diff --git a/core/lib/liblinear-wrapper.jar b/core/lib/liblinear-wrapper.jar
deleted file mode 100644
index 8ebb61e9..00000000
Binary files a/core/lib/liblinear-wrapper.jar and /dev/null differ
diff --git a/core/lib/liblinear.jar b/core/lib/liblinear.jar
deleted file mode 100644
index 8b4459a9..00000000
Binary files a/core/lib/liblinear.jar and /dev/null differ
diff --git a/core/pom.xml b/core/pom.xml
index e4b6e8ae..d285b02c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -143,18 +143,20 @@
 			<artifactId>opennlp-tools</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>de.bwaldvogel</groupId>
-			<artifactId>liblinear</artifactId>
-			<version>1.96</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/lib/liblinear.jar</systemPath>
+			<groupId>nz.ac.waikato.cms.weka</groupId>
+			<artifactId>LibLINEAR</artifactId>
+			<version>1.9.7</version>
+			<exclusions>
+				<exclusion>
+					<groupId>nz.ac.waikato.cms.weka</groupId>
+					<artifactId>weka-dev</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>nz.ac.waikato.cms.weka</groupId>
+			<groupId>de.bwaldvogel</groupId>
 			<artifactId>liblinear</artifactId>
-			<version>1.9.8-SNAPSHOT</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/lib/liblinear-wrapper.jar</systemPath>
+			<version>2.11</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/distribution/assembly.xml b/distribution/assembly.xml
index a36a4e9b..30baa49b 100644
--- a/distribution/assembly.xml
+++ b/distribution/assembly.xml
@@ -37,6 +37,6 @@
             </binaries>
         </moduleSet>
     </moduleSets>
-    
+
 </assembly>
 
diff --git a/distribution/pack.xml b/distribution/pack.xml
new file mode 100644
index 00000000..53faf68b
--- /dev/null
+++ b/distribution/pack.xml
@@ -0,0 +1,24 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>project</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <baseDirectory>Excitement-Open-Platform-${artifact.version}</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/..</directory><!-- TODO: bad practice, should change the build -->
+            <outputDirectory>/</outputDirectory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+            <excludes>
+                <exclude>**/*.iml</exclude>
+                <exclude>**/.idea/**</exclude>
+                <exclude>**/${project.build.directory}/**</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>
+
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 9fb6c3c2..5859f4b7 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -3,20 +3,20 @@
          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>
-  
+
 	<parent>
 		<groupId>eu.excitementproject</groupId>
 		<artifactId>eop</artifactId>
 		<version>1.2.4-SNAPSHOT</version>
 	</parent>
-  
-  <artifactId>distribution</artifactId>
- 
+
+  <artifactId>Excitement-Open-Platform</artifactId>
+
   <packaging>pom</packaging>
- 
+
   <name>EOP Distribution</name>
-  
-  <!-- NOTE: These dependency declarations are only required to sort this project to the 
+
+  <!-- NOTE: These dependency declarations are only required to sort this project to the
        end of the line in the multimodule build (i.e to ensure this module builds last).
   -->
   <dependencies>
@@ -99,14 +99,46 @@
             </goals>
             <configuration>
               <descriptors>
+                <descriptor>${project.basedir}/pack.xml</descriptor>
                 <descriptor>${project.basedir}/assembly.xml</descriptor>
               </descriptors>
               <!-- TODO: this is bad practice. Build script should look for dist file under distribution/target/ -->
               <outputDirectory>${project.basedir}/../target</outputDirectory>
+              <appendAssemblyId>true</appendAssemblyId>
             </configuration>
           </execution>
         </executions>
       </plugin>
-    </plugins>
+		<plugin>
+			<groupId>com.coderplus.maven.plugins</groupId>
+			<artifactId>copy-rename-maven-plugin</artifactId>
+			<version>1.0.1</version>
+			<executions>
+				<execution>
+					<id>rename-dist-files</id>
+					<phase>package</phase>
+					<goals>
+						<goal>rename</goal>
+					</goals>
+					<configuration>
+						<fileSets>
+							<fileSet>
+								<sourceFile>${project.basedir}/../target/Excitement-Open-Platform-${eop-version}-bin.zip</sourceFile>
+								<destinationFile>${project.basedir}/../target/eop-${eop-version}-bin.zip</destinationFile>
+							</fileSet>
+							<fileSet>
+								<sourceFile>${project.basedir}/../target/Excitement-Open-Platform-${eop-version}-project.zip</sourceFile>
+								<destinationFile>${project.basedir}/../target/Excitement-Open-Platform-${eop-version}.zip</destinationFile>
+							</fileSet>
+							<fileSet>
+								<sourceFile>${project.basedir}/../target/Excitement-Open-Platform-${eop-version}-project.tar.gz</sourceFile>
+								<destinationFile>${project.basedir}/../target/Excitement-Open-Platform-${eop-version}.tar.gz</destinationFile>
+							</fileSet>
+						</fileSets>
+					</configuration>
+				</execution>
+			</executions>
+		</plugin>
+	</plugins>
   </build>
 </project>
diff --git a/pom.xml b/pom.xml
index e47bf403..cddb7fb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
 		<module>lexicalinferenceminer</module>
 		<module>alignmentedas</module> 
 		<module>adarte</module>
+		<module>distribution</module>
 	</modules>
 
         <profiles>
@@ -558,17 +559,6 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.0.0</version>
-				<configuration>
-					<descriptors>
-						<descriptor>distribution/assembly.xml</descriptor>
-					</descriptors>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>