diff --git a/.gitignore b/.gitignore
index 552351b..03d41b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,8 @@
 # generated files
 bin/
 out/
-gen/
+src/common
+src/template
 
 # Libraries used by the app
 # Can explicitly add if we want, but shouldn't do so blindly.  Licenses, bloat, etc.
@@ -37,3 +38,4 @@
 .gradle
 build/
 
+
diff --git a/background/alarms/repeatingAlarm/build.gradle b/background/alarms/repeatingAlarm/build.gradle
index dbe554d..88331e3 100644
--- a/background/alarms/repeatingAlarm/build.gradle
+++ b/background/alarms/repeatingAlarm/build.gradle
@@ -1,6 +1,7 @@
 // BEGIN_EXCLUDE
 apply from: "../../../../../build/build.gradle"
 samplegen {
-pathToSamplesCommon "../../../common"
+    pathToBuild "../../../../../build"
+    pathToSamplesCommon "../../../common"
 }
-// END_EXCLUDE
\ No newline at end of file
+// END_EXCLUDE
diff --git a/background/alarms/repeatingAlarm/buildSrc/build.gradle b/background/alarms/repeatingAlarm/buildSrc/build.gradle
index 8c294c2..7cebf71 100644
--- a/background/alarms/repeatingAlarm/buildSrc/build.gradle
+++ b/background/alarms/repeatingAlarm/buildSrc/build.gradle
@@ -8,7 +8,7 @@
 sourceSets {
     main {
         groovy {
-            srcDir new File(rootDir, "../../../../../build/buildSrc/src/main/groovy")
+            srcDir new File(rootDir, "../../../../../../build/buildSrc/src/main/groovy")
         }
     }
 }
