diff --git a/akka-amqp/pom.xml b/akka-amqp/pom.xml
index b1b37d26fe..f7067e56b8 100644
--- a/akka-amqp/pom.xml
+++ b/akka-amqp/pom.xml
@@ -14,11 +14,6 @@
   </parent>
 
   <dependencies>
-    <dependency>
-      <artifactId>akka-util</artifactId>
-      <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <artifactId>akka-core</artifactId>
       <groupId>${project.groupId}</groupId>
diff --git a/akka-comet/pom.xml b/akka-comet/pom.xml
index 246a7cb9bc..ae64f166f3 100644
--- a/akka-comet/pom.xml
+++ b/akka-comet/pom.xml
@@ -16,11 +16,6 @@
 
   <!-- Core deps -->
   <dependencies>
-    <dependency>
-      <artifactId>akka-core</artifactId>
-      <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <artifactId>akka-rest</artifactId>
       <groupId>${project.groupId}</groupId>
@@ -33,11 +28,7 @@
       <artifactId>grizzly-comet-webserver</artifactId>
       <version>${grizzly.version}</version>
     </dependency>
-    <!--dependency>
-      <groupId>com.sun.grizzly</groupId>
-      <artifactId>grizzly-comet-webserver</artifactId>
-      <version>${grizzly.version}</version>
-    </dependency-->
+
     <!-- For Atmosphere -->
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -59,30 +50,5 @@
       <artifactId>atmosphere-runtime</artifactId>
       <version>${atmosphere.version}</version>
     </dependency>
-    <!--dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-      <version>${jersey.version}</version>
-    </dependency-->
-    <!--dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-json</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>jsr311-api</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey.contribs</groupId>
-      <artifactId>jersey-scala</artifactId>
-      <version>${jersey.version}</version>
-    </dependency-->
   </dependencies>
 </project>
diff --git a/akka-kernel/pom.xml b/akka-kernel/pom.xml
index 43b23911f5..c0ccec2db9 100755
--- a/akka-kernel/pom.xml
+++ b/akka-kernel/pom.xml
@@ -16,11 +16,6 @@
 
   <!-- akka deps -->
   <dependencies>
-    <dependency>
-      <artifactId>akka-core</artifactId>
-      <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <artifactId>akka-rest</artifactId>
       <groupId>${project.groupId}</groupId>
diff --git a/akka-persistence-cassandra/pom.xml b/akka-persistence/akka-persistence-cassandra/pom.xml
similarity index 72%
rename from akka-persistence-cassandra/pom.xml
rename to akka-persistence/akka-persistence-cassandra/pom.xml
index a6f870c896..9abb616796 100644
--- a/akka-persistence-cassandra/pom.xml
+++ b/akka-persistence/akka-persistence-cassandra/pom.xml
@@ -8,7 +8,7 @@
   <packaging>jar</packaging>
 
   <parent>
-    <artifactId>akka</artifactId>
+    <artifactId>akka-persistence-parent</artifactId>
     <groupId>se.scalablesolutions.akka</groupId>
     <version>0.6</version>
   </parent>
@@ -31,20 +31,6 @@
       <artifactId>log4j</artifactId>
       <version>1.2.13</version>
     </dependency>
-    
-    <!-- For Testing -->
-    <dependency>
-      <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
-      <version>1.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.5</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/akka-persistence-cassandra/src/main/scala/CassandraSession.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala
similarity index 100%
rename from akka-persistence-cassandra/src/main/scala/CassandraSession.scala
rename to akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala
diff --git a/akka-persistence-cassandra/src/main/scala/CassandraStorage.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorage.scala
similarity index 100%
rename from akka-persistence-cassandra/src/main/scala/CassandraStorage.scala
rename to akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorage.scala
diff --git a/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala
similarity index 100%
rename from akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala
rename to akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala
diff --git a/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala b/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala
similarity index 100%
rename from akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala
rename to akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala
diff --git a/akka-persistence-common/pom.xml b/akka-persistence/akka-persistence-common/pom.xml
similarity index 59%
rename from akka-persistence-common/pom.xml
rename to akka-persistence/akka-persistence-common/pom.xml
index 5e673b4eb8..e260d3c5a9 100644
--- a/akka-persistence-common/pom.xml
+++ b/akka-persistence/akka-persistence-common/pom.xml
@@ -8,18 +8,12 @@
   <packaging>jar</packaging>
 
   <parent>
