diff --git a/.classpath b/.classpath
new file mode 100644
index 000000000..3e0fb272a
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..ba077a403
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/.project b/.project
new file mode 100644
index 000000000..c539d8f59
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+
+
+ JSON-java
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..7cef69bd9
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,72 @@
+#Mon Apr 16 09:42:23 CEST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 000000000..5deb74161
--- /dev/null
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,54 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=true
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
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/tests/SampleResourceBundle_en_US.java b/src/org/json/tests/SampleResourceBundle_en_US.java
similarity index 100%
rename from tests/SampleResourceBundle_en_US.java
rename to src/org/json/tests/SampleResourceBundle_en_US.java
diff --git a/tests/SampleResourceBundle_fr.java b/src/org/json/tests/SampleResourceBundle_fr.java
similarity index 100%
rename from tests/SampleResourceBundle_fr.java
rename to src/org/json/tests/SampleResourceBundle_fr.java
diff --git a/tests/TestCDL.java b/src/org/json/tests/TestCDL.java
similarity index 100%
rename from tests/TestCDL.java
rename to src/org/json/tests/TestCDL.java
diff --git a/tests/TestCookie.java b/src/org/json/tests/TestCookie.java
similarity index 100%
rename from tests/TestCookie.java
rename to src/org/json/tests/TestCookie.java
diff --git a/tests/TestCookieList.java b/src/org/json/tests/TestCookieList.java
similarity index 100%
rename from tests/TestCookieList.java
rename to src/org/json/tests/TestCookieList.java
diff --git a/tests/TestHTTP.java b/src/org/json/tests/TestHTTP.java
similarity index 100%
rename from tests/TestHTTP.java
rename to src/org/json/tests/TestHTTP.java
diff --git a/tests/TestHTTPTokener.java b/src/org/json/tests/TestHTTPTokener.java
similarity index 100%
rename from tests/TestHTTPTokener.java
rename to src/org/json/tests/TestHTTPTokener.java
diff --git a/tests/TestJSONArray.java b/src/org/json/tests/TestJSONArray.java
similarity index 100%
rename from tests/TestJSONArray.java
rename to src/org/json/tests/TestJSONArray.java
diff --git a/tests/TestJSONException.java b/src/org/json/tests/TestJSONException.java
similarity index 100%
rename from tests/TestJSONException.java
rename to src/org/json/tests/TestJSONException.java
diff --git a/tests/TestJSONML.java b/src/org/json/tests/TestJSONML.java
similarity index 100%
rename from tests/TestJSONML.java
rename to src/org/json/tests/TestJSONML.java
diff --git a/tests/TestJSONObject.java b/src/org/json/tests/TestJSONObject.java
similarity index 100%
rename from tests/TestJSONObject.java
rename to src/org/json/tests/TestJSONObject.java
diff --git a/tests/TestJSONStringer.java b/src/org/json/tests/TestJSONStringer.java
similarity index 100%
rename from tests/TestJSONStringer.java
rename to src/org/json/tests/TestJSONStringer.java
diff --git a/tests/TestJSONTokener.java b/src/org/json/tests/TestJSONTokener.java
similarity index 100%
rename from tests/TestJSONTokener.java
rename to src/org/json/tests/TestJSONTokener.java
diff --git a/tests/TestJSONWriter.java b/src/org/json/tests/TestJSONWriter.java
similarity index 100%
rename from tests/TestJSONWriter.java
rename to src/org/json/tests/TestJSONWriter.java
diff --git a/tests/TestSuite.java b/src/org/json/tests/TestSuite.java
similarity index 100%
rename from tests/TestSuite.java
rename to src/org/json/tests/TestSuite.java
diff --git a/tests/TestXML.java b/src/org/json/tests/TestXML.java
similarity index 100%
rename from tests/TestXML.java
rename to src/org/json/tests/TestXML.java
diff --git a/tests/TestXMLTokener.java b/src/org/json/tests/TestXMLTokener.java
similarity index 100%
rename from tests/TestXMLTokener.java
rename to src/org/json/tests/TestXMLTokener.java