diff --git a/.gitignore b/.gitignore
index 4885a10..7051cf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,14 @@
-src/*/.classpath
-src/*/.settings
-src/*/.project
-src/*/.cache*
-src/*/target
-src/*/bin
-src/.gradle
-src/.settings
-src/.project
-src/build
-src/*/build
-src/com.logicalhacking.dasca.dataflow/config/main.config
-src/com.logicalhacking.dasca.dataflow/main.log*
-src/com.logicalhacking.dasca.crosslanguage/BuildCordovaCallgraph.launch
+*/.classpath
+*/.settings
+*/.project
+*/.cache*
+*/target
+*/bin
+.gradle
+.settings
+.project
+build
+*/build
+com.logicalhacking.dasca.dataflow/config/main.config
+com.logicalhacking.dasca.dataflow/main.log*
+com.logicalhacking.dasca.crosslanguage/BuildCordovaCallgraph.launch
diff --git a/src/build.gradle b/build.gradle
similarity index 100%
rename from src/build.gradle
rename to build.gradle
diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/.gitignore b/com.logicalhacking.dasca.crosslanguage.test/.gitignore
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage.test/.gitignore
rename to com.logicalhacking.dasca.crosslanguage.test/.gitignore
diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/build.gradle b/com.logicalhacking.dasca.crosslanguage.test/build.gradle
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage.test/build.gradle
rename to com.logicalhacking.dasca.crosslanguage.test/build.gradle
diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/src/test/resources/de.zertapps.dvhma.featherweight.apk b/com.logicalhacking.dasca.crosslanguage.test/src/test/resources/de.zertapps.dvhma.featherweight.apk
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage.test/src/test/resources/de.zertapps.dvhma.featherweight.apk
rename to com.logicalhacking.dasca.crosslanguage.test/src/test/resources/de.zertapps.dvhma.featherweight.apk
diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/src/test/resources/de.zertapps.dvhma.featherweight_1.0.0_3.5.0_debug.apk b/com.logicalhacking.dasca.crosslanguage.test/src/test/resources/de.zertapps.dvhma.featherweight_1.0.0_3.5.0_debug.apk
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage.test/src/test/resources/de.zertapps.dvhma.featherweight_1.0.0_3.5.0_debug.apk
rename to com.logicalhacking.dasca.crosslanguage.test/src/test/resources/de.zertapps.dvhma.featherweight_1.0.0_3.5.0_debug.apk
diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/src/test/resources/de.zertapps.dvhma.featherweight_1.0.0_6.3.0_debug.apk b/com.logicalhacking.dasca.crosslanguage.test/src/test/resources/de.zertapps.dvhma.featherweight_1.0.0_6.3.0_debug.apk
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage.test/src/test/resources/de.zertapps.dvhma.featherweight_1.0.0_6.3.0_debug.apk
rename to com.logicalhacking.dasca.crosslanguage.test/src/test/resources/de.zertapps.dvhma.featherweight_1.0.0_6.3.0_debug.apk
diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/AppInfo.scala b/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/AppInfo.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/AppInfo.scala
rename to com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/AppInfo.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/AppTest.scala b/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/AppTest.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/AppTest.scala
rename to com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/AppTest.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Featherweight.scala b/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Featherweight.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Featherweight.scala
rename to com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Featherweight.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Featherweight_100_350.scala b/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Featherweight_100_350.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Featherweight_100_350.scala
rename to com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Featherweight_100_350.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Featherweight_100_630.scala b/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Featherweight_100_630.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Featherweight_100_630.scala
rename to com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Featherweight_100_630.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Tags.scala b/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Tags.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Tags.scala
rename to com.logicalhacking.dasca.crosslanguage.test/src/test/scala/com/logicalhacking/dasca/crosslanguage/test/Tags.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/.gitignore b/com.logicalhacking.dasca.crosslanguage/.gitignore
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/.gitignore
rename to com.logicalhacking.dasca.crosslanguage/.gitignore
diff --git a/src/com.logicalhacking.dasca.crosslanguage/BuildCordovaCallgraph.in.launch b/com.logicalhacking.dasca.crosslanguage/BuildCordovaCallgraph.in.launch
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/BuildCordovaCallgraph.in.launch
rename to com.logicalhacking.dasca.crosslanguage/BuildCordovaCallgraph.in.launch
diff --git a/src/com.logicalhacking.dasca.crosslanguage/build.gradle b/com.logicalhacking.dasca.crosslanguage/build.gradle
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/build.gradle
rename to com.logicalhacking.dasca.crosslanguage/build.gradle
diff --git a/src/com.logicalhacking.dasca.crosslanguage/logback.xml b/com.logicalhacking.dasca.crosslanguage/logback.xml
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/logback.xml
rename to com.logicalhacking.dasca.crosslanguage/logback.xml
diff --git a/src/com.logicalhacking.dasca.crosslanguage/logging.properties b/com.logicalhacking.dasca.crosslanguage/logging.properties
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/logging.properties
rename to com.logicalhacking.dasca.crosslanguage/logging.properties
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/resources/javaexclusions.txt b/com.logicalhacking.dasca.crosslanguage/src/main/resources/javaexclusions.txt
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/resources/javaexclusions.txt
rename to com.logicalhacking.dasca.crosslanguage/src/main/resources/javaexclusions.txt
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/Main.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/Main.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/Main.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/Main.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/AllScriptsExtractor.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/AllScriptsExtractor.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/AllScriptsExtractor.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/AllScriptsExtractor.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/CordovaCGBuilder.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/CordovaCGBuilder.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/CordovaCGBuilder.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/CordovaCGBuilder.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/CrossBuilderOption.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/CrossBuilderOption.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/CrossBuilderOption.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/CrossBuilderOption.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/DalvikLineNumberCalculator.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/DalvikLineNumberCalculator.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/DalvikLineNumberCalculator.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/DalvikLineNumberCalculator.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/EmptyCallGraph.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/EmptyCallGraph.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/EmptyCallGraph.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/EmptyCallGraph.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/MergedCallGraph.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/MergedCallGraph.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/MergedCallGraph.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/MergedCallGraph.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/PluginInfo.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/PluginInfo.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/PluginInfo.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/PluginInfo.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/algorithms/ExecuteActionBasedChecker.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/algorithms/ExecuteActionBasedChecker.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/algorithms/ExecuteActionBasedChecker.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/algorithms/ExecuteActionBasedChecker.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/algorithms/ReachabilityChecker.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/algorithms/ReachabilityChecker.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/algorithms/ReachabilityChecker.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/builder/algorithms/ReachabilityChecker.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/cg/CallTree.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/cg/CallTree.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/cg/CallTree.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/cg/CallTree.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/cg/CallTreeBuilder.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/cg/CallTreeBuilder.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/cg/CallTreeBuilder.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/cg/CallTreeBuilder.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/FileMapRecorder.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/FileMapRecorder.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/FileMapRecorder.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/FileMapRecorder.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/FileMappingStore.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/FileMappingStore.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/FileMappingStore.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/FileMappingStore.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/JavaScriptSourceLocation.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/JavaScriptSourceLocation.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/JavaScriptSourceLocation.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/JavaScriptSourceLocation.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/JavaSourceLocation.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/JavaSourceLocation.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/JavaSourceLocation.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/JavaSourceLocation.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/SourceLocation.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/SourceLocation.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/SourceLocation.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/SourceLocation.scala
diff --git a/src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/Util.scala b/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/Util.scala
similarity index 100%
rename from src/com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/Util.scala
rename to com.logicalhacking.dasca.crosslanguage/src/main/scala/com/logicalhacking/dasca/crosslanguage/util/Util.scala
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/build.gradle b/com.logicalhacking.dasca.dataflow.test.data/build.gradle
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/build.gradle
rename to com.logicalhacking.dasca.dataflow.test.data/build.gradle
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test01.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test01.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test01.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test01.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test02.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test02.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test02.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test02.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test03.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test03.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test03.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test03.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test04.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test04.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test04.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test04.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test05.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test05.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test05.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test05.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test06.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test06.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test06.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test06.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test07.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test07.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test07.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test07.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test08.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test08.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test08.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test08.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test09.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test09.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test09.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test09.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test10.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test10.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test10.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test10.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test11.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test11.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test11.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test11.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test12.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test12.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test12.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test12.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test13.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test13.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test13.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test13.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test14.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test14.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test14.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test14.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test15.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test15.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test15.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test15.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test16.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test16.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test16.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test16.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test17.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test17.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test17.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test17.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test18.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test18.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test18.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test18.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test19.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test19.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test19.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/Test19.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/dummy/IO.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/dummy/IO.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/dummy/IO.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/dummy/IO.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/dummy/Logger.java b/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/dummy/Logger.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/dummy/Logger.java
rename to com.logicalhacking.dasca.dataflow.test.data/src/main/java/com/logicalhacking/dasca/dataflow/test/data/dummy/Logger.java
diff --git a/src/com.logicalhacking.dasca.dataflow.test.data/src/test/java/.empty b/com.logicalhacking.dasca.dataflow.test.data/src/test/java/.empty
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow.test.data/src/test/java/.empty
rename to com.logicalhacking.dasca.dataflow.test.data/src/test/java/.empty
diff --git a/src/com.logicalhacking.dasca.dataflow/META-INF/MANIFEST.MF b/com.logicalhacking.dasca.dataflow/META-INF/MANIFEST.MF
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/META-INF/MANIFEST.MF
rename to com.logicalhacking.dasca.dataflow/META-INF/MANIFEST.MF
diff --git a/src/com.logicalhacking.dasca.dataflow/build.gradle b/com.logicalhacking.dasca.dataflow/build.gradle
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/build.gradle
rename to com.logicalhacking.dasca.dataflow/build.gradle
diff --git a/src/com.logicalhacking.dasca.dataflow/com.logicalhacking.dasca.dataflow-junit.launch b/com.logicalhacking.dasca.dataflow/com.logicalhacking.dasca.dataflow-junit.launch
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/com.logicalhacking.dasca.dataflow-junit.launch
rename to com.logicalhacking.dasca.dataflow/com.logicalhacking.dasca.dataflow-junit.launch
diff --git a/src/com.logicalhacking.dasca.dataflow/config/Java60RegressionExclusions.txt b/com.logicalhacking.dasca.dataflow/config/Java60RegressionExclusions.txt
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/config/Java60RegressionExclusions.txt
rename to com.logicalhacking.dasca.dataflow/config/Java60RegressionExclusions.txt
diff --git a/src/com.logicalhacking.dasca.dataflow/config/log4j.properties b/com.logicalhacking.dasca.dataflow/config/log4j.properties
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/config/log4j.properties
rename to com.logicalhacking.dasca.dataflow/config/log4j.properties
diff --git a/src/com.logicalhacking.dasca.dataflow/config/main.config.in b/com.logicalhacking.dasca.dataflow/config/main.config.in
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/config/main.config.in
rename to com.logicalhacking.dasca.dataflow/config/main.config.in
diff --git a/src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/AnalysisUtil.java b/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/AnalysisUtil.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/AnalysisUtil.java
rename to com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/AnalysisUtil.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/PlugInUtil.java b/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/PlugInUtil.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/PlugInUtil.java
rename to com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/PlugInUtil.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/SMTChecker.java b/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/SMTChecker.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/SMTChecker.java
rename to com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/SMTChecker.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/SSAInstructionKey.java b/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/SSAInstructionKey.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/SSAInstructionKey.java
rename to com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/SSAInstructionKey.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/SuperGraphUtil.java b/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/SuperGraphUtil.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/SuperGraphUtil.java
rename to com.logicalhacking.dasca.dataflow/src/main/java/com/logicalhacking/dasca/dataflow/util/SuperGraphUtil.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test01.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test01.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test01.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test01.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test02.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test02.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test02.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test02.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test03.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test03.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test03.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test03.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test04.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test04.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test04.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test04.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test05.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test05.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test05.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test05.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test06.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test06.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test06.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test06.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test07.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test07.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test07.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test07.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test08.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test08.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test08.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test08.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test09.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test09.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test09.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test09.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test10.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test10.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test10.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test10.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test11.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test11.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test11.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test11.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test12.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test12.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test12.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test12.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test13.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test13.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test13.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test13.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test14.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test14.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test14.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test14.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test15.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test15.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test15.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test15.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test16.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test16.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test16.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test16.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test17.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test17.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test17.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test17.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test18.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test18.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test18.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test18.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test19.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test19.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test19.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/Test19.java
diff --git a/src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/TestSuite.java b/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/TestSuite.java
similarity index 100%
rename from src/com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/TestSuite.java
rename to com.logicalhacking.dasca.dataflow/src/test/java/com/logicalhacking/dasca/dataflow/test/TestSuite.java
diff --git a/src/com.logicalhacking.dasca.js/build.gradle b/com.logicalhacking.dasca.js/build.gradle
similarity index 100%
rename from src/com.logicalhacking.dasca.js/build.gradle
rename to com.logicalhacking.dasca.js/build.gradle
diff --git a/src/com.logicalhacking.dasca.js/examples/js_deadcode_001.html b/com.logicalhacking.dasca.js/examples/js_deadcode_001.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_deadcode_001.html
rename to com.logicalhacking.dasca.js/examples/js_deadcode_001.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_eval_001.html b/com.logicalhacking.dasca.js/examples/js_eval_001.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_eval_001.html
rename to com.logicalhacking.dasca.js/examples/js_eval_001.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_eval_002.html b/com.logicalhacking.dasca.js/examples/js_eval_002.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_eval_002.html
rename to com.logicalhacking.dasca.js/examples/js_eval_002.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_eval_003.html b/com.logicalhacking.dasca.js/examples/js_eval_003.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_eval_003.html
rename to com.logicalhacking.dasca.js/examples/js_eval_003.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_eval_004.html b/com.logicalhacking.dasca.js/examples/js_eval_004.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_eval_004.html
rename to com.logicalhacking.dasca.js/examples/js_eval_004.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_eval_window.name_a_onclick.html b/com.logicalhacking.dasca.js/examples/js_eval_window.name_a_onclick.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_eval_window.name_a_onclick.html
rename to com.logicalhacking.dasca.js/examples/js_eval_window.name_a_onclick.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_eval_window.name_body_onload.html b/com.logicalhacking.dasca.js/examples/js_eval_window.name_body_onload.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_eval_window.name_body_onload.html
rename to com.logicalhacking.dasca.js/examples/js_eval_window.name_body_onload.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_eval_window.name_head.html b/com.logicalhacking.dasca.js/examples/js_eval_window.name_head.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_eval_window.name_head.html
rename to com.logicalhacking.dasca.js/examples/js_eval_window.name_head.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_storage_001.html b/com.logicalhacking.dasca.js/examples/js_storage_001.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_storage_001.html
rename to com.logicalhacking.dasca.js/examples/js_storage_001.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_storage_002.html b/com.logicalhacking.dasca.js/examples/js_storage_002.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_storage_002.html
rename to com.logicalhacking.dasca.js/examples/js_storage_002.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_storage_011.html b/com.logicalhacking.dasca.js/examples/js_storage_011.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_storage_011.html
rename to com.logicalhacking.dasca.js/examples/js_storage_011.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_string_001.html b/com.logicalhacking.dasca.js/examples/js_string_001.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_string_001.html
rename to com.logicalhacking.dasca.js/examples/js_string_001.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_string_002.html b/com.logicalhacking.dasca.js/examples/js_string_002.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_string_002.html
rename to com.logicalhacking.dasca.js/examples/js_string_002.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_string_003.html b/com.logicalhacking.dasca.js/examples/js_string_003.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_string_003.html
rename to com.logicalhacking.dasca.js/examples/js_string_003.html
diff --git a/src/com.logicalhacking.dasca.js/examples/js_string_co_001.html b/com.logicalhacking.dasca.js/examples/js_string_co_001.html
similarity index 100%
rename from src/com.logicalhacking.dasca.js/examples/js_string_co_001.html
rename to com.logicalhacking.dasca.js/examples/js_string_co_001.html
diff --git a/src/com.logicalhacking.dasca.js/resources/config.xml b/com.logicalhacking.dasca.js/resources/config.xml
similarity index 100%
rename from src/com.logicalhacking.dasca.js/resources/config.xml
rename to com.logicalhacking.dasca.js/resources/config.xml
diff --git a/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/CFGAnalyzer.java b/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/CFGAnalyzer.java
similarity index 100%
rename from src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/CFGAnalyzer.java
rename to com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/CFGAnalyzer.java
diff --git a/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/GUI.java b/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/GUI.java
similarity index 100%
rename from src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/GUI.java
rename to com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/GUI.java
diff --git a/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/ImprovedJSCallGraphBuilderUtil.java b/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/ImprovedJSCallGraphBuilderUtil.java
similarity index 100%
rename from src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/ImprovedJSCallGraphBuilderUtil.java
rename to com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/ImprovedJSCallGraphBuilderUtil.java
diff --git a/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/Item.java b/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/Item.java
similarity index 100%
rename from src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/Item.java
rename to com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/Item.java
diff --git a/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/Main.java b/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/Main.java
similarity index 100%
rename from src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/Main.java
rename to com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/Main.java
diff --git a/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/StaXParser.java b/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/StaXParser.java
similarity index 100%
rename from src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/StaXParser.java
rename to com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/StaXParser.java
diff --git a/src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/SuperGraphUtil.java b/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/SuperGraphUtil.java
similarity index 100%
rename from src/com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/SuperGraphUtil.java
rename to com.logicalhacking.dasca.js/src/main/java/com/logicalhacking/dasca/js/SuperGraphUtil.java
diff --git a/src/gradle.properties b/gradle.properties
similarity index 100%
rename from src/gradle.properties
rename to gradle.properties
diff --git a/src/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from src/gradle/wrapper/gradle-wrapper.jar
rename to gradle/wrapper/gradle-wrapper.jar
diff --git a/src/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from src/gradle/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
diff --git a/src/gradlew b/gradlew
similarity index 100%
rename from src/gradlew
rename to gradlew
diff --git a/src/gradlew.bat b/gradlew.bat
similarity index 100%
rename from src/gradlew.bat
rename to gradlew.bat
diff --git a/src/settings.gradle b/settings.gradle
similarity index 100%
rename from src/settings.gradle
rename to settings.gradle