diff --git a/ch.psi.fdaq/.project b/ch.psi.fdaq/.project
index 75b1b8f..28b487e 100644
--- a/ch.psi.fdaq/.project
+++ b/ch.psi.fdaq/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ch.psi.fdaq</name>
+	<name>ch.psi.fda.fdaq</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/ch.psi.fdaq/src/main/java/ch/psi/fdaq/FdaqMain.java b/ch.psi.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java
similarity index 98%
rename from ch.psi.fdaq/src/main/java/ch/psi/fdaq/FdaqMain.java
rename to ch.psi.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java
index 8e71c16..e94b78f 100644
--- a/ch.psi.fdaq/src/main/java/ch/psi/fdaq/FdaqMain.java
+++ b/ch.psi.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java
@@ -16,7 +16,7 @@
  * along with this code. If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package ch.psi.fdaq;
+package ch.psi.fda.fdaq;
 
 import java.io.File;
 import java.util.concurrent.Executors;
diff --git a/ch.psi.fdaq/src/main/java/ch/psi/fdaq/FdaqService.java b/ch.psi.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java
similarity index 99%
rename from ch.psi.fdaq/src/main/java/ch/psi/fdaq/FdaqService.java
rename to ch.psi.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java
index 5d884fc..fa449c2 100644
--- a/ch.psi.fdaq/src/main/java/ch/psi/fdaq/FdaqService.java
+++ b/ch.psi.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java
@@ -16,7 +16,7 @@
  * along with this code. If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package ch.psi.fdaq;
+package ch.psi.fda.fdaq;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/ch.psi.fdaq/src/test/java/ch/psi/fdaq/SocketClient.java b/ch.psi.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClient.java
similarity index 99%
rename from ch.psi.fdaq/src/test/java/ch/psi/fdaq/SocketClient.java
rename to ch.psi.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClient.java
index 878211c..347d77c 100644
--- a/ch.psi.fdaq/src/test/java/ch/psi/fdaq/SocketClient.java
+++ b/ch.psi.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClient.java
@@ -16,7 +16,7 @@
  * along with this code. If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package ch.psi.fdaq;
+package ch.psi.fda.fdaq;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/ch.psi.fdaq/src/test/java/ch/psi/fdaq/SocketClientStop.java b/ch.psi.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClientStop.java
similarity index 98%
rename from ch.psi.fdaq/src/test/java/ch/psi/fdaq/SocketClientStop.java
rename to ch.psi.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClientStop.java
index b9fe059..fc9a96a 100644
--- a/ch.psi.fdaq/src/test/java/ch/psi/fdaq/SocketClientStop.java
+++ b/ch.psi.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClientStop.java
@@ -16,7 +16,7 @@
  * along with this code. If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package ch.psi.fdaq;
+package ch.psi.fda.fdaq;
 
 import java.io.DataOutputStream;
 import java.io.IOException;