diff --git a/ch.psi.cdump/.project b/ch.psi.cdump/.project
index 2d212ac..f26d2f4 100644
--- a/ch.psi.cdump/.project
+++ b/ch.psi.cdump/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ch.psi.cdump</name>
+	<name>ch.psi.fda.cdump</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/ch.psi.cdump/pom.xml b/ch.psi.cdump/pom.xml
index 9c6e9a8..6764c2e 100644
--- a/ch.psi.cdump/pom.xml
+++ b/ch.psi.cdump/pom.xml
@@ -2,14 +2,15 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.psi</groupId>
-	<artifactId>cdump</artifactId>
+	<artifactId>ch.psi.fda.cdump</artifactId>
 	<version>1.0.0</version>
 	<dependencies>
 		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>15.0</version>
+			<groupId>ch.psi</groupId>
+			<artifactId>ch.psi.fda.core</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
+		
 		<dependency>
 			<groupId>ch.psi</groupId>
 			<artifactId>jcae</artifactId>
@@ -71,12 +72,12 @@
 		<snapshotRepository>
 			<id>i.snapshots</id>
 			<name>Artifactory Snapshots</name>
-			<url>http://slsyoke1/artifactory/libs-snapshots-local</url>
+			<url>http://yoke/artifactory/libs-snapshots-local</url>
 		</snapshotRepository>
 		<repository>
 			<id>i.releases</id>
 			<name>Atrifactory Releases</name>
-			<url>http://slsyoke1/artifactory/libs-releases-local</url>
+			<url>http://yoke/artifactory/libs-releases-local</url>
 		</repository>
 	</distributionManagement>
 </project>
\ No newline at end of file
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpAqLogic.java b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpAqLogic.java
similarity index 98%
rename from ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpAqLogic.java
rename to ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpAqLogic.java
index c41bd52..5434721 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpAqLogic.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpAqLogic.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.cdump;
+package ch.psi.fda.cdump;
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpConfiguration.java b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpConfiguration.java
similarity index 99%
rename from ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpConfiguration.java
rename to ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpConfiguration.java
index 2fdbf0f..3c7ddd6 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpConfiguration.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpConfiguration.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.cdump;
+package ch.psi.fda.cdump;
 
 import java.io.FileNotFoundException;
 import java.io.FileReader;
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpMain.java b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpMain.java
similarity index 99%
rename from ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpMain.java
rename to ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpMain.java
index fa8ce7f..b0b6971 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpMain.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpMain.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.cdump;
+package ch.psi.fda.cdump;
 
 import java.io.File;
 import java.util.Date;
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpSerializer.java b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpSerializer.java
similarity index 98%
rename from ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpSerializer.java
rename to ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpSerializer.java
index d3dde32..51d2b36 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpSerializer.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpSerializer.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.cdump;
+package ch.psi.fda.cdump;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpService.java b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpService.java
similarity index 99%
rename from ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpService.java
rename to ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpService.java
index 9faf064..70b1778 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpService.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/CdumpService.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.cdump;
+package ch.psi.fda.cdump;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/RunConfiguration.java b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/RunConfiguration.java
similarity index 98%
rename from ch.psi.cdump/src/main/java/ch/psi/cdump/RunConfiguration.java
rename to ch.psi.cdump/src/main/java/ch/psi/fda/cdump/RunConfiguration.java
index 3195dc9..c8702e6 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/RunConfiguration.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/RunConfiguration.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.cdump;
+package ch.psi.fda.cdump;
 
 import java.io.File;
 
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/CalibratePanel.java b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/ui/CalibratePanel.java
similarity index 97%
rename from ch.psi.cdump/src/main/java/ch/psi/cdump/ui/CalibratePanel.java
rename to ch.psi.cdump/src/main/java/ch/psi/fda/cdump/ui/CalibratePanel.java
index a667317..2a8ff78 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/CalibratePanel.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/ui/CalibratePanel.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.cdump.ui;
+package ch.psi.fda.cdump.ui;
 
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/ControlPanel.java b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/ui/ControlPanel.java
similarity index 99%
rename from ch.psi.cdump/src/main/java/ch/psi/cdump/ui/ControlPanel.java
rename to ch.psi.cdump/src/main/java/ch/psi/fda/cdump/ui/ControlPanel.java
index a861ccd..77c6427 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/ControlPanel.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/ui/ControlPanel.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.cdump.ui;
+package ch.psi.fda.cdump.ui;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/MainGui.java b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/ui/MainGui.java
similarity index 97%
rename from ch.psi.cdump/src/main/java/ch/psi/cdump/ui/MainGui.java
rename to ch.psi.cdump/src/main/java/ch/psi/fda/cdump/ui/MainGui.java
index a981c1d..6d55d87 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/MainGui.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/fda/cdump/ui/MainGui.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.cdump.ui;
+package ch.psi.fda.cdump.ui;
 
 import java.awt.EventQueue;
 
diff --git a/ch.psi.cdump/src/test/java/ch/psi/cdump/CdumpPrLogicTest.java b/ch.psi.cdump/src/test/java/ch/psi/fda/cdump/CdumpPrLogicTest.java
similarity index 95%
rename from ch.psi.cdump/src/test/java/ch/psi/cdump/CdumpPrLogicTest.java
rename to ch.psi.cdump/src/test/java/ch/psi/fda/cdump/CdumpPrLogicTest.java
index 55dfc6f..e3f5dd3 100644
--- a/ch.psi.cdump/src/test/java/ch/psi/cdump/CdumpPrLogicTest.java
+++ b/ch.psi.cdump/src/test/java/ch/psi/fda/cdump/CdumpPrLogicTest.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.cdump;
+package ch.psi.fda.cdump;
 
 import java.io.File;
 
@@ -25,6 +25,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import ch.psi.fda.cdump.CdumpSerializer;
+
 import com.google.common.eventbus.EventBus;
 
 public class CdumpPrLogicTest {