diff --git a/ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/ControlMessage.java b/ch.psi.fda.core/src/main/java/ch/psi/fda/messages/ControlMessage.java
similarity index 96%
rename from ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/ControlMessage.java
rename to ch.psi.fda.core/src/main/java/ch/psi/fda/messages/ControlMessage.java
index b06f030..ec9cda9 100644
--- a/ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/ControlMessage.java
+++ b/ch.psi.fda.core/src/main/java/ch/psi/fda/messages/ControlMessage.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.core.messages;
+package ch.psi.fda.messages;
 
 
 /**
diff --git a/ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/DataMessage.java b/ch.psi.fda.core/src/main/java/ch/psi/fda/messages/DataMessage.java
similarity index 98%
rename from ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/DataMessage.java
rename to ch.psi.fda.core/src/main/java/ch/psi/fda/messages/DataMessage.java
index bfbb128..2b3d19c 100644
--- a/ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/DataMessage.java
+++ b/ch.psi.fda.core/src/main/java/ch/psi/fda/messages/DataMessage.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.core.messages;
+package ch.psi.fda.messages;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/EndOfStreamMessage.java b/ch.psi.fda.core/src/main/java/ch/psi/fda/messages/EndOfStreamMessage.java
similarity index 97%
rename from ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/EndOfStreamMessage.java
rename to ch.psi.fda.core/src/main/java/ch/psi/fda/messages/EndOfStreamMessage.java
index c85eec1..409a85c 100644
--- a/ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/EndOfStreamMessage.java
+++ b/ch.psi.fda.core/src/main/java/ch/psi/fda/messages/EndOfStreamMessage.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.core.messages;
+package ch.psi.fda.messages;
 
 /**
  * Message that is send at the end of the action loop inside an ActionLoop implementation
diff --git a/ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/Message.java b/ch.psi.fda.core/src/main/java/ch/psi/fda/messages/Message.java
similarity index 96%
rename from ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/Message.java
rename to ch.psi.fda.core/src/main/java/ch/psi/fda/messages/Message.java
index 0d4536a..9c5f4f7 100644
--- a/ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/Message.java
+++ b/ch.psi.fda.core/src/main/java/ch/psi/fda/messages/Message.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.core.messages;
+package ch.psi.fda.messages;
 
 import java.io.Serializable;
 
diff --git a/ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/Metadata.java b/ch.psi.fda.core/src/main/java/ch/psi/fda/messages/Metadata.java
similarity index 97%
rename from ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/Metadata.java
rename to ch.psi.fda.core/src/main/java/ch/psi/fda/messages/Metadata.java
index 4d8cf3c..cc208fc 100644
--- a/ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/Metadata.java
+++ b/ch.psi.fda.core/src/main/java/ch/psi/fda/messages/Metadata.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.core.messages;
+package ch.psi.fda.messages;
 
 import java.io.Serializable;
 
diff --git a/ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/StreamDelimiterMessage.java b/ch.psi.fda.core/src/main/java/ch/psi/fda/messages/StreamDelimiterMessage.java
similarity index 98%
rename from ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/StreamDelimiterMessage.java
rename to ch.psi.fda.core/src/main/java/ch/psi/fda/messages/StreamDelimiterMessage.java
index 9d35ba8..91c7b87 100644
--- a/ch.psi.fda.core/src/main/java/ch/psi/fda/core/messages/StreamDelimiterMessage.java
+++ b/ch.psi.fda.core/src/main/java/ch/psi/fda/messages/StreamDelimiterMessage.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.core.messages;
+package ch.psi.fda.messages;
 
 /**
  * Message that is send at the end of the action loop inside an ActionLoop implementation