diff --git a/.gitignore b/.gitignore
index 9e7b59c..7afd420 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,9 @@ build
 .classpath
 .project
 .settings/
+/.gradle/
+/gradle/
+/gradlew
+/gradlew.bat
+.gitmodules
+src/main/
diff --git a/build.gradle b/build.gradle
index ad186a1..d2969d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,21 +4,8 @@ apply plugin: 'jacoco'
 
 sourceSets {
   // Uncomment main if you have merged JSON-Java and JSON-Java-unit-test code
-  main {
-    java {
-      srcDir 'src'
-      exclude 'test/' 
-    }
-  }
-  test {
-    java {
-      srcDir 'src/test'
-      exclude 'resources/'
-    }
-    resources {
-       srcDir 'resources'
-    }
-  }
+  main
+  test
 }
 
 repositories {
diff --git a/src/test/org/json/junit/CDLTest.java b/src/test/java/org/json/junit/CDLTest.java
similarity index 100%
rename from src/test/org/json/junit/CDLTest.java
rename to src/test/java/org/json/junit/CDLTest.java
diff --git a/src/test/org/json/junit/CookieListTest.java b/src/test/java/org/json/junit/CookieListTest.java
similarity index 100%
rename from src/test/org/json/junit/CookieListTest.java
rename to src/test/java/org/json/junit/CookieListTest.java
diff --git a/src/test/org/json/junit/CookieTest.java b/src/test/java/org/json/junit/CookieTest.java
similarity index 100%
rename from src/test/org/json/junit/CookieTest.java
rename to src/test/java/org/json/junit/CookieTest.java
diff --git a/src/test/org/json/junit/EnumTest.java b/src/test/java/org/json/junit/EnumTest.java
similarity index 100%
rename from src/test/org/json/junit/EnumTest.java
rename to src/test/java/org/json/junit/EnumTest.java
diff --git a/src/test/org/json/junit/HTTPTest.java b/src/test/java/org/json/junit/HTTPTest.java
similarity index 100%
rename from src/test/org/json/junit/HTTPTest.java
rename to src/test/java/org/json/junit/HTTPTest.java
diff --git a/src/test/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
similarity index 100%
rename from src/test/org/json/junit/JSONArrayTest.java
rename to src/test/java/org/json/junit/JSONArrayTest.java
diff --git a/src/test/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
similarity index 100%
rename from src/test/org/json/junit/JSONMLTest.java
rename to src/test/java/org/json/junit/JSONMLTest.java
diff --git a/src/test/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
similarity index 100%
rename from src/test/org/json/junit/JSONObjectTest.java
rename to src/test/java/org/json/junit/JSONObjectTest.java
diff --git a/src/test/org/json/junit/JSONPointerTest.java b/src/test/java/org/json/junit/JSONPointerTest.java
similarity index 100%
rename from src/test/org/json/junit/JSONPointerTest.java
rename to src/test/java/org/json/junit/JSONPointerTest.java
diff --git a/src/test/org/json/junit/JSONStringerTest.java b/src/test/java/org/json/junit/JSONStringerTest.java
similarity index 100%
rename from src/test/org/json/junit/JSONStringerTest.java
rename to src/test/java/org/json/junit/JSONStringerTest.java
diff --git a/src/test/org/json/junit/JunitTestSuite.java b/src/test/java/org/json/junit/JunitTestSuite.java
similarity index 100%
rename from src/test/org/json/junit/JunitTestSuite.java
rename to src/test/java/org/json/junit/JunitTestSuite.java
diff --git a/src/test/org/json/junit/MyBean.java b/src/test/java/org/json/junit/MyBean.java
similarity index 100%
rename from src/test/org/json/junit/MyBean.java
rename to src/test/java/org/json/junit/MyBean.java
diff --git a/src/test/org/json/junit/MyBigNumberBean.java b/src/test/java/org/json/junit/MyBigNumberBean.java
similarity index 100%
rename from src/test/org/json/junit/MyBigNumberBean.java
rename to src/test/java/org/json/junit/MyBigNumberBean.java
diff --git a/src/test/org/json/junit/MyEnum.java b/src/test/java/org/json/junit/MyEnum.java
similarity index 100%
rename from src/test/org/json/junit/MyEnum.java
rename to src/test/java/org/json/junit/MyEnum.java
diff --git a/src/test/org/json/junit/MyEnumClass.java b/src/test/java/org/json/junit/MyEnumClass.java
similarity index 100%
rename from src/test/org/json/junit/MyEnumClass.java
rename to src/test/java/org/json/junit/MyEnumClass.java
diff --git a/src/test/org/json/junit/MyEnumField.java b/src/test/java/org/json/junit/MyEnumField.java
similarity index 100%
rename from src/test/org/json/junit/MyEnumField.java
rename to src/test/java/org/json/junit/MyEnumField.java
diff --git a/src/test/org/json/junit/MyJsonString.java b/src/test/java/org/json/junit/MyJsonString.java
similarity index 100%
rename from src/test/org/json/junit/MyJsonString.java
rename to src/test/java/org/json/junit/MyJsonString.java
diff --git a/src/test/org/json/junit/MyPublicClass.java b/src/test/java/org/json/junit/MyPublicClass.java
similarity index 100%
rename from src/test/org/json/junit/MyPublicClass.java
rename to src/test/java/org/json/junit/MyPublicClass.java
diff --git a/src/test/org/json/junit/PropertyTest.java b/src/test/java/org/json/junit/PropertyTest.java
similarity index 100%
rename from src/test/org/json/junit/PropertyTest.java
rename to src/test/java/org/json/junit/PropertyTest.java
diff --git a/src/test/org/json/junit/StringsResourceBundle.java b/src/test/java/org/json/junit/StringsResourceBundle.java
similarity index 100%
rename from src/test/org/json/junit/StringsResourceBundle.java
rename to src/test/java/org/json/junit/StringsResourceBundle.java
diff --git a/src/test/org/json/junit/TestRunner.java b/src/test/java/org/json/junit/TestRunner.java
similarity index 100%
rename from src/test/org/json/junit/TestRunner.java
rename to src/test/java/org/json/junit/TestRunner.java
diff --git a/src/test/org/json/junit/Util.java b/src/test/java/org/json/junit/Util.java
similarity index 100%
rename from src/test/org/json/junit/Util.java
rename to src/test/java/org/json/junit/Util.java
diff --git a/src/test/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
similarity index 100%
rename from src/test/org/json/junit/XMLTest.java
rename to src/test/java/org/json/junit/XMLTest.java