diff --git a/.gitignore b/.gitignore
index 4bfa911..4d9779c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 bin
-gen
 .settings
 .DS_Store
diff --git a/framework/.classpath b/framework/.classpath
new file mode 100644
index 0000000..a4763d1
--- /dev/null
+++ b/framework/.classpath
@@ -0,0 +1,8 @@
+<?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 kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/framework/.project b/framework/.project
new file mode 100644
index 0000000..5fdba36
--- /dev/null
+++ b/framework/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Dice Roller</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/AndroidManifest.xml b/framework/AndroidManifest.xml
similarity index 100%
rename from AndroidManifest.xml
rename to framework/AndroidManifest.xml
diff --git a/framework/gen/com/flip/diceroller/BuildConfig.java b/framework/gen/com/flip/diceroller/BuildConfig.java
new file mode 100644
index 0000000..43b4a18
--- /dev/null
+++ b/framework/gen/com/flip/diceroller/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package com.flip.diceroller;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}
\ No newline at end of file
diff --git a/framework/gen/com/flip/diceroller/R.java b/framework/gen/com/flip/diceroller/R.java
new file mode 100644
index 0000000..aad60d6
--- /dev/null
+++ b/framework/gen/com/flip/diceroller/R.java
@@ -0,0 +1,46 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.flip.diceroller;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int ic_launcher=0x7f020000;
+    }
+    public static final class id {
+        public static final int coin=0x7f05000b;
+        public static final int d10=0x7f050007;
+        public static final int d100=0x7f05000a;
+        public static final int d12=0x7f050008;
+        public static final int d20=0x7f050009;
+        public static final int d4=0x7f050004;
+        public static final int d6=0x7f050005;
+        public static final int d8=0x7f050006;
+        public static final int editText=0x7f050000;
+        public static final int roll=0x7f050001;
+        public static final int textViewLabel=0x7f050003;
+        public static final int textViewValue=0x7f050002;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040000;
+        public static final int coin=0x7f040009;
+        public static final int d10=0x7f040005;
+        public static final int d100=0x7f040008;
+        public static final int d12=0x7f040006;
+        public static final int d20=0x7f040007;
+        public static final int d4=0x7f040002;
+        public static final int d6=0x7f040003;
+        public static final int d8=0x7f040004;
+        public static final int roll=0x7f040001;
+        public static final int texthint=0x7f04000a;
+    }
+}
diff --git a/proguard-project.txt b/framework/proguard-project.txt
similarity index 100%
rename from proguard-project.txt
rename to framework/proguard-project.txt
diff --git a/project.properties b/framework/project.properties
similarity index 100%
rename from project.properties
rename to framework/project.properties
diff --git a/res/drawable-hdpi/ic_launcher.png b/framework/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher.png
rename to framework/res/drawable-hdpi/ic_launcher.png
diff --git a/res/drawable-ldpi/ic_launcher.png b/framework/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from res/drawable-ldpi/ic_launcher.png
rename to framework/res/drawable-ldpi/ic_launcher.png
diff --git a/res/drawable-mdpi/ic_launcher.png b/framework/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher.png
rename to framework/res/drawable-mdpi/ic_launcher.png
diff --git a/res/drawable-xhdpi/ic_launcher.png b/framework/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from res/drawable-xhdpi/ic_launcher.png
rename to framework/res/drawable-xhdpi/ic_launcher.png
diff --git a/res/layout/main.xml b/framework/res/layout/main.xml
similarity index 100%
rename from res/layout/main.xml
rename to framework/res/layout/main.xml
diff --git a/res/values/strings.xml b/framework/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to framework/res/values/strings.xml
diff --git a/src/com/flip/diceroller/Coin.java b/framework/src/com/flip/diceroller/Coin.java
similarity index 100%
rename from src/com/flip/diceroller/Coin.java
rename to framework/src/com/flip/diceroller/Coin.java
diff --git a/src/com/flip/diceroller/CoinButton.java b/framework/src/com/flip/diceroller/CoinButton.java
similarity index 100%
rename from src/com/flip/diceroller/CoinButton.java
rename to framework/src/com/flip/diceroller/CoinButton.java
diff --git a/src/com/flip/diceroller/DiceRollerActivity.java b/framework/src/com/flip/diceroller/DiceRollerActivity.java
similarity index 100%
rename from src/com/flip/diceroller/DiceRollerActivity.java
rename to framework/src/com/flip/diceroller/DiceRollerActivity.java
diff --git a/src/com/flip/diceroller/Die.java b/framework/src/com/flip/diceroller/Die.java
similarity index 100%
rename from src/com/flip/diceroller/Die.java
rename to framework/src/com/flip/diceroller/Die.java
diff --git a/src/com/flip/diceroller/DieButton.java b/framework/src/com/flip/diceroller/DieButton.java
similarity index 100%
rename from src/com/flip/diceroller/DieButton.java
rename to framework/src/com/flip/diceroller/DieButton.java
diff --git a/src/com/flip/diceroller/Dieset.java b/framework/src/com/flip/diceroller/Dieset.java
similarity index 100%
rename from src/com/flip/diceroller/Dieset.java
rename to framework/src/com/flip/diceroller/Dieset.java