diff --git a/.gitignore b/rome-propono/.gitignore
similarity index 100%
rename from .gitignore
rename to rome-propono/.gitignore
diff --git a/LICENSE b/rome-propono/LICENSE
similarity index 100%
rename from LICENSE
rename to rome-propono/LICENSE
diff --git a/NOTICE b/rome-propono/NOTICE
similarity index 100%
rename from NOTICE
rename to rome-propono/NOTICE
diff --git a/README.md b/rome-propono/README.md
similarity index 100%
rename from README.md
rename to rome-propono/README.md
diff --git a/pom.xml b/rome-propono/pom.xml
similarity index 100%
rename from pom.xml
rename to rome-propono/pom.xml
diff --git a/src/main/java/com/rometools/propono/atom/client/AtomClientFactory.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/AtomClientFactory.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/AtomClientFactory.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/AtomClientFactory.java
diff --git a/src/main/java/com/rometools/propono/atom/client/AuthStrategy.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/AuthStrategy.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/AuthStrategy.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/AuthStrategy.java
diff --git a/src/main/java/com/rometools/propono/atom/client/BasicAuthStrategy.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/BasicAuthStrategy.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/BasicAuthStrategy.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/BasicAuthStrategy.java
diff --git a/src/main/java/com/rometools/propono/atom/client/ClientAtomService.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/ClientAtomService.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/ClientAtomService.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/ClientAtomService.java
diff --git a/src/main/java/com/rometools/propono/atom/client/ClientCategories.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/ClientCategories.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/ClientCategories.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/ClientCategories.java
diff --git a/src/main/java/com/rometools/propono/atom/client/ClientCollection.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/ClientCollection.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/ClientCollection.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/ClientCollection.java
diff --git a/src/main/java/com/rometools/propono/atom/client/ClientEntry.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/ClientEntry.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/ClientEntry.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/ClientEntry.java
diff --git a/src/main/java/com/rometools/propono/atom/client/ClientMediaEntry.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/ClientMediaEntry.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/ClientMediaEntry.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/ClientMediaEntry.java
diff --git a/src/main/java/com/rometools/propono/atom/client/ClientWorkspace.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/ClientWorkspace.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/ClientWorkspace.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/ClientWorkspace.java
diff --git a/src/main/java/com/rometools/propono/atom/client/EntryIterator.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/EntryIterator.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/EntryIterator.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/EntryIterator.java
diff --git a/src/main/java/com/rometools/propono/atom/client/GDataAuthStrategy.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/GDataAuthStrategy.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/GDataAuthStrategy.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/GDataAuthStrategy.java
diff --git a/src/main/java/com/rometools/propono/atom/client/NoAuthStrategy.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/NoAuthStrategy.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/NoAuthStrategy.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/NoAuthStrategy.java
diff --git a/src/main/java/com/rometools/propono/atom/client/OAuthStrategy.java b/rome-propono/src/main/java/com/rometools/propono/atom/client/OAuthStrategy.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/OAuthStrategy.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/OAuthStrategy.java
diff --git a/src/main/java/com/rometools/propono/atom/client/atomclient-diagram.gif b/rome-propono/src/main/java/com/rometools/propono/atom/client/atomclient-diagram.gif
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/client/atomclient-diagram.gif
rename to rome-propono/src/main/java/com/rometools/propono/atom/client/atomclient-diagram.gif
diff --git a/src/main/java/com/rometools/propono/atom/common/AtomService.java b/rome-propono/src/main/java/com/rometools/propono/atom/common/AtomService.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/common/AtomService.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/common/AtomService.java
diff --git a/src/main/java/com/rometools/propono/atom/common/Categories.java b/rome-propono/src/main/java/com/rometools/propono/atom/common/Categories.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/common/Categories.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/common/Categories.java
diff --git a/src/main/java/com/rometools/propono/atom/common/Collection.java b/rome-propono/src/main/java/com/rometools/propono/atom/common/Collection.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/common/Collection.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/common/Collection.java
diff --git a/src/main/java/com/rometools/propono/atom/common/Workspace.java b/rome-propono/src/main/java/com/rometools/propono/atom/common/Workspace.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/common/Workspace.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/common/Workspace.java
diff --git a/src/main/java/com/rometools/propono/atom/common/rome/AppModule.java b/rome-propono/src/main/java/com/rometools/propono/atom/common/rome/AppModule.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/common/rome/AppModule.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/common/rome/AppModule.java
diff --git a/src/main/java/com/rometools/propono/atom/common/rome/AppModuleGenerator.java b/rome-propono/src/main/java/com/rometools/propono/atom/common/rome/AppModuleGenerator.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/common/rome/AppModuleGenerator.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/common/rome/AppModuleGenerator.java
diff --git a/src/main/java/com/rometools/propono/atom/common/rome/AppModuleImpl.java b/rome-propono/src/main/java/com/rometools/propono/atom/common/rome/AppModuleImpl.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/common/rome/AppModuleImpl.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/common/rome/AppModuleImpl.java
diff --git a/src/main/java/com/rometools/propono/atom/common/rome/AppModuleParser.java b/rome-propono/src/main/java/com/rometools/propono/atom/common/rome/AppModuleParser.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/common/rome/AppModuleParser.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/common/rome/AppModuleParser.java
diff --git a/src/main/java/com/rometools/propono/atom/server/AtomException.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/AtomException.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/AtomException.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/AtomException.java
diff --git a/src/main/java/com/rometools/propono/atom/server/AtomHandler.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/AtomHandler.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/AtomHandler.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/AtomHandler.java
diff --git a/src/main/java/com/rometools/propono/atom/server/AtomHandlerFactory.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/AtomHandlerFactory.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/AtomHandlerFactory.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/AtomHandlerFactory.java
diff --git a/src/main/java/com/rometools/propono/atom/server/AtomMediaResource.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/AtomMediaResource.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/AtomMediaResource.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/AtomMediaResource.java
diff --git a/src/main/java/com/rometools/propono/atom/server/AtomNotAuthorizedException.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/AtomNotAuthorizedException.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/AtomNotAuthorizedException.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/AtomNotAuthorizedException.java
diff --git a/src/main/java/com/rometools/propono/atom/server/AtomNotFoundException.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/AtomNotFoundException.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/AtomNotFoundException.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/AtomNotFoundException.java
diff --git a/src/main/java/com/rometools/propono/atom/server/AtomRequest.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/AtomRequest.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/AtomRequest.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/AtomRequest.java
diff --git a/src/main/java/com/rometools/propono/atom/server/AtomRequestImpl.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/AtomRequestImpl.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/AtomRequestImpl.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/AtomRequestImpl.java
diff --git a/src/main/java/com/rometools/propono/atom/server/AtomServlet.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/AtomServlet.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/AtomServlet.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/AtomServlet.java
diff --git a/src/main/java/com/rometools/propono/atom/server/ConfigurationError.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/ConfigurationError.java
similarity index 95%
rename from src/main/java/com/rometools/propono/atom/server/ConfigurationError.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/ConfigurationError.java
index 1aca365..120f28d 100644
--- a/src/main/java/com/rometools/propono/atom/server/ConfigurationError.java
+++ b/rome-propono/src/main/java/com/rometools/propono/atom/server/ConfigurationError.java
@@ -1,21 +1,21 @@
-package com.rometools.propono.atom.server;
-
-class ConfigurationError extends Error {
-
-    private static final long serialVersionUID = 1L;
-
-    private final Exception exception;
-
-    /**
-     * Construct a new instance with the specified detail string and exception.
-     */
-    ConfigurationError(final String msg, final Exception x) {
-        super(msg);
-        exception = x;
-    }
-
-    Exception getException() {
-        return exception;
-    }
-
+package com.rometools.propono.atom.server;
+
+class ConfigurationError extends Error {
+
+    private static final long serialVersionUID = 1L;
+
+    private final Exception exception;
+
+    /**
+     * Construct a new instance with the specified detail string and exception.
+     */
+    ConfigurationError(final String msg, final Exception x) {
+        super(msg);
+        exception = x;
+    }
+
+    Exception getException() {
+        return exception;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/rometools/propono/atom/server/FactoryConfigurationError.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/FactoryConfigurationError.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/FactoryConfigurationError.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/FactoryConfigurationError.java
diff --git a/src/main/java/com/rometools/propono/atom/server/FactoryFinder.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/FactoryFinder.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/FactoryFinder.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/FactoryFinder.java
diff --git a/src/main/java/com/rometools/propono/atom/server/SecuritySupport.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/SecuritySupport.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/SecuritySupport.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/SecuritySupport.java
diff --git a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandler.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandler.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandler.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandler.java
diff --git a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandlerFactory.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandlerFactory.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandlerFactory.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomHandlerFactory.java
diff --git a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomService.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomService.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomService.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/impl/FileBasedAtomService.java
diff --git a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedCollection.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/impl/FileBasedCollection.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/impl/FileBasedCollection.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/impl/FileBasedCollection.java
diff --git a/src/main/java/com/rometools/propono/atom/server/impl/FileBasedWorkspace.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/impl/FileBasedWorkspace.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/impl/FileBasedWorkspace.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/impl/FileBasedWorkspace.java
diff --git a/src/main/java/com/rometools/propono/atom/server/impl/FileStore.java b/rome-propono/src/main/java/com/rometools/propono/atom/server/impl/FileStore.java
similarity index 100%
rename from src/main/java/com/rometools/propono/atom/server/impl/FileStore.java
rename to rome-propono/src/main/java/com/rometools/propono/atom/server/impl/FileStore.java
diff --git a/src/main/java/com/rometools/propono/blogclient/BaseBlogEntry.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/BaseBlogEntry.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/BaseBlogEntry.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/BaseBlogEntry.java
diff --git a/src/main/java/com/rometools/propono/blogclient/Blog.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/Blog.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/Blog.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/Blog.java
diff --git a/src/main/java/com/rometools/propono/blogclient/BlogClientException.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/BlogClientException.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/BlogClientException.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/BlogClientException.java
diff --git a/src/main/java/com/rometools/propono/blogclient/BlogConnection.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/BlogConnection.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/BlogConnection.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/BlogConnection.java
diff --git a/src/main/java/com/rometools/propono/blogclient/BlogConnectionFactory.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/BlogConnectionFactory.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/BlogConnectionFactory.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/BlogConnectionFactory.java
diff --git a/src/main/java/com/rometools/propono/blogclient/BlogEntry.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/BlogEntry.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/BlogEntry.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/BlogEntry.java
diff --git a/src/main/java/com/rometools/propono/blogclient/BlogResource.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/BlogResource.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/BlogResource.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/BlogResource.java
diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomBlog.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomBlog.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomBlog.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomBlog.java
diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomCollection.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomCollection.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomCollection.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomCollection.java
diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomConnection.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomConnection.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomConnection.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomConnection.java
diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntry.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntry.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntry.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntry.java
diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntryIterator.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntryIterator.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntryIterator.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomEntryIterator.java
diff --git a/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomResource.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomResource.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomResource.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/atomprotocol/AtomResource.java
diff --git a/src/main/java/com/rometools/propono/blogclient/blogclient-diagram.gif b/rome-propono/src/main/java/com/rometools/propono/blogclient/blogclient-diagram.gif
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/blogclient-diagram.gif
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/blogclient-diagram.gif
diff --git a/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogBlog.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogBlog.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogBlog.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogBlog.java
diff --git a/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogConnection.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogConnection.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogConnection.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogConnection.java
diff --git a/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogEntry.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogEntry.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogEntry.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogEntry.java
diff --git a/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogResource.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogResource.java
similarity index 100%
rename from src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogResource.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/metaweblog/MetaWeblogResource.java
diff --git a/src/main/java/com/rometools/propono/blogclient/metaweblog/NoOpIterator.java b/rome-propono/src/main/java/com/rometools/propono/blogclient/metaweblog/NoOpIterator.java
similarity index 93%
rename from src/main/java/com/rometools/propono/blogclient/metaweblog/NoOpIterator.java
rename to rome-propono/src/main/java/com/rometools/propono/blogclient/metaweblog/NoOpIterator.java
index 0f147eb..7a77bcb 100644
--- a/src/main/java/com/rometools/propono/blogclient/metaweblog/NoOpIterator.java
+++ b/rome-propono/src/main/java/com/rometools/propono/blogclient/metaweblog/NoOpIterator.java
@@ -1,24 +1,24 @@
-package com.rometools.propono.blogclient.metaweblog;
-
-import java.util.Iterator;
-
-class NoOpIterator<T> implements Iterator<T> {
-
-    /** No-op */
-    @Override
-    public boolean hasNext() {
-        return false;
-    }
-
-    /** No-op */
-    @Override
-    public T next() {
-        return null;
-    }
-
-    /** No-op */
-    @Override
-    public void remove() {
-    }
-
+package com.rometools.propono.blogclient.metaweblog;
+
+import java.util.Iterator;
+
+class NoOpIterator<T> implements Iterator<T> {
+
+    /** No-op */
+    @Override
+    public boolean hasNext() {
+        return false;
+    }
+
+    /** No-op */
+    @Override
+    public T next() {
+        return null;
+    }
+
+    /** No-op */
+    @Override
+    public void remove() {
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/rometools/propono/utils/ProponoException.java b/rome-propono/src/main/java/com/rometools/propono/utils/ProponoException.java
similarity index 100%
rename from src/main/java/com/rometools/propono/utils/ProponoException.java
rename to rome-propono/src/main/java/com/rometools/propono/utils/ProponoException.java
diff --git a/src/main/java/com/rometools/propono/utils/Utilities.java b/rome-propono/src/main/java/com/rometools/propono/utils/Utilities.java
similarity index 100%
rename from src/main/java/com/rometools/propono/utils/Utilities.java
rename to rome-propono/src/main/java/com/rometools/propono/utils/Utilities.java
diff --git a/src/main/resources/propono-version.properties b/rome-propono/src/main/resources/propono-version.properties
similarity index 100%
rename from src/main/resources/propono-version.properties
rename to rome-propono/src/main/resources/propono-version.properties
diff --git a/src/main/resources/rome.properties b/rome-propono/src/main/resources/rome.properties
similarity index 100%
rename from src/main/resources/rome.properties
rename to rome-propono/src/main/resources/rome.properties
diff --git a/src/site/apt/ROMEProponoVersion0.4.apt b/rome-propono/src/site/apt/ROMEProponoVersion0.4.apt
similarity index 100%
rename from src/site/apt/ROMEProponoVersion0.4.apt
rename to rome-propono/src/site/apt/ROMEProponoVersion0.4.apt
diff --git a/src/site/apt/ROMEProponoVersion0.5.apt b/rome-propono/src/site/apt/ROMEProponoVersion0.5.apt
similarity index 100%
rename from src/site/apt/ROMEProponoVersion0.5.apt
rename to rome-propono/src/site/apt/ROMEProponoVersion0.5.apt
diff --git a/src/site/apt/ROMEProponoVersion0.6.apt b/rome-propono/src/site/apt/ROMEProponoVersion0.6.apt
similarity index 100%
rename from src/site/apt/ROMEProponoVersion0.6.apt
rename to rome-propono/src/site/apt/ROMEProponoVersion0.6.apt
diff --git a/src/site/apt/ROMEProponoVersion1.0.apt b/rome-propono/src/site/apt/ROMEProponoVersion1.0.apt
similarity index 100%
rename from src/site/apt/ROMEProponoVersion1.0.apt
rename to rome-propono/src/site/apt/ROMEProponoVersion1.0.apt
diff --git a/src/site/apt/index.apt b/rome-propono/src/site/apt/index.apt
similarity index 100%
rename from src/site/apt/index.apt
rename to rome-propono/src/site/apt/index.apt
diff --git a/src/site/resources/.nojekyll b/rome-propono/src/site/resources/.nojekyll
similarity index 100%
rename from src/site/resources/.nojekyll
rename to rome-propono/src/site/resources/.nojekyll
diff --git a/src/site/resources/css/site.css b/rome-propono/src/site/resources/css/site.css
similarity index 100%
rename from src/site/resources/css/site.css
rename to rome-propono/src/site/resources/css/site.css
diff --git a/src/site/resources/images/romelogo.png b/rome-propono/src/site/resources/images/romelogo.png
similarity index 100%
rename from src/site/resources/images/romelogo.png
rename to rome-propono/src/site/resources/images/romelogo.png
diff --git a/src/site/resources/rome-propono-0.4-src.tar.gz b/rome-propono/src/site/resources/rome-propono-0.4-src.tar.gz
similarity index 100%
rename from src/site/resources/rome-propono-0.4-src.tar.gz
rename to rome-propono/src/site/resources/rome-propono-0.4-src.tar.gz
diff --git a/src/site/resources/rome-propono-0.4-src.zip b/rome-propono/src/site/resources/rome-propono-0.4-src.zip
similarity index 100%
rename from src/site/resources/rome-propono-0.4-src.zip
rename to rome-propono/src/site/resources/rome-propono-0.4-src.zip
diff --git a/src/site/resources/rome-propono-0.4.tar.gz b/rome-propono/src/site/resources/rome-propono-0.4.tar.gz
similarity index 100%
rename from src/site/resources/rome-propono-0.4.tar.gz
rename to rome-propono/src/site/resources/rome-propono-0.4.tar.gz
diff --git a/src/site/resources/rome-propono-0.4.zip b/rome-propono/src/site/resources/rome-propono-0.4.zip
similarity index 100%
rename from src/site/resources/rome-propono-0.4.zip
rename to rome-propono/src/site/resources/rome-propono-0.4.zip
diff --git a/src/site/resources/rome-propono-0.5-src.tar.gz b/rome-propono/src/site/resources/rome-propono-0.5-src.tar.gz
similarity index 100%
rename from src/site/resources/rome-propono-0.5-src.tar.gz
rename to rome-propono/src/site/resources/rome-propono-0.5-src.tar.gz
diff --git a/src/site/resources/rome-propono-0.5-src.zip b/rome-propono/src/site/resources/rome-propono-0.5-src.zip
similarity index 100%
rename from src/site/resources/rome-propono-0.5-src.zip
rename to rome-propono/src/site/resources/rome-propono-0.5-src.zip
diff --git a/src/site/resources/rome-propono-0.5.tar.gz b/rome-propono/src/site/resources/rome-propono-0.5.tar.gz
similarity index 100%
rename from src/site/resources/rome-propono-0.5.tar.gz
rename to rome-propono/src/site/resources/rome-propono-0.5.tar.gz
diff --git a/src/site/resources/rome-propono-0.5.zip b/rome-propono/src/site/resources/rome-propono-0.5.zip
similarity index 100%
rename from src/site/resources/rome-propono-0.5.zip
rename to rome-propono/src/site/resources/rome-propono-0.5.zip
diff --git a/src/site/resources/rome-propono-0.6-src.tar.gz b/rome-propono/src/site/resources/rome-propono-0.6-src.tar.gz
similarity index 100%
rename from src/site/resources/rome-propono-0.6-src.tar.gz
rename to rome-propono/src/site/resources/rome-propono-0.6-src.tar.gz
diff --git a/src/site/resources/rome-propono-0.6-src.zip b/rome-propono/src/site/resources/rome-propono-0.6-src.zip
similarity index 100%
rename from src/site/resources/rome-propono-0.6-src.zip
rename to rome-propono/src/site/resources/rome-propono-0.6-src.zip
diff --git a/src/site/resources/rome-propono-0.6.tar.gz b/rome-propono/src/site/resources/rome-propono-0.6.tar.gz
similarity index 100%
rename from src/site/resources/rome-propono-0.6.tar.gz
rename to rome-propono/src/site/resources/rome-propono-0.6.tar.gz
diff --git a/src/site/resources/rome-propono-0.6.zip b/rome-propono/src/site/resources/rome-propono-0.6.zip
similarity index 100%
rename from src/site/resources/rome-propono-0.6.zip
rename to rome-propono/src/site/resources/rome-propono-0.6.zip
diff --git a/src/site/resources/rome-propono-1.0RC1-src.tar.gz b/rome-propono/src/site/resources/rome-propono-1.0RC1-src.tar.gz
similarity index 100%
rename from src/site/resources/rome-propono-1.0RC1-src.tar.gz
rename to rome-propono/src/site/resources/rome-propono-1.0RC1-src.tar.gz
diff --git a/src/site/resources/rome-propono-1.0RC1-src.zip b/rome-propono/src/site/resources/rome-propono-1.0RC1-src.zip
similarity index 100%
rename from src/site/resources/rome-propono-1.0RC1-src.zip
rename to rome-propono/src/site/resources/rome-propono-1.0RC1-src.zip
diff --git a/src/site/resources/rome-propono-1.0RC1.tar.gz b/rome-propono/src/site/resources/rome-propono-1.0RC1.tar.gz
similarity index 100%
rename from src/site/resources/rome-propono-1.0RC1.tar.gz
rename to rome-propono/src/site/resources/rome-propono-1.0RC1.tar.gz
diff --git a/src/site/resources/rome-propono-1.0RC1.zip b/rome-propono/src/site/resources/rome-propono-1.0RC1.zip
similarity index 100%
rename from src/site/resources/rome-propono-1.0RC1.zip
rename to rome-propono/src/site/resources/rome-propono-1.0RC1.zip
diff --git a/src/site/site.xml b/rome-propono/src/site/site.xml
similarity index 100%
rename from src/site/site.xml
rename to rome-propono/src/site/site.xml
diff --git a/src/test/java/com/rometools/propono/atom/client/AtomClientTest.java b/rome-propono/src/test/java/com/rometools/propono/atom/client/AtomClientTest.java
similarity index 100%
rename from src/test/java/com/rometools/propono/atom/client/AtomClientTest.java
rename to rome-propono/src/test/java/com/rometools/propono/atom/client/AtomClientTest.java
diff --git a/src/test/java/com/rometools/propono/atom/client/BloggerDotComTest.java b/rome-propono/src/test/java/com/rometools/propono/atom/client/BloggerDotComTest.java
similarity index 100%
rename from src/test/java/com/rometools/propono/atom/client/BloggerDotComTest.java
rename to rome-propono/src/test/java/com/rometools/propono/atom/client/BloggerDotComTest.java
diff --git a/src/test/java/com/rometools/propono/atom/common/AtomServiceTest.java b/rome-propono/src/test/java/com/rometools/propono/atom/common/AtomServiceTest.java
similarity index 100%
rename from src/test/java/com/rometools/propono/atom/common/AtomServiceTest.java
rename to rome-propono/src/test/java/com/rometools/propono/atom/common/AtomServiceTest.java
diff --git a/src/test/java/com/rometools/propono/atom/common/CollectionTest.java b/rome-propono/src/test/java/com/rometools/propono/atom/common/CollectionTest.java
similarity index 100%
rename from src/test/java/com/rometools/propono/atom/common/CollectionTest.java
rename to rome-propono/src/test/java/com/rometools/propono/atom/common/CollectionTest.java
diff --git a/src/test/java/com/rometools/propono/atom/server/AtomClientServerTest.java b/rome-propono/src/test/java/com/rometools/propono/atom/server/AtomClientServerTest.java
similarity index 100%
rename from src/test/java/com/rometools/propono/atom/server/AtomClientServerTest.java
rename to rome-propono/src/test/java/com/rometools/propono/atom/server/AtomClientServerTest.java
diff --git a/src/test/java/com/rometools/propono/atom/server/TestAtomHandlerFactory.java b/rome-propono/src/test/java/com/rometools/propono/atom/server/TestAtomHandlerFactory.java
similarity index 100%
rename from src/test/java/com/rometools/propono/atom/server/TestAtomHandlerFactory.java
rename to rome-propono/src/test/java/com/rometools/propono/atom/server/TestAtomHandlerFactory.java
diff --git a/src/test/java/com/rometools/propono/atom/server/TestAtomHandlerImpl.java b/rome-propono/src/test/java/com/rometools/propono/atom/server/TestAtomHandlerImpl.java
similarity index 100%
rename from src/test/java/com/rometools/propono/atom/server/TestAtomHandlerImpl.java
rename to rome-propono/src/test/java/com/rometools/propono/atom/server/TestAtomHandlerImpl.java
diff --git a/src/test/java/com/rometools/propono/blogclient/SimpleBlogClientTest.java b/rome-propono/src/test/java/com/rometools/propono/blogclient/SimpleBlogClientTest.java
similarity index 100%
rename from src/test/java/com/rometools/propono/blogclient/SimpleBlogClientTest.java
rename to rome-propono/src/test/java/com/rometools/propono/blogclient/SimpleBlogClientTest.java
diff --git a/src/test/resources/commons-logging.properties b/rome-propono/src/test/resources/commons-logging.properties
similarity index 100%
rename from src/test/resources/commons-logging.properties
rename to rome-propono/src/test/resources/commons-logging.properties
diff --git a/src/test/resources/duke-wave-shadow.gif b/rome-propono/src/test/resources/duke-wave-shadow.gif
similarity index 100%
rename from src/test/resources/duke-wave-shadow.gif
rename to rome-propono/src/test/resources/duke-wave-shadow.gif
diff --git a/src/test/resources/logback-test.xml b/rome-propono/src/test/resources/logback-test.xml
similarity index 90%
rename from src/test/resources/logback-test.xml
rename to rome-propono/src/test/resources/logback-test.xml
index 44dea42..c34b099 100644
--- a/src/test/resources/logback-test.xml
+++ b/rome-propono/src/test/resources/logback-test.xml
@@ -1,13 +1,13 @@
-<configuration>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<root level="warn">
-		<appender-ref ref="STDOUT" />
-	</root>
-
+<configuration>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="warn">
+		<appender-ref ref="STDOUT" />
+	</root>
+
 </configuration>
\ No newline at end of file
diff --git a/src/test/resources/servicedoc1.xml b/rome-propono/src/test/resources/servicedoc1.xml
similarity index 100%
rename from src/test/resources/servicedoc1.xml
rename to rome-propono/src/test/resources/servicedoc1.xml
diff --git a/src/test/resources/simplelog.properties b/rome-propono/src/test/resources/simplelog.properties
similarity index 100%
rename from src/test/resources/simplelog.properties
rename to rome-propono/src/test/resources/simplelog.properties