diff --git a/common/src/com/example/android/common/actionbarcompat/MultiSelectionUtil.java b/common/src/java/com/example/android/common/actionbarcompat/MultiSelectionUtil.java
similarity index 100%
rename from common/src/com/example/android/common/actionbarcompat/MultiSelectionUtil.java
rename to common/src/java/com/example/android/common/actionbarcompat/MultiSelectionUtil.java
diff --git a/common/src/com/example/android/common/dummydata/Cheeses.java b/common/src/java/com/example/android/common/dummydata/Cheeses.java
similarity index 100%
rename from common/src/com/example/android/common/dummydata/Cheeses.java
rename to common/src/java/com/example/android/common/dummydata/Cheeses.java
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/.gitignore b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/.gitignore
new file mode 100644
index 0000000..6eb878d
--- /dev/null
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/.gitignore
@@ -0,0 +1,16 @@
+# Copyright 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+src/template/
+src/common/
+build.gradle
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/proguard-project.txt b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/proguard-project.txt
new file mode 100644
index 0000000..0d8f171
--- /dev/null
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/proguard-project.txt
@@ -0,0 +1,20 @@
+ To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..800118c
--- /dev/null
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/AndroidManifest.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.actionbarcompat.listviewmodalselect"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <!--
+        ActionBarCompat provides an Action Bar from API v7 onwards
+    -->
+    <uses-sdk
+        android:minSdkVersion="7"
+        android:targetSdkVersion="17" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.AppCompat"
+        android:allowBackup="true">
+
+        <activity
+            android:name=".MainActivity">
+            <!-- Launcher Intent filter -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+
+</manifest>
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/src/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java
similarity index 99%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/src/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java
index 2ea9638..f8fed22 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/src/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java
@@ -15,9 +15,6 @@
  */
 package com.example.android.actionbarcompat.listviewmodalselect;
 
-import com.example.android.common.actionbarcompat.MultiSelectionUtil;
-import com.example.android.common.dummydata.Cheeses;
-
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
 import android.support.v7.app.ActionBarActivity;
@@ -29,6 +26,9 @@
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 
+import com.example.android.common.actionbarcompat.MultiSelectionUtil;
+import com.example.android.common.dummydata.Cheeses;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/src/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java
similarity index 96%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/src/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java
index 72afc56..ef278bd 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/src/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java
@@ -35,7 +35,7 @@
         super.onCreate(savedInstanceState);
 
         // Set content view (which contains a CheeseListFragment)
-        setContentView(R.layout.activity_main);
+        setContentView(R.layout.sample_main);
     }
 
 }
\ No newline at end of file
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/drawable-hdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/drawable-hdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/drawable-mdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/drawable-mdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/drawable-xhdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/drawable-xhdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/drawable-xxhdpi/ic_launcher.png b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/drawable/background_checked.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable/background_checked.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/drawable/background_checked.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/drawable/background_checked.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/layout/activity_main.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/layout/sample_main.xml
similarity index 96%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/layout/activity_main.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/layout/sample_main.xml
index 456cd19..5131c01 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/layout/activity_main.xml
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/layout/sample_main.xml
@@ -30,7 +30,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/intro_message"
+        android:text="@string/instructions"
         android:padding="16dp"
         android:textAppearance="?android:textAppearanceMedium"
         android:lineSpacingMultiplier="1.1"
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/layout/simple_selectable_list_item.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/layout/simple_selectable_list_item.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/layout/simple_selectable_list_item.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/layout/simple_selectable_list_item.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/menu/context_cheeses.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/menu/context_cheeses.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/menu/context_cheeses.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/menu/context_cheeses.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/values/colors.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/values/colors.xml
similarity index 100%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/values/colors.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/values/colors.xml
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/values/strings.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/values/strings.xml
similarity index 85%
rename from ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/values/strings.xml
rename to ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/values/strings.xml
index 1987fab..e9f785b 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/res/values/strings.xml
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/src/main/res/values/strings.xml
@@ -16,8 +16,7 @@
 -->
 <resources>
 
