diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java b/ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java
index a27ca1f..3011216 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/aq/Acquisition.java
@@ -55,7 +55,6 @@ import ch.psi.fda.core.actors.ComplexActuator;
 import ch.psi.fda.core.actors.JythonFunction;
 import ch.psi.fda.core.actors.OTFActuator;
 import ch.psi.fda.core.actors.PseudoActuatorSensor;
-import ch.psi.fda.core.collector.Collector;
 import ch.psi.fda.core.guard.ChannelAccessGuard;
 import ch.psi.fda.core.guard.ChannelAccessGuardCondition;
 import ch.psi.fda.core.loops.ActorSensorLoop;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/core/collector/Collector.java b/ch.psi.fda/src/main/java/ch/psi/fda/aq/Collector.java
similarity index 99%
rename from ch.psi.fda/src/main/java/ch/psi/fda/core/collector/Collector.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/aq/Collector.java
index 002d2f7..b0b23f8 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/core/collector/Collector.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/aq/Collector.java
@@ -17,7 +17,7 @@
  * 
  */
 
-package ch.psi.fda.core.collector;
+package ch.psi.fda.aq;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/SeriesDataFilter.java b/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/SeriesDataFilter.java
index ada16ca..02793f2 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/SeriesDataFilter.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/visualizer/SeriesDataFilter.java
@@ -19,10 +19,5 @@
 
 package ch.psi.fda.visualizer;
 
-/**
- * @author ebner
- *
- */
 public interface SeriesDataFilter {
-
 }
diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/core/collector/CollectorTest.java b/ch.psi.fda/src/test/java/ch/psi/fda/core/collector/CollectorTest.java
index 20a1b5e..8ecd7e1 100644
--- a/ch.psi.fda/src/test/java/ch/psi/fda/core/collector/CollectorTest.java
+++ b/ch.psi.fda/src/test/java/ch/psi/fda/core/collector/CollectorTest.java
@@ -30,7 +30,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import ch.psi.fda.core.collector.Collector;
+import ch.psi.fda.aq.Collector;
 import ch.psi.fda.core.messages.ComponentMetadata;
 import ch.psi.fda.core.messages.ControlMessage;
 import ch.psi.fda.core.messages.DataMessage;
@@ -198,7 +198,7 @@ public class CollectorTest {
 	}
 
 	/**
-	 * Test method for {@link ch.psi.fda.core.collector.Collector#run()}.
+	 * Test method for {@link ch.psi.fda.aq.Collector#run()}.
 	 * @throws InterruptedException 
 	 */
 	@Test