diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..42aaf4a7c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+target
+reports
+*~
diff --git a/buildfile b/buildfile
new file mode 100644
index 000000000..290a43b18
--- /dev/null
+++ b/buildfile
@@ -0,0 +1,26 @@
+repositories.remote << 'http://www.ibiblio.org/maven2'
+
+require 'time'
+
+THIS_VERSION = '20110525'
+
+ant_layout = Layout.new
+
+ant_layout[:source, :main, :java] = 'src'
+ant_layout[:source, :main, :resources] = 'resource'
+ant_layout[:source, :test, :java] = 'test'
+
+desc 'json'
+define 'json', :layout=>ant_layout do
+  project.group = 'org.json'
+  project.version = THIS_VERSION
+  package :sources
+  package :javadoc
+  package(:jar).with :manifest=>
+  { 
+    'Project' => project.id,
+    'Version' => THIS_VERSION,
+    'Creation' => Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
+  }
+
+end
diff --git a/CDL.java b/src/org/json/CDL.java
similarity index 100%
rename from CDL.java
rename to src/org/json/CDL.java
diff --git a/Cookie.java b/src/org/json/Cookie.java
similarity index 100%
rename from Cookie.java
rename to src/org/json/Cookie.java
diff --git a/CookieList.java b/src/org/json/CookieList.java
similarity index 100%
rename from CookieList.java
rename to src/org/json/CookieList.java
diff --git a/HTTP.java b/src/org/json/HTTP.java
similarity index 100%
rename from HTTP.java
rename to src/org/json/HTTP.java
diff --git a/HTTPTokener.java b/src/org/json/HTTPTokener.java
similarity index 100%
rename from HTTPTokener.java
rename to src/org/json/HTTPTokener.java
diff --git a/JSONArray.java b/src/org/json/JSONArray.java
similarity index 100%
rename from JSONArray.java
rename to src/org/json/JSONArray.java
diff --git a/JSONException.java b/src/org/json/JSONException.java
similarity index 100%
rename from JSONException.java
rename to src/org/json/JSONException.java
diff --git a/JSONML.java b/src/org/json/JSONML.java
similarity index 100%
rename from JSONML.java
rename to src/org/json/JSONML.java
diff --git a/JSONObject.java b/src/org/json/JSONObject.java
similarity index 100%
rename from JSONObject.java
rename to src/org/json/JSONObject.java
diff --git a/JSONString.java b/src/org/json/JSONString.java
similarity index 100%
rename from JSONString.java
rename to src/org/json/JSONString.java
diff --git a/JSONStringer.java b/src/org/json/JSONStringer.java
similarity index 100%
rename from JSONStringer.java
rename to src/org/json/JSONStringer.java
diff --git a/JSONTokener.java b/src/org/json/JSONTokener.java
similarity index 100%
rename from JSONTokener.java
rename to src/org/json/JSONTokener.java
diff --git a/JSONWriter.java b/src/org/json/JSONWriter.java
similarity index 100%
rename from JSONWriter.java
rename to src/org/json/JSONWriter.java
diff --git a/XML.java b/src/org/json/XML.java
similarity index 100%
rename from XML.java
rename to src/org/json/XML.java
diff --git a/XMLTokener.java b/src/org/json/XMLTokener.java
similarity index 100%
rename from XMLTokener.java
rename to src/org/json/XMLTokener.java
diff --git a/Test.java b/test/org/json/Test.java
similarity index 100%
rename from Test.java
rename to test/org/json/Test.java