diff --git a/main/pom.xml b/main/pom.xml
new file mode 100644
index 000000000..e3a903c58
--- /dev/null
+++ b/main/pom.xml
@@ -0,0 +1,371 @@
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.openrefine</groupId>
+  <artifactId>main</artifactId>
+  <packaging>pom</packaging>
+  <version>3.0-SNAPSHOT</version>
+
+  <name>OpenRefine - main</name>
+  <description>OpenRefine is a free, open source power tool for working with messy data and improving it</description>
+  <url>http://openrefine.org/</url>
+  <parent>
+    <groupId>org.openrefine</groupId>
+    <artifactId>openrefine</artifactId>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+
+  <properties>
+    <jee.path>/</jee.path>
+    <jee.port>3333</jee.port>
+    <refine.data>/tmp/refine</refine.data>
+  </properties>
+
+  <scm>
+    <connection>scm:git:http://github.com/OpenRefine/OpenRefine</connection>
+    <url>http://github.com/OpenRefine/OpenRefine</url>
+  </scm>
+
+  <build>
+    <finalName>openrefine-main</finalName>
+    <resources>
+      <resource>
+        <directory>src</directory>
+      </resource>
+    </resources>
+    <testSourceDirectory>tests/server/src</testSourceDirectory>
+    <testResources>
+      <testResource>
+        <directory>tests/data</directory>
+      </testResource>
+    </testResources>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>src</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+          <encoding>UTF-8</encoding>
+          <showDeprecation>false</showDeprecation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.22.0</version>
+        <configuration>
+          <suiteXmlFiles>
+            <suiteXmlFile>tests/server/conf/tests.xml</suiteXmlFile>
+          </suiteXmlFiles>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.3</version>
+        <configuration>
+          <mainClass>com.google.refine.Refine</mainClass>
+          <skip>true</skip>
+          <executable>java</executable>
+        </configuration>
+      </plugin>
+
+    </plugins>
+    <pluginManagement>
+      <plugins>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+  <!--  <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.22</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>6.1.22</version>
+    </dependency>
+    <dependency>
+      <groupId>com.codeberry.jdatapath</groupId>
+      <artifactId>jdatapath</artifactId>
+      <version>alpha2</version>
+    </dependency> -->
+    <dependency>
+      <groupId>edu.mit.simile</groupId>
+      <artifactId>butterfly</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mozilla</groupId>
+      <artifactId>rhino</artifactId>
+      <version>1.7.10</version>
+    </dependency>
+  <!--  <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>13.0</version>
+    </dependency> -->
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <version>20160810</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>2.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.7.18</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.18</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.6</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>1.8.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.2.1</version>
+    </dependency>
+    <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>velocity</groupId>
+      <artifactId>velocity</artifactId>
+      <version>1.5</version>
+    </dependency>
+    <dependency>
+      <groupId>marc4j</groupId>
+      <artifactId>marc4j</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId> <!-- for org.apache.tools.bzip2 -->
+      <version>1.8.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jsoup</groupId>
+      <artifactId>jsoup</artifactId>
+      <version>1.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.opencsv</groupId>
+      <artifactId>opencsv</artifactId>
+      <version>2.4-refine-20130712</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.poi</groupId>
+      <artifactId>poi</artifactId>
+      <version>3.8</version> <!-- in classpath: 3.13-20150929 -->
+    </dependency>
+    <dependency>
+      <groupId>org.apache.poi</groupId>
+      <artifactId>poi-ooxml</artifactId>
+      <version>3.8</version> <!-- in classpath: 3.13-20150929 -->
+    </dependency>
+    <dependency>
+      <groupId>org.apache.odftoolkit</groupId>
+      <artifactId>odfdom-java</artifactId>
+      <version>0.8.8-incubating</version> <!-- in classpath: 0.8.7 -->
+    </dependency>
+  <!--  <dependency>
+      <groupId>com.ibm.icu</groupId>
+      <artifactId>icu4j</artifactId>
+      <version>4.0.1</version>
+    </dependency> -->
+    <dependency>
+      <groupId>edu.mit.simile</groupId>
+      <artifactId>vicino</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>oauth.signpost</groupId>
+      <artifactId>signpost-core</artifactId>
+      <version>1.2.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>oauth.signpost</groupId>
+      <artifactId>signpost-commonshttp4</artifactId>
+      <version>1.2.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>clojure</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>4.4.9</version>
+    </dependency>
+    <dependency>
+      <groupId>org.sweble.wikitext</groupId>
+      <artifactId>swc-parser-lazy</artifactId>
+      <version>3.1.7</version>
+    </dependency>
+    <dependency>
+      <groupId>org.everit.json</groupId>
+      <artifactId>org.everit.json.schema</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>io.frictionlessdata</groupId>
+      <artifactId>datapackage-java</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>io.frictionlessdata</groupId>
+      <artifactId>tableschema-java</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.9.9</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-arq</artifactId>
+      <version>3.6.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-base</artifactId>
+      <version>3.6.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-cmds</artifactId>
+      <version>3.6.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-core</artifactId>
+      <version>3.6.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.metaweb</groupId>
+      <artifactId>lessen</artifactId>
+      <version>1.0</version>
+    </dependency>
+
+
+
+
+
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>6.9.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.8.9</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.7.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito2</artifactId>
+      <version>1.7.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <repositories>
+   <!-- <repository>
+      <id>nightlabs</id>
+      <url>http://oss.sonatype.org/content/repositories/sourceforge-snapshots/</url>
+    </repository>
+    <repository>
+      <id>kint</id>
+      <url>http://developer.k-int.com/maven2</url>
+    </repository> -->
+    <repository>
+      <id>local-jars</id>
+      <name>Local JARs</name>
+      <url>file://${project.basedir}/../libs</url>
+    </repository>
+  </repositories>
+
+</project>
+
diff --git a/pom.xml b/pom.xml
index 31e2ddb88..e0c0c47e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,17 @@
 
   <groupId>org.openrefine</groupId>
   <artifactId>openrefine</artifactId>
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
   <version>3.0-SNAPSHOT</version>
 
