diff --git a/samples/viewhost/.gitignore b/samples/externalviews/viewhost/.gitignore
similarity index 100%
rename from samples/viewhost/.gitignore
rename to samples/externalviews/viewhost/.gitignore
diff --git a/samples/viewhost/Android.mk b/samples/externalviews/viewhost/Android.mk
similarity index 100%
rename from samples/viewhost/Android.mk
rename to samples/externalviews/viewhost/Android.mk
diff --git a/samples/viewhost/AndroidManifest.xml b/samples/externalviews/viewhost/AndroidManifest.xml
similarity index 100%
rename from samples/viewhost/AndroidManifest.xml
rename to samples/externalviews/viewhost/AndroidManifest.xml
diff --git a/samples/viewhost/res/layout/activity_main.xml b/samples/externalviews/viewhost/res/layout/activity_main.xml
similarity index 100%
rename from samples/viewhost/res/layout/activity_main.xml
rename to samples/externalviews/viewhost/res/layout/activity_main.xml
diff --git a/samples/viewhost/res/mipmap-hdpi/ic_launcher.png b/samples/externalviews/viewhost/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from samples/viewhost/res/mipmap-hdpi/ic_launcher.png
rename to samples/externalviews/viewhost/res/mipmap-hdpi/ic_launcher.png
diff --git a/samples/viewhost/res/mipmap-mdpi/ic_launcher.png b/samples/externalviews/viewhost/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from samples/viewhost/res/mipmap-mdpi/ic_launcher.png
rename to samples/externalviews/viewhost/res/mipmap-mdpi/ic_launcher.png
diff --git a/samples/viewhost/res/mipmap-xhdpi/ic_launcher.png b/samples/externalviews/viewhost/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from samples/viewhost/res/mipmap-xhdpi/ic_launcher.png
rename to samples/externalviews/viewhost/res/mipmap-xhdpi/ic_launcher.png
diff --git a/samples/viewhost/res/mipmap-xxhdpi/ic_launcher.png b/samples/externalviews/viewhost/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from samples/viewhost/res/mipmap-xxhdpi/ic_launcher.png
rename to samples/externalviews/viewhost/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/samples/viewhost/res/values-v21/styles.xml b/samples/externalviews/viewhost/res/values-v21/styles.xml
similarity index 100%
rename from samples/viewhost/res/values-v21/styles.xml
rename to samples/externalviews/viewhost/res/values-v21/styles.xml
diff --git a/samples/viewhost/res/values-w820dp/dimens.xml b/samples/externalviews/viewhost/res/values-w820dp/dimens.xml
similarity index 100%
rename from samples/viewhost/res/values-w820dp/dimens.xml
rename to samples/externalviews/viewhost/res/values-w820dp/dimens.xml
diff --git a/samples/viewhost/res/values/dimens.xml b/samples/externalviews/viewhost/res/values/dimens.xml
similarity index 100%
rename from samples/viewhost/res/values/dimens.xml
rename to samples/externalviews/viewhost/res/values/dimens.xml
diff --git a/samples/viewhost/res/values/strings.xml b/samples/externalviews/viewhost/res/values/strings.xml
similarity index 100%
rename from samples/viewhost/res/values/strings.xml
rename to samples/externalviews/viewhost/res/values/strings.xml
diff --git a/samples/viewhost/res/values/styles.xml b/samples/externalviews/viewhost/res/values/styles.xml
similarity index 100%
rename from samples/viewhost/res/values/styles.xml
rename to samples/externalviews/viewhost/res/values/styles.xml
diff --git a/samples/viewhost/src/org/cyanogenmod/samples/extviewhost/MainActivity.java b/samples/externalviews/viewhost/src/org/cyanogenmod/samples/extviewhost/MainActivity.java
similarity index 100%
rename from samples/viewhost/src/org/cyanogenmod/samples/extviewhost/MainActivity.java
rename to samples/externalviews/viewhost/src/org/cyanogenmod/samples/extviewhost/MainActivity.java
diff --git a/samples/viewprovider/Android.mk b/samples/externalviews/viewprovider/Android.mk
similarity index 100%
rename from samples/viewprovider/Android.mk
rename to samples/externalviews/viewprovider/Android.mk
diff --git a/samples/viewprovider/AndroidManifest.xml b/samples/externalviews/viewprovider/AndroidManifest.xml
similarity index 100%
rename from samples/viewprovider/AndroidManifest.xml
rename to samples/externalviews/viewprovider/AndroidManifest.xml
diff --git a/samples/viewprovider/res/drawable-hdpi/ic_launcher.png b/samples/externalviews/viewprovider/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from samples/viewprovider/res/drawable-hdpi/ic_launcher.png
rename to samples/externalviews/viewprovider/res/drawable-hdpi/ic_launcher.png
diff --git a/samples/viewprovider/res/drawable-ldpi/ic_launcher.png b/samples/externalviews/viewprovider/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from samples/viewprovider/res/drawable-ldpi/ic_launcher.png
rename to samples/externalviews/viewprovider/res/drawable-ldpi/ic_launcher.png
diff --git a/samples/viewprovider/res/drawable-mdpi/ic_launcher.png b/samples/externalviews/viewprovider/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from samples/viewprovider/res/drawable-mdpi/ic_launcher.png
rename to samples/externalviews/viewprovider/res/drawable-mdpi/ic_launcher.png
diff --git a/samples/viewprovider/res/drawable-xhdpi/ic_launcher.png b/samples/externalviews/viewprovider/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from samples/viewprovider/res/drawable-xhdpi/ic_launcher.png
rename to samples/externalviews/viewprovider/res/drawable-xhdpi/ic_launcher.png
diff --git a/samples/viewprovider/res/layout/main.xml b/samples/externalviews/viewprovider/res/layout/main.xml
similarity index 100%
rename from samples/viewprovider/res/layout/main.xml
rename to samples/externalviews/viewprovider/res/layout/main.xml
diff --git a/samples/viewprovider/res/values/strings.xml b/samples/externalviews/viewprovider/res/values/strings.xml
similarity index 100%
rename from samples/viewprovider/res/values/strings.xml
rename to samples/externalviews/viewprovider/res/values/strings.xml
diff --git a/samples/viewprovider/src/org/cyanogenmod/samples/extview/SampleProviderService.java b/samples/externalviews/viewprovider/src/org/cyanogenmod/samples/extview/SampleProviderService.java
similarity index 100%
rename from samples/viewprovider/src/org/cyanogenmod/samples/extview/SampleProviderService.java
rename to samples/externalviews/viewprovider/src/org/cyanogenmod/samples/extview/SampleProviderService.java