diff --git a/.gitignore b/.gitignore
index f2aa16e..827d469 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
 /fda.ui.cdump/target/
 /fda.ui.cdump/nbactions.xml
 /.project
+/fda.ui.application/target/
+/fda.ui.module/target/
\ No newline at end of file
diff --git a/application/pom.xml b/fda.ui.application/pom.xml
similarity index 96%
rename from application/pom.xml
rename to fda.ui.application/pom.xml
index 8f269bc..31a869e 100644
--- a/application/pom.xml
+++ b/fda.ui.application/pom.xml
@@ -8,10 +8,10 @@
         <version>2.0.1</version>
     </parent>
 
-    <artifactId>application</artifactId>
+    <artifactId>fda.ui.application</artifactId>
     <packaging>nbm-application</packaging>
 
-    <name>fda.ui - NB App</name>
+    <name>ch.psi.fda.ui.application</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>fda.ui.ee</artifactId>
+            <artifactId>fda.ui.module</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/application/src/main/resources/fda.conf b/fda.ui.application/src/main/resources/fda.conf
similarity index 100%
rename from application/src/main/resources/fda.conf
rename to fda.ui.application/src/main/resources/fda.conf
diff --git a/application/src/main/scripts/fda.bat b/fda.ui.application/src/main/scripts/fda.bat
similarity index 100%
rename from application/src/main/scripts/fda.bat
rename to fda.ui.application/src/main/scripts/fda.bat
diff --git a/application/src/main/scripts/fda_convert b/fda.ui.application/src/main/scripts/fda_convert
similarity index 100%
rename from application/src/main/scripts/fda_convert
rename to fda.ui.application/src/main/scripts/fda_convert
diff --git a/application/src/main/scripts/fda_scan b/fda.ui.application/src/main/scripts/fda_scan
similarity index 100%
rename from application/src/main/scripts/fda_scan
rename to fda.ui.application/src/main/scripts/fda_scan
diff --git a/application/src/main/scripts/fda_vis b/fda.ui.application/src/main/scripts/fda_vis
similarity index 100%
rename from application/src/main/scripts/fda_vis
rename to fda.ui.application/src/main/scripts/fda_vis
diff --git a/fda.ui.ee/pom.xml b/fda.ui.module/pom.xml
similarity index 96%
rename from fda.ui.ee/pom.xml
rename to fda.ui.module/pom.xml
index 94d2bf7..3d88d2c 100644
--- a/fda.ui.ee/pom.xml
+++ b/fda.ui.module/pom.xml
@@ -7,10 +7,10 @@
         <version>2.0.1</version>
     </parent>
     
-    <artifactId>fda.ui.ee</artifactId>
+    <artifactId>fda.ui.module</artifactId>
     <packaging>nbm</packaging>
 
