diff --git a/.gitignore b/.gitignore
index 723ef36f4..e3240aadf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-.idea
\ No newline at end of file
+**/*.idea
+src/main
+*.iml
diff --git a/package.sh b/package.sh
index b16026d1e..67b111859 100644
--- a/package.sh
+++ b/package.sh
@@ -1,9 +1,14 @@
 #!/bin/bash
 SRC_FOLDER=dist/src/main/java/org/json
+MODITECT_FOLDER=dist/src/moditect
 WORKING_DIR=`pwd`
 
 # Get the original sources from Douglas Crockfords GitHub repo
 mkdir -p $SRC_FOLDER
+#mkdir -p $MODITECT_FOLDER
+# Copy the module-info to the dist folder to build
+#cp src/moditect/module-info.java $MODITECT_FOLDER/module-info.java
+#echo "Copied the module info file"
 git clone https://github.com/stleary/JSON-java.git $SRC_FOLDER
 
 echo ""
diff --git a/pom.xml b/pom.xml
index 4f7e02b58..bda855ff0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,19 @@
 		</dependency>
 	</dependencies>
 
-	<build>
+    <!-- Allow finding fixed moditect version -->
+    <repositories>
+        <repository>
+            <id>sonatype-nexus-snapshots</id>
+            <name>Sonatype Nexus Snapshots</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases><enabled>false</enabled></releases>
+            <snapshots><enabled>true</enabled></snapshots>
+        </repository>
+    </repositories>
+
+
+    <build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
@@ -113,14 +125,45 @@
 					</instructions>
 				</configuration>
 			</plugin>
+            <!-- Force Maven to run under 1.8, The compiler is set to 1.6, and 1.7 to build the output -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M2</version>
+                <executions>
+                    <execution>
+                        <id>enforce-java</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>1.8.0</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.8.1</version>
 				<configuration>
 					<source>%%JAVAVERSION%%</source>
 					<target>%%JAVAVERSION%%</target>
+                    <!--<source>1.6</source>
+                    <target>1.6</target>-->
+                    <!--<release>1.11</release>-->
 				</configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.ow2.asm</groupId>
+                        <artifactId>asm</artifactId>
+                        <version>7.0</version>
+                    </dependency>
+                </dependencies>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -147,10 +190,22 @@
 						</goals>
 						<configuration>
 							<additionalparam>-Xdoclint:none</additionalparam>
+                            <failOnError>false</failOnError>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.3</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>false</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-gpg-plugin</artifactId>
@@ -165,17 +220,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.3</version>
-				<extensions>true</extensions>
-				<configuration>
-					<serverId>ossrh</serverId>
-					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-					<autoReleaseAfterClose>false</autoReleaseAfterClose>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
@@ -187,6 +231,31 @@
 					</archive>
 				</configuration>
 			</plugin>
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <version>1.0.0.Beta2</version>
+                <executions>
+                    <execution>
+                        <id>add-module-infos</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Put module-info.class in META-INF/versions/9 to maximize backwards compat -->
+                            <!-- See: https://github.com/moditect/moditect/issues/67 -->
+                            <jvmVersion>9</jvmVersion>
+                            <overwriteExistingFiles>true</overwriteExistingFiles>
+                            <module>
+                                <moduleInfoFile>
+                                    src/moditect/module-info.java
+                                </moduleInfoFile>
+                            </module>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/src/moditect/module-info.java b/src/moditect/module-info.java
new file mode 100644
index 000000000..202a3a774
--- /dev/null
+++ b/src/moditect/module-info.java
@@ -0,0 +1,3 @@
+module org.json {
+	exports org.json;
+}