diff --git a/.editorconfig b/jadx-with-jadxecute/.editorconfig
similarity index 100%
rename from .editorconfig
rename to jadx-with-jadxecute/.editorconfig
diff --git a/.gitignore b/jadx-with-jadxecute/.gitignore
similarity index 100%
rename from .gitignore
rename to jadx-with-jadxecute/.gitignore
diff --git a/.gitlab-ci.yml b/jadx-with-jadxecute/.gitlab-ci.yml
similarity index 100%
rename from .gitlab-ci.yml
rename to jadx-with-jadxecute/.gitlab-ci.yml
diff --git a/.jitpack.yml b/jadx-with-jadxecute/.jitpack.yml
similarity index 100%
rename from .jitpack.yml
rename to jadx-with-jadxecute/.jitpack.yml
diff --git a/CODE_OF_CONDUCT.md b/jadx-with-jadxecute/CODE_OF_CONDUCT.md
similarity index 100%
rename from CODE_OF_CONDUCT.md
rename to jadx-with-jadxecute/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/jadx-with-jadxecute/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to jadx-with-jadxecute/CONTRIBUTING.md
diff --git a/LICENSE b/jadx-with-jadxecute/LICENSE
similarity index 100%
rename from LICENSE
rename to jadx-with-jadxecute/LICENSE
diff --git a/NOTICE b/jadx-with-jadxecute/NOTICE
similarity index 100%
rename from NOTICE
rename to jadx-with-jadxecute/NOTICE
diff --git a/SECURITY.md b/jadx-with-jadxecute/SECURITY.md
similarity index 100%
rename from SECURITY.md
rename to jadx-with-jadxecute/SECURITY.md
diff --git a/build.gradle b/jadx-with-jadxecute/build.gradle
similarity index 100%
rename from build.gradle
rename to jadx-with-jadxecute/build.gradle
diff --git a/buildSrc/build.gradle b/jadx-with-jadxecute/buildSrc/build.gradle
similarity index 100%
rename from buildSrc/build.gradle
rename to jadx-with-jadxecute/buildSrc/build.gradle
diff --git a/buildSrc/src/main/groovy/jadx-library.gradle b/jadx-with-jadxecute/buildSrc/src/main/groovy/jadx-library.gradle
similarity index 100%
rename from buildSrc/src/main/groovy/jadx-library.gradle
rename to jadx-with-jadxecute/buildSrc/src/main/groovy/jadx-library.gradle
diff --git a/config/checkstyle/checkstyle.xml b/jadx-with-jadxecute/config/checkstyle/checkstyle.xml
similarity index 100%
rename from config/checkstyle/checkstyle.xml
rename to jadx-with-jadxecute/config/checkstyle/checkstyle.xml
diff --git a/config/code-formatter/eclipse.importorder b/jadx-with-jadxecute/config/code-formatter/eclipse.importorder
similarity index 100%
rename from config/code-formatter/eclipse.importorder
rename to jadx-with-jadxecute/config/code-formatter/eclipse.importorder
diff --git a/config/code-formatter/eclipse.xml b/jadx-with-jadxecute/config/code-formatter/eclipse.xml
similarity index 100%
rename from config/code-formatter/eclipse.xml
rename to jadx-with-jadxecute/config/code-formatter/eclipse.xml
diff --git a/config/jflex/.gitignore b/jadx-with-jadxecute/config/jflex/.gitignore
similarity index 100%
rename from config/jflex/.gitignore
rename to jadx-with-jadxecute/config/jflex/.gitignore
diff --git a/config/jflex/README.md b/jadx-with-jadxecute/config/jflex/README.md
similarity index 100%
rename from config/jflex/README.md
rename to jadx-with-jadxecute/config/jflex/README.md
diff --git a/config/jflex/SmaliTokenMaker.flex b/jadx-with-jadxecute/config/jflex/SmaliTokenMaker.flex
similarity index 100%
rename from config/jflex/SmaliTokenMaker.flex
rename to jadx-with-jadxecute/config/jflex/SmaliTokenMaker.flex
diff --git a/config/jflex/skeleton.default b/jadx-with-jadxecute/config/jflex/skeleton.default
similarity index 100%
rename from config/jflex/skeleton.default
rename to jadx-with-jadxecute/config/jflex/skeleton.default
diff --git a/gradle.properties b/jadx-with-jadxecute/gradle.properties
similarity index 100%
rename from gradle.properties
rename to jadx-with-jadxecute/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/jadx-with-jadxecute/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.jar
rename to jadx-with-jadxecute/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/jadx-with-jadxecute/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.properties
rename to jadx-with-jadxecute/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/jadx-with-jadxecute/gradlew
similarity index 100%
rename from gradlew
rename to jadx-with-jadxecute/gradlew
diff --git a/gradlew.bat b/jadx-with-jadxecute/gradlew.bat
similarity index 100%
rename from gradlew.bat
rename to jadx-with-jadxecute/gradlew.bat
diff --git a/jadx-cli/build.gradle b/jadx-with-jadxecute/jadx-cli/build.gradle
similarity index 100%
rename from jadx-cli/build.gradle
rename to jadx-with-jadxecute/jadx-cli/build.gradle
diff --git a/jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java b/jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java
similarity index 100%
rename from jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java
rename to jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java
diff --git a/jadx-cli/src/main/java/jadx/cli/JadxCLI.java b/jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/JadxCLI.java
similarity index 100%
rename from jadx-cli/src/main/java/jadx/cli/JadxCLI.java
rename to jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/JadxCLI.java
diff --git a/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java b/jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
similarity index 100%
rename from jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
rename to jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java
diff --git a/jadx-cli/src/main/java/jadx/cli/LogHelper.java b/jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/LogHelper.java
similarity index 100%
rename from jadx-cli/src/main/java/jadx/cli/LogHelper.java
rename to jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/LogHelper.java
diff --git a/jadx-cli/src/main/java/jadx/cli/SingleClassMode.java b/jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/SingleClassMode.java
similarity index 100%
rename from jadx-cli/src/main/java/jadx/cli/SingleClassMode.java
rename to jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/SingleClassMode.java
diff --git a/jadx-cli/src/main/java/jadx/cli/clst/ConvertToClsSet.java b/jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/clst/ConvertToClsSet.java
similarity index 100%
rename from jadx-cli/src/main/java/jadx/cli/clst/ConvertToClsSet.java
rename to jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/clst/ConvertToClsSet.java
diff --git a/jadx-cli/src/main/java/jadx/cli/tools/ConvertArscFile.java b/jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/tools/ConvertArscFile.java
similarity index 100%
rename from jadx-cli/src/main/java/jadx/cli/tools/ConvertArscFile.java
rename to jadx-with-jadxecute/jadx-cli/src/main/java/jadx/cli/tools/ConvertArscFile.java
diff --git a/jadx-cli/src/main/resources/logback.xml b/jadx-with-jadxecute/jadx-cli/src/main/resources/logback.xml
similarity index 100%
rename from jadx-cli/src/main/resources/logback.xml
rename to jadx-with-jadxecute/jadx-cli/src/main/resources/logback.xml
diff --git a/jadx-cli/src/test/java/jadx/cli/JadxCLIArgsTest.java b/jadx-with-jadxecute/jadx-cli/src/test/java/jadx/cli/JadxCLIArgsTest.java
similarity index 100%
rename from jadx-cli/src/test/java/jadx/cli/JadxCLIArgsTest.java
rename to jadx-with-jadxecute/jadx-cli/src/test/java/jadx/cli/JadxCLIArgsTest.java
diff --git a/jadx-cli/src/test/java/jadx/cli/RenameConverterTest.java b/jadx-with-jadxecute/jadx-cli/src/test/java/jadx/cli/RenameConverterTest.java
similarity index 100%
rename from jadx-cli/src/test/java/jadx/cli/RenameConverterTest.java
rename to jadx-with-jadxecute/jadx-cli/src/test/java/jadx/cli/RenameConverterTest.java
diff --git a/jadx-cli/src/test/java/jadx/cli/TestInput.java b/jadx-with-jadxecute/jadx-cli/src/test/java/jadx/cli/TestInput.java
similarity index 100%
rename from jadx-cli/src/test/java/jadx/cli/TestInput.java
rename to jadx-with-jadxecute/jadx-cli/src/test/java/jadx/cli/TestInput.java
diff --git a/jadx-cli/src/test/resources/samples/HelloWorld.smali b/jadx-with-jadxecute/jadx-cli/src/test/resources/samples/HelloWorld.smali
similarity index 100%
rename from jadx-cli/src/test/resources/samples/HelloWorld.smali
rename to jadx-with-jadxecute/jadx-cli/src/test/resources/samples/HelloWorld.smali
diff --git a/jadx-cli/src/test/resources/samples/hello.dex b/jadx-with-jadxecute/jadx-cli/src/test/resources/samples/hello.dex
similarity index 100%
rename from jadx-cli/src/test/resources/samples/hello.dex
rename to jadx-with-jadxecute/jadx-cli/src/test/resources/samples/hello.dex
diff --git a/jadx-cli/src/test/resources/samples/resources-only.apk b/jadx-with-jadxecute/jadx-cli/src/test/resources/samples/resources-only.apk
similarity index 100%
rename from jadx-cli/src/test/resources/samples/resources-only.apk
rename to jadx-with-jadxecute/jadx-cli/src/test/resources/samples/resources-only.apk
diff --git a/jadx-core/build.gradle b/jadx-with-jadxecute/jadx-core/build.gradle
similarity index 100%
rename from jadx-core/build.gradle
rename to jadx-with-jadxecute/jadx-core/build.gradle
diff --git a/jadx-core/src/main/java/jadx/api/CommentsLevel.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/CommentsLevel.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/CommentsLevel.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/CommentsLevel.java
diff --git a/jadx-core/src/main/java/jadx/api/DecompilationMode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/DecompilationMode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/DecompilationMode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/DecompilationMode.java
diff --git a/jadx-core/src/main/java/jadx/api/ICodeCache.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ICodeCache.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/ICodeCache.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ICodeCache.java
diff --git a/jadx-core/src/main/java/jadx/api/ICodeInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ICodeInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/ICodeInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ICodeInfo.java
diff --git a/jadx-core/src/main/java/jadx/api/ICodeWriter.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ICodeWriter.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/ICodeWriter.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ICodeWriter.java
diff --git a/jadx-core/src/main/java/jadx/api/IDecompileScheduler.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/IDecompileScheduler.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/IDecompileScheduler.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/IDecompileScheduler.java
diff --git a/jadx-core/src/main/java/jadx/api/JadxArgs.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JadxArgs.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/JadxArgs.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JadxArgs.java
diff --git a/jadx-core/src/main/java/jadx/api/JadxArgsValidator.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JadxArgsValidator.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/JadxArgsValidator.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JadxArgsValidator.java
diff --git a/jadx-core/src/main/java/jadx/api/JadxDecompiler.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JadxDecompiler.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/JadxDecompiler.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JadxDecompiler.java
diff --git a/jadx-core/src/main/java/jadx/api/JavaClass.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JavaClass.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/JavaClass.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JavaClass.java
diff --git a/jadx-core/src/main/java/jadx/api/JavaField.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JavaField.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/JavaField.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JavaField.java
diff --git a/jadx-core/src/main/java/jadx/api/JavaMethod.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JavaMethod.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/JavaMethod.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JavaMethod.java
diff --git a/jadx-core/src/main/java/jadx/api/JavaNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JavaNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/JavaNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JavaNode.java
diff --git a/jadx-core/src/main/java/jadx/api/JavaPackage.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JavaPackage.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/JavaPackage.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JavaPackage.java
diff --git a/jadx-core/src/main/java/jadx/api/JavaVariable.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JavaVariable.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/JavaVariable.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/JavaVariable.java
diff --git a/jadx-core/src/main/java/jadx/api/ResourceFile.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ResourceFile.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/ResourceFile.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ResourceFile.java
diff --git a/jadx-core/src/main/java/jadx/api/ResourceFileContent.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ResourceFileContent.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/ResourceFileContent.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ResourceFileContent.java
diff --git a/jadx-core/src/main/java/jadx/api/ResourceType.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ResourceType.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/ResourceType.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ResourceType.java
diff --git a/jadx-core/src/main/java/jadx/api/ResourcesLoader.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ResourcesLoader.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/ResourcesLoader.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/ResourcesLoader.java
diff --git a/jadx-core/src/main/java/jadx/api/args/DeobfuscationMapFileMode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/args/DeobfuscationMapFileMode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/args/DeobfuscationMapFileMode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/args/DeobfuscationMapFileMode.java
diff --git a/jadx-core/src/main/java/jadx/api/args/ResourceNameSource.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/args/ResourceNameSource.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/args/ResourceNameSource.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/args/ResourceNameSource.java
diff --git a/jadx-core/src/main/java/jadx/api/data/CodeRefType.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/CodeRefType.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/data/CodeRefType.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/CodeRefType.java
diff --git a/jadx-core/src/main/java/jadx/api/data/ICodeComment.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/ICodeComment.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/data/ICodeComment.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/ICodeComment.java
diff --git a/jadx-core/src/main/java/jadx/api/data/ICodeData.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/ICodeData.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/data/ICodeData.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/ICodeData.java
diff --git a/jadx-core/src/main/java/jadx/api/data/ICodeRename.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/ICodeRename.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/data/ICodeRename.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/ICodeRename.java
diff --git a/jadx-core/src/main/java/jadx/api/data/IJavaCodeRef.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/IJavaCodeRef.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/data/IJavaCodeRef.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/IJavaCodeRef.java
diff --git a/jadx-core/src/main/java/jadx/api/data/IJavaNodeRef.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/IJavaNodeRef.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/data/IJavaNodeRef.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/IJavaNodeRef.java
diff --git a/jadx-core/src/main/java/jadx/api/data/impl/JadxCodeComment.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/impl/JadxCodeComment.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/data/impl/JadxCodeComment.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/impl/JadxCodeComment.java
diff --git a/jadx-core/src/main/java/jadx/api/data/impl/JadxCodeData.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/impl/JadxCodeData.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/data/impl/JadxCodeData.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/impl/JadxCodeData.java
diff --git a/jadx-core/src/main/java/jadx/api/data/impl/JadxCodeRef.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/impl/JadxCodeRef.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/data/impl/JadxCodeRef.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/impl/JadxCodeRef.java
diff --git a/jadx-core/src/main/java/jadx/api/data/impl/JadxCodeRename.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/impl/JadxCodeRename.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/data/impl/JadxCodeRename.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/impl/JadxCodeRename.java
diff --git a/jadx-core/src/main/java/jadx/api/data/impl/JadxNodeRef.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/impl/JadxNodeRef.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/data/impl/JadxNodeRef.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/data/impl/JadxNodeRef.java
diff --git a/jadx-core/src/main/java/jadx/api/impl/AnnotatedCodeInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/AnnotatedCodeInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/impl/AnnotatedCodeInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/AnnotatedCodeInfo.java
diff --git a/jadx-core/src/main/java/jadx/api/impl/AnnotatedCodeWriter.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/AnnotatedCodeWriter.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/impl/AnnotatedCodeWriter.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/AnnotatedCodeWriter.java
diff --git a/jadx-core/src/main/java/jadx/api/impl/DelegateCodeCache.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/DelegateCodeCache.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/impl/DelegateCodeCache.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/DelegateCodeCache.java
diff --git a/jadx-core/src/main/java/jadx/api/impl/InMemoryCodeCache.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/InMemoryCodeCache.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/impl/InMemoryCodeCache.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/InMemoryCodeCache.java
diff --git a/jadx-core/src/main/java/jadx/api/impl/NoOpCodeCache.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/NoOpCodeCache.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/impl/NoOpCodeCache.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/NoOpCodeCache.java
diff --git a/jadx-core/src/main/java/jadx/api/impl/SimpleCodeInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/SimpleCodeInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/impl/SimpleCodeInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/SimpleCodeInfo.java
diff --git a/jadx-core/src/main/java/jadx/api/impl/SimpleCodeWriter.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/SimpleCodeWriter.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/impl/SimpleCodeWriter.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/impl/SimpleCodeWriter.java
diff --git a/jadx-core/src/main/java/jadx/api/metadata/ICodeAnnotation.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/ICodeAnnotation.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/metadata/ICodeAnnotation.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/ICodeAnnotation.java
diff --git a/jadx-core/src/main/java/jadx/api/metadata/ICodeMetadata.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/ICodeMetadata.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/metadata/ICodeMetadata.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/ICodeMetadata.java
diff --git a/jadx-core/src/main/java/jadx/api/metadata/ICodeNodeRef.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/ICodeNodeRef.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/metadata/ICodeNodeRef.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/ICodeNodeRef.java
diff --git a/jadx-core/src/main/java/jadx/api/metadata/annotations/InsnCodeOffset.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/annotations/InsnCodeOffset.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/metadata/annotations/InsnCodeOffset.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/annotations/InsnCodeOffset.java
diff --git a/jadx-core/src/main/java/jadx/api/metadata/annotations/NodeDeclareRef.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/annotations/NodeDeclareRef.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/metadata/annotations/NodeDeclareRef.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/annotations/NodeDeclareRef.java
diff --git a/jadx-core/src/main/java/jadx/api/metadata/annotations/NodeEnd.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/annotations/NodeEnd.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/metadata/annotations/NodeEnd.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/annotations/NodeEnd.java
diff --git a/jadx-core/src/main/java/jadx/api/metadata/annotations/VarNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/annotations/VarNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/metadata/annotations/VarNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/annotations/VarNode.java
diff --git a/jadx-core/src/main/java/jadx/api/metadata/annotations/VarRef.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/annotations/VarRef.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/metadata/annotations/VarRef.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/annotations/VarRef.java
diff --git a/jadx-core/src/main/java/jadx/api/metadata/impl/CodeMetadataStorage.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/impl/CodeMetadataStorage.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/metadata/impl/CodeMetadataStorage.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/metadata/impl/CodeMetadataStorage.java
diff --git a/jadx-core/src/main/java/jadx/api/utils/CodeUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/utils/CodeUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/api/utils/CodeUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/api/utils/CodeUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/Consts.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/Consts.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/Consts.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/Consts.java
diff --git a/jadx-core/src/main/java/jadx/core/Jadx.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/Jadx.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/Jadx.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/Jadx.java
diff --git a/jadx-core/src/main/java/jadx/core/ProcessClass.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/ProcessClass.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/ProcessClass.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/ProcessClass.java
diff --git a/jadx-core/src/main/java/jadx/core/clsp/ClsSet.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/clsp/ClsSet.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/clsp/ClsSet.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/clsp/ClsSet.java
diff --git a/jadx-core/src/main/java/jadx/core/clsp/ClspClass.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/clsp/ClspClass.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/clsp/ClspClass.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/clsp/ClspClass.java
diff --git a/jadx-core/src/main/java/jadx/core/clsp/ClspGraph.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/clsp/ClspGraph.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/clsp/ClspGraph.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/clsp/ClspGraph.java
diff --git a/jadx-core/src/main/java/jadx/core/clsp/ClspMethod.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/clsp/ClspMethod.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/clsp/ClspMethod.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/clsp/ClspMethod.java
diff --git a/jadx-core/src/main/java/jadx/core/clsp/SimpleMethodDetails.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/clsp/SimpleMethodDetails.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/clsp/SimpleMethodDetails.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/clsp/SimpleMethodDetails.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/CodeGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/CodeGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/CodeGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/CodeGen.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/ConditionGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/ConditionGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/ConditionGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/ConditionGen.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/InsnGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/NameGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/NameGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/NameGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/NameGen.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/RegionGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/RegionGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/RegionGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/RegionGen.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/SimpleModeHelper.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/SimpleModeHelper.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/SimpleModeHelper.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/SimpleModeHelper.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/TypeGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/TypeGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/TypeGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/TypeGen.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/json/JsonCodeGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/JsonCodeGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/json/JsonCodeGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/JsonCodeGen.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/json/JsonMappingGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/JsonMappingGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/json/JsonMappingGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/JsonMappingGen.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonClass.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonClass.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonClass.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonClass.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonCodeLine.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonCodeLine.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonCodeLine.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonCodeLine.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonField.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonField.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonField.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonField.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonMethod.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonMethod.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonMethod.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonMethod.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/cls/JsonNode.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonClsMapping.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonClsMapping.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonClsMapping.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonClsMapping.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonFieldMapping.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonFieldMapping.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonFieldMapping.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonFieldMapping.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonMapping.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonMapping.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonMapping.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonMapping.java
diff --git a/jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonMthMapping.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonMthMapping.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonMthMapping.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/codegen/json/mapping/JsonMthMapping.java
diff --git a/jadx-core/src/main/java/jadx/core/deobf/ClsAliasPair.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/ClsAliasPair.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/deobf/ClsAliasPair.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/ClsAliasPair.java
diff --git a/jadx-core/src/main/java/jadx/core/deobf/DeobfClsInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/DeobfClsInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/deobf/DeobfClsInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/DeobfClsInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/deobf/DeobfPresets.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/DeobfPresets.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/deobf/DeobfPresets.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/DeobfPresets.java
diff --git a/jadx-core/src/main/java/jadx/core/deobf/Deobfuscator.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/Deobfuscator.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/deobf/Deobfuscator.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/Deobfuscator.java
diff --git a/jadx-core/src/main/java/jadx/core/deobf/NameMapper.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/NameMapper.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/deobf/NameMapper.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/NameMapper.java
diff --git a/jadx-core/src/main/java/jadx/core/deobf/PackageNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/PackageNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/deobf/PackageNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/PackageNode.java
diff --git a/jadx-core/src/main/java/jadx/core/deobf/TldHelper.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/TldHelper.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/deobf/TldHelper.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/deobf/TldHelper.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/AType.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/AType.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/AType.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/AType.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/AttrList.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/AttrList.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/AttrList.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/AttrList.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/AttrNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/AttrNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/AttrNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/AttrNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/AttributeStorage.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/AttributeStorage.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/AttributeStorage.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/AttributeStorage.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/EmptyAttrStorage.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/EmptyAttrStorage.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/EmptyAttrStorage.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/EmptyAttrStorage.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/FieldInitInsnAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/FieldInitInsnAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/FieldInitInsnAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/FieldInitInsnAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/IAttributeNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/IAttributeNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/IAttributeNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/IAttributeNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/ILineAttributeNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/ILineAttributeNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/ILineAttributeNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/ILineAttributeNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/AnonymousClassAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/AnonymousClassAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/AnonymousClassAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/AnonymousClassAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/ClassTypeVarsAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/ClassTypeVarsAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/ClassTypeVarsAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/ClassTypeVarsAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/DeclareVariablesAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/DeclareVariablesAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/DeclareVariablesAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/DeclareVariablesAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EdgeInsnAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EdgeInsnAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EdgeInsnAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EdgeInsnAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EnumClassAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EnumClassAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EnumClassAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EnumClassAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EnumMapAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EnumMapAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EnumMapAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EnumMapAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/FieldReplaceAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/FieldReplaceAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/FieldReplaceAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/FieldReplaceAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/ForceReturnAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/ForceReturnAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/ForceReturnAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/ForceReturnAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/GenericInfoAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/GenericInfoAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/GenericInfoAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/GenericInfoAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/InlinedAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/InlinedAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/InlinedAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/InlinedAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JadxCommentsAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JadxCommentsAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JadxCommentsAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JadxCommentsAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JadxError.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JadxError.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JadxError.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JadxError.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JumpInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JumpInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JumpInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JumpInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LineAttrNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LineAttrNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LineAttrNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LineAttrNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LocalVarsDebugInfoAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LocalVarsDebugInfoAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LocalVarsDebugInfoAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LocalVarsDebugInfoAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LoopInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LoopInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LoopInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LoopInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LoopLabelAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LoopLabelAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LoopLabelAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LoopLabelAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodBridgeAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodBridgeAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodBridgeAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodBridgeAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodInlineAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodInlineAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodInlineAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodInlineAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodOverrideAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodOverrideAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodOverrideAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodOverrideAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodReplaceAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodReplaceAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodReplaceAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodReplaceAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodTypeVarsAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodTypeVarsAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodTypeVarsAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodTypeVarsAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/NotificationAttrNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/NotificationAttrNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/NotificationAttrNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/NotificationAttrNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/PhiListAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/PhiListAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/PhiListAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/PhiListAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/RegDebugInfoAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/RegDebugInfoAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/RegDebugInfoAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/RegDebugInfoAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/RenameReasonAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/RenameReasonAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/RenameReasonAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/RenameReasonAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/SkipMethodArgsAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/SkipMethodArgsAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/SkipMethodArgsAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/SkipMethodArgsAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/SpecialEdgeAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/SpecialEdgeAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/SpecialEdgeAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/SpecialEdgeAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/TmpEdgeAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/TmpEdgeAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/attributes/nodes/TmpEdgeAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/attributes/nodes/TmpEdgeAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/info/AccessInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/AccessInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/info/AccessInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/AccessInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/info/ClassAliasInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/ClassAliasInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/info/ClassAliasInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/ClassAliasInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/info/ConstStorage.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/ConstStorage.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/info/ConstStorage.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/ConstStorage.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/info/FieldInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/FieldInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/info/FieldInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/FieldInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/info/InfoStorage.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/InfoStorage.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/info/InfoStorage.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/InfoStorage.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/info/MethodInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/MethodInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/info/MethodInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/info/MethodInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/ArithNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/ArithNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/ArithNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/ArithNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/ArithOp.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/ArithOp.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/ArithOp.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/ArithOp.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/BaseInvokeNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/BaseInvokeNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/BaseInvokeNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/BaseInvokeNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/ConstClassNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/ConstClassNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/ConstClassNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/ConstClassNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/ConstStringNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/ConstStringNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/ConstStringNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/ConstStringNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/FillArrayData.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/FillArrayData.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/FillArrayData.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/FillArrayData.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/FillArrayInsn.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/FillArrayInsn.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/FillArrayInsn.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/FillArrayInsn.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/FilledNewArrayNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/FilledNewArrayNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/FilledNewArrayNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/FilledNewArrayNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/GotoNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/GotoNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/GotoNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/GotoNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/IfNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/IfNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/IfNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/IfNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/IfOp.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/IfOp.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/IfOp.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/IfOp.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/IndexInsnNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/IndexInsnNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/IndexInsnNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/IndexInsnNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/InsnDecoder.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InsnDecoder.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/InsnDecoder.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InsnDecoder.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/InsnType.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InsnType.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/InsnType.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InsnType.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeCustomBuilder.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeCustomBuilder.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/InvokeCustomBuilder.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeCustomBuilder.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeCustomNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeCustomNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/InvokeCustomNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeCustomNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeCustomRawNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeCustomRawNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/InvokeCustomRawNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeCustomRawNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/InvokeNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/InvokePolymorphicNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InvokePolymorphicNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/InvokePolymorphicNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InvokePolymorphicNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeType.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeType.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/InvokeType.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/InvokeType.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/NewArrayNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/NewArrayNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/NewArrayNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/NewArrayNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/PhiInsn.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/PhiInsn.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/PhiInsn.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/PhiInsn.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/SwitchData.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/SwitchData.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/SwitchData.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/SwitchData.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/SwitchInsn.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/SwitchInsn.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/SwitchInsn.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/SwitchInsn.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/TargetInsnNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/TargetInsnNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/TargetInsnNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/TargetInsnNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/CodeVar.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/CodeVar.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/args/CodeVar.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/CodeVar.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnWrapArg.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnWrapArg.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnWrapArg.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnWrapArg.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/LiteralArg.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/LiteralArg.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/args/LiteralArg.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/LiteralArg.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/Named.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/Named.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/args/Named.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/Named.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/NamedArg.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/NamedArg.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/args/NamedArg.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/NamedArg.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/PrimitiveType.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/PrimitiveType.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/args/PrimitiveType.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/PrimitiveType.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/SSAVar.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/SSAVar.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/args/SSAVar.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/SSAVar.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/Typed.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/Typed.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/args/Typed.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/Typed.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/args/VarName.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/VarName.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/args/VarName.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/args/VarName.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/CustomLambdaCall.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/CustomLambdaCall.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/CustomLambdaCall.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/CustomLambdaCall.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/CustomRawCall.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/CustomRawCall.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/CustomRawCall.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/CustomRawCall.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/CustomStringConcat.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/CustomStringConcat.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/CustomStringConcat.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/CustomStringConcat.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/InvokeCustomUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/InvokeCustomUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/InvokeCustomUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/invokedynamic/InvokeCustomUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/mods/ConstructorInsn.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/mods/ConstructorInsn.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/mods/ConstructorInsn.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/mods/ConstructorInsn.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/instructions/mods/TernaryInsn.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/mods/TernaryInsn.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/instructions/mods/TernaryInsn.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/instructions/mods/TernaryInsn.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/Edge.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/Edge.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/Edge.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/Edge.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/FieldNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/FieldNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/FieldNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/FieldNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/IBlock.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IBlock.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/IBlock.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IBlock.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/IBranchRegion.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IBranchRegion.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/IBranchRegion.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IBranchRegion.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/ICodeDataUpdateListener.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/ICodeDataUpdateListener.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/ICodeDataUpdateListener.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/ICodeDataUpdateListener.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/ICodeNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/ICodeNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/ICodeNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/ICodeNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/IConditionRegion.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IConditionRegion.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/IConditionRegion.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IConditionRegion.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/IContainer.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IContainer.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/IContainer.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IContainer.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/IDexNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IDexNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/IDexNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IDexNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/ILoadable.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/ILoadable.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/ILoadable.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/ILoadable.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/IMethodDetails.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IMethodDetails.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/IMethodDetails.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IMethodDetails.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/IRegion.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IRegion.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/IRegion.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IRegion.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/IUsageInfoNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IUsageInfoNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/IUsageInfoNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/IUsageInfoNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/InsnContainer.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/InsnContainer.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/InsnContainer.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/InsnContainer.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/InsnNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/InsnNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/InsnNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/InsnNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/LoadStage.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/LoadStage.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/LoadStage.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/LoadStage.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/ProcessState.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/ProcessState.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/ProcessState.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/ProcessState.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/RootNode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/RootNode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/RootNode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/RootNode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/parser/SignatureParser.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/parser/SignatureParser.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/parser/SignatureParser.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/parser/SignatureParser.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/utils/MethodUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/utils/MethodUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/utils/MethodUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/utils/MethodUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/nodes/utils/TypeUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/utils/TypeUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/nodes/utils/TypeUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/nodes/utils/TypeUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/AbstractRegion.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/AbstractRegion.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/AbstractRegion.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/AbstractRegion.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/Region.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/Region.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/Region.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/Region.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/SwitchRegion.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/SwitchRegion.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/SwitchRegion.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/SwitchRegion.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/SynchronizedRegion.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/SynchronizedRegion.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/SynchronizedRegion.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/SynchronizedRegion.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/TryCatchRegion.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/TryCatchRegion.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/TryCatchRegion.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/TryCatchRegion.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/conditions/Compare.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/conditions/Compare.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/conditions/Compare.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/conditions/Compare.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/conditions/ConditionRegion.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/conditions/ConditionRegion.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/conditions/ConditionRegion.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/conditions/ConditionRegion.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfCondition.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfCondition.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfCondition.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfCondition.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfRegion.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfRegion.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfRegion.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfRegion.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/loops/ForEachLoop.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/loops/ForEachLoop.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/loops/ForEachLoop.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/loops/ForEachLoop.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/loops/ForLoop.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/loops/ForLoop.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/loops/ForLoop.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/loops/ForLoop.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/loops/LoopRegion.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/loops/LoopRegion.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/loops/LoopRegion.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/loops/LoopRegion.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/regions/loops/LoopType.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/loops/LoopType.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/regions/loops/LoopType.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/regions/loops/LoopType.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/trycatch/CatchAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/trycatch/CatchAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/trycatch/CatchAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/trycatch/CatchAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/trycatch/ExcHandlerAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/trycatch/ExcHandlerAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/trycatch/ExcHandlerAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/trycatch/ExcHandlerAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/trycatch/ExceptionHandler.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/trycatch/ExceptionHandler.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/trycatch/ExceptionHandler.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/trycatch/ExceptionHandler.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/trycatch/TryCatchBlockAttr.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/trycatch/TryCatchBlockAttr.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/trycatch/TryCatchBlockAttr.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/trycatch/TryCatchBlockAttr.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/AbstractVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/AbstractVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/AbstractVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/AbstractVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/AnonymousClassVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/AnonymousClassVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/AnonymousClassVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/AnonymousClassVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/AttachCommentsVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/AttachCommentsVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/AttachCommentsVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/AttachCommentsVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/AttachMethodDetails.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/AttachMethodDetails.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/AttachMethodDetails.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/AttachMethodDetails.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/AttachTryCatchVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/AttachTryCatchVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/AttachTryCatchVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/AttachTryCatchVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/CheckCode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/CheckCode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/CheckCode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/CheckCode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ClassModifier.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ClassModifier.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ClassModifier.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ClassModifier.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ConstInlineVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ConstInlineVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ConstInlineVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ConstInlineVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ConstructorVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ConstructorVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ConstructorVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ConstructorVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/DeboxingVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/DeboxingVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/DeboxingVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/DeboxingVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/DepthTraversal.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/DepthTraversal.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/DepthTraversal.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/DepthTraversal.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/DotGraphVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/DotGraphVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/DotGraphVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/DotGraphVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/EnumVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/EnumVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/EnumVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/EnumVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ExtractFieldInit.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ExtractFieldInit.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ExtractFieldInit.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ExtractFieldInit.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/FallbackModeVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/FallbackModeVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/FallbackModeVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/FallbackModeVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/FixAccessModifiers.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/FixAccessModifiers.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/FixAccessModifiers.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/FixAccessModifiers.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/GenericTypesVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/GenericTypesVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/GenericTypesVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/GenericTypesVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/IDexTreeVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/IDexTreeVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/IDexTreeVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/IDexTreeVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/InitCodeVariables.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/InitCodeVariables.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/InitCodeVariables.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/InitCodeVariables.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/InlineMethods.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/InlineMethods.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/InlineMethods.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/InlineMethods.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/JadxVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/JadxVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/JadxVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/JadxVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/MarkMethodsForInline.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/MarkMethodsForInline.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/MarkMethodsForInline.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/MarkMethodsForInline.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/MethodInvokeVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/MethodInvokeVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/MethodInvokeVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/MethodInvokeVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/MethodVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/MethodVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/MethodVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/MethodVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/MoveInlineVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/MoveInlineVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/MoveInlineVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/MoveInlineVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/OverrideMethodVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/OverrideMethodVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/OverrideMethodVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/OverrideMethodVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/PrepareForCodeGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/PrepareForCodeGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/PrepareForCodeGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/PrepareForCodeGen.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ProcessAnonymous.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ProcessAnonymous.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ProcessAnonymous.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ProcessAnonymous.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ProcessInstructionsVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ProcessInstructionsVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ProcessInstructionsVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ProcessInstructionsVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ProcessMethodsForInline.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ProcessMethodsForInline.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ProcessMethodsForInline.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ProcessMethodsForInline.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ReSugarCode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ReSugarCode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ReSugarCode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ReSugarCode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/SaveCode.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/SaveCode.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/SaveCode.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/SaveCode.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ShadowFieldVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ShadowFieldVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ShadowFieldVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ShadowFieldVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/SignatureProcessor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/SignatureProcessor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/SignatureProcessor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/SignatureProcessor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockExceptionHandler.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockExceptionHandler.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockExceptionHandler.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockExceptionHandler.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockProcessor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockProcessor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockProcessor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockProcessor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockSplitter.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockSplitter.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockSplitter.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/BlockSplitter.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/DominatorTree.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/DominatorTree.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/blocks/DominatorTree.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/DominatorTree.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/FixMultiEntryLoops.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/FixMultiEntryLoops.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/blocks/FixMultiEntryLoops.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/blocks/FixMultiEntryLoops.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/DebugInfoApplyVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/DebugInfoApplyVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/DebugInfoApplyVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/DebugInfoApplyVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/DebugInfoAttachVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/DebugInfoAttachVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/DebugInfoAttachVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/DebugInfoAttachVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/finaly/FinallyExtractInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/finaly/FinallyExtractInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/finaly/FinallyExtractInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/finaly/FinallyExtractInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/finaly/InsnsSlice.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/finaly/InsnsSlice.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/finaly/InsnsSlice.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/finaly/InsnsSlice.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/finaly/MarkFinallyVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/finaly/MarkFinallyVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/finaly/MarkFinallyVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/finaly/MarkFinallyVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/kotlin/ProcessKotlinInternals.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/kotlin/ProcessKotlinInternals.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/kotlin/ProcessKotlinInternals.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/kotlin/ProcessKotlinInternals.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/methods/MutableMethodDetails.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/methods/MutableMethodDetails.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/methods/MutableMethodDetails.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/methods/MutableMethodDetails.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/AbstractRegionVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/AbstractRegionVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/AbstractRegionVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/AbstractRegionVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/CheckRegions.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/CheckRegions.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/CheckRegions.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/CheckRegions.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/CleanRegions.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/CleanRegions.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/CleanRegions.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/CleanRegions.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/DepthRegionTraversal.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/DepthRegionTraversal.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/DepthRegionTraversal.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/DepthRegionTraversal.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/IRegionIterativeVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/IRegionIterativeVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/IRegionIterativeVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/IRegionIterativeVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/IRegionVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/IRegionVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/IRegionVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/IRegionVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/IfMakerHelper.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/IfMakerHelper.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/IfMakerHelper.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/IfMakerHelper.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/IfRegionVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/IfRegionVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/IfRegionVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/IfRegionVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/LoopRegionVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/LoopRegionVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/LoopRegionVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/LoopRegionVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMakerVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMakerVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMakerVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMakerVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionStack.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionStack.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionStack.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionStack.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/ReturnVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/ReturnVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/ReturnVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/ReturnVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/TernaryMod.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/TernaryMod.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/TernaryMod.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/TernaryMod.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/TracedRegionVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/TracedRegionVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/TracedRegionVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/TracedRegionVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/CollectUsageRegionVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/CollectUsageRegionVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/CollectUsageRegionVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/CollectUsageRegionVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/ProcessVariables.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/ProcessVariables.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/ProcessVariables.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/ProcessVariables.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/UsePlace.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/UsePlace.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/UsePlace.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/UsePlace.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/VarUsage.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/VarUsage.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/VarUsage.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/regions/variables/VarUsage.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/rename/CodeRenameVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/rename/CodeRenameVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/rename/CodeRenameVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/rename/CodeRenameVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/rename/RenameVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/rename/RenameVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/rename/RenameVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/rename/RenameVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/rename/UserRenames.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/rename/UserRenames.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/rename/UserRenames.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/rename/UserRenames.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/shrink/ArgsInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/shrink/ArgsInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/shrink/ArgsInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/shrink/ArgsInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/shrink/CodeShrinkVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/shrink/CodeShrinkVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/shrink/CodeShrinkVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/shrink/CodeShrinkVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/shrink/WrapInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/shrink/WrapInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/shrink/WrapInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/shrink/WrapInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ssa/LiveVarAnalysis.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ssa/LiveVarAnalysis.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ssa/LiveVarAnalysis.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ssa/LiveVarAnalysis.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ssa/RenameState.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ssa/RenameState.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ssa/RenameState.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ssa/RenameState.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/ssa/SSATransform.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ssa/SSATransform.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/ssa/SSATransform.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/ssa/SSATransform.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/AbstractTypeConstraint.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/AbstractTypeConstraint.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/AbstractTypeConstraint.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/AbstractTypeConstraint.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/BoundEnum.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/BoundEnum.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/BoundEnum.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/BoundEnum.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/FinishTypeInference.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/FinishTypeInference.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/FinishTypeInference.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/FinishTypeInference.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeBound.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeBound.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeBound.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeBound.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeBoundDynamic.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeBoundDynamic.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeBoundDynamic.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeBoundDynamic.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeConstraint.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeConstraint.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeConstraint.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeConstraint.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeListener.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeListener.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeListener.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/ITypeListener.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundCheckCastAssign.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundCheckCastAssign.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundCheckCastAssign.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundCheckCastAssign.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundConst.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundConst.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundConst.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundConst.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundFieldGetAssign.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundFieldGetAssign.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundFieldGetAssign.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundFieldGetAssign.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundInvokeAssign.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundInvokeAssign.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundInvokeAssign.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundInvokeAssign.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundInvokeUse.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundInvokeUse.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundInvokeUse.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeBoundInvokeUse.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeCompare.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeCompare.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeCompare.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeCompare.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeCompareEnum.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeCompareEnum.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeCompareEnum.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeCompareEnum.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInferenceVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInferenceVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInferenceVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInferenceVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearch.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearch.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearch.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearch.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearchState.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearchState.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearchState.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearchState.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearchVarInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearchVarInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearchVarInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeSearchVarInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdate.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdate.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdate.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdate.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateEntry.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateEntry.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateEntry.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateEntry.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateFlags.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateFlags.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateFlags.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateFlags.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateRegistry.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateRegistry.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateRegistry.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateRegistry.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateResult.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateResult.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateResult.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/typeinference/TypeUpdateResult.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/usage/UsageInfo.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/usage/UsageInfo.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/usage/UsageInfo.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/usage/UsageInfo.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/usage/UsageInfoVisitor.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/usage/UsageInfoVisitor.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/usage/UsageInfoVisitor.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/usage/UsageInfoVisitor.java
diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/usage/UseSet.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/usage/UseSet.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/dex/visitors/usage/UseSet.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/dex/visitors/usage/UseSet.java
diff --git a/jadx-core/src/main/java/jadx/core/export/ApplicationParams.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/export/ApplicationParams.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/export/ApplicationParams.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/export/ApplicationParams.java
diff --git a/jadx-core/src/main/java/jadx/core/export/ExportGradleProject.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/export/ExportGradleProject.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/export/ExportGradleProject.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/export/ExportGradleProject.java
diff --git a/jadx-core/src/main/java/jadx/core/export/TemplateFile.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/export/TemplateFile.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/export/TemplateFile.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/export/TemplateFile.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/BetterName.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/BetterName.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/BetterName.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/BetterName.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/BlockInsnPair.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/BlockInsnPair.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/BlockInsnPair.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/BlockInsnPair.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/BlockUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/CacheStorage.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/CacheStorage.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/CacheStorage.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/CacheStorage.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/CodeGenUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/CodeGenUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/CodeGenUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/CodeGenUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/DebugChecks.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/DebugChecks.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/DebugChecks.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/DebugChecks.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/DebugUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/DebugUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/DebugUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/DebugUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/DecompilerScheduler.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/DecompilerScheduler.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/DecompilerScheduler.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/DecompilerScheduler.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/EmptyBitSet.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/EmptyBitSet.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/EmptyBitSet.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/EmptyBitSet.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/EncodedValueUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/EncodedValueUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/EncodedValueUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/EncodedValueUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/ErrorsCounter.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/ErrorsCounter.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/ErrorsCounter.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/ErrorsCounter.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/GsonUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/GsonUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/GsonUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/GsonUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/ImmutableList.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/ImmutableList.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/ImmutableList.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/ImmutableList.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/InsnList.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/InsnList.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/InsnList.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/InsnList.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/InsnRemover.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/InsnRemover.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/InsnRemover.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/InsnRemover.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/InsnUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/InsnUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/InsnUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/InsnUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/ListUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/ListUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/ListUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/ListUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/RegionUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/RegionUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/RegionUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/RegionUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/StringUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/StringUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/StringUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/StringUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/Utils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/Utils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/Utils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/Utils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/android/AndroidResourcesUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/android/AndroidResourcesUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/android/AndroidResourcesUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/android/AndroidResourcesUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/android/DataInputDelegate.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/android/DataInputDelegate.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/android/DataInputDelegate.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/android/DataInputDelegate.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/android/ExtDataInput.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/android/ExtDataInput.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/android/ExtDataInput.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/android/ExtDataInput.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/android/Res9patchStreamDecoder.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/android/Res9patchStreamDecoder.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/android/Res9patchStreamDecoder.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/android/Res9patchStreamDecoder.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/android/TextResMapFile.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/android/TextResMapFile.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/android/TextResMapFile.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/android/TextResMapFile.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/exceptions/CodegenException.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/exceptions/CodegenException.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/exceptions/CodegenException.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/exceptions/CodegenException.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/exceptions/DecodeException.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/exceptions/DecodeException.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/exceptions/DecodeException.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/exceptions/DecodeException.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/exceptions/JadxArgsValidateException.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/exceptions/JadxArgsValidateException.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/exceptions/JadxArgsValidateException.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/exceptions/JadxArgsValidateException.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/exceptions/JadxException.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/exceptions/JadxException.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/exceptions/JadxException.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/exceptions/JadxException.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/exceptions/JadxOverflowException.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/exceptions/JadxOverflowException.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/exceptions/JadxOverflowException.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/exceptions/JadxOverflowException.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/exceptions/JadxRuntimeException.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/exceptions/JadxRuntimeException.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/exceptions/JadxRuntimeException.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/exceptions/JadxRuntimeException.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/files/FileUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/input/InsnDataUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/input/InsnDataUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/input/InsnDataUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/input/InsnDataUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/kotlin/KotlinMetadataUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/kotlin/KotlinMetadataUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/kotlin/KotlinMetadataUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/kotlin/KotlinMetadataUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/utils/log/LogUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/log/LogUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/utils/log/LogUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/utils/log/LogUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/CommonBinaryParser.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/CommonBinaryParser.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/CommonBinaryParser.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/CommonBinaryParser.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/IResParser.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/IResParser.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/IResParser.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/IResParser.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ManifestAttributes.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ManifestAttributes.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/ManifestAttributes.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ManifestAttributes.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ParserConstants.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ParserConstants.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/ParserConstants.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ParserConstants.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ParserStream.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ParserStream.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/ParserStream.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ParserStream.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ProtoXMLParser.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ProtoXMLParser.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/ProtoXMLParser.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ProtoXMLParser.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ResContainer.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResContainer.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/ResContainer.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResContainer.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ResDecoder.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResDecoder.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/ResDecoder.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResDecoder.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ResProtoParser.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResProtoParser.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/ResProtoParser.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResProtoParser.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ResTableParser.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResTableParser.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/ResTableParser.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResTableParser.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ResXmlGen.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResXmlGen.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/ResXmlGen.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResXmlGen.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ResourceStorage.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResourceStorage.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/ResourceStorage.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResourceStorage.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ResourcesSaver.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResourcesSaver.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/ResourcesSaver.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/ResourcesSaver.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/XMLChar.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/XMLChar.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/XMLChar.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/XMLChar.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/XmlDeobf.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/XmlDeobf.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/XmlDeobf.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/XmlDeobf.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/XmlGenUtils.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/XmlGenUtils.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/XmlGenUtils.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/XmlGenUtils.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/XmlSecurity.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/XmlSecurity.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/XmlSecurity.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/XmlSecurity.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/entry/EntryConfig.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/entry/EntryConfig.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/entry/EntryConfig.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/entry/EntryConfig.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/entry/ProtoValue.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/entry/ProtoValue.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/entry/ProtoValue.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/entry/ProtoValue.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/entry/RawNamedValue.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/entry/RawNamedValue.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/entry/RawNamedValue.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/entry/RawNamedValue.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/entry/RawValue.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/entry/RawValue.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/entry/RawValue.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/entry/RawValue.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/entry/ResourceEntry.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/entry/ResourceEntry.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/entry/ResourceEntry.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/entry/ResourceEntry.java
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/entry/ValuesParser.java b/jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/entry/ValuesParser.java
similarity index 100%
rename from jadx-core/src/main/java/jadx/core/xmlgen/entry/ValuesParser.java
rename to jadx-with-jadxecute/jadx-core/src/main/java/jadx/core/xmlgen/entry/ValuesParser.java
diff --git a/jadx-core/src/main/resources/android/attrs.xml b/jadx-with-jadxecute/jadx-core/src/main/resources/android/attrs.xml
similarity index 100%
rename from jadx-core/src/main/resources/android/attrs.xml
rename to jadx-with-jadxecute/jadx-core/src/main/resources/android/attrs.xml
diff --git a/jadx-core/src/main/resources/android/attrs_manifest.xml b/jadx-with-jadxecute/jadx-core/src/main/resources/android/attrs_manifest.xml
similarity index 100%
rename from jadx-core/src/main/resources/android/attrs_manifest.xml
rename to jadx-with-jadxecute/jadx-core/src/main/resources/android/attrs_manifest.xml
diff --git a/jadx-core/src/main/resources/android/res-map.txt b/jadx-with-jadxecute/jadx-core/src/main/resources/android/res-map.txt
similarity index 100%
rename from jadx-core/src/main/resources/android/res-map.txt
rename to jadx-with-jadxecute/jadx-core/src/main/resources/android/res-map.txt
diff --git a/jadx-core/src/main/resources/clst/core.jcst b/jadx-with-jadxecute/jadx-core/src/main/resources/clst/core.jcst
similarity index 100%
rename from jadx-core/src/main/resources/clst/core.jcst
rename to jadx-with-jadxecute/jadx-core/src/main/resources/clst/core.jcst
diff --git a/jadx-core/src/main/resources/export/app.build.gradle.tmpl b/jadx-with-jadxecute/jadx-core/src/main/resources/export/app.build.gradle.tmpl
similarity index 100%
rename from jadx-core/src/main/resources/export/app.build.gradle.tmpl
rename to jadx-with-jadxecute/jadx-core/src/main/resources/export/app.build.gradle.tmpl
diff --git a/jadx-core/src/main/resources/export/build.gradle.tmpl b/jadx-with-jadxecute/jadx-core/src/main/resources/export/build.gradle.tmpl
similarity index 100%
rename from jadx-core/src/main/resources/export/build.gradle.tmpl
rename to jadx-with-jadxecute/jadx-core/src/main/resources/export/build.gradle.tmpl
diff --git a/jadx-core/src/main/resources/export/settings.gradle.tmpl b/jadx-with-jadxecute/jadx-core/src/main/resources/export/settings.gradle.tmpl
similarity index 100%
rename from jadx-core/src/main/resources/export/settings.gradle.tmpl
rename to jadx-with-jadxecute/jadx-core/src/main/resources/export/settings.gradle.tmpl
diff --git a/jadx-core/src/main/resources/jadx/core/deobf/tld_3.txt b/jadx-with-jadxecute/jadx-core/src/main/resources/jadx/core/deobf/tld_3.txt
similarity index 100%
rename from jadx-core/src/main/resources/jadx/core/deobf/tld_3.txt
rename to jadx-with-jadxecute/jadx-core/src/main/resources/jadx/core/deobf/tld_3.txt
diff --git a/jadx-core/src/test/java/jadx/NotYetImplemented.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/NotYetImplemented.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/NotYetImplemented.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/NotYetImplemented.java
diff --git a/jadx-core/src/test/java/jadx/NotYetImplementedExtension.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/NotYetImplementedExtension.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/NotYetImplementedExtension.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/NotYetImplementedExtension.java
diff --git a/jadx-core/src/test/java/jadx/api/JadxArgsValidatorOutDirsTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/api/JadxArgsValidatorOutDirsTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/api/JadxArgsValidatorOutDirsTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/api/JadxArgsValidatorOutDirsTest.java
diff --git a/jadx-core/src/test/java/jadx/api/JadxDecompilerTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/api/JadxDecompilerTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/api/JadxDecompilerTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/api/JadxDecompilerTest.java
diff --git a/jadx-core/src/test/java/jadx/api/JadxDecompilerTestUtils.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/api/JadxDecompilerTestUtils.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/api/JadxDecompilerTestUtils.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/api/JadxDecompilerTestUtils.java
diff --git a/jadx-core/src/test/java/jadx/api/JadxInternalAccess.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/api/JadxInternalAccess.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/api/JadxInternalAccess.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/api/JadxInternalAccess.java
diff --git a/jadx-core/src/test/java/jadx/core/deobf/NameMapperTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/deobf/NameMapperTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/core/deobf/NameMapperTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/deobf/NameMapperTest.java
diff --git a/jadx-core/src/test/java/jadx/core/dex/info/AccessInfoTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/dex/info/AccessInfoTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/core/dex/info/AccessInfoTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/dex/info/AccessInfoTest.java
diff --git a/jadx-core/src/test/java/jadx/core/dex/instructions/args/ArgTypeTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/dex/instructions/args/ArgTypeTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/core/dex/instructions/args/ArgTypeTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/dex/instructions/args/ArgTypeTest.java
diff --git a/jadx-core/src/test/java/jadx/core/dex/nodes/utils/TypeUtilsTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/dex/nodes/utils/TypeUtilsTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/core/dex/nodes/utils/TypeUtilsTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/dex/nodes/utils/TypeUtilsTest.java
diff --git a/jadx-core/src/test/java/jadx/core/dex/visitors/typeinference/TypeCompareTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/dex/visitors/typeinference/TypeCompareTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/core/dex/visitors/typeinference/TypeCompareTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/dex/visitors/typeinference/TypeCompareTest.java
diff --git a/jadx-core/src/test/java/jadx/core/utils/TestBetterName.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/utils/TestBetterName.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/core/utils/TestBetterName.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/utils/TestBetterName.java
diff --git a/jadx-core/src/test/java/jadx/core/utils/TypeUtilsTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/utils/TypeUtilsTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/core/utils/TypeUtilsTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/utils/TypeUtilsTest.java
diff --git a/jadx-core/src/test/java/jadx/core/utils/log/LogUtilsTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/utils/log/LogUtilsTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/core/utils/log/LogUtilsTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/utils/log/LogUtilsTest.java
diff --git a/jadx-core/src/test/java/jadx/core/xmlgen/entry/ValuesParserTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/xmlgen/entry/ValuesParserTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/core/xmlgen/entry/ValuesParserTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/core/xmlgen/entry/ValuesParserTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/ExportGradleTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/ExportGradleTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/ExportGradleTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/ExportGradleTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/RaungTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/RaungTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/RaungTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/RaungTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/SmaliTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/SmaliTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/SmaliTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/SmaliTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/compiler/ClassFileManager.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/ClassFileManager.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/compiler/ClassFileManager.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/ClassFileManager.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/compiler/CompilerOptions.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/CompilerOptions.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/compiler/CompilerOptions.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/CompilerOptions.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/compiler/DynamicClassLoader.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/DynamicClassLoader.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/compiler/DynamicClassLoader.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/DynamicClassLoader.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/compiler/EclipseCompilerUtils.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/EclipseCompilerUtils.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/compiler/EclipseCompilerUtils.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/EclipseCompilerUtils.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/compiler/JavaClassObject.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/JavaClassObject.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/compiler/JavaClassObject.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/JavaClassObject.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/compiler/JavaUtils.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/JavaUtils.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/compiler/JavaUtils.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/JavaUtils.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/compiler/StringJavaFileObject.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/StringJavaFileObject.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/compiler/StringJavaFileObject.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/StringJavaFileObject.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/compiler/TestCompiler.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/TestCompiler.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/compiler/TestCompiler.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/compiler/TestCompiler.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/extensions/profiles/JadxTestProfilesExtension.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/extensions/profiles/JadxTestProfilesExtension.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/extensions/profiles/JadxTestProfilesExtension.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/extensions/profiles/JadxTestProfilesExtension.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/extensions/profiles/TestProfile.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/extensions/profiles/TestProfile.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/extensions/profiles/TestProfile.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/extensions/profiles/TestProfile.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/extensions/profiles/TestWithProfiles.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/extensions/profiles/TestWithProfiles.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/extensions/profiles/TestWithProfiles.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/extensions/profiles/TestWithProfiles.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/utils/CountString.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/CountString.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/utils/CountString.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/CountString.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/utils/JadxMatchers.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/JadxMatchers.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/utils/JadxMatchers.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/JadxMatchers.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/utils/TestUtils.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/TestUtils.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/utils/TestUtils.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/TestUtils.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxAssertions.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxAssertions.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxAssertions.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxAssertions.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxClassNodeAssertions.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxClassNodeAssertions.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxClassNodeAssertions.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxClassNodeAssertions.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxCodeAssertions.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxCodeAssertions.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxCodeAssertions.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxCodeAssertions.java
diff --git a/jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxCodeInfoAssertions.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxCodeInfoAssertions.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxCodeInfoAssertions.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/api/utils/assertj/JadxCodeInfoAssertions.java
diff --git a/jadx-core/src/test/java/jadx/tests/export/OptionalTargetSdkVersion.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/export/OptionalTargetSdkVersion.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/export/OptionalTargetSdkVersion.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/export/OptionalTargetSdkVersion.java
diff --git a/jadx-core/src/test/java/jadx/tests/external/BaseExternalTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/external/BaseExternalTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/external/BaseExternalTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/external/BaseExternalTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/functional/AttributeStorageTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/AttributeStorageTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/functional/AttributeStorageTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/AttributeStorageTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/functional/JadxClasspathTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/JadxClasspathTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/functional/JadxClasspathTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/JadxClasspathTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/functional/NameMapperTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/NameMapperTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/functional/NameMapperTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/NameMapperTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/functional/SignatureParserTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/SignatureParserTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/functional/SignatureParserTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/SignatureParserTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/functional/StringUtilsTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/StringUtilsTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/functional/StringUtilsTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/StringUtilsTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/functional/TemplateFileTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/TemplateFileTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/functional/TemplateFileTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/TemplateFileTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/functional/TestIfCondition.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/TestIfCondition.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/functional/TestIfCondition.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/functional/TestIfCondition.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldAccess.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldAccess.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldAccess.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldAccess.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldRestore.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldRestore.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldRestore.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldRestore.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldRestore2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldRestore2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldRestore2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldRestore2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldRestore3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldRestore3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldRestore3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/android/TestRFieldRestore3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotations2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotationsMix.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotationsMix.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotationsMix.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotationsMix.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotationsRename.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotationsRename.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotationsRename.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotationsRename.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotationsRenameDef.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotationsRenameDef.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotationsRenameDef.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/annotations/TestAnnotationsRenameDef.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/annotations/TestParamAnnotations.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/annotations/TestParamAnnotations.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/annotations/TestParamAnnotations.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/annotations/TestParamAnnotations.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestArith3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestArith4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestArith4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestArithConst.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestArithConst.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestArithConst.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestArithConst.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestArithNot.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestArithNot.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestArithNot.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestArithNot.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestFieldIncrement3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestPrimitivesNegate.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestPrimitivesNegate.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestPrimitivesNegate.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestPrimitivesNegate.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestSpecialValues2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arith/TestXor.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestXor.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arith/TestXor.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arith/TestXor.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFill4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFillConstReplace.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFillConstReplace.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFillConstReplace.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFillConstReplace.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFillWithMove.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFillWithMove.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFillWithMove.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayFillWithMove.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayInit.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayInit.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayInit.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayInit.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayInitField.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayInitField.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayInitField.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrayInitField.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestArrays4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestFillArrayData.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestFillArrayData.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestFillArrayData.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestFillArrayData.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestMultiDimArrayFill.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestMultiDimArrayFill.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestMultiDimArrayFill.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestMultiDimArrayFill.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/arrays/TestRedundantType.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestRedundantType.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/arrays/TestRedundantType.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/arrays/TestRedundantType.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBitwiseAnd.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBitwiseAnd.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestBitwiseAnd.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBitwiseAnd.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBitwiseOr.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBitwiseOr.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestBitwiseOr.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBitwiseOr.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToByte.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToByte.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToByte.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToByte.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToChar.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToChar.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToChar.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToChar.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToDouble.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToDouble.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToDouble.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToDouble.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToFloat.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToFloat.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToFloat.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToFloat.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToInt.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToInt.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToInt.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToInt.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToInt2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToInt2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToInt2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToInt2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToLong.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToLong.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToLong.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToLong.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToShort.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToShort.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToShort.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestBooleanToShort.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCast.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCast.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestCast.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCast.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestCmpOp2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestComplexIf.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestComplexIf.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestComplexIf.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestComplexIf.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestComplexIf2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestComplexIf2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestComplexIf2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestComplexIf2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditionInLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditionInLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditionInLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditionInLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions10.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions10.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions10.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions10.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions11.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions11.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions11.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions11.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions12.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions12.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions12.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions12.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions13.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions13.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions13.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions13.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions14.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions14.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions14.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions14.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions15.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions16.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions16.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions16.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions16.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions17.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions17.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions17.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions17.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions18.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions18.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions18.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions18.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions21.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions21.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions21.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions21.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions5.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions5.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions5.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions5.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions6.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions6.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions6.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions6.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions7.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions7.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions7.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions7.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions8.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions8.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions8.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions8.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions9.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions9.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions9.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestConditions9.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIf.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIf.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIf.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIf.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIfCodeStyle.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIfCodeStyle.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIfCodeStyle.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestElseIfCodeStyle.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestIfCodeStyle.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestIfCodeStyle.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestIfCodeStyle.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestIfCodeStyle.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestInnerAssign.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestInnerAssign.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestInnerAssign.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestInnerAssign.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestInnerAssign2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestInnerAssign2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestInnerAssign2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestInnerAssign2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestInnerAssign3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestInnerAssign3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestInnerAssign3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestInnerAssign3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestNestedIf2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestSimpleConditions.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestSimpleConditions.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestSimpleConditions.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestSimpleConditions.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernary4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryInIf2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryOneBranchInConstructor.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryOneBranchInConstructor.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryOneBranchInConstructor.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryOneBranchInConstructor.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryOneBranchInConstructor2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryOneBranchInConstructor2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryOneBranchInConstructor2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/conditions/TestTernaryOneBranchInConstructor2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestLineNumbers3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestReturnSourceLine.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestReturnSourceLine.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestReturnSourceLine.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestReturnSourceLine.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestVariablesNames.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestVariablesNames.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestVariablesNames.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/debuginfo/TestVariablesNames.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/deobf/TestDontRenameClspOverriddenMethod.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestDontRenameClspOverriddenMethod.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/deobf/TestDontRenameClspOverriddenMethod.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestDontRenameClspOverriddenMethod.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/deobf/TestFieldFromInnerClass.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestFieldFromInnerClass.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/deobf/TestFieldFromInnerClass.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestFieldFromInnerClass.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/deobf/TestInheritedMethodRename.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestInheritedMethodRename.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/deobf/TestInheritedMethodRename.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestInheritedMethodRename.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/deobf/TestKotlinMetadata.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestKotlinMetadata.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/deobf/TestKotlinMetadata.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestKotlinMetadata.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/deobf/TestMthRename.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestMthRename.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/deobf/TestMthRename.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestMthRename.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/deobf/TestRenameOverriddenMethod.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestRenameOverriddenMethod.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/deobf/TestRenameOverriddenMethod.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestRenameOverriddenMethod.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/deobf/TestRenameOverriddenMethod2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestRenameOverriddenMethod2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/deobf/TestRenameOverriddenMethod2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/TestRenameOverriddenMethod2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/deobf/a/TestNegativeRenameCondition.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/a/TestNegativeRenameCondition.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/deobf/a/TestNegativeRenameCondition.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/deobf/a/TestNegativeRenameCondition.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumObfuscated.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumObfuscated.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumObfuscated.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumObfuscated.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumWithConstInlining.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumWithConstInlining.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumWithConstInlining.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumWithConstInlining.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumWithFields.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumWithFields.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumWithFields.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumWithFields.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums10.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums10.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums10.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums10.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2a.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2a.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2a.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums2a.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums5.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums5.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums5.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums5.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums6.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums6.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums6.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums6.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums7.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums7.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums7.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums7.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums8.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums8.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums8.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums8.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums9.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums9.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums9.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnums9.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsInterface.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsInterface.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsInterface.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsInterface.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithAssert.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithAssert.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithAssert.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithAssert.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithConsts.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithConsts.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithConsts.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithConsts.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithCustomInit.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithCustomInit.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithCustomInit.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithCustomInit.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithStaticFields.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithStaticFields.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithStaticFields.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithStaticFields.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithTernary.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithTernary.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithTernary.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestEnumsWithTernary.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestInnerEnums.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestInnerEnums.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestInnerEnums.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestInnerEnums.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/enums/TestSwitchOverEnum2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/fallback/TestFallbackManyNops.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/fallback/TestFallbackManyNops.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/fallback/TestFallbackManyNops.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/fallback/TestFallbackManyNops.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/fallback/TestFallbackMode.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/fallback/TestFallbackMode.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/fallback/TestFallbackMode.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/fallback/TestFallbackMode.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/MissingGenericsTypesTest.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/MissingGenericsTypesTest.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/MissingGenericsTypesTest.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/MissingGenericsTypesTest.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestClassSignature.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestClassSignature.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestClassSignature.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestClassSignature.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestConstructorGenerics.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestConstructorGenerics.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestConstructorGenerics.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestConstructorGenerics.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGeneric8.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGeneric8.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestGeneric8.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGeneric8.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenericFields.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenericFields.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestGenericFields.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenericFields.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics6.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics6.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics6.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics6.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics7.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics7.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics7.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics7.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics8.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics8.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics8.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenerics8.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenericsInArgs.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenericsInArgs.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestGenericsInArgs.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenericsInArgs.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenericsMthOverride.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenericsMthOverride.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestGenericsMthOverride.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestGenericsMthOverride.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestImportGenericMap.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestImportGenericMap.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestImportGenericMap.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestImportGenericMap.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestMethodOverride.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestMethodOverride.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestMethodOverride.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestMethodOverride.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestOuterGeneric.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestOuterGeneric.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestOuterGeneric.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestOuterGeneric.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestSyntheticOverride.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestSyntheticOverride.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestSyntheticOverride.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestSyntheticOverride.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestTypeVarsFromOuterClass.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestTypeVarsFromOuterClass.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestTypeVarsFromOuterClass.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestTypeVarsFromOuterClass.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/generics/TestTypeVarsFromSuperClass.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestTypeVarsFromSuperClass.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/generics/TestTypeVarsFromSuperClass.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/generics/TestTypeVarsFromSuperClass.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestConstInline.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestConstInline.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestConstInline.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestConstInline.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestGetterInlineNegative.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestGetterInlineNegative.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestGetterInlineNegative.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestGetterInlineNegative.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestInline.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestInline2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestInline3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline6.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline6.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestInline6.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline6.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline7.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline7.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestInline7.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestInline7.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestIssue86.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestIssue86.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestIssue86.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestIssue86.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestMethodInline.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestMethodInline.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestMethodInline.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestMethodInline.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestOverlapSyntheticMethods.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestOverlapSyntheticMethods.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestOverlapSyntheticMethods.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestOverlapSyntheticMethods.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestOverrideBridgeMerge.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestOverrideBridgeMerge.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestOverrideBridgeMerge.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestOverrideBridgeMerge.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticBridgeRename.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticBridgeRename.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticBridgeRename.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticBridgeRename.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticInline3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inline/TestTernaryCast.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestTernaryCast.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inline/TestTernaryCast.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inline/TestTernaryCast.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass10.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass10.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass10.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass10.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass11.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass11.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass11.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass11.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass12.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass12.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass12.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass12.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass13.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass13.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass13.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass13.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass14.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass14.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass14.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass14.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass15.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass15.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass15.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass15.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass16.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass16.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass16.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass16.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass17.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass17.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass17.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass17.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass18.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass18.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass18.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass18.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass19.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass19.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass19.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass19.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass20.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass20.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass20.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass20.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3a.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3a.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3a.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass3a.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass5.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass5.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass5.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass5.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass6.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass6.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass6.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass6.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass7.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass7.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass7.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass7.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass8.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass8.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass8.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass8.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass9.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass9.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass9.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestAnonymousClass9.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestIncorrectAnonymousClass.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestIncorrectAnonymousClass.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestIncorrectAnonymousClass.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestIncorrectAnonymousClass.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInner2Samples.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInner2Samples.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestInner2Samples.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInner2Samples.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass5.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass5.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass5.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClass5.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClassFakeSyntheticConstructor.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClassFakeSyntheticConstructor.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClassFakeSyntheticConstructor.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClassFakeSyntheticConstructor.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClassSyntheticConstructor.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClassSyntheticConstructor.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClassSyntheticConstructor.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClassSyntheticConstructor.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClassSyntheticRename.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClassSyntheticRename.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClassSyntheticRename.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestInnerClassSyntheticRename.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestNestedAnonymousClass.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestNestedAnonymousClass.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestNestedAnonymousClass.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestNestedAnonymousClass.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestOuterConstructorCall.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestOuterConstructorCall.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestOuterConstructorCall.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestOuterConstructorCall.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestReplaceConstsInAnnotations.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestReplaceConstsInAnnotations.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestReplaceConstsInAnnotations.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestReplaceConstsInAnnotations.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestReplaceConstsInAnnotations2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestReplaceConstsInAnnotations2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestReplaceConstsInAnnotations2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestReplaceConstsInAnnotations2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/inner/TestSyntheticMthRename.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestSyntheticMthRename.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/inner/TestSyntheticMthRename.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/inner/TestSyntheticMthRename.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedAccessor.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedAccessor.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedAccessor.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedAccessor.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestCastInOverloadedInvoke4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestConstructorWithMoves.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestConstructorWithMoves.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestConstructorWithMoves.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestConstructorWithMoves.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestHierarchyOverloadedInvoke.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestHierarchyOverloadedInvoke.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestHierarchyOverloadedInvoke.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestHierarchyOverloadedInvoke.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInheritedStaticInvoke.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInheritedStaticInvoke.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestInheritedStaticInvoke.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInheritedStaticInvoke.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvoke1.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvoke1.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvoke1.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvoke1.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvokeInCatch.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvokeInCatch.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvokeInCatch.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvokeInCatch.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvokeWithWideVars.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvokeWithWideVars.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvokeWithWideVars.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestInvokeWithWideVars.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestOverloadedInvoke.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestOverloadedInvoke.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestOverloadedInvoke.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestOverloadedInvoke.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestOverloadedMethodInvoke.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestOverloadedMethodInvoke.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestOverloadedMethodInvoke.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestOverloadedMethodInvoke.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestPolymorphicInvoke.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestPolymorphicInvoke.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestPolymorphicInvoke.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestPolymorphicInvoke.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestPolymorphicRangeInvoke.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestPolymorphicRangeInvoke.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestPolymorphicRangeInvoke.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestPolymorphicRangeInvoke.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestRawCustomInvoke.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestRawCustomInvoke.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestRawCustomInvoke.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestRawCustomInvoke.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvoke.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvoke.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvoke.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvoke.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvoke2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvoke2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvoke2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvoke2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvokeUnknown.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvokeUnknown.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvokeUnknown.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvokeUnknown.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvokeWithGenerics.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvokeWithGenerics.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvokeWithGenerics.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestSuperInvokeWithGenerics.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestVarArg.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestVarArg.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestVarArg.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestVarArg.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/invoke/TestVarArg2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestVarArg2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/invoke/TestVarArg2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/invoke/TestVarArg2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaConstructor.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaConstructor.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaConstructor.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaConstructor.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaExtVar.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaExtVar.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaExtVar.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaExtVar.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaInArray.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaInArray.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaInArray.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaInArray.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaInstance.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaInstance.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaInstance.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaInstance.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaResugar.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaResugar.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaResugar.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaResugar.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaStatic.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaStatic.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaStatic.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/java8/TestLambdaStatic.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEach3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestArrayForEachNegative.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInComplexIf.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInComplexIf.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInComplexIf.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInComplexIf.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInComplexIf2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInComplexIf2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInComplexIf2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInComplexIf2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakInLoop3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakWithLabel.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakWithLabel.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakWithLabel.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestBreakWithLabel.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestComplexWhileLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestComplexWhileLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestComplexWhileLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestComplexWhileLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestContinueInLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestContinueInLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestContinueInLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestContinueInLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestEndlessLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestEndlessLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestEndlessLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestEndlessLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestEndlessLoop2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestEndlessLoop2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestEndlessLoop2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestEndlessLoop2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIfInLoop2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIfInLoop2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestIfInLoop2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIfInLoop2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIfInLoop3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIfInLoop3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestIfInLoop3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIfInLoop3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexForLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexedLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexedLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexedLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIndexedLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestIterableForEach3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition5.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition5.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition5.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopCondition5.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopConditionInvoke.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection5.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection5.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection5.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopDetection5.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopRestore.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopRestore.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopRestore.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestLoopRestore.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestMultiEntryLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestMultiEntryLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestMultiEntryLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestMultiEntryLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops5.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops5.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops5.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestNestedLoops5.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestNotIndexedLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestNotIndexedLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestNotIndexedLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestNotIndexedLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestSequentialLoops2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestSynchronizedInEndlessLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestSynchronizedInEndlessLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestSynchronizedInEndlessLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestSynchronizedInEndlessLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestTryCatchInLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestTryCatchInLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestTryCatchInLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestTryCatchInLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/loops/TestTryCatchInLoop2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestTryCatchInLoop2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/loops/TestTryCatchInLoop2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/loops/TestTryCatchInLoop2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestCaseSensitiveChecks.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestCaseSensitiveChecks.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestCaseSensitiveChecks.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestCaseSensitiveChecks.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestClassNameWithInvalidChar.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestClassNameWithInvalidChar.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestClassNameWithInvalidChar.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestClassNameWithInvalidChar.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestClassNamesCollision.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestClassNamesCollision.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestClassNamesCollision.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestClassNamesCollision.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestClassNamesCollision2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestClassNamesCollision2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestClassNamesCollision2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestClassNamesCollision2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestCollisionWithJavaLangClasses.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestCollisionWithJavaLangClasses.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestCollisionWithJavaLangClasses.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestCollisionWithJavaLangClasses.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestConstructorArgNames.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestConstructorArgNames.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestConstructorArgNames.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestConstructorArgNames.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestDuplicateVarNames.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestDuplicateVarNames.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestDuplicateVarNames.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestDuplicateVarNames.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestDuplicatedNames.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestDuplicatedNames.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestDuplicatedNames.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestDuplicatedNames.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestFieldCollideWithPackage.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestFieldCollideWithPackage.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestFieldCollideWithPackage.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestFieldCollideWithPackage.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestLocalVarCollideWithPackage.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestLocalVarCollideWithPackage.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestLocalVarCollideWithPackage.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestLocalVarCollideWithPackage.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestNameAssign2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestNameAssign2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestNameAssign2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestNameAssign2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestReservedClassNames.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestReservedClassNames.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestReservedClassNames.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestReservedClassNames.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestReservedNames.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestReservedNames.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestReservedNames.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestReservedNames.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestReservedPackageNames.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestReservedPackageNames.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestReservedPackageNames.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestReservedPackageNames.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/TestSameMethodsNames.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestSameMethodsNames.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/TestSameMethodsNames.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/TestSameMethodsNames.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/pkg/a.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/pkg/a.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/pkg/a.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/pkg/a.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/pkg/b.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/pkg/b.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/pkg/b.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/pkg/b.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/pkg2/System.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/pkg2/System.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/pkg2/System.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/pkg2/System.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/names/pkg2/TestCls.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/pkg2/TestCls.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/names/pkg2/TestCls.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/names/pkg2/TestCls.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestAllNops.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestAllNops.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestAllNops.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestAllNops.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestArgInline.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestArgInline.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestArgInline.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestArgInline.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestBadMethodAccessModifiers.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestBadMethodAccessModifiers.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestBadMethodAccessModifiers.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestBadMethodAccessModifiers.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestCastOfNull.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCastOfNull.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestCastOfNull.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCastOfNull.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestClassGen.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestClassGen.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestClassGen.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestClassGen.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestClassReGen.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestClassReGen.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestClassReGen.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestClassReGen.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeComments.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeComments.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestCodeComments.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeComments.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeComments2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeComments2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestCodeComments2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeComments2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeComments2a.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeComments2a.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestCodeComments2a.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeComments2a.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeCommentsMultiline.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeCommentsMultiline.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestCodeCommentsMultiline.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeCommentsMultiline.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeCommentsOverride.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeCommentsOverride.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestCodeCommentsOverride.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeCommentsOverride.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeMetadata.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeMetadata.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestCodeMetadata.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeMetadata.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeMetadata2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeMetadata2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestCodeMetadata2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestCodeMetadata2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestConstReplace.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestConstReplace.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestConstReplace.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestConstReplace.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestConstStringConcat.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestConstStringConcat.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestConstStringConcat.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestConstStringConcat.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestConstructor.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestConstructor.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestConstructor.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestConstructor.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestConstructorBranched.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestConstructorBranched.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestConstructorBranched.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestConstructorBranched.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestDeadBlockReferencesStart.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDeadBlockReferencesStart.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestDeadBlockReferencesStart.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDeadBlockReferencesStart.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDeboxing4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestDefConstructorNotRemoved.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDefConstructorNotRemoved.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestDefConstructorNotRemoved.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDefConstructorNotRemoved.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestDuplicateCast.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDuplicateCast.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestDuplicateCast.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestDuplicateCast.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestExplicitOverride.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestExplicitOverride.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestExplicitOverride.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestExplicitOverride.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitInTryCatch.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitInTryCatch.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitInTryCatch.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitInTryCatch.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitNegative.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitNegative.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitNegative.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitNegative.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitOrder.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitOrder.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitOrder.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitOrder.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitOrder2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitOrder2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitOrder2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitOrder2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitOrderStatic.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitOrderStatic.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitOrderStatic.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitOrderStatic.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestFixClassAccessModifiers.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFixClassAccessModifiers.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestFixClassAccessModifiers.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFixClassAccessModifiers.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestFloatValue.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFloatValue.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestFloatValue.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestFloatValue.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestIfInTry.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestIfTryInCatch.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIncorrectMethodSignature.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestIncorrectMethodSignature.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestIncorrectMethodSignature.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestIncorrectMethodSignature.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestInlineVarArg.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestInlineVarArg.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestInlineVarArg.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestInlineVarArg.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestInsnsBeforeSuper.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestInsnsBeforeSuper.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestInsnsBeforeSuper.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestInsnsBeforeSuper.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestInsnsBeforeSuper2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestInsnsBeforeSuper2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestInsnsBeforeSuper2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestInsnsBeforeSuper2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestInsnsBeforeThis.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestInsnsBeforeThis.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestInsnsBeforeThis.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestInsnsBeforeThis.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestInterfaceDefaultMethod.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestInterfaceDefaultMethod.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestInterfaceDefaultMethod.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestInterfaceDefaultMethod.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13b.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestJavaDupInsn.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestJavaDupInsn.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestJavaDupInsn.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestJavaDupInsn.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestJavaSwap.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestJavaSwap.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestJavaSwap.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestJavaSwap.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestJsonOutput.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestJsonOutput.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestJsonOutput.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestJsonOutput.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestLoopInTry.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestMethodParametersAttribute.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestMethodParametersAttribute.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestMethodParametersAttribute.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestMethodParametersAttribute.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestMoveInline.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestMoveInline.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestMoveInline.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestMoveInline.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestMultipleNOPs.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestMultipleNOPs.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestMultipleNOPs.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestMultipleNOPs.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestN21.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestN21.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestN21.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestN21.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestOverridePackagePrivateMethod.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestOverridePackagePrivateMethod.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestOverridePackagePrivateMethod.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestOverridePackagePrivateMethod.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestOverridePrivateMethod.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestOverridePrivateMethod.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestOverridePrivateMethod.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestOverridePrivateMethod.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideStaticMethod.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideStaticMethod.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideStaticMethod.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideStaticMethod.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideWithSameName.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideWithSameName.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideWithSameName.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideWithSameName.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideWithTwoBases.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideWithTwoBases.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideWithTwoBases.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideWithTwoBases.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideWithTwoBases2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideWithTwoBases2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideWithTwoBases2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestOverrideWithTwoBases2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestPrimitiveCasts.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestPrimitiveCasts.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestPrimitiveCasts.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestPrimitiveCasts.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestRedundantBrackets.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestRedundantBrackets.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestRedundantBrackets.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestRedundantBrackets.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestRedundantReturn.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestRedundantReturn.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestRedundantReturn.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestRedundantReturn.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestReturnWrapping.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestReturnWrapping.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestReturnWrapping.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestReturnWrapping.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestShadowingSuperMember.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestShadowingSuperMember.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestShadowingSuperMember.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestShadowingSuperMember.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestStaticFieldsInit.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStaticFieldsInit.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestStaticFieldsInit.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStaticFieldsInit.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestStaticMethod.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStaticMethod.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestStaticMethod.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStaticMethod.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination4Neg.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination4Neg.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination4Neg.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringBuilderElimination4Neg.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestStringConcatJava11.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringConcatJava11.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestStringConcatJava11.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringConcatJava11.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestStringConcatWithoutResult.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringConcatWithoutResult.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestStringConcatWithoutResult.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringConcatWithoutResult.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestStringConstructor.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringConstructor.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestStringConstructor.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestStringConstructor.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestSyntheticConstructor.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestSyntheticConstructor.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestSyntheticConstructor.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestSyntheticConstructor.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestWrongCode.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestWrongCode.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestWrongCode.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestWrongCode.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestWrongCode2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestWrongCode2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/others/TestWrongCode2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/others/TestWrongCode2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/rename/TestAnonymousInline.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/rename/TestAnonymousInline.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/rename/TestAnonymousInline.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/rename/TestAnonymousInline.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/rename/TestConstReplace.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/rename/TestConstReplace.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/rename/TestConstReplace.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/rename/TestConstReplace.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/rename/TestFieldWithGenericRename.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/rename/TestFieldWithGenericRename.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/rename/TestFieldWithGenericRename.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/rename/TestFieldWithGenericRename.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/rename/TestRenameEnum.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/rename/TestRenameEnum.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/rename/TestRenameEnum.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/rename/TestRenameEnum.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/rename/TestUserRenames.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/rename/TestUserRenames.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/rename/TestUserRenames.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/rename/TestUserRenames.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchBreak.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchBreak.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchBreak.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchBreak.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchContinue.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchContinue.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchContinue.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchContinue.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchFallThrough.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchFallThrough.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchFallThrough.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchFallThrough.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchInLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchInLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchInLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchInLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchInLoop2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchInLoop2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchInLoop2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchInLoop2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchLabels.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchNoDefault.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchNoDefault.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchNoDefault.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchNoDefault.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchReturnFromCase.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchReturnFromCase.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchReturnFromCase.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchReturnFromCase.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchReturnFromCase2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchReturnFromCase2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchReturnFromCase2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchReturnFromCase2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchSimple.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchSimple.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchSimple.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchSimple.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithFallThroughCase.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithFallThroughCase.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithFallThroughCase.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithFallThroughCase.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithFallThroughCase2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithFallThroughCase2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithFallThroughCase2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithFallThroughCase2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithThrow.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithThrow.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithThrow.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithThrow.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithTryCatch.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithTryCatch.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithTryCatch.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchWithTryCatch.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestNestedSynchronize.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestNestedSynchronize.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/synchronize/TestNestedSynchronize.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestNestedSynchronize.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized5.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized5.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized5.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized5.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized6.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized6.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized6.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized6.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestEmptyCatch.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestEmptyCatch.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestEmptyCatch.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestEmptyCatch.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestEmptyFinally.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestEmptyFinally.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestEmptyFinally.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestEmptyFinally.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinally.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinally.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinally.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinally.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinally2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinally2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinally2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinally2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinally3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinally3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinally3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinally3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinallyExtract.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinallyExtract.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinallyExtract.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestFinallyExtract.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestInlineInCatch.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestInlineInCatch.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestInlineInCatch.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestInlineInCatch.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestLoopInTryCatch.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestLoopInTryCatch.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestLoopInTryCatch.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestLoopInTryCatch.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestMultiExceptionCatch.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestMultiExceptionCatch.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestMultiExceptionCatch.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestMultiExceptionCatch.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestMultiExceptionCatch2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestMultiExceptionCatch2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestMultiExceptionCatch2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestMultiExceptionCatch2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestMultiExceptionCatchSameJump.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestMultiExceptionCatchSameJump.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestMultiExceptionCatchSameJump.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestMultiExceptionCatchSameJump.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestNestedTryCatch4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryAfterDeclaration.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryAfterDeclaration.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryAfterDeclaration.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryAfterDeclaration.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch6.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch6.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch6.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch6.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch7.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch7.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch7.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch7.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch8.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch8.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch8.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch8.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch9.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch9.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch9.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatch9.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally10.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally10.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally10.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally10.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally11.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally11.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally11.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally11.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally12.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally12.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally12.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally12.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally13.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally13.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally13.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally13.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally14.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally14.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally14.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally14.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally15.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally15.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally15.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally15.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally5.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally5.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally5.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally5.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally6.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally6.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally6.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally6.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally7.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally7.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally7.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally7.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally8.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally8.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally8.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally8.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally9.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally9.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally9.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchFinally9.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchInIf.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchInIf.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchInIf.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchInIf.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchLastInsn.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchLastInsn.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchLastInsn.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchLastInsn.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchMultiException.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchMultiException.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchMultiException.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchMultiException.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchMultiException2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchMultiException2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchMultiException2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchMultiException2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchNoMoveExc.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchNoMoveExc.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchNoMoveExc.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchNoMoveExc.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchNoMoveExc2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchNoMoveExc2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchNoMoveExc2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchNoMoveExc2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchStartOnMove.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchStartOnMove.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchStartOnMove.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchStartOnMove.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithEmptyCatch.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithEmptyCatch.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithEmptyCatch.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithEmptyCatch.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithEmptyCatchTriple.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithEmptyCatchTriple.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithEmptyCatchTriple.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithEmptyCatchTriple.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithResources.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithResources.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithResources.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithResources.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestArrayTypes.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestArrayTypes.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestArrayTypes.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestArrayTypes.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestConstInline.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestConstInline.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestConstInline.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestConstInline.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestConstTypeInference.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestConstTypeInference.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestConstTypeInference.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestConstTypeInference.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestFieldAccess.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestFieldAccess.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestFieldAccess.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestFieldAccess.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestFieldCast.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestFieldCast.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestFieldCast.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestFieldCast.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics5.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics5.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics5.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics5.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics6.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics6.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics6.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics6.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics7.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics7.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics7.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenerics7.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestGenericsInFullInnerCls.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenericsInFullInnerCls.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestGenericsInFullInnerCls.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestGenericsInFullInnerCls.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitiveConversion.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitiveConversion.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitiveConversion.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitiveConversion.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitiveConversion2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitiveConversion2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitiveConversion2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitiveConversion2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitivesInIf.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitivesInIf.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitivesInIf.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestPrimitivesInIf.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeInheritance.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeInheritance.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeInheritance.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeInheritance.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver10.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver10.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver10.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver10.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver11.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver11.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver11.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver11.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver12.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver12.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver12.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver12.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver13.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver13.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver13.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver13.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver14.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver14.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver14.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver14.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver15.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver15.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver15.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver15.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver16.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver16.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver16.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver16.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver17.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver17.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver17.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver17.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver18.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver18.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver18.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver18.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver19.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver19.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver19.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver19.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver20.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver20.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver20.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver20.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver21.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver21.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver21.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver21.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver22.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver22.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver22.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver22.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver23.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver23.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver23.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver23.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver5.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver5.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver5.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver5.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6a.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6a.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6a.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver6a.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver7.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver7.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver7.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver7.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver8.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver8.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver8.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver8.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver9.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver9.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver9.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver9.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestDontInlineThis.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/usethis/TestDontInlineThis.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/usethis/TestDontInlineThis.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/usethis/TestDontInlineThis.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/usethis/TestInlineThis2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/usethis/TestRedundantThis.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/usethis/TestRedundantThis.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/usethis/TestRedundantThis.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/usethis/TestRedundantThis.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables3.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables3.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables3.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables3.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables4.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables5.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables5.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables5.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables5.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables6.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables6.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables6.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariables6.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDeclAnnotation.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDeclAnnotation.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDeclAnnotation.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDeclAnnotation.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions2.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions2.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions2.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesDefinitions2.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesGeneric.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesGeneric.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesGeneric.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesGeneric.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesIfElseChain.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesIfElseChain.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesIfElseChain.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesIfElseChain.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesInInlinedAssign.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesInInlinedAssign.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesInInlinedAssign.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesInInlinedAssign.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesInLoop.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesInLoop.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesInLoop.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesInLoop.java
diff --git a/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesUsageWithLoops.java b/jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesUsageWithLoops.java
similarity index 100%
rename from jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesUsageWithLoops.java
rename to jadx-with-jadxecute/jadx-core/src/test/java/jadx/tests/integration/variables/TestVariablesUsageWithLoops.java
diff --git a/jadx-core/src/test/manifest/OptionalTargetSdkVersion.xml b/jadx-with-jadxecute/jadx-core/src/test/manifest/OptionalTargetSdkVersion.xml
similarity index 100%
rename from jadx-core/src/test/manifest/OptionalTargetSdkVersion.xml
rename to jadx-with-jadxecute/jadx-core/src/test/manifest/OptionalTargetSdkVersion.xml
diff --git a/jadx-core/src/test/manifest/strings.xml b/jadx-with-jadxecute/jadx-core/src/test/manifest/strings.xml
similarity index 100%
rename from jadx-core/src/test/manifest/strings.xml
rename to jadx-with-jadxecute/jadx-core/src/test/manifest/strings.xml
diff --git a/jadx-core/src/test/raung/others/TestJavaSwap.raung b/jadx-with-jadxecute/jadx-core/src/test/raung/others/TestJavaSwap.raung
similarity index 100%
rename from jadx-core/src/test/raung/others/TestJavaSwap.raung
rename to jadx-with-jadxecute/jadx-core/src/test/raung/others/TestJavaSwap.raung
diff --git a/jadx-core/src/test/raung/others/TestStringConcatJava11.raung b/jadx-with-jadxecute/jadx-core/src/test/raung/others/TestStringConcatJava11.raung
similarity index 100%
rename from jadx-core/src/test/raung/others/TestStringConcatJava11.raung
rename to jadx-with-jadxecute/jadx-core/src/test/raung/others/TestStringConcatJava11.raung
diff --git a/jadx-core/src/test/resources/logback.xml b/jadx-with-jadxecute/jadx-core/src/test/resources/logback.xml
similarity index 100%
rename from jadx-core/src/test/resources/logback.xml
rename to jadx-with-jadxecute/jadx-core/src/test/resources/logback.xml
diff --git a/jadx-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/jadx-with-jadxecute/jadx-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
similarity index 100%
rename from jadx-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
rename to jadx-with-jadxecute/jadx-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/jadx-core/src/test/resources/test-samples/app-with-fake-dex.apk b/jadx-with-jadxecute/jadx-core/src/test/resources/test-samples/app-with-fake-dex.apk
similarity index 100%
rename from jadx-core/src/test/resources/test-samples/app-with-fake-dex.apk
rename to jadx-with-jadxecute/jadx-core/src/test/resources/test-samples/app-with-fake-dex.apk
diff --git a/jadx-core/src/test/resources/test-samples/hello.dex b/jadx-with-jadxecute/jadx-core/src/test/resources/test-samples/hello.dex
similarity index 100%
rename from jadx-core/src/test/resources/test-samples/hello.dex
rename to jadx-with-jadxecute/jadx-core/src/test/resources/test-samples/hello.dex
diff --git a/jadx-core/src/test/smali/arith/TestArithConst.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/arith/TestArithConst.smali
similarity index 100%
rename from jadx-core/src/test/smali/arith/TestArithConst.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/arith/TestArithConst.smali
diff --git a/jadx-core/src/test/smali/arith/TestArithNot.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/arith/TestArithNot.smali
similarity index 100%
rename from jadx-core/src/test/smali/arith/TestArithNot.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/arith/TestArithNot.smali
diff --git a/jadx-core/src/test/smali/arith/TestXor.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/arith/TestXor.smali
similarity index 100%
rename from jadx-core/src/test/smali/arith/TestXor.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/arith/TestXor.smali
diff --git a/jadx-core/src/test/smali/arrays/TestArrayFillWithMove/TestCls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/arrays/TestArrayFillWithMove/TestCls.smali
similarity index 100%
rename from jadx-core/src/test/smali/arrays/TestArrayFillWithMove/TestCls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/arrays/TestArrayFillWithMove/TestCls.smali
diff --git a/jadx-core/src/test/smali/arrays/TestFillArrayData/TestCls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/arrays/TestFillArrayData/TestCls.smali
similarity index 100%
rename from jadx-core/src/test/smali/arrays/TestFillArrayData/TestCls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/arrays/TestFillArrayData/TestCls.smali
diff --git a/jadx-core/src/test/smali/conditions/TestBooleanToByte.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToByte.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestBooleanToByte.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToByte.smali
diff --git a/jadx-core/src/test/smali/conditions/TestBooleanToChar.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToChar.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestBooleanToChar.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToChar.smali
diff --git a/jadx-core/src/test/smali/conditions/TestBooleanToDouble.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToDouble.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestBooleanToDouble.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToDouble.smali
diff --git a/jadx-core/src/test/smali/conditions/TestBooleanToFloat.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToFloat.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestBooleanToFloat.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToFloat.smali
diff --git a/jadx-core/src/test/smali/conditions/TestBooleanToInt.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToInt.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestBooleanToInt.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToInt.smali
diff --git a/jadx-core/src/test/smali/conditions/TestBooleanToInt2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToInt2.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestBooleanToInt2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToInt2.smali
diff --git a/jadx-core/src/test/smali/conditions/TestBooleanToLong.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToLong.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestBooleanToLong.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToLong.smali
diff --git a/jadx-core/src/test/smali/conditions/TestBooleanToShort.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToShort.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestBooleanToShort.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestBooleanToShort.smali
diff --git a/jadx-core/src/test/smali/conditions/TestComplexIf.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestComplexIf.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestComplexIf.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestComplexIf.smali
diff --git a/jadx-core/src/test/smali/conditions/TestComplexIf2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestComplexIf2.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestComplexIf2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestComplexIf2.smali
diff --git a/jadx-core/src/test/smali/conditions/TestConditions18.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestConditions18.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestConditions18.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestConditions18.smali
diff --git a/jadx-core/src/test/smali/conditions/TestConditions21.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestConditions21.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestConditions21.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestConditions21.smali
diff --git a/jadx-core/src/test/smali/conditions/TestIfCodeStyle.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestIfCodeStyle.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestIfCodeStyle.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestIfCodeStyle.smali
diff --git a/jadx-core/src/test/smali/conditions/TestInnerAssign3.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestInnerAssign3.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestInnerAssign3.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestInnerAssign3.smali
diff --git a/jadx-core/src/test/smali/conditions/TestTernary4.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestTernary4.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestTernary4.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestTernary4.smali
diff --git a/jadx-core/src/test/smali/conditions/TestTernaryInIf2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestTernaryInIf2.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestTernaryInIf2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestTernaryInIf2.smali
diff --git a/jadx-core/src/test/smali/conditions/TestTernaryOneBranchInConstructor2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestTernaryOneBranchInConstructor2.smali
similarity index 100%
rename from jadx-core/src/test/smali/conditions/TestTernaryOneBranchInConstructor2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/conditions/TestTernaryOneBranchInConstructor2.smali
diff --git a/jadx-core/src/test/smali/debuginfo/TestVariablesNames.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/debuginfo/TestVariablesNames.smali
similarity index 100%
rename from jadx-core/src/test/smali/debuginfo/TestVariablesNames.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/debuginfo/TestVariablesNames.smali
diff --git a/jadx-core/src/test/smali/deobf/TestKotlinMetadata.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/deobf/TestKotlinMetadata.smali
similarity index 100%
rename from jadx-core/src/test/smali/deobf/TestKotlinMetadata.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/deobf/TestKotlinMetadata.smali
diff --git a/jadx-core/src/test/smali/enums/TestEnumObfuscated.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/enums/TestEnumObfuscated.smali
similarity index 100%
rename from jadx-core/src/test/smali/enums/TestEnumObfuscated.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/enums/TestEnumObfuscated.smali
diff --git a/jadx-core/src/test/smali/enums/TestEnumWithFields.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/enums/TestEnumWithFields.smali
similarity index 100%
rename from jadx-core/src/test/smali/enums/TestEnumWithFields.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/enums/TestEnumWithFields.smali
diff --git a/jadx-core/src/test/smali/enums/TestEnums10.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/enums/TestEnums10.smali
similarity index 100%
rename from jadx-core/src/test/smali/enums/TestEnums10.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/enums/TestEnums10.smali
diff --git a/jadx-core/src/test/smali/enums/TestEnums5.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/enums/TestEnums5.smali
similarity index 100%
rename from jadx-core/src/test/smali/enums/TestEnums5.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/enums/TestEnums5.smali
diff --git a/jadx-core/src/test/smali/enums/TestEnums8.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/enums/TestEnums8.smali
similarity index 100%
rename from jadx-core/src/test/smali/enums/TestEnums8.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/enums/TestEnums8.smali
diff --git a/jadx-core/src/test/smali/enums/TestEnumsWithStaticFields.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/enums/TestEnumsWithStaticFields.smali
similarity index 100%
rename from jadx-core/src/test/smali/enums/TestEnumsWithStaticFields.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/enums/TestEnumsWithStaticFields.smali
diff --git a/jadx-core/src/test/smali/fallback/TestFallbackManyNops.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/fallback/TestFallbackManyNops.smali
similarity index 100%
rename from jadx-core/src/test/smali/fallback/TestFallbackManyNops.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/fallback/TestFallbackManyNops.smali
diff --git a/jadx-core/src/test/smali/generics/MissingGenericsTypesTest.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/generics/MissingGenericsTypesTest.smali
similarity index 100%
rename from jadx-core/src/test/smali/generics/MissingGenericsTypesTest.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/generics/MissingGenericsTypesTest.smali
diff --git a/jadx-core/src/test/smali/generics/TestClassSignature.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/generics/TestClassSignature.smali
similarity index 100%
rename from jadx-core/src/test/smali/generics/TestClassSignature.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/generics/TestClassSignature.smali
diff --git a/jadx-core/src/test/smali/generics/TestMethodOverride.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/generics/TestMethodOverride.smali
similarity index 100%
rename from jadx-core/src/test/smali/generics/TestMethodOverride.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/generics/TestMethodOverride.smali
diff --git a/jadx-core/src/test/smali/generics/TestSyntheticOverride/KotlinFunction1.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/generics/TestSyntheticOverride/KotlinFunction1.smali
similarity index 100%
rename from jadx-core/src/test/smali/generics/TestSyntheticOverride/KotlinFunction1.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/generics/TestSyntheticOverride/KotlinFunction1.smali
diff --git a/jadx-core/src/test/smali/generics/TestSyntheticOverride/TestSyntheticOverride.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/generics/TestSyntheticOverride/TestSyntheticOverride.smali
similarity index 100%
rename from jadx-core/src/test/smali/generics/TestSyntheticOverride/TestSyntheticOverride.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/generics/TestSyntheticOverride/TestSyntheticOverride.smali
diff --git a/jadx-core/src/test/smali/inline/TestGetterInlineNegative.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestGetterInlineNegative.smali
similarity index 100%
rename from jadx-core/src/test/smali/inline/TestGetterInlineNegative.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestGetterInlineNegative.smali
diff --git a/jadx-core/src/test/smali/inline/TestInline7.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestInline7.smali
similarity index 100%
rename from jadx-core/src/test/smali/inline/TestInline7.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestInline7.smali
diff --git a/jadx-core/src/test/smali/inline/TestMethodInline/A.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestMethodInline/A.smali
similarity index 100%
rename from jadx-core/src/test/smali/inline/TestMethodInline/A.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestMethodInline/A.smali
diff --git a/jadx-core/src/test/smali/inline/TestMethodInline/B.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestMethodInline/B.smali
similarity index 100%
rename from jadx-core/src/test/smali/inline/TestMethodInline/B.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestMethodInline/B.smali
diff --git a/jadx-core/src/test/smali/inline/TestMethodInline/C.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestMethodInline/C.smali
similarity index 100%
rename from jadx-core/src/test/smali/inline/TestMethodInline/C.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestMethodInline/C.smali
diff --git a/jadx-core/src/test/smali/inline/TestOverlapSyntheticMethods.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestOverlapSyntheticMethods.smali
similarity index 100%
rename from jadx-core/src/test/smali/inline/TestOverlapSyntheticMethods.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestOverlapSyntheticMethods.smali
diff --git a/jadx-core/src/test/smali/inline/TestOverrideBridgeMerge.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestOverrideBridgeMerge.smali
similarity index 100%
rename from jadx-core/src/test/smali/inline/TestOverrideBridgeMerge.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestOverrideBridgeMerge.smali
diff --git a/jadx-core/src/test/smali/inline/TestSyntheticInline3/KotlinFunction1.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestSyntheticInline3/KotlinFunction1.smali
similarity index 100%
rename from jadx-core/src/test/smali/inline/TestSyntheticInline3/KotlinFunction1.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestSyntheticInline3/KotlinFunction1.smali
diff --git a/jadx-core/src/test/smali/inline/TestSyntheticInline3/TestSyntheticInline3$onCreate$1.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestSyntheticInline3/TestSyntheticInline3$onCreate$1.smali
similarity index 100%
rename from jadx-core/src/test/smali/inline/TestSyntheticInline3/TestSyntheticInline3$onCreate$1.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestSyntheticInline3/TestSyntheticInline3$onCreate$1.smali
diff --git a/jadx-core/src/test/smali/inline/TestSyntheticInline3/TestSyntheticInline3.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestSyntheticInline3/TestSyntheticInline3.smali
similarity index 100%
rename from jadx-core/src/test/smali/inline/TestSyntheticInline3/TestSyntheticInline3.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inline/TestSyntheticInline3/TestSyntheticInline3.smali
diff --git a/jadx-core/src/test/smali/inner/TestAnonymousClass14/OuterCls$1.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestAnonymousClass14/OuterCls$1.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestAnonymousClass14/OuterCls$1.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestAnonymousClass14/OuterCls$1.smali
diff --git a/jadx-core/src/test/smali/inner/TestAnonymousClass14/OuterCls$TestCls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestAnonymousClass14/OuterCls$TestCls.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestAnonymousClass14/OuterCls$TestCls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestAnonymousClass14/OuterCls$TestCls.smali
diff --git a/jadx-core/src/test/smali/inner/TestAnonymousClass14/OuterCls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestAnonymousClass14/OuterCls.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestAnonymousClass14/OuterCls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestAnonymousClass14/OuterCls.smali
diff --git a/jadx-core/src/test/smali/inner/TestAnonymousClass19/ATestCls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestAnonymousClass19/ATestCls.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestAnonymousClass19/ATestCls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestAnonymousClass19/ATestCls.smali
diff --git a/jadx-core/src/test/smali/inner/TestAnonymousClass19/Lambda$TestCls$1.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestAnonymousClass19/Lambda$TestCls$1.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestAnonymousClass19/Lambda$TestCls$1.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestAnonymousClass19/Lambda$TestCls$1.smali
diff --git a/jadx-core/src/test/smali/inner/TestIncorrectAnonymousClass/TestCls$1.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestIncorrectAnonymousClass/TestCls$1.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestIncorrectAnonymousClass/TestCls$1.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestIncorrectAnonymousClass/TestCls$1.smali
diff --git a/jadx-core/src/test/smali/inner/TestIncorrectAnonymousClass/TestCls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestIncorrectAnonymousClass/TestCls.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestIncorrectAnonymousClass/TestCls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestIncorrectAnonymousClass/TestCls.smali
diff --git a/jadx-core/src/test/smali/inner/TestInnerClassFakeSyntheticConstructor.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestInnerClassFakeSyntheticConstructor.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestInnerClassFakeSyntheticConstructor.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestInnerClassFakeSyntheticConstructor.smali
diff --git a/jadx-core/src/test/smali/inner/TestInnerClassSyntheticRename.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestInnerClassSyntheticRename.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestInnerClassSyntheticRename.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestInnerClassSyntheticRename.smali
diff --git a/jadx-core/src/test/smali/inner/TestNestedAnonymousClass/A.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestNestedAnonymousClass/A.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestNestedAnonymousClass/A.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestNestedAnonymousClass/A.smali
diff --git a/jadx-core/src/test/smali/inner/TestNestedAnonymousClass/B.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestNestedAnonymousClass/B.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestNestedAnonymousClass/B.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestNestedAnonymousClass/B.smali
diff --git a/jadx-core/src/test/smali/inner/TestNestedAnonymousClass/C.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestNestedAnonymousClass/C.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestNestedAnonymousClass/C.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestNestedAnonymousClass/C.smali
diff --git a/jadx-core/src/test/smali/inner/TestSyntheticMthRename/TestCls$A.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestSyntheticMthRename/TestCls$A.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestSyntheticMthRename/TestCls$A.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestSyntheticMthRename/TestCls$A.smali
diff --git a/jadx-core/src/test/smali/inner/TestSyntheticMthRename/TestCls$I.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestSyntheticMthRename/TestCls$I.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestSyntheticMthRename/TestCls$I.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestSyntheticMthRename/TestCls$I.smali
diff --git a/jadx-core/src/test/smali/inner/TestSyntheticMthRename/TestCls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestSyntheticMthRename/TestCls.smali
similarity index 100%
rename from jadx-core/src/test/smali/inner/TestSyntheticMthRename/TestCls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/inner/TestSyntheticMthRename/TestCls.smali
diff --git a/jadx-core/src/test/smali/invoke/TestCastInOverloadedInvoke2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/invoke/TestCastInOverloadedInvoke2.smali
similarity index 100%
rename from jadx-core/src/test/smali/invoke/TestCastInOverloadedInvoke2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/invoke/TestCastInOverloadedInvoke2.smali
diff --git a/jadx-core/src/test/smali/invoke/TestConstructorWithMoves.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/invoke/TestConstructorWithMoves.smali
similarity index 100%
rename from jadx-core/src/test/smali/invoke/TestConstructorWithMoves.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/invoke/TestConstructorWithMoves.smali
diff --git a/jadx-core/src/test/smali/invoke/TestPolymorphicInvoke.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/invoke/TestPolymorphicInvoke.smali
similarity index 100%
rename from jadx-core/src/test/smali/invoke/TestPolymorphicInvoke.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/invoke/TestPolymorphicInvoke.smali
diff --git a/jadx-core/src/test/smali/invoke/TestRawCustomInvoke.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/invoke/TestRawCustomInvoke.smali
similarity index 100%
rename from jadx-core/src/test/smali/invoke/TestRawCustomInvoke.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/invoke/TestRawCustomInvoke.smali
diff --git a/jadx-core/src/test/smali/loops/TestEndlessLoop2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/loops/TestEndlessLoop2.smali
similarity index 100%
rename from jadx-core/src/test/smali/loops/TestEndlessLoop2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/loops/TestEndlessLoop2.smali
diff --git a/jadx-core/src/test/smali/loops/TestLoopCondition5.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/loops/TestLoopCondition5.smali
similarity index 100%
rename from jadx-core/src/test/smali/loops/TestLoopCondition5.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/loops/TestLoopCondition5.smali
diff --git a/jadx-core/src/test/smali/loops/TestLoopRestore.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/loops/TestLoopRestore.smali
similarity index 100%
rename from jadx-core/src/test/smali/loops/TestLoopRestore.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/loops/TestLoopRestore.smali
diff --git a/jadx-core/src/test/smali/loops/TestMultiEntryLoop.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/loops/TestMultiEntryLoop.smali
similarity index 100%
rename from jadx-core/src/test/smali/loops/TestMultiEntryLoop.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/loops/TestMultiEntryLoop.smali
diff --git a/jadx-core/src/test/smali/names/TestCaseSensitiveChecks/1.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestCaseSensitiveChecks/1.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestCaseSensitiveChecks/1.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestCaseSensitiveChecks/1.smali
diff --git a/jadx-core/src/test/smali/names/TestCaseSensitiveChecks/2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestCaseSensitiveChecks/2.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestCaseSensitiveChecks/2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestCaseSensitiveChecks/2.smali
diff --git a/jadx-core/src/test/smali/names/TestClassNameWithInvalidChar/a.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestClassNameWithInvalidChar/a.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestClassNameWithInvalidChar/a.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestClassNameWithInvalidChar/a.smali
diff --git a/jadx-core/src/test/smali/names/TestClassNameWithInvalidChar/b.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestClassNameWithInvalidChar/b.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestClassNameWithInvalidChar/b.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestClassNameWithInvalidChar/b.smali
diff --git a/jadx-core/src/test/smali/names/TestDuplicatedNames.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestDuplicatedNames.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestDuplicatedNames.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestDuplicatedNames.smali
diff --git a/jadx-core/src/test/smali/names/TestFieldCollideWithPackage/1.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestFieldCollideWithPackage/1.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestFieldCollideWithPackage/1.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestFieldCollideWithPackage/1.smali
diff --git a/jadx-core/src/test/smali/names/TestFieldCollideWithPackage/2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestFieldCollideWithPackage/2.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestFieldCollideWithPackage/2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestFieldCollideWithPackage/2.smali
diff --git a/jadx-core/src/test/smali/names/TestLocalVarCollideWithPackage/1.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestLocalVarCollideWithPackage/1.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestLocalVarCollideWithPackage/1.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestLocalVarCollideWithPackage/1.smali
diff --git a/jadx-core/src/test/smali/names/TestLocalVarCollideWithPackage/2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestLocalVarCollideWithPackage/2.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestLocalVarCollideWithPackage/2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestLocalVarCollideWithPackage/2.smali
diff --git a/jadx-core/src/test/smali/names/TestLocalVarCollideWithPackage/3.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestLocalVarCollideWithPackage/3.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestLocalVarCollideWithPackage/3.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestLocalVarCollideWithPackage/3.smali
diff --git a/jadx-core/src/test/smali/names/TestReservedClassNames.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestReservedClassNames.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestReservedClassNames.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestReservedClassNames.smali
diff --git a/jadx-core/src/test/smali/names/TestReservedNames.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestReservedNames.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestReservedNames.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestReservedNames.smali
diff --git a/jadx-core/src/test/smali/names/TestReservedPackageNames/a.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/names/TestReservedPackageNames/a.smali
similarity index 100%
rename from jadx-core/src/test/smali/names/TestReservedPackageNames/a.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/names/TestReservedPackageNames/a.smali
diff --git a/jadx-core/src/test/smali/others/TestAllNops.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestAllNops.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestAllNops.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestAllNops.smali
diff --git a/jadx-core/src/test/smali/others/TestBadMethodAccessModifiers/TestCls$A.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestBadMethodAccessModifiers/TestCls$A.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestBadMethodAccessModifiers/TestCls$A.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestBadMethodAccessModifiers/TestCls$A.smali
diff --git a/jadx-core/src/test/smali/others/TestBadMethodAccessModifiers/TestCls$B.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestBadMethodAccessModifiers/TestCls$B.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestBadMethodAccessModifiers/TestCls$B.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestBadMethodAccessModifiers/TestCls$B.smali
diff --git a/jadx-core/src/test/smali/others/TestBadMethodAccessModifiers/TestCls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestBadMethodAccessModifiers/TestCls.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestBadMethodAccessModifiers/TestCls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestBadMethodAccessModifiers/TestCls.smali
diff --git a/jadx-core/src/test/smali/others/TestConstructor.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestConstructor.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestConstructor.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestConstructor.smali
diff --git a/jadx-core/src/test/smali/others/TestConstructorBranched.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestConstructorBranched.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestConstructorBranched.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestConstructorBranched.smali
diff --git a/jadx-core/src/test/smali/others/TestDeadBlockReferencesStart.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestDeadBlockReferencesStart.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestDeadBlockReferencesStart.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestDeadBlockReferencesStart.smali
diff --git a/jadx-core/src/test/smali/others/TestExplicitOverride.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestExplicitOverride.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestExplicitOverride.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestExplicitOverride.smali
diff --git a/jadx-core/src/test/smali/others/TestFieldInitOrder2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestFieldInitOrder2.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestFieldInitOrder2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestFieldInitOrder2.smali
diff --git a/jadx-core/src/test/smali/others/TestFixClassAccessModifiers/Cls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestFixClassAccessModifiers/Cls.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestFixClassAccessModifiers/Cls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestFixClassAccessModifiers/Cls.smali
diff --git a/jadx-core/src/test/smali/others/TestFixClassAccessModifiers/InnerCls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestFixClassAccessModifiers/InnerCls.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestFixClassAccessModifiers/InnerCls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestFixClassAccessModifiers/InnerCls.smali
diff --git a/jadx-core/src/test/smali/others/TestFixClassAccessModifiers/TestCls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestFixClassAccessModifiers/TestCls.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestFixClassAccessModifiers/TestCls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestFixClassAccessModifiers/TestCls.smali
diff --git a/jadx-core/src/test/smali/others/TestIncorrectMethodSignature.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestIncorrectMethodSignature.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestIncorrectMethodSignature.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestIncorrectMethodSignature.smali
diff --git a/jadx-core/src/test/smali/others/TestInlineVarArg.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestInlineVarArg.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestInlineVarArg.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestInlineVarArg.smali
diff --git a/jadx-core/src/test/smali/others/TestInsnsBeforeSuper/A.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestInsnsBeforeSuper/A.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestInsnsBeforeSuper/A.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestInsnsBeforeSuper/A.smali
diff --git a/jadx-core/src/test/smali/others/TestInsnsBeforeSuper/B.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestInsnsBeforeSuper/B.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestInsnsBeforeSuper/B.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestInsnsBeforeSuper/B.smali
diff --git a/jadx-core/src/test/smali/others/TestInsnsBeforeSuper2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestInsnsBeforeSuper2.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestInsnsBeforeSuper2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestInsnsBeforeSuper2.smali
diff --git a/jadx-core/src/test/smali/others/TestInsnsBeforeThis.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestInsnsBeforeThis.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestInsnsBeforeThis.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestInsnsBeforeThis.smali
diff --git a/jadx-core/src/test/smali/others/TestMoveInline.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestMoveInline.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestMoveInline.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestMoveInline.smali
diff --git a/jadx-core/src/test/smali/others/TestMultipleNOPs/test.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestMultipleNOPs/test.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestMultipleNOPs/test.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestMultipleNOPs/test.smali
diff --git a/jadx-core/src/test/smali/others/TestN21.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestN21.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestN21.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestN21.smali
diff --git a/jadx-core/src/test/smali/others/TestOverridePackagePrivateMethod/A.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestOverridePackagePrivateMethod/A.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestOverridePackagePrivateMethod/A.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestOverridePackagePrivateMethod/A.smali
diff --git a/jadx-core/src/test/smali/others/TestOverridePackagePrivateMethod/B.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestOverridePackagePrivateMethod/B.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestOverridePackagePrivateMethod/B.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestOverridePackagePrivateMethod/B.smali
diff --git a/jadx-core/src/test/smali/others/TestOverridePackagePrivateMethod/C.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestOverridePackagePrivateMethod/C.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestOverridePackagePrivateMethod/C.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestOverridePackagePrivateMethod/C.smali
diff --git a/jadx-core/src/test/smali/others/TestOverrideWithSameName/A.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestOverrideWithSameName/A.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestOverrideWithSameName/A.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestOverrideWithSameName/A.smali
diff --git a/jadx-core/src/test/smali/others/TestOverrideWithSameName/B.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestOverrideWithSameName/B.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestOverrideWithSameName/B.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestOverrideWithSameName/B.smali
diff --git a/jadx-core/src/test/smali/others/TestOverrideWithSameName/C.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestOverrideWithSameName/C.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestOverrideWithSameName/C.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestOverrideWithSameName/C.smali
diff --git a/jadx-core/src/test/smali/others/TestSyntheticConstructor/BuggyConstructor.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestSyntheticConstructor/BuggyConstructor.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestSyntheticConstructor/BuggyConstructor.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestSyntheticConstructor/BuggyConstructor.smali
diff --git a/jadx-core/src/test/smali/others/TestSyntheticConstructor/Test.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/others/TestSyntheticConstructor/Test.smali
similarity index 100%
rename from jadx-core/src/test/smali/others/TestSyntheticConstructor/Test.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/others/TestSyntheticConstructor/Test.smali
diff --git a/jadx-core/src/test/smali/synchronize/TestNestedSynchronize.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/synchronize/TestNestedSynchronize.smali
similarity index 100%
rename from jadx-core/src/test/smali/synchronize/TestNestedSynchronize.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/synchronize/TestNestedSynchronize.smali
diff --git a/jadx-core/src/test/smali/synchronize/TestSynchronized4.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/synchronize/TestSynchronized4.smali
similarity index 100%
rename from jadx-core/src/test/smali/synchronize/TestSynchronized4.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/synchronize/TestSynchronized4.smali
diff --git a/jadx-core/src/test/smali/synchronize/TestSynchronized5.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/synchronize/TestSynchronized5.smali
similarity index 100%
rename from jadx-core/src/test/smali/synchronize/TestSynchronized5.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/synchronize/TestSynchronized5.smali
diff --git a/jadx-core/src/test/smali/synchronize/TestSynchronized6.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/synchronize/TestSynchronized6.smali
similarity index 100%
rename from jadx-core/src/test/smali/synchronize/TestSynchronized6.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/synchronize/TestSynchronized6.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestEmptyCatch.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestEmptyCatch.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestEmptyCatch.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestEmptyCatch.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestFinally3.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestFinally3.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestFinally3.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestFinally3.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestLoopInTryCatch.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestLoopInTryCatch.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestLoopInTryCatch.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestLoopInTryCatch.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestMultiExceptionCatchSameJump.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestMultiExceptionCatchSameJump.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestMultiExceptionCatchSameJump.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestMultiExceptionCatchSameJump.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestNestedTryCatch4.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestNestedTryCatch4.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestNestedTryCatch4.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestNestedTryCatch4.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestTryCatchFinally10.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchFinally10.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestTryCatchFinally10.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchFinally10.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestTryCatchFinally15.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchFinally15.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestTryCatchFinally15.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchFinally15.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestTryCatchLastInsn.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchLastInsn.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestTryCatchLastInsn.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchLastInsn.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestTryCatchMultiException2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchMultiException2.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestTryCatchMultiException2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchMultiException2.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestTryCatchNoMoveExc.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchNoMoveExc.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestTryCatchNoMoveExc.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchNoMoveExc.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestTryCatchNoMoveExc2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchNoMoveExc2.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestTryCatchNoMoveExc2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchNoMoveExc2.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestTryCatchStartOnMove.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchStartOnMove.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestTryCatchStartOnMove.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryCatchStartOnMove.smali
diff --git a/jadx-core/src/test/smali/trycatch/TestTryWithEmptyCatchTriple.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryWithEmptyCatchTriple.smali
similarity index 100%
rename from jadx-core/src/test/smali/trycatch/TestTryWithEmptyCatchTriple.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/trycatch/TestTryWithEmptyCatchTriple.smali
diff --git a/jadx-core/src/test/smali/types/TestConstInline.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestConstInline.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestConstInline.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestConstInline.smali
diff --git a/jadx-core/src/test/smali/types/TestGenerics2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestGenerics2.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestGenerics2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestGenerics2.smali
diff --git a/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/FieldCls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/FieldCls.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/FieldCls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/FieldCls.smali
diff --git a/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/ba.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/ba.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/ba.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/ba.smali
diff --git a/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/bb.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/bb.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/bb.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/bb.smali
diff --git a/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/bc.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/bc.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/bc.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/bc.smali
diff --git a/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/n.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/n.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/n.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestGenericsInFullInnerCls/n.smali
diff --git a/jadx-core/src/test/smali/types/TestPrimitiveConversion.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestPrimitiveConversion.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestPrimitiveConversion.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestPrimitiveConversion.smali
diff --git a/jadx-core/src/test/smali/types/TestPrimitiveConversion2.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestPrimitiveConversion2.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestPrimitiveConversion2.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestPrimitiveConversion2.smali
diff --git a/jadx-core/src/test/smali/types/TestTypeResolver10.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver10.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestTypeResolver10.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver10.smali
diff --git a/jadx-core/src/test/smali/types/TestTypeResolver14.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver14.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestTypeResolver14.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver14.smali
diff --git a/jadx-core/src/test/smali/types/TestTypeResolver15.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver15.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestTypeResolver15.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver15.smali
diff --git a/jadx-core/src/test/smali/types/TestTypeResolver16.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver16.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestTypeResolver16.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver16.smali
diff --git a/jadx-core/src/test/smali/types/TestTypeResolver17.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver17.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestTypeResolver17.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver17.smali
diff --git a/jadx-core/src/test/smali/types/TestTypeResolver20/Sequence.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver20/Sequence.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestTypeResolver20/Sequence.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver20/Sequence.smali
diff --git a/jadx-core/src/test/smali/types/TestTypeResolver20/TestTypeResolver20.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver20/TestTypeResolver20.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestTypeResolver20/TestTypeResolver20.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver20/TestTypeResolver20.smali
diff --git a/jadx-core/src/test/smali/types/TestTypeResolver21.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver21.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestTypeResolver21.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver21.smali
diff --git a/jadx-core/src/test/smali/types/TestTypeResolver5.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver5.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestTypeResolver5.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver5.smali
diff --git a/jadx-core/src/test/smali/types/TestTypeResolver8/A.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver8/A.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestTypeResolver8/A.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver8/A.smali
diff --git a/jadx-core/src/test/smali/types/TestTypeResolver8/B.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver8/B.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestTypeResolver8/B.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver8/B.smali
diff --git a/jadx-core/src/test/smali/types/TestTypeResolver8/TestCls.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver8/TestCls.smali
similarity index 100%
rename from jadx-core/src/test/smali/types/TestTypeResolver8/TestCls.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/types/TestTypeResolver8/TestCls.smali
diff --git a/jadx-core/src/test/smali/variables/TestVariables6.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/variables/TestVariables6.smali
similarity index 100%
rename from jadx-core/src/test/smali/variables/TestVariables6.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/variables/TestVariables6.smali
diff --git a/jadx-core/src/test/smali/variables/TestVariablesGeneric.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/variables/TestVariablesGeneric.smali
similarity index 100%
rename from jadx-core/src/test/smali/variables/TestVariablesGeneric.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/variables/TestVariablesGeneric.smali
diff --git a/jadx-core/src/test/smali/variables/TestVariablesInLoop.smali b/jadx-with-jadxecute/jadx-core/src/test/smali/variables/TestVariablesInLoop.smali
similarity index 100%
rename from jadx-core/src/test/smali/variables/TestVariablesInLoop.smali
rename to jadx-with-jadxecute/jadx-core/src/test/smali/variables/TestVariablesInLoop.smali
diff --git a/jadx-gui/build.gradle b/jadx-with-jadxecute/jadx-gui/build.gradle
similarity index 100%
rename from jadx-gui/build.gradle
rename to jadx-with-jadxecute/jadx-gui/build.gradle
diff --git a/jadx-gui/libs/jfontchooser-1.0.5.jar b/jadx-with-jadxecute/jadx-gui/libs/jfontchooser-1.0.5.jar
similarity index 100%
rename from jadx-gui/libs/jfontchooser-1.0.5.jar
rename to jadx-with-jadxecute/jadx-gui/libs/jfontchooser-1.0.5.jar
diff --git a/jadx-gui/libs/mapping-io-0.4.0-SNAPSHOT.jar b/jadx-with-jadxecute/jadx-gui/libs/mapping-io-0.4.0-SNAPSHOT.jar
similarity index 100%
rename from jadx-gui/libs/mapping-io-0.4.0-SNAPSHOT.jar
rename to jadx-with-jadxecute/jadx-gui/libs/mapping-io-0.4.0-SNAPSHOT.jar
diff --git a/jadx-gui/src/main/java/jadx/gui/JadxGUI.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/JadxGUI.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/JadxGUI.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/JadxGUI.java
diff --git a/jadx-gui/src/main/java/jadx/gui/JadxWrapper.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/JadxWrapper.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/JadxWrapper.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/JadxWrapper.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/ArtAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/ArtAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/ArtAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/ArtAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/DbgUtils.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/DbgUtils.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/DbgUtils.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/DbgUtils.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/DebugController.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/DebugController.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/DebugController.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/DebugController.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/EventListenerAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/EventListenerAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/EventListenerAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/EventListenerAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/LogcatController.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/LogcatController.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/LogcatController.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/LogcatController.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/RegisterObserver.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/RegisterObserver.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/RegisterObserver.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/RegisterObserver.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/RuntimeType.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/RuntimeType.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/RuntimeType.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/RuntimeType.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebugger.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebugger.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebugger.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebugger.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebuggerException.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebuggerException.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebuggerException.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/SmaliDebuggerException.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/SuspendInfo.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/SuspendInfo.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/SuspendInfo.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/SuspendInfo.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/RegisterInfo.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/RegisterInfo.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/smali/RegisterInfo.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/RegisterInfo.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/Smali.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/Smali.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/smali/Smali.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/Smali.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/SmaliMethodNode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/SmaliMethodNode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/smali/SmaliMethodNode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/SmaliMethodNode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/SmaliRegister.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/SmaliRegister.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/smali/SmaliRegister.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/SmaliRegister.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/SmaliWriter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/SmaliWriter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/debugger/smali/SmaliWriter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/SmaliWriter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/protocol/ADB.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/protocol/ADB.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/protocol/ADB.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/protocol/ADB.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java
diff --git a/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDeviceInfo.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDeviceInfo.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDeviceInfo.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDeviceInfo.java
diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/BackgroundExecutor.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/BackgroundExecutor.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/jobs/BackgroundExecutor.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/BackgroundExecutor.java
diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/Cancelable.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/Cancelable.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/jobs/Cancelable.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/Cancelable.java
diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/CancelableBackgroundTask.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/CancelableBackgroundTask.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/jobs/CancelableBackgroundTask.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/CancelableBackgroundTask.java
diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/DecompileTask.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/DecompileTask.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/jobs/DecompileTask.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/DecompileTask.java
diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/ExportTask.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/ExportTask.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/jobs/ExportTask.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/ExportTask.java
diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/IBackgroundTask.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/IBackgroundTask.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/jobs/IBackgroundTask.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/IBackgroundTask.java
diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/ITaskInfo.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/ITaskInfo.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/jobs/ITaskInfo.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/ITaskInfo.java
diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/ITaskProgress.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/ITaskProgress.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/jobs/ITaskProgress.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/ITaskProgress.java
diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/ProcessResult.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/ProcessResult.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/jobs/ProcessResult.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/ProcessResult.java
diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/SimpleTask.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/SimpleTask.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/jobs/SimpleTask.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/SimpleTask.java
diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/TaskProgress.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/TaskProgress.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/jobs/TaskProgress.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/TaskProgress.java
diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/TaskStatus.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/TaskStatus.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/jobs/TaskStatus.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/jobs/TaskStatus.java
diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/AddCommentHelper.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/AddCommentHelper.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/AddCommentHelper.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/AddCommentHelper.java
diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/ErrorHighlightingLinter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/ErrorHighlightingLinter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/ErrorHighlightingLinter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/ErrorHighlightingLinter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/JadxecuteDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/JadxecuteDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/JadxecuteDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/JadxecuteDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/RenameObjectHelper.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/RenameObjectHelper.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/RenameObjectHelper.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/RenameObjectHelper.java
diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/UserCodeLoader.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/UserCodeLoader.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/UserCodeLoader.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/jadxecute/UserCodeLoader.java
diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/mappings/MappingExporter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/mappings/MappingExporter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/plugins/mappings/MappingExporter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/mappings/MappingExporter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkManager.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkManager.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkManager.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkManager.java
diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportData.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportData.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportData.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportData.java
diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportNode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportNode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportNode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportNode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportPanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportPanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportPanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/plugins/quark/QuarkReportPanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/ISearchMethod.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/ISearchMethod.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/ISearchMethod.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/ISearchMethod.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/ISearchProvider.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/ISearchProvider.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/ISearchProvider.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/ISearchProvider.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/SearchJob.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/SearchJob.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/SearchJob.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/SearchJob.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/SearchSettings.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/SearchSettings.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/SearchSettings.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/SearchSettings.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/SearchTask.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/SearchTask.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/SearchTask.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/SearchTask.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/providers/BaseSearchProvider.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/BaseSearchProvider.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/providers/BaseSearchProvider.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/BaseSearchProvider.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/providers/ClassSearchProvider.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/ClassSearchProvider.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/providers/ClassSearchProvider.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/ClassSearchProvider.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/providers/CodeSearchProvider.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/CodeSearchProvider.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/providers/CodeSearchProvider.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/CodeSearchProvider.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/providers/CommentSearchProvider.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/CommentSearchProvider.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/providers/CommentSearchProvider.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/CommentSearchProvider.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/providers/FieldSearchProvider.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/FieldSearchProvider.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/providers/FieldSearchProvider.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/FieldSearchProvider.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/providers/MergedSearchProvider.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/MergedSearchProvider.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/providers/MergedSearchProvider.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/MergedSearchProvider.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/providers/MethodSearchProvider.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/MethodSearchProvider.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/providers/MethodSearchProvider.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/MethodSearchProvider.java
diff --git a/jadx-gui/src/main/java/jadx/gui/search/providers/ResourceSearchProvider.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/ResourceSearchProvider.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/search/providers/ResourceSearchProvider.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/search/providers/ResourceSearchProvider.java
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/JadxProject.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/JadxProject.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/settings/JadxProject.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/JadxProject.java
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/JadxSettings.java
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsWindow.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsWindow.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsWindow.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/JadxSettingsWindow.java
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/LineNumbersMode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/LineNumbersMode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/settings/LineNumbersMode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/LineNumbersMode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/TabStateViewAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/TabStateViewAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/settings/TabStateViewAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/TabStateViewAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/WindowLocation.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/WindowLocation.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/settings/WindowLocation.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/WindowLocation.java
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/data/ProjectData.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/data/ProjectData.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/settings/data/ProjectData.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/data/ProjectData.java
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/data/TabViewState.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/data/TabViewState.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/settings/data/TabViewState.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/data/TabViewState.java
diff --git a/jadx-gui/src/main/java/jadx/gui/settings/data/ViewPoint.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/data/ViewPoint.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/settings/data/ViewPoint.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/settings/data/ViewPoint.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/ApkSignature.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/ApkSignature.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/ApkSignature.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/ApkSignature.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/CodeNode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/CodeNode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/CodeNode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/CodeNode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JClass.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JClass.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/JClass.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JClass.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JField.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JField.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/JField.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JField.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JLoadableNode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JLoadableNode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/JLoadableNode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JLoadableNode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JMethod.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JPackage.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JPackage.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/JPackage.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JPackage.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JResSearchNode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JResSearchNode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/JResSearchNode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JResSearchNode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JResource.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JResource.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/JResource.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JResource.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JSources.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JSources.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/JSources.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JSources.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JVariable.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JVariable.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/JVariable.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/JVariable.java
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/TextNode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/TextNode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/treemodel/TextNode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/treemodel/TextNode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/ExceptionDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/ExceptionDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/ExceptionDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/ExceptionDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/HeapUsageBar.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/HeapUsageBar.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/HeapUsageBar.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/HeapUsageBar.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/MainDropTarget.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/MainDropTarget.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/MainDropTarget.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/MainDropTarget.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/MainWindow.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/TabComponent.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/TabComponent.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/TabComponent.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/TabComponent.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/TabbedPane.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeArea.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeContentPanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeContentPanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeContentPanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/AbstractCodeContentPanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/ClassCodeContentPanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/ClassCodeContentPanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/ClassCodeContentPanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/ClassCodeContentPanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeArea.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeArea.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeArea.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeArea.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeContentPanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeContentPanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeContentPanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeContentPanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeLinkGenerator.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeLinkGenerator.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeLinkGenerator.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodeLinkGenerator.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodePanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodePanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/CodePanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/CodePanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/CommentAction.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/CommentAction.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/CommentAction.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/CommentAction.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/CommentSearchAction.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/CommentSearchAction.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/CommentSearchAction.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/CommentSearchAction.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorTheme.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorTheme.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorTheme.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorTheme.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorViewState.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorViewState.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorViewState.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/EditorViewState.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/FindUsageAction.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/FindUsageAction.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/FindUsageAction.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/FindUsageAction.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/FridaAction.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/FridaAction.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/FridaAction.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/FridaAction.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/GoToDeclarationAction.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/GoToDeclarationAction.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/GoToDeclarationAction.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/GoToDeclarationAction.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodeAction.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodeAction.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodeAction.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodeAction.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodePopupBuilder.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodePopupBuilder.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodePopupBuilder.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodePopupBuilder.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodePopupListener.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodePopupListener.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodePopupListener.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodePopupListener.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/JadxTokenMaker.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/JadxTokenMaker.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/JadxTokenMaker.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/JadxTokenMaker.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/LineNumbers.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/LineNumbers.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/LineNumbers.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/LineNumbers.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/MouseHoverHighlighter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/MouseHoverHighlighter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/MouseHoverHighlighter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/MouseHoverHighlighter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/RenameAction.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/RenameAction.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/RenameAction.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/RenameAction.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/SearchBar.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/SearchBar.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/SearchBar.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/SearchBar.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliArea.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliArea.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliArea.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliArea.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliTokenMaker.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliTokenMaker.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliTokenMaker.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliTokenMaker.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/XposedAction.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/XposedAction.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/XposedAction.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/XposedAction.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/mode/JCodeMode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/mode/JCodeMode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/codearea/mode/JCodeMode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/codearea/mode/JCodeMode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/ADBDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/ADBDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/dialog/ADBDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/ADBDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/AboutDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/AboutDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/dialog/AboutDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/AboutDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/CommentDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/CommentDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/dialog/CommentDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/CommentDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/CommonSearchDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/CommonSearchDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/dialog/CommonSearchDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/CommonSearchDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/ExcludePkgDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/ExcludePkgDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/dialog/ExcludePkgDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/ExcludePkgDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/LogViewerDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/LogViewerDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/dialog/LogViewerDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/LogViewerDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/RenameDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/SearchDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/SearchDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/dialog/SearchDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/SearchDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/SetValueDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/SetValueDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/dialog/SetValueDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/SetValueDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/UsageDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/UsageDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/dialog/UsageDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/dialog/UsageDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/filedialog/CustomFileChooser.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/filedialog/CustomFileChooser.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/filedialog/CustomFileChooser.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/filedialog/CustomFileChooser.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/filedialog/CustomFileDialog.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/filedialog/CustomFileDialog.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/filedialog/CustomFileDialog.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/filedialog/CustomFileDialog.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/filedialog/FileDialogWrapper.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/filedialog/FileDialogWrapper.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/filedialog/FileDialogWrapper.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/filedialog/FileDialogWrapper.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/filedialog/FileOpenMode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/filedialog/FileOpenMode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/filedialog/FileOpenMode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/filedialog/FileOpenMode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/ContentPanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/ContentPanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/panel/ContentPanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/ContentPanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/HtmlPanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/HtmlPanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/panel/HtmlPanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/HtmlPanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/IDebugController.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/IDebugController.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/panel/IDebugController.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/IDebugController.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/IViewStateSupport.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/IViewStateSupport.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/panel/IViewStateSupport.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/IViewStateSupport.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/ImagePanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/ImagePanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/panel/ImagePanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/ImagePanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/IssuesPanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/IssuesPanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/panel/IssuesPanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/IssuesPanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/LogcatPanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/LogcatPanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/panel/LogcatPanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/LogcatPanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/ProgressPanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/ProgressPanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/panel/ProgressPanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/ProgressPanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/StartPagePanel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/StartPagePanel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/panel/StartPagePanel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/panel/StartPagePanel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/JPackagePopupMenu.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/JPackagePopupMenu.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/popupmenu/JPackagePopupMenu.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/JPackagePopupMenu.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/VarTreePopupMenu.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/VarTreePopupMenu.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/popupmenu/VarTreePopupMenu.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/popupmenu/VarTreePopupMenu.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/treenodes/StartPageNode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/treenodes/StartPageNode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/treenodes/StartPageNode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/treenodes/StartPageNode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/treenodes/SummaryNode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/treenodes/SummaryNode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/ui/treenodes/SummaryNode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/ui/treenodes/SummaryNode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/update/JadxUpdate.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/update/JadxUpdate.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/update/JadxUpdate.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/update/JadxUpdate.java
diff --git a/jadx-gui/src/main/java/jadx/gui/update/VersionComparator.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/update/VersionComparator.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/update/VersionComparator.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/update/VersionComparator.java
diff --git a/jadx-gui/src/main/java/jadx/gui/update/data/Asset.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/update/data/Asset.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/update/data/Asset.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/update/data/Asset.java
diff --git a/jadx-gui/src/main/java/jadx/gui/update/data/Release.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/update/data/Release.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/update/data/Release.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/update/data/Release.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/CacheObject.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/CacheObject.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/CacheObject.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/CacheObject.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/CaretPositionFix.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/CaretPositionFix.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/CaretPositionFix.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/CaretPositionFix.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/CertificateManager.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/CertificateManager.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/CertificateManager.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/CertificateManager.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/DefaultPopupMenuListener.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/DefaultPopupMenuListener.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/DefaultPopupMenuListener.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/DefaultPopupMenuListener.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/FontUtils.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/FontUtils.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/FontUtils.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/FontUtils.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/ILoadListener.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/ILoadListener.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/ILoadListener.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/ILoadListener.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/IOUtils.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/IOUtils.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/IOUtils.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/IOUtils.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/Icons.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/Icons.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/Icons.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/Icons.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/JNodeCache.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/JNodeCache.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/JNodeCache.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/JNodeCache.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/JumpManager.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/JumpManager.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/JumpManager.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/JumpManager.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/JumpPosition.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/JumpPosition.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/JumpPosition.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/JumpPosition.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/LafManager.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/LafManager.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/LafManager.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/LafManager.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/LangLocale.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/LangLocale.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/LangLocale.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/LangLocale.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/Link.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/Link.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/Link.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/Link.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/NLS.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/NLS.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/NLS.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/NLS.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/ObjectPool.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/ObjectPool.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/ObjectPool.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/ObjectPool.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/OverlayIcon.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/OverlayIcon.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/OverlayIcon.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/OverlayIcon.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/PathTypeAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/PathTypeAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/PathTypeAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/PathTypeAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/RectangleTypeAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/RectangleTypeAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/RectangleTypeAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/RectangleTypeAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/RelativePathTypeAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/RelativePathTypeAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/RelativePathTypeAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/RelativePathTypeAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/SystemInfo.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/SystemInfo.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/SystemInfo.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/SystemInfo.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/TextStandardActions.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/TextStandardActions.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/TextStandardActions.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/TextStandardActions.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/UiUtils.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/UiUtils.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/UiUtils.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/UiUtils.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/CodeCacheMode.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/CodeCacheMode.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/CodeCacheMode.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/CodeCacheMode.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/CodeStringCache.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/CodeStringCache.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/CodeStringCache.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/CodeStringCache.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/FixedCodeCache.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/FixedCodeCache.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/FixedCodeCache.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/FixedCodeCache.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/BufferCodeCache.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/BufferCodeCache.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/BufferCodeCache.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/BufferCodeCache.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/CodeMetadataAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/CodeMetadataAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/CodeMetadataAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/CodeMetadataAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/DiskCodeCache.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/DiskCodeCache.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/DiskCodeCache.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/DiskCodeCache.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/ArgTypeAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/ArgTypeAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/ArgTypeAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/ArgTypeAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/ClassNodeAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/ClassNodeAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/ClassNodeAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/ClassNodeAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/CodeAnnotationAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/CodeAnnotationAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/CodeAnnotationAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/CodeAnnotationAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/DataAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/DataAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/DataAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/DataAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/DataAdapterHelper.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/DataAdapterHelper.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/DataAdapterHelper.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/DataAdapterHelper.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/FieldNodeAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/FieldNodeAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/FieldNodeAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/FieldNodeAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/InsnCodeOffsetAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/InsnCodeOffsetAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/InsnCodeOffsetAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/InsnCodeOffsetAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/MethodNodeAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/MethodNodeAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/MethodNodeAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/MethodNodeAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/NodeDeclareRefAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/NodeDeclareRefAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/NodeDeclareRefAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/NodeDeclareRefAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/NodeEndAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/NodeEndAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/NodeEndAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/NodeEndAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/VarNodeAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/VarNodeAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/VarNodeAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/VarNodeAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/VarRefAdapter.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/VarRefAdapter.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/VarRefAdapter.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/codecache/disk/adapters/VarRefAdapter.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/FilesWatcher.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/FilesWatcher.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/FilesWatcher.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/FilesWatcher.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/LiveReloadWorker.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/LiveReloadWorker.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/LiveReloadWorker.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/LiveReloadWorker.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/layout/WrapLayout.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/layout/WrapLayout.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/layout/WrapLayout.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/layout/WrapLayout.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/logs/ILogIssuesListener.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/logs/ILogIssuesListener.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/logs/ILogIssuesListener.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/logs/ILogIssuesListener.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/logs/ILogListener.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/logs/ILogListener.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/logs/ILogListener.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/logs/ILogListener.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/logs/LimitedQueue.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/logs/LimitedQueue.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/logs/LimitedQueue.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/logs/LimitedQueue.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/logs/LogCollector.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/logs/LogCollector.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/logs/LogCollector.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/logs/LogCollector.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/logs/LogEvent.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/logs/LogEvent.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/logs/LogEvent.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/logs/LogEvent.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/res/ResTableHelper.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/res/ResTableHelper.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/res/ResTableHelper.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/res/ResTableHelper.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/rx/CustomDisposable.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/rx/CustomDisposable.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/rx/CustomDisposable.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/rx/CustomDisposable.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/rx/RxUtils.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/rx/RxUtils.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/rx/RxUtils.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/rx/RxUtils.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/tools/NLSAddNewLines.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/tools/NLSAddNewLines.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/tools/NLSAddNewLines.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/tools/NLSAddNewLines.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/ui/ActionHandler.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/ui/ActionHandler.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/ui/ActionHandler.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/ui/ActionHandler.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/ui/DocumentUpdateListener.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/ui/DocumentUpdateListener.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/ui/DocumentUpdateListener.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/ui/DocumentUpdateListener.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/ui/NodeLabel.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/ui/NodeLabel.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/ui/NodeLabel.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/ui/NodeLabel.java
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/ui/ZoomActions.java b/jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/ui/ZoomActions.java
similarity index 100%
rename from jadx-gui/src/main/java/jadx/gui/utils/ui/ZoomActions.java
rename to jadx-with-jadxecute/jadx-gui/src/main/java/jadx/gui/utils/ui/ZoomActions.java
diff --git a/jadx-gui/src/main/resources/fonts/Hack-Regular.ttf b/jadx-with-jadxecute/jadx-gui/src/main/resources/fonts/Hack-Regular.ttf
similarity index 100%
rename from jadx-gui/src/main/resources/fonts/Hack-Regular.ttf
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/fonts/Hack-Regular.ttf
diff --git a/jadx-gui/src/main/resources/i18n/Messages_de_DE.properties b/jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_de_DE.properties
similarity index 100%
rename from jadx-gui/src/main/resources/i18n/Messages_de_DE.properties
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_de_DE.properties
diff --git a/jadx-gui/src/main/resources/i18n/Messages_en_US.properties b/jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_en_US.properties
similarity index 100%
rename from jadx-gui/src/main/resources/i18n/Messages_en_US.properties
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_en_US.properties
diff --git a/jadx-gui/src/main/resources/i18n/Messages_es_ES.properties b/jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_es_ES.properties
similarity index 100%
rename from jadx-gui/src/main/resources/i18n/Messages_es_ES.properties
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_es_ES.properties
diff --git a/jadx-gui/src/main/resources/i18n/Messages_ko_KR.properties b/jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_ko_KR.properties
similarity index 100%
rename from jadx-gui/src/main/resources/i18n/Messages_ko_KR.properties
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_ko_KR.properties
diff --git a/jadx-gui/src/main/resources/i18n/Messages_pt_BR.properties b/jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_pt_BR.properties
similarity index 100%
rename from jadx-gui/src/main/resources/i18n/Messages_pt_BR.properties
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_pt_BR.properties
diff --git a/jadx-gui/src/main/resources/i18n/Messages_ru_RU.properties b/jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_ru_RU.properties
similarity index 100%
rename from jadx-gui/src/main/resources/i18n/Messages_ru_RU.properties
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_ru_RU.properties
diff --git a/jadx-gui/src/main/resources/i18n/Messages_zh_CN.properties b/jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_zh_CN.properties
similarity index 100%
rename from jadx-gui/src/main/resources/i18n/Messages_zh_CN.properties
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_zh_CN.properties
diff --git a/jadx-gui/src/main/resources/i18n/Messages_zh_TW.properties b/jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_zh_TW.properties
similarity index 100%
rename from jadx-gui/src/main/resources/i18n/Messages_zh_TW.properties
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/i18n/Messages_zh_TW.properties
diff --git a/jadx-gui/src/main/resources/icons/adb/addToWatch.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/adb/addToWatch.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/adb/addToWatch.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/adb/addToWatch.svg
diff --git a/jadx-gui/src/main/resources/icons/adb/androidDevice.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/adb/androidDevice.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/adb/androidDevice.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/adb/androidDevice.svg
diff --git a/jadx-gui/src/main/resources/icons/debugger/db_disabled_breakpoint.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/db_disabled_breakpoint.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/debugger/db_disabled_breakpoint.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/db_disabled_breakpoint.svg
diff --git a/jadx-gui/src/main/resources/icons/debugger/db_set_breakpoint.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/db_set_breakpoint.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/debugger/db_set_breakpoint.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/db_set_breakpoint.svg
diff --git a/jadx-gui/src/main/resources/icons/debugger/execute.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/execute.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/debugger/execute.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/execute.svg
diff --git a/jadx-gui/src/main/resources/icons/debugger/rerun.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/rerun.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/debugger/rerun.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/rerun.svg
diff --git a/jadx-gui/src/main/resources/icons/debugger/stepOut.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/stepOut.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/debugger/stepOut.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/stepOut.svg
diff --git a/jadx-gui/src/main/resources/icons/debugger/suspend.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/suspend.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/debugger/suspend.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/suspend.svg
diff --git a/jadx-gui/src/main/resources/icons/debugger/suspendGray.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/suspendGray.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/debugger/suspendGray.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/suspendGray.svg
diff --git a/jadx-gui/src/main/resources/icons/debugger/threadFrozen.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/threadFrozen.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/debugger/threadFrozen.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/threadFrozen.svg
diff --git a/jadx-gui/src/main/resources/icons/debugger/traceInto.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/traceInto.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/debugger/traceInto.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/traceInto.svg
diff --git a/jadx-gui/src/main/resources/icons/debugger/traceOver.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/traceOver.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/debugger/traceOver.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/traceOver.svg
diff --git a/jadx-gui/src/main/resources/icons/debugger/trash.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/trash.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/debugger/trash.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/debugger/trash.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/ImagesFileType.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/ImagesFileType.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/ImagesFileType.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/ImagesFileType.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/abstractClass.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/abstractClass.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/abstractClass.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/abstractClass.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/abstractMethod.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/abstractMethod.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/abstractMethod.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/abstractMethod.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/annotationtype.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/annotationtype.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/annotationtype.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/annotationtype.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/binaryFile.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/binaryFile.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/binaryFile.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/binaryFile.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/class.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/class.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/class.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/class.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/constructorMethod.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/constructorMethod.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/constructorMethod.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/constructorMethod.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/detailView.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/detailView.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/detailView.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/detailView.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/enum.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/enum.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/enum.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/enum.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/field.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/field.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/field.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/field.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/file_any_type.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/file_any_type.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/file_any_type.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/file_any_type.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/finalMark.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/finalMark.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/finalMark.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/finalMark.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/folder.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/folder.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/folder.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/folder.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/interface.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/interface.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/interface.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/interface.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/java.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/java.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/java.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/java.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/manifest.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/manifest.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/manifest.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/manifest.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/method.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/method.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/method.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/method.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/methodReference.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/methodReference.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/methodReference.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/methodReference.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/newWindow.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/newWindow.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/newWindow.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/newWindow.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/package.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/package.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/package.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/package.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/packageClasses.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/packageClasses.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/packageClasses.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/packageClasses.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/privateClass.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/privateClass.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/privateClass.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/privateClass.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/privateField.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/privateField.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/privateField.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/privateField.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/privateMethod.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/privateMethod.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/privateMethod.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/privateMethod.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/protectedClass.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/protectedClass.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/protectedClass.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/protectedClass.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/protectedField.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/protectedField.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/protectedField.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/protectedField.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/protectedMethod.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/protectedMethod.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/protectedMethod.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/protectedMethod.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/publicClass.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/publicClass.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/publicClass.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/publicClass.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/publicField.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/publicField.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/publicField.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/publicField.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/publicMethod.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/publicMethod.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/publicMethod.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/publicMethod.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/resourceBundle.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/resourceBundle.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/resourceBundle.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/resourceBundle.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/resourcesRoot.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/resourcesRoot.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/resourcesRoot.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/resourcesRoot.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/rootPackageFolder.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/rootPackageFolder.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/rootPackageFolder.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/rootPackageFolder.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/staticMark.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/staticMark.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/staticMark.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/staticMark.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/styleKeyPack.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/styleKeyPack.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/styleKeyPack.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/styleKeyPack.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/unknown.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/unknown.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/unknown.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/unknown.svg
diff --git a/jadx-gui/src/main/resources/icons/nodes/xml.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/xml.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/nodes/xml.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/nodes/xml.svg
diff --git a/jadx-gui/src/main/resources/icons/search/mark.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/mark.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/search/mark.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/mark.svg
diff --git a/jadx-gui/src/main/resources/icons/search/matchCaseHovered.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/matchCaseHovered.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/search/matchCaseHovered.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/matchCaseHovered.svg
diff --git a/jadx-gui/src/main/resources/icons/search/matchCaseSelected.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/matchCaseSelected.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/search/matchCaseSelected.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/matchCaseSelected.svg
diff --git a/jadx-gui/src/main/resources/icons/search/previewSelected.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/previewSelected.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/search/previewSelected.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/previewSelected.svg
diff --git a/jadx-gui/src/main/resources/icons/search/regexHovered.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/regexHovered.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/search/regexHovered.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/regexHovered.svg
diff --git a/jadx-gui/src/main/resources/icons/search/regexSelected.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/regexSelected.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/search/regexSelected.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/regexSelected.svg
diff --git a/jadx-gui/src/main/resources/icons/search/wordsHovered.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/wordsHovered.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/search/wordsHovered.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/wordsHovered.svg
diff --git a/jadx-gui/src/main/resources/icons/search/wordsSelected.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/wordsSelected.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/search/wordsSelected.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/search/wordsSelected.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/Module.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/Module.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/Module.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/Module.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/addFile.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/addFile.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/addFile.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/addFile.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/bottom.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/bottom.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/bottom.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/bottom.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/close.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/close.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/close.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/close.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/closeHovered.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/closeHovered.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/closeHovered.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/closeHovered.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/ejbFinderMethod.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/ejbFinderMethod.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/ejbFinderMethod.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/ejbFinderMethod.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/error.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/error.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/error.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/error.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/exit.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/exit.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/exit.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/exit.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/export.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/export.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/export.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/export.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/find.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/find.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/find.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/find.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/helmChartLock.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/helmChartLock.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/helmChartLock.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/helmChartLock.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/jadxecute.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/jadxecute.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/jadxecute.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/jadxecute.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/left.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/left.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/left.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/left.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/logVerbose.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/logVerbose.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/logVerbose.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/logVerbose.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/menu-saveall.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/menu-saveall.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/menu-saveall.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/menu-saveall.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/moduleGroup.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/moduleGroup.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/moduleGroup.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/moduleGroup.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/newFolder.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/newFolder.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/newFolder.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/newFolder.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/openDisk.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/openDisk.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/openDisk.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/openDisk.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/pagination.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/pagination.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/pagination.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/pagination.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/projectDirectory.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/projectDirectory.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/projectDirectory.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/projectDirectory.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/quark.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/quark.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/quark.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/quark.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/refresh.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/refresh.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/refresh.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/refresh.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/right.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/right.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/right.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/right.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/settings.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/settings.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/settings.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/settings.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/showInfos.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/showInfos.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/showInfos.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/showInfos.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/startDebugger.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/startDebugger.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/startDebugger.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/startDebugger.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/top.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/top.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/top.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/top.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/usagesFinder.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/usagesFinder.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/usagesFinder.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/usagesFinder.svg
diff --git a/jadx-gui/src/main/resources/icons/ui/warning.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/warning.svg
similarity index 100%
rename from jadx-gui/src/main/resources/icons/ui/warning.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/icons/ui/warning.svg
diff --git a/jadx-gui/src/main/resources/logos/jadx-logo-16px.png b/jadx-with-jadxecute/jadx-gui/src/main/resources/logos/jadx-logo-16px.png
similarity index 100%
rename from jadx-gui/src/main/resources/logos/jadx-logo-16px.png
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/logos/jadx-logo-16px.png
diff --git a/jadx-gui/src/main/resources/logos/jadx-logo-32px.png b/jadx-with-jadxecute/jadx-gui/src/main/resources/logos/jadx-logo-32px.png
similarity index 100%
rename from jadx-gui/src/main/resources/logos/jadx-logo-32px.png
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/logos/jadx-logo-32px.png
diff --git a/jadx-gui/src/main/resources/logos/jadx-logo-48px.png b/jadx-with-jadxecute/jadx-gui/src/main/resources/logos/jadx-logo-48px.png
similarity index 100%
rename from jadx-gui/src/main/resources/logos/jadx-logo-48px.png
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/logos/jadx-logo-48px.png
diff --git a/jadx-gui/src/main/resources/logos/jadx-logo.ico b/jadx-with-jadxecute/jadx-gui/src/main/resources/logos/jadx-logo.ico
similarity index 100%
rename from jadx-gui/src/main/resources/logos/jadx-logo.ico
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/logos/jadx-logo.ico
diff --git a/jadx-gui/src/main/resources/logos/jadx-logo.png b/jadx-with-jadxecute/jadx-gui/src/main/resources/logos/jadx-logo.png
similarity index 100%
rename from jadx-gui/src/main/resources/logos/jadx-logo.png
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/logos/jadx-logo.png
diff --git a/jadx-gui/src/main/resources/logos/jadx-logo.svg b/jadx-with-jadxecute/jadx-gui/src/main/resources/logos/jadx-logo.svg
similarity index 100%
rename from jadx-gui/src/main/resources/logos/jadx-logo.svg
rename to jadx-with-jadxecute/jadx-gui/src/main/resources/logos/jadx-logo.svg
diff --git a/jadx-gui/src/test/java/jadx/api/Factory.java b/jadx-with-jadxecute/jadx-gui/src/test/java/jadx/api/Factory.java
similarity index 100%
rename from jadx-gui/src/test/java/jadx/api/Factory.java
rename to jadx-with-jadxecute/jadx-gui/src/test/java/jadx/api/Factory.java
diff --git a/jadx-gui/src/test/java/jadx/gui/TestI18n.java b/jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/TestI18n.java
similarity index 100%
rename from jadx-gui/src/test/java/jadx/gui/TestI18n.java
rename to jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/TestI18n.java
diff --git a/jadx-gui/src/test/java/jadx/gui/device/debugger/smali/DbgSmaliTest.java b/jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/device/debugger/smali/DbgSmaliTest.java
similarity index 100%
rename from jadx-gui/src/test/java/jadx/gui/device/debugger/smali/DbgSmaliTest.java
rename to jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/device/debugger/smali/DbgSmaliTest.java
diff --git a/jadx-gui/src/test/java/jadx/gui/treemodel/JSourcesTest.java b/jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/treemodel/JSourcesTest.java
similarity index 100%
rename from jadx-gui/src/test/java/jadx/gui/treemodel/JSourcesTest.java
rename to jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/treemodel/JSourcesTest.java
diff --git a/jadx-gui/src/test/java/jadx/gui/update/VersionComparatorTest.java b/jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/update/VersionComparatorTest.java
similarity index 100%
rename from jadx-gui/src/test/java/jadx/gui/update/VersionComparatorTest.java
rename to jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/update/VersionComparatorTest.java
diff --git a/jadx-gui/src/test/java/jadx/gui/utils/CertificateManagerTest.java b/jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/utils/CertificateManagerTest.java
similarity index 100%
rename from jadx-gui/src/test/java/jadx/gui/utils/CertificateManagerTest.java
rename to jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/utils/CertificateManagerTest.java
diff --git a/jadx-gui/src/test/java/jadx/gui/utils/JumpManagerTest.java b/jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/utils/JumpManagerTest.java
similarity index 100%
rename from jadx-gui/src/test/java/jadx/gui/utils/JumpManagerTest.java
rename to jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/utils/JumpManagerTest.java
diff --git a/jadx-gui/src/test/java/jadx/gui/utils/codecache/DiskCodeCacheTest.java b/jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/utils/codecache/DiskCodeCacheTest.java
similarity index 100%
rename from jadx-gui/src/test/java/jadx/gui/utils/codecache/DiskCodeCacheTest.java
rename to jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/utils/codecache/DiskCodeCacheTest.java
diff --git a/jadx-gui/src/test/java/jadx/gui/utils/codecache/disk/adapters/DataAdapterHelperTest.java b/jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/utils/codecache/disk/adapters/DataAdapterHelperTest.java
similarity index 100%
rename from jadx-gui/src/test/java/jadx/gui/utils/codecache/disk/adapters/DataAdapterHelperTest.java
rename to jadx-with-jadxecute/jadx-gui/src/test/java/jadx/gui/utils/codecache/disk/adapters/DataAdapterHelperTest.java
diff --git a/jadx-gui/src/test/resources/certificate-test/CERT.DSA b/jadx-with-jadxecute/jadx-gui/src/test/resources/certificate-test/CERT.DSA
similarity index 100%
rename from jadx-gui/src/test/resources/certificate-test/CERT.DSA
rename to jadx-with-jadxecute/jadx-gui/src/test/resources/certificate-test/CERT.DSA
diff --git a/jadx-gui/src/test/resources/certificate-test/CERT.RSA b/jadx-with-jadxecute/jadx-gui/src/test/resources/certificate-test/CERT.RSA
similarity index 100%
rename from jadx-gui/src/test/resources/certificate-test/CERT.RSA
rename to jadx-with-jadxecute/jadx-gui/src/test/resources/certificate-test/CERT.RSA
diff --git a/jadx-gui/src/test/resources/certificate-test/EMPTY.txt b/jadx-with-jadxecute/jadx-gui/src/test/resources/certificate-test/EMPTY.txt
similarity index 100%
rename from jadx-gui/src/test/resources/certificate-test/EMPTY.txt
rename to jadx-with-jadxecute/jadx-gui/src/test/resources/certificate-test/EMPTY.txt
diff --git a/jadx-gui/src/test/resources/logback-test.xml b/jadx-with-jadxecute/jadx-gui/src/test/resources/logback-test.xml
similarity index 100%
rename from jadx-gui/src/test/resources/logback-test.xml
rename to jadx-with-jadxecute/jadx-gui/src/test/resources/logback-test.xml
diff --git a/jadx-gui/src/test/smali/params.smali b/jadx-with-jadxecute/jadx-gui/src/test/smali/params.smali
similarity index 100%
rename from jadx-gui/src/test/smali/params.smali
rename to jadx-with-jadxecute/jadx-gui/src/test/smali/params.smali
diff --git a/jadx-gui/src/test/smali/switch.smali b/jadx-with-jadxecute/jadx-gui/src/test/smali/switch.smali
similarity index 100%
rename from jadx-gui/src/test/smali/switch.smali
rename to jadx-with-jadxecute/jadx-gui/src/test/smali/switch.smali
diff --git a/jadx-plugins/jadx-dex-input/build.gradle b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/build.gradle
similarity index 100%
rename from jadx-plugins/jadx-dex-input/build.gradle
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/build.gradle
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexException.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexException.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexException.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexException.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexFileLoader.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexFileLoader.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexFileLoader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexFileLoader.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexInputOptions.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexInputOptions.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexInputOptions.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexInputOptions.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexInputPlugin.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexInputPlugin.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexInputPlugin.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexInputPlugin.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexLoadResult.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexLoadResult.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexLoadResult.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexLoadResult.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexReader.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexReader.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexReader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/DexReader.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnData.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnData.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnData.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnFormat.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnFormat.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnFormat.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnFormat.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnInfo.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnInfo.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnInfo.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnInfo.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnMnemonics.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnMnemonics.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnMnemonics.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexInsnMnemonics.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexOpcodes.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexOpcodes.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexOpcodes.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/DexOpcodes.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/payloads/DexArrayPayload.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/payloads/DexArrayPayload.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/payloads/DexArrayPayload.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/insns/payloads/DexArrayPayload.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexAnnotationsConvert.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexAnnotationsConvert.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexAnnotationsConvert.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexAnnotationsConvert.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexClassData.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexClassData.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexClassData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexClassData.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexCodeReader.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexCodeReader.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexCodeReader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexCodeReader.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexConsts.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexConsts.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexConsts.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexConsts.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexFieldData.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexFieldData.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexFieldData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexFieldData.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexHeader.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexHeader.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexHeader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexHeader.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexMethodData.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexMethodData.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexMethodData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexMethodData.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexMethodProto.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexMethodProto.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexMethodProto.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexMethodProto.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexMethodRef.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexMethodRef.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexMethodRef.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexMethodRef.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/SectionReader.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/SectionReader.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/SectionReader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/SectionReader.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/AnnotationsParser.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/AnnotationsParser.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/AnnotationsParser.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/AnnotationsParser.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/AnnotationsUtils.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/AnnotationsUtils.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/AnnotationsUtils.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/AnnotationsUtils.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/EncodedValueParser.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/EncodedValueParser.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/EncodedValueParser.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/EncodedValueParser.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/debuginfo/DebugInfoParser.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/debuginfo/DebugInfoParser.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/debuginfo/DebugInfoParser.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/debuginfo/DebugInfoParser.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/debuginfo/DexLocalVar.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/debuginfo/DexLocalVar.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/debuginfo/DexLocalVar.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/debuginfo/DexLocalVar.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/InsnFormatter.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/InsnFormatter.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/InsnFormatter.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/InsnFormatter.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/InsnFormatterInfo.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/InsnFormatterInfo.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/InsnFormatterInfo.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/InsnFormatterInfo.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/SmaliCodeWriter.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/SmaliCodeWriter.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/SmaliCodeWriter.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/SmaliCodeWriter.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/SmaliInsnFormat.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/SmaliInsnFormat.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/SmaliInsnFormat.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/SmaliInsnFormat.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/SmaliPrinter.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/SmaliPrinter.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/SmaliPrinter.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/smali/SmaliPrinter.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/DexCheckSum.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/DexCheckSum.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/DexCheckSum.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/DexCheckSum.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/Leb128.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/Leb128.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/Leb128.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/Leb128.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/MUtf8.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/MUtf8.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/MUtf8.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/MUtf8.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/SmaliUtils.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/SmaliUtils.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/SmaliUtils.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/utils/SmaliUtils.java
diff --git a/jadx-plugins/jadx-dex-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
diff --git a/jadx-plugins/jadx-dex-input/src/test/java/jadx/plugins/input/dex/DexInputPluginTest.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/test/java/jadx/plugins/input/dex/DexInputPluginTest.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/test/java/jadx/plugins/input/dex/DexInputPluginTest.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/test/java/jadx/plugins/input/dex/DexInputPluginTest.java
diff --git a/jadx-plugins/jadx-dex-input/src/test/java/jadx/plugins/input/dex/utils/SmaliTestUtils.java b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/test/java/jadx/plugins/input/dex/utils/SmaliTestUtils.java
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/test/java/jadx/plugins/input/dex/utils/SmaliTestUtils.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/test/java/jadx/plugins/input/dex/utils/SmaliTestUtils.java
diff --git a/jadx-plugins/jadx-dex-input/src/test/resources/samples/app-with-fake-dex.apk b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/test/resources/samples/app-with-fake-dex.apk
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/test/resources/samples/app-with-fake-dex.apk
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/test/resources/samples/app-with-fake-dex.apk
diff --git a/jadx-plugins/jadx-dex-input/src/test/resources/samples/hello.dex b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/test/resources/samples/hello.dex
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/test/resources/samples/hello.dex
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/test/resources/samples/hello.dex
diff --git a/jadx-plugins/jadx-dex-input/src/test/resources/samples/test.smali b/jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/test/resources/samples/test.smali
similarity index 100%
rename from jadx-plugins/jadx-dex-input/src/test/resources/samples/test.smali
rename to jadx-with-jadxecute/jadx-plugins/jadx-dex-input/src/test/resources/samples/test.smali
diff --git a/jadx-plugins/jadx-java-convert/build.gradle b/jadx-with-jadxecute/jadx-plugins/jadx-java-convert/build.gradle
similarity index 100%
rename from jadx-plugins/jadx-java-convert/build.gradle
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-convert/build.gradle
diff --git a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/AsmUtils.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/AsmUtils.java
similarity index 100%
rename from jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/AsmUtils.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/AsmUtils.java
diff --git a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/ConvertResult.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/ConvertResult.java
similarity index 100%
rename from jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/ConvertResult.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/ConvertResult.java
diff --git a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/D8Converter.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/D8Converter.java
similarity index 100%
rename from jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/D8Converter.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/D8Converter.java
diff --git a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/DxConverter.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/DxConverter.java
similarity index 100%
rename from jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/DxConverter.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/DxConverter.java
diff --git a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertLoader.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertLoader.java
similarity index 100%
rename from jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertLoader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertLoader.java
diff --git a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertOptions.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertOptions.java
similarity index 100%
rename from jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertOptions.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertOptions.java
diff --git a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertPlugin.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertPlugin.java
similarity index 100%
rename from jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertPlugin.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertPlugin.java
diff --git a/jadx-plugins/jadx-java-convert/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin b/jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
similarity index 100%
rename from jadx-plugins/jadx-java-convert/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-convert/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
diff --git a/jadx-plugins/jadx-java-input/build.gradle b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/build.gradle
similarity index 100%
rename from jadx-plugins/jadx-java-input/build.gradle
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/build.gradle
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaClassReader.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaClassReader.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaClassReader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaClassReader.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaFileLoader.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaFileLoader.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaFileLoader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaFileLoader.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaInputPlugin.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaInputPlugin.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaInputPlugin.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaInputPlugin.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaLoadResult.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaLoadResult.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaLoadResult.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/JavaLoadResult.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/ClassOffsets.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/ClassOffsets.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/ClassOffsets.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/ClassOffsets.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/ConstPoolReader.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/ConstPoolReader.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/ConstPoolReader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/ConstPoolReader.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/ConstantType.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/ConstantType.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/ConstantType.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/ConstantType.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/DataReader.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/DataReader.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/DataReader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/DataReader.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaClassData.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaClassData.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaClassData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaClassData.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaFieldData.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaFieldData.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaFieldData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaFieldData.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaMethodData.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaMethodData.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaMethodData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaMethodData.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaMethodProto.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaMethodProto.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaMethodProto.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaMethodProto.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaMethodRef.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaMethodRef.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaMethodRef.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/JavaMethodRef.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/AttributesReader.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/AttributesReader.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/AttributesReader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/AttributesReader.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/EncodedValueReader.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/EncodedValueReader.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/EncodedValueReader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/EncodedValueReader.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/IJavaAttribute.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/IJavaAttribute.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/IJavaAttribute.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/IJavaAttribute.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/IJavaAttributeReader.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/IJavaAttributeReader.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/IJavaAttributeReader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/IJavaAttributeReader.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/JavaAttrStorage.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/JavaAttrStorage.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/JavaAttrStorage.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/JavaAttrStorage.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/JavaAttrType.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/JavaAttrType.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/JavaAttrType.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/JavaAttrType.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/JavaLocalVar.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/JavaLocalVar.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/JavaLocalVar.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/JavaLocalVar.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/LineNumberTableAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/LineNumberTableAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/LineNumberTableAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/LineNumberTableAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/LocalVarTypesAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/LocalVarTypesAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/LocalVarTypesAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/LocalVarTypesAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/LocalVarsAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/LocalVarsAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/LocalVarsAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/debuginfo/LocalVarsAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/CodeAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/CodeAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/CodeAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/CodeAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/ConstValueAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/ConstValueAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/ConstValueAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/ConstValueAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/IgnoredAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/IgnoredAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/IgnoredAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/IgnoredAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaAnnotationDefaultAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaAnnotationDefaultAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaAnnotationDefaultAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaAnnotationDefaultAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaAnnotationsAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaAnnotationsAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaAnnotationsAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaAnnotationsAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaBootstrapMethodsAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaBootstrapMethodsAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaBootstrapMethodsAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaBootstrapMethodsAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaExceptionsAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaExceptionsAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaExceptionsAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaExceptionsAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaInnerClsAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaInnerClsAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaInnerClsAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaInnerClsAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaMethodParametersAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaMethodParametersAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaMethodParametersAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaMethodParametersAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaParamAnnsAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaParamAnnsAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaParamAnnsAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaParamAnnsAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaSignatureAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaSignatureAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaSignatureAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaSignatureAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaSourceFileAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaSourceFileAttr.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaSourceFileAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/JavaSourceFileAttr.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/data/RawBootstrapMethod.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/data/RawBootstrapMethod.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/data/RawBootstrapMethod.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/attributes/types/data/RawBootstrapMethod.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/ArrayType.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/ArrayType.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/ArrayType.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/ArrayType.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/CodeDecodeState.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/CodeDecodeState.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/CodeDecodeState.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/CodeDecodeState.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaCodeReader.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaCodeReader.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaCodeReader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaCodeReader.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaInsnData.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaInsnData.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaInsnData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaInsnData.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaInsnInfo.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaInsnInfo.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaInsnInfo.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaInsnInfo.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaInsnsRegister.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaInsnsRegister.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaInsnsRegister.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/JavaInsnsRegister.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/StackState.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/StackState.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/StackState.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/StackState.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/IJavaInsnDecoder.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/IJavaInsnDecoder.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/IJavaInsnDecoder.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/IJavaInsnDecoder.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/InvokeDecoder.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/InvokeDecoder.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/InvokeDecoder.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/InvokeDecoder.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/LoadConstDecoder.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/LoadConstDecoder.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/LoadConstDecoder.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/LoadConstDecoder.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/LookupSwitchDecoder.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/LookupSwitchDecoder.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/LookupSwitchDecoder.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/LookupSwitchDecoder.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/TableSwitchDecoder.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/TableSwitchDecoder.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/TableSwitchDecoder.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/TableSwitchDecoder.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/WideDecoder.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/WideDecoder.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/WideDecoder.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/decoders/WideDecoder.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/trycatch/JavaSingleCatch.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/trycatch/JavaSingleCatch.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/trycatch/JavaSingleCatch.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/trycatch/JavaSingleCatch.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/trycatch/JavaTryData.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/trycatch/JavaTryData.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/trycatch/JavaTryData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/data/code/trycatch/JavaTryData.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/utils/DescriptorParser.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/utils/DescriptorParser.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/utils/DescriptorParser.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/utils/DescriptorParser.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/utils/DisasmUtils.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/utils/DisasmUtils.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/utils/DisasmUtils.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/utils/DisasmUtils.java
diff --git a/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/utils/JavaClassParseException.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/utils/JavaClassParseException.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/utils/JavaClassParseException.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/java/jadx/plugins/input/java/utils/JavaClassParseException.java
diff --git a/jadx-plugins/jadx-java-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
diff --git a/jadx-plugins/jadx-java-input/src/test/java/jadx/plugins/input/java/utils/DescriptorParserTest.java b/jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/test/java/jadx/plugins/input/java/utils/DescriptorParserTest.java
similarity index 100%
rename from jadx-plugins/jadx-java-input/src/test/java/jadx/plugins/input/java/utils/DescriptorParserTest.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-java-input/src/test/java/jadx/plugins/input/java/utils/DescriptorParserTest.java
diff --git a/jadx-plugins/jadx-plugins-api/build.gradle b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/build.gradle
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/build.gradle
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/build.gradle
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPlugin.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPlugin.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPlugin.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPlugin.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPluginInfo.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPluginInfo.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPluginInfo.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPluginInfo.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPluginManager.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPluginManager.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPluginManager.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/JadxPluginManager.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/JadxInputPlugin.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/JadxInputPlugin.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/JadxInputPlugin.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/JadxInputPlugin.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/AccessFlags.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/AccessFlags.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/AccessFlags.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/AccessFlags.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/AccessFlagsScope.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/AccessFlagsScope.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/AccessFlagsScope.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/AccessFlagsScope.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ICallSite.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ICallSite.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ICallSite.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ICallSite.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ICatch.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ICatch.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ICatch.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ICatch.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IClassData.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IClassData.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IClassData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IClassData.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ICodeReader.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ICodeReader.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ICodeReader.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ICodeReader.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IDebugInfo.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IDebugInfo.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IDebugInfo.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IDebugInfo.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IFieldData.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IFieldData.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IFieldData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IFieldData.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IFieldRef.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IFieldRef.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IFieldRef.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IFieldRef.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ILoadResult.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ILoadResult.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ILoadResult.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ILoadResult.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ILocalVar.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ILocalVar.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ILocalVar.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ILocalVar.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodData.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodData.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodData.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodHandle.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodHandle.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodHandle.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodHandle.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodProto.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodProto.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodProto.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodProto.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodRef.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodRef.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodRef.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IMethodRef.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IResourceData.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IResourceData.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IResourceData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/IResourceData.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ISeqConsumer.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ISeqConsumer.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ISeqConsumer.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ISeqConsumer.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ITry.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ITry.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ITry.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/ITry.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/MethodHandleType.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/MethodHandleType.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/MethodHandleType.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/MethodHandleType.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/AnnotationVisibility.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/AnnotationVisibility.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/AnnotationVisibility.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/AnnotationVisibility.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/EncodedType.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/EncodedType.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/EncodedType.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/EncodedType.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/EncodedValue.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/EncodedValue.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/EncodedValue.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/EncodedValue.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/IAnnotation.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/IAnnotation.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/IAnnotation.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/IAnnotation.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/JadxAnnotation.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/JadxAnnotation.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/JadxAnnotation.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/annotations/JadxAnnotation.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttrType.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttrType.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttrType.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttrType.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttribute.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttribute.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttribute.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttribute.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/JadxAttrType.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/JadxAttrType.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/JadxAttrType.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/JadxAttrType.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/PinnedAttribute.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/PinnedAttribute.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/PinnedAttribute.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/PinnedAttribute.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultAttr.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultAttr.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultClassAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultClassAttr.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultClassAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultClassAttr.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationMethodParamsAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationMethodParamsAttr.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationMethodParamsAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationMethodParamsAttr.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationsAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationsAttr.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationsAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationsAttr.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/ExceptionsAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/ExceptionsAttr.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/ExceptionsAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/ExceptionsAttr.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClassesAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClassesAttr.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClassesAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClassesAttr.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClsInfo.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClsInfo.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClsInfo.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClsInfo.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/MethodParametersAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/MethodParametersAttr.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/MethodParametersAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/MethodParametersAttr.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/SignatureAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/SignatureAttr.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/SignatureAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/SignatureAttr.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/SourceFileAttr.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/SourceFileAttr.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/SourceFileAttr.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/attributes/types/SourceFileAttr.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/CallSite.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/CallSite.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/CallSite.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/CallSite.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/CatchData.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/CatchData.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/CatchData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/CatchData.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/DebugInfo.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/DebugInfo.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/DebugInfo.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/DebugInfo.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/EmptyLoadResult.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/EmptyLoadResult.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/EmptyLoadResult.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/EmptyLoadResult.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/FieldRefHandle.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/FieldRefHandle.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/FieldRefHandle.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/FieldRefHandle.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/JadxFieldRef.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/JadxFieldRef.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/JadxFieldRef.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/JadxFieldRef.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/ListConsumer.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/ListConsumer.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/ListConsumer.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/ListConsumer.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/MethodRefHandle.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/MethodRefHandle.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/MethodRefHandle.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/MethodRefHandle.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/TryData.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/TryData.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/TryData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/data/impl/TryData.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/InsnData.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/InsnData.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/InsnData.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/InsnData.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/InsnIndexType.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/InsnIndexType.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/InsnIndexType.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/InsnIndexType.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/Opcode.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/Opcode.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/Opcode.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/Opcode.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/IArrayPayload.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/IArrayPayload.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/IArrayPayload.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/IArrayPayload.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/ICustomPayload.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/ICustomPayload.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/ICustomPayload.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/ICustomPayload.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/ISwitchPayload.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/ISwitchPayload.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/ISwitchPayload.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/ISwitchPayload.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/impl/SwitchPayload.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/impl/SwitchPayload.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/impl/SwitchPayload.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/input/insns/custom/impl/SwitchPayload.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/JadxPluginOptions.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/JadxPluginOptions.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/JadxPluginOptions.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/JadxPluginOptions.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/OptionDescription.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/OptionDescription.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/OptionDescription.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/OptionDescription.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/impl/BaseOptionsParser.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/impl/BaseOptionsParser.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/impl/BaseOptionsParser.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/impl/BaseOptionsParser.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/impl/JadxOptionDescription.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/impl/JadxOptionDescription.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/impl/JadxOptionDescription.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/options/impl/JadxOptionDescription.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/CommonFileUtils.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/CommonFileUtils.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/CommonFileUtils.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/CommonFileUtils.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/LimitedInputStream.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/LimitedInputStream.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/LimitedInputStream.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/LimitedInputStream.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/Utils.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/Utils.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/Utils.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/Utils.java
diff --git a/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/ZipSecurity.java b/jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/ZipSecurity.java
similarity index 100%
rename from jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/ZipSecurity.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-plugins-api/src/main/java/jadx/api/plugins/utils/ZipSecurity.java
diff --git a/jadx-plugins/jadx-raung-input/build.gradle b/jadx-with-jadxecute/jadx-plugins/jadx-raung-input/build.gradle
similarity index 100%
rename from jadx-plugins/jadx-raung-input/build.gradle
rename to jadx-with-jadxecute/jadx-plugins/jadx-raung-input/build.gradle
diff --git a/jadx-plugins/jadx-raung-input/src/main/java/jadx/plugins/input/raung/RaungConvert.java b/jadx-with-jadxecute/jadx-plugins/jadx-raung-input/src/main/java/jadx/plugins/input/raung/RaungConvert.java
similarity index 100%
rename from jadx-plugins/jadx-raung-input/src/main/java/jadx/plugins/input/raung/RaungConvert.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-raung-input/src/main/java/jadx/plugins/input/raung/RaungConvert.java
diff --git a/jadx-plugins/jadx-raung-input/src/main/java/jadx/plugins/input/raung/RaungInputPlugin.java b/jadx-with-jadxecute/jadx-plugins/jadx-raung-input/src/main/java/jadx/plugins/input/raung/RaungInputPlugin.java
similarity index 100%
rename from jadx-plugins/jadx-raung-input/src/main/java/jadx/plugins/input/raung/RaungInputPlugin.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-raung-input/src/main/java/jadx/plugins/input/raung/RaungInputPlugin.java
diff --git a/jadx-plugins/jadx-raung-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin b/jadx-with-jadxecute/jadx-plugins/jadx-raung-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
similarity index 100%
rename from jadx-plugins/jadx-raung-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
rename to jadx-with-jadxecute/jadx-plugins/jadx-raung-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
diff --git a/jadx-plugins/jadx-smali-input/build.gradle b/jadx-with-jadxecute/jadx-plugins/jadx-smali-input/build.gradle
similarity index 100%
rename from jadx-plugins/jadx-smali-input/build.gradle
rename to jadx-with-jadxecute/jadx-plugins/jadx-smali-input/build.gradle
diff --git a/jadx-plugins/jadx-smali-input/src/main/java/jadx/plugins/input/smali/SmaliConvert.java b/jadx-with-jadxecute/jadx-plugins/jadx-smali-input/src/main/java/jadx/plugins/input/smali/SmaliConvert.java
similarity index 100%
rename from jadx-plugins/jadx-smali-input/src/main/java/jadx/plugins/input/smali/SmaliConvert.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-smali-input/src/main/java/jadx/plugins/input/smali/SmaliConvert.java
diff --git a/jadx-plugins/jadx-smali-input/src/main/java/jadx/plugins/input/smali/SmaliInputPlugin.java b/jadx-with-jadxecute/jadx-plugins/jadx-smali-input/src/main/java/jadx/plugins/input/smali/SmaliInputPlugin.java
similarity index 100%
rename from jadx-plugins/jadx-smali-input/src/main/java/jadx/plugins/input/smali/SmaliInputPlugin.java
rename to jadx-with-jadxecute/jadx-plugins/jadx-smali-input/src/main/java/jadx/plugins/input/smali/SmaliInputPlugin.java
diff --git a/jadx-plugins/jadx-smali-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin b/jadx-with-jadxecute/jadx-plugins/jadx-smali-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
similarity index 100%
rename from jadx-plugins/jadx-smali-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
rename to jadx-with-jadxecute/jadx-plugins/jadx-smali-input/src/main/resources/META-INF/services/jadx.api.plugins.JadxPlugin
diff --git a/lgtm.yml b/jadx-with-jadxecute/lgtm.yml
similarity index 100%
rename from lgtm.yml
rename to jadx-with-jadxecute/lgtm.yml
diff --git a/settings.gradle b/jadx-with-jadxecute/settings.gradle
similarity index 100%
rename from settings.gradle
rename to jadx-with-jadxecute/settings.gradle