diff --git a/.gitignore b/.gitignore
index 3d841208b..b25c15b81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,63 +1 @@
 *~
-tools/eclipse/plugins/com.android.ide.eclipse.adt/androidprefs.jar
-tools/eclipse/plugins/com.android.ide.eclipse.adt/jarutils.jar
-tools/eclipse/plugins/com.android.ide.eclipse.adt/kxml2-2.3.0.jar
-tools/eclipse/plugins/com.android.ide.eclipse.adt/layoutlib_api.jar
-tools/eclipse/plugins/com.android.ide.eclipse.adt/layoutlib_utils.jar
-tools/eclipse/plugins/com.android.ide.eclipse.adt/ninepatch.jar
-tools/eclipse/plugins/com.android.ide.eclipse.adt/sdklib.jar
-tools/eclipse/plugins/com.android.ide.eclipse.adt/sdkstats.jar
-tools/eclipse/plugins/com.android.ide.eclipse.adt/sdkuilib.jar
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/add.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/backward.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/clear.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/d.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/debug-attach.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/debug-error.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/debug-wait.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/delete.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/device.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/down.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/e.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/edit.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/empty.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/emulator.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/forward.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/gc.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/halt.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/heap.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/i.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/importBug.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/load.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/pause.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/play.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/pull.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/push.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/save.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/thread.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/up.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/v.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/w.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/warning.png
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/libs/jcommon-1.0.12.jar
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/libs/jfreechart-1.0.9-swt.jar
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/libs/jfreechart-1.0.9.jar
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ddmlib
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ddmuilib
-tools/eclipse/plugins/com.android.ide.eclipse.tests/kxml2-2.3.0.jar
-tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ddmlib
-tools/androidprefs/bin/*
-tools/anttasks/bin/*
-tools/apkbuilder/bin/*
-tools/ddms/app/bin/*
-tools/ddms/libs/ddmlib/bin/*
-tools/ddms/libs/ddmuilib/bin/*
-tools/eclipse/plugins/com.android.ide.eclipse.adt/bin/*
-tools/eclipse/plugins/com.android.ide.eclipse.ddms/bin/*
-tools/eclipse/plugins/com.android.ide.eclipse.tests/bin/*
-tools/jarutils/bin/*
-tools/sdkmanager/app/bin/*
-tools/sdkmanager/libs/sdklib/bin/*
-tools/sdkmanager/libs/sdkuilib/bin/*
-tools/sdkstats/bin/*
-tools/mkstubs/bin/*
\ No newline at end of file
diff --git a/tools/androidprefs/.gitignore b/tools/androidprefs/.gitignore
new file mode 100644
index 000000000..fe99505dc
--- /dev/null
+++ b/tools/androidprefs/.gitignore
@@ -0,0 +1,2 @@
+bin
+
diff --git a/tools/anttasks/.gitignore b/tools/anttasks/.gitignore
new file mode 100644
index 000000000..fe99505dc
--- /dev/null
+++ b/tools/anttasks/.gitignore
@@ -0,0 +1,2 @@
+bin
+
diff --git a/tools/apkbuilder/.gitignore b/tools/apkbuilder/.gitignore
new file mode 100644
index 000000000..fe99505dc
--- /dev/null
+++ b/tools/apkbuilder/.gitignore
@@ -0,0 +1,2 @@
+bin
+
diff --git a/tools/ddms/.gitignore b/tools/ddms/.gitignore
new file mode 100644
index 000000000..6d833a0ee
--- /dev/null
+++ b/tools/ddms/.gitignore
@@ -0,0 +1,4 @@
+app/bin
+libs/ddmlib/bin
+libs/ddmuilib/bin
+
diff --git a/tools/eclipse/plugins/.gitignore b/tools/eclipse/plugins/.gitignore
new file mode 100644
index 000000000..2842bb13d
--- /dev/null
+++ b/tools/eclipse/plugins/.gitignore
@@ -0,0 +1,52 @@
+com.android.ide.eclipse.adt/bin
+com.android.ide.eclipse.ddms/bin
+com.android.ide.eclipse.tests/bin
+
+com.android.ide.eclipse.adt/androidprefs.jar
+com.android.ide.eclipse.adt/jarutils.jar
+com.android.ide.eclipse.adt/kxml2-2.3.0.jar
+com.android.ide.eclipse.adt/layoutlib_api.jar
+com.android.ide.eclipse.adt/layoutlib_utils.jar
+com.android.ide.eclipse.adt/ninepatch.jar
+com.android.ide.eclipse.adt/sdklib.jar
+com.android.ide.eclipse.adt/sdkstats.jar
+com.android.ide.eclipse.adt/sdkuilib.jar
+com.android.ide.eclipse.ddms/icons/add.png
+com.android.ide.eclipse.ddms/icons/backward.png
+com.android.ide.eclipse.ddms/icons/clear.png
+com.android.ide.eclipse.ddms/icons/d.png
+com.android.ide.eclipse.ddms/icons/debug-attach.png
+com.android.ide.eclipse.ddms/icons/debug-error.png
+com.android.ide.eclipse.ddms/icons/debug-wait.png
+com.android.ide.eclipse.ddms/icons/delete.png
+com.android.ide.eclipse.ddms/icons/device.png
+com.android.ide.eclipse.ddms/icons/down.png
+com.android.ide.eclipse.ddms/icons/e.png
+com.android.ide.eclipse.ddms/icons/edit.png
+com.android.ide.eclipse.ddms/icons/empty.png
+com.android.ide.eclipse.ddms/icons/emulator.png
+com.android.ide.eclipse.ddms/icons/forward.png
+com.android.ide.eclipse.ddms/icons/gc.png
+com.android.ide.eclipse.ddms/icons/halt.png
+com.android.ide.eclipse.ddms/icons/heap.png
+com.android.ide.eclipse.ddms/icons/i.png
+com.android.ide.eclipse.ddms/icons/importBug.png
+com.android.ide.eclipse.ddms/icons/load.png
+com.android.ide.eclipse.ddms/icons/pause.png
+com.android.ide.eclipse.ddms/icons/play.png
+com.android.ide.eclipse.ddms/icons/pull.png
+com.android.ide.eclipse.ddms/icons/push.png
+com.android.ide.eclipse.ddms/icons/save.png
+com.android.ide.eclipse.ddms/icons/thread.png
+com.android.ide.eclipse.ddms/icons/up.png
+com.android.ide.eclipse.ddms/icons/v.png
+com.android.ide.eclipse.ddms/icons/w.png
+com.android.ide.eclipse.ddms/icons/warning.png
+com.android.ide.eclipse.ddms/libs/jcommon-1.0.12.jar
+com.android.ide.eclipse.ddms/libs/jfreechart-1.0.9-swt.jar
+com.android.ide.eclipse.ddms/libs/jfreechart-1.0.9.jar
+com.android.ide.eclipse.ddms/src/com/android/ddmlib
+com.android.ide.eclipse.ddms/src/com/android/ddmuilib
+com.android.ide.eclipse.tests/kxml2-2.3.0.jar
+com.android.ide.eclipse.tests/unittests/com/android/ddmlib
+
diff --git a/tools/jarutils/.gitignore b/tools/jarutils/.gitignore
new file mode 100644
index 000000000..fe99505dc
--- /dev/null
+++ b/tools/jarutils/.gitignore
@@ -0,0 +1,2 @@
+bin
+
diff --git a/tools/layoutlib_utils/.gitignore b/tools/layoutlib_utils/.gitignore
new file mode 100644
index 000000000..fe99505dc
--- /dev/null
+++ b/tools/layoutlib_utils/.gitignore
@@ -0,0 +1,2 @@
+bin
+
diff --git a/tools/mkstubs/.classpath b/tools/mkstubs/.classpath
index a6b4c4717..49a6d6ca0 100644
--- a/tools/mkstubs/.classpath
+++ b/tools/mkstubs/.classpath
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="tests"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/asm3"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="tests"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="var" path="ANDROID_SRC/prebuilt/common/asm/asm-3.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tools/mkstubs/.gitignore b/tools/mkstubs/.gitignore
new file mode 100644
index 000000000..fe99505dc
--- /dev/null
+++ b/tools/mkstubs/.gitignore
@@ -0,0 +1,2 @@
+bin
+
diff --git a/tools/mkstubs/.project b/tools/mkstubs/.project
index bef013ee0..12944f469 100644
--- a/tools/mkstubs/.project
+++ b/tools/mkstubs/.project
@@ -1,18 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>MkStubs</name>
-	<comment></comment>
-	<projects>
-		<project>asm3</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>MkStubs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tools/sdkmanager/.gitignore b/tools/sdkmanager/.gitignore
new file mode 100644
index 000000000..48f206a91
--- /dev/null
+++ b/tools/sdkmanager/.gitignore
@@ -0,0 +1,4 @@
+app/bin
+libs/sdklib/bin
+libs/sdkuilib/bin
+
diff --git a/tools/sdkstats/.gitignore b/tools/sdkstats/.gitignore
new file mode 100644
index 000000000..fe99505dc
--- /dev/null
+++ b/tools/sdkstats/.gitignore
@@ -0,0 +1,2 @@
+bin
+