diff --git a/background/alarms/repeatingAlarm/repeatingAlarmSample/build.gradle b/background/alarms/repeatingAlarm/repeatingAlarmSample/build.gradle
index 0481875..241bcc7 100644
--- a/background/alarms/repeatingAlarm/repeatingAlarmSample/build.gradle
+++ b/background/alarms/repeatingAlarm/repeatingAlarmSample/build.gradle
@@ -1,3 +1,4 @@
+
 buildscript {
     repositories {
         mavenCentral()
@@ -27,7 +28,6 @@
     compileSdkVersion 18
     buildToolsVersion "18.0.1"
 
-
     sourceSets {
         main {
             dirs.each { dir ->
@@ -35,15 +35,20 @@
                 res.srcDirs "src/${dir}/res"
             }
         }
+        instrumentTest.setRoot('tests')
+        instrumentTest.java.srcDirs = ['tests/src']
     }
 }
 
-task preflight (dependsOn: parent.preflight) {}
-
-// Inject a preflight task into each variant so we have a place to hook tasks
-// that need to run before any of the android build tasks.
-android.applicationVariants.each { variant ->
-    tasks.getByPath("prepare${variant.name.capitalize()}Dependencies").dependsOn preflight
+task preflight (dependsOn: parent.preflight) {
+    project.afterEvaluate {
+        // Inject a preflight task into each variant so we have a place to hook tasks
+        // that need to run before any of the android build tasks.
+        //
+        android.applicationVariants.each { variant ->
+            tasks.getByPath("prepare${variant.name.capitalize()}Dependencies").dependsOn preflight
+        }
+    }
 }
 
 
diff --git a/build.gradle b/build.gradle
index 602c3fd..f511c5e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,46 +1,54 @@
-List<String> samples = [ 
-    "connectivity/bluetooth/BluetoothLeGatt",
+List<String> samples = [
+//    "connectivity/bluetooth/BluetoothLeGatt",
 //    "connectivity/sync/BasicSyncAdapter",
-    "connectivity/network/BasicNetworkDemo",
-    "connectivity/network/NetworkConnect",
-    "content/multiuser/AppRestrictions",
-    "content/contacts/BasicContactables",
+//    "connectivity/network/BasicNetworkDemo",
+//    "connectivity/network/NetworkConnect",
+//    "content/multiuser/AppRestrictions",
+//    "content/contacts/BasicContactables",
     "sampleSamples/BaseSample",
-    "sampleSamples/foo",
     "sampleSamples/singleViewSample",
     "sampleSamples/ActivityCards",
-    "ui/notifications/CustomNotifications",
-    "ui/notifications/BasicNotifications",
+//    "ui/notifications/CustomNotifications",
+//    "ui/notifications/BasicNotifications",
 //    "ui/ImmersiveMode",
-    "ui/actionbarcompat/ListPopupMenu",
-    "ui/actionbarcompat/Styled",
-    "ui/actionbarcompat/ShareActionProvider",
-    "ui/actionbarcompat/Basic",
-    "ui/actionbar/DoneBar",
-    "ui/accessibility/BasicAccessibility",
-    "ui/lists/CustomChoiceList",
-    "ui/views/TextSwitcher",
-    "ui/views/HorizontalPaging",
-    "ui/holo/BorderlessButtons",
-    "security/keystore/BasicAndroidKeyStore",
-    "views/TextLinkify",
+//    "ui/actionbarcompat/ListPopupMenu",
+//    "ui/actionbarcompat/Styled",
+//    "ui/actionbarcompat/ShareActionProvider",
+//    "ui/actionbarcompat/Basic",
+//    "ui/actionbar/DoneBar",
+//    "ui/accessibility/BasicAccessibility",
+//    "ui/lists/CustomChoiceList",
+//    "ui/views/TextSwitcher",
+//    "ui/views/HorizontalPaging",
+//    "ui/holo/BorderlessButtons",
+//    "security/keystore/BasicAndroidKeyStore",
+//    "views/TextLinkify",
 //    "background/alarms/repeatingAlarm",
-    "media/BasicMediaRouter",
+//    "media/BasicMediaRouter",
 //    "media/BasicMediaDecoder",
 //    "media/MediaRecorder",
-    "input/multitouch/BasicMultitouch",
-    "input/gestures/BasicGestureDetect",
+//    "input/multitouch/BasicMultitouch",
+//    "input/gestures/BasicGestureDetect",
 ]
 
-task build {}
+List<String> taskNames = [
+    "refresh",
+    "build",
+    "emitAnt",
+    "emitGradle",
+    "emitBrowseable",
+]
 
-samples.each { sample ->
-    File sampleDir = new File(sample)
-    buildSample = project.task([type: GradleBuild], sample, {
-        buildFile = "${sample}/build.gradle"
-        dir = sample
-        tasks = ["build"]
-    })  
-    build.dependsOn(buildSample)
+taskNames.each { taskName ->
+    def task = project.hasProperty(taskName) ? project.tasks[taskName] : project.task(taskName)
+    println task
+    samples.each { sample ->
+        File sampleDir = new File(sample)
+        task.dependsOn project.task([type: GradleBuild], "${sample}_${taskName}", {
+            buildFile = "${sample}/build.gradle"
+            dir = sample
+            tasks = [taskName]
+        })
+    }
 }
 
diff --git a/common/build/templates/create/_MODULE_/src/main/res/drawable-hdpi/ic_launcher.png b/common/build/templates/create/_MODULE_/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index b1efaf4..0000000
--- a/common/build/templates/create/_MODULE_/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/common/build/templates/create/_MODULE_/src/main/res/drawable-mdpi/ic_launcher.png b/common/build/templates/create/_MODULE_/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index f5f9244..0000000
--- a/common/build/templates/create/_MODULE_/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/common/build/templates/create/_MODULE_/src/main/res/drawable-xhdpi/ic_launcher.png b/common/build/templates/create/_MODULE_/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 5d07b3f..0000000
--- a/common/build/templates/create/_MODULE_/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/common/build/templates/create/_MODULE_/src/main/res/drawable-xxhdpi/ic_launcher.png b/common/build/templates/create/_MODULE_/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 6ef21e1..0000000
--- a/common/build/templates/create/_MODULE_/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 45caa08..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,63 +0,0 @@
-include(
-  ':connectivity:bluetooth:BluetoothLeGatt:BluetoothLeGatt',
-  ':connectivity:bluetooth:BluetoothLeGatt',
-  ':connectivity:sync:BasicSyncAdapter',
-  ':connectivity:sync:BasicSyncAdapter:BasicSyncAdapter',
-  ':connectivity:network:BasicNetworkDemo:BasicNetworkDemo',
-  ':connectivity:network:BasicNetworkDemo',
-  ':connectivity:network:NetworkConnect:NetworkConnect',
-  ':connectivity:network:NetworkConnect',
-  ':content:multiuser:AppRestrictions:AppRestrictions',
-  ':content:multiuser:AppRestrictions',
-  ':content:contacts:BasicContactables:BasicContactables',
-  ':content:contacts:BasicContactables',
-  ':sampleSamples:BaseSample:BaseSampleSample',
-  ':sampleSamples:BaseSample',
-  ':sampleSamples:singleViewSample:singleViewSampleSample',
-  ':sampleSamples:singleViewSample',
-  ':sampleSamples:ActivityCards:ActivityCardsSample',
-  ':sampleSamples:ActivityCards',
-  ':ui:notifications:CustomNotifications:CustomNotifications',
-  ':ui:notifications:CustomNotifications',
-  ':ui:notifications:BasicNotifications:BasicNotifications',
-  ':ui:notifications:BasicNotifications',
-  ':ui:ImmersiveMode',
-  ':ui:ImmersiveMode:ImmersiveModeSample',
-  ':ui:actionbarcompat:ListPopupMenu:ListPopupMenu',
-  ':ui:actionbarcompat:ListPopupMenu',
-  ':ui:actionbarcompat:Styled:Styled',
-  ':ui:actionbarcompat:Styled',
-  ':ui:actionbarcompat:SearchView',
-  ':ui:actionbarcompat:ShareActionProvider:ShareActionProvider',
-  ':ui:actionbarcompat:ShareActionProvider',
-  ':ui:actionbarcompat:ListViewModalSelect',
-  ':ui:actionbarcompat:Basic',
-  ':ui:actionbarcompat:Basic:Basic',
-  ':ui:actionbar:DoneBar',
-  ':ui:actionbar:DoneBar:DoneBar',
-  ':ui:accessibility:BasicAccessibility:BasicAccessibility',
-  ':ui:accessibility:BasicAccessibility',
-  ':ui:lists:CustomChoiceList:CustomChoiceList',
-  ':ui:lists:CustomChoiceList',
-  ':ui:views:TextSwitcher:TextSwitcher',
-  ':ui:views:TextSwitcher',
-  ':ui:views:HorizontalPaging:HorizontalPaging',
-  ':ui:views:HorizontalPaging',
-  ':ui:holo:BorderlessButtons:BorderlessButtons',
-  ':ui:holo:BorderlessButtons',
-  ':security:keystore:BasicAndroidKeyStore:BasicAndroidKeyStore',
-  ':security:keystore:BasicAndroidKeyStore',
-  ':views:TextLinkify:TextLinkify',
-  ':views:TextLinkify',
-  ':background:alarms:repeatingAlarm',
-  ':background:alarms:repeatingAlarm:repeatingAlarmSample',
-  ':media:BasicMediaRouter:BasicMediaRouter',
-  ':media:BasicMediaRouter',
-  ':media:BasicMediaDecoder:BasicMediaDecoder',
-  ':media:BasicMediaDecoder',
-  ':media:MediaRecorder:MediaRecorder',
-  ':media:MediaRecorder',
-  ':input:multitouch:BasicMultitouch:BasicMultitouch',
-  ':input:multitouch:BasicMultitouch',
-  ':input:gestures:BasicGestureDetect:BasicGestureDetect',
-  ':input:gestures:BasicGestureDetect')
diff --git a/settings.gradle.old b/settings.gradle.old
deleted file mode 100644
index 03da487..0000000
--- a/settings.gradle.old
+++ /dev/null
@@ -1,63 +0,0 @@
-include(
-  ':connectivity:bluetooth:BluetoothLeGatt:BluetoothLeGatt',
-  ':connectivity:bluetooth:BluetoothLeGatt',
-  ':connectivity:sync:BasicSyncAdapter',
-  ':connectivity:sync:BasicSyncAdapter:BasicSyncAdapter',
-  ':connectivity:network:BasicNetworkDemo:BasicNetworkDemo',
-  ':connectivity:network:BasicNetworkDemo',
-  //':connectivity:network:NetworkConnect:NetworkConnect',
-  //':connectivity:network:NetworkConnect',
-  ':content:multiuser:AppRestrictions:AppRestrictions',
-  ':content:multiuser:AppRestrictions',
-  ':content:contacts:BasicContactables:BasicContactables',
-  ':content:contacts:BasicContactables',
-  ':sampleSamples:BaseSample:BaseSampleSample',
-  ':sampleSamples:BaseSample',
-  ':sampleSamples:singleViewSample:singleViewSampleSample',
-  ':sampleSamples:singleViewSample',
-  ':sampleSamples:ActivityCards:ActivityCardsSample',
-  ':sampleSamples:ActivityCards',
-  ':ui:notifications:CustomNotifications:CustomNotifications',
-  ':ui:notifications:CustomNotifications',
-  ':ui:notifications:BasicNotifications:BasicNotifications',
-  ':ui:notifications:BasicNotifications',
-  ':ui:ImmersiveMode',
-  ':ui:ImmersiveMode:ImmersiveModeSample',
-  ':ui:actionbarcompat:ListPopupMenu:ListPopupMenu',
-  ':ui:actionbarcompat:ListPopupMenu',
-  ':ui:actionbarcompat:Styled:Styled',
-  ':ui:actionbarcompat:Styled',
-  ':ui:actionbarcompat:SearchView',
-  ':ui:actionbarcompat:ShareActionProvider:ShareActionProvider',
-  ':ui:actionbarcompat:ShareActionProvider',
-  ':ui:actionbarcompat:ListViewModalSelect',
-  ':ui:actionbarcompat:Basic',
-  ':ui:actionbarcompat:Basic:Basic',
-  ':ui:actionbar:DoneBar',
-  ':ui:actionbar:DoneBar:DoneBar',
-  ':ui:accessibility:BasicAccessibility:BasicAccessibility',
-  ':ui:accessibility:BasicAccessibility',
-  ':ui:lists:CustomChoiceList:CustomChoiceList',
-  ':ui:lists:CustomChoiceList',
-  ':ui:views:TextSwitcher:TextSwitcher',
-  ':ui:views:TextSwitcher',
-  ':ui:views:HorizontalPaging:HorizontalPaging',
-  ':ui:views:HorizontalPaging',
-  ':ui:holo:BorderlessButtons:BorderlessButtons',
-  ':ui:holo:BorderlessButtons',
-  ':security:keystore:BasicAndroidKeyStore:BasicAndroidKeyStore',
-  ':security:keystore:BasicAndroidKeyStore',
-  ':views:TextLinkify:TextLinkify',
-  ':views:TextLinkify',
-  ':background:alarms:repeatingAlarm',
-  ':background:alarms:repeatingAlarm:repeatingAlarmSample',
-  ':media:BasicMediaRouter:BasicMediaRouter',
-  ':media:BasicMediaRouter',
-  ':media:BasicMediaDecoder:BasicMediaDecoder',
-  ':media:BasicMediaDecoder',
-  ':media:MediaRecorder:MediaRecorder',
-  ':media:MediaRecorder',
-  ':input:multitouch:BasicMultitouch:BasicMultitouch',
-  ':input:multitouch:BasicMultitouch',
-  ':input:gestures:BasicGestureDetect:BasicGestureDetect',
-  ':input:gestures:BasicGestureDetect')