diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..eb5a316cb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000..56c67f45f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,123 @@
+
+<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>20141113-jdk15</version>
+	<packaging>jar</packaging>
+
+	<name>JSON in Java</name>
+	<description>
+		JSON is a light-weight, language independent, data interchange format.
+		See http://www.JSON.org/
+
+		The files in this package implement JSON encoders/decoders in Java.
+		It also includes the capability to convert between JSON and XML, HTTP
+		headers, Cookies, and CDL.
+
+		This is a reference implementation. There is a large number of JSON packages
+		in Java. Perhaps someday the Java community will standardize on one. Until
+		then, choose carefully.
+
+		The license includes this restriction: "The software shall be used for good,
+		not evil." If your conscience cannot live with that, then choose a different
+		package.
+
+		The package compiles on Java 1.2 thru Java 1.4.
+	</description>
+	<url>https://github.com/douglascrockford/JSON-java</url>
+
+
+	<scm>
+		<url>https://github.com/douglascrockford/JSON-java.git</url>
+		<connection>scm:git:git://github.com/douglascrockford/JSON-java.git</connection>
+		<developerConnection>scm:git:git@github.com:douglascrockford/JSON-java.git</developerConnection>
+	</scm>
+
+	<licenses>
+		<license>
+			<name>The JSON License</name>
+			<url>http://json.org/license.html</url>
+			<distribution>repo</distribution>
+			<comments>Copyright (c) 2002 JSON.org
+
+				Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+				associated documentation files (the "Software"), to deal in the Software without restriction, including
+				without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+				copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
+				following conditions:
+
+				The above copyright notice and this permission notice shall be included in all copies or substantial
+				portions of the Software.
+
+				The Software shall be used for Good, not Evil.
+
+				THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+				LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+				NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+				WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+				SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+			</comments>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<name>Douglas Crockford</name>
+			<email>douglas@crockford.com</email>
+		</developer>
+	</developers>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+
+	<dependencies>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.1.2</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.7</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<additionalparam>-Xdoclint:none</additionalparam>
+						</configuration>
+					</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 99%
rename from JSONArray.java
rename to src/main/java/org/json/JSONArray.java
index b2717d9bd..117228d15 100644
--- a/JSONArray.java
+++ b/src/main/java/org/json/JSONArray.java
@@ -594,7 +594,9 @@ public <E extends Enum<E>> E optEnum(Class<E> clazz, int index, E defaultValue)
                 return myE;
             }
             return Enum.valueOf(clazz, val.toString());
-        } catch (IllegalArgumentException | NullPointerException e) {
+        } catch (IllegalArgumentException e) {
+            return defaultValue;
+        } catch (NullPointerException e) {
             return defaultValue;
         }
     }
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 ed1159e9c..00e60ae23 100755
--- a/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -907,7 +907,9 @@ public <E extends Enum<E>> E optEnum(Class<E> clazz, String key, E defaultValue)
                 return myE;
             }
             return Enum.valueOf(clazz, val.toString());
-        } catch (IllegalArgumentException | NullPointerException e) {
+        } catch (IllegalArgumentException e) {
+            return defaultValue;
+        } catch (NullPointerException e) {
             return defaultValue;
         }
     }
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