diff --git a/ch.psi.fda/.gitignore b/.gitignore
similarity index 100%
rename from ch.psi.fda/.gitignore
rename to .gitignore
diff --git a/ch.psi.fda/Readme.md b/Readme.md
similarity index 100%
rename from ch.psi.fda/Readme.md
rename to Readme.md
diff --git a/ch.psi.fda/build.gradle b/build.gradle
similarity index 100%
rename from ch.psi.fda/build.gradle
rename to build.gradle
diff --git a/ch.psi.fda/pom.xml b/pom.xml
similarity index 100%
rename from ch.psi.fda/pom.xml
rename to pom.xml
diff --git a/ch.psi.fda/site/pictures/fda_small.svg b/site/pictures/fda_small.svg
similarity index 100%
rename from ch.psi.fda/site/pictures/fda_small.svg
rename to site/pictures/fda_small.svg
diff --git a/ch.psi.fda/site/pictures/fda_splashScreen.png b/site/pictures/fda_splashScreen.png
similarity index 100%
rename from ch.psi.fda/site/pictures/fda_splashScreen.png
rename to site/pictures/fda_splashScreen.png
diff --git a/ch.psi.fda/site/pictures/fda_splashScreen.svg b/site/pictures/fda_splashScreen.svg
similarity index 100%
rename from ch.psi.fda/site/pictures/fda_splashScreen.svg
rename to site/pictures/fda_splashScreen.svg
diff --git a/ch.psi.fda/site/pictures/fda_transparent.png b/site/pictures/fda_transparent.png
similarity index 100%
rename from ch.psi.fda/site/pictures/fda_transparent.png
rename to site/pictures/fda_transparent.png
diff --git a/ch.psi.fda/site/pictures/logo_only.png b/site/pictures/logo_only.png
similarity index 100%
rename from ch.psi.fda/site/pictures/logo_only.png
rename to site/pictures/logo_only.png
diff --git a/ch.psi.fda/src/main/assembly/assembly.xml b/src/main/assembly/assembly.xml
similarity index 100%
rename from ch.psi.fda/src/main/assembly/assembly.xml
rename to src/main/assembly/assembly.xml
diff --git a/ch.psi.fda/src/main/assembly/bin/convert b/src/main/assembly/bin/convert
similarity index 100%
rename from ch.psi.fda/src/main/assembly/bin/convert
rename to src/main/assembly/bin/convert
diff --git a/ch.psi.fda/src/main/assembly/bin/scan b/src/main/assembly/bin/scan
similarity index 100%
rename from ch.psi.fda/src/main/assembly/bin/scan
rename to src/main/assembly/bin/scan
diff --git a/ch.psi.fda/src/main/assembly/bin/scan_local b/src/main/assembly/bin/scan_local
similarity index 100%
rename from ch.psi.fda/src/main/assembly/bin/scan_local
rename to src/main/assembly/bin/scan_local
diff --git a/ch.psi.fda/src/main/assembly/bin/server b/src/main/assembly/bin/server
similarity index 100%
rename from ch.psi.fda/src/main/assembly/bin/server
rename to src/main/assembly/bin/server
diff --git a/ch.psi.fda/src/main/assembly/bin/viewer b/src/main/assembly/bin/viewer
similarity index 100%
rename from ch.psi.fda/src/main/assembly/bin/viewer
rename to src/main/assembly/bin/viewer
diff --git a/ch.psi.fda/src/main/assembly/bin/visualize b/src/main/assembly/bin/visualize
similarity index 100%
rename from ch.psi.fda/src/main/assembly/bin/visualize
rename to src/main/assembly/bin/visualize
diff --git a/ch.psi.fda/src/main/assembly/www/apple-touch-icon-114x114-precomposed.png b/src/main/assembly/www/apple-touch-icon-114x114-precomposed.png
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/apple-touch-icon-114x114-precomposed.png
rename to src/main/assembly/www/apple-touch-icon-114x114-precomposed.png
diff --git a/ch.psi.fda/src/main/assembly/www/apple-touch-icon-144x144-precomposed.png b/src/main/assembly/www/apple-touch-icon-144x144-precomposed.png
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/apple-touch-icon-144x144-precomposed.png
rename to src/main/assembly/www/apple-touch-icon-144x144-precomposed.png
diff --git a/ch.psi.fda/src/main/assembly/www/apple-touch-icon-57x57-precomposed.png b/src/main/assembly/www/apple-touch-icon-57x57-precomposed.png
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/apple-touch-icon-57x57-precomposed.png
rename to src/main/assembly/www/apple-touch-icon-57x57-precomposed.png
diff --git a/ch.psi.fda/src/main/assembly/www/apple-touch-icon-72x72-precomposed.png b/src/main/assembly/www/apple-touch-icon-72x72-precomposed.png
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/apple-touch-icon-72x72-precomposed.png
rename to src/main/assembly/www/apple-touch-icon-72x72-precomposed.png
diff --git a/ch.psi.fda/src/main/assembly/www/apple-touch-icon-precomposed.png b/src/main/assembly/www/apple-touch-icon-precomposed.png
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/apple-touch-icon-precomposed.png
rename to src/main/assembly/www/apple-touch-icon-precomposed.png
diff --git a/ch.psi.fda/src/main/assembly/www/apple-touch-icon.png b/src/main/assembly/www/apple-touch-icon.png
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/apple-touch-icon.png
rename to src/main/assembly/www/apple-touch-icon.png
diff --git a/ch.psi.fda/src/main/assembly/www/css/bootstrap-responsive.css b/src/main/assembly/www/css/bootstrap-responsive.css
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/css/bootstrap-responsive.css
rename to src/main/assembly/www/css/bootstrap-responsive.css
diff --git a/ch.psi.fda/src/main/assembly/www/css/bootstrap-responsive.min.css b/src/main/assembly/www/css/bootstrap-responsive.min.css
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/css/bootstrap-responsive.min.css
rename to src/main/assembly/www/css/bootstrap-responsive.min.css
diff --git a/ch.psi.fda/src/main/assembly/www/css/bootstrap.css b/src/main/assembly/www/css/bootstrap.css
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/css/bootstrap.css
rename to src/main/assembly/www/css/bootstrap.css
diff --git a/ch.psi.fda/src/main/assembly/www/css/bootstrap.min.css b/src/main/assembly/www/css/bootstrap.min.css
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/css/bootstrap.min.css
rename to src/main/assembly/www/css/bootstrap.min.css
diff --git a/ch.psi.fda/src/main/assembly/www/css/main.css b/src/main/assembly/www/css/main.css
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/css/main.css
rename to src/main/assembly/www/css/main.css
diff --git a/ch.psi.fda/src/main/assembly/www/favicon.ico b/src/main/assembly/www/favicon.ico
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/favicon.ico
rename to src/main/assembly/www/favicon.ico
diff --git a/ch.psi.fda/src/main/assembly/www/img/glyphicons-halflings-white.png b/src/main/assembly/www/img/glyphicons-halflings-white.png
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/img/glyphicons-halflings-white.png
rename to src/main/assembly/www/img/glyphicons-halflings-white.png
diff --git a/ch.psi.fda/src/main/assembly/www/img/glyphicons-halflings.png b/src/main/assembly/www/img/glyphicons-halflings.png
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/img/glyphicons-halflings.png
rename to src/main/assembly/www/img/glyphicons-halflings.png
diff --git a/ch.psi.fda/src/main/assembly/www/index.html b/src/main/assembly/www/index.html
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/index.html
rename to src/main/assembly/www/index.html
diff --git a/ch.psi.fda/src/main/assembly/www/js/jquery-2.0.0.min.js b/src/main/assembly/www/js/jquery-2.0.0.min.js
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/js/jquery-2.0.0.min.js
rename to src/main/assembly/www/js/jquery-2.0.0.min.js
diff --git a/ch.psi.fda/src/main/assembly/www/js/main.js b/src/main/assembly/www/js/main.js
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/js/main.js
rename to src/main/assembly/www/js/main.js
diff --git a/ch.psi.fda/src/main/assembly/www/js/vendor/bootstrap.js b/src/main/assembly/www/js/vendor/bootstrap.js
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/js/vendor/bootstrap.js
rename to src/main/assembly/www/js/vendor/bootstrap.js
diff --git a/ch.psi.fda/src/main/assembly/www/js/vendor/bootstrap.min.js b/src/main/assembly/www/js/vendor/bootstrap.min.js
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/js/vendor/bootstrap.min.js
rename to src/main/assembly/www/js/vendor/bootstrap.min.js
diff --git a/ch.psi.fda/src/main/assembly/www/js/vendor/jquery-1.9.1.min.js b/src/main/assembly/www/js/vendor/jquery-1.9.1.min.js
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/js/vendor/jquery-1.9.1.min.js
rename to src/main/assembly/www/js/vendor/jquery-1.9.1.min.js
diff --git a/ch.psi.fda/src/main/assembly/www/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js b/src/main/assembly/www/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
similarity index 100%
rename from ch.psi.fda/src/main/assembly/www/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
rename to src/main/assembly/www/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializer.java b/src/main/java/ch/psi/fda/deserializer/DataDeserializer.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializer.java
rename to src/main/java/ch/psi/fda/deserializer/DataDeserializer.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerMDA.java b/src/main/java/ch/psi/fda/deserializer/DataDeserializerMDA.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerMDA.java
rename to src/main/java/ch/psi/fda/deserializer/DataDeserializerMDA.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerTXT.java b/src/main/java/ch/psi/fda/deserializer/DataDeserializerTXT.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/deserializer/DataDeserializerTXT.java
rename to src/main/java/ch/psi/fda/deserializer/DataDeserializerTXT.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/gui/ProgressPanel.java b/src/main/java/ch/psi/fda/gui/ProgressPanel.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/gui/ProgressPanel.java
rename to src/main/java/ch/psi/fda/gui/ProgressPanel.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/gui/ScrollableFlowPanel.java b/src/main/java/ch/psi/fda/gui/ScrollableFlowPanel.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/gui/ScrollableFlowPanel.java
rename to src/main/java/ch/psi/fda/gui/ScrollableFlowPanel.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionEngine.java b/src/main/java/ch/psi/fda/rest/ExecutionEngine.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionEngine.java
rename to src/main/java/ch/psi/fda/rest/ExecutionEngine.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionJob.java b/src/main/java/ch/psi/fda/rest/ExecutionJob.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionJob.java
rename to src/main/java/ch/psi/fda/rest/ExecutionJob.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaServer.java b/src/main/java/ch/psi/fda/rest/FdaServer.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaServer.java
rename to src/main/java/ch/psi/fda/rest/FdaServer.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/InjectionModule.java b/src/main/java/ch/psi/fda/rest/InjectionModule.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/InjectionModule.java
rename to src/main/java/ch/psi/fda/rest/InjectionModule.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/JobEntry.java b/src/main/java/ch/psi/fda/rest/JobEntry.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/JobEntry.java
rename to src/main/java/ch/psi/fda/rest/JobEntry.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ResourceBinder.java b/src/main/java/ch/psi/fda/rest/ResourceBinder.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/ResourceBinder.java
rename to src/main/java/ch/psi/fda/rest/ResourceBinder.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java b/src/main/java/ch/psi/fda/rest/ZMQDataService.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/ZMQDataService.java
rename to src/main/java/ch/psi/fda/rest/ZMQDataService.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/services/EDescriptorJAXBContextProvider.java b/src/main/java/ch/psi/fda/rest/services/EDescriptorJAXBContextProvider.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/services/EDescriptorJAXBContextProvider.java
rename to src/main/java/ch/psi/fda/rest/services/EDescriptorJAXBContextProvider.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/services/ExecutionService.java b/src/main/java/ch/psi/fda/rest/services/ExecutionService.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/services/ExecutionService.java
rename to src/main/java/ch/psi/fda/rest/services/ExecutionService.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/SerializerMAT.java b/src/main/java/ch/psi/fda/serializer/SerializerMAT.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/serializer/SerializerMAT.java
rename to src/main/java/ch/psi/fda/serializer/SerializerMAT.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/SerializerMAT2D.java b/src/main/java/ch/psi/fda/serializer/SerializerMAT2D.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/serializer/SerializerMAT2D.java
rename to src/main/java/ch/psi/fda/serializer/SerializerMAT2D.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/SerializerMAT2DZigZag.java b/src/main/java/ch/psi/fda/serializer/SerializerMAT2DZigZag.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/serializer/SerializerMAT2DZigZag.java
rename to src/main/java/ch/psi/fda/serializer/SerializerMAT2DZigZag.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/SerializerMDA.java b/src/main/java/ch/psi/fda/serializer/SerializerMDA.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/serializer/SerializerMDA.java
rename to src/main/java/ch/psi/fda/serializer/SerializerMDA.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/SerializerTXT2D.java b/src/main/java/ch/psi/fda/serializer/SerializerTXT2D.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/serializer/SerializerTXT2D.java
rename to src/main/java/ch/psi/fda/serializer/SerializerTXT2D.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/serializer/SerializerTXTSplit.java b/src/main/java/ch/psi/fda/serializer/SerializerTXTSplit.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/serializer/SerializerTXTSplit.java
rename to src/main/java/ch/psi/fda/serializer/SerializerTXTSplit.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/AcquisitionMain.java b/src/main/java/ch/psi/fda/ui/AcquisitionMain.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/AcquisitionMain.java
rename to src/main/java/ch/psi/fda/ui/AcquisitionMain.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/ApplicationConfigurator.java b/src/main/java/ch/psi/fda/ui/ApplicationConfigurator.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/ApplicationConfigurator.java
rename to src/main/java/ch/psi/fda/ui/ApplicationConfigurator.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/ConversionMain.java b/src/main/java/ch/psi/fda/ui/ConversionMain.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/ConversionMain.java
rename to src/main/java/ch/psi/fda/ui/ConversionMain.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/RemoteAcquisitionMain.java b/src/main/java/ch/psi/fda/ui/RemoteAcquisitionMain.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/RemoteAcquisitionMain.java
rename to src/main/java/ch/psi/fda/ui/RemoteAcquisitionMain.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/RestClient.java b/src/main/java/ch/psi/fda/ui/RestClient.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/RestClient.java
rename to src/main/java/ch/psi/fda/ui/RestClient.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/StreamClient.java b/src/main/java/ch/psi/fda/ui/StreamClient.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/StreamClient.java
rename to src/main/java/ch/psi/fda/ui/StreamClient.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationMain.java b/src/main/java/ch/psi/fda/ui/VisualizationMain.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationMain.java
rename to src/main/java/ch/psi/fda/ui/VisualizationMain.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationZMQMain.java b/src/main/java/ch/psi/fda/ui/VisualizationZMQMain.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/VisualizationZMQMain.java
rename to src/main/java/ch/psi/fda/ui/VisualizationZMQMain.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/DataVisualization.java b/src/main/java/ch/psi/fda/ui/visualizer/DataVisualization.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/DataVisualization.java
rename to src/main/java/ch/psi/fda/ui/visualizer/DataVisualization.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/SeriesDataFilter.java b/src/main/java/ch/psi/fda/ui/visualizer/SeriesDataFilter.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/SeriesDataFilter.java
rename to src/main/java/ch/psi/fda/ui/visualizer/SeriesDataFilter.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/Visualizer.java b/src/main/java/ch/psi/fda/ui/visualizer/Visualizer.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/Visualizer.java
rename to src/main/java/ch/psi/fda/ui/visualizer/Visualizer.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesArrayDataFilter.java b/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesArrayDataFilter.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesArrayDataFilter.java
rename to src/main/java/ch/psi/fda/ui/visualizer/XYSeriesArrayDataFilter.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesDataFilter.java b/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesDataFilter.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYSeriesDataFilter.java
rename to src/main/java/ch/psi/fda/ui/visualizer/XYSeriesDataFilter.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesArrayDataFilter.java b/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesArrayDataFilter.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesArrayDataFilter.java
rename to src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesArrayDataFilter.java
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesDataFilter.java b/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesDataFilter.java
similarity index 100%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesDataFilter.java
rename to src/main/java/ch/psi/fda/ui/visualizer/XYZSeriesDataFilter.java
diff --git a/ch.psi.fda/src/main/resources/.gitignore b/src/main/resources/.gitignore
similarity index 100%
rename from ch.psi.fda/src/main/resources/.gitignore
rename to src/main/resources/.gitignore
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerMDATest.java b/src/test/java/ch/psi/fda/deserializer/DataDeserializerMDATest.java
similarity index 100%
rename from ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerMDATest.java
rename to src/test/java/ch/psi/fda/deserializer/DataDeserializerMDATest.java
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerTest.java b/src/test/java/ch/psi/fda/deserializer/DataDeserializerTest.java
similarity index 100%
rename from ch.psi.fda/src/test/java/ch/psi/fda/deserializer/DataDeserializerTest.java
rename to src/test/java/ch/psi/fda/deserializer/DataDeserializerTest.java
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/serializer/SerializerTest.java b/src/test/java/ch/psi/fda/serializer/SerializerTest.java
similarity index 100%
rename from ch.psi.fda/src/test/java/ch/psi/fda/serializer/SerializerTest.java
rename to src/test/java/ch/psi/fda/serializer/SerializerTest.java
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/ui/AcquisitionMainTest.java b/src/test/java/ch/psi/fda/ui/AcquisitionMainTest.java
similarity index 100%
rename from ch.psi.fda/src/test/java/ch/psi/fda/ui/AcquisitionMainTest.java
rename to src/test/java/ch/psi/fda/ui/AcquisitionMainTest.java
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/ui/ApplicationConfiguratorTest.java b/src/test/java/ch/psi/fda/ui/ApplicationConfiguratorTest.java
similarity index 100%
rename from ch.psi.fda/src/test/java/ch/psi/fda/ui/ApplicationConfiguratorTest.java
rename to src/test/java/ch/psi/fda/ui/ApplicationConfiguratorTest.java
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/ui/VisualizationMainTest.java b/src/test/java/ch/psi/fda/ui/VisualizationMainTest.java
similarity index 100%
rename from ch.psi.fda/src/test/java/ch/psi/fda/ui/VisualizationMainTest.java
rename to src/test/java/ch/psi/fda/ui/VisualizationMainTest.java
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/ui/visualizer/DataVisualizerTest.java b/src/test/java/ch/psi/fda/ui/visualizer/DataVisualizerTest.java
similarity index 100%
rename from ch.psi.fda/src/test/java/ch/psi/fda/ui/visualizer/DataVisualizerTest.java
rename to src/test/java/ch/psi/fda/ui/visualizer/DataVisualizerTest.java
diff --git a/ch.psi.fda/src/test/resources/cdump.properties b/src/test/resources/cdump.properties
similarity index 100%
rename from ch.psi.fda/src/test/resources/cdump.properties
rename to src/test/resources/cdump.properties
diff --git a/ch.psi.fda/src/test/resources/fdaq.properties b/src/test/resources/fdaq.properties
similarity index 100%
rename from ch.psi.fda/src/test/resources/fdaq.properties
rename to src/test/resources/fdaq.properties
diff --git a/ch.psi.fda/src/test/resources/home/.gitignore b/src/test/resources/home/.gitignore
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/.gitignore
rename to src/test/resources/home/.gitignore
diff --git a/ch.psi.fda/src/test/resources/home/config/cdump.properties b/src/test/resources/home/config/cdump.properties
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/config/cdump.properties
rename to src/test/resources/home/config/cdump.properties
diff --git a/ch.psi.fda/src/test/resources/home/config/fda.properties b/src/test/resources/home/config/fda.properties
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/config/fda.properties
rename to src/test/resources/home/config/fda.properties
diff --git a/ch.psi.fda/src/test/resources/home/config/jcae.properties b/src/test/resources/home/config/jcae.properties
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/config/jcae.properties
rename to src/test/resources/home/config/jcae.properties
diff --git a/ch.psi.fda/src/test/resources/home/config/logging.properties b/src/test/resources/home/config/logging.properties
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/config/logging.properties
rename to src/test/resources/home/config/logging.properties
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/Co_EXAFS_GeD.xml b/src/test/resources/home/scans/templates/Co_EXAFS_GeD.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/Co_EXAFS_GeD.xml
rename to src/test/resources/home/scans/templates/Co_EXAFS_GeD.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/GUI_testing_extMot_otf.xml b/src/test/resources/home/scans/templates/GUI_testing_extMot_otf.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/GUI_testing_extMot_otf.xml
rename to src/test/resources/home/scans/templates/GUI_testing_extMot_otf.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/StopGo_X10DA-DCM_Fl.xml b/src/test/resources/home/scans/templates/StopGo_X10DA-DCM_Fl.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/StopGo_X10DA-DCM_Fl.xml
rename to src/test/resources/home/scans/templates/StopGo_X10DA-DCM_Fl.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/TestXY__OTF_2D_v01_small-map.xml b/src/test/resources/home/scans/templates/TestXY__OTF_2D_v01_small-map.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/TestXY__OTF_2D_v01_small-map.xml
rename to src/test/resources/home/scans/templates/TestXY__OTF_2D_v01_small-map.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-crlogic-2.xml b/src/test/resources/home/scans/templates/cscan1d-crlogic-2.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-crlogic-2.xml
rename to src/test/resources/home/scans/templates/cscan1d-crlogic-2.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-crlogic.xml b/src/test/resources/home/scans/templates/cscan1d-crlogic.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-crlogic.xml
rename to src/test/resources/home/scans/templates/cscan1d-crlogic.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-manipulation.xml b/src/test/resources/home/scans/templates/cscan1d-manipulation.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-manipulation.xml
rename to src/test/resources/home/scans/templates/cscan1d-manipulation.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-maxv.xml b/src/test/resources/home/scans/templates/cscan1d-maxv.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-maxv.xml
rename to src/test/resources/home/scans/templates/cscan1d-maxv.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-prePostAction.xml b/src/test/resources/home/scans/templates/cscan1d-prePostAction.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-prePostAction.xml
rename to src/test/resources/home/scans/templates/cscan1d-prePostAction.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-scrlogic.xml b/src/test/resources/home/scans/templates/cscan1d-scrlogic.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/cscan1d-scrlogic.xml
rename to src/test/resources/home/scans/templates/cscan1d-scrlogic.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan1d.xml b/src/test/resources/home/scans/templates/cscan1d.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/cscan1d.xml
rename to src/test/resources/home/scans/templates/cscan1d.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan2d-crlogic-additional.xml b/src/test/resources/home/scans/templates/cscan2d-crlogic-additional.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/cscan2d-crlogic-additional.xml
rename to src/test/resources/home/scans/templates/cscan2d-crlogic-additional.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan2d-crlogic.xml b/src/test/resources/home/scans/templates/cscan2d-crlogic.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/cscan2d-crlogic.xml
rename to src/test/resources/home/scans/templates/cscan2d-crlogic.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan2d-zigzag.xml b/src/test/resources/home/scans/templates/cscan2d-zigzag.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/cscan2d-zigzag.xml
rename to src/test/resources/home/scans/templates/cscan2d-zigzag.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/cscan2d.xml b/src/test/resources/home/scans/templates/cscan2d.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/cscan2d.xml
rename to src/test/resources/home/scans/templates/cscan2d.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan0d-pseudo.xml b/src/test/resources/home/scans/templates/scan0d-pseudo.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan0d-pseudo.xml
rename to src/test/resources/home/scans/templates/scan0d-pseudo.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan0d.xml b/src/test/resources/home/scans/templates/scan0d.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan0d.xml
rename to src/test/resources/home/scans/templates/scan0d.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-array.xml b/src/test/resources/home/scans/templates/scan1d-array.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-array.xml
rename to src/test/resources/home/scans/templates/scan1d-array.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-arrayManipulation.xml b/src/test/resources/home/scans/templates/scan1d-arrayManipulation.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-arrayManipulation.xml
rename to src/test/resources/home/scans/templates/scan1d-arrayManipulation.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-arrayManipulation2.xml b/src/test/resources/home/scans/templates/scan1d-arrayManipulation2.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-arrayManipulation2.xml
rename to src/test/resources/home/scans/templates/scan1d-arrayManipulation2.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-condition.xml b/src/test/resources/home/scans/templates/scan1d-condition.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-condition.xml
rename to src/test/resources/home/scans/templates/scan1d-condition.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-dod.xml b/src/test/resources/home/scans/templates/scan1d-dod.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-dod.xml
rename to src/test/resources/home/scans/templates/scan1d-dod.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-done.xml b/src/test/resources/home/scans/templates/scan1d-done.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-done.xml
rename to src/test/resources/home/scans/templates/scan1d-done.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-failOnSensorError.xml b/src/test/resources/home/scans/templates/scan1d-failOnSensorError.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-failOnSensorError.xml
rename to src/test/resources/home/scans/templates/scan1d-failOnSensorError.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-function.xml b/src/test/resources/home/scans/templates/scan1d-function.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-function.xml
rename to src/test/resources/home/scans/templates/scan1d-function.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-functionVariable.xml b/src/test/resources/home/scans/templates/scan1d-functionVariable.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-functionVariable.xml
rename to src/test/resources/home/scans/templates/scan1d-functionVariable.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-issue18.xml b/src/test/resources/home/scans/templates/scan1d-issue18.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-issue18.xml
rename to src/test/resources/home/scans/templates/scan1d-issue18.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-jythonpre.xml b/src/test/resources/home/scans/templates/scan1d-jythonpre.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-jythonpre.xml
rename to src/test/resources/home/scans/templates/scan1d-jythonpre.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-longPrePut.xml b/src/test/resources/home/scans/templates/scan1d-longPrePut.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-longPrePut.xml
rename to src/test/resources/home/scans/templates/scan1d-longPrePut.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-manipulation.xml b/src/test/resources/home/scans/templates/scan1d-manipulation.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-manipulation.xml
rename to src/test/resources/home/scans/templates/scan1d-manipulation.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-manipulationChannel-2.xml b/src/test/resources/home/scans/templates/scan1d-manipulationChannel-2.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-manipulationChannel-2.xml
rename to src/test/resources/home/scans/templates/scan1d-manipulationChannel-2.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-manipulationChannel.xml b/src/test/resources/home/scans/templates/scan1d-manipulationChannel.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-manipulationChannel.xml
rename to src/test/resources/home/scans/templates/scan1d-manipulationChannel.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-manipulationOfM.xml b/src/test/resources/home/scans/templates/scan1d-manipulationOfM.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-manipulationOfM.xml
rename to src/test/resources/home/scans/templates/scan1d-manipulationOfM.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-manipulationTime.xml b/src/test/resources/home/scans/templates/scan1d-manipulationTime.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-manipulationTime.xml
rename to src/test/resources/home/scans/templates/scan1d-manipulationTime.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-manipulationVariable.xml b/src/test/resources/home/scans/templates/scan1d-manipulationVariable.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-manipulationVariable.xml
rename to src/test/resources/home/scans/templates/scan1d-manipulationVariable.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-mmm.xml b/src/test/resources/home/scans/templates/scan1d-mmm.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-mmm.xml
rename to src/test/resources/home/scans/templates/scan1d-mmm.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-noPositioner.xml b/src/test/resources/home/scans/templates/scan1d-noPositioner.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-noPositioner.xml
rename to src/test/resources/home/scans/templates/scan1d-noPositioner.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-noVis.xml b/src/test/resources/home/scans/templates/scan1d-noVis.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-noVis.xml
rename to src/test/resources/home/scans/templates/scan1d-noVis.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-notification.xml b/src/test/resources/home/scans/templates/scan1d-notification.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-notification.xml
rename to src/test/resources/home/scans/templates/scan1d-notification.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-pre.xml b/src/test/resources/home/scans/templates/scan1d-pre.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-pre.xml
rename to src/test/resources/home/scans/templates/scan1d-pre.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-prePostDimension.xml b/src/test/resources/home/scans/templates/scan1d-prePostDimension.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-prePostDimension.xml
rename to src/test/resources/home/scans/templates/scan1d-prePostDimension.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-region.xml b/src/test/resources/home/scans/templates/scan1d-region.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-region.xml
rename to src/test/resources/home/scans/templates/scan1d-region.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-regionFunction.xml b/src/test/resources/home/scans/templates/scan1d-regionFunction.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-regionFunction.xml
rename to src/test/resources/home/scans/templates/scan1d-regionFunction.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-regionNotExact.xml b/src/test/resources/home/scans/templates/scan1d-regionNotExact.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-regionNotExact.xml
rename to src/test/resources/home/scans/templates/scan1d-regionNotExact.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-regionOverlapping.xml b/src/test/resources/home/scans/templates/scan1d-regionOverlapping.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-regionOverlapping.xml
rename to src/test/resources/home/scans/templates/scan1d-regionOverlapping.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-shell.xml b/src/test/resources/home/scans/templates/scan1d-shell.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-shell.xml
rename to src/test/resources/home/scans/templates/scan1d-shell.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-shellaction.xml b/src/test/resources/home/scans/templates/scan1d-shellaction.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-shellaction.xml
rename to src/test/resources/home/scans/templates/scan1d-shellaction.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-shellactionError.xml b/src/test/resources/home/scans/templates/scan1d-shellactionError.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-shellactionError.xml
rename to src/test/resources/home/scans/templates/scan1d-shellactionError.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-simon.xml b/src/test/resources/home/scans/templates/scan1d-simon.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-simon.xml
rename to src/test/resources/home/scans/templates/scan1d-simon.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-simon2.xml b/src/test/resources/home/scans/templates/scan1d-simon2.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-simon2.xml
rename to src/test/resources/home/scans/templates/scan1d-simon2.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-small.xml b/src/test/resources/home/scans/templates/scan1d-small.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-small.xml
rename to src/test/resources/home/scans/templates/scan1d-small.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-string.xml b/src/test/resources/home/scans/templates/scan1d-string.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-string.xml
rename to src/test/resources/home/scans/templates/scan1d-string.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d-waitError.xml b/src/test/resources/home/scans/templates/scan1d-waitError.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d-waitError.xml
rename to src/test/resources/home/scans/templates/scan1d-waitError.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d.xml b/src/test/resources/home/scans/templates/scan1d.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d.xml
rename to src/test/resources/home/scans/templates/scan1d.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d_1234.xml b/src/test/resources/home/scans/templates/scan1d_1234.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d_1234.xml
rename to src/test/resources/home/scans/templates/scan1d_1234.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan1d_manipulationNoDouble.xml b/src/test/resources/home/scans/templates/scan1d_manipulationNoDouble.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan1d_manipulationNoDouble.xml
rename to src/test/resources/home/scans/templates/scan1d_manipulationNoDouble.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan2d-1.xml b/src/test/resources/home/scans/templates/scan2d-1.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan2d-1.xml
rename to src/test/resources/home/scans/templates/scan2d-1.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan2d-2.xml b/src/test/resources/home/scans/templates/scan2d-2.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan2d-2.xml
rename to src/test/resources/home/scans/templates/scan2d-2.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan2d-dgroup.xml b/src/test/resources/home/scans/templates/scan2d-dgroup.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan2d-dgroup.xml
rename to src/test/resources/home/scans/templates/scan2d-dgroup.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan2d-guard.xml b/src/test/resources/home/scans/templates/scan2d-guard.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan2d-guard.xml
rename to src/test/resources/home/scans/templates/scan2d-guard.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan2d-manipulation.xml b/src/test/resources/home/scans/templates/scan2d-manipulation.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan2d-manipulation.xml
rename to src/test/resources/home/scans/templates/scan2d-manipulation.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan2d-pseudo.xml b/src/test/resources/home/scans/templates/scan2d-pseudo.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan2d-pseudo.xml
rename to src/test/resources/home/scans/templates/scan2d-pseudo.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan2d-pseudo2.xml b/src/test/resources/home/scans/templates/scan2d-pseudo2.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan2d-pseudo2.xml
rename to src/test/resources/home/scans/templates/scan2d-pseudo2.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan2d-region.xml b/src/test/resources/home/scans/templates/scan2d-region.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan2d-region.xml
rename to src/test/resources/home/scans/templates/scan2d-region.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan2d-zigZag.xml b/src/test/resources/home/scans/templates/scan2d-zigZag.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan2d-zigZag.xml
rename to src/test/resources/home/scans/templates/scan2d-zigZag.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan2d-zigzag2.xml b/src/test/resources/home/scans/templates/scan2d-zigzag2.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan2d-zigzag2.xml
rename to src/test/resources/home/scans/templates/scan2d-zigzag2.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/scan2d.xml b/src/test/resources/home/scans/templates/scan2d.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/scan2d.xml
rename to src/test/resources/home/scans/templates/scan2d.xml
diff --git a/ch.psi.fda/src/test/resources/home/scans/templates/shellaction.xml b/src/test/resources/home/scans/templates/shellaction.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/home/scans/templates/shellaction.xml
rename to src/test/resources/home/scans/templates/shellaction.xml
diff --git a/ch.psi.fda/src/test/resources/testdata/mda/mdadata1.mda b/src/test/resources/testdata/mda/mdadata1.mda
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/mda/mdadata1.mda
rename to src/test/resources/testdata/mda/mdadata1.mda
diff --git a/ch.psi.fda/src/test/resources/testdata/mda/mdadata2.mda b/src/test/resources/testdata/mda/mdadata2.mda
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/mda/mdadata2.mda
rename to src/test/resources/testdata/mda/mdadata2.mda
diff --git a/ch.psi.fda/src/test/resources/testdata/mda/mdadata3.mda b/src/test/resources/testdata/mda/mdadata3.mda
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/mda/mdadata3.mda
rename to src/test/resources/testdata/mda/mdadata3.mda
diff --git a/ch.psi.fda/src/test/resources/testdata/mda/mdadata4.mda b/src/test/resources/testdata/mda/mdadata4.mda
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/mda/mdadata4.mda
rename to src/test/resources/testdata/mda/mdadata4.mda
diff --git a/ch.psi.fda/src/test/resources/testdata/mda/mdadata5.mda b/src/test/resources/testdata/mda/mdadata5.mda
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/mda/mdadata5.mda
rename to src/test/resources/testdata/mda/mdadata5.mda
diff --git a/ch.psi.fda/src/test/resources/testdata/mda/mdadata6.mda b/src/test/resources/testdata/mda/mdadata6.mda
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/mda/mdadata6.mda
rename to src/test/resources/testdata/mda/mdadata6.mda
diff --git a/ch.psi.fda/src/test/resources/testdata/mda/mdadata7.mda b/src/test/resources/testdata/mda/mdadata7.mda
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/mda/mdadata7.mda
rename to src/test/resources/testdata/mda/mdadata7.mda
diff --git a/ch.psi.fda/src/test/resources/testdata/scan/scan1d.xml b/src/test/resources/testdata/scan/scan1d.xml
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/scan/scan1d.xml
rename to src/test/resources/testdata/scan/scan1d.xml
diff --git a/ch.psi.fda/src/test/resources/testdata/scan/scan1d_0000.txt b/src/test/resources/testdata/scan/scan1d_0000.txt
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/scan/scan1d_0000.txt
rename to src/test/resources/testdata/scan/scan1d_0000.txt
diff --git a/ch.psi.fda/src/test/resources/testdata/text/textdata1.txt b/src/test/resources/testdata/text/textdata1.txt
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/text/textdata1.txt
rename to src/test/resources/testdata/text/textdata1.txt
diff --git a/ch.psi.fda/src/test/resources/testdata/text/textdata2.txt b/src/test/resources/testdata/text/textdata2.txt
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/text/textdata2.txt
rename to src/test/resources/testdata/text/textdata2.txt
diff --git a/ch.psi.fda/src/test/resources/testdata/text/textdata3-2d.txt b/src/test/resources/testdata/text/textdata3-2d.txt
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/text/textdata3-2d.txt
rename to src/test/resources/testdata/text/textdata3-2d.txt
diff --git a/ch.psi.fda/src/test/resources/testdata/text/textdata4-array.txt b/src/test/resources/testdata/text/textdata4-array.txt
similarity index 100%
rename from ch.psi.fda/src/test/resources/testdata/text/textdata4-array.txt
rename to src/test/resources/testdata/text/textdata4-array.txt
diff --git a/ch.psi.fda/src/test/resources/testscripts/errorscript.sh b/src/test/resources/testscripts/errorscript.sh
similarity index 100%
rename from ch.psi.fda/src/test/resources/testscripts/errorscript.sh
rename to src/test/resources/testscripts/errorscript.sh
diff --git a/ch.psi.fda/src/test/resources/testscripts/testscript1.sh b/src/test/resources/testscripts/testscript1.sh
similarity index 100%
rename from ch.psi.fda/src/test/resources/testscripts/testscript1.sh
rename to src/test/resources/testscripts/testscript1.sh
diff --git a/ch.psi.fda/src/test/resources/testscripts/testscript2-error.sh b/src/test/resources/testscripts/testscript2-error.sh
similarity index 100%
rename from ch.psi.fda/src/test/resources/testscripts/testscript2-error.sh
rename to src/test/resources/testscripts/testscript2-error.sh