-    <artifactId>akka</artifactId>
+    <artifactId>akka-persistence-parent</artifactId>
     <groupId>se.scalablesolutions.akka</groupId>
     <version>0.6</version>
   </parent>
 
   <dependencies>
-    <dependency>
-      <artifactId>akka-core</artifactId>
-      <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>com.facebook</groupId>
       <artifactId>thrift</artifactId>
@@ -30,20 +24,6 @@
       <artifactId>commons-pool</artifactId>
       <version>1.5.1</version>
     </dependency>
-    
-    <!-- For Testing -->
-    <dependency>
-      <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
-      <version>1.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.5</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/akka-persistence-common/src/main/scala/Pool.scala b/akka-persistence/akka-persistence-common/src/main/scala/Pool.scala
similarity index 100%
rename from akka-persistence-common/src/main/scala/Pool.scala
rename to akka-persistence/akka-persistence-common/src/main/scala/Pool.scala
diff --git a/akka-persistence-common/src/main/scala/Storage.scala b/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
similarity index 100%
rename from akka-persistence-common/src/main/scala/Storage.scala
rename to akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
diff --git a/akka-persistence-common/src/main/scala/StorageBackend.scala b/akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala
similarity index 100%
rename from akka-persistence-common/src/main/scala/StorageBackend.scala
rename to akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala
diff --git a/akka-persistence/akka-persistence-mongo/pom.xml b/akka-persistence/akka-persistence-mongo/pom.xml
new file mode 100644
index 0000000000..f8543cdd67
--- /dev/null
+++ b/akka-persistence/akka-persistence-mongo/pom.xml
@@ -0,0 +1,31 @@
+<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>
+
+  <artifactId>akka-persistence-mongo</artifactId>
+  <name>Akka Persistence Mongo Module</name>
+
+  <packaging>jar</packaging>
+
+  <parent>
+    <artifactId>akka-persistence-parent</artifactId>
+    <groupId>se.scalablesolutions.akka</groupId>
+    <version>0.6</version>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <artifactId>akka-persistence-common</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <version>${project.version}</version>
+    </dependency>
+
+   <!-- For Mongo -->
+    <dependency>
+      <groupId>org.mongodb</groupId>
+      <artifactId>mongo-java-driver</artifactId>
+      <version>1.1</version>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/akka-persistence-mongo/src/main/scala/MongoStorage.scala b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorage.scala
similarity index 100%
rename from akka-persistence-mongo/src/main/scala/MongoStorage.scala
rename to akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorage.scala
diff --git a/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
similarity index 100%
rename from akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
rename to akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
diff --git a/akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala
similarity index 100%
rename from akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala
rename to akka-persistence/akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala
diff --git a/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala
similarity index 100%
rename from akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala
rename to akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala
diff --git a/akka-persistence-redis/pom.xml b/akka-persistence/akka-persistence-redis/pom.xml
similarity index 67%
rename from akka-persistence-redis/pom.xml
rename to akka-persistence/akka-persistence-redis/pom.xml
index 0ecb47b724..71b5db8920 100644
--- a/akka-persistence-redis/pom.xml
+++ b/akka-persistence/akka-persistence-redis/pom.xml
@@ -8,7 +8,7 @@
   <packaging>jar</packaging>
 
   <parent>
-    <artifactId>akka</artifactId>
+    <artifactId>akka-persistence-parent</artifactId>
     <groupId>se.scalablesolutions.akka</groupId>
     <version>0.6</version>
   </parent>
@@ -20,26 +20,12 @@
       <version>${project.version}</version>
     </dependency>
 
-   <!-- For Mongo -->
+   <!-- For Redis -->
     <dependency>
       <groupId>com.redis</groupId>
       <artifactId>redisclient</artifactId>
       <version>1.0.1</version>
     </dependency>
