diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000..51fb5604f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,65 @@
+<?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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.json</groupId>
+  <artifactId>json</artifactId>
+  <version>20180615</version>
+
+  <name>json</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+        <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.7.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.20.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </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 99%
rename from JSONObject.java
rename to src/main/java/org/json/JSONObject.java
index 8deb6bae5..4aa13f7b3 100644
--- a/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -237,10 +237,10 @@ public JSONObject(JSONTokener x) throws JSONException {
             
             if (key != null) {
                 // Check if key exists
-                if (this.opt(key) != null) {
-                    // key already exists
-                    throw x.syntaxError("Duplicate key \"" + key + "\"");
-                }
+//                if (this.opt(key) != null) {
+//                    // key already exists
+//                    throw x.syntaxError("Duplicate key \"" + key + "\"");
+//                }
                 // Only add value if non-null
                 Object value = x.nextValue();
                 if (value!=null) {
diff --git a/JSONPointer.java b/src/main/java/org/json/JSONPointer.java
similarity index 100%
rename from JSONPointer.java
rename to src/main/java/org/json/JSONPointer.java
diff --git a/JSONPointerException.java b/src/main/java/org/json/JSONPointerException.java
similarity index 100%
rename from JSONPointerException.java
rename to src/main/java/org/json/JSONPointerException.java
diff --git a/JSONPropertyIgnore.java b/src/main/java/org/json/JSONPropertyIgnore.java
similarity index 100%
rename from JSONPropertyIgnore.java
rename to src/main/java/org/json/JSONPropertyIgnore.java
diff --git a/JSONPropertyName.java b/src/main/java/org/json/JSONPropertyName.java
similarity index 100%
rename from JSONPropertyName.java
rename to src/main/java/org/json/JSONPropertyName.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/Property.java b/src/main/java/org/json/Property.java
similarity index 100%
rename from Property.java
rename to src/main/java/org/json/Property.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