diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..19c348736
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.DS_Store
+.idea
+*.iml
+
+build
+target
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000..81a07fe64
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,35 @@
+<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>com.github.pengrad</groupId>
+    <artifactId>json</artifactId>
+    <packaging>jar</packaging>
+    <version>2.0</version>
+    <name>json</name>
+    <url>http://maven.apache.org</url>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <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>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/CDL.java b/src/main/java/com/github/pengrad/json/CDL.java
similarity index 99%
rename from CDL.java
rename to src/main/java/com/github/pengrad/json/CDL.java
index 995b1d478..4d9a677b4 100755
--- a/CDL.java
+++ b/src/main/java/com/github/pengrad/json/CDL.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /*
 Copyright (c) 2002 JSON.org
diff --git a/Cookie.java b/src/main/java/com/github/pengrad/json/Cookie.java
similarity index 99%
rename from Cookie.java
rename to src/main/java/com/github/pengrad/json/Cookie.java
index 1867dbd74..3cae4c100 100755
--- a/Cookie.java
+++ b/src/main/java/com/github/pengrad/json/Cookie.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /*
 Copyright (c) 2002 JSON.org
diff --git a/CookieList.java b/src/main/java/com/github/pengrad/json/CookieList.java
similarity index 99%
rename from CookieList.java
rename to src/main/java/com/github/pengrad/json/CookieList.java
index b716fd7e3..9fc1be92e 100755
--- a/CookieList.java
+++ b/src/main/java/com/github/pengrad/json/CookieList.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /*
 Copyright (c) 2002 JSON.org
diff --git a/HTTP.java b/src/main/java/com/github/pengrad/json/HTTP.java
similarity index 96%
rename from HTTP.java
rename to src/main/java/com/github/pengrad/json/HTTP.java
index 648f4dad7..c0ddd3619 100755
--- a/HTTP.java
+++ b/src/main/java/com/github/pengrad/json/HTTP.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /*
 Copyright (c) 2002 JSON.org
diff --git a/HTTPTokener.java b/src/main/java/com/github/pengrad/json/HTTPTokener.java
similarity index 98%
rename from HTTPTokener.java
rename to src/main/java/com/github/pengrad/json/HTTPTokener.java
index b2489b68d..8c0e1db8e 100755
--- a/HTTPTokener.java
+++ b/src/main/java/com/github/pengrad/json/HTTPTokener.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /*
 Copyright (c) 2002 JSON.org
diff --git a/JSONArray.java b/src/main/java/com/github/pengrad/json/JSONArray.java
similarity index 99%
rename from JSONArray.java
rename to src/main/java/com/github/pengrad/json/JSONArray.java
index 3f05548d5..ef550746d 100644
--- a/JSONArray.java
+++ b/src/main/java/com/github/pengrad/json/JSONArray.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /*
  Copyright (c) 2002 JSON.org
diff --git a/JSONException.java b/src/main/java/com/github/pengrad/json/JSONException.java
similarity index 96%
rename from JSONException.java
rename to src/main/java/com/github/pengrad/json/JSONException.java
index 6fef51943..f5f716052 100755
--- a/JSONException.java
+++ b/src/main/java/com/github/pengrad/json/JSONException.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /**
  * The JSONException is thrown by the JSON.org classes when things are amiss.
diff --git a/JSONML.java b/src/main/java/com/github/pengrad/json/JSONML.java
similarity index 99%
rename from JSONML.java
rename to src/main/java/com/github/pengrad/json/JSONML.java
index 20e0be5fa..47c0c8e1d 100755
--- a/JSONML.java
+++ b/src/main/java/com/github/pengrad/json/JSONML.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /*
 Copyright (c) 2008 JSON.org
diff --git a/JSONObject.java b/src/main/java/com/github/pengrad/json/JSONObject.java
similarity index 99%
rename from JSONObject.java
rename to src/main/java/com/github/pengrad/json/JSONObject.java
index d66623110..0eb9d1298 100755
--- a/JSONObject.java
+++ b/src/main/java/com/github/pengrad/json/JSONObject.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /*
  Copyright (c) 2002 JSON.org
diff --git a/JSONString.java b/src/main/java/com/github/pengrad/json/JSONString.java
similarity index 95%
rename from JSONString.java
rename to src/main/java/com/github/pengrad/json/JSONString.java
index 1f2d77dd1..3f5eb01b9 100755
--- a/JSONString.java
+++ b/src/main/java/com/github/pengrad/json/JSONString.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 /**
  * The <code>JSONString</code> interface allows a <code>toJSONString()</code>
  * method so that a class can change the behavior of
diff --git a/JSONStringer.java b/src/main/java/com/github/pengrad/json/JSONStringer.java
similarity index 96%
rename from JSONStringer.java
rename to src/main/java/com/github/pengrad/json/JSONStringer.java
index 25c2e5d78..a2d9b8376 100755
--- a/JSONStringer.java
+++ b/src/main/java/com/github/pengrad/json/JSONStringer.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /*
 Copyright (c) 2006 JSON.org
diff --git a/JSONTokener.java b/src/main/java/com/github/pengrad/json/JSONTokener.java
similarity index 99%
rename from JSONTokener.java
rename to src/main/java/com/github/pengrad/json/JSONTokener.java
index 32548ed9f..e62965769 100644
--- a/JSONTokener.java
+++ b/src/main/java/com/github/pengrad/json/JSONTokener.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/JSONWriter.java b/src/main/java/com/github/pengrad/json/JSONWriter.java
similarity index 96%
rename from JSONWriter.java
rename to src/main/java/com/github/pengrad/json/JSONWriter.java
index 07bbc8cfa..a403e0881 100755
--- a/JSONWriter.java
+++ b/src/main/java/com/github/pengrad/json/JSONWriter.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/Property.java b/src/main/java/com/github/pengrad/json/Property.java
similarity index 98%
rename from Property.java
rename to src/main/java/com/github/pengrad/json/Property.java
index 8122241e9..06c341e4f 100644
--- a/Property.java
+++ b/src/main/java/com/github/pengrad/json/Property.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /*
 Copyright (c) 2002 JSON.org
diff --git a/XML.java b/src/main/java/com/github/pengrad/json/XML.java
similarity index 99%
rename from XML.java
rename to src/main/java/com/github/pengrad/json/XML.java
index 07090abe3..729c03079 100755
--- a/XML.java
+++ b/src/main/java/com/github/pengrad/json/XML.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /*
 Copyright (c) 2002 JSON.org
diff --git a/XMLTokener.java b/src/main/java/com/github/pengrad/json/XMLTokener.java
similarity index 99%
rename from XMLTokener.java
rename to src/main/java/com/github/pengrad/json/XMLTokener.java
index d3197653c..aafa2b931 100755
--- a/XMLTokener.java
+++ b/src/main/java/com/github/pengrad/json/XMLTokener.java
@@ -1,4 +1,4 @@
-package org.json;
+package com.github.pengrad.json;
 
 /*
 Copyright (c) 2002 JSON.org