diff --git a/.gitignore b/.gitignore
index 3ca2848..91315c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 dist
 *.eml
 *.iml
-targets
\ No newline at end of file
+targets
+target
\ No newline at end of file
diff --git a/assembly-dist.xml b/assembly-dist.xml
new file mode 100644
index 0000000..a86c033
--- /dev/null
+++ b/assembly-dist.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<assembly>
+    <id>dist</id>
+
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <includeSiteDirectory>false</includeSiteDirectory>
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>app/**</include>
+                <include>conf/**</include>
+                <include>documentation/**</include>
+                <include>src/**</include>
+                <include>assembly-dist.xml</include>
+                <include>LICENSE.txt</include>
+                <include>pom.xml</include>
+                <include>README.txt</include>
+            </includes>
+            <excludes>
+                <exclude>documentation/api/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/samples-and-tests</directory>
+            <outputDirectory>samples-and-tests</outputDirectory>
+            <includes>
+                <include>*/README</include>
+                <include>*/README.txt</include>
+                <include>*/app/**</include>
+                <include>*/conf/**</include>
+                <include>*/public/**</include>
+                <include>*/test/**</include>
+                <include>*/war/**</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/apidocs</directory>
+            <outputDirectory>documentation/api</outputDirectory>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>${project.build.directory}/manifest</source>
+        </file>
+    </files>
+
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+        </dependencySet>
+    </dependencySets>
+</assembly>
diff --git a/bm.bat b/bm.bat
deleted file mode 100644
index cc3909f..0000000
--- a/bm.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-rm -rf dist
-find samples-and-tests -name tmp | xargs rm -rf
-find samples-and-tests -name precompiled | xargs rm -rf
-find samples-and-tests -name modules | xargs rm -rf
-play build-module
\ No newline at end of file
diff --git a/build.bat b/build.bat
deleted file mode 100644
index f4beff1..0000000
--- a/build.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-call ant -Dplay.path=c:/l/j/play
-rem xcopy /y lib\* J:\play\modules\morphia\lib
\ No newline at end of file
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 548e896..0000000
--- a/build.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="rythm module" default="build" basedir=".">
-
-    <path id="project.classpath">
-        <pathelement path="${play.path}/framework/classes"/>
-        <fileset dir="${play.path}/framework">
-            <include name="*.jar"/>
-        </fileset>
-        <fileset dir="${play.path}/framework/lib">
-            <include name="*.jar"/>
-        </fileset>
-        <fileset dir="./lib">
-            <include name="*.jar"/>
-        </fileset>
-    </path>
-
-    <target name="build">
-        <mkdir dir="tmp/classes" />
-        <javac srcdir="src" destdir="tmp/classes" source="1.6" target="1.6" bootclasspath="c:/l/j/jdk1.6.0_29/jre/lib/rt.jar" debug="true" debuglevel="lines,vars,source">
-            <classpath refid="project.classpath" />
-        </javac>
-        <copy todir="tmp/classes">
-            <fileset dir="src">
-                <include name="**/*.properties"/>
-                <include name="**/*.xml"/>
-                <include name="**/play.plugins"/>
-            </fileset>
-        </copy>
-        <jar destfile="lib/play-rythm.jar" basedir="tmp/classes">
-            <manifest>
-                <section name="Play">
-                    <attribute name="Specification-Title" value="Rythm module"/>
-                </section>
-            </manifest>
-        </jar>
-        <delete dir="tmp" />
-    </target>
-    
-</project>
diff --git a/lib b/lib
deleted file mode 120000
index a0e009a..0000000
--- a/lib
+++ /dev/null
@@ -1 +0,0 @@
-/c/w/_lgl/rythm/lib
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..b862ab4
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<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">
+
+    <parent>
+        <groupId>com.google.code.maven-play-plugin</groupId>
+        <artifactId>play-module-default-parent</artifactId>
+        <version>1.0.0-beta1</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.github.greenlaw110.play-rythm</groupId>
+    <artifactId>play-rythm</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>Play! Rythm Module</name>
+    <description>Play! Rythm Module</description>
+    <url>http://www.playframework.org/modules/play-rythm</url>
+
+    <repositories>
+        <repository>
+            <id>com.google.code.maven-play-plugin</id>
+            <name>Maven Play Plugin - releases</name>
+            <url>http://maven-play-plugin.googlecode.com/svn/mavenrepo/releases</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>com.google.code.maven-play-plugin-snapshots</id>
+            <name>Maven Play Plugin - snapshots</name>
+            <url>http://maven-play-plugin.googlecode.com/svn/mavenrepo/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+    <properties>
+        <play.manifest.section>Play</play.manifest.section>
+        <manifest.specification.title>Rythm module</manifest.specification.title>
+        <play.module.frameworkVersions>1.2.2</play.module.frameworkVersions>
+
+        <play.version>1.2.2</play.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.maven-play-plugin.org.playframework</groupId>
+            <artifactId>play</artifactId>
+            <version>${play.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.rythmengine</groupId>
+            <artifactId>rythm</artifactId>
+            <version>1.0.0-20120617</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.maven-play-plugin.org.eclipse.jdt</groupId>
+                    <artifactId>org.eclipse.jdt.core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <links>
+                        <link>http://download.oracle.com/javase/6/docs/api/</link>
+                        <link>http://www.playframework.org/documentation/api/${play.version}/</link>
+                    </links>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>dist</id>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>make-assembly</id>
+                                <configuration>
+                                    <appendAssemblyId>false</appendAssemblyId>
+                                    <descriptors>
+                                        <descriptor>${basedir}/assembly-dist.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>