diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..03c9604
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,10 @@
+This directory contains samples that are distributed with the Android SDK.
+
+New top level directories (categories) are not automatically published. If
+you are adding a new category, you will need to add it to
+develpment/build/sdk.atree.
+
+Note: In the future, the samples will be built using a template system, which
+will automatically import the "common" directory as needed. Until then, if
+you need access to the "common" directory, you will need to have it copied
+during the SDK build process by modifying development/build/sdk.atree.
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/build.gradle b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/build.gradle
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/build.gradle
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/build.gradle
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/AndroidManifest.xml b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/AndroidManifest.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/AndroidManifest.xml
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/AndroidManifest.xml
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/SimpleTextFragment.java b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/SimpleTextFragment.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/SimpleTextFragment.java
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/SimpleTextFragment.java
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/Log.java b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/Log.java
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/Log.java
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogNode.java b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogNode.java
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogView.java b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogView.java
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogWrapper.java b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/LogFragment.java b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/LogFragment.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/LogFragment.java
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/LogFragment.java
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/MainActivity.java b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/MainActivity.java
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/MainActivity.java
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/java/com/example/android/networkbasic/MainActivity.java
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-hdpi/ic_launcher.png b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-hdpi/ic_launcher.png
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-mdpi/ic_launcher.png b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-mdpi/ic_launcher.png
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-xhdpi/ic_launcher.png b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-xhdpi/ic_launcher.png
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/layout/activity_main.xml b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/layout/activity_main.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/layout/activity_main.xml
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/layout/activity_main.xml
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/layout/log_fragment.xml b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/layout/log_fragment.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/layout/log_fragment.xml
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/layout/log_fragment.xml
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/menu/main.xml b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/menu/main.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/menu/main.xml
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/menu/main.xml
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values-sw600dp/styles.xml b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values-sw600dp/styles.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values-sw600dp/styles.xml
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values-sw600dp/styles.xml
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values-v11/styles.xml b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values-v11/styles.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values-v11/styles.xml
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values-v11/styles.xml
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/dimens.xml b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/dimens.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/dimens.xml
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/dimens.xml
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/strings.xml b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/strings.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/strings.xml
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/strings.xml
diff --git a/connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/styles.xml b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/styles.xml
similarity index 100%
rename from connectivity/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/styles.xml
rename to connectivity/network/BasicNetworkDemo/BasicNetworkDemo/src/main/res/values/styles.xml
diff --git a/connectivity/BasicNetworkDemo/README.txt b/connectivity/network/BasicNetworkDemo/README.txt
similarity index 100%
rename from connectivity/BasicNetworkDemo/README.txt
rename to connectivity/network/BasicNetworkDemo/README.txt
diff --git a/connectivity/BasicNetworkDemo/build.gradle b/connectivity/network/BasicNetworkDemo/build.gradle
similarity index 100%
rename from connectivity/BasicNetworkDemo/build.gradle
rename to connectivity/network/BasicNetworkDemo/build.gradle
diff --git a/connectivity/BasicNetworkDemo/gradle/wrapper/gradle-wrapper.jar b/connectivity/network/BasicNetworkDemo/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from connectivity/BasicNetworkDemo/gradle/wrapper/gradle-wrapper.jar
rename to connectivity/network/BasicNetworkDemo/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/connectivity/BasicNetworkDemo/gradle/wrapper/gradle-wrapper.properties b/connectivity/network/BasicNetworkDemo/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from connectivity/BasicNetworkDemo/gradle/wrapper/gradle-wrapper.properties
rename to connectivity/network/BasicNetworkDemo/gradle/wrapper/gradle-wrapper.properties
diff --git a/connectivity/BasicNetworkDemo/gradlew b/connectivity/network/BasicNetworkDemo/gradlew
similarity index 100%
rename from connectivity/BasicNetworkDemo/gradlew
rename to connectivity/network/BasicNetworkDemo/gradlew
diff --git a/connectivity/BasicNetworkDemo/gradlew.bat b/connectivity/network/BasicNetworkDemo/gradlew.bat
similarity index 100%
rename from connectivity/BasicNetworkDemo/gradlew.bat
rename to connectivity/network/BasicNetworkDemo/gradlew.bat
diff --git a/connectivity/BasicNetworkDemo/settings.gradle b/connectivity/network/BasicNetworkDemo/settings.gradle
similarity index 100%
rename from connectivity/BasicNetworkDemo/settings.gradle
rename to connectivity/network/BasicNetworkDemo/settings.gradle
diff --git a/connectivity/NetworkConnect/NetworkConnect/build.gradle b/connectivity/network/NetworkConnect/NetworkConnect/build.gradle
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/build.gradle
rename to connectivity/network/NetworkConnect/NetworkConnect/build.gradle
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/AndroidManifest.xml b/connectivity/network/NetworkConnect/NetworkConnect/src/main/AndroidManifest.xml
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/AndroidManifest.xml
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/AndroidManifest.xml
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/SimpleTextFragment.java b/connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/SimpleTextFragment.java
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/SimpleTextFragment.java
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/SimpleTextFragment.java
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/Log.java b/connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/Log.java
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/Log.java
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogNode.java b/connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogNode.java
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogView.java b/connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogView.java
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogWrapper.java b/connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/networkconnect/LogFragment.java b/connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/networkconnect/LogFragment.java
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/networkconnect/LogFragment.java
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/networkconnect/LogFragment.java
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/networkconnect/MainActivity.java b/connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/networkconnect/MainActivity.java
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/java/com/example/android/networkconnect/MainActivity.java
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/java/com/example/android/networkconnect/MainActivity.java
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-hdpi/ic_launcher.png b/connectivity/network/NetworkConnect/NetworkConnect/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-hdpi/ic_launcher.png
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-mdpi/ic_launcher.png b/connectivity/network/NetworkConnect/NetworkConnect/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-mdpi/ic_launcher.png
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-xhdpi/ic_launcher.png b/connectivity/network/NetworkConnect/NetworkConnect/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-xhdpi/ic_launcher.png
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectivity/network/NetworkConnect/NetworkConnect/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/res/layout/activity_main.xml b/connectivity/network/NetworkConnect/NetworkConnect/src/main/res/layout/activity_main.xml
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/res/layout/activity_main.xml
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/res/layout/activity_main.xml
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/res/layout/log_fragment.xml b/connectivity/network/NetworkConnect/NetworkConnect/src/main/res/layout/log_fragment.xml
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/res/layout/log_fragment.xml
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/res/layout/log_fragment.xml
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/res/menu/main.xml b/connectivity/network/NetworkConnect/NetworkConnect/src/main/res/menu/main.xml
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/res/menu/main.xml
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/res/menu/main.xml
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/res/values-sw600dp/styles.xml b/connectivity/network/NetworkConnect/NetworkConnect/src/main/res/values-sw600dp/styles.xml
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/res/values-sw600dp/styles.xml
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/res/values-sw600dp/styles.xml
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/res/values-v11/styles.xml b/connectivity/network/NetworkConnect/NetworkConnect/src/main/res/values-v11/styles.xml
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/res/values-v11/styles.xml
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/res/values-v11/styles.xml
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/res/values/dimens.xml b/connectivity/network/NetworkConnect/NetworkConnect/src/main/res/values/dimens.xml
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/res/values/dimens.xml
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/res/values/dimens.xml
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/res/values/strings.xml b/connectivity/network/NetworkConnect/NetworkConnect/src/main/res/values/strings.xml
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/res/values/strings.xml
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/res/values/strings.xml
diff --git a/connectivity/NetworkConnect/NetworkConnect/src/main/res/values/styles.xml b/connectivity/network/NetworkConnect/NetworkConnect/src/main/res/values/styles.xml
similarity index 100%
rename from connectivity/NetworkConnect/NetworkConnect/src/main/res/values/styles.xml
rename to connectivity/network/NetworkConnect/NetworkConnect/src/main/res/values/styles.xml
diff --git a/connectivity/NetworkConnect/README.txt b/connectivity/network/NetworkConnect/README.txt
similarity index 100%
rename from connectivity/NetworkConnect/README.txt
rename to connectivity/network/NetworkConnect/README.txt
diff --git a/connectivity/NetworkConnect/build.gradle b/connectivity/network/NetworkConnect/build.gradle
similarity index 100%
rename from connectivity/NetworkConnect/build.gradle
rename to connectivity/network/NetworkConnect/build.gradle
diff --git a/connectivity/NetworkConnect/gradle/wrapper/gradle-wrapper.jar b/connectivity/network/NetworkConnect/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from connectivity/NetworkConnect/gradle/wrapper/gradle-wrapper.jar
rename to connectivity/network/NetworkConnect/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/connectivity/NetworkConnect/gradle/wrapper/gradle-wrapper.properties b/connectivity/network/NetworkConnect/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from connectivity/NetworkConnect/gradle/wrapper/gradle-wrapper.properties
rename to connectivity/network/NetworkConnect/gradle/wrapper/gradle-wrapper.properties
diff --git a/connectivity/NetworkConnect/gradlew b/connectivity/network/NetworkConnect/gradlew
similarity index 100%
rename from connectivity/NetworkConnect/gradlew
rename to connectivity/network/NetworkConnect/gradlew
diff --git a/connectivity/NetworkConnect/gradlew.bat b/connectivity/network/NetworkConnect/gradlew.bat
similarity index 100%
rename from connectivity/NetworkConnect/gradlew.bat
rename to connectivity/network/NetworkConnect/gradlew.bat
diff --git a/connectivity/NetworkConnect/settings.gradle b/connectivity/network/NetworkConnect/settings.gradle
similarity index 100%
rename from connectivity/NetworkConnect/settings.gradle
rename to connectivity/network/NetworkConnect/settings.gradle
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/build.gradle b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/build.gradle
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/build.gradle
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/build.gradle
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/AndroidManifest.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/AndroidManifest.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/AndroidManifest.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/AndroidManifest.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/EntryListActivity.java b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/EntryListActivity.java
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/EntryListActivity.java
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/EntryListActivity.java
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/EntryListFragment.java b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/EntryListFragment.java
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/EntryListFragment.java
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/EntryListFragment.java
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/SyncAdapter.java b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/SyncAdapter.java
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/SyncAdapter.java
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/SyncAdapter.java
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/SyncService.java b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/SyncService.java
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/SyncService.java
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/SyncService.java
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/SyncUtils.java b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/SyncUtils.java
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/SyncUtils.java
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/SyncUtils.java
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/net/FeedParser.java b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/net/FeedParser.java
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/net/FeedParser.java
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/net/FeedParser.java
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/provider/FeedContract.java b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/provider/FeedContract.java
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/provider/FeedContract.java
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/provider/FeedContract.java
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/provider/FeedProvider.java b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/provider/FeedProvider.java
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/provider/FeedProvider.java
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/network/sync/basicsyncadapter/provider/FeedProvider.java
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-hdpi/ic_launcher.png b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-hdpi/ic_launcher.png
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-mdpi/ic_launcher.png b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-mdpi/ic_launcher.png
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-xhdpi/ic_action_refresh.png b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files differ
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-xhdpi/ic_launcher.png b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-xhdpi/ic_launcher.png
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/layout/actionbar_indeterminate_progress.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/layout/actionbar_indeterminate_progress.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/layout/actionbar_indeterminate_progress.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/layout/actionbar_indeterminate_progress.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/layout/activity_entry_list.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/layout/activity_entry_list.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/layout/activity_entry_list.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/layout/activity_entry_list.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/menu/main.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/menu/main.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/menu/main.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/menu/main.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values-v11/styles.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values-v11/styles.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values-v11/styles.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values-v11/styles.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values-v14/styles.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values-v14/styles.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values-v14/styles.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values-v14/styles.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/attrs.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/attrs.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/attrs.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/attrs.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/dimen.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/dimen.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/dimen.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/dimen.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/strings.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/strings.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/strings.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/strings.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/styles.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/styles.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/styles.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/values/styles.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/xml/authenticator.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/xml/authenticator.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/xml/authenticator.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/xml/authenticator.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/xml/syncadapter.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/xml/syncadapter.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/res/xml/syncadapter.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/src/main/res/xml/syncadapter.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapterTests/AndroidManifest.xml b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterTests/AndroidManifest.xml
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapterTests/AndroidManifest.xml
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapterTests/AndroidManifest.xml
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapterTests/proguard-project.txt b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterTests/proguard-project.txt
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapterTests/proguard-project.txt
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapterTests/proguard-project.txt
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapterTests/src/com/example/android/network/sync/basicsyncadapter/SyncAdapterTest.java b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterTests/src/com/example/android/network/sync/basicsyncadapter/SyncAdapterTest.java
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapterTests/src/com/example/android/network/sync/basicsyncadapter/SyncAdapterTest.java
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapterTests/src/com/example/android/network/sync/basicsyncadapter/SyncAdapterTest.java
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapterTests/src/com/example/android/network/sync/basicsyncadapter/net/FeedParserTest.java b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterTests/src/com/example/android/network/sync/basicsyncadapter/net/FeedParserTest.java
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapterTests/src/com/example/android/network/sync/basicsyncadapter/net/FeedParserTest.java
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapterTests/src/com/example/android/network/sync/basicsyncadapter/net/FeedParserTest.java
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapterTests/src/com/example/android/network/sync/basicsyncadapter/provider/FeedProviderTest.java b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapterTests/src/com/example/android/network/sync/basicsyncadapter/provider/FeedProviderTest.java
similarity index 100%
rename from connectivity/BasicSyncAdapter/BasicSyncAdapterTests/src/com/example/android/network/sync/basicsyncadapter/provider/FeedProviderTest.java
rename to connectivity/sync/BasicSyncAdapter/BasicSyncAdapterTests/src/com/example/android/network/sync/basicsyncadapter/provider/FeedProviderTest.java
diff --git a/connectivity/BasicSyncAdapter/README.txt b/connectivity/sync/BasicSyncAdapter/README.txt
similarity index 100%
rename from connectivity/BasicSyncAdapter/README.txt
rename to connectivity/sync/BasicSyncAdapter/README.txt
diff --git a/connectivity/BasicSyncAdapter/build.gradle b/connectivity/sync/BasicSyncAdapter/build.gradle
similarity index 100%
rename from connectivity/BasicSyncAdapter/build.gradle
rename to connectivity/sync/BasicSyncAdapter/build.gradle
diff --git a/connectivity/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.jar b/connectivity/sync/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from connectivity/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.jar
rename to connectivity/sync/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/connectivity/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties b/connectivity/sync/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from connectivity/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties
rename to connectivity/sync/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties
diff --git a/connectivity/BasicSyncAdapter/gradlew b/connectivity/sync/BasicSyncAdapter/gradlew
similarity index 100%
rename from connectivity/BasicSyncAdapter/gradlew
rename to connectivity/sync/BasicSyncAdapter/gradlew
diff --git a/connectivity/BasicSyncAdapter/gradlew.bat b/connectivity/sync/BasicSyncAdapter/gradlew.bat
similarity index 100%
rename from connectivity/BasicSyncAdapter/gradlew.bat
rename to connectivity/sync/BasicSyncAdapter/gradlew.bat
diff --git a/connectivity/BasicSyncAdapter/settings.gradle b/connectivity/sync/BasicSyncAdapter/settings.gradle
similarity index 100%
rename from connectivity/BasicSyncAdapter/settings.gradle
rename to connectivity/sync/BasicSyncAdapter/settings.gradle