-
-    <!-- For Testing -->
-    <dependency>
-      <groupId>org.scalatest</groupId>
-      <artifactId>scalatest</artifactId>
-      <version>1.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.5</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/akka-persistence-redis/src/main/scala/RedisStorage.scala b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala
similarity index 100%
rename from akka-persistence-redis/src/main/scala/RedisStorage.scala
rename to akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala
diff --git a/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala
similarity index 100%
rename from akka-persistence-redis/src/main/scala/RedisStorageBackend.scala
rename to akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala
diff --git a/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala b/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala
similarity index 100%
rename from akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala
rename to akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala
diff --git a/akka-persistence-redis/src/test/scala/RedisStorageBackendSpec.scala b/akka-persistence/akka-persistence-redis/src/test/scala/RedisStorageBackendSpec.scala
similarity index 100%
rename from akka-persistence-redis/src/test/scala/RedisStorageBackendSpec.scala
rename to akka-persistence/akka-persistence-redis/src/test/scala/RedisStorageBackendSpec.scala
diff --git a/akka-persistence-mongo/pom.xml b/akka-persistence/pom.xml
similarity index 71%
rename from akka-persistence-mongo/pom.xml
rename to akka-persistence/pom.xml
index f6ced1e5cc..20f15f8aff 100644
--- a/akka-persistence-mongo/pom.xml
+++ b/akka-persistence/pom.xml
@@ -2,10 +2,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>akka-persistence-mongo</artifactId>
-  <name>Akka Persistence Mongo Module</name>
+  <artifactId>akka-persistence-parent</artifactId>
+  <name>Akka Persistence Modules</name>
 
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
 
   <parent>
     <artifactId>akka</artifactId>
@@ -13,20 +13,19 @@
     <version>0.6</version>
   </parent>
 
+  <modules>
+    <module>akka-persistence-common</module>
+    <module>akka-persistence-redis</module>
+    <module>akka-persistence-mongo</module>
+    <module>akka-persistence-cassandra</module>
+  </modules>
+
   <dependencies>
     <dependency>
-      <artifactId>akka-persistence-common</artifactId>
+      <artifactId>akka-core</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>
-
-   <!-- For Mongo -->
-    <dependency>
-      <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
-      <version>1.1</version>
-    </dependency>
-
     <!-- For Testing -->
     <dependency>
       <groupId>org.scalatest</groupId>
@@ -41,5 +40,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/akka-samples/akka-samples-chat/README b/akka-samples/akka-sample-chat/README
similarity index 100%
rename from akka-samples/akka-samples-chat/README
rename to akka-samples/akka-sample-chat/README
diff --git a/akka-samples/akka-samples-chat/pom.xml b/akka-samples/akka-sample-chat/pom.xml
similarity index 82%
rename from akka-samples/akka-samples-chat/pom.xml
rename to akka-samples/akka-sample-chat/pom.xml
index 31b4678f53..9648a1f867 100644
--- a/akka-samples/akka-samples-chat/pom.xml
+++ b/akka-samples/akka-sample-chat/pom.xml
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>akka-samples-chat</artifactId>
+  <artifactId>akka-sample-chat</artifactId>
   <name>Akka Chat Sample Module</name>
 
   <packaging>jar</packaging>
@@ -23,8 +23,8 @@
             <phase>install</phase>
             <configuration>
               <tasks>
-                <copy file="target/akka-samples-chat-${project.version}.jar"
-                      tofile="../../deploy/akka-samples-chat-${project.version}.jar"/>
+                <copy file="target/akka-sample-chat-${project.version}.jar"
+                      tofile="../../deploy/akka-sample-chat-${project.version}.jar"/>
               </tasks>
             </configuration>
             <goals>
diff --git a/akka-samples/akka-samples-chat/src/main/scala/ChatServer.scala b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
similarity index 100%
rename from akka-samples/akka-samples-chat/src/main/scala/ChatServer.scala
rename to akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
diff --git a/akka-samples/akka-samples-lift/config/akka.conf b/akka-samples/akka-sample-lift/config/akka.conf
similarity index 100%
rename from akka-samples/akka-samples-lift/config/akka.conf
rename to akka-samples/akka-sample-lift/config/akka.conf
diff --git a/akka-samples/akka-samples-lift/pom.xml b/akka-samples/akka-sample-lift/pom.xml
similarity index 94%
rename from akka-samples/akka-samples-lift/pom.xml
rename to akka-samples/akka-sample-lift/pom.xml
index 4d86c07bef..bc9d1f8eaa 100644
--- a/akka-samples/akka-samples-lift/pom.xml
+++ b/akka-samples/akka-sample-lift/pom.xml
@@ -2,8 +2,8 @@
 <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>
 
