diff --git a/.classpath b/.classpath
new file mode 100644
index 000000000..37a11b83e
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/AndroidPinning"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/MemorizingActivity"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/Universal-Image-Loader"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
index 8345f35d2..22273c3f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 /local.properties
-/.classpath
 /bin/
 /gen/
 /build/
@@ -7,6 +6,6 @@
 /build.xml
 *~
 /.idea/
-/.project
 /*.iml
 out
+/.settings/
diff --git a/test/.classpath b/test/.classpath
new file mode 100644
index 000000000..d585386c3
--- /dev/null
+++ b/test/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/fdroid"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/test/.gitignore b/test/.gitignore
index 8345f35d2..22273c3f4 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,5 +1,4 @@
 /local.properties
-/.classpath
 /bin/
 /gen/
 /build/
@@ -7,6 +6,6 @@
 /build.xml
 *~
 /.idea/
-/.project
 /*.iml
 out
+/.settings/