diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..e2d3bdc0b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# compiled files
+target
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000..b8555f6bc
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-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>
+	<groupId>org.json</groupId>
+	<artifactId>json</artifactId>
+	<version>20111006</version>
+	<packaging>jar</packaging>
+	<name>json.org</name>
+	<description>A reference implementation of a JSON package in Java.</description>
+	<url>http://www.json.org/java/</url>
+	<issueManagement>
+		<system>GitHub Issues</system>
+		<url>https://github.com/douglascrockford/JSON-java/issues</url>
+	</issueManagement>
+	<scm>
+		<connection>scm:git:https://github.com/stefanhoth/JSON-java.git</connection>
+		<developerConnection>scm:git:ssh://github.com/stefanhoth/JSON-java.git</developerConnection>
+		<url>https://github.com/stefanhoth/JSON-java</url>
+	</scm>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+		<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.4</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<plugins>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.7</version>
+				<executions>
+					<execution>
+						<id>parse-version</id>
+						<goals>
+							<goal>parse-version</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<compilerVersion>1.6</compilerVersion>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jarsigner-plugin</artifactId>
+				<version>1.2</version>
+				<!-- uncomment when a storepass is available and signing is neccessary 
+					<executions> <execution> <id>signing</id> <goals> <goal>sign</goal> </goals> 
+					<phase>package</phase> <inherited>true</inherited> <configuration> <archiveDirectory></archiveDirectory> 
+					<includes> <include>target/*.jar</include> </includes> <keystore>immopoly.keystore</keystore> 
+					<storepass>storepass_here</storepass> <keypass>keypass_here</keypass> <alias>immopoly_android</alias> 
+					</configuration> </execution> </executions> -->
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/CDL.java b/src/main/java/org/json/CDL.java
similarity index 100%
rename from CDL.java
rename to src/main/java/org/json/CDL.java
diff --git a/Cookie.java b/src/main/java/org/json/Cookie.java
similarity index 100%
rename from Cookie.java
rename to src/main/java/org/json/Cookie.java
diff --git a/CookieList.java b/src/main/java/org/json/CookieList.java
similarity index 100%
rename from CookieList.java
rename to src/main/java/org/json/CookieList.java
diff --git a/HTTP.java b/src/main/java/org/json/HTTP.java
similarity index 100%
rename from HTTP.java
rename to src/main/java/org/json/HTTP.java
diff --git a/HTTPTokener.java b/src/main/java/org/json/HTTPTokener.java
similarity index 100%
rename from HTTPTokener.java
rename to src/main/java/org/json/HTTPTokener.java
diff --git a/JSONArray.java b/src/main/java/org/json/JSONArray.java
similarity index 100%
rename from JSONArray.java
rename to src/main/java/org/json/JSONArray.java
diff --git a/JSONException.java b/src/main/java/org/json/JSONException.java
similarity index 100%
rename from JSONException.java
rename to src/main/java/org/json/JSONException.java
diff --git a/JSONML.java b/src/main/java/org/json/JSONML.java
similarity index 100%
rename from JSONML.java
rename to src/main/java/org/json/JSONML.java
diff --git a/JSONObject.java b/src/main/java/org/json/JSONObject.java
similarity index 100%
rename from JSONObject.java
rename to src/main/java/org/json/JSONObject.java
diff --git a/JSONString.java b/src/main/java/org/json/JSONString.java
similarity index 100%
rename from JSONString.java
rename to src/main/java/org/json/JSONString.java
diff --git a/JSONStringer.java b/src/main/java/org/json/JSONStringer.java
similarity index 100%
rename from JSONStringer.java
rename to src/main/java/org/json/JSONStringer.java
diff --git a/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
similarity index 100%
rename from JSONTokener.java
rename to src/main/java/org/json/JSONTokener.java
diff --git a/JSONWriter.java b/src/main/java/org/json/JSONWriter.java
similarity index 100%
rename from JSONWriter.java
rename to src/main/java/org/json/JSONWriter.java
diff --git a/XML.java b/src/main/java/org/json/XML.java
similarity index 100%
rename from XML.java
rename to src/main/java/org/json/XML.java
diff --git a/XMLTokener.java b/src/main/java/org/json/XMLTokener.java
similarity index 100%
rename from XMLTokener.java
rename to src/main/java/org/json/XMLTokener.java
diff --git a/tests/SampleResourceBundle_en_US.java b/src/test/java/org/json/tests/SampleResourceBundle_en_US.java
similarity index 100%
rename from tests/SampleResourceBundle_en_US.java
rename to src/test/java/org/json/tests/SampleResourceBundle_en_US.java
diff --git a/tests/SampleResourceBundle_fr.java b/src/test/java/org/json/tests/SampleResourceBundle_fr.java
similarity index 100%
rename from tests/SampleResourceBundle_fr.java
rename to src/test/java/org/json/tests/SampleResourceBundle_fr.java
diff --git a/tests/TestCDL.java b/src/test/java/org/json/tests/TestCDL.java
similarity index 100%
rename from tests/TestCDL.java
rename to src/test/java/org/json/tests/TestCDL.java
diff --git a/tests/TestCookie.java b/src/test/java/org/json/tests/TestCookie.java
similarity index 100%
rename from tests/TestCookie.java
rename to src/test/java/org/json/tests/TestCookie.java
diff --git a/tests/TestCookieList.java b/src/test/java/org/json/tests/TestCookieList.java
similarity index 100%
rename from tests/TestCookieList.java
rename to src/test/java/org/json/tests/TestCookieList.java
diff --git a/tests/TestHTTP.java b/src/test/java/org/json/tests/TestHTTP.java
similarity index 100%
rename from tests/TestHTTP.java
rename to src/test/java/org/json/tests/TestHTTP.java
diff --git a/tests/TestHTTPTokener.java b/src/test/java/org/json/tests/TestHTTPTokener.java
similarity index 100%
rename from tests/TestHTTPTokener.java
rename to src/test/java/org/json/tests/TestHTTPTokener.java
diff --git a/tests/TestJSONArray.java b/src/test/java/org/json/tests/TestJSONArray.java
similarity index 100%
rename from tests/TestJSONArray.java
rename to src/test/java/org/json/tests/TestJSONArray.java
diff --git a/tests/TestJSONException.java b/src/test/java/org/json/tests/TestJSONException.java
similarity index 100%
rename from tests/TestJSONException.java
rename to src/test/java/org/json/tests/TestJSONException.java
diff --git a/tests/TestJSONML.java b/src/test/java/org/json/tests/TestJSONML.java
similarity index 100%
rename from tests/TestJSONML.java
rename to src/test/java/org/json/tests/TestJSONML.java
diff --git a/tests/TestJSONObject.java b/src/test/java/org/json/tests/TestJSONObject.java
similarity index 100%
rename from tests/TestJSONObject.java
rename to src/test/java/org/json/tests/TestJSONObject.java
diff --git a/tests/TestJSONStringer.java b/src/test/java/org/json/tests/TestJSONStringer.java
similarity index 100%
rename from tests/TestJSONStringer.java
rename to src/test/java/org/json/tests/TestJSONStringer.java
diff --git a/tests/TestJSONTokener.java b/src/test/java/org/json/tests/TestJSONTokener.java
similarity index 100%
rename from tests/TestJSONTokener.java
rename to src/test/java/org/json/tests/TestJSONTokener.java
diff --git a/tests/TestJSONWriter.java b/src/test/java/org/json/tests/TestJSONWriter.java
similarity index 100%
rename from tests/TestJSONWriter.java
rename to src/test/java/org/json/tests/TestJSONWriter.java
diff --git a/tests/TestSuite.java b/src/test/java/org/json/tests/TestSuite.java
similarity index 100%
rename from tests/TestSuite.java
rename to src/test/java/org/json/tests/TestSuite.java
diff --git a/tests/TestXML.java b/src/test/java/org/json/tests/TestXML.java
similarity index 100%
rename from tests/TestXML.java
rename to src/test/java/org/json/tests/TestXML.java
diff --git a/tests/TestXMLTokener.java b/src/test/java/org/json/tests/TestXMLTokener.java
similarity index 100%
rename from tests/TestXMLTokener.java
rename to src/test/java/org/json/tests/TestXMLTokener.java