-  <artifactId>akka-samples-lift</artifactId>
-  <name>Akka Lift Samples Module</name>
+  <artifactId>akka-sample-lift</artifactId>
+  <name>Akka Lift Sample Module</name>
 
   <packaging>war</packaging>
 
diff --git a/akka-samples/akka-samples-lift/src/main/scala/akka/SimpleService.scala b/akka-samples/akka-sample-lift/src/main/scala/akka/SimpleService.scala
similarity index 100%
rename from akka-samples/akka-samples-lift/src/main/scala/akka/SimpleService.scala
rename to akka-samples/akka-sample-lift/src/main/scala/akka/SimpleService.scala
diff --git a/akka-samples/akka-samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala b/akka-samples/akka-sample-lift/src/main/scala/bootstrap/liftweb/Boot.scala
similarity index 100%
rename from akka-samples/akka-samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala
rename to akka-samples/akka-sample-lift/src/main/scala/bootstrap/liftweb/Boot.scala
diff --git a/akka-samples/akka-samples-lift/src/main/scala/comet/.keep b/akka-samples/akka-sample-lift/src/main/scala/comet/.keep
similarity index 100%
rename from akka-samples/akka-samples-lift/src/main/scala/comet/.keep
rename to akka-samples/akka-sample-lift/src/main/scala/comet/.keep
diff --git a/akka-samples/akka-samples-lift/src/main/scala/model/.keep b/akka-samples/akka-sample-lift/src/main/scala/model/.keep
similarity index 100%
rename from akka-samples/akka-samples-lift/src/main/scala/model/.keep
rename to akka-samples/akka-sample-lift/src/main/scala/model/.keep
diff --git a/akka-samples/akka-samples-lift/src/main/scala/snippet/.keep b/akka-samples/akka-sample-lift/src/main/scala/snippet/.keep
similarity index 100%
rename from akka-samples/akka-samples-lift/src/main/scala/snippet/.keep
rename to akka-samples/akka-sample-lift/src/main/scala/snippet/.keep
diff --git a/akka-samples/akka-samples-lift/src/main/scala/snippet/HelloWorld.scala b/akka-samples/akka-sample-lift/src/main/scala/snippet/HelloWorld.scala
similarity index 100%
rename from akka-samples/akka-samples-lift/src/main/scala/snippet/HelloWorld.scala
rename to akka-samples/akka-sample-lift/src/main/scala/snippet/HelloWorld.scala
diff --git a/akka-samples/akka-samples-lift/src/main/scala/view/.keep b/akka-samples/akka-sample-lift/src/main/scala/view/.keep
similarity index 100%
rename from akka-samples/akka-samples-lift/src/main/scala/view/.keep
rename to akka-samples/akka-sample-lift/src/main/scala/view/.keep
diff --git a/akka-samples/akka-samples-lift/src/main/webapp/WEB-INF/web.xml b/akka-samples/akka-sample-lift/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from akka-samples/akka-samples-lift/src/main/webapp/WEB-INF/web.xml
rename to akka-samples/akka-sample-lift/src/main/webapp/WEB-INF/web.xml
diff --git a/akka-samples/akka-samples-lift/src/main/webapp/index.html b/akka-samples/akka-sample-lift/src/main/webapp/index.html
similarity index 100%
rename from akka-samples/akka-samples-lift/src/main/webapp/index.html
rename to akka-samples/akka-sample-lift/src/main/webapp/index.html
diff --git a/akka-samples/akka-samples-lift/src/main/webapp/templates-hidden/default.html b/akka-samples/akka-sample-lift/src/main/webapp/templates-hidden/default.html
similarity index 100%
rename from akka-samples/akka-samples-lift/src/main/webapp/templates-hidden/default.html
rename to akka-samples/akka-sample-lift/src/main/webapp/templates-hidden/default.html
diff --git a/akka-samples/akka-samples-lift/src/test/scala/LiftConsole.scala b/akka-samples/akka-sample-lift/src/test/scala/LiftConsole.scala
similarity index 100%
rename from akka-samples/akka-samples-lift/src/test/scala/LiftConsole.scala
rename to akka-samples/akka-sample-lift/src/test/scala/LiftConsole.scala
diff --git a/akka-samples/akka-samples-lift/src/test/scala/RunWebApp.scala b/akka-samples/akka-sample-lift/src/test/scala/RunWebApp.scala
similarity index 100%
rename from akka-samples/akka-samples-lift/src/test/scala/RunWebApp.scala
rename to akka-samples/akka-sample-lift/src/test/scala/RunWebApp.scala
diff --git a/akka-samples/akka-samples-rest-java/pom.xml b/akka-samples/akka-sample-rest-java/pom.xml
similarity index 82%
rename from akka-samples/akka-samples-rest-java/pom.xml
rename to akka-samples/akka-sample-rest-java/pom.xml
index ec782333cc..23ec858ff8 100644
--- a/akka-samples/akka-samples-rest-java/pom.xml
+++ b/akka-samples/akka-sample-rest-java/pom.xml
@@ -2,8 +2,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>akka-samples-rest-java</artifactId>
-  <name>Akka REST Java Samples Module</name>
+  <artifactId>akka-sample-rest-java</artifactId>
+  <name>Akka REST Java Sample Module</name>
 
   <packaging>jar</packaging>
 
