diff --git a/ch.psi.fda/Readme.md b/ch.psi.fda/Readme.md
index 1fa21b9..3971a30 100644
--- a/ch.psi.fda/Readme.md
+++ b/ch.psi.fda/Readme.md
@@ -20,4 +20,7 @@ After checking out the project execute `mvn compile` to create the folder and th
 
 To build project use `mvn clean install`.
 
-To upload the latest version to the central artifact repository use `mvn clean deploy`.
\ No newline at end of file
+To upload the latest version to the central artifact repository use `mvn clean deploy`.
+
+## REST
+FDA offers a rest service to execute scans. There are 3 distinct service for fda scan, fdaq and cdump.
\ No newline at end of file
diff --git a/ch.psi.fda/pom.xml b/ch.psi.fda/pom.xml
index f1525d4..16bc864 100644
--- a/ch.psi.fda/pom.xml
+++ b/ch.psi.fda/pom.xml
@@ -231,20 +231,28 @@
 					</configuration>
 				</plugin>
 				
-				<plugin>
+				<!-- <plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>
 					<finalName>${project.name}-${project.version}</finalName>
 					<appendAssemblyId>false</appendAssemblyId>
 					<archive>
-						<!-- <manifest>
-							<mainClass>ch.psi.fda.AcquisitionMain</mainClass>
-						</manifest> -->
 					</archive>
 					<descriptorRefs>
 						<descriptorRef>jar-with-dependencies</descriptorRef>
 					</descriptorRefs>
 				</configuration>
+			</plugin> -->
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<!-- Specifies the configuration file of the assembly plugin -->
+					<descriptors>
+						<descriptor>src/main/assembly/assembly.xml</descriptor>
+					</descriptors>
+				</configuration>
 			</plugin>
 				
 			</plugins>
