diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 80c5a8a..a191092 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,7 @@
             <option value="$PROJECT_DIR$" />
           </set>
         </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index b384666..9e56013 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/dexpatcher-multidexlib2_main.iml" filepath="$PROJECT_DIR$/.idea/modules/dexpatcher-multidexlib2_main.iml" group="multidexlib2" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/dexpatcher-multidexlib2_test.iml" filepath="$PROJECT_DIR$/.idea/modules/dexpatcher-multidexlib2_test.iml" group="multidexlib2" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/multidexlib2.iml" filepath="$PROJECT_DIR$/.idea/modules/multidexlib2.iml" />
     </modules>
   </component>
diff --git a/.idea/modules/dexpatcher-multidexlib2_main.iml b/.idea/modules/dexpatcher-multidexlib2_main.iml
deleted file mode 100644
index 7868fc0..0000000
--- a/.idea/modules/dexpatcher-multidexlib2_main.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="multidexlib2:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.github.lanchon.dexpatcher" external.system.module.type="sourceSet" external.system.module.version="2.2.1.r2" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/../../out/production/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: org.smali:dexlib2:2.2.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.smali:util:2.2.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:1.3.9" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.beust:jcommander:1.64" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/dexpatcher-multidexlib2_test.iml b/.idea/modules/dexpatcher-multidexlib2_test.iml
deleted file mode 100644
index 3b783f4..0000000
--- a/.idea/modules/dexpatcher-multidexlib2_test.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="multidexlib2:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.github.lanchon.dexpatcher" external.system.module.type="sourceSet" external.system.module.version="2.2.1.r2" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="dexpatcher-multidexlib2_main" />
-    <orderEntry type="library" name="Gradle: org.smali:dexlib2:2.2.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.smali:util:2.2.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:1.3.9" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.beust:jcommander:1.64" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="multidexlib2_main" />
-</module>
\ No newline at end of file
diff --git a/.idea/modules/multidexlib2.iml b/.idea/modules/multidexlib2.iml
index d633566..8ec812a 100644
--- a/.idea/modules/multidexlib2.iml
+++ b/.idea/modules/multidexlib2.iml
@@ -1,13 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="multidexlib2" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.github.lanchon.dexpatcher" external.system.module.version="2.2.1.r2" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/../../out/production/classes" />
+    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
       <excludeFolder url="file://$MODULE_DIR$/../../out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: org.smali:dexlib2:2.2.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.smali:util:2.2.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.beust:jcommander:1.64" level="project" />
   </component>
 </module>
\ No newline at end of file