diff --git a/.gitignore b/rome-certiorem-webapp/.gitignore
similarity index 100%
rename from .gitignore
rename to rome-certiorem-webapp/.gitignore
diff --git a/README.md b/rome-certiorem-webapp/README.md
similarity index 100%
rename from README.md
rename to rome-certiorem-webapp/README.md
diff --git a/pom.xml b/rome-certiorem-webapp/pom.xml
similarity index 97%
rename from pom.xml
rename to rome-certiorem-webapp/pom.xml
index 8288c2c..1d3f5a1 100644
--- a/pom.xml
+++ b/rome-certiorem-webapp/pom.xml
@@ -1,61 +1,61 @@
-<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>
-
-    <parent>
-        <groupId>com.rometools</groupId>
-        <artifactId>rome-parent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>rome-certiorem-webapp</artifactId>
-    <packaging>war</packaging>
-
-    <name>rome-certiorem-webapp</name>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <scm>
-        <connection>scm:git:git@github.com:rometools/rome-certiorem-webapp.git</connection>
-        <developerConnection>scm:git:git@github.com:rometools/rome-certiorem-webapp.git</developerConnection>
-        <url>https://github.com/rometools/rome-certiorem-webapp/</url>
-    </scm>
-
-    <repositories>
-        <repository>
-            <id>sonatype-nexus-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.rometools</groupId>
-            <artifactId>rome-certiorem</artifactId>
-            <version>1.5.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-servlet</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-</project>
+<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>
+
+    <parent>
+        <groupId>com.rometools</groupId>
+        <artifactId>rome-parent</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>rome-certiorem-webapp</artifactId>
+    <packaging>war</packaging>
+
+    <name>rome-certiorem-webapp</name>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <scm>
+        <connection>scm:git:git@github.com:rometools/rome-certiorem-webapp.git</connection>
+        <developerConnection>scm:git:git@github.com:rometools/rome-certiorem-webapp.git</developerConnection>
+        <url>https://github.com/rometools/rome-certiorem-webapp/</url>
+    </scm>
+
+    <repositories>
+        <repository>
+            <id>sonatype-nexus-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.rometools</groupId>
+            <artifactId>rome-certiorem</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject.extensions</groupId>
+            <artifactId>guice-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/src/main/java/com/rometools/certiorem/webapp/HubServlet.java b/rome-certiorem-webapp/src/main/java/com/rometools/certiorem/webapp/HubServlet.java
similarity index 100%
rename from src/main/java/com/rometools/certiorem/webapp/HubServlet.java
rename to rome-certiorem-webapp/src/main/java/com/rometools/certiorem/webapp/HubServlet.java
diff --git a/src/main/java/com/rometools/certiorem/webapp/NotifyTest.java b/rome-certiorem-webapp/src/main/java/com/rometools/certiorem/webapp/NotifyTest.java
similarity index 100%
rename from src/main/java/com/rometools/certiorem/webapp/NotifyTest.java
rename to rome-certiorem-webapp/src/main/java/com/rometools/certiorem/webapp/NotifyTest.java
diff --git a/src/main/java/com/rometools/certiorem/webapp/ServerModule.java b/rome-certiorem-webapp/src/main/java/com/rometools/certiorem/webapp/ServerModule.java
similarity index 100%
rename from src/main/java/com/rometools/certiorem/webapp/ServerModule.java
rename to rome-certiorem-webapp/src/main/java/com/rometools/certiorem/webapp/ServerModule.java
diff --git a/src/main/java/com/rometools/certiorem/webapp/SubServlet.java b/rome-certiorem-webapp/src/main/java/com/rometools/certiorem/webapp/SubServlet.java
similarity index 100%
rename from src/main/java/com/rometools/certiorem/webapp/SubServlet.java
rename to rome-certiorem-webapp/src/main/java/com/rometools/certiorem/webapp/SubServlet.java
diff --git a/src/main/java/com/rometools/certiorem/webapp/SubTest.java b/rome-certiorem-webapp/src/main/java/com/rometools/certiorem/webapp/SubTest.java
similarity index 100%
rename from src/main/java/com/rometools/certiorem/webapp/SubTest.java
rename to rome-certiorem-webapp/src/main/java/com/rometools/certiorem/webapp/SubTest.java
diff --git a/src/main/resources/.gitignore b/rome-certiorem-webapp/src/main/resources/.gitignore
similarity index 100%
rename from src/main/resources/.gitignore
rename to rome-certiorem-webapp/src/main/resources/.gitignore
diff --git a/src/main/webapp/WEB-INF/sun-web.xml b/rome-certiorem-webapp/src/main/webapp/WEB-INF/sun-web.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/sun-web.xml
rename to rome-certiorem-webapp/src/main/webapp/WEB-INF/sun-web.xml
diff --git a/src/main/webapp/WEB-INF/web.xml b/rome-certiorem-webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/web.xml
rename to rome-certiorem-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/src/main/webapp/index.jsp b/rome-certiorem-webapp/src/main/webapp/index.jsp
similarity index 100%
rename from src/main/webapp/index.jsp
rename to rome-certiorem-webapp/src/main/webapp/index.jsp
diff --git a/src/main/webapp/research-atom.xml b/rome-certiorem-webapp/src/main/webapp/research-atom.xml
similarity index 97%
rename from src/main/webapp/research-atom.xml
rename to rome-certiorem-webapp/src/main/webapp/research-atom.xml
index d3b6359..fcac7d3 100644
--- a/src/main/webapp/research-atom.xml
+++ b/rome-certiorem-webapp/src/main/webapp/research-atom.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<feed version="0.3" xmlns="http://purl.org/atom/ns#" 
-xmlns:g="http://base.google.com/ns/1.0">
-
-<title>The name of your feed</title>
-<link href="The URL to the HTML website" 
-  rel="alternate" type="text/html"/>
-
-<modified>2003-12-13T18:30:02Z</modified>
-
-<author>
-  <name>The name of the author</name>
-</author>
-  
-  <entry>
-
-   <title>Analysis of tsunami on the economy</title>
-   <summary>Analysis of the recent tsumani on the economy</summary>
-   <link rel="alternate" type="text/html"
-    href="http://provider-website.com/item1-info-page.html"/>
-   <id>tag:providers-website-item1.com,2003:3.2397</id>
-   <issued>2003-12-13T08:29:29-04:00</issued>
-   <modified>2003-12-13T18:30:02Z</modified>
-   <g:image_link>http://www.providers-website.com/image1.jpg</g:image_link>
-   <g:expiration_date>2005-12-20</g:expiration_date>
-   <g:label>Economy</g:label>
-   <g:label>Tsunami</g:label>
-   
-   <g:publish_date>2005-02-25</g:publish_date>
-   <g:author>James Smith</g:author>
-   <g:publication_name>Tsunami and the Economy</g:publication_name>
-   <g:publication_volume>III</g:publication_volume>
-   <g:pages>5</g:pages>
-
-  </entry>
-
-  <entry>
-
-   <title>Google and the internet</title>
-   <summary>Analysis of Google's impact on the internet</summary>
-   <link rel="alternate" type="text/html"
-    href="http://provider-website.com/item2-info-page.html"/>
-   <id>tag:providers-website-item1.com,2003:3.2397</id>
-   <issued>2003-12-13T08:29:29-04:00</issued>
-   <modified>2003-12-13T18:30:02Z</modified>
-   <g:image_link>http://www.providers-website.com/image2.jpg</g:image_link>
-   <g:expiration_date>2005-12-20</g:expiration_date>
-   <g:label>Internet</g:label>
-   <g:label>Search Engine</g:label>
-
-   <g:publish_date>2004-01-29</g:publish_date>
-   <g:author>Sue Smith</g:author>
-   <g:publication_name>Google and the Internet</g:publication_name>
-   <g:publication_volume>VI</g:publication_volume>
-   <g:pages>23</g:pages>
-
-  </entry>
-</feed>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<feed version="0.3" xmlns="http://purl.org/atom/ns#" 
+xmlns:g="http://base.google.com/ns/1.0">
+
+<title>The name of your feed</title>
+<link href="The URL to the HTML website" 
+  rel="alternate" type="text/html"/>
+
+<modified>2003-12-13T18:30:02Z</modified>
+
+<author>
+  <name>The name of the author</name>
+</author>
+  
+  <entry>
+
+   <title>Analysis of tsunami on the economy</title>
+   <summary>Analysis of the recent tsumani on the economy</summary>
+   <link rel="alternate" type="text/html"
+    href="http://provider-website.com/item1-info-page.html"/>
+   <id>tag:providers-website-item1.com,2003:3.2397</id>
+   <issued>2003-12-13T08:29:29-04:00</issued>
+   <modified>2003-12-13T18:30:02Z</modified>
+   <g:image_link>http://www.providers-website.com/image1.jpg</g:image_link>
+   <g:expiration_date>2005-12-20</g:expiration_date>
+   <g:label>Economy</g:label>
+   <g:label>Tsunami</g:label>
+   
+   <g:publish_date>2005-02-25</g:publish_date>
+   <g:author>James Smith</g:author>
+   <g:publication_name>Tsunami and the Economy</g:publication_name>
+   <g:publication_volume>III</g:publication_volume>
+   <g:pages>5</g:pages>
+
+  </entry>
+
+  <entry>
+
+   <title>Google and the internet</title>
+   <summary>Analysis of Google's impact on the internet</summary>
+   <link rel="alternate" type="text/html"
+    href="http://provider-website.com/item2-info-page.html"/>
+   <id>tag:providers-website-item1.com,2003:3.2397</id>
+   <issued>2003-12-13T08:29:29-04:00</issued>
+   <modified>2003-12-13T18:30:02Z</modified>
+   <g:image_link>http://www.providers-website.com/image2.jpg</g:image_link>
+   <g:expiration_date>2005-12-20</g:expiration_date>
+   <g:label>Internet</g:label>
+   <g:label>Search Engine</g:label>
+
+   <g:publish_date>2004-01-29</g:publish_date>
+   <g:author>Sue Smith</g:author>
+   <g:publication_name>Google and the Internet</g:publication_name>
+   <g:publication_volume>VI</g:publication_volume>
+   <g:pages>23</g:pages>
+
+  </entry>
+</feed>
diff --git a/src/test/java/.gitignore b/rome-certiorem-webapp/src/test/java/.gitignore
similarity index 100%
rename from src/test/java/.gitignore
rename to rome-certiorem-webapp/src/test/java/.gitignore
diff --git a/src/test/resources/.gitignore b/rome-certiorem-webapp/src/test/resources/.gitignore
similarity index 100%
rename from src/test/resources/.gitignore
rename to rome-certiorem-webapp/src/test/resources/.gitignore