diff --git a/demo/README.md b/demos/main/README.md
similarity index 100%
rename from demo/README.md
rename to demos/main/README.md
diff --git a/demo/build.gradle b/demos/main/build.gradle
similarity index 100%
rename from demo/build.gradle
rename to demos/main/build.gradle
diff --git a/demo/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
similarity index 100%
rename from demo/src/main/AndroidManifest.xml
rename to demos/main/src/main/AndroidManifest.xml
diff --git a/demo/src/main/assets/media.exolist.json b/demos/main/src/main/assets/media.exolist.json
similarity index 100%
rename from demo/src/main/assets/media.exolist.json
rename to demos/main/src/main/assets/media.exolist.json
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
similarity index 100%
rename from demo/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/DemoUtil.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoUtil.java
similarity index 100%
rename from demo/src/main/java/com/google/android/exoplayer2/demo/DemoUtil.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoUtil.java
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
similarity index 100%
rename from demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
similarity index 100%
rename from demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
similarity index 100%
rename from demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java
similarity index 100%
rename from demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java
diff --git a/demo/src/main/res/drawable-xhdpi/ic_banner.png b/demos/main/src/main/res/drawable-xhdpi/ic_banner.png
similarity index 100%
rename from demo/src/main/res/drawable-xhdpi/ic_banner.png
rename to demos/main/src/main/res/drawable-xhdpi/ic_banner.png
diff --git a/demo/src/main/res/layout/list_divider.xml b/demos/main/src/main/res/layout/list_divider.xml
similarity index 100%
rename from demo/src/main/res/layout/list_divider.xml
rename to demos/main/src/main/res/layout/list_divider.xml
diff --git a/demo/src/main/res/layout/player_activity.xml b/demos/main/src/main/res/layout/player_activity.xml
similarity index 100%
rename from demo/src/main/res/layout/player_activity.xml
rename to demos/main/src/main/res/layout/player_activity.xml
diff --git a/demo/src/main/res/layout/sample_chooser_activity.xml b/demos/main/src/main/res/layout/sample_chooser_activity.xml
similarity index 100%
rename from demo/src/main/res/layout/sample_chooser_activity.xml
rename to demos/main/src/main/res/layout/sample_chooser_activity.xml
diff --git a/demo/src/main/res/layout/track_selection_dialog.xml b/demos/main/src/main/res/layout/track_selection_dialog.xml
similarity index 100%
rename from demo/src/main/res/layout/track_selection_dialog.xml
rename to demos/main/src/main/res/layout/track_selection_dialog.xml
diff --git a/demo/src/main/res/mipmap-hdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from demo/src/main/res/mipmap-hdpi/ic_launcher.png
rename to demos/main/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/demo/src/main/res/mipmap-mdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from demo/src/main/res/mipmap-mdpi/ic_launcher.png
rename to demos/main/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/demo/src/main/res/mipmap-xhdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from demo/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to demos/main/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/demo/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from demo/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to demos/main/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/demo/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from demo/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to demos/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/demo/src/main/res/values/strings.xml b/demos/main/src/main/res/values/strings.xml
similarity index 100%
rename from demo/src/main/res/values/strings.xml
rename to demos/main/src/main/res/values/strings.xml
diff --git a/demo/src/main/res/values/styles.xml b/demos/main/src/main/res/values/styles.xml
similarity index 100%
rename from demo/src/main/res/values/styles.xml
rename to demos/main/src/main/res/values/styles.xml
diff --git a/settings.gradle b/settings.gradle
index fb31055f5e..766d46bbae 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ if (gradle.ext.has('exoplayerModulePrefix')) {
 
 include modulePrefix + 'demo'
 include modulePrefix + 'playbacktests'
-project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demo')
+project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demos/main')
 project(modulePrefix + 'playbacktests').projectDir = new File(rootDir, 'playbacktests')
 
 apply from: 'core_settings.gradle'