diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java
index 0a17dbb..39c225e 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/AcquisitionMain.java
@@ -59,6 +59,7 @@ import sun.misc.SignalHandler;
 import ch.psi.fda.edescriptor.EDescriptor;
 import ch.psi.fda.gui.ProgressPanel;
 import ch.psi.fda.gui.ScrollableFlowPanel;
+import ch.psi.fda.rest.InjectionModule;
 import ch.psi.fda.vdescriptor.VDescriptor;
 import ch.psi.fda.visualizer.Visualizer;
 import ch.psi.jcae.ChannelService;
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionEngine.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionEngine.java
index 8c829ca..d9a2d5b 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionEngine.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionEngine.java
@@ -62,7 +62,7 @@ public class ExecutionEngine {
 	 */
 	public void submit(String trackingId, EDescriptor edescriptor){
 
-		logger.info("Submitting new scan with trackingId " + trackingId);
+		logger.info("Submitting job with trackingId ----" + trackingId);
 		if(erequests.keySet().contains(trackingId) && !erequests.get(trackingId).isDone()){ // Allow finished tracking ids to be reused for new tasks
 			throw new IllegalArgumentException("A request with tracking ID "+trackingId+" is already submitted");
 		}
@@ -74,7 +74,7 @@ public class ExecutionEngine {
 	
 	
 	public void terminateAll() {
-		logger.info("Terminate all scans");
+		logger.info("Terminate all jobs");
 		for(Future<?> f: erequests.values()){
 			f.cancel(true);
 		}
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionJob.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionJob.java
index f88fc97..b747743 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionJob.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/ExecutionJob.java
@@ -23,7 +23,6 @@ import java.util.logging.Logger;
 
 import ch.psi.fda.EContainer;
 import ch.psi.fda.EContainerFactory;
-import ch.psi.fda.InjectionModule;
 import ch.psi.fda.edescriptor.EDescriptor;
 import ch.psi.jcae.ChannelService;
 
@@ -31,6 +30,11 @@ import com.google.common.eventbus.EventBus;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
+/**
+ * "Wrapper" around the execution container. Depending on the edescriptor this class takes care of loading the
+ * correct execution container. It also takes care of all common stuff described in the edescriptor like 
+ * streaming for plotting, etc.
+ */
 public class ExecutionJob implements Runnable {
 
 	private static final Logger logger = Logger.getLogger(ExecutionJob.class.getName());
@@ -54,7 +58,7 @@ public class ExecutionJob implements Runnable {
 		 EContainer econtainer = null;
 		try {
 
-			logger.info("Execute - " + trackingId);
+			logger.info("Execute ----" + trackingId);
 
 			EventBus ebus = new EventBus();
 			zmqService.setTrackingId(trackingId);
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/InjectionModule.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/InjectionModule.java
similarity index 93%
rename from ch.psi.fda/src/main/java/ch/psi/fda/InjectionModule.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/rest/InjectionModule.java
index 3d449e9..15b32f8 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/InjectionModule.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/InjectionModule.java
@@ -1,4 +1,4 @@
-package ch.psi.fda;
+package ch.psi.fda.rest;
 
 import ch.psi.jcae.ChannelService;