diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..94015f85f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*.class
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
diff --git a/themoviedbapi/LICENCE.txt b/LICENCE.txt
similarity index 100%
rename from themoviedbapi/LICENCE.txt
rename to LICENCE.txt
diff --git a/themoviedbapi/pom.xml b/pom.xml
similarity index 100%
rename from themoviedbapi/pom.xml
rename to pom.xml
diff --git a/themoviedbapi/readme.txt b/readme.txt
similarity index 100%
rename from themoviedbapi/readme.txt
rename to readme.txt
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/MovieDbException.java b/src/main/java/com/moviejukebox/themoviedb/MovieDbException.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/MovieDbException.java
rename to src/main/java/com/moviejukebox/themoviedb/MovieDbException.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java b/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
rename to src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java b/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java
rename to src/main/java/com/moviejukebox/themoviedb/model/AlternativeTitle.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java b/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java
rename to src/main/java/com/moviejukebox/themoviedb/model/Artwork.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ArtworkType.java b/src/main/java/com/moviejukebox/themoviedb/model/ArtworkType.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ArtworkType.java
rename to src/main/java/com/moviejukebox/themoviedb/model/ArtworkType.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Collection.java b/src/main/java/com/moviejukebox/themoviedb/model/Collection.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Collection.java
rename to src/main/java/com/moviejukebox/themoviedb/model/Collection.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java b/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java
rename to src/main/java/com/moviejukebox/themoviedb/model/CollectionInfo.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Company.java b/src/main/java/com/moviejukebox/themoviedb/model/Company.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Company.java
rename to src/main/java/com/moviejukebox/themoviedb/model/Company.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Genre.java b/src/main/java/com/moviejukebox/themoviedb/model/Genre.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Genre.java
rename to src/main/java/com/moviejukebox/themoviedb/model/Genre.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java b/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Keyword.java
rename to src/main/java/com/moviejukebox/themoviedb/model/Keyword.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java b/src/main/java/com/moviejukebox/themoviedb/model/Language.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Language.java
rename to src/main/java/com/moviejukebox/themoviedb/model/Language.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDb.java b/src/main/java/com/moviejukebox/themoviedb/model/MovieDb.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/MovieDb.java
rename to src/main/java/com/moviejukebox/themoviedb/model/MovieDb.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java b/src/main/java/com/moviejukebox/themoviedb/model/Person.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Person.java
rename to src/main/java/com/moviejukebox/themoviedb/model/Person.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java b/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java
rename to src/main/java/com/moviejukebox/themoviedb/model/PersonCast.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCredit.java b/src/main/java/com/moviejukebox/themoviedb/model/PersonCredit.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCredit.java
rename to src/main/java/com/moviejukebox/themoviedb/model/PersonCredit.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java b/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java
rename to src/main/java/com/moviejukebox/themoviedb/model/PersonCrew.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonType.java b/src/main/java/com/moviejukebox/themoviedb/model/PersonType.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/PersonType.java
rename to src/main/java/com/moviejukebox/themoviedb/model/PersonType.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java b/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java
rename to src/main/java/com/moviejukebox/themoviedb/model/ProductionCompany.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java b/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java
rename to src/main/java/com/moviejukebox/themoviedb/model/ProductionCountry.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java b/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java
rename to src/main/java/com/moviejukebox/themoviedb/model/ReleaseInfo.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java b/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java
rename to src/main/java/com/moviejukebox/themoviedb/model/StatusCode.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java b/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java
rename to src/main/java/com/moviejukebox/themoviedb/model/TmdbConfiguration.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenAuthorisation.java b/src/main/java/com/moviejukebox/themoviedb/model/TokenAuthorisation.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenAuthorisation.java
rename to src/main/java/com/moviejukebox/themoviedb/model/TokenAuthorisation.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenSession.java b/src/main/java/com/moviejukebox/themoviedb/model/TokenSession.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/TokenSession.java
rename to src/main/java/com/moviejukebox/themoviedb/model/TokenSession.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java b/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Trailer.java
rename to src/main/java/com/moviejukebox/themoviedb/model/Trailer.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Translation.java b/src/main/java/com/moviejukebox/themoviedb/model/Translation.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Translation.java
rename to src/main/java/com/moviejukebox/themoviedb/model/Translation.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/ApiUrl.java b/src/main/java/com/moviejukebox/themoviedb/tools/ApiUrl.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/ApiUrl.java
rename to src/main/java/com/moviejukebox/themoviedb/tools/ApiUrl.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/FilteringLayout.java b/src/main/java/com/moviejukebox/themoviedb/tools/FilteringLayout.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/FilteringLayout.java
rename to src/main/java/com/moviejukebox/themoviedb/tools/FilteringLayout.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/WebBrowser.java b/src/main/java/com/moviejukebox/themoviedb/tools/WebBrowser.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/WebBrowser.java
rename to src/main/java/com/moviejukebox/themoviedb/tools/WebBrowser.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperAlternativeTitles.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompany.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompany.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompany.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompany.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompanyMovies.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompanyMovies.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompanyMovies.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperCompanyMovies.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperConfig.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperConfig.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperConfig.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperConfig.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperGenres.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperGenres.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperGenres.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperGenres.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperImages.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperImages.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperImages.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperImages.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovie.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovie.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovie.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovie.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieCasts.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperMovieKeywords.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPerson.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPerson.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPerson.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPerson.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPersonCredits.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPersonCredits.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPersonCredits.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperPersonCredits.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperReleaseInfo.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTrailers.java
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java b/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java
similarity index 100%
rename from themoviedbapi/src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java
rename to src/main/java/com/moviejukebox/themoviedb/wrapper/WrapperTranslations.java
diff --git a/themoviedbapi/src/main/resources/bin.xml b/src/main/resources/bin.xml
similarity index 100%
rename from themoviedbapi/src/main/resources/bin.xml
rename to src/main/resources/bin.xml
diff --git a/themoviedbapi/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
similarity index 100%
rename from themoviedbapi/src/main/resources/log4j.properties
rename to src/main/resources/log4j.properties
diff --git a/themoviedbapi/src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java b/src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java
similarity index 100%
rename from themoviedbapi/src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java
rename to src/test/java/com/moviejukebox/themoviedb/TheMovieDbTest.java
diff --git a/themoviedbapi/.classpath b/themoviedbapi/.classpath
deleted file mode 100644
index 691a73b87..000000000
--- a/themoviedbapi/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<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="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/themoviedbapi/.project b/themoviedbapi/.project
deleted file mode 100644
index 58de97bb0..000000000
--- a/themoviedbapi/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>API-TheMovieDb</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>