@@ -34,8 +34,8 @@
             <phase>install</phase>
             <configuration>
               <tasks>
-                <copy file="target/akka-samples-rest-java-${project.version}.jar"
-                      tofile="../../deploy/akka-samples-rest-java-${project.version}.jar"/>
+                <copy file="target/akka-sample-rest-java-${project.version}.jar"
+                      tofile="../../deploy/akka-sample-rest-java-${project.version}.jar"/>
               </tasks>
             </configuration>
             <goals>
diff --git a/akka-samples/akka-samples-rest-java/src/main/java/sample/java/Boot.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/java/Boot.java
similarity index 100%
rename from akka-samples/akka-samples-rest-java/src/main/java/sample/java/Boot.java
rename to akka-samples/akka-sample-rest-java/src/main/java/sample/java/Boot.java
diff --git a/akka-samples/akka-samples-rest-java/src/main/java/sample/java/PersistentSimpleService.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/java/PersistentSimpleService.java
similarity index 100%
rename from akka-samples/akka-samples-rest-java/src/main/java/sample/java/PersistentSimpleService.java
rename to akka-samples/akka-sample-rest-java/src/main/java/sample/java/PersistentSimpleService.java
diff --git a/akka-samples/akka-samples-rest-java/src/main/java/sample/java/SimpleService.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/java/SimpleService.java
similarity index 100%
rename from akka-samples/akka-samples-rest-java/src/main/java/sample/java/SimpleService.java
rename to akka-samples/akka-sample-rest-java/src/main/java/sample/java/SimpleService.java
diff --git a/akka-samples/akka-samples-rest-scala/pom.xml b/akka-samples/akka-sample-rest-scala/pom.xml
similarity index 80%
rename from akka-samples/akka-samples-rest-scala/pom.xml
rename to akka-samples/akka-sample-rest-scala/pom.xml
index 11d9b65d12..b9268b76eb 100644
--- a/akka-samples/akka-samples-rest-scala/pom.xml
+++ b/akka-samples/akka-sample-rest-scala/pom.xml
@@ -2,8 +2,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>akka-samples-rest-scala</artifactId>
-  <name>Akka REST Scala Samples Module</name>
+  <artifactId>akka-sample-rest-scala</artifactId>
+  <name>Akka REST Scala Sample Module</name>
 
   <packaging>jar</packaging>
 
@@ -31,8 +31,8 @@
             <phase>install</phase>
             <configuration>
               <tasks>
-                <copy file="target/akka-samples-rest-scala-${project.version}.jar"
-                      tofile="../../deploy/akka-samples-rest-scala-${project.version}.jar"/>
+                <copy file="target/akka-sample-rest-scala-${project.version}.jar"
+                      tofile="../../deploy/akka-sample-rest-scala-${project.version}.jar"/>
               </tasks>
             </configuration>
             <goals>
