diff --git a/LICENSES/fuzzdb_path_traversal_payload.txt b/LICENSES/fuzzdb_path_traversal_payload.txt
deleted file mode 100644
index 2a6dd94b..00000000
--- a/LICENSES/fuzzdb_path_traversal_payload.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Copyright (c) 2010-2015, Adam Muntner
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of fuzzdb  nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Licensed under Creative Commons - By Attribution
-
-see
-
-http://creativecommons.org/licenses/by/3.0/legalcode
\ No newline at end of file
diff --git a/mobsf/StaticAnalyzer/views/android/static_analyzer.py b/mobsf/StaticAnalyzer/views/android/static_analyzer.py
index 6a2e799a..023f7506 100755
--- a/mobsf/StaticAnalyzer/views/android/static_analyzer.py
+++ b/mobsf/StaticAnalyzer/views/android/static_analyzer.py
@@ -334,7 +334,8 @@ def static_analyzer(request, api=False):
                     app_dic['files'] = unzip(
                         app_dic['app_path'], app_dic['app_dir'])
                     # Check if Valid Directory Structure and get ZIP Type
-                    pro_type, valid = valid_android_zip(app_dic['app_dir'])
+                    pro_type, valid = valid_source_code(app_dic['app_dir'])
+                    logger.info('Source code type - %s', pro_type)
                     if valid and pro_type == 'ios':
                         logger.info('Redirecting to iOS Source Code Analyzer')
                         if api:
@@ -344,7 +345,6 @@ def static_analyzer(request, api=False):
                     app_dic['certz'] = get_hardcoded_cert_keystore(
                         app_dic['files'])
                     app_dic['zipped'] = pro_type
-                    logger.info('ZIP Type - %s', pro_type)
                     if valid and (pro_type in ['eclipse', 'studio']):
                         # ANALYSIS BEGINS
                         app_dic['size'] = str(
@@ -513,23 +513,40 @@ def static_analyzer(request, api=False):
             return print_n_send_error_response(request, msg, False, exp)
 
 
-def valid_android_zip(app_dir):
-    """Test if this is an valid android zip."""
+def is_android_source(app_dir):
+    """Detect Android Source and IDE Type."""
+    # Eclipse
+    man = os.path.isfile(os.path.join(app_dir, 'AndroidManifest.xml'))
+    src = os.path.exists(os.path.join(app_dir, 'src/'))
+    if man and src:
+        return 'eclipse', True
+    # Studio
+    man = os.path.isfile(
+        os.path.join(app_dir, 'app/src/main/AndroidManifest.xml'),
+    )
+    java = os.path.exists(os.path.join(app_dir, 'app/src/main/java/'))
+    kotlin = os.path.exists(os.path.join(app_dir, 'app/src/main/kotlin/'))
+    if man and (java or kotlin):
+        return 'studio', True
+    return None, False
+
+
+def valid_source_code(app_dir):
+    """Test if this is an valid source code zip."""
     try:
-        logger.info('Checking for ZIP Validity and Mode')
-        # Eclipse
-        man = os.path.isfile(os.path.join(app_dir, 'AndroidManifest.xml'))
-        src = os.path.exists(os.path.join(app_dir, 'src/'))
-        if man and src:
-            return 'eclipse', True
-        # Studio
-        man = os.path.isfile(
-            os.path.join(app_dir, 'app/src/main/AndroidManifest.xml'),
-        )
-        java = os.path.exists(os.path.join(app_dir, 'app/src/main/java/'))
-        kotlin = os.path.exists(os.path.join(app_dir, 'app/src/main/kotlin/'))
-        if man and (java or kotlin):
-            return 'studio', True
+        logger.info('Detecting source code type')
+        ide, is_and = is_android_source(app_dir)
+        if ide:
+            return ide, is_and
+        # Relaxed Android Source check, one level down
+        for x in os.listdir(app_dir):
+            obj = os.path.join(app_dir, x)
+            if not is_dir_exists(obj):
+                continue
+            ide, is_and = is_android_source(obj)
+            if ide:
+                move_to_parent(obj, app_dir)
+                return ide, is_and
         # iOS Source
         xcode = [f for f in os.listdir(app_dir) if f.endswith('.xcodeproj')]
         if xcode:
@@ -543,7 +560,15 @@ def valid_android_zip(app_dir):
                 return 'ios', True
         return '', False
     except Exception:
-        logger.exception('Determining Upload type')
+        logger.exception('Identifying source code from zip')
+
+
+def move_to_parent(inside, app_dir):
+    """Move contents of inside to app dir."""
+    for x in os.listdir(inside):
+        full_path = os.path.join(inside, x)
+        shutil.move(full_path, app_dir)
+    shutil.rmtree(inside)
 
 
 def copy_icon(md5, icon_path=''):
@@ -574,6 +599,8 @@ def get_app_name(app_path, app_dir, tools_dir, is_apk):
             strings_dir = strings_path
         elif os.path.exists(eclipse_path):
             strings_dir = eclipse_path
+        else:
+            strings_dir = ''
     if not os.path.exists(strings_dir):
         logger.warning('Cannot find values folder.')
         return ''