diff --git a/ch.psi.fda/src/main/assembly/bin/scan b/ch.psi.fda/src/main/assembly/bin/scan
index 2203715..55c9add 100644
--- a/ch.psi.fda/src/main/assembly/bin/scan
+++ b/ch.psi.fda/src/main/assembly/bin/scan
@@ -37,4 +37,4 @@ do
 done
 
 # Execute java
-java -Xmx1024m -XX:MaxPermSize=128m -Dch.psi.fda.home=${APPLICATION_HOME} -Djava.util.logging.config.file=${APPLICATION_HOME}/config/logging.properties $VM_ARGUMENTS -cp $CLASSPATH ch.psi.fda.AcquisitionMain $ARGUMENTS
\ No newline at end of file
+java -Xmx1024m -XX:MaxPermSize=128m -Dch.psi.fda.home=${APPLICATION_HOME} -Djava.util.logging.config.file=${APPLICATION_HOME}/config/logging.properties $VM_ARGUMENTS -cp $CLASSPATH ch.psi.fda.ui.AcquisitionMain $ARGUMENTS
\ No newline at end of file
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaServer.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaServer.java
index 88e9f86..10649a0 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaServer.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaServer.java
@@ -18,7 +18,7 @@ import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.grizzly.http.server.HttpServer;
 
-import ch.psi.fda.ApplicationConfigurator;
+import ch.psi.fda.ui.ApplicationConfigurator;
 import sun.misc.Signal;
 import sun.misc.SignalHandler;
 
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/AcquisitionMain.java
similarity index 98%
rename from ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/AcquisitionMain.java
index 8961c08..3559d1a 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/AcquisitionMain.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda;
+package ch.psi.fda.ui;
 
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
@@ -56,6 +56,9 @@ import com.google.inject.Injector;
 
 import sun.misc.Signal;
 import sun.misc.SignalHandler;
+import ch.psi.fda.DescriptorProvider;
+import ch.psi.fda.EContainer;
+import ch.psi.fda.EContainerFactory;
 import ch.psi.fda.edescriptor.EDescriptor;
 import ch.psi.fda.gui.ProgressPanel;
 import ch.psi.fda.gui.ScrollableFlowPanel;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/ApplicationConfigurator.java b/ch.psi.fda/src/main/java/ch/psi/fda/ui/ApplicationConfigurator.java
similarity index 99%
rename from ch.psi.fda/src/main/java/ch/psi/fda/ApplicationConfigurator.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/ui/ApplicationConfigurator.java
index 7bdf475..51e2e83 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/ApplicationConfigurator.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/ui/ApplicationConfigurator.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda;
+package ch.psi.fda.ui;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/AcquisitionMainTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/AcquisitionMainTest.java
index 19ee8a0..561fa43 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/AcquisitionMainTest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/AcquisitionMainTest.java
@@ -23,7 +23,7 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import ch.psi.fda.AcquisitionMain;
+import ch.psi.fda.ui.AcquisitionMain;
 
 /**
  * @author ebner
@@ -46,7 +46,7 @@ public class AcquisitionMainTest {
 	}
 
 	/**
-	 * Test method for {@link ch.psi.fda.AcquisitionMain#main(java.lang.String[])}.
+	 * Test method for {@link ch.psi.fda.ui.AcquisitionMain#main(java.lang.String[])}.
 	 */
 	@Ignore
 	@Test
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/ApplicationConfiguratorTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/ApplicationConfiguratorTest.java
index ab35e62..344a2d9 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/ApplicationConfiguratorTest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/ApplicationConfiguratorTest.java
@@ -25,7 +25,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import ch.psi.fda.ApplicationConfigurator;
+import ch.psi.fda.ui.ApplicationConfigurator;
 
 /**
  * @author ebner