-    <string name="app_name">ABC ListView Modal</string>
-    <string name="intro_message">This sample demonstrates how to provide a
+    <string name="instructions">This sample demonstrates how to provide a
         <em>MULTIPLE_MODAL</em> ListView choice mode, compatible from API v7.
     </string>
     <string name="menu_remove">Remove</string>
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/tests/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..d4a31c9
--- /dev/null
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/tests/AndroidManifest.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2013 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.example.android.actionbarcompat.listviewmodalselect.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- We add an application tag here just so that we can indicate that
+         this package needs to link against the android.test library,
+         which is needed when building test cases. -->
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <!--
+    Specifies the instrumentation test runner used to run the tests.
+    -->
+    <instrumentation
+            android:name="android.test.InstrumentationTestRunner"
+            android:targetPackage="com.example.android.actionbarcompat.listviewmodalselect"
+            android:label="Tests for com.example.android.actionbarcompat.listviewmodalselect" />
+
+</manifest>
\ No newline at end of file
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java
new file mode 100644
index 0000000..9e592f5
--- /dev/null
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/ActionBarCompat-ListViewModalSelectSample/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java
@@ -0,0 +1,79 @@
+/*
+* Copyright 2013 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+
+
+/*
+* Copyright (C) 2013 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.example.android.actionbarcompat.listviewmodalselect.tests;
+
+import com.example.android.actionbarcompat.listviewmodalselect.*;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+/**
+* Tests for ActionBarCompat-ListViewModalSelect sample.
+*/
+public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
+
+    private MainActivity mTestActivity;
+    private ActionBarCompat-ListViewModalSelectFragment mTestFragment;
+
+    public SampleTests() {
+        super(MainActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        // Starts the activity under test using the default Intent with:
+        // action = {@link Intent#ACTION_MAIN}
+        // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
+        // All other fields are null or empty.
+        mTestActivity = getActivity();
+        mTestFragment = (ActionBarCompat-ListViewModalSelectFragment)
+            mTestActivity.getSupportFragmentManager().getFragments().get(1);
+    }
+
+    /**
+    * Test if the test fixture has been set up correctly.
+    */
+    public void testPreconditions() {
+        //Try to add a message to add context to your assertions. These messages will be shown if
+        //a tests fails and make it easy to understand why a test failed
+        assertNotNull("mTestActivity is null", mTestActivity);
+        assertNotNull("mTestFragment is null", mTestFragment);
+    }
+
+    /**
+    * Add more tests below.
+    */
+
+}
\ No newline at end of file
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/big_icon.png b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/big_icon.png
deleted file mode 100644
index 0f47486..0000000
--- a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/big_icon.png
+++ /dev/null
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/build.gradle b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/build.gradle
index 46996c6..be1fa82 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/build.gradle
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/build.gradle
@@ -1,25 +1,14 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
 
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
-    }
+
+
+
+// BEGIN_EXCLUDE
+import com.example.android.samples.build.SampleGenPlugin
+apply plugin: SampleGenPlugin
+
+samplegen {
+  pathToBuild "../../../../../build"
+  pathToSamplesCommon "../../../common"
 }
-
-apply plugin: 'android'
-
-dependencies {
-    compile "com.android.support:appcompat-v7:+"
-}
-
-android {
-    compileSdkVersion 17
-    buildToolsVersion "18.0.1"
-
-    defaultConfig {
-        minSdkVersion 7
-        targetSdkVersion 16
-    }
-}
+apply from: "../../../../../build/build.gradle"
+// END_EXCLUDE
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/buildSrc/build.gradle b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/buildSrc/build.gradle
new file mode 100644
index 0000000..e344a8c
--- /dev/null
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/buildSrc/build.gradle
@@ -0,0 +1,18 @@
+
+
+
+repositories {
+    mavenCentral()
+}
+dependencies {
+    compile 'org.freemarker:freemarker:2.3.20'
+}
+
+sourceSets {
+    main {
+        groovy {
+            srcDir new File(rootDir, "../../../../../../build/buildSrc/src/main/groovy")
+        }
+    }
+}
+
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/gradle/wrapper/gradle-wrapper.jar b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..8c0fb64
--- /dev/null
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/gradle/wrapper/gradle-wrapper.properties b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..861eddc
--- /dev/null
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/gradlew b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/gradlew.bat b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/settings.gradle b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/settings.gradle
new file mode 100644
index 0000000..cbe6e29
--- /dev/null
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/settings.gradle
@@ -0,0 +1,4 @@
+
+
+
+include 'ActionBarCompat-ListViewModalSelectSample'
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/AndroidManifest.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/AndroidManifest.xml
deleted file mode 100644
index 1ca1c5d..0000000
--- a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.actionbarcompat.listviewmodalselect"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <!--
-        ActionBarCompat provides an Action Bar from API v7 onwards
-    -->
-    <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="17" />
-
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat"
-        android:allowBackup="true">
-
-        <activity
-            android:name=".MainActivity">
-            <!-- Launcher Intent filter -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/template-params.xml b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/template-params.xml
new file mode 100644
index 0000000..b0d371e
--- /dev/null
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/template-params.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+
+<sample>
+    <name>ActionBarCompat-ListViewModalSelect</name>
+    <group>UI</group>
+    <package>com.example.android.actionbarcompat.listviewmodalselect</package>
+
+    <dependency>com.android.support:appcompat-v7:18.0.+</dependency>
+
+    <!-- change minSdk if needed-->
+    <minSdk>7</minSdk>
+
+    <strings>
+        <intro>
+           <![CDATA[
+           This sample shows you how a provide a ListView which allows the user to select multiple
+           items in a modal selection mode with ActionBarCompat, backwards compatible to API v7.
+           ]]>
+        </intro>
+    </strings>
+
+    <template src="base"/>
+    <common src="actionbarcompat"/>
+    <common src="dummydata"/>
+</sample>