diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..2544a69
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'java'
+apply plugin: 'eclipse'
+
+jar.baseName = 'JSON-java'
+
+sourceSets {
+ test {
+  java {
+   srcDir 'src/test'
+  }
+ }
+}
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.+'
+    testCompile group: 'com.jayway.jsonpath', name: 'json-path', version: '2.1.0'
+    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.5'
+    // Use this line if you are testing a JSON-Java release. 
+    // Otherwise add an external jar from your local repository in Eclipse
+    // (The gradle build won't work unless you add a main sourceSets entry and a jar.baseName entry
+    // testCompile group: 'org.json', name: 'json', version: '20151123'
+}
diff --git a/CDLTest.java b/src/test/org/json/junit/CDLTest.java
similarity index 100%
rename from CDLTest.java
rename to src/test/org/json/junit/CDLTest.java
diff --git a/CookieListTest.java b/src/test/org/json/junit/CookieListTest.java
similarity index 100%
rename from CookieListTest.java
rename to src/test/org/json/junit/CookieListTest.java
diff --git a/CookieTest.java b/src/test/org/json/junit/CookieTest.java
similarity index 100%
rename from CookieTest.java
rename to src/test/org/json/junit/CookieTest.java
diff --git a/EnumTest.java b/src/test/org/json/junit/EnumTest.java
similarity index 100%
rename from EnumTest.java
rename to src/test/org/json/junit/EnumTest.java
diff --git a/HTTPTest.java b/src/test/org/json/junit/HTTPTest.java
similarity index 100%
rename from HTTPTest.java
rename to src/test/org/json/junit/HTTPTest.java
diff --git a/JSONArrayTest.java b/src/test/org/json/junit/JSONArrayTest.java
similarity index 100%
rename from JSONArrayTest.java
rename to src/test/org/json/junit/JSONArrayTest.java
diff --git a/JSONMLTest.java b/src/test/org/json/junit/JSONMLTest.java
similarity index 100%
rename from JSONMLTest.java
rename to src/test/org/json/junit/JSONMLTest.java
diff --git a/JSONObjectTest.java b/src/test/org/json/junit/JSONObjectTest.java
similarity index 100%
rename from JSONObjectTest.java
rename to src/test/org/json/junit/JSONObjectTest.java
diff --git a/JSONStringerTest.java b/src/test/org/json/junit/JSONStringerTest.java
similarity index 100%
rename from JSONStringerTest.java
rename to src/test/org/json/junit/JSONStringerTest.java
diff --git a/JunitTestSuite.java b/src/test/org/json/junit/JunitTestSuite.java
similarity index 100%
rename from JunitTestSuite.java
rename to src/test/org/json/junit/JunitTestSuite.java
diff --git a/MyBean.java b/src/test/org/json/junit/MyBean.java
similarity index 100%
rename from MyBean.java
rename to src/test/org/json/junit/MyBean.java
diff --git a/MyBigNumberBean.java b/src/test/org/json/junit/MyBigNumberBean.java
similarity index 100%
rename from MyBigNumberBean.java
rename to src/test/org/json/junit/MyBigNumberBean.java
diff --git a/MyEnum.java b/src/test/org/json/junit/MyEnum.java
similarity index 100%
rename from MyEnum.java
rename to src/test/org/json/junit/MyEnum.java
diff --git a/MyEnumClass.java b/src/test/org/json/junit/MyEnumClass.java
similarity index 100%
rename from MyEnumClass.java
rename to src/test/org/json/junit/MyEnumClass.java
diff --git a/MyEnumField.java b/src/test/org/json/junit/MyEnumField.java
similarity index 100%
rename from MyEnumField.java
rename to src/test/org/json/junit/MyEnumField.java
diff --git a/MyJsonString.java b/src/test/org/json/junit/MyJsonString.java
similarity index 100%
rename from MyJsonString.java
rename to src/test/org/json/junit/MyJsonString.java
diff --git a/MyPublicClass.java b/src/test/org/json/junit/MyPublicClass.java
similarity index 100%
rename from MyPublicClass.java
rename to src/test/org/json/junit/MyPublicClass.java
diff --git a/PropertyTest.java b/src/test/org/json/junit/PropertyTest.java
similarity index 100%
rename from PropertyTest.java
rename to src/test/org/json/junit/PropertyTest.java
diff --git a/StringsResourceBundle.java b/src/test/org/json/junit/StringsResourceBundle.java
similarity index 100%
rename from StringsResourceBundle.java
rename to src/test/org/json/junit/StringsResourceBundle.java
diff --git a/TestRunner.java b/src/test/org/json/junit/TestRunner.java
similarity index 100%
rename from TestRunner.java
rename to src/test/org/json/junit/TestRunner.java
diff --git a/Util.java b/src/test/org/json/junit/Util.java
similarity index 100%
rename from Util.java
rename to src/test/org/json/junit/Util.java
diff --git a/XMLTest.java b/src/test/org/json/junit/XMLTest.java
similarity index 100%
rename from XMLTest.java
rename to src/test/org/json/junit/XMLTest.java