diff --git a/.gitignore b/.gitignore
index 5bb5a81..9751ddd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/bin
 /target
 /build
 .gradle
diff --git a/build.gradle b/build.gradle
index 9815028..dc267e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'eclipse'
 
 sourceCompatibility = 1.7
 
-version = '2.5.2_zmq'
+version = '2.6.0'
 
 repositories {
     mavenCentral()
@@ -13,7 +13,7 @@ repositories {
 
 dependencies {
 	compile 'ch.psi:ch.psi.fda.core:2.3.4'
-	compile 'ch.psi.fda:ch.psi.fda.xscan:2.4.1_zmq'
+	compile 'ch.psi.fda:ch.psi.fda.xscan:2.6.0'
 	compile 'ch.psi:ch.psi.fda.cdump:2.3.4'
 	compile 'ch.psi:ch.psi.fda.fdaq:2.3.4'
 	compile 'ch.psi:jcae:2.4.1'
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index c0d68ce..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>ch.psi</groupId>
-	<artifactId>fda</artifactId>
-	<version>2.5.2_zmq</version>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>ch.psi</groupId>
-			<artifactId>ch.psi.fda.core</artifactId>
-			<version>2.3.4</version>
-		</dependency>
-
-		<!-- These 3 libraries are just needed for testing -->
-		<dependency>
-			<groupId>ch.psi.fda</groupId>
-			<artifactId>ch.psi.fda.xscan</artifactId>
-			<version>2.4.1_zmq</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.psi</groupId>
-			<artifactId>ch.psi.fda.cdump</artifactId>
-			<version>2.3.4</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.psi</groupId>
-			<artifactId>ch.psi.fda.fdaq</artifactId>
-			<version>2.3.4</version>
-		</dependency>
-
-		<dependency>
-			<groupId>ch.psi</groupId>
-			<artifactId>jcae</artifactId>
-			<version>2.4.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.inject</groupId>
-			<artifactId>guice</artifactId>
-			<version>3.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.glassfish.jersey.containers</groupId>
-			<artifactId>jersey-container-grizzly2-http</artifactId>
-			<version>2.5.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.glassfish.jersey.media</groupId>
-			<artifactId>jersey-media-sse</artifactId>
-			<version>2.5.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.glassfish.jersey.media</groupId>
-			<artifactId>jersey-media-json-jackson</artifactId>
-			<version>2.5.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.zeromq</groupId>
-			<artifactId>jeromq</artifactId>
-			<version>0.3.4</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>cli</artifactId>
-			<version>1.2</version>
-		</dependency>
-
-		<!-- Library to Read Matlab Files -->
-		<dependency>
-			<groupId>com.jmatio</groupId>
-			<artifactId>jmatio</artifactId>
-			<version>0.2u2psi1</version>
-		</dependency>
-		<!-- Library for reading/writing XDR Format (MDA) -->
-		<dependency>
-			<groupId>org.freehep</groupId>
-			<artifactId>freehep-xdr</artifactId>
-			<version>2.0.4</version>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.2</version>
-			<scope>test</scope>
-		</dependency>
-	 <dependency>
-	  <groupId>${project.groupId}</groupId>
-	  <artifactId>plot</artifactId>
-	  <version>2.1-SNAPSHOT</version>
-	 </dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<encoding>UTF-8</encoding>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<additionalparam>-Xdoclint:none</additionalparam> <!-- Disable Java8 strict Javadoc checking -->
-				</configuration>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<distributionManagement>
-		<snapshotRepository>
-			<id>i.snapshots</id>
-			<name>Artifactory Snapshots</name>
-			<url>http://artifacts.psi.ch/artifactory/libs-snapshots-local</url>
-		</snapshotRepository>
-		<repository>
-			<id>i.releases</id>
-			<name>Atrifactory Releases</name>
-			<url>http://artifacts.psi.ch/artifactory/libs-releases-local</url>
-		</repository>
-	</distributionManagement>
-</project>
\ No newline at end of file