diff --git a/themoviedbapi/.classpath b/themoviedbapi/.classpath
index d171cd4c1..31cf404a4 100644
--- a/themoviedbapi/.classpath
+++ b/themoviedbapi/.classpath
@@ -1,6 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/themoviedbapi/.project b/themoviedbapi/.project
index 63e67b96e..88028eef1 100644
--- a/themoviedbapi/.project
+++ b/themoviedbapi/.project
@@ -1,17 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>themoviedbapi</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>themoviedbapi</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/themoviedbapi/.settings/org.eclipse.jdt.core.prefs b/themoviedbapi/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..483d704da
--- /dev/null
+++ b/themoviedbapi/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,6 @@
+#Sat Jan 29 22:13:58 CET 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/themoviedbapi/.settings/org.maven.ide.eclipse.prefs b/themoviedbapi/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..341107664
--- /dev/null
+++ b/themoviedbapi/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Sat Jan 29 22:13:55 CET 2011
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/themoviedbapi/build.xml b/themoviedbapi/build.xml
deleted file mode 100644
index 392df835c..000000000
--- a/themoviedbapi/build.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-<project name="themoviedbapi" default="dist" basedir=".">
-	<target name="init">
-    	<property name="project" value="TheMovieDB API" />
-        <property name="src" location="src" />
-        <property name="build" location="build" />
-        <property name="dist"  location="dist" />
-
-        <!-- Get the revision information from SVN -->
-        <property environment="env" />
-	    <condition property="revision" value="${env.SVN_REVISION}" else="0000">
-	    	<isset property="env.SVN_REVISION" />
-    	</condition>
-    </target>
-		
-	<target name="clean" depends="init" description="Delete the directories for a clean build">
-		<delete dir="${build}" />
-		<delete dir="${dist}" />
-		
-        <!-- Create the build directory structure used by compile -->
-        <mkdir dir="${build}"/>
-		
-        <!-- Create the distribution directory -->
-        <mkdir dir="${dist}"/>
-	</target>
-	
-	<target name="version" description="Write out the version file">
-        <tstamp>
-            <format property="builddate" pattern="yyyy-MM-dd HH:mm:ss" locale="en"/>
-        </tstamp>
-
-    	<!-- Write out the readme information file -->
-        <echo file="${dist}/${ant.project.name}_version.txt" append="false">${project}${line.separator}</echo>
-        <echo file="${dist}/${ant.project.name}_version.txt" append="true">Build Date: ${builddate}${line.separator}</echo>
-        <echo file="${dist}/${ant.project.name}_version.txt" append="true">Revision: r${revision}${line.separator}</echo>
-		
-		<copy file="${src}/readme.txt" tofile="${dist}/${ant.project.name}_readme.txt" overwrite="true"/>
-		
-        <manifest file="MANIFEST.MF">
-            <attribute name="Built-By" value="${user.name}" />
-            <attribute name="Specification-Title" value="${project}" />
-            <attribute name="Implementation-Version" value="${revision}" />
-            <attribute name="Implementation-Title" value="${builddate}" />
-        </manifest>
-
-	</target>
-	
-	<target name="compile" depends="clean" description="compile the source " >
-		<!-- Compile the java code from ${src} into ${build} -->
-	    <javac srcdir="${src}" destdir="${build}"/>
-	</target>
-
-    <target name="dist" depends="compile, version" description="generate the distribution" >
-        <jar jarfile="${dist}/${ant.project.name}.jar" manifest="MANIFEST.MF">
-    	    <!-- Put everything in ${build} into the jar file -->
-            <fileset dir="${build}">
-               <include name="**/*.class"/>
-            </fileset>
-        	<!-- Add files from the ${src} too -->
-            <fileset dir="${src}">
-               <include name="**/*.java"/>
-            </fileset>
-    	</jar>
-
-        <zip basedir="dist" destfile="${dist}/${ant.project.name}_r${revision}.zip" excludes="*.zip" level="9" comment="${project}${line.separator}Build Date: ${builddate}${line.separator}Revision: r${revision}${line.separator}"/>
-    	
-        <delete>
-             <fileset dir="${dist}">
-                <exclude name="*.zip"/>
-    			<exclude name="*.jar"/>
-             </fileset>
-         </delete>
-
-    </target>
-
-</project>
-
diff --git a/themoviedbapi/pom.xml b/themoviedbapi/pom.xml
new file mode 100644
index 000000000..f07319517
--- /dev/null
+++ b/themoviedbapi/pom.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.sonatype.oss</groupId>
+		<artifactId>oss-parent</artifactId>
+		<version>6</version>
+	</parent>
+	<groupId>com.moviejukebox</groupId>
+	<artifactId>themoviedbapi</artifactId>
+	<version>1.0-SNAPSHOT</version>
+	<name>The MovieDB API</name>
+
+	<issueManagement>
+		<system>Google Code</system>
+		<url>http://code.google.com/p/themoviedbapi/issues/list</url>
+	</issueManagement>
+	<ciManagement>
+		<system>Hudson CI</system>
+		<url>http://mediadeveloper.org:8080/job/themoviedbapi/</url>
+	</ciManagement>
+	<scm>
+		<connection>scm:svn:http://themoviedbapi.googlecode.com/svn/trunk/themoviedbapi</connection>
+		<developerConnection>scm:svn:https://themoviedbapi.googlecode.com/svn/trunk/themoviedbapi</developerConnection>
+		<tag>HEAD</tag>
+		<url>http://code.google.com/p/themoviedbapi/source/browse/trunk/themoviedbapi</url>
+	</scm>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<skipTests>true</skipTests>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.5</version>
+				<scope>test</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>2.4.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>2.3.2</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.3.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.7.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>buildnumber-maven-plugin</artifactId>
+					<version>1.0-beta-4</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>build-helper-maven-plugin</artifactId>
+					<version>1.5</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+				<configuration>
+					<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+					<revisionOnScmFailure>0000</revisionOnScmFailure>
+					<timestampFormat>{0,date,yyyy-MM-dd HH:mm:ss}</timestampFormat>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+					<failOnError>true</failOnError>
+					<verbose>true</verbose>
+					<!-- excludes><exclude>**/*</exclude></excludes -->
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Specification-Title>${project.name}</Specification-Title>
+							<Specification-Version>${project.version}</Specification-Version>
+							<Implementation-Version>${buildNumber}</Implementation-Version>
+							<Implementation-Title>${timestamp}</Implementation-Title>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+
+			<!-- To skip tests by default -->
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skipTests>${skipTests}</skipTests>
+				</configuration>
+			</plugin>
+
+		</plugins>
+
+		<finalName>${artifactId}-${project.version}-r${buildNumber}</finalName>
+
+	</build>
+</project>
diff --git a/themoviedbapi/src/readme.txt b/themoviedbapi/readme.txt
similarity index 100%
rename from themoviedbapi/src/readme.txt
rename to themoviedbapi/readme.txt
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/TheMovieDb.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/TheMovieDb.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/model/Artwork.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/model/Artwork.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/model/Category.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Category.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/model/Category.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Category.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/model/Country.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Country.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/model/Country.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Country.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/model/Filmography.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Filmography.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/model/Filmography.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Filmography.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/model/Language.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/model/Language.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/model/MovieDB.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDB.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/model/MovieDB.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDB.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/model/Person.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/model/Person.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/model/Studio.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Studio.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/model/Studio.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Studio.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/tools/Base64.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/Base64.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/tools/Base64.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/Base64.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/tools/DOMHelper.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/DOMHelper.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/tools/DOMHelper.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/DOMHelper.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/tools/LogFormatter.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/LogFormatter.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/tools/LogFormatter.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/LogFormatter.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/tools/ModelTools.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/ModelTools.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/tools/ModelTools.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/ModelTools.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/tools/MovieDbParser.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/MovieDbParser.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/tools/MovieDbParser.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/MovieDbParser.java
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/tools/WebBrowser.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/WebBrowser.java
similarity index 100%
rename from themoviedbapi/src/com/moviejukebox/themoviedb/tools/WebBrowser.java
rename to themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/WebBrowser.java
diff --git a/themoviedbapi/test/com/moviejukebox/themoviedb/TheMovieDbTest.java b/themoviedbapi/src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java
similarity index 100%
rename from themoviedbapi/test/com/moviejukebox/themoviedb/TheMovieDbTest.java
rename to themoviedbapi/src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java