Move ExoPlayer code into the tree directory am: 662958f0b3 am: 0c964584b3 am: 13f18254bf

Change-Id: I1fe2b0c9b94d6b3bbb6d41d32870e20d68a08253
diff --git a/Android.bp b/Android.bp
index 8143365..979740f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,10 +17,10 @@
 // Exposes ExoPlayer classes required for implementing the MediaParser API.
 android_library {
     name: "exoplayer2-extractor",
-    manifest: "library/extractor/src/main/AndroidManifest.xml",
+    manifest: "tree/library/extractor/src/main/AndroidManifest.xml",
     srcs: [
-        "library/extractor/src/main/java/**/*.java",
-        "library/common/src/main/java/**/*.java",
+        "tree/library/extractor/src/main/java/**/*.java",
+        "tree/library/common/src/main/java/**/*.java",
     ],
     sdk_version: "29", // Needs to be a prebuilt, so not "current".
     static_libs: [
@@ -45,15 +45,15 @@
 // Exposes util classes for testing MediaParser.
 android_library {
     name: "exoplayer2-extractor-test-utils",
-    manifest: "library/extractor/src/test/AndroidManifest.xml",
+    manifest: "tree/library/extractor/src/test/AndroidManifest.xml",
     srcs: [
-        "testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java",
-        "testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java",
-        "testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java",
-        "testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java",
-        "testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java",
-        "library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java",
-        "library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java",
+        "tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java",
+        "tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java",
+        "tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java",
+        "tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java",
+        "tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java",
+        "tree/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java",
+        "tree/library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java",
     ],
     sdk_version: "29",
     static_libs: [
@@ -72,11 +72,11 @@
 // Exposes the assets for testing MediaParser.
 android_library {
     name: "exoplayer2-extractor-tests-assets",
-    manifest: "library/extractor/src/main/AndroidManifest.xml",
+    manifest: "tree/library/extractor/src/main/AndroidManifest.xml",
     srcs: [],
     sdk_version: "29",
     visibility: ["//cts/tests/tests/mediaparser:__subpackages__"],
-    asset_dirs: ["library/extractor/src/test/assets"],
+    asset_dirs: ["tree/library/extractor/src/test/assets"],
     // Do not compress media files.
     aaptflags: [
         "-0 .ac3",
diff --git a/CONTRIBUTING.md b/tree/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to tree/CONTRIBUTING.md
diff --git a/README.md b/tree/README.md
similarity index 100%
rename from README.md
rename to tree/README.md
diff --git a/RELEASENOTES.md b/tree/RELEASENOTES.md
similarity index 100%
rename from RELEASENOTES.md
rename to tree/RELEASENOTES.md
diff --git a/build.gradle b/tree/build.gradle
similarity index 100%
rename from build.gradle
rename to tree/build.gradle
diff --git a/constants.gradle b/tree/constants.gradle
similarity index 100%
rename from constants.gradle
rename to tree/constants.gradle
diff --git a/core_settings.gradle b/tree/core_settings.gradle
similarity index 100%
rename from core_settings.gradle
rename to tree/core_settings.gradle
diff --git a/demos/README.md b/tree/demos/README.md
similarity index 100%
rename from demos/README.md
rename to tree/demos/README.md
diff --git a/demos/cast/README.md b/tree/demos/cast/README.md
similarity index 100%
rename from demos/cast/README.md
rename to tree/demos/cast/README.md
diff --git a/demos/cast/build.gradle b/tree/demos/cast/build.gradle
similarity index 100%
rename from demos/cast/build.gradle
rename to tree/demos/cast/build.gradle
diff --git a/demos/cast/proguard-rules.txt b/tree/demos/cast/proguard-rules.txt
similarity index 100%
rename from demos/cast/proguard-rules.txt
rename to tree/demos/cast/proguard-rules.txt
diff --git a/demos/cast/src/main/AndroidManifest.xml b/tree/demos/cast/src/main/AndroidManifest.xml
similarity index 100%
rename from demos/cast/src/main/AndroidManifest.xml
rename to tree/demos/cast/src/main/AndroidManifest.xml
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java b/tree/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
similarity index 100%
rename from demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
rename to tree/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/tree/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
similarity index 100%
rename from demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
rename to tree/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/tree/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
similarity index 100%
rename from demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
rename to tree/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
diff --git a/demos/cast/src/main/res/drawable/ic_plus.xml b/tree/demos/cast/src/main/res/drawable/ic_plus.xml
similarity index 100%
rename from demos/cast/src/main/res/drawable/ic_plus.xml
rename to tree/demos/cast/src/main/res/drawable/ic_plus.xml
diff --git a/demos/cast/src/main/res/layout/cast_context_error.xml b/tree/demos/cast/src/main/res/layout/cast_context_error.xml
similarity index 100%
rename from demos/cast/src/main/res/layout/cast_context_error.xml
rename to tree/demos/cast/src/main/res/layout/cast_context_error.xml
diff --git a/demos/cast/src/main/res/layout/main_activity.xml b/tree/demos/cast/src/main/res/layout/main_activity.xml
similarity index 100%
rename from demos/cast/src/main/res/layout/main_activity.xml
rename to tree/demos/cast/src/main/res/layout/main_activity.xml
diff --git a/demos/cast/src/main/res/layout/sample_list.xml b/tree/demos/cast/src/main/res/layout/sample_list.xml
similarity index 100%
rename from demos/cast/src/main/res/layout/sample_list.xml
rename to tree/demos/cast/src/main/res/layout/sample_list.xml
diff --git a/demos/cast/src/main/res/menu/menu.xml b/tree/demos/cast/src/main/res/menu/menu.xml
similarity index 100%
rename from demos/cast/src/main/res/menu/menu.xml
rename to tree/demos/cast/src/main/res/menu/menu.xml
diff --git a/demos/cast/src/main/res/mipmap-hdpi/ic_launcher.png b/tree/demos/cast/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from demos/cast/src/main/res/mipmap-hdpi/ic_launcher.png
rename to tree/demos/cast/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/demos/cast/src/main/res/mipmap-mdpi/ic_launcher.png b/tree/demos/cast/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from demos/cast/src/main/res/mipmap-mdpi/ic_launcher.png
rename to tree/demos/cast/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/demos/cast/src/main/res/mipmap-xhdpi/ic_launcher.png b/tree/demos/cast/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from demos/cast/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to tree/demos/cast/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/demos/cast/src/main/res/mipmap-xxhdpi/ic_launcher.png b/tree/demos/cast/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from demos/cast/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to tree/demos/cast/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/demos/cast/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/tree/demos/cast/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from demos/cast/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to tree/demos/cast/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/demos/cast/src/main/res/values/strings.xml b/tree/demos/cast/src/main/res/values/strings.xml
similarity index 100%
rename from demos/cast/src/main/res/values/strings.xml
rename to tree/demos/cast/src/main/res/values/strings.xml
diff --git a/demos/main/README.md b/tree/demos/main/README.md
similarity index 100%
rename from demos/main/README.md
rename to tree/demos/main/README.md
diff --git a/demos/main/build.gradle b/tree/demos/main/build.gradle
similarity index 100%
rename from demos/main/build.gradle
rename to tree/demos/main/build.gradle
diff --git a/demos/main/proguard-rules.txt b/tree/demos/main/proguard-rules.txt
similarity index 100%
rename from demos/main/proguard-rules.txt
rename to tree/demos/main/proguard-rules.txt
diff --git a/demos/main/src/main/AndroidManifest.xml b/tree/demos/main/src/main/AndroidManifest.xml
similarity index 100%
rename from demos/main/src/main/AndroidManifest.xml
rename to tree/demos/main/src/main/AndroidManifest.xml
diff --git a/demos/main/src/main/assets/media.exolist.json b/tree/demos/main/src/main/assets/media.exolist.json
similarity index 100%
rename from demos/main/src/main/assets/media.exolist.json
rename to tree/demos/main/src/main/assets/media.exolist.json
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
similarity index 100%
rename from demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
rename to tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java b/tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
similarity index 100%
rename from demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
rename to tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoDownloadService.java
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
similarity index 100%
rename from demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
rename to tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
similarity index 100%
rename from demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
rename to tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/Sample.java b/tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/Sample.java
similarity index 100%
rename from demos/main/src/main/java/com/google/android/exoplayer2/demo/Sample.java
rename to tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/Sample.java
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
similarity index 100%
rename from demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
rename to tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
similarity index 100%
rename from demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
rename to tree/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
diff --git a/demos/main/src/main/res/drawable-hdpi/ic_download.png b/tree/demos/main/src/main/res/drawable-hdpi/ic_download.png
similarity index 100%
rename from demos/main/src/main/res/drawable-hdpi/ic_download.png
rename to tree/demos/main/src/main/res/drawable-hdpi/ic_download.png
Binary files differ
diff --git a/demos/main/src/main/res/drawable-hdpi/ic_download_done.png b/tree/demos/main/src/main/res/drawable-hdpi/ic_download_done.png
similarity index 100%
rename from demos/main/src/main/res/drawable-hdpi/ic_download_done.png
rename to tree/demos/main/src/main/res/drawable-hdpi/ic_download_done.png
Binary files differ
diff --git a/demos/main/src/main/res/drawable-mdpi/ic_download.png b/tree/demos/main/src/main/res/drawable-mdpi/ic_download.png
similarity index 100%
rename from demos/main/src/main/res/drawable-mdpi/ic_download.png
rename to tree/demos/main/src/main/res/drawable-mdpi/ic_download.png
Binary files differ
diff --git a/demos/main/src/main/res/drawable-mdpi/ic_download_done.png b/tree/demos/main/src/main/res/drawable-mdpi/ic_download_done.png
similarity index 100%
rename from demos/main/src/main/res/drawable-mdpi/ic_download_done.png
rename to tree/demos/main/src/main/res/drawable-mdpi/ic_download_done.png
Binary files differ
diff --git a/demos/main/src/main/res/drawable-xhdpi/ic_banner.png b/tree/demos/main/src/main/res/drawable-xhdpi/ic_banner.png
similarity index 100%
rename from demos/main/src/main/res/drawable-xhdpi/ic_banner.png
rename to tree/demos/main/src/main/res/drawable-xhdpi/ic_banner.png
Binary files differ
diff --git a/demos/main/src/main/res/drawable-xhdpi/ic_download.png b/tree/demos/main/src/main/res/drawable-xhdpi/ic_download.png
similarity index 100%
rename from demos/main/src/main/res/drawable-xhdpi/ic_download.png
rename to tree/demos/main/src/main/res/drawable-xhdpi/ic_download.png
Binary files differ
diff --git a/demos/main/src/main/res/drawable-xhdpi/ic_download_done.png b/tree/demos/main/src/main/res/drawable-xhdpi/ic_download_done.png
similarity index 100%
rename from demos/main/src/main/res/drawable-xhdpi/ic_download_done.png
rename to tree/demos/main/src/main/res/drawable-xhdpi/ic_download_done.png
Binary files differ
diff --git a/demos/main/src/main/res/drawable-xxhdpi/ic_download.png b/tree/demos/main/src/main/res/drawable-xxhdpi/ic_download.png
similarity index 100%
rename from demos/main/src/main/res/drawable-xxhdpi/ic_download.png
rename to tree/demos/main/src/main/res/drawable-xxhdpi/ic_download.png
Binary files differ
diff --git a/demos/main/src/main/res/drawable-xxhdpi/ic_download_done.png b/tree/demos/main/src/main/res/drawable-xxhdpi/ic_download_done.png
similarity index 100%
rename from demos/main/src/main/res/drawable-xxhdpi/ic_download_done.png
rename to tree/demos/main/src/main/res/drawable-xxhdpi/ic_download_done.png
Binary files differ
diff --git a/demos/main/src/main/res/drawable-xxxhdpi/ic_download.png b/tree/demos/main/src/main/res/drawable-xxxhdpi/ic_download.png
similarity index 100%
rename from demos/main/src/main/res/drawable-xxxhdpi/ic_download.png
rename to tree/demos/main/src/main/res/drawable-xxxhdpi/ic_download.png
Binary files differ
diff --git a/demos/main/src/main/res/drawable-xxxhdpi/ic_download_done.png b/tree/demos/main/src/main/res/drawable-xxxhdpi/ic_download_done.png
similarity index 100%
rename from demos/main/src/main/res/drawable-xxxhdpi/ic_download_done.png
rename to tree/demos/main/src/main/res/drawable-xxxhdpi/ic_download_done.png
Binary files differ
diff --git a/demos/main/src/main/res/layout/player_activity.xml b/tree/demos/main/src/main/res/layout/player_activity.xml
similarity index 100%
rename from demos/main/src/main/res/layout/player_activity.xml
rename to tree/demos/main/src/main/res/layout/player_activity.xml
diff --git a/demos/main/src/main/res/layout/sample_chooser_activity.xml b/tree/demos/main/src/main/res/layout/sample_chooser_activity.xml
similarity index 100%
rename from demos/main/src/main/res/layout/sample_chooser_activity.xml
rename to tree/demos/main/src/main/res/layout/sample_chooser_activity.xml
diff --git a/demos/main/src/main/res/layout/sample_list_item.xml b/tree/demos/main/src/main/res/layout/sample_list_item.xml
similarity index 100%
rename from demos/main/src/main/res/layout/sample_list_item.xml
rename to tree/demos/main/src/main/res/layout/sample_list_item.xml
diff --git a/demos/main/src/main/res/layout/track_selection_dialog.xml b/tree/demos/main/src/main/res/layout/track_selection_dialog.xml
similarity index 100%
rename from demos/main/src/main/res/layout/track_selection_dialog.xml
rename to tree/demos/main/src/main/res/layout/track_selection_dialog.xml
diff --git a/demos/main/src/main/res/menu/sample_chooser_menu.xml b/tree/demos/main/src/main/res/menu/sample_chooser_menu.xml
similarity index 100%
rename from demos/main/src/main/res/menu/sample_chooser_menu.xml
rename to tree/demos/main/src/main/res/menu/sample_chooser_menu.xml
diff --git a/demos/main/src/main/res/mipmap-hdpi/ic_launcher.png b/tree/demos/main/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from demos/main/src/main/res/mipmap-hdpi/ic_launcher.png
rename to tree/demos/main/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/demos/main/src/main/res/mipmap-mdpi/ic_launcher.png b/tree/demos/main/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from demos/main/src/main/res/mipmap-mdpi/ic_launcher.png
rename to tree/demos/main/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/demos/main/src/main/res/mipmap-xhdpi/ic_launcher.png b/tree/demos/main/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from demos/main/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to tree/demos/main/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/demos/main/src/main/res/mipmap-xxhdpi/ic_launcher.png b/tree/demos/main/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from demos/main/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to tree/demos/main/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/demos/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/tree/demos/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from demos/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to tree/demos/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/demos/main/src/main/res/values/strings.xml b/tree/demos/main/src/main/res/values/strings.xml
similarity index 100%
rename from demos/main/src/main/res/values/strings.xml
rename to tree/demos/main/src/main/res/values/strings.xml
diff --git a/demos/main/src/main/res/values/styles.xml b/tree/demos/main/src/main/res/values/styles.xml
similarity index 100%
rename from demos/main/src/main/res/values/styles.xml
rename to tree/demos/main/src/main/res/values/styles.xml
diff --git a/demos/surface/README.md b/tree/demos/surface/README.md
similarity index 100%
rename from demos/surface/README.md
rename to tree/demos/surface/README.md
diff --git a/demos/surface/build.gradle b/tree/demos/surface/build.gradle
similarity index 100%
rename from demos/surface/build.gradle
rename to tree/demos/surface/build.gradle
diff --git a/demos/surface/src/main/AndroidManifest.xml b/tree/demos/surface/src/main/AndroidManifest.xml
similarity index 100%
rename from demos/surface/src/main/AndroidManifest.xml
rename to tree/demos/surface/src/main/AndroidManifest.xml
diff --git a/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java b/tree/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java
similarity index 100%
rename from demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java
rename to tree/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java
diff --git a/demos/surface/src/main/res/layout/main_activity.xml b/tree/demos/surface/src/main/res/layout/main_activity.xml
similarity index 100%
rename from demos/surface/src/main/res/layout/main_activity.xml
rename to tree/demos/surface/src/main/res/layout/main_activity.xml
diff --git a/demos/surface/src/main/res/mipmap-hdpi/ic_launcher.png b/tree/demos/surface/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from demos/surface/src/main/res/mipmap-hdpi/ic_launcher.png
rename to tree/demos/surface/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/demos/surface/src/main/res/mipmap-mdpi/ic_launcher.png b/tree/demos/surface/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from demos/surface/src/main/res/mipmap-mdpi/ic_launcher.png
rename to tree/demos/surface/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/demos/surface/src/main/res/mipmap-xhdpi/ic_launcher.png b/tree/demos/surface/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from demos/surface/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to tree/demos/surface/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/demos/surface/src/main/res/mipmap-xxhdpi/ic_launcher.png b/tree/demos/surface/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from demos/surface/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to tree/demos/surface/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/demos/surface/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/tree/demos/surface/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from demos/surface/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to tree/demos/surface/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/demos/surface/src/main/res/values/strings.xml b/tree/demos/surface/src/main/res/values/strings.xml
similarity index 100%
rename from demos/surface/src/main/res/values/strings.xml
rename to tree/demos/surface/src/main/res/values/strings.xml
diff --git a/extensions/README.md b/tree/extensions/README.md
similarity index 100%
rename from extensions/README.md
rename to tree/extensions/README.md
diff --git a/extensions/av1/README.md b/tree/extensions/av1/README.md
similarity index 100%
rename from extensions/av1/README.md
rename to tree/extensions/av1/README.md
diff --git a/extensions/av1/build.gradle b/tree/extensions/av1/build.gradle
similarity index 100%
rename from extensions/av1/build.gradle
rename to tree/extensions/av1/build.gradle
diff --git a/extensions/av1/proguard-rules.txt b/tree/extensions/av1/proguard-rules.txt
similarity index 100%
rename from extensions/av1/proguard-rules.txt
rename to tree/extensions/av1/proguard-rules.txt
diff --git a/extensions/av1/src/main/AndroidManifest.xml b/tree/extensions/av1/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/av1/src/main/AndroidManifest.xml
rename to tree/extensions/av1/src/main/AndroidManifest.xml
diff --git a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java b/tree/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java
similarity index 100%
rename from extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java
rename to tree/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java
diff --git a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1DecoderException.java b/tree/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1DecoderException.java
similarity index 100%
rename from extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1DecoderException.java
rename to tree/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1DecoderException.java
diff --git a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Library.java b/tree/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Library.java
similarity index 100%
rename from extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Library.java
rename to tree/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Library.java
diff --git a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java b/tree/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java
similarity index 100%
rename from extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java
rename to tree/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java
diff --git a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/package-info.java b/tree/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/package-info.java
similarity index 100%
rename from extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/package-info.java
rename to tree/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/package-info.java
diff --git a/extensions/av1/src/main/jni/CMakeLists.txt b/tree/extensions/av1/src/main/jni/CMakeLists.txt
similarity index 100%
rename from extensions/av1/src/main/jni/CMakeLists.txt
rename to tree/extensions/av1/src/main/jni/CMakeLists.txt
diff --git a/extensions/av1/src/main/jni/gav1_jni.cc b/tree/extensions/av1/src/main/jni/gav1_jni.cc
similarity index 100%
rename from extensions/av1/src/main/jni/gav1_jni.cc
rename to tree/extensions/av1/src/main/jni/gav1_jni.cc
diff --git a/extensions/cast/README.md b/tree/extensions/cast/README.md
similarity index 100%
rename from extensions/cast/README.md
rename to tree/extensions/cast/README.md
diff --git a/extensions/cast/build.gradle b/tree/extensions/cast/build.gradle
similarity index 100%
rename from extensions/cast/build.gradle
rename to tree/extensions/cast/build.gradle
diff --git a/extensions/cast/src/main/AndroidManifest.xml b/tree/extensions/cast/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/cast/src/main/AndroidManifest.xml
rename to tree/extensions/cast/src/main/AndroidManifest.xml
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
similarity index 100%
rename from extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
rename to tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java b/tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
similarity index 100%
rename from extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
rename to tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java b/tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java
similarity index 100%
rename from extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java
rename to tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java b/tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
similarity index 100%
rename from extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
rename to tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java b/tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java
similarity index 100%
rename from extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java
rename to tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverter.java b/tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverter.java
similarity index 100%
rename from extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverter.java
rename to tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverter.java
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java b/tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
similarity index 100%
rename from extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
rename to tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItem.java
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemConverter.java b/tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemConverter.java
similarity index 100%
rename from extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemConverter.java
rename to tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemConverter.java
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/SessionAvailabilityListener.java b/tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/SessionAvailabilityListener.java
similarity index 100%
rename from extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/SessionAvailabilityListener.java
rename to tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/SessionAvailabilityListener.java
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/package-info.java b/tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/package-info.java
similarity index 100%
rename from extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/package-info.java
rename to tree/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/package-info.java
diff --git a/extensions/cast/src/test/AndroidManifest.xml b/tree/extensions/cast/src/test/AndroidManifest.xml
similarity index 100%
rename from extensions/cast/src/test/AndroidManifest.xml
rename to tree/extensions/cast/src/test/AndroidManifest.xml
diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java b/tree/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java
similarity index 100%
rename from extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java
rename to tree/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java
diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java b/tree/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
similarity index 100%
rename from extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
rename to tree/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java b/tree/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java
similarity index 100%
rename from extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java
rename to tree/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverterTest.java
diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java b/tree/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
similarity index 100%
rename from extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
rename to tree/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/MediaItemTest.java
diff --git a/extensions/cronet/README.md b/tree/extensions/cronet/README.md
similarity index 100%
rename from extensions/cronet/README.md
rename to tree/extensions/cronet/README.md
diff --git a/extensions/cronet/build.gradle b/tree/extensions/cronet/build.gradle
similarity index 100%
rename from extensions/cronet/build.gradle
rename to tree/extensions/cronet/build.gradle
diff --git a/extensions/cronet/src/main/AndroidManifest.xml b/tree/extensions/cronet/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/cronet/src/main/AndroidManifest.xml
rename to tree/extensions/cronet/src/main/AndroidManifest.xml
diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProvider.java b/tree/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProvider.java
similarity index 100%
rename from extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProvider.java
rename to tree/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProvider.java
diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java b/tree/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
similarity index 100%
rename from extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
rename to tree/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java b/tree/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java
similarity index 100%
rename from extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java
rename to tree/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceFactory.java
diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java b/tree/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
similarity index 100%
rename from extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
rename to tree/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/package-info.java b/tree/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/package-info.java
similarity index 100%
rename from extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/package-info.java
rename to tree/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/package-info.java
diff --git a/extensions/cronet/src/test/AndroidManifest.xml b/tree/extensions/cronet/src/test/AndroidManifest.xml
similarity index 100%
rename from extensions/cronet/src/test/AndroidManifest.xml
rename to tree/extensions/cronet/src/test/AndroidManifest.xml
diff --git a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java b/tree/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
similarity index 100%
rename from extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
rename to tree/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
diff --git a/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java b/tree/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
similarity index 100%
rename from extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
rename to tree/extensions/cronet/src/test/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
diff --git a/extensions/ffmpeg/README.md b/tree/extensions/ffmpeg/README.md
similarity index 100%
rename from extensions/ffmpeg/README.md
rename to tree/extensions/ffmpeg/README.md
diff --git a/extensions/ffmpeg/build.gradle b/tree/extensions/ffmpeg/build.gradle
similarity index 100%
rename from extensions/ffmpeg/build.gradle
rename to tree/extensions/ffmpeg/build.gradle
diff --git a/extensions/ffmpeg/proguard-rules.txt b/tree/extensions/ffmpeg/proguard-rules.txt
similarity index 100%
rename from extensions/ffmpeg/proguard-rules.txt
rename to tree/extensions/ffmpeg/proguard-rules.txt
diff --git a/extensions/ffmpeg/src/main/AndroidManifest.xml b/tree/extensions/ffmpeg/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/ffmpeg/src/main/AndroidManifest.xml
rename to tree/extensions/ffmpeg/src/main/AndroidManifest.xml
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java b/tree/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
similarity index 100%
rename from extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
rename to tree/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java b/tree/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java
similarity index 100%
rename from extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java
rename to tree/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoderException.java b/tree/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoderException.java
similarity index 100%
rename from extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoderException.java
rename to tree/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoderException.java
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java b/tree/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
similarity index 100%
rename from extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
rename to tree/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/package-info.java b/tree/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/package-info.java
similarity index 100%
rename from extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/package-info.java
rename to tree/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/package-info.java
diff --git a/extensions/ffmpeg/src/main/jni/Android.mk b/tree/extensions/ffmpeg/src/main/jni/Android.mk
similarity index 100%
rename from extensions/ffmpeg/src/main/jni/Android.mk
rename to tree/extensions/ffmpeg/src/main/jni/Android.mk
diff --git a/extensions/ffmpeg/src/main/jni/Application.mk b/tree/extensions/ffmpeg/src/main/jni/Application.mk
similarity index 100%
rename from extensions/ffmpeg/src/main/jni/Application.mk
rename to tree/extensions/ffmpeg/src/main/jni/Application.mk
diff --git a/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh b/tree/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
similarity index 100%
rename from extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
rename to tree/extensions/ffmpeg/src/main/jni/build_ffmpeg.sh
diff --git a/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc b/tree/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
similarity index 100%
rename from extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
rename to tree/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
diff --git a/extensions/ffmpeg/src/test/AndroidManifest.xml b/tree/extensions/ffmpeg/src/test/AndroidManifest.xml
similarity index 100%
rename from extensions/ffmpeg/src/test/AndroidManifest.xml
rename to tree/extensions/ffmpeg/src/test/AndroidManifest.xml
diff --git a/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java b/tree/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
similarity index 100%
rename from extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
rename to tree/extensions/ffmpeg/src/test/java/com/google/android/exoplayer2/ext/ffmpeg/DefaultRenderersFactoryTest.java
diff --git a/extensions/flac/README.md b/tree/extensions/flac/README.md
similarity index 100%
rename from extensions/flac/README.md
rename to tree/extensions/flac/README.md
diff --git a/extensions/flac/build.gradle b/tree/extensions/flac/build.gradle
similarity index 100%
rename from extensions/flac/build.gradle
rename to tree/extensions/flac/build.gradle
diff --git a/extensions/flac/proguard-rules.txt b/tree/extensions/flac/proguard-rules.txt
similarity index 100%
rename from extensions/flac/proguard-rules.txt
rename to tree/extensions/flac/proguard-rules.txt
diff --git a/extensions/flac/src/androidTest/AndroidManifest.xml b/tree/extensions/flac/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from extensions/flac/src/androidTest/AndroidManifest.xml
rename to tree/extensions/flac/src/androidTest/AndroidManifest.xml
diff --git a/extensions/flac/src/androidTest/assets/bear-flac-16bit.mka b/tree/extensions/flac/src/androidTest/assets/bear-flac-16bit.mka
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear-flac-16bit.mka
rename to tree/extensions/flac/src/androidTest/assets/bear-flac-16bit.mka
Binary files differ
diff --git a/extensions/flac/src/androidTest/assets/bear-flac-16bit.mka.audiosink.dump b/tree/extensions/flac/src/androidTest/assets/bear-flac-16bit.mka.audiosink.dump
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear-flac-16bit.mka.audiosink.dump
rename to tree/extensions/flac/src/androidTest/assets/bear-flac-16bit.mka.audiosink.dump
diff --git a/extensions/flac/src/androidTest/assets/bear-flac-24bit.mka b/tree/extensions/flac/src/androidTest/assets/bear-flac-24bit.mka
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear-flac-24bit.mka
rename to tree/extensions/flac/src/androidTest/assets/bear-flac-24bit.mka
Binary files differ
diff --git a/extensions/flac/src/androidTest/assets/bear-flac-24bit.mka.audiosink.dump b/tree/extensions/flac/src/androidTest/assets/bear-flac-24bit.mka.audiosink.dump
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear-flac-24bit.mka.audiosink.dump
rename to tree/extensions/flac/src/androidTest/assets/bear-flac-24bit.mka.audiosink.dump
diff --git a/extensions/flac/src/androidTest/assets/bear.flac b/tree/extensions/flac/src/androidTest/assets/bear.flac
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear.flac
rename to tree/extensions/flac/src/androidTest/assets/bear.flac
Binary files differ
diff --git a/extensions/flac/src/androidTest/assets/bear.flac.0.dump b/tree/extensions/flac/src/androidTest/assets/bear.flac.0.dump
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear.flac.0.dump
rename to tree/extensions/flac/src/androidTest/assets/bear.flac.0.dump
diff --git a/extensions/flac/src/androidTest/assets/bear.flac.1.dump b/tree/extensions/flac/src/androidTest/assets/bear.flac.1.dump
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear.flac.1.dump
rename to tree/extensions/flac/src/androidTest/assets/bear.flac.1.dump
diff --git a/extensions/flac/src/androidTest/assets/bear.flac.2.dump b/tree/extensions/flac/src/androidTest/assets/bear.flac.2.dump
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear.flac.2.dump
rename to tree/extensions/flac/src/androidTest/assets/bear.flac.2.dump
diff --git a/extensions/flac/src/androidTest/assets/bear.flac.3.dump b/tree/extensions/flac/src/androidTest/assets/bear.flac.3.dump
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear.flac.3.dump
rename to tree/extensions/flac/src/androidTest/assets/bear.flac.3.dump
diff --git a/extensions/flac/src/androidTest/assets/bear_no_seek.flac b/tree/extensions/flac/src/androidTest/assets/bear_no_seek.flac
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear_no_seek.flac
rename to tree/extensions/flac/src/androidTest/assets/bear_no_seek.flac
Binary files differ
diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac b/tree/extensions/flac/src/androidTest/assets/bear_with_id3.flac
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear_with_id3.flac
rename to tree/extensions/flac/src/androidTest/assets/bear_with_id3.flac
Binary files differ
diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump b/tree/extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump
rename to tree/extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump
diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump b/tree/extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump
rename to tree/extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump
diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump b/tree/extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump
rename to tree/extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump
diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump b/tree/extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump
similarity index 100%
rename from extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump
rename to tree/extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java b/tree/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java
similarity index 100%
rename from extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java
rename to tree/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java b/tree/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
similarity index 100%
rename from extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
rename to tree/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java b/tree/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java
similarity index 100%
rename from extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java
rename to tree/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java
diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java b/tree/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
similarity index 100%
rename from extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
rename to tree/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java
diff --git a/extensions/flac/src/main/AndroidManifest.xml b/tree/extensions/flac/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/flac/src/main/AndroidManifest.xml
rename to tree/extensions/flac/src/main/AndroidManifest.xml
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeeker.java b/tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeeker.java
similarity index 100%
rename from extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeeker.java
rename to tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeeker.java
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java b/tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java
similarity index 100%
rename from extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java
rename to tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderException.java b/tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderException.java
similarity index 100%
rename from extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderException.java
rename to tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderException.java
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderJni.java b/tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderJni.java
similarity index 100%
rename from extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderJni.java
rename to tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderJni.java
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java b/tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
similarity index 100%
rename from extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
rename to tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacLibrary.java b/tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacLibrary.java
similarity index 100%
rename from extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacLibrary.java
rename to tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacLibrary.java
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java b/tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java
similarity index 100%
rename from extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java
rename to tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/package-info.java b/tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/package-info.java
similarity index 100%
rename from extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/package-info.java
rename to tree/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/package-info.java
diff --git a/extensions/flac/src/main/jni/Android.mk b/tree/extensions/flac/src/main/jni/Android.mk
similarity index 100%
rename from extensions/flac/src/main/jni/Android.mk
rename to tree/extensions/flac/src/main/jni/Android.mk
diff --git a/extensions/flac/src/main/jni/Application.mk b/tree/extensions/flac/src/main/jni/Application.mk
similarity index 100%
rename from extensions/flac/src/main/jni/Application.mk
rename to tree/extensions/flac/src/main/jni/Application.mk
diff --git a/extensions/flac/src/main/jni/flac_jni.cc b/tree/extensions/flac/src/main/jni/flac_jni.cc
similarity index 100%
rename from extensions/flac/src/main/jni/flac_jni.cc
rename to tree/extensions/flac/src/main/jni/flac_jni.cc
diff --git a/extensions/flac/src/main/jni/flac_parser.cc b/tree/extensions/flac/src/main/jni/flac_parser.cc
similarity index 100%
rename from extensions/flac/src/main/jni/flac_parser.cc
rename to tree/extensions/flac/src/main/jni/flac_parser.cc
diff --git a/extensions/flac/src/main/jni/flac_sources.mk b/tree/extensions/flac/src/main/jni/flac_sources.mk
similarity index 100%
rename from extensions/flac/src/main/jni/flac_sources.mk
rename to tree/extensions/flac/src/main/jni/flac_sources.mk
diff --git a/extensions/flac/src/main/jni/include/data_source.h b/tree/extensions/flac/src/main/jni/include/data_source.h
similarity index 100%
rename from extensions/flac/src/main/jni/include/data_source.h
rename to tree/extensions/flac/src/main/jni/include/data_source.h
diff --git a/extensions/flac/src/main/jni/include/flac_parser.h b/tree/extensions/flac/src/main/jni/include/flac_parser.h
similarity index 100%
rename from extensions/flac/src/main/jni/include/flac_parser.h
rename to tree/extensions/flac/src/main/jni/include/flac_parser.h
diff --git a/extensions/flac/src/test/AndroidManifest.xml b/tree/extensions/flac/src/test/AndroidManifest.xml
similarity index 100%
rename from extensions/flac/src/test/AndroidManifest.xml
rename to tree/extensions/flac/src/test/AndroidManifest.xml
diff --git a/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java b/tree/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
similarity index 100%
rename from extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
rename to tree/extensions/flac/src/test/java/com/google/android/exoplayer2/ext/flac/DefaultRenderersFactoryTest.java
diff --git a/extensions/gvr/README.md b/tree/extensions/gvr/README.md
similarity index 100%
rename from extensions/gvr/README.md
rename to tree/extensions/gvr/README.md
diff --git a/extensions/gvr/build.gradle b/tree/extensions/gvr/build.gradle
similarity index 100%
rename from extensions/gvr/build.gradle
rename to tree/extensions/gvr/build.gradle
diff --git a/extensions/gvr/src/main/AndroidManifest.xml b/tree/extensions/gvr/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/gvr/src/main/AndroidManifest.xml
rename to tree/extensions/gvr/src/main/AndroidManifest.xml
diff --git a/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java b/tree/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
similarity index 100%
rename from extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
rename to tree/extensions/gvr/src/main/java/com/google/android/exoplayer2/ext/gvr/GvrAudioProcessor.java
diff --git a/extensions/gvr/src/main/res/layout/exo_vr_ui.xml b/tree/extensions/gvr/src/main/res/layout/exo_vr_ui.xml
similarity index 100%
rename from extensions/gvr/src/main/res/layout/exo_vr_ui.xml
rename to tree/extensions/gvr/src/main/res/layout/exo_vr_ui.xml
diff --git a/extensions/gvr/src/main/res/values/styles.xml b/tree/extensions/gvr/src/main/res/values/styles.xml
similarity index 100%
rename from extensions/gvr/src/main/res/values/styles.xml
rename to tree/extensions/gvr/src/main/res/values/styles.xml
diff --git a/extensions/ima/README.md b/tree/extensions/ima/README.md
similarity index 100%
rename from extensions/ima/README.md
rename to tree/extensions/ima/README.md
diff --git a/extensions/ima/build.gradle b/tree/extensions/ima/build.gradle
similarity index 100%
rename from extensions/ima/build.gradle
rename to tree/extensions/ima/build.gradle
diff --git a/extensions/ima/proguard-rules.txt b/tree/extensions/ima/proguard-rules.txt
similarity index 100%
rename from extensions/ima/proguard-rules.txt
rename to tree/extensions/ima/proguard-rules.txt
diff --git a/extensions/ima/src/main/AndroidManifest.xml b/tree/extensions/ima/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/ima/src/main/AndroidManifest.xml
rename to tree/extensions/ima/src/main/AndroidManifest.xml
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/tree/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
similarity index 100%
rename from extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
rename to tree/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/package-info.java b/tree/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/package-info.java
similarity index 100%
rename from extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/package-info.java
rename to tree/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/package-info.java
diff --git a/extensions/ima/src/test/AndroidManifest.xml b/tree/extensions/ima/src/test/AndroidManifest.xml
similarity index 100%
rename from extensions/ima/src/test/AndroidManifest.xml
rename to tree/extensions/ima/src/test/AndroidManifest.xml
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java b/tree/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java
similarity index 100%
rename from extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java
rename to tree/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAd.java
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAdsLoader.java b/tree/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAdsLoader.java
similarity index 100%
rename from extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAdsLoader.java
rename to tree/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAdsLoader.java
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAdsRequest.java b/tree/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAdsRequest.java
similarity index 100%
rename from extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAdsRequest.java
rename to tree/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeAdsRequest.java
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java b/tree/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
similarity index 100%
rename from extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
rename to tree/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java b/tree/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
similarity index 100%
rename from extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
rename to tree/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java
diff --git a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/SingletonImaFactory.java b/tree/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/SingletonImaFactory.java
similarity index 100%
rename from extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/SingletonImaFactory.java
rename to tree/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/SingletonImaFactory.java
diff --git a/extensions/jobdispatcher/README.md b/tree/extensions/jobdispatcher/README.md
similarity index 100%
rename from extensions/jobdispatcher/README.md
rename to tree/extensions/jobdispatcher/README.md
diff --git a/extensions/jobdispatcher/build.gradle b/tree/extensions/jobdispatcher/build.gradle
similarity index 100%
rename from extensions/jobdispatcher/build.gradle
rename to tree/extensions/jobdispatcher/build.gradle
diff --git a/extensions/jobdispatcher/src/main/AndroidManifest.xml b/tree/extensions/jobdispatcher/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/jobdispatcher/src/main/AndroidManifest.xml
rename to tree/extensions/jobdispatcher/src/main/AndroidManifest.xml
diff --git a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java b/tree/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
similarity index 100%
rename from extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
rename to tree/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/JobDispatcherScheduler.java
diff --git a/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/package-info.java b/tree/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/package-info.java
similarity index 100%
rename from extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/package-info.java
rename to tree/extensions/jobdispatcher/src/main/java/com/google/android/exoplayer2/ext/jobdispatcher/package-info.java
diff --git a/extensions/leanback/README.md b/tree/extensions/leanback/README.md
similarity index 100%
rename from extensions/leanback/README.md
rename to tree/extensions/leanback/README.md
diff --git a/extensions/leanback/build.gradle b/tree/extensions/leanback/build.gradle
similarity index 100%
rename from extensions/leanback/build.gradle
rename to tree/extensions/leanback/build.gradle
diff --git a/extensions/leanback/src/main/AndroidManifest.xml b/tree/extensions/leanback/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/leanback/src/main/AndroidManifest.xml
rename to tree/extensions/leanback/src/main/AndroidManifest.xml
diff --git a/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java b/tree/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java
similarity index 100%
rename from extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java
rename to tree/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java
diff --git a/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/package-info.java b/tree/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/package-info.java
similarity index 100%
rename from extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/package-info.java
rename to tree/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/package-info.java
diff --git a/extensions/mediasession/README.md b/tree/extensions/mediasession/README.md
similarity index 100%
rename from extensions/mediasession/README.md
rename to tree/extensions/mediasession/README.md
diff --git a/extensions/mediasession/build.gradle b/tree/extensions/mediasession/build.gradle
similarity index 100%
rename from extensions/mediasession/build.gradle
rename to tree/extensions/mediasession/build.gradle
diff --git a/extensions/mediasession/src/main/AndroidManifest.xml b/tree/extensions/mediasession/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/mediasession/src/main/AndroidManifest.xml
rename to tree/extensions/mediasession/src/main/AndroidManifest.xml
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/tree/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
similarity index 100%
rename from extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
rename to tree/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java b/tree/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
similarity index 100%
rename from extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
rename to tree/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java b/tree/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
similarity index 100%
rename from extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
rename to tree/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/tree/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
similarity index 100%
rename from extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
rename to tree/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/package-info.java b/tree/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/package-info.java
similarity index 100%
rename from extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/package-info.java
rename to tree/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/package-info.java
diff --git a/extensions/mediasession/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_all.xml b/tree/extensions/mediasession/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_all.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_all.xml
rename to tree/extensions/mediasession/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_all.xml
diff --git a/extensions/mediasession/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_off.xml b/tree/extensions/mediasession/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_off.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_off.xml
rename to tree/extensions/mediasession/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_off.xml
diff --git a/extensions/mediasession/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_one.xml b/tree/extensions/mediasession/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_one.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_one.xml
rename to tree/extensions/mediasession/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_one.xml
diff --git a/extensions/mediasession/src/main/res/drawable-hdpi/exo_media_action_repeat_all.png b/tree/extensions/mediasession/src/main/res/drawable-hdpi/exo_media_action_repeat_all.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-hdpi/exo_media_action_repeat_all.png
rename to tree/extensions/mediasession/src/main/res/drawable-hdpi/exo_media_action_repeat_all.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-hdpi/exo_media_action_repeat_off.png b/tree/extensions/mediasession/src/main/res/drawable-hdpi/exo_media_action_repeat_off.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-hdpi/exo_media_action_repeat_off.png
rename to tree/extensions/mediasession/src/main/res/drawable-hdpi/exo_media_action_repeat_off.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-hdpi/exo_media_action_repeat_one.png b/tree/extensions/mediasession/src/main/res/drawable-hdpi/exo_media_action_repeat_one.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-hdpi/exo_media_action_repeat_one.png
rename to tree/extensions/mediasession/src/main/res/drawable-hdpi/exo_media_action_repeat_one.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-ldpi/exo_media_action_repeat_all.png b/tree/extensions/mediasession/src/main/res/drawable-ldpi/exo_media_action_repeat_all.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-ldpi/exo_media_action_repeat_all.png
rename to tree/extensions/mediasession/src/main/res/drawable-ldpi/exo_media_action_repeat_all.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-ldpi/exo_media_action_repeat_off.png b/tree/extensions/mediasession/src/main/res/drawable-ldpi/exo_media_action_repeat_off.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-ldpi/exo_media_action_repeat_off.png
rename to tree/extensions/mediasession/src/main/res/drawable-ldpi/exo_media_action_repeat_off.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-ldpi/exo_media_action_repeat_one.png b/tree/extensions/mediasession/src/main/res/drawable-ldpi/exo_media_action_repeat_one.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-ldpi/exo_media_action_repeat_one.png
rename to tree/extensions/mediasession/src/main/res/drawable-ldpi/exo_media_action_repeat_one.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-mdpi/exo_media_action_repeat_all.png b/tree/extensions/mediasession/src/main/res/drawable-mdpi/exo_media_action_repeat_all.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-mdpi/exo_media_action_repeat_all.png
rename to tree/extensions/mediasession/src/main/res/drawable-mdpi/exo_media_action_repeat_all.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-mdpi/exo_media_action_repeat_off.png b/tree/extensions/mediasession/src/main/res/drawable-mdpi/exo_media_action_repeat_off.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-mdpi/exo_media_action_repeat_off.png
rename to tree/extensions/mediasession/src/main/res/drawable-mdpi/exo_media_action_repeat_off.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-mdpi/exo_media_action_repeat_one.png b/tree/extensions/mediasession/src/main/res/drawable-mdpi/exo_media_action_repeat_one.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-mdpi/exo_media_action_repeat_one.png
rename to tree/extensions/mediasession/src/main/res/drawable-mdpi/exo_media_action_repeat_one.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-xhdpi/exo_media_action_repeat_all.png b/tree/extensions/mediasession/src/main/res/drawable-xhdpi/exo_media_action_repeat_all.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-xhdpi/exo_media_action_repeat_all.png
rename to tree/extensions/mediasession/src/main/res/drawable-xhdpi/exo_media_action_repeat_all.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-xhdpi/exo_media_action_repeat_off.png b/tree/extensions/mediasession/src/main/res/drawable-xhdpi/exo_media_action_repeat_off.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-xhdpi/exo_media_action_repeat_off.png
rename to tree/extensions/mediasession/src/main/res/drawable-xhdpi/exo_media_action_repeat_off.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-xhdpi/exo_media_action_repeat_one.png b/tree/extensions/mediasession/src/main/res/drawable-xhdpi/exo_media_action_repeat_one.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-xhdpi/exo_media_action_repeat_one.png
rename to tree/extensions/mediasession/src/main/res/drawable-xhdpi/exo_media_action_repeat_one.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-xxhdpi/exo_media_action_repeat_all.png b/tree/extensions/mediasession/src/main/res/drawable-xxhdpi/exo_media_action_repeat_all.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-xxhdpi/exo_media_action_repeat_all.png
rename to tree/extensions/mediasession/src/main/res/drawable-xxhdpi/exo_media_action_repeat_all.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-xxhdpi/exo_media_action_repeat_off.png b/tree/extensions/mediasession/src/main/res/drawable-xxhdpi/exo_media_action_repeat_off.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-xxhdpi/exo_media_action_repeat_off.png
rename to tree/extensions/mediasession/src/main/res/drawable-xxhdpi/exo_media_action_repeat_off.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/drawable-xxhdpi/exo_media_action_repeat_one.png b/tree/extensions/mediasession/src/main/res/drawable-xxhdpi/exo_media_action_repeat_one.png
similarity index 100%
rename from extensions/mediasession/src/main/res/drawable-xxhdpi/exo_media_action_repeat_one.png
rename to tree/extensions/mediasession/src/main/res/drawable-xxhdpi/exo_media_action_repeat_one.png
Binary files differ
diff --git a/extensions/mediasession/src/main/res/values-af/strings.xml b/tree/extensions/mediasession/src/main/res/values-af/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-af/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-af/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-am/strings.xml b/tree/extensions/mediasession/src/main/res/values-am/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-am/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-am/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ar/strings.xml b/tree/extensions/mediasession/src/main/res/values-ar/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ar/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ar/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-az/strings.xml b/tree/extensions/mediasession/src/main/res/values-az/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-az/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-az/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-b+sr+Latn/strings.xml b/tree/extensions/mediasession/src/main/res/values-b+sr+Latn/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-b+sr+Latn/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-b+sr+Latn/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-be/strings.xml b/tree/extensions/mediasession/src/main/res/values-be/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-be/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-be/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-bg/strings.xml b/tree/extensions/mediasession/src/main/res/values-bg/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-bg/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-bg/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-bn/strings.xml b/tree/extensions/mediasession/src/main/res/values-bn/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-bn/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-bn/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-bs/strings.xml b/tree/extensions/mediasession/src/main/res/values-bs/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-bs/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-bs/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ca/strings.xml b/tree/extensions/mediasession/src/main/res/values-ca/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ca/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ca/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-cs/strings.xml b/tree/extensions/mediasession/src/main/res/values-cs/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-cs/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-cs/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-da/strings.xml b/tree/extensions/mediasession/src/main/res/values-da/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-da/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-da/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-de/strings.xml b/tree/extensions/mediasession/src/main/res/values-de/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-de/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-de/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-el/strings.xml b/tree/extensions/mediasession/src/main/res/values-el/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-el/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-el/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-en-rAU/strings.xml b/tree/extensions/mediasession/src/main/res/values-en-rAU/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-en-rAU/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-en-rAU/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-en-rGB/strings.xml b/tree/extensions/mediasession/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-en-rGB/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-en-rGB/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-en-rIN/strings.xml b/tree/extensions/mediasession/src/main/res/values-en-rIN/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-en-rIN/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-en-rIN/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-es-rUS/strings.xml b/tree/extensions/mediasession/src/main/res/values-es-rUS/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-es-rUS/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-es-rUS/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-es/strings.xml b/tree/extensions/mediasession/src/main/res/values-es/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-es/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-es/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-et/strings.xml b/tree/extensions/mediasession/src/main/res/values-et/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-et/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-et/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-eu/strings.xml b/tree/extensions/mediasession/src/main/res/values-eu/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-eu/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-eu/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-fa/strings.xml b/tree/extensions/mediasession/src/main/res/values-fa/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-fa/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-fa/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-fi/strings.xml b/tree/extensions/mediasession/src/main/res/values-fi/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-fi/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-fi/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-fr-rCA/strings.xml b/tree/extensions/mediasession/src/main/res/values-fr-rCA/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-fr-rCA/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-fr-rCA/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-fr/strings.xml b/tree/extensions/mediasession/src/main/res/values-fr/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-fr/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-fr/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-gl/strings.xml b/tree/extensions/mediasession/src/main/res/values-gl/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-gl/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-gl/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-gu/strings.xml b/tree/extensions/mediasession/src/main/res/values-gu/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-gu/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-gu/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-hi/strings.xml b/tree/extensions/mediasession/src/main/res/values-hi/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-hi/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-hi/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-hr/strings.xml b/tree/extensions/mediasession/src/main/res/values-hr/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-hr/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-hr/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-hu/strings.xml b/tree/extensions/mediasession/src/main/res/values-hu/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-hu/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-hu/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-hy/strings.xml b/tree/extensions/mediasession/src/main/res/values-hy/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-hy/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-hy/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-in/strings.xml b/tree/extensions/mediasession/src/main/res/values-in/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-in/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-in/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-is/strings.xml b/tree/extensions/mediasession/src/main/res/values-is/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-is/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-is/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-it/strings.xml b/tree/extensions/mediasession/src/main/res/values-it/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-it/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-it/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-iw/strings.xml b/tree/extensions/mediasession/src/main/res/values-iw/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-iw/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-iw/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ja/strings.xml b/tree/extensions/mediasession/src/main/res/values-ja/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ja/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ja/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ka/strings.xml b/tree/extensions/mediasession/src/main/res/values-ka/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ka/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ka/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-kk/strings.xml b/tree/extensions/mediasession/src/main/res/values-kk/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-kk/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-kk/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-km/strings.xml b/tree/extensions/mediasession/src/main/res/values-km/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-km/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-km/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-kn/strings.xml b/tree/extensions/mediasession/src/main/res/values-kn/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-kn/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-kn/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ko/strings.xml b/tree/extensions/mediasession/src/main/res/values-ko/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ko/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ko/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ky/strings.xml b/tree/extensions/mediasession/src/main/res/values-ky/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ky/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ky/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-lo/strings.xml b/tree/extensions/mediasession/src/main/res/values-lo/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-lo/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-lo/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-lt/strings.xml b/tree/extensions/mediasession/src/main/res/values-lt/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-lt/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-lt/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-lv/strings.xml b/tree/extensions/mediasession/src/main/res/values-lv/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-lv/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-lv/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-mk/strings.xml b/tree/extensions/mediasession/src/main/res/values-mk/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-mk/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-mk/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ml/strings.xml b/tree/extensions/mediasession/src/main/res/values-ml/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ml/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ml/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-mn/strings.xml b/tree/extensions/mediasession/src/main/res/values-mn/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-mn/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-mn/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-mr/strings.xml b/tree/extensions/mediasession/src/main/res/values-mr/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-mr/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-mr/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ms/strings.xml b/tree/extensions/mediasession/src/main/res/values-ms/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ms/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ms/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-my/strings.xml b/tree/extensions/mediasession/src/main/res/values-my/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-my/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-my/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-nb/strings.xml b/tree/extensions/mediasession/src/main/res/values-nb/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-nb/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-nb/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ne/strings.xml b/tree/extensions/mediasession/src/main/res/values-ne/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ne/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ne/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-nl/strings.xml b/tree/extensions/mediasession/src/main/res/values-nl/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-nl/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-nl/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-pa/strings.xml b/tree/extensions/mediasession/src/main/res/values-pa/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-pa/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-pa/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-pl/strings.xml b/tree/extensions/mediasession/src/main/res/values-pl/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-pl/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-pl/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-pt-rPT/strings.xml b/tree/extensions/mediasession/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-pt-rPT/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-pt-rPT/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-pt/strings.xml b/tree/extensions/mediasession/src/main/res/values-pt/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-pt/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-pt/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ro/strings.xml b/tree/extensions/mediasession/src/main/res/values-ro/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ro/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ro/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ru/strings.xml b/tree/extensions/mediasession/src/main/res/values-ru/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ru/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ru/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-si/strings.xml b/tree/extensions/mediasession/src/main/res/values-si/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-si/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-si/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-sk/strings.xml b/tree/extensions/mediasession/src/main/res/values-sk/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-sk/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-sk/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-sl/strings.xml b/tree/extensions/mediasession/src/main/res/values-sl/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-sl/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-sl/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-sq/strings.xml b/tree/extensions/mediasession/src/main/res/values-sq/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-sq/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-sq/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-sr/strings.xml b/tree/extensions/mediasession/src/main/res/values-sr/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-sr/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-sr/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-sv/strings.xml b/tree/extensions/mediasession/src/main/res/values-sv/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-sv/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-sv/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-sw/strings.xml b/tree/extensions/mediasession/src/main/res/values-sw/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-sw/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-sw/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ta/strings.xml b/tree/extensions/mediasession/src/main/res/values-ta/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ta/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ta/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-te/strings.xml b/tree/extensions/mediasession/src/main/res/values-te/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-te/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-te/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-th/strings.xml b/tree/extensions/mediasession/src/main/res/values-th/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-th/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-th/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-tl/strings.xml b/tree/extensions/mediasession/src/main/res/values-tl/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-tl/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-tl/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-tr/strings.xml b/tree/extensions/mediasession/src/main/res/values-tr/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-tr/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-tr/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-uk/strings.xml b/tree/extensions/mediasession/src/main/res/values-uk/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-uk/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-uk/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-ur/strings.xml b/tree/extensions/mediasession/src/main/res/values-ur/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-ur/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-ur/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-uz/strings.xml b/tree/extensions/mediasession/src/main/res/values-uz/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-uz/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-uz/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-vi/strings.xml b/tree/extensions/mediasession/src/main/res/values-vi/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-vi/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-vi/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-zh-rCN/strings.xml b/tree/extensions/mediasession/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-zh-rCN/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-zh-rCN/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-zh-rHK/strings.xml b/tree/extensions/mediasession/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-zh-rHK/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-zh-rHK/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-zh-rTW/strings.xml b/tree/extensions/mediasession/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-zh-rTW/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-zh-rTW/strings.xml
diff --git a/extensions/mediasession/src/main/res/values-zu/strings.xml b/tree/extensions/mediasession/src/main/res/values-zu/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values-zu/strings.xml
rename to tree/extensions/mediasession/src/main/res/values-zu/strings.xml
diff --git a/extensions/mediasession/src/main/res/values/strings.xml b/tree/extensions/mediasession/src/main/res/values/strings.xml
similarity index 100%
rename from extensions/mediasession/src/main/res/values/strings.xml
rename to tree/extensions/mediasession/src/main/res/values/strings.xml
diff --git a/extensions/okhttp/README.md b/tree/extensions/okhttp/README.md
similarity index 100%
rename from extensions/okhttp/README.md
rename to tree/extensions/okhttp/README.md
diff --git a/extensions/okhttp/build.gradle b/tree/extensions/okhttp/build.gradle
similarity index 100%
rename from extensions/okhttp/build.gradle
rename to tree/extensions/okhttp/build.gradle
diff --git a/extensions/okhttp/proguard-rules.txt b/tree/extensions/okhttp/proguard-rules.txt
similarity index 100%
rename from extensions/okhttp/proguard-rules.txt
rename to tree/extensions/okhttp/proguard-rules.txt
diff --git a/extensions/okhttp/src/main/AndroidManifest.xml b/tree/extensions/okhttp/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/okhttp/src/main/AndroidManifest.xml
rename to tree/extensions/okhttp/src/main/AndroidManifest.xml
diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java b/tree/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
similarity index 100%
rename from extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
rename to tree/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java b/tree/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java
similarity index 100%
rename from extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java
rename to tree/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceFactory.java
diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/package-info.java b/tree/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/package-info.java
similarity index 100%
rename from extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/package-info.java
rename to tree/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/package-info.java
diff --git a/extensions/okhttp/src/test/AndroidManifest.xml b/tree/extensions/okhttp/src/test/AndroidManifest.xml
similarity index 100%
rename from extensions/okhttp/src/test/AndroidManifest.xml
rename to tree/extensions/okhttp/src/test/AndroidManifest.xml
diff --git a/extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceTest.java b/tree/extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceTest.java
similarity index 100%
rename from extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceTest.java
rename to tree/extensions/okhttp/src/test/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSourceTest.java
diff --git a/extensions/opus/README.md b/tree/extensions/opus/README.md
similarity index 100%
rename from extensions/opus/README.md
rename to tree/extensions/opus/README.md
diff --git a/extensions/opus/build.gradle b/tree/extensions/opus/build.gradle
similarity index 100%
rename from extensions/opus/build.gradle
rename to tree/extensions/opus/build.gradle
diff --git a/extensions/opus/proguard-rules.txt b/tree/extensions/opus/proguard-rules.txt
similarity index 100%
rename from extensions/opus/proguard-rules.txt
rename to tree/extensions/opus/proguard-rules.txt
diff --git a/extensions/opus/src/androidTest/AndroidManifest.xml b/tree/extensions/opus/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from extensions/opus/src/androidTest/AndroidManifest.xml
rename to tree/extensions/opus/src/androidTest/AndroidManifest.xml
diff --git a/extensions/opus/src/androidTest/assets/bear-opus.webm b/tree/extensions/opus/src/androidTest/assets/bear-opus.webm
similarity index 100%
rename from extensions/opus/src/androidTest/assets/bear-opus.webm
rename to tree/extensions/opus/src/androidTest/assets/bear-opus.webm
Binary files differ
diff --git a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java b/tree/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
similarity index 100%
rename from extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
rename to tree/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java
diff --git a/extensions/opus/src/main/AndroidManifest.xml b/tree/extensions/opus/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/opus/src/main/AndroidManifest.xml
rename to tree/extensions/opus/src/main/AndroidManifest.xml
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java b/tree/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java
similarity index 100%
rename from extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java
rename to tree/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java b/tree/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
similarity index 100%
rename from extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
rename to tree/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoderException.java b/tree/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoderException.java
similarity index 100%
rename from extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoderException.java
rename to tree/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoderException.java
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java b/tree/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java
similarity index 100%
rename from extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java
rename to tree/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/package-info.java b/tree/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/package-info.java
similarity index 100%
rename from extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/package-info.java
rename to tree/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/package-info.java
diff --git a/extensions/opus/src/main/jni/Android.mk b/tree/extensions/opus/src/main/jni/Android.mk
similarity index 100%
rename from extensions/opus/src/main/jni/Android.mk
rename to tree/extensions/opus/src/main/jni/Android.mk
diff --git a/extensions/opus/src/main/jni/Application.mk b/tree/extensions/opus/src/main/jni/Application.mk
similarity index 100%
rename from extensions/opus/src/main/jni/Application.mk
rename to tree/extensions/opus/src/main/jni/Application.mk
diff --git a/extensions/opus/src/main/jni/convert_android_asm.sh b/tree/extensions/opus/src/main/jni/convert_android_asm.sh
similarity index 100%
rename from extensions/opus/src/main/jni/convert_android_asm.sh
rename to tree/extensions/opus/src/main/jni/convert_android_asm.sh
diff --git a/extensions/opus/src/main/jni/libopus.mk b/tree/extensions/opus/src/main/jni/libopus.mk
similarity index 100%
rename from extensions/opus/src/main/jni/libopus.mk
rename to tree/extensions/opus/src/main/jni/libopus.mk
diff --git a/extensions/opus/src/main/jni/opus_jni.cc b/tree/extensions/opus/src/main/jni/opus_jni.cc
similarity index 100%
rename from extensions/opus/src/main/jni/opus_jni.cc
rename to tree/extensions/opus/src/main/jni/opus_jni.cc
diff --git a/extensions/opus/src/test/AndroidManifest.xml b/tree/extensions/opus/src/test/AndroidManifest.xml
similarity index 100%
rename from extensions/opus/src/test/AndroidManifest.xml
rename to tree/extensions/opus/src/test/AndroidManifest.xml
diff --git a/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java b/tree/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java
similarity index 100%
rename from extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java
rename to tree/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/DefaultRenderersFactoryTest.java
diff --git a/extensions/rtmp/README.md b/tree/extensions/rtmp/README.md
similarity index 100%
rename from extensions/rtmp/README.md
rename to tree/extensions/rtmp/README.md
diff --git a/extensions/rtmp/build.gradle b/tree/extensions/rtmp/build.gradle
similarity index 100%
rename from extensions/rtmp/build.gradle
rename to tree/extensions/rtmp/build.gradle
diff --git a/extensions/rtmp/src/main/AndroidManifest.xml b/tree/extensions/rtmp/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/rtmp/src/main/AndroidManifest.xml
rename to tree/extensions/rtmp/src/main/AndroidManifest.xml
diff --git a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java b/tree/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java
similarity index 100%
rename from extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java
rename to tree/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSource.java
diff --git a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java b/tree/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java
similarity index 100%
rename from extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java
rename to tree/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/RtmpDataSourceFactory.java
diff --git a/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/package-info.java b/tree/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/package-info.java
similarity index 100%
rename from extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/package-info.java
rename to tree/extensions/rtmp/src/main/java/com/google/android/exoplayer2/ext/rtmp/package-info.java
diff --git a/extensions/rtmp/src/test/AndroidManifest.xml b/tree/extensions/rtmp/src/test/AndroidManifest.xml
similarity index 100%
rename from extensions/rtmp/src/test/AndroidManifest.xml
rename to tree/extensions/rtmp/src/test/AndroidManifest.xml
diff --git a/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java b/tree/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java
similarity index 100%
rename from extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java
rename to tree/extensions/rtmp/src/test/java/com/google/android/exoplayer2/ext/rtmp/DefaultDataSourceTest.java
diff --git a/extensions/vp9/README.md b/tree/extensions/vp9/README.md
similarity index 100%
rename from extensions/vp9/README.md
rename to tree/extensions/vp9/README.md
diff --git a/extensions/vp9/build.gradle b/tree/extensions/vp9/build.gradle
similarity index 100%
rename from extensions/vp9/build.gradle
rename to tree/extensions/vp9/build.gradle
diff --git a/extensions/vp9/proguard-rules.txt b/tree/extensions/vp9/proguard-rules.txt
similarity index 100%
rename from extensions/vp9/proguard-rules.txt
rename to tree/extensions/vp9/proguard-rules.txt
diff --git a/extensions/vp9/src/androidTest/AndroidManifest.xml b/tree/extensions/vp9/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from extensions/vp9/src/androidTest/AndroidManifest.xml
rename to tree/extensions/vp9/src/androidTest/AndroidManifest.xml
diff --git a/extensions/vp9/src/androidTest/assets/bear-vp9-odd-dimensions.webm b/tree/extensions/vp9/src/androidTest/assets/bear-vp9-odd-dimensions.webm
similarity index 100%
rename from extensions/vp9/src/androidTest/assets/bear-vp9-odd-dimensions.webm
rename to tree/extensions/vp9/src/androidTest/assets/bear-vp9-odd-dimensions.webm
Binary files differ
diff --git a/extensions/vp9/src/androidTest/assets/bear-vp9.webm b/tree/extensions/vp9/src/androidTest/assets/bear-vp9.webm
similarity index 100%
rename from extensions/vp9/src/androidTest/assets/bear-vp9.webm
rename to tree/extensions/vp9/src/androidTest/assets/bear-vp9.webm
Binary files differ
diff --git a/extensions/vp9/src/androidTest/assets/invalid-bitstream.webm b/tree/extensions/vp9/src/androidTest/assets/invalid-bitstream.webm
similarity index 100%
rename from extensions/vp9/src/androidTest/assets/invalid-bitstream.webm
rename to tree/extensions/vp9/src/androidTest/assets/invalid-bitstream.webm
Binary files differ
diff --git a/extensions/vp9/src/androidTest/assets/roadtrip-vp92-10bit.webm b/tree/extensions/vp9/src/androidTest/assets/roadtrip-vp92-10bit.webm
similarity index 100%
rename from extensions/vp9/src/androidTest/assets/roadtrip-vp92-10bit.webm
rename to tree/extensions/vp9/src/androidTest/assets/roadtrip-vp92-10bit.webm
Binary files differ
diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/tree/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
similarity index 100%
rename from extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
rename to tree/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
diff --git a/extensions/vp9/src/main/AndroidManifest.xml b/tree/extensions/vp9/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/vp9/src/main/AndroidManifest.xml
rename to tree/extensions/vp9/src/main/AndroidManifest.xml
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/tree/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
similarity index 100%
rename from extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
rename to tree/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java b/tree/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
similarity index 100%
rename from extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
rename to tree/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoderException.java b/tree/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoderException.java
similarity index 100%
rename from extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoderException.java
rename to tree/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoderException.java
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java b/tree/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java
similarity index 100%
rename from extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java
rename to tree/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java b/tree/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
similarity index 100%
rename from extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
rename to tree/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/package-info.java b/tree/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/package-info.java
similarity index 100%
rename from extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/package-info.java
rename to tree/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/package-info.java
diff --git a/extensions/vp9/src/main/jni/Android.mk b/tree/extensions/vp9/src/main/jni/Android.mk
similarity index 100%
rename from extensions/vp9/src/main/jni/Android.mk
rename to tree/extensions/vp9/src/main/jni/Android.mk
diff --git a/extensions/vp9/src/main/jni/Application.mk b/tree/extensions/vp9/src/main/jni/Application.mk
similarity index 100%
rename from extensions/vp9/src/main/jni/Application.mk
rename to tree/extensions/vp9/src/main/jni/Application.mk
diff --git a/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh b/tree/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh
similarity index 100%
rename from extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh
rename to tree/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh
diff --git a/extensions/vp9/src/main/jni/libvpx.mk b/tree/extensions/vp9/src/main/jni/libvpx.mk
similarity index 100%
rename from extensions/vp9/src/main/jni/libvpx.mk
rename to tree/extensions/vp9/src/main/jni/libvpx.mk
diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/tree/extensions/vp9/src/main/jni/vpx_jni.cc
similarity index 100%
rename from extensions/vp9/src/main/jni/vpx_jni.cc
rename to tree/extensions/vp9/src/main/jni/vpx_jni.cc
diff --git a/extensions/vp9/src/test/AndroidManifest.xml b/tree/extensions/vp9/src/test/AndroidManifest.xml
similarity index 100%
rename from extensions/vp9/src/test/AndroidManifest.xml
rename to tree/extensions/vp9/src/test/AndroidManifest.xml
diff --git a/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java b/tree/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java
similarity index 100%
rename from extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java
rename to tree/extensions/vp9/src/test/java/com/google/android/exoplayer2/ext/vp9/DefaultRenderersFactoryTest.java
diff --git a/extensions/workmanager/README.md b/tree/extensions/workmanager/README.md
similarity index 100%
rename from extensions/workmanager/README.md
rename to tree/extensions/workmanager/README.md
diff --git a/extensions/workmanager/build.gradle b/tree/extensions/workmanager/build.gradle
similarity index 100%
rename from extensions/workmanager/build.gradle
rename to tree/extensions/workmanager/build.gradle
diff --git a/extensions/workmanager/src/main/AndroidManifest.xml b/tree/extensions/workmanager/src/main/AndroidManifest.xml
similarity index 100%
rename from extensions/workmanager/src/main/AndroidManifest.xml
rename to tree/extensions/workmanager/src/main/AndroidManifest.xml
diff --git a/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/WorkManagerScheduler.java b/tree/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/WorkManagerScheduler.java
similarity index 100%
rename from extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/WorkManagerScheduler.java
rename to tree/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/WorkManagerScheduler.java
diff --git a/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/package-info.java b/tree/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/package-info.java
similarity index 100%
rename from extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/package-info.java
rename to tree/extensions/workmanager/src/main/java/com/google/android/exoplayer2/ext/workmanager/package-info.java
diff --git a/gradle/wrapper/gradle-wrapper.jar b/tree/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.jar
rename to tree/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/tree/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.properties
rename to tree/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/tree/gradlew
similarity index 100%
rename from gradlew
rename to tree/gradlew
diff --git a/gradlew.bat b/tree/gradlew.bat
similarity index 100%
rename from gradlew.bat
rename to tree/gradlew.bat
diff --git a/javadoc_combined.gradle b/tree/javadoc_combined.gradle
similarity index 100%
rename from javadoc_combined.gradle
rename to tree/javadoc_combined.gradle
diff --git a/javadoc_library.gradle b/tree/javadoc_library.gradle
similarity index 100%
rename from javadoc_library.gradle
rename to tree/javadoc_library.gradle
diff --git a/javadoc_util.gradle b/tree/javadoc_util.gradle
similarity index 100%
rename from javadoc_util.gradle
rename to tree/javadoc_util.gradle
diff --git a/library/README.md b/tree/library/README.md
similarity index 100%
rename from library/README.md
rename to tree/library/README.md
diff --git a/library/all/README.md b/tree/library/all/README.md
similarity index 100%
rename from library/all/README.md
rename to tree/library/all/README.md
diff --git a/library/all/build.gradle b/tree/library/all/build.gradle
similarity index 100%
rename from library/all/build.gradle
rename to tree/library/all/build.gradle
diff --git a/library/all/src/main/AndroidManifest.xml b/tree/library/all/src/main/AndroidManifest.xml
similarity index 100%
rename from library/all/src/main/AndroidManifest.xml
rename to tree/library/all/src/main/AndroidManifest.xml
diff --git a/library/common/README.md b/tree/library/common/README.md
similarity index 100%
rename from library/common/README.md
rename to tree/library/common/README.md
diff --git a/library/common/build.gradle b/tree/library/common/build.gradle
similarity index 100%
rename from library/common/build.gradle
rename to tree/library/common/build.gradle
diff --git a/library/common/proguard-rules.txt b/tree/library/common/proguard-rules.txt
similarity index 100%
rename from library/common/proguard-rules.txt
rename to tree/library/common/proguard-rules.txt
diff --git a/library/common/src/main/AndroidManifest.xml b/tree/library/common/src/main/AndroidManifest.xml
similarity index 100%
rename from library/common/src/main/AndroidManifest.xml
rename to tree/library/common/src/main/AndroidManifest.xml
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/C.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/C.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/C.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/C.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/Format.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/Format.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/Format.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/Format.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/ParserException.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/ParserException.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/ParserException.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/ParserException.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/audio/package-info.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/audio/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/audio/package-info.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/audio/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/decoder/package-info.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/decoder/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/decoder/package-info.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/decoder/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/drm/package-info.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/drm/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/drm/package-info.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/drm/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/package-info.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/package-info.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/metadata/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/package-info.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/package-info.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/upstream/package-info.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/upstream/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/upstream/package-info.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/upstream/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Assertions.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/Assertions.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/Assertions.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/Assertions.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/FlacConstants.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/FlacConstants.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/FlacConstants.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/FlacConstants.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Log.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/Log.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/Log.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/Log.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/LongArray.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/LongArray.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/LongArray.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/LongArray.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/NonNullApi.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/NonNullApi.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/NonNullApi.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/NonNullApi.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Predicate.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/Predicate.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/Predicate.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/Predicate.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/package-info.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/util/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/util/package-info.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/util/package-info.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/video/package-info.java b/tree/library/common/src/main/java/com/google/android/exoplayer2/video/package-info.java
similarity index 100%
rename from library/common/src/main/java/com/google/android/exoplayer2/video/package-info.java
rename to tree/library/common/src/main/java/com/google/android/exoplayer2/video/package-info.java
diff --git a/library/common/src/main/proguard-rules.txt b/tree/library/common/src/main/proguard-rules.txt
similarity index 100%
rename from library/common/src/main/proguard-rules.txt
rename to tree/library/common/src/main/proguard-rules.txt
diff --git a/library/common/src/test/AndroidManifest.xml b/tree/library/common/src/test/AndroidManifest.xml
similarity index 100%
rename from library/common/src/test/AndroidManifest.xml
rename to tree/library/common/src/test/AndroidManifest.xml
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/CTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/CTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/CTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/CTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/FormatTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/FormatTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/FormatTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/FormatTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/MetadataTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/MetadataTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/MetadataTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/MetadataTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/upstream/DataSpecTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/upstream/DataSpecTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/upstream/DataSpecTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/upstream/DataSpecTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/util/CodecSpecificDataUtilTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/util/CodecSpecificDataUtilTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/util/CodecSpecificDataUtilTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/util/CodecSpecificDataUtilTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
diff --git a/library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java b/tree/library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
similarity index 100%
rename from library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
rename to tree/library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
diff --git a/library/core/README.md b/tree/library/core/README.md
similarity index 100%
rename from library/core/README.md
rename to tree/library/core/README.md
diff --git a/library/core/build.gradle b/tree/library/core/build.gradle
similarity index 100%
rename from library/core/build.gradle
rename to tree/library/core/build.gradle
diff --git a/library/core/proguard-rules.txt b/tree/library/core/proguard-rules.txt
similarity index 100%
rename from library/core/proguard-rules.txt
rename to tree/library/core/proguard-rules.txt
diff --git a/library/core/src/androidTest/AndroidManifest.xml b/tree/library/core/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from library/core/src/androidTest/AndroidManifest.xml
rename to tree/library/core/src/androidTest/AndroidManifest.xml
diff --git a/library/core/src/androidTest/assets/binary/1024_incrementing_bytes.mp3 b/tree/library/core/src/androidTest/assets/binary/1024_incrementing_bytes.mp3
similarity index 100%
rename from library/core/src/androidTest/assets/binary/1024_incrementing_bytes.mp3
rename to tree/library/core/src/androidTest/assets/binary/1024_incrementing_bytes.mp3
Binary files differ
diff --git a/library/core/src/androidTest/assets/bitmap/image_256_256.png b/tree/library/core/src/androidTest/assets/bitmap/image_256_256.png
similarity index 100%
rename from library/core/src/androidTest/assets/bitmap/image_256_256.png
rename to tree/library/core/src/androidTest/assets/bitmap/image_256_256.png
Binary files differ
diff --git a/library/core/src/androidTest/assets/bitmap/image_80_60.bmp b/tree/library/core/src/androidTest/assets/bitmap/image_80_60.bmp
similarity index 100%
rename from library/core/src/androidTest/assets/bitmap/image_80_60.bmp
rename to tree/library/core/src/androidTest/assets/bitmap/image_80_60.bmp
Binary files differ
diff --git a/library/core/src/androidTest/assets/mp4/testvid_1022ms.mp4 b/tree/library/core/src/androidTest/assets/mp4/testvid_1022ms.mp4
similarity index 100%
rename from library/core/src/androidTest/assets/mp4/testvid_1022ms.mp4
rename to tree/library/core/src/androidTest/assets/mp4/testvid_1022ms.mp4
Binary files differ
diff --git a/library/core/src/androidTest/assets/mp4/video000.png b/tree/library/core/src/androidTest/assets/mp4/video000.png
similarity index 100%
rename from library/core/src/androidTest/assets/mp4/video000.png
rename to tree/library/core/src/androidTest/assets/mp4/video000.png
Binary files differ
diff --git a/library/core/src/androidTest/assets/mp4/video014.png b/tree/library/core/src/androidTest/assets/mp4/video014.png
similarity index 100%
rename from library/core/src/androidTest/assets/mp4/video014.png
rename to tree/library/core/src/androidTest/assets/mp4/video014.png
Binary files differ
diff --git a/library/core/src/androidTest/assets/mp4/video015.png b/tree/library/core/src/androidTest/assets/mp4/video015.png
similarity index 100%
rename from library/core/src/androidTest/assets/mp4/video015.png
rename to tree/library/core/src/androidTest/assets/mp4/video015.png
Binary files differ
diff --git a/library/core/src/androidTest/assets/mp4/video016.png b/tree/library/core/src/androidTest/assets/mp4/video016.png
similarity index 100%
rename from library/core/src/androidTest/assets/mp4/video016.png
rename to tree/library/core/src/androidTest/assets/mp4/video016.png
Binary files differ
diff --git a/library/core/src/androidTest/assets/mp4/video029.png b/tree/library/core/src/androidTest/assets/mp4/video029.png
similarity index 100%
rename from library/core/src/androidTest/assets/mp4/video029.png
rename to tree/library/core/src/androidTest/assets/mp4/video029.png
Binary files differ
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java b/tree/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
similarity index 100%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
rename to tree/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java
diff --git a/library/core/src/main/AndroidManifest.xml b/tree/library/core/src/main/AndroidManifest.xml
similarity index 100%
rename from library/core/src/main/AndroidManifest.xml
rename to tree/library/core/src/main/AndroidManifest.xml
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/AbstractConcatenatedTimeline.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/AbstractConcatenatedTimeline.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/AbstractConcatenatedTimeline.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/AbstractConcatenatedTimeline.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/AudioBecomingNoisyManager.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/AudioBecomingNoisyManager.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/AudioBecomingNoisyManager.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/AudioBecomingNoisyManager.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/AudioFocusManager.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ControlDispatcher.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/ControlDispatcher.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/ControlDispatcher.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/ControlDispatcher.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultControlDispatcher.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/DefaultControlDispatcher.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/DefaultControlDispatcher.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/DefaultControlDispatcher.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/DefaultMediaClock.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/IllegalSeekPositionException.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/IllegalSeekPositionException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/IllegalSeekPositionException.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/IllegalSeekPositionException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/LoadControl.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/LoadControl.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/LoadControl.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/LoadControl.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfo.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackPreparer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/PlaybackPreparer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/PlaybackPreparer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/PlaybackPreparer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/Player.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/Player.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/Player.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/PlayerMessage.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Playlist.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/Playlist.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/Playlist.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/Playlist.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/RenderersFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/SeekParameters.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/WakeLockManager.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManager.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManager.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManager.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManager.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackSessionManager.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackSessionManager.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackSessionManager.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackSessionManager.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStats.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStats.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStats.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStats.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/analytics/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/analytics/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioDecoderException.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioDecoderException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AudioDecoderException.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioDecoderException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AudioListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ForwardingAudioSink.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/ForwardingAudioSink.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/ForwardingAudioSink.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/ForwardingAudioSink.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseIOException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/database/DatabaseProvider.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/database/DefaultDatabaseProvider.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/database/ExoDatabaseProvider.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/database/VersionTable.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/database/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/database/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/database/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/database/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleOutputBuffer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleOutputBuffer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleOutputBuffer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleOutputBuffer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ClearKeyUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/ClearKeyUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/ClearKeyUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/ClearKeyUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionEventListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionEventListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionEventListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionEventListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DummyExoMediaDrm.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/DummyExoMediaDrm.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/DummyExoMediaDrm.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/DummyExoMediaDrm.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/KeysExpiredException.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/KeysExpiredException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/KeysExpiredException.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/KeysExpiredException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/LocalMediaDrmCallback.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/LocalMediaDrmCallback.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/LocalMediaDrmCallback.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/LocalMediaDrmCallback.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapter.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapter.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapter.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapter.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAdapter.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAdapter.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAdapter.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAdapter.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAsyncCallback.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAsyncCallback.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAsyncCallback.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAsyncCallback.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapter.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapter.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapter.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapter.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/SynchronousMediaCodecAdapter.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/SynchronousMediaCodecAdapter.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/SynchronousMediaCodecAdapter.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/SynchronousMediaCodecAdapter.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataOutput.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataOutput.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataOutput.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataOutput.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/Download.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadCursor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadCursor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadCursor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadCursor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadIndex.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadProgress.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadProgress.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadProgress.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadProgress.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/FilterableManifest.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/FilterableManifest.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/FilterableManifest.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/FilterableManifest.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/FilteringManifestParser.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/FilteringManifestParser.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/FilteringManifestParser.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/FilteringManifestParser.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/StreamKey.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/WritableDownloadIndex.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/offline/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/offline/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/offline/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/scheduler/PlatformScheduler.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/scheduler/RequirementsWatcher.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Scheduler.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Scheduler.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/scheduler/Scheduler.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/scheduler/Scheduler.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/scheduler/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/scheduler/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/scheduler/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/scheduler/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/BaseMediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/BehindLiveWindowException.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/BehindLiveWindowException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/BehindLiveWindowException.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/BehindLiveWindowException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultCompositeSequenceableLoaderFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultCompositeSequenceableLoaderFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/DefaultCompositeSequenceableLoaderFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultCompositeSequenceableLoaderFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceEventListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceEventListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceEventListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceEventListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/IcyDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/IcyDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/IcyDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/IcyDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/LoadEventInfo.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/LoadEventInfo.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/LoadEventInfo.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/LoadEventInfo.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaPeriod.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaPeriod.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaPeriod.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaPeriod.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaLoadData.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/MediaLoadData.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/MediaLoadData.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/MediaLoadData.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceEventListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceEventListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceEventListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceEventListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleDataQueue.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/SampleDataQueue.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/SampleDataQueue.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/SampleDataQueue.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleStream.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/SampleStream.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/SampleStream.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/SampleStream.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/SinglePeriodAdTimeline.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ads/SinglePeriodAdTimeline.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ads/SinglePeriodAdTimeline.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ads/SinglePeriodAdTimeline.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/ads/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/ads/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/ads/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkIterator.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunkIterator.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunkIterator.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunkIterator.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunkIterator.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/source/chunk/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SpanUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/SpanUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SpanUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/SpanUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/Subtitle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/Subtitle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/Subtitle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/Subtitle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/TextOutput.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/TextOutput.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/TextOutput.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/TextOutput.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/cea/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/cea/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/cea/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbSubtitle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbSubtitle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbSubtitle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbSubtitle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/dvb/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsSubtitle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsSubtitle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsSubtitle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsSubtitle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/pgs/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/span/HorizontalTextInVerticalContextSpan.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/span/HorizontalTextInVerticalContextSpan.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/span/HorizontalTextInVerticalContextSpan.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/span/HorizontalTextInVerticalContextSpan.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/span/RubySpan.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/span/RubySpan.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/span/RubySpan.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/span/RubySpan.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDialogueFormat.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDialogueFormat.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDialogueFormat.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDialogueFormat.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaSubtitle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaSubtitle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaSubtitle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaSubtitle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/ssa/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/subrip/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueInfo.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueInfo.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueInfo.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueInfo.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/trackselection/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/Allocation.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/Allocation.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/Allocation.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/Allocation.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/Allocator.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/Allocator.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/Allocator.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/Allocator.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/BaseDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicy.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DummyDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DummyDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DummyDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/DummyDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/LoadErrorHandlingPolicy.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/LoadErrorHandlingPolicy.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/LoadErrorHandlingPolicy.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/LoadErrorHandlingPolicy.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSourceFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSourceFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSourceFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSourceFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/ResolvingDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/ResolvingDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/ResolvingDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/ResolvingDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/StatsDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/StatsDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/StatsDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/StatsDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadata.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndex.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheKeyFactory.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheKeyFactory.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheKeyFactory.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheKeyFactory.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadataMutations.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadata.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/CryptoUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/CryptoUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/CryptoUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/CryptoUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Clock.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/Clock.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/Clock.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/Clock.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ColorParser.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/ColorParser.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/ColorParser.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/ColorParser.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ErrorMessageProvider.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/ErrorMessageProvider.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/ErrorMessageProvider.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/ErrorMessageProvider.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EventDispatcher.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/EventDispatcher.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/EventDispatcher.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/EventDispatcher.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/GlUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/HandlerWrapper.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/HandlerWrapper.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/HandlerWrapper.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/HandlerWrapper.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/IntArrayQueue.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/IntArrayQueue.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/IntArrayQueue.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/IntArrayQueue.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/MediaClock.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/MediaClock.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/MediaClock.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/MediaClock.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/RepeatModeUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/SntpClient.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/SntpClient.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/SntpClient.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/SntpClient.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/SystemClock.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/SystemClock.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/SystemClock.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/SystemClock.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/SystemHandlerWrapper.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/SystemHandlerWrapper.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/SystemHandlerWrapper.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/SystemHandlerWrapper.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/TimedValueQueue.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/UriUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/UriUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/UriUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/UriUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/DummySurface.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/SimpleDecoderVideoRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/SimpleDecoderVideoRenderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/SimpleDecoderVideoRenderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/SimpleDecoderVideoRenderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderException.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderException.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderException.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderException.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderGLSurfaceView.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderGLSurfaceView.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderGLSurfaceView.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderGLSurfaceView.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderInputBuffer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderInputBuffer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderInputBuffer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderInputBuffer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBuffer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBuffer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBuffer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBuffer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBufferRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBufferRenderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBufferRenderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderOutputBufferRenderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderRenderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderRenderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoDecoderRenderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameMetadataListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameMetadataListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameMetadataListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameMetadataListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/VideoListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionListener.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionListener.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionRenderer.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueue.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueue.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueue.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueue.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/Projection.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/package-info.java b/tree/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/spherical/package-info.java
rename to tree/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/package-info.java
diff --git a/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/exoplayer-threading-model.svg b/tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/exoplayer-threading-model.svg
similarity index 100%
rename from library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/exoplayer-threading-model.svg
rename to tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/exoplayer-threading-model.svg
diff --git a/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/renderer-states.svg b/tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/renderer-states.svg
similarity index 100%
rename from library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/renderer-states.svg
rename to tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/renderer-states.svg
diff --git a/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-advanced.svg b/tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-advanced.svg
similarity index 100%
rename from library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-advanced.svg
rename to tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-advanced.svg
diff --git a/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-indefinite.svg b/tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-indefinite.svg
similarity index 100%
rename from library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-indefinite.svg
rename to tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-indefinite.svg
diff --git a/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-limited.svg b/tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-limited.svg
similarity index 100%
rename from library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-limited.svg
rename to tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-limited.svg
diff --git a/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-multi-period.svg b/tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-multi-period.svg
similarity index 100%
rename from library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-multi-period.svg
rename to tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-multi-period.svg
diff --git a/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-period.svg b/tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-period.svg
similarity index 100%
rename from library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-period.svg
rename to tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-period.svg
diff --git a/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-playlist.svg b/tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-playlist.svg
similarity index 100%
rename from library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-playlist.svg
rename to tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-playlist.svg
diff --git a/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file-midrolls.svg b/tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file-midrolls.svg
similarity index 100%
rename from library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file-midrolls.svg
rename to tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file-midrolls.svg
diff --git a/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file.svg b/tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file.svg
similarity index 100%
rename from library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file.svg
rename to tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file.svg
diff --git a/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-window.svg b/tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-window.svg
similarity index 100%
rename from library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-window.svg
rename to tree/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-window.svg
diff --git a/library/core/src/test/AndroidManifest.xml b/tree/library/core/src/test/AndroidManifest.xml
similarity index 100%
rename from library/core/src/test/AndroidManifest.xml
rename to tree/library/core/src/test/AndroidManifest.xml
diff --git a/library/core/src/test/assets/binary/1024_incrementing_bytes.mp3 b/tree/library/core/src/test/assets/binary/1024_incrementing_bytes.mp3
similarity index 100%
rename from library/core/src/test/assets/binary/1024_incrementing_bytes.mp3
rename to tree/library/core/src/test/assets/binary/1024_incrementing_bytes.mp3
Binary files differ
diff --git a/library/core/src/test/assets/download-actions/dash-download-v0 b/tree/library/core/src/test/assets/download-actions/dash-download-v0
similarity index 100%
rename from library/core/src/test/assets/download-actions/dash-download-v0
rename to tree/library/core/src/test/assets/download-actions/dash-download-v0
Binary files differ
diff --git a/library/core/src/test/assets/download-actions/dash-remove-v0 b/tree/library/core/src/test/assets/download-actions/dash-remove-v0
similarity index 100%
rename from library/core/src/test/assets/download-actions/dash-remove-v0
rename to tree/library/core/src/test/assets/download-actions/dash-remove-v0
Binary files differ
diff --git a/library/core/src/test/assets/download-actions/hls-download-v0 b/tree/library/core/src/test/assets/download-actions/hls-download-v0
similarity index 100%
rename from library/core/src/test/assets/download-actions/hls-download-v0
rename to tree/library/core/src/test/assets/download-actions/hls-download-v0
Binary files differ
diff --git a/library/core/src/test/assets/download-actions/hls-download-v1 b/tree/library/core/src/test/assets/download-actions/hls-download-v1
similarity index 100%
rename from library/core/src/test/assets/download-actions/hls-download-v1
rename to tree/library/core/src/test/assets/download-actions/hls-download-v1
Binary files differ
diff --git a/library/core/src/test/assets/download-actions/hls-remove-v0 b/tree/library/core/src/test/assets/download-actions/hls-remove-v0
similarity index 100%
rename from library/core/src/test/assets/download-actions/hls-remove-v0
rename to tree/library/core/src/test/assets/download-actions/hls-remove-v0
Binary files differ
diff --git a/library/core/src/test/assets/download-actions/hls-remove-v1 b/tree/library/core/src/test/assets/download-actions/hls-remove-v1
similarity index 100%
rename from library/core/src/test/assets/download-actions/hls-remove-v1
rename to tree/library/core/src/test/assets/download-actions/hls-remove-v1
Binary files differ
diff --git a/library/core/src/test/assets/download-actions/progressive-download-v0 b/tree/library/core/src/test/assets/download-actions/progressive-download-v0
similarity index 100%
rename from library/core/src/test/assets/download-actions/progressive-download-v0
rename to tree/library/core/src/test/assets/download-actions/progressive-download-v0
Binary files differ
diff --git a/library/core/src/test/assets/download-actions/progressive-remove-v0 b/tree/library/core/src/test/assets/download-actions/progressive-remove-v0
similarity index 100%
rename from library/core/src/test/assets/download-actions/progressive-remove-v0
rename to tree/library/core/src/test/assets/download-actions/progressive-remove-v0
Binary files differ
diff --git a/library/core/src/test/assets/download-actions/ss-download-v0 b/tree/library/core/src/test/assets/download-actions/ss-download-v0
similarity index 100%
rename from library/core/src/test/assets/download-actions/ss-download-v0
rename to tree/library/core/src/test/assets/download-actions/ss-download-v0
Binary files differ
diff --git a/library/core/src/test/assets/download-actions/ss-download-v1 b/tree/library/core/src/test/assets/download-actions/ss-download-v1
similarity index 100%
rename from library/core/src/test/assets/download-actions/ss-download-v1
rename to tree/library/core/src/test/assets/download-actions/ss-download-v1
Binary files differ
diff --git a/library/core/src/test/assets/download-actions/ss-remove-v0 b/tree/library/core/src/test/assets/download-actions/ss-remove-v0
similarity index 100%
rename from library/core/src/test/assets/download-actions/ss-remove-v0
rename to tree/library/core/src/test/assets/download-actions/ss-remove-v0
Binary files differ
diff --git a/library/core/src/test/assets/download-actions/ss-remove-v1 b/tree/library/core/src/test/assets/download-actions/ss-remove-v1
similarity index 100%
rename from library/core/src/test/assets/download-actions/ss-remove-v1
rename to tree/library/core/src/test/assets/download-actions/ss-remove-v1
Binary files differ
diff --git a/library/core/src/test/assets/mp4/testvid_1022ms.mp4 b/tree/library/core/src/test/assets/mp4/testvid_1022ms.mp4
similarity index 100%
rename from library/core/src/test/assets/mp4/testvid_1022ms.mp4
rename to tree/library/core/src/test/assets/mp4/testvid_1022ms.mp4
Binary files differ
diff --git a/library/core/src/test/assets/offline/action_file_for_download_index_upgrade.exi b/tree/library/core/src/test/assets/offline/action_file_for_download_index_upgrade.exi
similarity index 100%
rename from library/core/src/test/assets/offline/action_file_for_download_index_upgrade.exi
rename to tree/library/core/src/test/assets/offline/action_file_for_download_index_upgrade.exi
Binary files differ
diff --git a/library/core/src/test/assets/offline/action_file_incomplete_header.exi b/tree/library/core/src/test/assets/offline/action_file_incomplete_header.exi
similarity index 100%
rename from library/core/src/test/assets/offline/action_file_incomplete_header.exi
rename to tree/library/core/src/test/assets/offline/action_file_incomplete_header.exi
Binary files differ
diff --git a/library/core/src/test/assets/offline/action_file_no_data.exi b/tree/library/core/src/test/assets/offline/action_file_no_data.exi
similarity index 100%
rename from library/core/src/test/assets/offline/action_file_no_data.exi
rename to tree/library/core/src/test/assets/offline/action_file_no_data.exi
diff --git a/library/core/src/test/assets/offline/action_file_one_action.exi b/tree/library/core/src/test/assets/offline/action_file_one_action.exi
similarity index 100%
rename from library/core/src/test/assets/offline/action_file_one_action.exi
rename to tree/library/core/src/test/assets/offline/action_file_one_action.exi
Binary files differ
diff --git a/library/core/src/test/assets/offline/action_file_two_actions.exi b/tree/library/core/src/test/assets/offline/action_file_two_actions.exi
similarity index 100%
rename from library/core/src/test/assets/offline/action_file_two_actions.exi
rename to tree/library/core/src/test/assets/offline/action_file_two_actions.exi
Binary files differ
diff --git a/library/core/src/test/assets/offline/action_file_unsupported_version.exi b/tree/library/core/src/test/assets/offline/action_file_unsupported_version.exi
similarity index 100%
rename from library/core/src/test/assets/offline/action_file_unsupported_version.exi
rename to tree/library/core/src/test/assets/offline/action_file_unsupported_version.exi
Binary files differ
diff --git a/library/core/src/test/assets/offline/action_file_zero_actions.exi b/tree/library/core/src/test/assets/offline/action_file_zero_actions.exi
similarity index 100%
rename from library/core/src/test/assets/offline/action_file_zero_actions.exi
rename to tree/library/core/src/test/assets/offline/action_file_zero_actions.exi
Binary files differ
diff --git a/library/core/src/test/assets/ssa/empty b/tree/library/core/src/test/assets/ssa/empty
similarity index 100%
rename from library/core/src/test/assets/ssa/empty
rename to tree/library/core/src/test/assets/ssa/empty
diff --git a/library/core/src/test/assets/ssa/invalid_positioning b/tree/library/core/src/test/assets/ssa/invalid_positioning
similarity index 100%
rename from library/core/src/test/assets/ssa/invalid_positioning
rename to tree/library/core/src/test/assets/ssa/invalid_positioning
diff --git a/library/core/src/test/assets/ssa/invalid_timecodes b/tree/library/core/src/test/assets/ssa/invalid_timecodes
similarity index 100%
rename from library/core/src/test/assets/ssa/invalid_timecodes
rename to tree/library/core/src/test/assets/ssa/invalid_timecodes
diff --git a/library/core/src/test/assets/ssa/overlapping_timecodes b/tree/library/core/src/test/assets/ssa/overlapping_timecodes
similarity index 100%
rename from library/core/src/test/assets/ssa/overlapping_timecodes
rename to tree/library/core/src/test/assets/ssa/overlapping_timecodes
diff --git a/library/core/src/test/assets/ssa/positioning b/tree/library/core/src/test/assets/ssa/positioning
similarity index 100%
rename from library/core/src/test/assets/ssa/positioning
rename to tree/library/core/src/test/assets/ssa/positioning
diff --git a/library/core/src/test/assets/ssa/positioning_without_playres b/tree/library/core/src/test/assets/ssa/positioning_without_playres
similarity index 100%
rename from library/core/src/test/assets/ssa/positioning_without_playres
rename to tree/library/core/src/test/assets/ssa/positioning_without_playres
diff --git a/library/core/src/test/assets/ssa/typical b/tree/library/core/src/test/assets/ssa/typical
similarity index 100%
rename from library/core/src/test/assets/ssa/typical
rename to tree/library/core/src/test/assets/ssa/typical
diff --git a/library/core/src/test/assets/ssa/typical_dialogue b/tree/library/core/src/test/assets/ssa/typical_dialogue
similarity index 100%
rename from library/core/src/test/assets/ssa/typical_dialogue
rename to tree/library/core/src/test/assets/ssa/typical_dialogue
diff --git a/library/core/src/test/assets/ssa/typical_format b/tree/library/core/src/test/assets/ssa/typical_format
similarity index 100%
rename from library/core/src/test/assets/ssa/typical_format
rename to tree/library/core/src/test/assets/ssa/typical_format
diff --git a/library/core/src/test/assets/ssa/typical_header b/tree/library/core/src/test/assets/ssa/typical_header
similarity index 100%
rename from library/core/src/test/assets/ssa/typical_header
rename to tree/library/core/src/test/assets/ssa/typical_header
diff --git a/library/core/src/test/assets/subrip/empty b/tree/library/core/src/test/assets/subrip/empty
similarity index 100%
rename from library/core/src/test/assets/subrip/empty
rename to tree/library/core/src/test/assets/subrip/empty
diff --git a/library/core/src/test/assets/subrip/typical b/tree/library/core/src/test/assets/subrip/typical
similarity index 100%
rename from library/core/src/test/assets/subrip/typical
rename to tree/library/core/src/test/assets/subrip/typical
diff --git a/library/core/src/test/assets/subrip/typical_extra_blank_line b/tree/library/core/src/test/assets/subrip/typical_extra_blank_line
similarity index 100%
rename from library/core/src/test/assets/subrip/typical_extra_blank_line
rename to tree/library/core/src/test/assets/subrip/typical_extra_blank_line
diff --git a/library/core/src/test/assets/subrip/typical_missing_sequence b/tree/library/core/src/test/assets/subrip/typical_missing_sequence
similarity index 100%
rename from library/core/src/test/assets/subrip/typical_missing_sequence
rename to tree/library/core/src/test/assets/subrip/typical_missing_sequence
diff --git a/library/core/src/test/assets/subrip/typical_missing_timecode b/tree/library/core/src/test/assets/subrip/typical_missing_timecode
similarity index 100%
rename from library/core/src/test/assets/subrip/typical_missing_timecode
rename to tree/library/core/src/test/assets/subrip/typical_missing_timecode
diff --git a/library/core/src/test/assets/subrip/typical_negative_timestamps b/tree/library/core/src/test/assets/subrip/typical_negative_timestamps
similarity index 100%
rename from library/core/src/test/assets/subrip/typical_negative_timestamps
rename to tree/library/core/src/test/assets/subrip/typical_negative_timestamps
diff --git a/library/core/src/test/assets/subrip/typical_unexpected_end b/tree/library/core/src/test/assets/subrip/typical_unexpected_end
similarity index 100%
rename from library/core/src/test/assets/subrip/typical_unexpected_end
rename to tree/library/core/src/test/assets/subrip/typical_unexpected_end
diff --git a/library/core/src/test/assets/subrip/typical_with_byte_order_mark b/tree/library/core/src/test/assets/subrip/typical_with_byte_order_mark
similarity index 100%
rename from library/core/src/test/assets/subrip/typical_with_byte_order_mark
rename to tree/library/core/src/test/assets/subrip/typical_with_byte_order_mark
diff --git a/library/core/src/test/assets/subrip/typical_with_tags b/tree/library/core/src/test/assets/subrip/typical_with_tags
similarity index 100%
rename from library/core/src/test/assets/subrip/typical_with_tags
rename to tree/library/core/src/test/assets/subrip/typical_with_tags
diff --git a/library/core/src/test/assets/ttml/bitmap_percentage_region.xml b/tree/library/core/src/test/assets/ttml/bitmap_percentage_region.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/bitmap_percentage_region.xml
rename to tree/library/core/src/test/assets/ttml/bitmap_percentage_region.xml
diff --git a/library/core/src/test/assets/ttml/bitmap_pixel_region.xml b/tree/library/core/src/test/assets/ttml/bitmap_pixel_region.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/bitmap_pixel_region.xml
rename to tree/library/core/src/test/assets/ttml/bitmap_pixel_region.xml
diff --git a/library/core/src/test/assets/ttml/bitmap_unsupported_region.xml b/tree/library/core/src/test/assets/ttml/bitmap_unsupported_region.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/bitmap_unsupported_region.xml
rename to tree/library/core/src/test/assets/ttml/bitmap_unsupported_region.xml
diff --git a/library/core/src/test/assets/ttml/chain_multiple_styles.xml b/tree/library/core/src/test/assets/ttml/chain_multiple_styles.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/chain_multiple_styles.xml
rename to tree/library/core/src/test/assets/ttml/chain_multiple_styles.xml
diff --git a/library/core/src/test/assets/ttml/font_size.xml b/tree/library/core/src/test/assets/ttml/font_size.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/font_size.xml
rename to tree/library/core/src/test/assets/ttml/font_size.xml
diff --git a/library/core/src/test/assets/ttml/font_size_empty.xml b/tree/library/core/src/test/assets/ttml/font_size_empty.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/font_size_empty.xml
rename to tree/library/core/src/test/assets/ttml/font_size_empty.xml
diff --git a/library/core/src/test/assets/ttml/font_size_invalid.xml b/tree/library/core/src/test/assets/ttml/font_size_invalid.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/font_size_invalid.xml
rename to tree/library/core/src/test/assets/ttml/font_size_invalid.xml
diff --git a/library/core/src/test/assets/ttml/font_size_no_unit.xml b/tree/library/core/src/test/assets/ttml/font_size_no_unit.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/font_size_no_unit.xml
rename to tree/library/core/src/test/assets/ttml/font_size_no_unit.xml
diff --git a/library/core/src/test/assets/ttml/frame_rate.xml b/tree/library/core/src/test/assets/ttml/frame_rate.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/frame_rate.xml
rename to tree/library/core/src/test/assets/ttml/frame_rate.xml
diff --git a/library/core/src/test/assets/ttml/inherit_and_override_style.xml b/tree/library/core/src/test/assets/ttml/inherit_and_override_style.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/inherit_and_override_style.xml
rename to tree/library/core/src/test/assets/ttml/inherit_and_override_style.xml
diff --git a/library/core/src/test/assets/ttml/inherit_global_and_parent.xml b/tree/library/core/src/test/assets/ttml/inherit_global_and_parent.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/inherit_global_and_parent.xml
rename to tree/library/core/src/test/assets/ttml/inherit_global_and_parent.xml
diff --git a/library/core/src/test/assets/ttml/inherit_multiple_styles.xml b/tree/library/core/src/test/assets/ttml/inherit_multiple_styles.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/inherit_multiple_styles.xml
rename to tree/library/core/src/test/assets/ttml/inherit_multiple_styles.xml
diff --git a/library/core/src/test/assets/ttml/inherit_style.xml b/tree/library/core/src/test/assets/ttml/inherit_style.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/inherit_style.xml
rename to tree/library/core/src/test/assets/ttml/inherit_style.xml
diff --git a/library/core/src/test/assets/ttml/inline_style_attributes.xml b/tree/library/core/src/test/assets/ttml/inline_style_attributes.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/inline_style_attributes.xml
rename to tree/library/core/src/test/assets/ttml/inline_style_attributes.xml
diff --git a/library/core/src/test/assets/ttml/multiple_regions.xml b/tree/library/core/src/test/assets/ttml/multiple_regions.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/multiple_regions.xml
rename to tree/library/core/src/test/assets/ttml/multiple_regions.xml
diff --git a/library/core/src/test/assets/ttml/no_underline_linethrough.xml b/tree/library/core/src/test/assets/ttml/no_underline_linethrough.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/no_underline_linethrough.xml
rename to tree/library/core/src/test/assets/ttml/no_underline_linethrough.xml
diff --git a/library/core/src/test/assets/ttml/vertical_text.xml b/tree/library/core/src/test/assets/ttml/vertical_text.xml
similarity index 100%
rename from library/core/src/test/assets/ttml/vertical_text.xml
rename to tree/library/core/src/test/assets/ttml/vertical_text.xml
diff --git a/library/core/src/test/assets/tx3g/initialization b/tree/library/core/src/test/assets/tx3g/initialization
similarity index 100%
rename from library/core/src/test/assets/tx3g/initialization
rename to tree/library/core/src/test/assets/tx3g/initialization
Binary files differ
diff --git a/library/core/src/test/assets/tx3g/initialization_all_defaults b/tree/library/core/src/test/assets/tx3g/initialization_all_defaults
similarity index 100%
rename from library/core/src/test/assets/tx3g/initialization_all_defaults
rename to tree/library/core/src/test/assets/tx3g/initialization_all_defaults
Binary files differ
diff --git a/library/core/src/test/assets/tx3g/no_subtitle b/tree/library/core/src/test/assets/tx3g/no_subtitle
similarity index 100%
rename from library/core/src/test/assets/tx3g/no_subtitle
rename to tree/library/core/src/test/assets/tx3g/no_subtitle
Binary files differ
diff --git a/library/core/src/test/assets/tx3g/sample_just_text b/tree/library/core/src/test/assets/tx3g/sample_just_text
similarity index 100%
rename from library/core/src/test/assets/tx3g/sample_just_text
rename to tree/library/core/src/test/assets/tx3g/sample_just_text
Binary files differ
diff --git a/library/core/src/test/assets/tx3g/sample_utf16_be_no_styl b/tree/library/core/src/test/assets/tx3g/sample_utf16_be_no_styl
similarity index 100%
rename from library/core/src/test/assets/tx3g/sample_utf16_be_no_styl
rename to tree/library/core/src/test/assets/tx3g/sample_utf16_be_no_styl
Binary files differ
diff --git a/library/core/src/test/assets/tx3g/sample_utf16_le_no_styl b/tree/library/core/src/test/assets/tx3g/sample_utf16_le_no_styl
similarity index 100%
rename from library/core/src/test/assets/tx3g/sample_utf16_le_no_styl
rename to tree/library/core/src/test/assets/tx3g/sample_utf16_le_no_styl
Binary files differ
diff --git a/library/core/src/test/assets/tx3g/sample_with_multiple_styl b/tree/library/core/src/test/assets/tx3g/sample_with_multiple_styl
similarity index 100%
rename from library/core/src/test/assets/tx3g/sample_with_multiple_styl
rename to tree/library/core/src/test/assets/tx3g/sample_with_multiple_styl
Binary files differ
diff --git a/library/core/src/test/assets/tx3g/sample_with_other_extension b/tree/library/core/src/test/assets/tx3g/sample_with_other_extension
similarity index 100%
rename from library/core/src/test/assets/tx3g/sample_with_other_extension
rename to tree/library/core/src/test/assets/tx3g/sample_with_other_extension
Binary files differ
diff --git a/library/core/src/test/assets/tx3g/sample_with_styl b/tree/library/core/src/test/assets/tx3g/sample_with_styl
similarity index 100%
rename from library/core/src/test/assets/tx3g/sample_with_styl
rename to tree/library/core/src/test/assets/tx3g/sample_with_styl
Binary files differ
diff --git a/library/core/src/test/assets/tx3g/sample_with_styl_all_defaults b/tree/library/core/src/test/assets/tx3g/sample_with_styl_all_defaults
similarity index 100%
rename from library/core/src/test/assets/tx3g/sample_with_styl_all_defaults
rename to tree/library/core/src/test/assets/tx3g/sample_with_styl_all_defaults
Binary files differ
diff --git a/library/core/src/test/assets/tx3g/sample_with_tbox b/tree/library/core/src/test/assets/tx3g/sample_with_tbox
similarity index 100%
rename from library/core/src/test/assets/tx3g/sample_with_tbox
rename to tree/library/core/src/test/assets/tx3g/sample_with_tbox
Binary files differ
diff --git a/library/core/src/test/assets/webvtt/empty b/tree/library/core/src/test/assets/webvtt/empty
similarity index 100%
rename from library/core/src/test/assets/webvtt/empty
rename to tree/library/core/src/test/assets/webvtt/empty
diff --git a/library/core/src/test/assets/webvtt/typical b/tree/library/core/src/test/assets/webvtt/typical
similarity index 100%
rename from library/core/src/test/assets/webvtt/typical
rename to tree/library/core/src/test/assets/webvtt/typical
diff --git a/library/core/src/test/assets/webvtt/typical_with_bad_timestamps b/tree/library/core/src/test/assets/webvtt/typical_with_bad_timestamps
similarity index 100%
rename from library/core/src/test/assets/webvtt/typical_with_bad_timestamps
rename to tree/library/core/src/test/assets/webvtt/typical_with_bad_timestamps
diff --git a/library/core/src/test/assets/webvtt/typical_with_comments b/tree/library/core/src/test/assets/webvtt/typical_with_comments
similarity index 100%
rename from library/core/src/test/assets/webvtt/typical_with_comments
rename to tree/library/core/src/test/assets/webvtt/typical_with_comments
diff --git a/library/core/src/test/assets/webvtt/typical_with_identifiers b/tree/library/core/src/test/assets/webvtt/typical_with_identifiers
similarity index 100%
rename from library/core/src/test/assets/webvtt/typical_with_identifiers
rename to tree/library/core/src/test/assets/webvtt/typical_with_identifiers
diff --git a/library/core/src/test/assets/webvtt/with_bad_cue_header b/tree/library/core/src/test/assets/webvtt/with_bad_cue_header
similarity index 100%
rename from library/core/src/test/assets/webvtt/with_bad_cue_header
rename to tree/library/core/src/test/assets/webvtt/with_bad_cue_header
diff --git a/library/core/src/test/assets/webvtt/with_bom b/tree/library/core/src/test/assets/webvtt/with_bom
similarity index 100%
rename from library/core/src/test/assets/webvtt/with_bom
rename to tree/library/core/src/test/assets/webvtt/with_bom
diff --git a/library/core/src/test/assets/webvtt/with_css_complex_selectors b/tree/library/core/src/test/assets/webvtt/with_css_complex_selectors
similarity index 100%
rename from library/core/src/test/assets/webvtt/with_css_complex_selectors
rename to tree/library/core/src/test/assets/webvtt/with_css_complex_selectors
diff --git a/library/core/src/test/assets/webvtt/with_css_styles b/tree/library/core/src/test/assets/webvtt/with_css_styles
similarity index 100%
rename from library/core/src/test/assets/webvtt/with_css_styles
rename to tree/library/core/src/test/assets/webvtt/with_css_styles
diff --git a/library/core/src/test/assets/webvtt/with_css_text_combine_upright b/tree/library/core/src/test/assets/webvtt/with_css_text_combine_upright
similarity index 100%
rename from library/core/src/test/assets/webvtt/with_css_text_combine_upright
rename to tree/library/core/src/test/assets/webvtt/with_css_text_combine_upright
diff --git a/library/core/src/test/assets/webvtt/with_positioning b/tree/library/core/src/test/assets/webvtt/with_positioning
similarity index 100%
rename from library/core/src/test/assets/webvtt/with_positioning
rename to tree/library/core/src/test/assets/webvtt/with_positioning
diff --git a/library/core/src/test/assets/webvtt/with_tags b/tree/library/core/src/test/assets/webvtt/with_tags
similarity index 100%
rename from library/core/src/test/assets/webvtt/with_tags
rename to tree/library/core/src/test/assets/webvtt/with_tags
diff --git a/library/core/src/test/assets/webvtt/with_vertical b/tree/library/core/src/test/assets/webvtt/with_vertical
similarity index 100%
rename from library/core/src/test/assets/webvtt/with_vertical
rename to tree/library/core/src/test/assets/webvtt/with_vertical
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/AudioFocusManagerTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/DefaultLoadControlTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/DefaultMediaClockTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/DefaultMediaClockTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/DefaultMediaClockTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/DefaultMediaClockTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/PlayerMessageTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/PlayerMessageTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/PlayerMessageTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/PlayerMessageTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/PlaylistTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/PlaylistTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/PlaylistTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/PlaylistTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/TimelineTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/TimelineTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/TimelineTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/TimelineTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/audio/DefaultAudioSinkTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/database/VersionTableTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/ClearKeyUtilTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/drm/ClearKeyUtilTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/drm/ClearKeyUtilTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/drm/ClearKeyUtilTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapterTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapterTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecAsyncCallbackTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecAsyncCallbackTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecAsyncCallbackTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecAsyncCallbackTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtilTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtilTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtilTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtilTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapterTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataRendererTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileUpgradeUtilTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloadIndexTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactoryTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadHelperTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadRequestTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadRequestTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadRequestTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadRequestTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/offline/StreamKeyTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/offline/StreamKeyTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/offline/StreamKeyTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/offline/StreamKeyTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaSourceTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaSourceTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaSourceTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/source/MergingMediaSourceTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/SinglePeriodTimelineTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/source/SinglePeriodTimelineTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/source/SinglePeriodTimelineTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/source/SinglePeriodTimelineTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupArrayTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupArrayTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupArrayTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupArrayTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/source/TrackGroupTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/source/ads/AdPlaybackStateTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/CueTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/CueTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/CueTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/CueTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/SpanUtilTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/SpanUtilTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/SpanUtilTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/SpanUtilTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectorTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/BaseDataSourceTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultLoadErrorHandlingPolicyTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndexTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndexTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndexTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheFileMetadataIndexTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/DefaultContentMetadataTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/IntArrayQueueTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/util/IntArrayQueueTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/util/IntArrayQueueTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/util/IntArrayQueueTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/util/TimedValueQueueTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueueTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueueTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueueTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/FrameRotationQueueTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoderTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoderTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoderTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoderTest.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionTest.java b/tree/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionTest.java
rename to tree/library/core/src/test/java/com/google/android/exoplayer2/video/spherical/ProjectionTest.java
diff --git a/library/dash/README.md b/tree/library/dash/README.md
similarity index 100%
rename from library/dash/README.md
rename to tree/library/dash/README.md
diff --git a/library/dash/build.gradle b/tree/library/dash/build.gradle
similarity index 100%
rename from library/dash/build.gradle
rename to tree/library/dash/build.gradle
diff --git a/library/dash/src/main/AndroidManifest.xml b/tree/library/dash/src/main/AndroidManifest.xml
similarity index 100%
rename from library/dash/src/main/AndroidManifest.xml
rename to tree/library/dash/src/main/AndroidManifest.xml
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashManifestStaleException.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashManifestStaleException.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashManifestStaleException.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashManifestStaleException.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashSegmentIndex.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashSegmentIndex.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashSegmentIndex.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashSegmentIndex.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/EventSampleStream.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/EventSampleStream.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/EventSampleStream.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/EventSampleStream.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/AdaptationSet.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/AdaptationSet.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/AdaptationSet.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/AdaptationSet.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Descriptor.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Descriptor.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Descriptor.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Descriptor.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/EventStream.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/EventStream.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/EventStream.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/EventStream.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/ProgramInformation.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SingleSegmentIndex.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SingleSegmentIndex.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SingleSegmentIndex.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SingleSegmentIndex.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UtcTimingElement.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UtcTimingElement.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UtcTimingElement.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UtcTimingElement.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/package-info.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/package-info.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/package-info.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/package-info.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/package-info.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/package-info.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/package-info.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/package-info.java
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/package-info.java b/tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/package-info.java
similarity index 100%
rename from library/dash/src/main/java/com/google/android/exoplayer2/source/dash/package-info.java
rename to tree/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/package-info.java
diff --git a/library/dash/src/test/AndroidManifest.xml b/tree/library/dash/src/test/AndroidManifest.xml
similarity index 100%
rename from library/dash/src/test/AndroidManifest.xml
rename to tree/library/dash/src/test/AndroidManifest.xml
diff --git a/library/dash/src/test/assets/sample_mpd b/tree/library/dash/src/test/assets/sample_mpd
similarity index 100%
rename from library/dash/src/test/assets/sample_mpd
rename to tree/library/dash/src/test/assets/sample_mpd
diff --git a/library/dash/src/test/assets/sample_mpd_event_stream b/tree/library/dash/src/test/assets/sample_mpd_event_stream
similarity index 100%
rename from library/dash/src/test/assets/sample_mpd_event_stream
rename to tree/library/dash/src/test/assets/sample_mpd_event_stream
diff --git a/library/dash/src/test/assets/sample_mpd_labels b/tree/library/dash/src/test/assets/sample_mpd_labels
similarity index 100%
rename from library/dash/src/test/assets/sample_mpd_labels
rename to tree/library/dash/src/test/assets/sample_mpd_labels
diff --git a/library/dash/src/test/assets/sample_mpd_segment_template b/tree/library/dash/src/test/assets/sample_mpd_segment_template
similarity index 100%
rename from library/dash/src/test/assets/sample_mpd_segment_template
rename to tree/library/dash/src/test/assets/sample_mpd_segment_template
diff --git a/library/dash/src/test/assets/sample_mpd_unknown_mime_type b/tree/library/dash/src/test/assets/sample_mpd_unknown_mime_type
similarity index 100%
rename from library/dash/src/test/assets/sample_mpd_unknown_mime_type
rename to tree/library/dash/src/test/assets/sample_mpd_unknown_mime_type
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaPeriodTest.java
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/EventSampleStreamTest.java
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadHelperTest.java
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java b/tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
similarity index 100%
rename from library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
rename to tree/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
diff --git a/library/extractor/README.md b/tree/library/extractor/README.md
similarity index 100%
rename from library/extractor/README.md
rename to tree/library/extractor/README.md
diff --git a/library/extractor/build.gradle b/tree/library/extractor/build.gradle
similarity index 100%
rename from library/extractor/build.gradle
rename to tree/library/extractor/build.gradle
diff --git a/library/extractor/proguard-rules.txt b/tree/library/extractor/proguard-rules.txt
similarity index 100%
rename from library/extractor/proguard-rules.txt
rename to tree/library/extractor/proguard-rules.txt
diff --git a/library/extractor/src/main/AndroidManifest.xml b/tree/library/extractor/src/main/AndroidManifest.xml
similarity index 100%
rename from library/extractor/src/main/AndroidManifest.xml
rename to tree/library/extractor/src/main/AndroidManifest.xml
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/CeaUtil.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/CeaUtil.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/CeaUtil.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/CeaUtil.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMap.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMap.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMap.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMap.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyExtractorOutput.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyExtractorOutput.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyExtractorOutput.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyExtractorOutput.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorUtil.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorUtil.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorUtil.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorUtil.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacFrameReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacFrameReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacFrameReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacFrameReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacMetadataReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacMetadataReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacMetadataReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacMetadataReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacSeekTableSeekMap.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacSeekTableSeekMap.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacSeekTableSeekMap.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacSeekTableSeekMap.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisBitArray.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisBitArray.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisBitArray.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisBitArray.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/package-info.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/package-info.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/package-info.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/package-info.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacBinarySearchSeeker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacBinarySearchSeeker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacBinarySearchSeeker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacBinarySearchSeeker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/package-info.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/package-info.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/package-info.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/package-info.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/package-info.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/package-info.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/package-info.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/package-info.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/package-info.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/package-info.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/package-info.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/package-info.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/Seeker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/Seeker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/Seeker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/Seeker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/package-info.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/package-info.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/package-info.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/package-info.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/package-info.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/package-info.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/package-info.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/package-info.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/package-info.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/package-info.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/package-info.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/package-info.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/package-info.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/package-info.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/package-info.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/package-info.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/rawcc/package-info.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/rawcc/package-info.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/rawcc/package-info.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/rawcc/package-info.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsUtil.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsUtil.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsUtil.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsUtil.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/UserDataReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/UserDataReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/UserDataReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/UserDataReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/package-info.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/package-info.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/package-info.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/package-info.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavSeekMap.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavSeekMap.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavSeekMap.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavSeekMap.java
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/package-info.java b/tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/package-info.java
similarity index 100%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/package-info.java
rename to tree/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/package-info.java
diff --git a/library/extractor/src/main/proguard-rules.txt b/tree/library/extractor/src/main/proguard-rules.txt
similarity index 100%
rename from library/extractor/src/main/proguard-rules.txt
rename to tree/library/extractor/src/main/proguard-rules.txt
diff --git a/library/extractor/src/test/AndroidManifest.xml b/tree/library/extractor/src/test/AndroidManifest.xml
similarity index 100%
rename from library/extractor/src/test/AndroidManifest.xml
rename to tree/library/extractor/src/test/AndroidManifest.xml
diff --git a/library/extractor/src/test/assets/amr/sample_nb.amr b/tree/library/extractor/src/test/assets/amr/sample_nb.amr
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_nb.amr
rename to tree/library/extractor/src/test/assets/amr/sample_nb.amr
Binary files differ
diff --git a/library/extractor/src/test/assets/amr/sample_nb.amr.0.dump b/tree/library/extractor/src/test/assets/amr/sample_nb.amr.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_nb.amr.0.dump
rename to tree/library/extractor/src/test/assets/amr/sample_nb.amr.0.dump
diff --git a/library/extractor/src/test/assets/amr/sample_nb_cbr.amr b/tree/library/extractor/src/test/assets/amr/sample_nb_cbr.amr
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_nb_cbr.amr
rename to tree/library/extractor/src/test/assets/amr/sample_nb_cbr.amr
Binary files differ
diff --git a/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.0.dump b/tree/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_nb_cbr.amr.0.dump
rename to tree/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.0.dump
diff --git a/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.1.dump b/tree/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_nb_cbr.amr.1.dump
rename to tree/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.1.dump
diff --git a/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.2.dump b/tree/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_nb_cbr.amr.2.dump
rename to tree/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.2.dump
diff --git a/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.3.dump b/tree/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_nb_cbr.amr.3.dump
rename to tree/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.3.dump
diff --git a/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump b/tree/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump
rename to tree/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump
diff --git a/library/extractor/src/test/assets/amr/sample_wb.amr b/tree/library/extractor/src/test/assets/amr/sample_wb.amr
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_wb.amr
rename to tree/library/extractor/src/test/assets/amr/sample_wb.amr
Binary files differ
diff --git a/library/extractor/src/test/assets/amr/sample_wb.amr.0.dump b/tree/library/extractor/src/test/assets/amr/sample_wb.amr.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_wb.amr.0.dump
rename to tree/library/extractor/src/test/assets/amr/sample_wb.amr.0.dump
diff --git a/library/extractor/src/test/assets/amr/sample_wb_cbr.amr b/tree/library/extractor/src/test/assets/amr/sample_wb_cbr.amr
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_wb_cbr.amr
rename to tree/library/extractor/src/test/assets/amr/sample_wb_cbr.amr
Binary files differ
diff --git a/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.0.dump b/tree/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_wb_cbr.amr.0.dump
rename to tree/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.0.dump
diff --git a/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.1.dump b/tree/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_wb_cbr.amr.1.dump
rename to tree/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.1.dump
diff --git a/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.2.dump b/tree/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_wb_cbr.amr.2.dump
rename to tree/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.2.dump
diff --git a/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.3.dump b/tree/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_wb_cbr.amr.3.dump
rename to tree/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.3.dump
diff --git a/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump b/tree/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump
similarity index 100%
rename from library/extractor/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump
rename to tree/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump
diff --git a/library/extractor/src/test/assets/binary/ogg/vorbis_header_pages b/tree/library/extractor/src/test/assets/binary/ogg/vorbis_header_pages
similarity index 100%
rename from library/extractor/src/test/assets/binary/ogg/vorbis_header_pages
rename to tree/library/extractor/src/test/assets/binary/ogg/vorbis_header_pages
Binary files differ
diff --git a/library/extractor/src/test/assets/binary/vorbis/comment_header b/tree/library/extractor/src/test/assets/binary/vorbis/comment_header
similarity index 100%
rename from library/extractor/src/test/assets/binary/vorbis/comment_header
rename to tree/library/extractor/src/test/assets/binary/vorbis/comment_header
Binary files differ
diff --git a/library/extractor/src/test/assets/binary/vorbis/id_header b/tree/library/extractor/src/test/assets/binary/vorbis/id_header
similarity index 100%
rename from library/extractor/src/test/assets/binary/vorbis/id_header
rename to tree/library/extractor/src/test/assets/binary/vorbis/id_header
Binary files differ
diff --git a/library/extractor/src/test/assets/binary/vorbis/setup_header b/tree/library/extractor/src/test/assets/binary/vorbis/setup_header
similarity index 100%
rename from library/extractor/src/test/assets/binary/vorbis/setup_header
rename to tree/library/extractor/src/test/assets/binary/vorbis/setup_header
Binary files differ
diff --git a/library/extractor/src/test/assets/flac/bear.flac b/tree/library/extractor/src/test/assets/flac/bear.flac
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear.flac
rename to tree/library/extractor/src/test/assets/flac/bear.flac
Binary files differ
diff --git a/library/extractor/src/test/assets/flac/bear.flac.0.dump b/tree/library/extractor/src/test/assets/flac/bear.flac.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear.flac.0.dump
rename to tree/library/extractor/src/test/assets/flac/bear.flac.0.dump
diff --git a/library/extractor/src/test/assets/flac/bear.flac.1.dump b/tree/library/extractor/src/test/assets/flac/bear.flac.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear.flac.1.dump
rename to tree/library/extractor/src/test/assets/flac/bear.flac.1.dump
diff --git a/library/extractor/src/test/assets/flac/bear.flac.2.dump b/tree/library/extractor/src/test/assets/flac/bear.flac.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear.flac.2.dump
rename to tree/library/extractor/src/test/assets/flac/bear.flac.2.dump
diff --git a/library/extractor/src/test/assets/flac/bear.flac.3.dump b/tree/library/extractor/src/test/assets/flac/bear.flac.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear.flac.3.dump
rename to tree/library/extractor/src/test/assets/flac/bear.flac.3.dump
diff --git a/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac b/tree/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac
rename to tree/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac
Binary files differ
diff --git a/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.0.dump b/tree/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.0.dump
rename to tree/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.0.dump
diff --git a/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.1.dump b/tree/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.1.dump
rename to tree/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.1.dump
diff --git a/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.2.dump b/tree/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.2.dump
rename to tree/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.2.dump
diff --git a/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.3.dump b/tree/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.3.dump
rename to tree/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.3.dump
diff --git a/library/extractor/src/test/assets/flac/bear_no_num_samples.flac b/tree/library/extractor/src/test/assets/flac/bear_no_num_samples.flac
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_no_num_samples.flac
rename to tree/library/extractor/src/test/assets/flac/bear_no_num_samples.flac
Binary files differ
diff --git a/library/extractor/src/test/assets/flac/bear_no_num_samples.flac.0.dump b/tree/library/extractor/src/test/assets/flac/bear_no_num_samples.flac.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_no_num_samples.flac.0.dump
rename to tree/library/extractor/src/test/assets/flac/bear_no_num_samples.flac.0.dump
diff --git a/library/extractor/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac b/tree/library/extractor/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac
rename to tree/library/extractor/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac
Binary files differ
diff --git a/library/extractor/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac.0.dump b/tree/library/extractor/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac.0.dump
rename to tree/library/extractor/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac.0.dump
diff --git a/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac b/tree/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_one_metadata_block.flac
rename to tree/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac
Binary files differ
diff --git a/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.0.dump b/tree/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.0.dump
rename to tree/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.0.dump
diff --git a/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.1.dump b/tree/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.1.dump
rename to tree/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.1.dump
diff --git a/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.2.dump b/tree/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.2.dump
rename to tree/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.2.dump
diff --git a/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.3.dump b/tree/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.3.dump
rename to tree/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.3.dump
diff --git a/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.unklen.dump b/tree/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.unklen.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.unklen.dump
rename to tree/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.unklen.dump
diff --git a/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac b/tree/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac
rename to tree/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac
Binary files differ
diff --git a/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.0.dump b/tree/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.0.dump
rename to tree/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.0.dump
diff --git a/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.1.dump b/tree/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.1.dump
rename to tree/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.1.dump
diff --git a/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.2.dump b/tree/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.2.dump
rename to tree/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.2.dump
diff --git a/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.3.dump b/tree/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.3.dump
rename to tree/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.3.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac b/tree/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac
rename to tree/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac
Binary files differ
diff --git a/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.0.dump b/tree/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.0.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.0.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.1.dump b/tree/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.1.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.1.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.2.dump b/tree/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.2.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.2.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.3.dump b/tree/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.3.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.3.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac b/tree/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac
rename to tree/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac
Binary files differ
diff --git a/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.0.dump b/tree/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.0.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.0.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.1.dump b/tree/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.1.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.1.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.2.dump b/tree/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.2.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.2.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.3.dump b/tree/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.3.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.3.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_picture.flac b/tree/library/extractor/src/test/assets/flac/bear_with_picture.flac
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_picture.flac
rename to tree/library/extractor/src/test/assets/flac/bear_with_picture.flac
Binary files differ
diff --git a/library/extractor/src/test/assets/flac/bear_with_picture.flac.0.dump b/tree/library/extractor/src/test/assets/flac/bear_with_picture.flac.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_picture.flac.0.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_picture.flac.0.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_picture.flac.1.dump b/tree/library/extractor/src/test/assets/flac/bear_with_picture.flac.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_picture.flac.1.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_picture.flac.1.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_picture.flac.2.dump b/tree/library/extractor/src/test/assets/flac/bear_with_picture.flac.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_picture.flac.2.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_picture.flac.2.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_picture.flac.3.dump b/tree/library/extractor/src/test/assets/flac/bear_with_picture.flac.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_picture.flac.3.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_picture.flac.3.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac b/tree/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac
rename to tree/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac
Binary files differ
diff --git a/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.0.dump b/tree/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.0.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.0.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.1.dump b/tree/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.1.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.1.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.2.dump b/tree/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.2.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.2.dump
diff --git a/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.3.dump b/tree/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.3.dump
rename to tree/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.3.dump
diff --git a/library/extractor/src/test/assets/flv/sample.flv b/tree/library/extractor/src/test/assets/flv/sample.flv
similarity index 100%
rename from library/extractor/src/test/assets/flv/sample.flv
rename to tree/library/extractor/src/test/assets/flv/sample.flv
Binary files differ
diff --git a/library/extractor/src/test/assets/flv/sample.flv.0.dump b/tree/library/extractor/src/test/assets/flv/sample.flv.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/flv/sample.flv.0.dump
rename to tree/library/extractor/src/test/assets/flv/sample.flv.0.dump
diff --git a/library/extractor/src/test/assets/id3/apic.id3 b/tree/library/extractor/src/test/assets/id3/apic.id3
similarity index 100%
rename from library/extractor/src/test/assets/id3/apic.id3
rename to tree/library/extractor/src/test/assets/id3/apic.id3
Binary files differ
diff --git a/library/extractor/src/test/assets/id3/comm_apic.id3 b/tree/library/extractor/src/test/assets/id3/comm_apic.id3
similarity index 100%
rename from library/extractor/src/test/assets/id3/comm_apic.id3
rename to tree/library/extractor/src/test/assets/id3/comm_apic.id3
Binary files differ
diff --git a/library/extractor/src/test/assets/mkv/full_blocks.mkv b/tree/library/extractor/src/test/assets/mkv/full_blocks.mkv
similarity index 100%
rename from library/extractor/src/test/assets/mkv/full_blocks.mkv
rename to tree/library/extractor/src/test/assets/mkv/full_blocks.mkv
Binary files differ
diff --git a/library/extractor/src/test/assets/mkv/full_blocks.mkv.0.dump b/tree/library/extractor/src/test/assets/mkv/full_blocks.mkv.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mkv/full_blocks.mkv.0.dump
rename to tree/library/extractor/src/test/assets/mkv/full_blocks.mkv.0.dump
diff --git a/library/extractor/src/test/assets/mkv/full_blocks.mkv.1.dump b/tree/library/extractor/src/test/assets/mkv/full_blocks.mkv.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/mkv/full_blocks.mkv.1.dump
rename to tree/library/extractor/src/test/assets/mkv/full_blocks.mkv.1.dump
diff --git a/library/extractor/src/test/assets/mkv/full_blocks.mkv.2.dump b/tree/library/extractor/src/test/assets/mkv/full_blocks.mkv.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/mkv/full_blocks.mkv.2.dump
rename to tree/library/extractor/src/test/assets/mkv/full_blocks.mkv.2.dump
diff --git a/library/extractor/src/test/assets/mkv/full_blocks.mkv.3.dump b/tree/library/extractor/src/test/assets/mkv/full_blocks.mkv.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/mkv/full_blocks.mkv.3.dump
rename to tree/library/extractor/src/test/assets/mkv/full_blocks.mkv.3.dump
diff --git a/library/extractor/src/test/assets/mkv/sample.mkv b/tree/library/extractor/src/test/assets/mkv/sample.mkv
similarity index 100%
rename from library/extractor/src/test/assets/mkv/sample.mkv
rename to tree/library/extractor/src/test/assets/mkv/sample.mkv
Binary files differ
diff --git a/library/extractor/src/test/assets/mkv/sample.mkv.0.dump b/tree/library/extractor/src/test/assets/mkv/sample.mkv.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mkv/sample.mkv.0.dump
rename to tree/library/extractor/src/test/assets/mkv/sample.mkv.0.dump
diff --git a/library/extractor/src/test/assets/mkv/sample.mkv.1.dump b/tree/library/extractor/src/test/assets/mkv/sample.mkv.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/mkv/sample.mkv.1.dump
rename to tree/library/extractor/src/test/assets/mkv/sample.mkv.1.dump
diff --git a/library/extractor/src/test/assets/mkv/sample.mkv.2.dump b/tree/library/extractor/src/test/assets/mkv/sample.mkv.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/mkv/sample.mkv.2.dump
rename to tree/library/extractor/src/test/assets/mkv/sample.mkv.2.dump
diff --git a/library/extractor/src/test/assets/mkv/sample.mkv.3.dump b/tree/library/extractor/src/test/assets/mkv/sample.mkv.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/mkv/sample.mkv.3.dump
rename to tree/library/extractor/src/test/assets/mkv/sample.mkv.3.dump
diff --git a/library/extractor/src/test/assets/mkv/subsample_encrypted_altref.webm b/tree/library/extractor/src/test/assets/mkv/subsample_encrypted_altref.webm
similarity index 100%
rename from library/extractor/src/test/assets/mkv/subsample_encrypted_altref.webm
rename to tree/library/extractor/src/test/assets/mkv/subsample_encrypted_altref.webm
Binary files differ
diff --git a/library/extractor/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump b/tree/library/extractor/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump
rename to tree/library/extractor/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump
diff --git a/library/extractor/src/test/assets/mkv/subsample_encrypted_noaltref.webm b/tree/library/extractor/src/test/assets/mkv/subsample_encrypted_noaltref.webm
similarity index 100%
rename from library/extractor/src/test/assets/mkv/subsample_encrypted_noaltref.webm
rename to tree/library/extractor/src/test/assets/mkv/subsample_encrypted_noaltref.webm
Binary files differ
diff --git a/library/extractor/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump b/tree/library/extractor/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump
rename to tree/library/extractor/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump
diff --git a/library/extractor/src/test/assets/mp3/bear.mp3 b/tree/library/extractor/src/test/assets/mp3/bear.mp3
similarity index 100%
rename from library/extractor/src/test/assets/mp3/bear.mp3
rename to tree/library/extractor/src/test/assets/mp3/bear.mp3
Binary files differ
diff --git a/library/extractor/src/test/assets/mp3/bear.mp3.0.dump b/tree/library/extractor/src/test/assets/mp3/bear.mp3.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp3/bear.mp3.0.dump
rename to tree/library/extractor/src/test/assets/mp3/bear.mp3.0.dump
diff --git a/library/extractor/src/test/assets/mp3/bear.mp3.1.dump b/tree/library/extractor/src/test/assets/mp3/bear.mp3.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp3/bear.mp3.1.dump
rename to tree/library/extractor/src/test/assets/mp3/bear.mp3.1.dump
diff --git a/library/extractor/src/test/assets/mp3/bear.mp3.2.dump b/tree/library/extractor/src/test/assets/mp3/bear.mp3.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp3/bear.mp3.2.dump
rename to tree/library/extractor/src/test/assets/mp3/bear.mp3.2.dump
diff --git a/library/extractor/src/test/assets/mp3/bear.mp3.3.dump b/tree/library/extractor/src/test/assets/mp3/bear.mp3.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp3/bear.mp3.3.dump
rename to tree/library/extractor/src/test/assets/mp3/bear.mp3.3.dump
diff --git a/library/extractor/src/test/assets/mp3/play-trimmed.mp3 b/tree/library/extractor/src/test/assets/mp3/play-trimmed.mp3
similarity index 100%
rename from library/extractor/src/test/assets/mp3/play-trimmed.mp3
rename to tree/library/extractor/src/test/assets/mp3/play-trimmed.mp3
Binary files differ
diff --git a/library/extractor/src/test/assets/mp3/play-trimmed.mp3.0.dump b/tree/library/extractor/src/test/assets/mp3/play-trimmed.mp3.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp3/play-trimmed.mp3.0.dump
rename to tree/library/extractor/src/test/assets/mp3/play-trimmed.mp3.0.dump
diff --git a/library/extractor/src/test/assets/mp3/play-trimmed.mp3.1.dump b/tree/library/extractor/src/test/assets/mp3/play-trimmed.mp3.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp3/play-trimmed.mp3.1.dump
rename to tree/library/extractor/src/test/assets/mp3/play-trimmed.mp3.1.dump
diff --git a/library/extractor/src/test/assets/mp3/play-trimmed.mp3.2.dump b/tree/library/extractor/src/test/assets/mp3/play-trimmed.mp3.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp3/play-trimmed.mp3.2.dump
rename to tree/library/extractor/src/test/assets/mp3/play-trimmed.mp3.2.dump
diff --git a/library/extractor/src/test/assets/mp3/play-trimmed.mp3.3.dump b/tree/library/extractor/src/test/assets/mp3/play-trimmed.mp3.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp3/play-trimmed.mp3.3.dump
rename to tree/library/extractor/src/test/assets/mp3/play-trimmed.mp3.3.dump
diff --git a/library/extractor/src/test/assets/mp3/play-trimmed.mp3.unklen.dump b/tree/library/extractor/src/test/assets/mp3/play-trimmed.mp3.unklen.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp3/play-trimmed.mp3.unklen.dump
rename to tree/library/extractor/src/test/assets/mp3/play-trimmed.mp3.unklen.dump
diff --git a/library/extractor/src/test/assets/mp4/sample.mp4 b/tree/library/extractor/src/test/assets/mp4/sample.mp4
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample.mp4
rename to tree/library/extractor/src/test/assets/mp4/sample.mp4
Binary files differ
diff --git a/library/extractor/src/test/assets/mp4/sample.mp4.0.dump b/tree/library/extractor/src/test/assets/mp4/sample.mp4.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample.mp4.0.dump
rename to tree/library/extractor/src/test/assets/mp4/sample.mp4.0.dump
diff --git a/library/extractor/src/test/assets/mp4/sample.mp4.1.dump b/tree/library/extractor/src/test/assets/mp4/sample.mp4.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample.mp4.1.dump
rename to tree/library/extractor/src/test/assets/mp4/sample.mp4.1.dump
diff --git a/library/extractor/src/test/assets/mp4/sample.mp4.2.dump b/tree/library/extractor/src/test/assets/mp4/sample.mp4.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample.mp4.2.dump
rename to tree/library/extractor/src/test/assets/mp4/sample.mp4.2.dump
diff --git a/library/extractor/src/test/assets/mp4/sample.mp4.3.dump b/tree/library/extractor/src/test/assets/mp4/sample.mp4.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample.mp4.3.dump
rename to tree/library/extractor/src/test/assets/mp4/sample.mp4.3.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4.mp4 b/tree/library/extractor/src/test/assets/mp4/sample_ac4.mp4
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4.mp4
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4.mp4
Binary files differ
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4.mp4.0.dump b/tree/library/extractor/src/test/assets/mp4/sample_ac4.mp4.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4.mp4.0.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4.mp4.0.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4.mp4.1.dump b/tree/library/extractor/src/test/assets/mp4/sample_ac4.mp4.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4.mp4.1.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4.mp4.1.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4.mp4.2.dump b/tree/library/extractor/src/test/assets/mp4/sample_ac4.mp4.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4.mp4.2.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4.mp4.2.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4.mp4.3.dump b/tree/library/extractor/src/test/assets/mp4/sample_ac4.mp4.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4.mp4.3.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4.mp4.3.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4 b/tree/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4
Binary files differ
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump b/tree/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump b/tree/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump b/tree/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump b/tree/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4 b/tree/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4
Binary files differ
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump b/tree/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump b/tree/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump b/tree/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump b/tree/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4 b/tree/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4
rename to tree/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4
Binary files differ
diff --git a/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump b/tree/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump b/tree/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump b/tree/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump b/tree/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_fragmented.mp4 b/tree/library/extractor/src/test/assets/mp4/sample_fragmented.mp4
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_fragmented.mp4
rename to tree/library/extractor/src/test/assets/mp4/sample_fragmented.mp4
Binary files differ
diff --git a/library/extractor/src/test/assets/mp4/sample_fragmented.mp4.0.dump b/tree/library/extractor/src/test/assets/mp4/sample_fragmented.mp4.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_fragmented.mp4.0.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_fragmented.mp4.0.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4 b/tree/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4
rename to tree/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4
Binary files differ
diff --git a/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump b/tree/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump b/tree/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump b/tree/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump b/tree/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_fragmented_sei.mp4 b/tree/library/extractor/src/test/assets/mp4/sample_fragmented_sei.mp4
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_fragmented_sei.mp4
rename to tree/library/extractor/src/test/assets/mp4/sample_fragmented_sei.mp4
Binary files differ
diff --git a/library/extractor/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump b/tree/library/extractor/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4 b/tree/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4
rename to tree/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4
Binary files differ
diff --git a/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump b/tree/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump b/tree/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump b/tree/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump
diff --git a/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump b/tree/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump
rename to tree/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump
diff --git a/library/extractor/src/test/assets/ogg/bear.opus b/tree/library/extractor/src/test/assets/ogg/bear.opus
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear.opus
rename to tree/library/extractor/src/test/assets/ogg/bear.opus
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/bear.opus.0.dump b/tree/library/extractor/src/test/assets/ogg/bear.opus.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear.opus.0.dump
rename to tree/library/extractor/src/test/assets/ogg/bear.opus.0.dump
diff --git a/library/extractor/src/test/assets/ogg/bear.opus.1.dump b/tree/library/extractor/src/test/assets/ogg/bear.opus.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear.opus.1.dump
rename to tree/library/extractor/src/test/assets/ogg/bear.opus.1.dump
diff --git a/library/extractor/src/test/assets/ogg/bear.opus.2.dump b/tree/library/extractor/src/test/assets/ogg/bear.opus.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear.opus.2.dump
rename to tree/library/extractor/src/test/assets/ogg/bear.opus.2.dump
diff --git a/library/extractor/src/test/assets/ogg/bear.opus.3.dump b/tree/library/extractor/src/test/assets/ogg/bear.opus.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear.opus.3.dump
rename to tree/library/extractor/src/test/assets/ogg/bear.opus.3.dump
diff --git a/library/extractor/src/test/assets/ogg/bear.opus.unklen.dump b/tree/library/extractor/src/test/assets/ogg/bear.opus.unklen.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear.opus.unklen.dump
rename to tree/library/extractor/src/test/assets/ogg/bear.opus.unklen.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_flac.ogg b/tree/library/extractor/src/test/assets/ogg/bear_flac.ogg
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_flac.ogg
rename to tree/library/extractor/src/test/assets/ogg/bear_flac.ogg
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/bear_flac.ogg.0.dump b/tree/library/extractor/src/test/assets/ogg/bear_flac.ogg.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_flac.ogg.0.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_flac.ogg.0.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_flac.ogg.1.dump b/tree/library/extractor/src/test/assets/ogg/bear_flac.ogg.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_flac.ogg.1.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_flac.ogg.1.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_flac.ogg.2.dump b/tree/library/extractor/src/test/assets/ogg/bear_flac.ogg.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_flac.ogg.2.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_flac.ogg.2.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_flac.ogg.3.dump b/tree/library/extractor/src/test/assets/ogg/bear_flac.ogg.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_flac.ogg.3.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_flac.ogg.3.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_flac.ogg.unklen.dump b/tree/library/extractor/src/test/assets/ogg/bear_flac.ogg.unklen.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_flac.ogg.unklen.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_flac.ogg.unklen.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg b/tree/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg
rename to tree/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump b/tree/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump b/tree/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump b/tree/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump b/tree/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump b/tree/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_vorbis.ogg b/tree/library/extractor/src/test/assets/ogg/bear_vorbis.ogg
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_vorbis.ogg
rename to tree/library/extractor/src/test/assets/ogg/bear_vorbis.ogg
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.0.dump b/tree/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_vorbis.ogg.0.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.0.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.1.dump b/tree/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_vorbis.ogg.1.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.1.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.2.dump b/tree/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_vorbis.ogg.2.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.2.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.3.dump b/tree/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_vorbis.ogg.3.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.3.dump
diff --git a/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump b/tree/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump
similarity index 100%
rename from library/extractor/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump
rename to tree/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump
diff --git a/library/extractor/src/test/assets/ogg/continued_packet_at_start b/tree/library/extractor/src/test/assets/ogg/continued_packet_at_start
similarity index 100%
rename from library/extractor/src/test/assets/ogg/continued_packet_at_start
rename to tree/library/extractor/src/test/assets/ogg/continued_packet_at_start
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/continued_packet_over_four_pages b/tree/library/extractor/src/test/assets/ogg/continued_packet_over_four_pages
similarity index 100%
rename from library/extractor/src/test/assets/ogg/continued_packet_over_four_pages
rename to tree/library/extractor/src/test/assets/ogg/continued_packet_over_four_pages
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/continued_packet_over_two_pages b/tree/library/extractor/src/test/assets/ogg/continued_packet_over_two_pages
similarity index 100%
rename from library/extractor/src/test/assets/ogg/continued_packet_over_two_pages
rename to tree/library/extractor/src/test/assets/ogg/continued_packet_over_two_pages
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/eof_header b/tree/library/extractor/src/test/assets/ogg/eof_header
similarity index 100%
rename from library/extractor/src/test/assets/ogg/eof_header
rename to tree/library/extractor/src/test/assets/ogg/eof_header
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/flac_header b/tree/library/extractor/src/test/assets/ogg/flac_header
similarity index 100%
rename from library/extractor/src/test/assets/ogg/flac_header
rename to tree/library/extractor/src/test/assets/ogg/flac_header
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/four_packets_with_empty_page b/tree/library/extractor/src/test/assets/ogg/four_packets_with_empty_page
similarity index 100%
rename from library/extractor/src/test/assets/ogg/four_packets_with_empty_page
rename to tree/library/extractor/src/test/assets/ogg/four_packets_with_empty_page
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/invalid_header b/tree/library/extractor/src/test/assets/ogg/invalid_header
similarity index 100%
rename from library/extractor/src/test/assets/ogg/invalid_header
rename to tree/library/extractor/src/test/assets/ogg/invalid_header
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/invalid_ogg_header b/tree/library/extractor/src/test/assets/ogg/invalid_ogg_header
similarity index 100%
rename from library/extractor/src/test/assets/ogg/invalid_ogg_header
rename to tree/library/extractor/src/test/assets/ogg/invalid_ogg_header
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/opus_header b/tree/library/extractor/src/test/assets/ogg/opus_header
similarity index 100%
rename from library/extractor/src/test/assets/ogg/opus_header
rename to tree/library/extractor/src/test/assets/ogg/opus_header
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/packet_with_zero_size_terminator b/tree/library/extractor/src/test/assets/ogg/packet_with_zero_size_terminator
similarity index 100%
rename from library/extractor/src/test/assets/ogg/packet_with_zero_size_terminator
rename to tree/library/extractor/src/test/assets/ogg/packet_with_zero_size_terminator
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/page_header b/tree/library/extractor/src/test/assets/ogg/page_header
similarity index 100%
rename from library/extractor/src/test/assets/ogg/page_header
rename to tree/library/extractor/src/test/assets/ogg/page_header
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/random_1000_pages b/tree/library/extractor/src/test/assets/ogg/random_1000_pages
similarity index 100%
rename from library/extractor/src/test/assets/ogg/random_1000_pages
rename to tree/library/extractor/src/test/assets/ogg/random_1000_pages
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/three_headers b/tree/library/extractor/src/test/assets/ogg/three_headers
similarity index 100%
rename from library/extractor/src/test/assets/ogg/three_headers
rename to tree/library/extractor/src/test/assets/ogg/three_headers
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/vorbis_header b/tree/library/extractor/src/test/assets/ogg/vorbis_header
similarity index 100%
rename from library/extractor/src/test/assets/ogg/vorbis_header
rename to tree/library/extractor/src/test/assets/ogg/vorbis_header
Binary files differ
diff --git a/library/extractor/src/test/assets/ogg/zero_sized_packets_at_end_of_stream b/tree/library/extractor/src/test/assets/ogg/zero_sized_packets_at_end_of_stream
similarity index 100%
rename from library/extractor/src/test/assets/ogg/zero_sized_packets_at_end_of_stream
rename to tree/library/extractor/src/test/assets/ogg/zero_sized_packets_at_end_of_stream
Binary files differ
diff --git a/library/extractor/src/test/assets/rawcc/sample.rawcc b/tree/library/extractor/src/test/assets/rawcc/sample.rawcc
similarity index 100%
rename from library/extractor/src/test/assets/rawcc/sample.rawcc
rename to tree/library/extractor/src/test/assets/rawcc/sample.rawcc
Binary files differ
diff --git a/library/extractor/src/test/assets/rawcc/sample.rawcc.0.dump b/tree/library/extractor/src/test/assets/rawcc/sample.rawcc.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/rawcc/sample.rawcc.0.dump
rename to tree/library/extractor/src/test/assets/rawcc/sample.rawcc.0.dump
diff --git a/library/extractor/src/test/assets/ts/bbb_2500ms.ts b/tree/library/extractor/src/test/assets/ts/bbb_2500ms.ts
similarity index 100%
rename from library/extractor/src/test/assets/ts/bbb_2500ms.ts
rename to tree/library/extractor/src/test/assets/ts/bbb_2500ms.ts
Binary files differ
diff --git a/library/extractor/src/test/assets/ts/elephants_dream.mpg b/tree/library/extractor/src/test/assets/ts/elephants_dream.mpg
similarity index 100%
rename from library/extractor/src/test/assets/ts/elephants_dream.mpg
rename to tree/library/extractor/src/test/assets/ts/elephants_dream.mpg
Binary files differ
diff --git a/library/extractor/src/test/assets/ts/sample.ac3 b/tree/library/extractor/src/test/assets/ts/sample.ac3
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ac3
rename to tree/library/extractor/src/test/assets/ts/sample.ac3
Binary files differ
diff --git a/library/extractor/src/test/assets/ts/sample.ac3.0.dump b/tree/library/extractor/src/test/assets/ts/sample.ac3.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ac3.0.dump
rename to tree/library/extractor/src/test/assets/ts/sample.ac3.0.dump
diff --git a/library/extractor/src/test/assets/ts/sample.ac4 b/tree/library/extractor/src/test/assets/ts/sample.ac4
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ac4
rename to tree/library/extractor/src/test/assets/ts/sample.ac4
Binary files differ
diff --git a/library/extractor/src/test/assets/ts/sample.ac4.0.dump b/tree/library/extractor/src/test/assets/ts/sample.ac4.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ac4.0.dump
rename to tree/library/extractor/src/test/assets/ts/sample.ac4.0.dump
diff --git a/library/extractor/src/test/assets/ts/sample.adts b/tree/library/extractor/src/test/assets/ts/sample.adts
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.adts
rename to tree/library/extractor/src/test/assets/ts/sample.adts
Binary files differ
diff --git a/library/extractor/src/test/assets/ts/sample.adts.0.dump b/tree/library/extractor/src/test/assets/ts/sample.adts.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.adts.0.dump
rename to tree/library/extractor/src/test/assets/ts/sample.adts.0.dump
diff --git a/library/extractor/src/test/assets/ts/sample.eac3 b/tree/library/extractor/src/test/assets/ts/sample.eac3
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.eac3
rename to tree/library/extractor/src/test/assets/ts/sample.eac3
Binary files differ
diff --git a/library/extractor/src/test/assets/ts/sample.eac3.0.dump b/tree/library/extractor/src/test/assets/ts/sample.eac3.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.eac3.0.dump
rename to tree/library/extractor/src/test/assets/ts/sample.eac3.0.dump
diff --git a/library/extractor/src/test/assets/ts/sample.ps b/tree/library/extractor/src/test/assets/ts/sample.ps
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ps
rename to tree/library/extractor/src/test/assets/ts/sample.ps
Binary files differ
diff --git a/library/extractor/src/test/assets/ts/sample.ps.0.dump b/tree/library/extractor/src/test/assets/ts/sample.ps.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ps.0.dump
rename to tree/library/extractor/src/test/assets/ts/sample.ps.0.dump
diff --git a/library/extractor/src/test/assets/ts/sample.ps.1.dump b/tree/library/extractor/src/test/assets/ts/sample.ps.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ps.1.dump
rename to tree/library/extractor/src/test/assets/ts/sample.ps.1.dump
diff --git a/library/extractor/src/test/assets/ts/sample.ps.2.dump b/tree/library/extractor/src/test/assets/ts/sample.ps.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ps.2.dump
rename to tree/library/extractor/src/test/assets/ts/sample.ps.2.dump
diff --git a/library/extractor/src/test/assets/ts/sample.ps.3.dump b/tree/library/extractor/src/test/assets/ts/sample.ps.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ps.3.dump
rename to tree/library/extractor/src/test/assets/ts/sample.ps.3.dump
diff --git a/library/extractor/src/test/assets/ts/sample.ps.unklen.dump b/tree/library/extractor/src/test/assets/ts/sample.ps.unklen.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ps.unklen.dump
rename to tree/library/extractor/src/test/assets/ts/sample.ps.unklen.dump
diff --git a/library/extractor/src/test/assets/ts/sample.ts b/tree/library/extractor/src/test/assets/ts/sample.ts
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ts
rename to tree/library/extractor/src/test/assets/ts/sample.ts
Binary files differ
diff --git a/library/extractor/src/test/assets/ts/sample.ts.0.dump b/tree/library/extractor/src/test/assets/ts/sample.ts.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ts.0.dump
rename to tree/library/extractor/src/test/assets/ts/sample.ts.0.dump
diff --git a/library/extractor/src/test/assets/ts/sample.ts.1.dump b/tree/library/extractor/src/test/assets/ts/sample.ts.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ts.1.dump
rename to tree/library/extractor/src/test/assets/ts/sample.ts.1.dump
diff --git a/library/extractor/src/test/assets/ts/sample.ts.2.dump b/tree/library/extractor/src/test/assets/ts/sample.ts.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ts.2.dump
rename to tree/library/extractor/src/test/assets/ts/sample.ts.2.dump
diff --git a/library/extractor/src/test/assets/ts/sample.ts.3.dump b/tree/library/extractor/src/test/assets/ts/sample.ts.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ts.3.dump
rename to tree/library/extractor/src/test/assets/ts/sample.ts.3.dump
diff --git a/library/extractor/src/test/assets/ts/sample.ts.unklen.dump b/tree/library/extractor/src/test/assets/ts/sample.ts.unklen.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample.ts.unklen.dump
rename to tree/library/extractor/src/test/assets/ts/sample.ts.unklen.dump
diff --git a/library/extractor/src/test/assets/ts/sample_cbs.adts b/tree/library/extractor/src/test/assets/ts/sample_cbs.adts
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_cbs.adts
rename to tree/library/extractor/src/test/assets/ts/sample_cbs.adts
Binary files differ
diff --git a/library/extractor/src/test/assets/ts/sample_cbs.adts.0.dump b/tree/library/extractor/src/test/assets/ts/sample_cbs.adts.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_cbs.adts.0.dump
rename to tree/library/extractor/src/test/assets/ts/sample_cbs.adts.0.dump
diff --git a/library/extractor/src/test/assets/ts/sample_cbs.adts.1.dump b/tree/library/extractor/src/test/assets/ts/sample_cbs.adts.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_cbs.adts.1.dump
rename to tree/library/extractor/src/test/assets/ts/sample_cbs.adts.1.dump
diff --git a/library/extractor/src/test/assets/ts/sample_cbs.adts.2.dump b/tree/library/extractor/src/test/assets/ts/sample_cbs.adts.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_cbs.adts.2.dump
rename to tree/library/extractor/src/test/assets/ts/sample_cbs.adts.2.dump
diff --git a/library/extractor/src/test/assets/ts/sample_cbs.adts.3.dump b/tree/library/extractor/src/test/assets/ts/sample_cbs.adts.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_cbs.adts.3.dump
rename to tree/library/extractor/src/test/assets/ts/sample_cbs.adts.3.dump
diff --git a/library/extractor/src/test/assets/ts/sample_cbs.adts.unklen.dump b/tree/library/extractor/src/test/assets/ts/sample_cbs.adts.unklen.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_cbs.adts.unklen.dump
rename to tree/library/extractor/src/test/assets/ts/sample_cbs.adts.unklen.dump
diff --git a/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts b/tree/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_cbs_truncated.adts
rename to tree/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts
Binary files differ
diff --git a/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.0.dump b/tree/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.0.dump
rename to tree/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.0.dump
diff --git a/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.1.dump b/tree/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.1.dump
rename to tree/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.1.dump
diff --git a/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.2.dump b/tree/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.2.dump
rename to tree/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.2.dump
diff --git a/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.3.dump b/tree/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.3.dump
rename to tree/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.3.dump
diff --git a/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump b/tree/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump
rename to tree/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump
diff --git a/library/extractor/src/test/assets/ts/sample_with_sdt.ts b/tree/library/extractor/src/test/assets/ts/sample_with_sdt.ts
similarity index 100%
rename from library/extractor/src/test/assets/ts/sample_with_sdt.ts
rename to tree/library/extractor/src/test/assets/ts/sample_with_sdt.ts
Binary files differ
diff --git a/library/extractor/src/test/assets/wav/sample.wav b/tree/library/extractor/src/test/assets/wav/sample.wav
similarity index 100%
rename from library/extractor/src/test/assets/wav/sample.wav
rename to tree/library/extractor/src/test/assets/wav/sample.wav
Binary files differ
diff --git a/library/extractor/src/test/assets/wav/sample.wav.0.dump b/tree/library/extractor/src/test/assets/wav/sample.wav.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/wav/sample.wav.0.dump
rename to tree/library/extractor/src/test/assets/wav/sample.wav.0.dump
diff --git a/library/extractor/src/test/assets/wav/sample.wav.1.dump b/tree/library/extractor/src/test/assets/wav/sample.wav.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/wav/sample.wav.1.dump
rename to tree/library/extractor/src/test/assets/wav/sample.wav.1.dump
diff --git a/library/extractor/src/test/assets/wav/sample.wav.2.dump b/tree/library/extractor/src/test/assets/wav/sample.wav.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/wav/sample.wav.2.dump
rename to tree/library/extractor/src/test/assets/wav/sample.wav.2.dump
diff --git a/library/extractor/src/test/assets/wav/sample.wav.3.dump b/tree/library/extractor/src/test/assets/wav/sample.wav.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/wav/sample.wav.3.dump
rename to tree/library/extractor/src/test/assets/wav/sample.wav.3.dump
diff --git a/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav b/tree/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav
similarity index 100%
rename from library/extractor/src/test/assets/wav/sample_ima_adpcm.wav
rename to tree/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav
Binary files differ
diff --git a/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.0.dump b/tree/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.0.dump
similarity index 100%
rename from library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.0.dump
rename to tree/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.0.dump
diff --git a/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.1.dump b/tree/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.1.dump
similarity index 100%
rename from library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.1.dump
rename to tree/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.1.dump
diff --git a/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.2.dump b/tree/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.2.dump
similarity index 100%
rename from library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.2.dump
rename to tree/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.2.dump
diff --git a/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.3.dump b/tree/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.3.dump
similarity index 100%
rename from library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.3.dump
rename to tree/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.3.dump
diff --git a/library/extractor/src/test/assets/webm/vorbis_codec_private b/tree/library/extractor/src/test/assets/webm/vorbis_codec_private
similarity index 100%
rename from library/extractor/src/test/assets/webm/vorbis_codec_private
rename to tree/library/extractor/src/test/assets/webm/vorbis_codec_private
Binary files differ
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorUtilTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorUtilTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorUtilTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorUtilTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisBitArrayTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisBitArrayTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisBitArrayTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisBitArrayTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java b/tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
similarity index 100%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
rename to tree/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
diff --git a/library/hls/README.md b/tree/library/hls/README.md
similarity index 100%
rename from library/hls/README.md
rename to tree/library/hls/README.md
diff --git a/library/hls/build.gradle b/tree/library/hls/build.gradle
similarity index 100%
rename from library/hls/build.gradle
rename to tree/library/hls/build.gradle
diff --git a/library/hls/src/main/AndroidManifest.xml b/tree/library/hls/src/main/AndroidManifest.xml
similarity index 100%
rename from library/hls/src/main/AndroidManifest.xml
rename to tree/library/hls/src/main/AndroidManifest.xml
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsDataSourceFactory.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsDataSourceFactory.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsDataSourceFactory.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsDataSourceFactory.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/FullSegmentEncryptionKeyCache.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/FullSegmentEncryptionKeyCache.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/FullSegmentEncryptionKeyCache.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/FullSegmentEncryptionKeyCache.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsDataSourceFactory.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsDataSourceFactory.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsDataSourceFactory.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsDataSourceFactory.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsManifest.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsManifest.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsManifest.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsManifest.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsTrackMetadataEntry.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsTrackMetadataEntry.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsTrackMetadataEntry.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsTrackMetadataEntry.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/SampleQueueMappingException.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/SampleQueueMappingException.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/SampleQueueMappingException.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/SampleQueueMappingException.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/TimestampAdjusterProvider.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/TimestampAdjusterProvider.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/TimestampAdjusterProvider.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/TimestampAdjusterProvider.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/package-info.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/package-info.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/package-info.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/package-info.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/package-info.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/package-info.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/package-info.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/package-info.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistParserFactory.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistParserFactory.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistParserFactory.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistParserFactory.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/DefaultHlsPlaylistTracker.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/FilteringHlsPlaylistParserFactory.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/FilteringHlsPlaylistParserFactory.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/FilteringHlsPlaylistParserFactory.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/FilteringHlsPlaylistParserFactory.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylist.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylist.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylist.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylist.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParserFactory.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParserFactory.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParserFactory.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParserFactory.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/package-info.java b/tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/package-info.java
similarity index 100%
rename from library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/package-info.java
rename to tree/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/package-info.java
diff --git a/library/hls/src/test/AndroidManifest.xml b/tree/library/hls/src/test/AndroidManifest.xml
similarity index 100%
rename from library/hls/src/test/AndroidManifest.xml
rename to tree/library/hls/src/test/AndroidManifest.xml
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/Aes128DataSourceTest.java b/tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/Aes128DataSourceTest.java
similarity index 100%
rename from library/hls/src/test/java/com/google/android/exoplayer2/source/hls/Aes128DataSourceTest.java
rename to tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/Aes128DataSourceTest.java
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/FullSegmentEncryptionKeyCacheTest.java b/tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/FullSegmentEncryptionKeyCacheTest.java
similarity index 100%
rename from library/hls/src/test/java/com/google/android/exoplayer2/source/hls/FullSegmentEncryptionKeyCacheTest.java
rename to tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/FullSegmentEncryptionKeyCacheTest.java
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java b/tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
similarity index 100%
rename from library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
rename to tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java b/tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java
similarity index 100%
rename from library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java
rename to tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/WebvttExtractorTest.java
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java b/tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java
similarity index 100%
rename from library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java
rename to tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/DownloadHelperTest.java
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java b/tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java
similarity index 100%
rename from library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java
rename to tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
similarity index 100%
rename from library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
rename to tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
similarity index 100%
rename from library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
rename to tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java b/tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
similarity index 100%
rename from library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
rename to tree/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
diff --git a/library/smoothstreaming/README.md b/tree/library/smoothstreaming/README.md
similarity index 100%
rename from library/smoothstreaming/README.md
rename to tree/library/smoothstreaming/README.md
diff --git a/library/smoothstreaming/build.gradle b/tree/library/smoothstreaming/build.gradle
similarity index 100%
rename from library/smoothstreaming/build.gradle
rename to tree/library/smoothstreaming/build.gradle
diff --git a/library/smoothstreaming/src/main/AndroidManifest.xml b/tree/library/smoothstreaming/src/main/AndroidManifest.xml
similarity index 100%
rename from library/smoothstreaming/src/main/AndroidManifest.xml
rename to tree/library/smoothstreaming/src/main/AndroidManifest.xml
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java b/tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
similarity index 100%
rename from library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
rename to tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java b/tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java
similarity index 100%
rename from library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java
rename to tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java b/tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
similarity index 100%
rename from library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
rename to tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
similarity index 100%
rename from library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
rename to tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java b/tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java
similarity index 100%
rename from library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java
rename to tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java b/tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
similarity index 100%
rename from library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
rename to tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsUtil.java b/tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsUtil.java
similarity index 100%
rename from library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsUtil.java
rename to tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsUtil.java
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/package-info.java b/tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/package-info.java
similarity index 100%
rename from library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/package-info.java
rename to tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/package-info.java
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java b/tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
similarity index 100%
rename from library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
rename to tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/package-info.java b/tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/package-info.java
similarity index 100%
rename from library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/package-info.java
rename to tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/package-info.java
diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/package-info.java b/tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/package-info.java
similarity index 100%
rename from library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/package-info.java
rename to tree/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/package-info.java
diff --git a/library/smoothstreaming/src/test/AndroidManifest.xml b/tree/library/smoothstreaming/src/test/AndroidManifest.xml
similarity index 100%
rename from library/smoothstreaming/src/test/AndroidManifest.xml
rename to tree/library/smoothstreaming/src/test/AndroidManifest.xml
diff --git a/library/smoothstreaming/src/test/assets/sample_ismc_1 b/tree/library/smoothstreaming/src/test/assets/sample_ismc_1
similarity index 100%
rename from library/smoothstreaming/src/test/assets/sample_ismc_1
rename to tree/library/smoothstreaming/src/test/assets/sample_ismc_1
diff --git a/library/smoothstreaming/src/test/assets/sample_ismc_2 b/tree/library/smoothstreaming/src/test/assets/sample_ismc_2
similarity index 100%
rename from library/smoothstreaming/src/test/assets/sample_ismc_2
rename to tree/library/smoothstreaming/src/test/assets/sample_ismc_2
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java b/tree/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
similarity index 100%
rename from library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
rename to tree/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriodTest.java
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsTestUtils.java b/tree/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsTestUtils.java
similarity index 100%
rename from library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsTestUtils.java
rename to tree/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/SsTestUtils.java
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java b/tree/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java
similarity index 100%
rename from library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java
rename to tree/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java b/tree/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
similarity index 100%
rename from library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
rename to tree/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java b/tree/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java
similarity index 100%
rename from library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java
rename to tree/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/DownloadHelperTest.java
diff --git a/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java b/tree/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
similarity index 100%
rename from library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
rename to tree/library/smoothstreaming/src/test/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloaderTest.java
diff --git a/library/ui/README.md b/tree/library/ui/README.md
similarity index 100%
rename from library/ui/README.md
rename to tree/library/ui/README.md
diff --git a/library/ui/build.gradle b/tree/library/ui/build.gradle
similarity index 100%
rename from library/ui/build.gradle
rename to tree/library/ui/build.gradle
diff --git a/library/ui/src/main/AndroidManifest.xml b/tree/library/ui/src/main/AndroidManifest.xml
similarity index 100%
rename from library/ui/src/main/AndroidManifest.xml
rename to tree/library/ui/src/main/AndroidManifest.xml
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTrackNameProvider.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationHelper.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/DownloadNotificationUtil.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/TimeBar.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackNameProvider.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackNameProvider.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackNameProvider.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackNameProvider.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/package-info.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/package-info.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/package-info.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/package-info.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/OrientationListener.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/ProjectionRenderer.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SceneRenderer.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SingleTapListener.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SingleTapListener.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SingleTapListener.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SingleTapListener.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalGLSurfaceView.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalGLSurfaceView.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalGLSurfaceView.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/SphericalGLSurfaceView.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/TouchTracker.java
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/package-info.java b/tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/package-info.java
similarity index 100%
rename from library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/package-info.java
rename to tree/library/ui/src/main/java/com/google/android/exoplayer2/ui/spherical/package-info.java
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fastforward.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fastforward.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fastforward.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fastforward.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_next.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_next.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_next.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_next.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_pause.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_pause.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_pause.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_pause.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_play.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_play.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_play.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_play.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_previous.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_previous.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_previous.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_previous.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_rewind.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_rewind.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_rewind.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_rewind.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_stop.xml b/tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_stop.xml
similarity index 100%
rename from library/ui/src/main/res/drawable-anydpi-v21/exo_icon_stop.xml
rename to tree/library/ui/src/main/res/drawable-anydpi-v21/exo_icon_stop.xml
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_circular_play.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_circular_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_circular_play.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_circular_play.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_fastforward.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_fastforward.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_fastforward.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_fastforward.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_enter.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_enter.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_enter.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_enter.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_exit.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_exit.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_exit.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_fullscreen_exit.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_next.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_next.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_next.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_next.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_pause.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_pause.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_pause.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_pause.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_play.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_play.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_play.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_previous.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_previous.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_previous.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_previous.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_all.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_all.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_all.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_all.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_off.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_off.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_off.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_one.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_one.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_one.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_repeat_one.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_rewind.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_rewind.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_rewind.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_rewind.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_off.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_off.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_off.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_on.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_on.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_on.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_shuffle_on.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_stop.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_stop.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_stop.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_stop.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_icon_vr.png b/tree/library/ui/src/main/res/drawable-hdpi/exo_icon_vr.png
similarity index 100%
rename from library/ui/src/main/res/drawable-hdpi/exo_icon_vr.png
rename to tree/library/ui/src/main/res/drawable-hdpi/exo_icon_vr.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_circular_play.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_circular_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_circular_play.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_circular_play.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_fastforward.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_fastforward.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_fastforward.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_fastforward.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_enter.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_enter.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_enter.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_enter.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_exit.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_exit.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_exit.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_fullscreen_exit.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_next.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_next.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_next.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_next.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_pause.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_pause.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_pause.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_pause.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_play.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_play.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_play.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_previous.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_previous.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_previous.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_previous.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_all.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_all.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_all.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_all.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_off.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_off.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_off.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_one.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_one.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_one.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_repeat_one.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_rewind.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_rewind.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_rewind.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_rewind.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_off.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_off.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_off.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_on.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_on.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_on.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_shuffle_on.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_stop.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_stop.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_stop.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_stop.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-ldpi/exo_icon_vr.png b/tree/library/ui/src/main/res/drawable-ldpi/exo_icon_vr.png
similarity index 100%
rename from library/ui/src/main/res/drawable-ldpi/exo_icon_vr.png
rename to tree/library/ui/src/main/res/drawable-ldpi/exo_icon_vr.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_circular_play.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_circular_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_circular_play.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_circular_play.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_fastforward.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_fastforward.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_fastforward.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_fastforward.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_enter.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_enter.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_enter.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_enter.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_exit.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_exit.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_exit.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_fullscreen_exit.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_next.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_next.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_next.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_next.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_pause.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_pause.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_pause.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_pause.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_play.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_play.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_play.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_previous.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_previous.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_previous.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_previous.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_all.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_all.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_all.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_all.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_off.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_off.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_off.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_one.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_one.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_one.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_repeat_one.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_rewind.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_rewind.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_rewind.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_rewind.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_off.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_off.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_off.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_on.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_on.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_on.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_shuffle_on.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_stop.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_stop.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_stop.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_stop.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-mdpi/exo_icon_vr.png b/tree/library/ui/src/main/res/drawable-mdpi/exo_icon_vr.png
similarity index 100%
rename from library/ui/src/main/res/drawable-mdpi/exo_icon_vr.png
rename to tree/library/ui/src/main/res/drawable-mdpi/exo_icon_vr.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_circular_play.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_circular_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_circular_play.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_circular_play.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_fastforward.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_fastforward.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_fastforward.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_fastforward.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_enter.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_enter.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_enter.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_enter.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_exit.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_exit.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_exit.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_fullscreen_exit.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_next.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_next.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_next.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_next.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_pause.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_pause.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_pause.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_pause.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_play.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_play.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_play.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_previous.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_previous.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_previous.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_previous.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_all.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_all.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_all.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_all.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_off.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_off.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_off.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_one.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_one.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_one.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_repeat_one.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_rewind.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_rewind.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_rewind.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_rewind.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_off.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_off.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_off.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_on.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_on.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_on.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_shuffle_on.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_stop.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_stop.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_stop.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_stop.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_icon_vr.png b/tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_vr.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xhdpi/exo_icon_vr.png
rename to tree/library/ui/src/main/res/drawable-xhdpi/exo_icon_vr.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_circular_play.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_circular_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_circular_play.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_circular_play.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fastforward.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fastforward.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_fastforward.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fastforward.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_enter.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_enter.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_enter.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_enter.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_exit.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_exit.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_exit.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_fullscreen_exit.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_next.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_next.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_next.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_next.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_pause.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_pause.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_pause.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_pause.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_play.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_play.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_play.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_previous.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_previous.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_previous.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_previous.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_all.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_all.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_all.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_all.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_off.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_off.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_off.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_one.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_one.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_one.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_repeat_one.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_rewind.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_rewind.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_rewind.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_rewind.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_off.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_off.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_off.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_off.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_on.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_on.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_on.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_shuffle_on.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_stop.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_stop.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_stop.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_stop.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_icon_vr.png b/tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_vr.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxhdpi/exo_icon_vr.png
rename to tree/library/ui/src/main/res/drawable-xxhdpi/exo_icon_vr.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable-xxxhdpi/exo_icon_circular_play.png b/tree/library/ui/src/main/res/drawable-xxxhdpi/exo_icon_circular_play.png
similarity index 100%
rename from library/ui/src/main/res/drawable-xxxhdpi/exo_icon_circular_play.png
rename to tree/library/ui/src/main/res/drawable-xxxhdpi/exo_icon_circular_play.png
Binary files differ
diff --git a/library/ui/src/main/res/drawable/exo_edit_mode_logo.xml b/tree/library/ui/src/main/res/drawable/exo_edit_mode_logo.xml
similarity index 100%
rename from library/ui/src/main/res/drawable/exo_edit_mode_logo.xml
rename to tree/library/ui/src/main/res/drawable/exo_edit_mode_logo.xml
diff --git a/library/ui/src/main/res/layout/exo_list_divider.xml b/tree/library/ui/src/main/res/layout/exo_list_divider.xml
similarity index 100%
rename from library/ui/src/main/res/layout/exo_list_divider.xml
rename to tree/library/ui/src/main/res/layout/exo_list_divider.xml
diff --git a/library/ui/src/main/res/layout/exo_playback_control_view.xml b/tree/library/ui/src/main/res/layout/exo_playback_control_view.xml
similarity index 100%
rename from library/ui/src/main/res/layout/exo_playback_control_view.xml
rename to tree/library/ui/src/main/res/layout/exo_playback_control_view.xml
diff --git a/library/ui/src/main/res/layout/exo_player_control_view.xml b/tree/library/ui/src/main/res/layout/exo_player_control_view.xml
similarity index 100%
rename from library/ui/src/main/res/layout/exo_player_control_view.xml
rename to tree/library/ui/src/main/res/layout/exo_player_control_view.xml
diff --git a/library/ui/src/main/res/layout/exo_player_view.xml b/tree/library/ui/src/main/res/layout/exo_player_view.xml
similarity index 100%
rename from library/ui/src/main/res/layout/exo_player_view.xml
rename to tree/library/ui/src/main/res/layout/exo_player_view.xml
diff --git a/library/ui/src/main/res/layout/exo_simple_player_view.xml b/tree/library/ui/src/main/res/layout/exo_simple_player_view.xml
similarity index 100%
rename from library/ui/src/main/res/layout/exo_simple_player_view.xml
rename to tree/library/ui/src/main/res/layout/exo_simple_player_view.xml
diff --git a/library/ui/src/main/res/layout/exo_track_selection_dialog.xml b/tree/library/ui/src/main/res/layout/exo_track_selection_dialog.xml
similarity index 100%
rename from library/ui/src/main/res/layout/exo_track_selection_dialog.xml
rename to tree/library/ui/src/main/res/layout/exo_track_selection_dialog.xml
diff --git a/library/ui/src/main/res/values-af/strings.xml b/tree/library/ui/src/main/res/values-af/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-af/strings.xml
rename to tree/library/ui/src/main/res/values-af/strings.xml
diff --git a/library/ui/src/main/res/values-am/strings.xml b/tree/library/ui/src/main/res/values-am/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-am/strings.xml
rename to tree/library/ui/src/main/res/values-am/strings.xml
diff --git a/library/ui/src/main/res/values-ar/strings.xml b/tree/library/ui/src/main/res/values-ar/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ar/strings.xml
rename to tree/library/ui/src/main/res/values-ar/strings.xml
diff --git a/library/ui/src/main/res/values-az/strings.xml b/tree/library/ui/src/main/res/values-az/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-az/strings.xml
rename to tree/library/ui/src/main/res/values-az/strings.xml
diff --git a/library/ui/src/main/res/values-b+sr+Latn/strings.xml b/tree/library/ui/src/main/res/values-b+sr+Latn/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-b+sr+Latn/strings.xml
rename to tree/library/ui/src/main/res/values-b+sr+Latn/strings.xml
diff --git a/library/ui/src/main/res/values-be/strings.xml b/tree/library/ui/src/main/res/values-be/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-be/strings.xml
rename to tree/library/ui/src/main/res/values-be/strings.xml
diff --git a/library/ui/src/main/res/values-bg/strings.xml b/tree/library/ui/src/main/res/values-bg/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-bg/strings.xml
rename to tree/library/ui/src/main/res/values-bg/strings.xml
diff --git a/library/ui/src/main/res/values-bn/strings.xml b/tree/library/ui/src/main/res/values-bn/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-bn/strings.xml
rename to tree/library/ui/src/main/res/values-bn/strings.xml
diff --git a/library/ui/src/main/res/values-bs/strings.xml b/tree/library/ui/src/main/res/values-bs/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-bs/strings.xml
rename to tree/library/ui/src/main/res/values-bs/strings.xml
diff --git a/library/ui/src/main/res/values-ca/strings.xml b/tree/library/ui/src/main/res/values-ca/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ca/strings.xml
rename to tree/library/ui/src/main/res/values-ca/strings.xml
diff --git a/library/ui/src/main/res/values-cs/strings.xml b/tree/library/ui/src/main/res/values-cs/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-cs/strings.xml
rename to tree/library/ui/src/main/res/values-cs/strings.xml
diff --git a/library/ui/src/main/res/values-da/strings.xml b/tree/library/ui/src/main/res/values-da/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-da/strings.xml
rename to tree/library/ui/src/main/res/values-da/strings.xml
diff --git a/library/ui/src/main/res/values-de/strings.xml b/tree/library/ui/src/main/res/values-de/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-de/strings.xml
rename to tree/library/ui/src/main/res/values-de/strings.xml
diff --git a/library/ui/src/main/res/values-el/strings.xml b/tree/library/ui/src/main/res/values-el/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-el/strings.xml
rename to tree/library/ui/src/main/res/values-el/strings.xml
diff --git a/library/ui/src/main/res/values-en-rAU/strings.xml b/tree/library/ui/src/main/res/values-en-rAU/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-en-rAU/strings.xml
rename to tree/library/ui/src/main/res/values-en-rAU/strings.xml
diff --git a/library/ui/src/main/res/values-en-rGB/strings.xml b/tree/library/ui/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-en-rGB/strings.xml
rename to tree/library/ui/src/main/res/values-en-rGB/strings.xml
diff --git a/library/ui/src/main/res/values-en-rIN/strings.xml b/tree/library/ui/src/main/res/values-en-rIN/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-en-rIN/strings.xml
rename to tree/library/ui/src/main/res/values-en-rIN/strings.xml
diff --git a/library/ui/src/main/res/values-es-rUS/strings.xml b/tree/library/ui/src/main/res/values-es-rUS/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-es-rUS/strings.xml
rename to tree/library/ui/src/main/res/values-es-rUS/strings.xml
diff --git a/library/ui/src/main/res/values-es/strings.xml b/tree/library/ui/src/main/res/values-es/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-es/strings.xml
rename to tree/library/ui/src/main/res/values-es/strings.xml
diff --git a/library/ui/src/main/res/values-et/strings.xml b/tree/library/ui/src/main/res/values-et/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-et/strings.xml
rename to tree/library/ui/src/main/res/values-et/strings.xml
diff --git a/library/ui/src/main/res/values-eu/strings.xml b/tree/library/ui/src/main/res/values-eu/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-eu/strings.xml
rename to tree/library/ui/src/main/res/values-eu/strings.xml
diff --git a/library/ui/src/main/res/values-fa/strings.xml b/tree/library/ui/src/main/res/values-fa/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-fa/strings.xml
rename to tree/library/ui/src/main/res/values-fa/strings.xml
diff --git a/library/ui/src/main/res/values-fi/strings.xml b/tree/library/ui/src/main/res/values-fi/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-fi/strings.xml
rename to tree/library/ui/src/main/res/values-fi/strings.xml
diff --git a/library/ui/src/main/res/values-fr-rCA/strings.xml b/tree/library/ui/src/main/res/values-fr-rCA/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-fr-rCA/strings.xml
rename to tree/library/ui/src/main/res/values-fr-rCA/strings.xml
diff --git a/library/ui/src/main/res/values-fr/strings.xml b/tree/library/ui/src/main/res/values-fr/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-fr/strings.xml
rename to tree/library/ui/src/main/res/values-fr/strings.xml
diff --git a/library/ui/src/main/res/values-gl/strings.xml b/tree/library/ui/src/main/res/values-gl/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-gl/strings.xml
rename to tree/library/ui/src/main/res/values-gl/strings.xml
diff --git a/library/ui/src/main/res/values-gu/strings.xml b/tree/library/ui/src/main/res/values-gu/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-gu/strings.xml
rename to tree/library/ui/src/main/res/values-gu/strings.xml
diff --git a/library/ui/src/main/res/values-hi/strings.xml b/tree/library/ui/src/main/res/values-hi/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-hi/strings.xml
rename to tree/library/ui/src/main/res/values-hi/strings.xml
diff --git a/library/ui/src/main/res/values-hr/strings.xml b/tree/library/ui/src/main/res/values-hr/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-hr/strings.xml
rename to tree/library/ui/src/main/res/values-hr/strings.xml
diff --git a/library/ui/src/main/res/values-hu/strings.xml b/tree/library/ui/src/main/res/values-hu/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-hu/strings.xml
rename to tree/library/ui/src/main/res/values-hu/strings.xml
diff --git a/library/ui/src/main/res/values-hy/strings.xml b/tree/library/ui/src/main/res/values-hy/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-hy/strings.xml
rename to tree/library/ui/src/main/res/values-hy/strings.xml
diff --git a/library/ui/src/main/res/values-in/strings.xml b/tree/library/ui/src/main/res/values-in/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-in/strings.xml
rename to tree/library/ui/src/main/res/values-in/strings.xml
diff --git a/library/ui/src/main/res/values-is/strings.xml b/tree/library/ui/src/main/res/values-is/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-is/strings.xml
rename to tree/library/ui/src/main/res/values-is/strings.xml
diff --git a/library/ui/src/main/res/values-it/strings.xml b/tree/library/ui/src/main/res/values-it/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-it/strings.xml
rename to tree/library/ui/src/main/res/values-it/strings.xml
diff --git a/library/ui/src/main/res/values-iw/strings.xml b/tree/library/ui/src/main/res/values-iw/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-iw/strings.xml
rename to tree/library/ui/src/main/res/values-iw/strings.xml
diff --git a/library/ui/src/main/res/values-ja/strings.xml b/tree/library/ui/src/main/res/values-ja/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ja/strings.xml
rename to tree/library/ui/src/main/res/values-ja/strings.xml
diff --git a/library/ui/src/main/res/values-ka/strings.xml b/tree/library/ui/src/main/res/values-ka/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ka/strings.xml
rename to tree/library/ui/src/main/res/values-ka/strings.xml
diff --git a/library/ui/src/main/res/values-kk/strings.xml b/tree/library/ui/src/main/res/values-kk/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-kk/strings.xml
rename to tree/library/ui/src/main/res/values-kk/strings.xml
diff --git a/library/ui/src/main/res/values-km/strings.xml b/tree/library/ui/src/main/res/values-km/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-km/strings.xml
rename to tree/library/ui/src/main/res/values-km/strings.xml
diff --git a/library/ui/src/main/res/values-kn/strings.xml b/tree/library/ui/src/main/res/values-kn/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-kn/strings.xml
rename to tree/library/ui/src/main/res/values-kn/strings.xml
diff --git a/library/ui/src/main/res/values-ko/strings.xml b/tree/library/ui/src/main/res/values-ko/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ko/strings.xml
rename to tree/library/ui/src/main/res/values-ko/strings.xml
diff --git a/library/ui/src/main/res/values-ky/strings.xml b/tree/library/ui/src/main/res/values-ky/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ky/strings.xml
rename to tree/library/ui/src/main/res/values-ky/strings.xml
diff --git a/library/ui/src/main/res/values-lo/strings.xml b/tree/library/ui/src/main/res/values-lo/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-lo/strings.xml
rename to tree/library/ui/src/main/res/values-lo/strings.xml
diff --git a/library/ui/src/main/res/values-lt/strings.xml b/tree/library/ui/src/main/res/values-lt/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-lt/strings.xml
rename to tree/library/ui/src/main/res/values-lt/strings.xml
diff --git a/library/ui/src/main/res/values-lv/strings.xml b/tree/library/ui/src/main/res/values-lv/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-lv/strings.xml
rename to tree/library/ui/src/main/res/values-lv/strings.xml
diff --git a/library/ui/src/main/res/values-mk/strings.xml b/tree/library/ui/src/main/res/values-mk/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-mk/strings.xml
rename to tree/library/ui/src/main/res/values-mk/strings.xml
diff --git a/library/ui/src/main/res/values-ml/strings.xml b/tree/library/ui/src/main/res/values-ml/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ml/strings.xml
rename to tree/library/ui/src/main/res/values-ml/strings.xml
diff --git a/library/ui/src/main/res/values-mn/strings.xml b/tree/library/ui/src/main/res/values-mn/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-mn/strings.xml
rename to tree/library/ui/src/main/res/values-mn/strings.xml
diff --git a/library/ui/src/main/res/values-mr/strings.xml b/tree/library/ui/src/main/res/values-mr/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-mr/strings.xml
rename to tree/library/ui/src/main/res/values-mr/strings.xml
diff --git a/library/ui/src/main/res/values-ms/strings.xml b/tree/library/ui/src/main/res/values-ms/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ms/strings.xml
rename to tree/library/ui/src/main/res/values-ms/strings.xml
diff --git a/library/ui/src/main/res/values-my/strings.xml b/tree/library/ui/src/main/res/values-my/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-my/strings.xml
rename to tree/library/ui/src/main/res/values-my/strings.xml
diff --git a/library/ui/src/main/res/values-nb/strings.xml b/tree/library/ui/src/main/res/values-nb/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-nb/strings.xml
rename to tree/library/ui/src/main/res/values-nb/strings.xml
diff --git a/library/ui/src/main/res/values-ne/strings.xml b/tree/library/ui/src/main/res/values-ne/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ne/strings.xml
rename to tree/library/ui/src/main/res/values-ne/strings.xml
diff --git a/library/ui/src/main/res/values-nl/strings.xml b/tree/library/ui/src/main/res/values-nl/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-nl/strings.xml
rename to tree/library/ui/src/main/res/values-nl/strings.xml
diff --git a/library/ui/src/main/res/values-pa/strings.xml b/tree/library/ui/src/main/res/values-pa/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-pa/strings.xml
rename to tree/library/ui/src/main/res/values-pa/strings.xml
diff --git a/library/ui/src/main/res/values-pl/strings.xml b/tree/library/ui/src/main/res/values-pl/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-pl/strings.xml
rename to tree/library/ui/src/main/res/values-pl/strings.xml
diff --git a/library/ui/src/main/res/values-pt-rPT/strings.xml b/tree/library/ui/src/main/res/values-pt-rPT/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-pt-rPT/strings.xml
rename to tree/library/ui/src/main/res/values-pt-rPT/strings.xml
diff --git a/library/ui/src/main/res/values-pt/strings.xml b/tree/library/ui/src/main/res/values-pt/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-pt/strings.xml
rename to tree/library/ui/src/main/res/values-pt/strings.xml
diff --git a/library/ui/src/main/res/values-ro/strings.xml b/tree/library/ui/src/main/res/values-ro/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ro/strings.xml
rename to tree/library/ui/src/main/res/values-ro/strings.xml
diff --git a/library/ui/src/main/res/values-ru/strings.xml b/tree/library/ui/src/main/res/values-ru/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ru/strings.xml
rename to tree/library/ui/src/main/res/values-ru/strings.xml
diff --git a/library/ui/src/main/res/values-si/strings.xml b/tree/library/ui/src/main/res/values-si/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-si/strings.xml
rename to tree/library/ui/src/main/res/values-si/strings.xml
diff --git a/library/ui/src/main/res/values-sk/strings.xml b/tree/library/ui/src/main/res/values-sk/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-sk/strings.xml
rename to tree/library/ui/src/main/res/values-sk/strings.xml
diff --git a/library/ui/src/main/res/values-sl/strings.xml b/tree/library/ui/src/main/res/values-sl/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-sl/strings.xml
rename to tree/library/ui/src/main/res/values-sl/strings.xml
diff --git a/library/ui/src/main/res/values-sq/strings.xml b/tree/library/ui/src/main/res/values-sq/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-sq/strings.xml
rename to tree/library/ui/src/main/res/values-sq/strings.xml
diff --git a/library/ui/src/main/res/values-sr/strings.xml b/tree/library/ui/src/main/res/values-sr/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-sr/strings.xml
rename to tree/library/ui/src/main/res/values-sr/strings.xml
diff --git a/library/ui/src/main/res/values-sv/strings.xml b/tree/library/ui/src/main/res/values-sv/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-sv/strings.xml
rename to tree/library/ui/src/main/res/values-sv/strings.xml
diff --git a/library/ui/src/main/res/values-sw/strings.xml b/tree/library/ui/src/main/res/values-sw/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-sw/strings.xml
rename to tree/library/ui/src/main/res/values-sw/strings.xml
diff --git a/library/ui/src/main/res/values-ta/strings.xml b/tree/library/ui/src/main/res/values-ta/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ta/strings.xml
rename to tree/library/ui/src/main/res/values-ta/strings.xml
diff --git a/library/ui/src/main/res/values-te/strings.xml b/tree/library/ui/src/main/res/values-te/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-te/strings.xml
rename to tree/library/ui/src/main/res/values-te/strings.xml
diff --git a/library/ui/src/main/res/values-th/strings.xml b/tree/library/ui/src/main/res/values-th/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-th/strings.xml
rename to tree/library/ui/src/main/res/values-th/strings.xml
diff --git a/library/ui/src/main/res/values-tl/strings.xml b/tree/library/ui/src/main/res/values-tl/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-tl/strings.xml
rename to tree/library/ui/src/main/res/values-tl/strings.xml
diff --git a/library/ui/src/main/res/values-tr/strings.xml b/tree/library/ui/src/main/res/values-tr/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-tr/strings.xml
rename to tree/library/ui/src/main/res/values-tr/strings.xml
diff --git a/library/ui/src/main/res/values-uk/strings.xml b/tree/library/ui/src/main/res/values-uk/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-uk/strings.xml
rename to tree/library/ui/src/main/res/values-uk/strings.xml
diff --git a/library/ui/src/main/res/values-ur/strings.xml b/tree/library/ui/src/main/res/values-ur/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-ur/strings.xml
rename to tree/library/ui/src/main/res/values-ur/strings.xml
diff --git a/library/ui/src/main/res/values-uz/strings.xml b/tree/library/ui/src/main/res/values-uz/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-uz/strings.xml
rename to tree/library/ui/src/main/res/values-uz/strings.xml
diff --git a/library/ui/src/main/res/values-vi/strings.xml b/tree/library/ui/src/main/res/values-vi/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-vi/strings.xml
rename to tree/library/ui/src/main/res/values-vi/strings.xml
diff --git a/library/ui/src/main/res/values-zh-rCN/strings.xml b/tree/library/ui/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-zh-rCN/strings.xml
rename to tree/library/ui/src/main/res/values-zh-rCN/strings.xml
diff --git a/library/ui/src/main/res/values-zh-rHK/strings.xml b/tree/library/ui/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-zh-rHK/strings.xml
rename to tree/library/ui/src/main/res/values-zh-rHK/strings.xml
diff --git a/library/ui/src/main/res/values-zh-rTW/strings.xml b/tree/library/ui/src/main/res/values-zh-rTW/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-zh-rTW/strings.xml
rename to tree/library/ui/src/main/res/values-zh-rTW/strings.xml
diff --git a/library/ui/src/main/res/values-zu/strings.xml b/tree/library/ui/src/main/res/values-zu/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values-zu/strings.xml
rename to tree/library/ui/src/main/res/values-zu/strings.xml
diff --git a/library/ui/src/main/res/values/attrs.xml b/tree/library/ui/src/main/res/values/attrs.xml
similarity index 100%
rename from library/ui/src/main/res/values/attrs.xml
rename to tree/library/ui/src/main/res/values/attrs.xml
diff --git a/library/ui/src/main/res/values/constants.xml b/tree/library/ui/src/main/res/values/constants.xml
similarity index 100%
rename from library/ui/src/main/res/values/constants.xml
rename to tree/library/ui/src/main/res/values/constants.xml
diff --git a/library/ui/src/main/res/values/drawables.xml b/tree/library/ui/src/main/res/values/drawables.xml
similarity index 100%
rename from library/ui/src/main/res/values/drawables.xml
rename to tree/library/ui/src/main/res/values/drawables.xml
diff --git a/library/ui/src/main/res/values/ids.xml b/tree/library/ui/src/main/res/values/ids.xml
similarity index 100%
rename from library/ui/src/main/res/values/ids.xml
rename to tree/library/ui/src/main/res/values/ids.xml
diff --git a/library/ui/src/main/res/values/strings.xml b/tree/library/ui/src/main/res/values/strings.xml
similarity index 100%
rename from library/ui/src/main/res/values/strings.xml
rename to tree/library/ui/src/main/res/values/strings.xml
diff --git a/library/ui/src/main/res/values/styles.xml b/tree/library/ui/src/main/res/values/styles.xml
similarity index 100%
rename from library/ui/src/main/res/values/styles.xml
rename to tree/library/ui/src/main/res/values/styles.xml
diff --git a/library/ui/src/test/AndroidManifest.xml b/tree/library/ui/src/test/AndroidManifest.xml
similarity index 100%
rename from library/ui/src/test/AndroidManifest.xml
rename to tree/library/ui/src/test/AndroidManifest.xml
diff --git a/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java b/tree/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java
similarity index 100%
rename from library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java
rename to tree/library/ui/src/test/java/com/google/android/exoplayer2/ui/spherical/TouchTrackerTest.java
diff --git a/playbacktests/build.gradle b/tree/playbacktests/build.gradle
similarity index 100%
rename from playbacktests/build.gradle
rename to tree/playbacktests/build.gradle
diff --git a/playbacktests/src/androidTest/AndroidManifest.xml b/tree/playbacktests/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from playbacktests/src/androidTest/AndroidManifest.xml
rename to tree/playbacktests/src/androidTest/AndroidManifest.xml
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java b/tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java
similarity index 100%
rename from playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java
rename to tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/CommonEncryptionDrmTest.java
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java b/tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
similarity index 100%
rename from playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
rename to tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java b/tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
similarity index 100%
rename from playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
rename to tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestData.java b/tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestData.java
similarity index 100%
rename from playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestData.java
rename to tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestData.java
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java b/tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
similarity index 100%
rename from playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
rename to tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashWidevineOfflineTest.java b/tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashWidevineOfflineTest.java
similarity index 100%
rename from playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashWidevineOfflineTest.java
rename to tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashWidevineOfflineTest.java
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DebugRenderersFactory.java b/tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DebugRenderersFactory.java
similarity index 100%
rename from playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DebugRenderersFactory.java
rename to tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DebugRenderersFactory.java
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/EnumerateDecodersTest.java b/tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/EnumerateDecodersTest.java
similarity index 100%
rename from playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/EnumerateDecodersTest.java
rename to tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/EnumerateDecodersTest.java
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/LogcatMetricsLogger.java b/tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/LogcatMetricsLogger.java
similarity index 100%
rename from playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/LogcatMetricsLogger.java
rename to tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/LogcatMetricsLogger.java
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/MetricsLogger.java b/tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/MetricsLogger.java
similarity index 100%
rename from playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/MetricsLogger.java
rename to tree/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/MetricsLogger.java
diff --git a/playbacktests/src/main/AndroidManifest.xml b/tree/playbacktests/src/main/AndroidManifest.xml
similarity index 100%
rename from playbacktests/src/main/AndroidManifest.xml
rename to tree/playbacktests/src/main/AndroidManifest.xml
diff --git a/publish.gradle b/tree/publish.gradle
similarity index 100%
rename from publish.gradle
rename to tree/publish.gradle
diff --git a/settings.gradle b/tree/settings.gradle
similarity index 100%
rename from settings.gradle
rename to tree/settings.gradle
diff --git a/testutils/README.md b/tree/testutils/README.md
similarity index 100%
rename from testutils/README.md
rename to tree/testutils/README.md
diff --git a/testutils/build.gradle b/tree/testutils/build.gradle
similarity index 100%
rename from testutils/build.gradle
rename to tree/testutils/build.gradle
diff --git a/testutils/src/main/AndroidManifest.xml b/tree/testutils/src/main/AndroidManifest.xml
similarity index 100%
rename from testutils/src/main/AndroidManifest.xml
rename to tree/testutils/src/main/AndroidManifest.xml
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/AutoAdvancingFakeClock.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/AutoAdvancingFakeClock.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/AutoAdvancingFakeClock.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/AutoAdvancingFakeClock.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/CapturingAudioSink.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/CapturingAudioSink.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/CapturingAudioSink.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/CapturingAudioSink.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DefaultRenderersFactoryAsserts.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/DefaultRenderersFactoryAsserts.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/DefaultRenderersFactoryAsserts.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/DefaultRenderersFactoryAsserts.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DownloadBuilder.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/DownloadBuilder.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/DownloadBuilder.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/DownloadBuilder.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeChunkSource.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeChunkSource.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeChunkSource.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeChunkSource.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeClock.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeClock.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeClock.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeClock.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSet.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSet.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSet.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSet.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunk.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunk.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunk.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunk.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunkIterator.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunkIterator.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunkIterator.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaChunkIterator.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaClockRenderer.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaClockRenderer.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaClockRenderer.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaClockRenderer.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeRenderer.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeRenderer.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeRenderer.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeRenderer.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSampleStream.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeShuffleOrder.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeShuffleOrder.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeShuffleOrder.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeShuffleOrder.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTimeline.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTimeline.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTimeline.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTimeline.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelection.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelection.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelection.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelection.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackSelector.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/NoUidTimeline.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/NoUidTimeline.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/NoUidTimeline.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/NoUidTimeline.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/SpannedSubject.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/SpannedSubject.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/SpannedSubject.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/SpannedSubject.java
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/package-info.java b/tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/package-info.java
similarity index 100%
rename from testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/package-info.java
rename to tree/testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/package-info.java
diff --git a/testutils/src/main/res/layout/exo_testutils_host_activity.xml b/tree/testutils/src/main/res/layout/exo_testutils_host_activity.xml
similarity index 100%
rename from testutils/src/main/res/layout/exo_testutils_host_activity.xml
rename to tree/testutils/src/main/res/layout/exo_testutils_host_activity.xml
diff --git a/testutils/src/test/AndroidManifest.xml b/tree/testutils/src/test/AndroidManifest.xml
similarity index 100%
rename from testutils/src/test/AndroidManifest.xml
rename to tree/testutils/src/test/AndroidManifest.xml
diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java b/tree/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java
similarity index 100%
rename from testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java
rename to tree/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSetTest.java
diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java b/tree/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java
similarity index 100%
rename from testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java
rename to tree/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java
diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java b/tree/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java
similarity index 100%
rename from testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java
rename to tree/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java
diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java b/tree/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java
similarity index 100%
rename from testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java
rename to tree/testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSourceTest.java
diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/SpannedSubjectTest.java b/tree/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/SpannedSubjectTest.java
similarity index 100%
rename from testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/SpannedSubjectTest.java
rename to tree/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/SpannedSubjectTest.java
diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/package-info.java b/tree/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/package-info.java
similarity index 100%
rename from testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/package-info.java
rename to tree/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/package-info.java