diff --git a/ch.psi.fdaq/.classpath b/ch.psi.fda.fdaq/.classpath
similarity index 100%
rename from ch.psi.fdaq/.classpath
rename to ch.psi.fda.fdaq/.classpath
diff --git a/ch.psi.fdaq/.gitignore b/ch.psi.fda.fdaq/.gitignore
similarity index 100%
rename from ch.psi.fdaq/.gitignore
rename to ch.psi.fda.fdaq/.gitignore
diff --git a/ch.psi.fdaq/.project b/ch.psi.fda.fdaq/.project
similarity index 100%
rename from ch.psi.fdaq/.project
rename to ch.psi.fda.fdaq/.project
diff --git a/ch.psi.fdaq/.settings/org.eclipse.core.resources.prefs b/ch.psi.fda.fdaq/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from ch.psi.fdaq/.settings/org.eclipse.core.resources.prefs
rename to ch.psi.fda.fdaq/.settings/org.eclipse.core.resources.prefs
diff --git a/ch.psi.fdaq/.settings/org.eclipse.jdt.core.prefs b/ch.psi.fda.fdaq/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from ch.psi.fdaq/.settings/org.eclipse.jdt.core.prefs
rename to ch.psi.fda.fdaq/.settings/org.eclipse.jdt.core.prefs
diff --git a/ch.psi.fdaq/.settings/org.eclipse.m2e.core.prefs b/ch.psi.fda.fdaq/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from ch.psi.fdaq/.settings/org.eclipse.m2e.core.prefs
rename to ch.psi.fda.fdaq/.settings/org.eclipse.m2e.core.prefs
diff --git a/ch.psi.fdaq/Readme.md b/ch.psi.fda.fdaq/Readme.md
similarity index 100%
rename from ch.psi.fdaq/Readme.md
rename to ch.psi.fda.fdaq/Readme.md
diff --git a/ch.psi.fdaq/pom.xml b/ch.psi.fda.fdaq/pom.xml
similarity index 100%
rename from ch.psi.fdaq/pom.xml
rename to ch.psi.fda.fdaq/pom.xml
diff --git a/ch.psi.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java
similarity index 100%
rename from ch.psi.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java
rename to ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqMain.java
diff --git a/ch.psi.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java b/ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java
similarity index 100%
rename from ch.psi.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java
rename to ch.psi.fda.fdaq/src/main/java/ch/psi/fda/fdaq/FdaqService.java
diff --git a/ch.psi.fdaq/src/main/resources/.gitignore b/ch.psi.fda.fdaq/src/main/resources/.gitignore
similarity index 100%
rename from ch.psi.fdaq/src/main/resources/.gitignore
rename to ch.psi.fda.fdaq/src/main/resources/.gitignore
diff --git a/ch.psi.fdaq/src/test/java/.gitignore b/ch.psi.fda.fdaq/src/test/java/.gitignore
similarity index 100%
rename from ch.psi.fdaq/src/test/java/.gitignore
rename to ch.psi.fda.fdaq/src/test/java/.gitignore
diff --git a/ch.psi.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClient.java b/ch.psi.fda.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClient.java
similarity index 100%
rename from ch.psi.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClient.java
rename to ch.psi.fda.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClient.java
diff --git a/ch.psi.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClientStop.java b/ch.psi.fda.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClientStop.java
similarity index 100%
rename from ch.psi.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClientStop.java
rename to ch.psi.fda.fdaq/src/test/java/ch/psi/fda/fdaq/SocketClientStop.java
diff --git a/ch.psi.fdaq/src/test/resources/.gitignore b/ch.psi.fda.fdaq/src/test/resources/.gitignore
similarity index 100%
rename from ch.psi.fdaq/src/test/resources/.gitignore
rename to ch.psi.fda.fdaq/src/test/resources/.gitignore