-  <name>Open Refine</name>
+  <name>OpenRefine</name>
   <description>OpenRefine is a free, open source power tool for working with messy data and improving it</description>
+  <url>http://openrefine.org/</url>
+
+  <modules>
+        <module>main</module>
+        <module>server</module>
+  </modules>
 
   <properties>
     <jee.path>/</jee.path>
@@ -24,19 +30,13 @@
   <build>
     <finalName>openrefine</finalName>
     <resources>
-      <resource>
+       <!-- <resource>
         <directory>main/src</directory>
         <includes>
           <include>log4j.properties</include>
         </includes>
-      </resource>
+      </resource> -->
     </resources>
-    <testSourceDirectory>main/tests/server/src</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>main/tests/data</directory>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -50,8 +50,6 @@
             </goals>
             <configuration>
               <sources>
-                <source>src</source>
-                <source>main/src</source>
                 <source>server/src</source>
               </sources>
             </configuration>
@@ -82,7 +80,8 @@
         <artifactId>exec-maven-plugin</artifactId>
         <version>1.3</version>
         <configuration>
-          <mainClass>com.google.refine.Refine</mainClass>
+          <skip>true</skip>
+          <mainClass>none</mainClass>
         </configuration>
       </plugin>
       <!-- <plugin>
@@ -211,7 +210,7 @@
     <dependency>
       <groupId>org.mozilla</groupId>
       <artifactId>rhino</artifactId>
-      <version>1.7R2</version>
+      <version>1.7.10</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/server/pom.xml b/server/pom.xml
new file mode 100644
index 000000000..c61b44dfe
--- /dev/null
+++ b/server/pom.xml
@@ -0,0 +1,159 @@
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.openrefine</groupId>
+  <artifactId>server</artifactId>
+  <packaging>jar</packaging>
+  <version>3.0-SNAPSHOT</version>
+
+  <name>OpenRefine - server</name>
+  <description>OpenRefine is a free, open source power tool for working with messy data and improving it</description>
+  <url>http://openrefine.org/</url>
+  <parent>
+    <groupId>org.openrefine</groupId>
+    <artifactId>openrefine</artifactId>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+
+  <properties>
+    <jee.path>/</jee.path>
+    <jee.port>3333</jee.port>
+    <refine.data>/tmp/refine</refine.data>
+  </properties>
+
+  <scm>
+    <connection>scm:git:http://github.com/OpenRefine/OpenRefine</connection>
+    <url>http://github.com/OpenRefine/OpenRefine</url>
+  </scm>
+
+  <build>
+    <finalName>openrefine-server</finalName>
+    <resources>
+      <resource>
+        <directory>src</directory>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>src</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+          <encoding>UTF-8</encoding>
+          <showDeprecation>false</showDeprecation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.3</version>
+        <configuration>
+          <mainClass>com.google.refine.Refine</mainClass>
+          <skip>false</skip>
+          <executable>java</executable>
+        </configuration>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.openrefine</groupId>
+      <artifactId>main</artifactId>
+      <version>3.0-SNAPSHOT</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.22</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>6.1.22</version>
+    </dependency>
+    <dependency>
+      <groupId>com.codeberry.jdatapath</groupId>
+      <artifactId>jdatapath</artifactId>
+      <version>alpha2</version>
+    </dependency>
+    <dependency>
+      <groupId>edu.mit.simile</groupId>
+      <artifactId>butterfly</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mozilla</groupId>
+      <artifactId>rhino</artifactId>
+      <version>1.7.10</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.7.18</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.18</version>
+    </dependency>
+  </dependencies>
+
+  <repositories>
+   <!-- <repository>
+      <id>nightlabs</id>
+      <url>http://oss.sonatype.org/content/repositories/sourceforge-snapshots/</url>
+    </repository>
+    <repository>
+      <id>kint</id>
+      <url>http://developer.k-int.com/maven2</url>
+    </repository> -->
+    <repository>
+      <id>local-jars</id>
+      <name>Local JARs</name>
+      <url>file://${project.basedir}/../libs</url>
+    </repository>
+  </repositories>
+
+</project>
+