diff --git a/akka-samples/akka-samples-rest-scala/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala
similarity index 100%
rename from akka-samples/akka-samples-rest-scala/src/main/scala/SimpleService.scala
rename to akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala
diff --git a/akka-samples/akka-samples-security/pom.xml b/akka-samples/akka-sample-security/pom.xml
similarity index 85%
rename from akka-samples/akka-samples-security/pom.xml
rename to akka-samples/akka-sample-security/pom.xml
index f074b371be..4a2f44b3ae 100644
--- a/akka-samples/akka-samples-security/pom.xml
+++ b/akka-samples/akka-sample-security/pom.xml
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>akka-samples-security</artifactId>
+  <artifactId>akka-sample-security</artifactId>
   <name>Akka Sample Security Module</name>
 
   <packaging>jar</packaging>
@@ -37,8 +37,8 @@
             <phase>install</phase>
             <configuration>
               <tasks>
-                <copy file="target/akka-samples-security-${project.version}.jar"
-                      tofile="../../deploy/akka-samples-security-${project.version}.jar"/>
+                <copy file="target/akka-sample-security-${project.version}.jar"
+                      tofile="../../deploy/akka-sample-security-${project.version}.jar"/>
               </tasks>
             </configuration>
             <goals>
diff --git a/akka-samples/akka-samples-security/src/main/resources/akka.conf b/akka-samples/akka-sample-security/src/main/resources/akka.conf
similarity index 100%
rename from akka-samples/akka-samples-security/src/main/resources/akka.conf
rename to akka-samples/akka-sample-security/src/main/resources/akka.conf
diff --git a/akka-samples/akka-samples-security/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala
similarity index 100%
rename from akka-samples/akka-samples-security/src/main/scala/SimpleService.scala
rename to akka-samples/akka-sample-security/src/main/scala/SimpleService.scala
diff --git a/akka-samples/akka-samples-security/src/main/webapp/WEB-INF/web.xml b/akka-samples/akka-sample-security/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from akka-samples/akka-samples-security/src/main/webapp/WEB-INF/web.xml
rename to akka-samples/akka-sample-security/src/main/webapp/WEB-INF/web.xml
diff --git a/akka-samples/pom.xml b/akka-samples/pom.xml
index 236100f6ba..5b008bafde 100644
--- a/akka-samples/pom.xml
+++ b/akka-samples/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>akka-samples-parent</artifactId>
-  <name>Akka Samples Module</name>
+  <name>Akka Sample Modules</name>
 
   <packaging>pom</packaging>
 
@@ -14,11 +14,11 @@
   </parent>
 
   <modules>
-    <module>akka-samples-chat</module>
-    <module>akka-samples-lift</module>
-    <module>akka-samples-security</module>
-    <module>akka-samples-rest-scala</module>
-    <module>akka-samples-rest-java</module>
+    <module>akka-sample-chat</module>
+    <module>akka-sample-lift</module>
+    <module>akka-sample-security</module>
+    <module>akka-sample-rest-scala</module>
+    <module>akka-sample-rest-java</module>
   </modules>
 
   <dependencies>
diff --git a/akka-security/pom.xml b/akka-security/pom.xml
index 08f787a743..4b3dd43195 100644
--- a/akka-security/pom.xml
+++ b/akka-security/pom.xml
@@ -14,26 +14,11 @@
   </parent>
 
   <dependencies>
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-library</artifactId>
-      <version>${scala.version}</version>
-    </dependency>
     <dependency>
       <artifactId>akka-core</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <artifactId>akka-persistence-cassandra</artifactId>
-      <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <artifactId>akka-util</artifactId>
-      <groupId>${project.groupId}</groupId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>jsr250-api</artifactId>
diff --git a/pom.xml b/pom.xml
index c1f4c61884..f405169c8e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <name>Akka Transactors</name>
+  <name>Akka Project</name>
   <artifactId>akka</artifactId>
   <groupId>se.scalablesolutions.akka</groupId>
   <version>0.6</version>
@@ -51,10 +51,7 @@
     <module>akka-util-java</module>
     <module>akka-util</module>
     <module>akka-core</module>
-    <module>akka-persistence-common</module>
-    <module>akka-persistence-cassandra</module>
-    <module>akka-persistence-mongo</module>
-    <module>akka-persistence-redis</module>
+    <module>akka-persistence</module>
     <module>akka-rest</module>
     <module>akka-comet</module>
     <module>akka-amqp</module>