diff --git a/ch.psi.fda/src/main/assembly/assembly.xml b/ch.psi.fda/src/main/assembly/assembly.xml
new file mode 100644
index 0000000..fca2325
--- /dev/null
+++ b/ch.psi.fda/src/main/assembly/assembly.xml
@@ -0,0 +1,50 @@
+<assembly>
+    <id>bin</id>
+    <!-- Generates a zip package containing the needed files -->
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <!-- Adds dependencies to zip package under lib directory -->
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <unpack>false</unpack>
+        </dependencySet>
+    </dependencySets>
+
+    <fileSets>
+        <!--  Adds startup scripts to the root directory of zip package -->
+        <fileSet>
+        	<fileMode>0755</fileMode>
+            <directory>src/main/assembly/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+        </fileSet>
+        <!-- <fileSet>
+        	<directory>src/main/assembly/www</directory>
+            <outputDirectory>www</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet> -->
+        <!-- <fileSet>
+        	<fileMode>0755</fileMode>
+        	<directory>src/main/assembly/var</directory>
+            <outputDirectory>var</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet> -->
+        <!-- adds jar package to the root directory of zip package -->
+        <!-- <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet> -->
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/ch.psi.fda/src/main/assembly/bin/convert b/ch.psi.fda/src/main/assembly/bin/convert
new file mode 100644
index 0000000..e717b21
--- /dev/null
+++ b/ch.psi.fda/src/main/assembly/bin/convert
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+CURRENTDIR=`pwd`
+
+# Resolve symlinks
+BASEDIR=$0
+while [ -h "$BASEDIR" ]; do
+    ls=`ls -ld "$BASEDIR"`
+    link=`expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null`
+    if expr "$link" : '^/' 2> /dev/null >/dev/null; then
+        BASEDIR="$link"
+    else
+        BASEDIR="`dirname "$BASEDIR"`/$link"
+    fi
+done
+BASEDIR=`dirname "$BASEDIR"`
+
+SCRIPTNAME=`basename ${0}`
+
+APPLICATION_HOME=$BASEDIR/../..
+
+LIB_DIR=`find $BASEDIR/../lib -name "*.jar"`
+LIB_DIR=`echo $LIB_DIR | sed -e 's/ /:/g'`
+
+CLASSPATH=${APPLICATION_HOME}/config/:$LIB_DIR
+
+ARGUMENTS=
+VM_ARGUMENTS=
+for i in $@
+do
+        if [ `expr $i : '-D.*'` != '0' ] ;then
+                # Extract VM options
+                VM_ARGUMENTS="$VM_ARGUMENTS $i"
+        else
+                ARGUMENTS="$ARGUMENTS $i"
+        fi
+done
+
+# Execute java
+java -Xmx1024m -XX:MaxPermSize=128m -cp $CLASSPATH -Dch.psi.fda.home=${APPLICATION_HOME} -Djava.util.logging.config.file=${APPLICATION_HOME}/config/logging.properties $VM_ARGUMENTS ch.psi.fda.ConversionMain $ARGUMENTS
\ No newline at end of file
diff --git a/ch.psi.fda/src/main/assembly/bin/fda b/ch.psi.fda/src/main/assembly/bin/fda
new file mode 100644
index 0000000..5ee3712
--- /dev/null
+++ b/ch.psi.fda/src/main/assembly/bin/fda
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+CURRENTDIR=`pwd`
+
+# Resolve symlinks
+BASEDIR=$0
+while [ -h "$BASEDIR" ]; do
+    ls=`ls -ld "$BASEDIR"`
+    link=`expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null`
+    if expr "$link" : '^/' 2> /dev/null >/dev/null; then
+        BASEDIR="$link"
+    else
+        BASEDIR="`dirname "$BASEDIR"`/$link"
+    fi
+done
+BASEDIR=`dirname "$BASEDIR"`
+
+SCRIPTNAME=`basename ${0}`
+
+APPLICATION_HOME=$BASEDIR/../..
+
+LIB_DIR=`find $BASEDIR/../lib -name "*.jar"`
+LIB_DIR=`echo $LIB_DIR | sed -e 's/ /:/g'`
+
+CLASSPATH=${APPLICATION_HOME}/config/:$LIB_DIR
+
+ARGUMENTS=
+VM_ARGUMENTS=
+for i in $@
+do
+        if [ `expr $i : '-D.*'` != '0' ] ;then
+                # Extract VM options
+                VM_ARGUMENTS="$VM_ARGUMENTS $i"
+        else
+                ARGUMENTS="$ARGUMENTS $i"
+        fi
+done
+
+
+#HUB_BASE=$BASEDIR/../
+#export HUB_BASE
+java $VM_ARGUMENTS -cp $CLASSPATH -Dch.psi.fda.home=${APPLICATION_HOME} -Djava.util.logging.config.file=${APPLICATION_HOME}/config/logging.properties ch.psi.fda.rest.FdaServer $ARGUMENTS
\ No newline at end of file
diff --git a/ch.psi.fda/src/main/assembly/bin/scan b/ch.psi.fda/src/main/assembly/bin/scan
new file mode 100644
index 0000000..2203715
--- /dev/null
+++ b/ch.psi.fda/src/main/assembly/bin/scan
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+CURRENTDIR=`pwd`
+
+# Resolve symlinks
+BASEDIR=$0
+while [ -h "$BASEDIR" ]; do
+    ls=`ls -ld "$BASEDIR"`
+    link=`expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null`
+    if expr "$link" : '^/' 2> /dev/null >/dev/null; then
+        BASEDIR="$link"
+    else
+        BASEDIR="`dirname "$BASEDIR"`/$link"
+    fi
+done
+BASEDIR=`dirname "$BASEDIR"`
+
+SCRIPTNAME=`basename ${0}`
+
+APPLICATION_HOME=$BASEDIR/../..
+
+LIB_DIR=`find $BASEDIR/../lib -name "*.jar"`
+LIB_DIR=`echo $LIB_DIR | sed -e 's/ /:/g'`
+
+CLASSPATH=${APPLICATION_HOME}/config/:$LIB_DIR
+
+ARGUMENTS=
+VM_ARGUMENTS=
+for i in $@
+do
+        if [ `expr $i : '-D.*'` != '0' ] ;then
+                # Extract VM options
+                VM_ARGUMENTS="$VM_ARGUMENTS $i"
+        else
+                ARGUMENTS="$ARGUMENTS $i"
+        fi
+done
+
+# Execute java
+java -Xmx1024m -XX:MaxPermSize=128m -Dch.psi.fda.home=${APPLICATION_HOME} -Djava.util.logging.config.file=${APPLICATION_HOME}/config/logging.properties $VM_ARGUMENTS -cp $CLASSPATH ch.psi.fda.AcquisitionMain $ARGUMENTS
\ No newline at end of file
diff --git a/ch.psi.fda/src/main/assembly/bin/visualize b/ch.psi.fda/src/main/assembly/bin/visualize
new file mode 100644
index 0000000..40615a6
--- /dev/null
+++ b/ch.psi.fda/src/main/assembly/bin/visualize
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+CURRENTDIR=`pwd`
+
+# Resolve symlinks
+BASEDIR=$0
+while [ -h "$BASEDIR" ]; do
+    ls=`ls -ld "$BASEDIR"`
+    link=`expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null`
+    if expr "$link" : '^/' 2> /dev/null >/dev/null; then
+        BASEDIR="$link"
+    else
+        BASEDIR="`dirname "$BASEDIR"`/$link"
+    fi
+done
+BASEDIR=`dirname "$BASEDIR"`
+
+SCRIPTNAME=`basename ${0}`
+
+APPLICATION_HOME=$BASEDIR/../..
+
+LIB_DIR=`find $BASEDIR/../lib -name "*.jar"`
+LIB_DIR=`echo $LIB_DIR | sed -e 's/ /:/g'`
+
+CLASSPATH=${APPLICATION_HOME}/config/:$LIB_DIR
+
+ARGUMENTS=
+VM_ARGUMENTS=
+for i in $@
+do
+        if [ `expr $i : '-D.*'` != '0' ] ;then
+                # Extract VM options
+                VM_ARGUMENTS="$VM_ARGUMENTS $i"
+        else
+                ARGUMENTS="$ARGUMENTS $i"
+        fi
+done
+
+# Execute java
+java -Xmx1024m -XX:MaxPermSize=128m -cp $CLASSPATH -Dch.psi.fda.home=${APPLICATION_HOME} -Djava.util.logging.config.file=${APPLICATION_HOME}/config/logging.properties $VM_ARGUMENTS ch.psi.fda.VisualizationMain $ARGUMENTS
\ No newline at end of file
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/RestServer.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaServer.java
similarity index 92%
rename from ch.psi.fda/src/main/java/ch/psi/fda/rest/RestServer.java
rename to ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaServer.java
index 8a5879f..fdf077f 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/RestServer.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/FdaServer.java
@@ -22,9 +22,9 @@ import sun.misc.Signal;
 import sun.misc.SignalHandler;
 
 @SuppressWarnings("restriction")
-public class RestServer {
+public class FdaServer {
 	
-	private static final Logger logger = Logger.getLogger(RestServer.class.getName());
+	private static final Logger logger = Logger.getLogger(FdaServer.class.getName());
 
 	public static void main(String[] args) throws IOException, ParseException {
 
@@ -56,7 +56,7 @@ public class RestServer {
 		ResourceBinder binder = new ResourceBinder();
 		
 		ResourceConfig resourceConfig = new ResourceConfig();
-		resourceConfig.packages(RestServer.class.getPackage().getName()+".services"); // Services are located in services package
+		resourceConfig.packages(FdaServer.class.getPackage().getName()+".services"); // Services are located in services package
 		resourceConfig.register(binder);
 		
 		resourceConfig.register(JacksonFeature.class);