-    <name>fda.ui.ee NetBeans Module</name>
+    <name>ch.psi.fda.ui.module</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/ExecuteAction.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/ExecuteAction.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/ExecuteAction.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/ExecuteAction.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/ExecuteCapability.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/ExecuteCapability.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/ExecuteCapability.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/ExecuteCapability.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/LoadingErrorPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/LoadingErrorPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/LoadingErrorPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/LoadingErrorPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/LoadingErrorPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/LoadingErrorPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/LoadingErrorPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/LoadingErrorPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/NewAction.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/NewAction.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/NewAction.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/NewAction.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/ViewConfigurationAction.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/ViewConfigurationAction.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/ViewConfigurationAction.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/ViewConfigurationAction.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/VisualEditorTopComponent.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/VisualEditorTopComponent.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/VisualEditorTopComponent.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/VisualEditorTopComponent.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/VisualEditorTopComponent.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/VisualEditorTopComponent.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/VisualEditorTopComponent.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/VisualEditorTopComponent.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleContainer.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleContainer.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleContainer.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleContainer.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleContainer.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleContainer.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleContainer.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleContainer.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainer.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainer.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainer.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainer.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainer.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainer.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainer.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainer.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ComponentMetadata.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ComponentMetadata.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ComponentMetadata.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ComponentMetadata.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/DocumentAdapter.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/DocumentAdapter.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/DocumentAdapter.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/DocumentAdapter.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/EditableComponent.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/EditableComponent.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/EditableComponent.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/EditableComponent.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/FieldUtilities.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/FieldUtilities.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/FieldUtilities.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/FieldUtilities.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/IdInputVerifier.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/IdInputVerifier.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/IdInputVerifier.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/IdInputVerifier.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListContainer.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListContainer.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListContainer.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListContainer.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListContainer.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListContainer.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListContainer.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListContainer.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListContainerDropTargetListener.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListContainerDropTargetListener.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListContainerDropTargetListener.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListContainerDropTargetListener.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListItem.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItem.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListItem.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItem.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListItem.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItem.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListItem.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItem.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListItemTransferHandler.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItemTransferHandler.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListItemTransferHandler.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListItemTransferHandler.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListUtil.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListUtil.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ListUtil.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ListUtil.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ObjectProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ObjectProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/ObjectProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/ObjectProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/PanelSupport.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/PanelSupport.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/PanelSupport.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/PanelSupport.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/WrapLayout.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/WrapLayout.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/WrapLayout.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/WrapLayout.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ActionListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ActionListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ActionListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ActionListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDetectorListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDetectorListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDetectorListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDetectorListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DefaultSettings.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DefaultSettings.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DefaultSettings.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DefaultSettings.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DescriptionPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DetectorOfDetectorsPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DetectorOfDetectorsPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DetectorOfDetectorsPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DetectorOfDetectorsPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DetectorOfDetectorsPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DetectorOfDetectorsPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DetectorOfDetectorsPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DetectorOfDetectorsPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDetectorListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDetectorListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDetectorListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDetectorListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepScalarDetectorListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepScalarDetectorListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepScalarDetectorListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepScalarDetectorListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPositionerPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPositionerPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPositionerPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPositionerPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPositionerPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPositionerPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPositionerPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPositionerPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariableListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariableListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariableListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariableListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariablePanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariablePanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariablePanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariablePanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariablePanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariablePanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariablePanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariablePanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariableParameterMappingPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariableParameterMappingPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariableParameterMappingPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariableParameterMappingPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariableParameterMappingPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariableParameterMappingPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariableParameterMappingPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GlobalVariableParameterMappingPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GuardConditionPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GuardConditionPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GuardConditionPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GuardConditionPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GuardConditionPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GuardConditionPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GuardConditionPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GuardConditionPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GuardListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GuardListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/GuardListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/GuardListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/IDParameterMappingPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/IDParameterMappingPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/IDParameterMappingPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/IDParameterMappingPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/IDParameterMappingPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/IDParameterMappingPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/IDParameterMappingPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/IDParameterMappingPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/IdGenerator.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/IdGenerator.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/IdGenerator.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/IdGenerator.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotArrayPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotArrayPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotArrayPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotArrayPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotArrayPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotArrayPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotArrayPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotArrayPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/LinePlotPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/LinearPositionerPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/LinearPositionerPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/LinearPositionerPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/LinearPositionerPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/LinearPositionerPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/LinearPositionerPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/LinearPositionerPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/LinearPositionerPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ManipulationListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ManipulationListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ManipulationListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ManipulationListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotArrayPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotArrayPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotArrayPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotArrayPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotArrayPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotArrayPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotArrayPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotArrayPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ParameterMappingListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ParameterMappingListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ParameterMappingListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ParameterMappingListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ParameterMappingVariableListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ParameterMappingVariableListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ParameterMappingVariableListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ParameterMappingVariableListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/PseudoPositionerPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/PseudoPositionerPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/PseudoPositionerPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/PseudoPositionerPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/PseudoPositionerPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/PseudoPositionerPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/PseudoPositionerPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/PseudoPositionerPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RecipientListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RecipientListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RecipientListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RecipientListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RecipientPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RecipientPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RecipientPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RecipientPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RecipientPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RecipientPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RecipientPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RecipientPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPositionerPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPositionerPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPositionerPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPositionerPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPositionerPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPositionerPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPositionerPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/RegionPositionerPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalarDetectorPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalarDetectorPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalarDetectorPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalarDetectorPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalarDetectorPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalarDetectorPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalarDetectorPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalarDetectorPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalerChannelPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalerChannelPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalerChannelPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalerChannelPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalerChannelPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalerChannelPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalerChannelPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScalerChannelPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScanPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScanPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScanPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScanPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScanPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScanPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScanPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScanPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptActionPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptActionPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptActionPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptActionPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptActionPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptActionPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptActionPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptActionPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptManipulationPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptManipulationPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptManipulationPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptManipulationPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptManipulationPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptManipulationPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptManipulationPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ScriptManipulationPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/SimpleScalarDetectorPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/SimpleScalarDetectorPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/SimpleScalarDetectorPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/SimpleScalarDetectorPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/SimpleScalarDetectorPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/SimpleScalarDetectorPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/SimpleScalarDetectorPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/SimpleScalarDetectorPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/TimestampDetectorPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/TimestampDetectorPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/TimestampDetectorPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/TimestampDetectorPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/TimestampDetectorPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/TimestampDetectorPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/TimestampDetectorPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/TimestampDetectorPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/VisualizationListItemProvider.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/VisualizationListItemProvider.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/VisualizationListItemProvider.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/VisualizationListItemProvider.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/util/ModelUtil.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/util/ModelUtil.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ce/panels/model/util/ModelUtil.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ce/panels/model/util/ModelUtil.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/ConfigurationManagerTopComponent.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConfigurationManagerTopComponent.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/ConfigurationManagerTopComponent.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConfigurationManagerTopComponent.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/ConfigurationManagerTopComponent.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConfigurationManagerTopComponent.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/ConfigurationManagerTopComponent.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConfigurationManagerTopComponent.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/ConvertMAT2DAction.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConvertMAT2DAction.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/ConvertMAT2DAction.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConvertMAT2DAction.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/ConvertMAT2DZAction.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConvertMAT2DZAction.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/ConvertMAT2DZAction.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConvertMAT2DZAction.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/ConvertMATAction.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConvertMATAction.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/ConvertMATAction.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConvertMATAction.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/ConvertMDAAction.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConvertMDAAction.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/ConvertMDAAction.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/ConvertMDAAction.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/DataManagerTopComponent.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/DataManagerTopComponent.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/DataManagerTopComponent.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/DataManagerTopComponent.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/DataManagerTopComponent.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/DataManagerTopComponent.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/DataManagerTopComponent.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/DataManagerTopComponent.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/RefreshAction.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/RefreshAction.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/RefreshAction.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/RefreshAction.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/VisualizeAction.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/VisualizeAction.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/VisualizeAction.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/VisualizeAction.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/fs/ConfigurationDataObject.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/fs/ConfigurationDataObject.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/fs/ConfigurationDataObject.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/fs/ConfigurationDataObject.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/fs/DataDataObject.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/fs/DataDataObject.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/fs/DataDataObject.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/fs/DataDataObject.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/fs/RefreshCapability.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/cm/fs/RefreshCapability.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/cm/fs/RefreshCapability.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/cm/fs/RefreshCapability.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/AbortAllAction.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/AbortAllAction.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/AbortAllAction.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/AbortAllAction.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/Configuration.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/Configuration.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/Configuration.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/Configuration.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/ExecutionExecutable.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/ExecutionExecutable.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/ExecutionExecutable.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/ExecutionExecutable.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/ExportAsPNGAction.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/ExportAsPNGAction.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/ExportAsPNGAction.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/ExportAsPNGAction.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/ExportCapability.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/ExportCapability.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/ExportCapability.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/ExportCapability.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/Installer.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/Installer.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/Installer.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/Installer.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/PlotVisualizerTopComponent.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/PlotVisualizerTopComponent.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/PlotVisualizerTopComponent.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/PlotVisualizerTopComponent.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/PlotVisualizerTopComponent.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/PlotVisualizerTopComponent.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/PlotVisualizerTopComponent.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/PlotVisualizerTopComponent.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/SimpleConversionService.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/SimpleConversionService.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/SimpleConversionService.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/SimpleConversionService.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/SimpleExecutionService.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/SimpleExecutionService.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/SimpleExecutionService.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/SimpleExecutionService.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/SimpleVisualizationService.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/SimpleVisualizationService.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/SimpleVisualizationService.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/SimpleVisualizationService.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/api/ConversionService.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/api/ConversionService.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/api/ConversionService.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/api/ConversionService.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/api/ExecutionService.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/api/ExecutionService.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/api/ExecutionService.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/api/ExecutionService.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/api/VisualizationService.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/ee/api/VisualizationService.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/ee/api/VisualizationService.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/ee/api/VisualizationService.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/preferences/DefaultPreferences.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/preferences/DefaultPreferences.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/preferences/DefaultPreferences.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/preferences/DefaultPreferences.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/preferences/PreferencesOptionsPanelController.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/preferences/PreferencesOptionsPanelController.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/preferences/PreferencesOptionsPanelController.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/preferences/PreferencesOptionsPanelController.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/preferences/PreferencesPanel.form b/fda.ui.module/src/main/java/ch/psi/fda/ui/preferences/PreferencesPanel.form
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/preferences/PreferencesPanel.form
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/preferences/PreferencesPanel.form
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/preferences/PreferencesPanel.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/preferences/PreferencesPanel.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/preferences/PreferencesPanel.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/preferences/PreferencesPanel.java
diff --git a/fda.ui.ee/src/main/java/ch/psi/fda/ui/preferences/api/Preferences.java b/fda.ui.module/src/main/java/ch/psi/fda/ui/preferences/api/Preferences.java
similarity index 100%
rename from fda.ui.ee/src/main/java/ch/psi/fda/ui/preferences/api/Preferences.java
rename to fda.ui.module/src/main/java/ch/psi/fda/ui/preferences/api/Preferences.java
diff --git a/fda.ui.ee/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/fda.ui.module/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
rename to fda.ui.module/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
diff --git a/fda.ui.ee/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif b/fda.ui.module/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif
similarity index 100%
rename from fda.ui.ee/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif
rename to fda.ui.module/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame.gif
diff --git a/fda.ui.ee/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame32.gif b/fda.ui.module/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame32.gif
similarity index 100%
rename from fda.ui.ee/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame32.gif
rename to fda.ui.module/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame32.gif
diff --git a/fda.ui.ee/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame48.gif b/fda.ui.module/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame48.gif
similarity index 100%
rename from fda.ui.ee/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame48.gif
rename to fda.ui.module/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/frame48.gif
diff --git a/fda.ui.ee/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/splash.gif b/fda.ui.module/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/splash.gif
similarity index 100%
rename from fda.ui.ee/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/splash.gif
rename to fda.ui.module/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/splash.gif
diff --git a/fda.ui.ee/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/fda.ui.module/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
rename to fda.ui.module/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
diff --git a/fda.ui.ee/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties b/fda.ui.module/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties
rename to fda.ui.module/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties
diff --git a/fda.ui.ee/src/main/nbm/manifest.mf b/fda.ui.module/src/main/nbm/manifest.mf
similarity index 100%
rename from fda.ui.ee/src/main/nbm/manifest.mf
rename to fda.ui.module/src/main/nbm/manifest.mf
diff --git a/fda.ui.ee/src/main/nbm/module.xml b/fda.ui.module/src/main/nbm/module.xml
similarity index 100%
rename from fda.ui.ee/src/main/nbm/module.xml
rename to fda.ui.module/src/main/nbm/module.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/branding/Bundle.properties b/fda.ui.module/src/main/resources/ch/psi/fda/ui/branding/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/branding/Bundle.properties
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/branding/Bundle.properties
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/cdump/Bundle.properties b/fda.ui.module/src/main/resources/ch/psi/fda/ui/cdump/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/cdump/Bundle.properties
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/cdump/Bundle.properties
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/Bundle.properties b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/Bundle.properties
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/Bundle.properties
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/chart_bar.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/chart_bar.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/chart_bar.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/chart_bar.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/chart_line.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/chart_line.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/chart_line.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/chart_line.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/checkbox_unchecked.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/checkbox_unchecked.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/checkbox_unchecked.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/checkbox_unchecked.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/close-gray.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/close-gray.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/close-gray.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/close-gray.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/close.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/close.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/close.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/close.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/cog.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/cog.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/cog.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/cog.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/dimension.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/dimension.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/dimension.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/dimension.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/down.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/down.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/down.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/down.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/edit.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/edit.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/edit.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/edit.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/list_num.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/list_num.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/list_num.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/list_num.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/photo.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/photo.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/photo.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/photo.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/plus-gray.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/plus-gray.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/plus-gray.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/plus-gray.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/plus.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/plus.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/plus.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/plus.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/readme.txt b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/readme.txt
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/readme.txt
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/readme.txt
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/sq_down.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/sq_down.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/sq_down.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/sq_down.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/sq_up.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/sq_up.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/sq_up.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/sq_up.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/up.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/up.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/up.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/up.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/wrench.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/wrench.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/icons/wrench.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/icons/wrench.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/panels/Bundle.properties b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/panels/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/panels/Bundle.properties
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/panels/Bundle.properties
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/panels/model/Bundle.properties b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/panels/model/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/panels/model/Bundle.properties
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/panels/model/Bundle.properties
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/runProject.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/runProject.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/runProject.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/runProject.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/runProject24.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/runProject24.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ce/runProject24.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ce/runProject24.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/cm/1291127654_user-info.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/cm/1291127654_user-info.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/cm/1291127654_user-info.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/cm/1291127654_user-info.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/cm/Bundle.properties b/fda.ui.module/src/main/resources/ch/psi/fda/ui/cm/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/cm/Bundle.properties
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/cm/Bundle.properties
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/cm/chart_line.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/cm/chart_line.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/cm/chart_line.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/cm/chart_line.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/cm/fs/Bundle.properties b/fda.ui.module/src/main/resources/ch/psi/fda/ui/cm/fs/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/cm/fs/Bundle.properties
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/cm/fs/Bundle.properties
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/cm/fs/configurationFile.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/cm/fs/configurationFile.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/cm/fs/configurationFile.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/cm/fs/configurationFile.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/cm/fs/dataFile.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/cm/fs/dataFile.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/cm/fs/dataFile.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/cm/fs/dataFile.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/Bundle.properties b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/Bundle.properties
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/Bundle.properties
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentSettings.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentSettings.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentSettings.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentSettings.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentWstcref.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentWstcref.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentWstcref.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/CdumpExecutionTopComponentWstcref.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentSettings.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentSettings.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentSettings.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentSettings.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentWstcref.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentWstcref.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentWstcref.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationManagerTopComponentWstcref.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/ConfigurationResolver.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationResolver.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/ConfigurationResolver.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationResolver.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/ConfigurationTemplate.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationTemplate.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/ConfigurationTemplate.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/ConfigurationTemplate.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentSettings.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentSettings.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentSettings.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentSettings.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentWstcref.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentWstcref.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentWstcref.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataManagerTopComponentWstcref.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/DataResolver.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataResolver.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/DataResolver.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataResolver.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/DataTemplate.txt b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataTemplate.txt
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/DataTemplate.txt
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/DataTemplate.txt
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentSettings.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentSettings.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentSettings.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentSettings.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentWstcref.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentWstcref.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentWstcref.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/PlotVisualizerTopComponentWstcref.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentSettings.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentSettings.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentSettings.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentSettings.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentWstcref.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentWstcref.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentWstcref.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/VisualEditorTopComponentWstcref.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/layer.xml b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/layer.xml
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/layer.xml
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/layer.xml
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/stop.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/stop.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/ee/stop.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/ee/stop.png
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/fdaq/Bundle.properties b/fda.ui.module/src/main/resources/ch/psi/fda/ui/fdaq/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/fdaq/Bundle.properties
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/fdaq/Bundle.properties
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/preferences/Bundle.properties b/fda.ui.module/src/main/resources/ch/psi/fda/ui/preferences/Bundle.properties
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/preferences/Bundle.properties
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/preferences/Bundle.properties
diff --git a/fda.ui.ee/src/main/resources/ch/psi/fda/ui/preferences/preferences_icon.png b/fda.ui.module/src/main/resources/ch/psi/fda/ui/preferences/preferences_icon.png
similarity index 100%
rename from fda.ui.ee/src/main/resources/ch/psi/fda/ui/preferences/preferences_icon.png
rename to fda.ui.module/src/main/resources/ch/psi/fda/ui/preferences/preferences_icon.png
diff --git a/fda.ui.ee/src/test/java/.gitignore b/fda.ui.module/src/test/java/.gitignore
similarity index 100%
rename from fda.ui.ee/src/test/java/.gitignore
rename to fda.ui.module/src/test/java/.gitignore
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainerTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainerTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainerTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/CollapsibleListContainerTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ActionPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ActionPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ActionPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ActionPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ArrayDetectorPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ArrayPositionerPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ChannelParameterMappingPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ConfigurationPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ContinuousDimensionPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ContinuousPositionerPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepDimensionPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/DiscreteStepPositionerPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/IDParameterMappingPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/IDParameterMappingPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/IDParameterMappingPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/IDParameterMappingPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/LinePlotPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/LinePlotPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/LinePlotPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/LinePlotPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/LinearPositionerPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/LinearPositionerPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/LinearPositionerPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/LinearPositionerPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/MatrixPlotPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/NewTestSuite.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/NewTestSuite.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/NewTestSuite.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/NewTestSuite.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/PositionerPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/PositionerPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/PositionerPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/PositionerPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/RegionPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/RegionPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/RegionPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/RegionPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/RegionPositionerPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/RegionPositionerPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/RegionPositionerPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/RegionPositionerPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ScalarDetectorPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ScalarDetectorPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ScalarDetectorPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ScalarDetectorPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ScanPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ScanPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ScanPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ScanPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ScriptActionPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ScriptActionPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ScriptActionPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ScriptActionPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ScriptManipulationPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ScriptManipulationPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ScriptManipulationPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ScriptManipulationPanelTest.java
diff --git a/fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanelTest.java b/fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanelTest.java
similarity index 100%
rename from fda.ui.ee/src/test/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanelTest.java
rename to fda.ui.module/src/test/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanelTest.java
diff --git a/fda.ui.ee/src/test/resources/.gitignore b/fda.ui.module/src/test/resources/.gitignore
similarity index 100%
rename from fda.ui.ee/src/test/resources/.gitignore
rename to fda.ui.module/src/test/resources/.gitignore
diff --git a/pom.xml b/pom.xml
index ff5f87e..f7144de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <version>2.0.1</version>
     <packaging>pom</packaging>
 
-    <name>fda.ui - NB App Parent</name>
+    <name>ch.psi.fda.ui.parent</name>
 
     <repositories>
         <!--
@@ -79,8 +79,8 @@
     </distributionManagement>
 
     <modules>
-        <module>application</module>
-        <module>fda.ui.ee</module>
+        <module>fda.ui.application</module>
+        <module>fda.ui.module</module>
     </modules>
 
     <properties>