diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 3ac519b..34b15a8 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -259,7 +259,6 @@
         "IMediaExtractor.cpp",
         "IMediaExtractorService.cpp",
         "IMediaSource.cpp",
-        "IStreamSource.cpp",
         "MediaCodecBuffer.cpp",
         "MediaUtils.cpp",
         "Metadata.cpp",
@@ -313,77 +312,3 @@
         },
     },
 }
-
-cc_library {
-    name: "libmedia_player2",
-
-    srcs: [
-        "JAudioTrack.cpp",
-        "MediaPlayer2Manager.cpp",
-        "mediaplayer2.cpp",
-    ],
-
-    shared_libs: [
-        "libandroid_runtime",
-        "libaudioclient",
-        "libbinder",
-        "libcutils",
-        "libgui",
-        "liblog",
-        "libmedia_omx",
-        "libmedia_player2_util",
-        "libmediaextractor",
-        "libstagefright_foundation",
-        "libui",
-        "libutils",
-
-        "libcrypto",
-        "libmediadrm",
-        "libmediametrics",
-        "libmediandk",
-        "libmediautils",
-        "libmemunreachable",
-        "libnativewindow",
-        "libpowermanager",
-        "libstagefright_httplive",
-        "libstagefright_player2",
-    ],
-
-    export_shared_lib_headers: [
-        "libaudioclient",
-        "libbinder",
-        "libmedia_omx",
-    ],
-
-    header_libs: [
-        "media_plugin_headers",
-    ],
-
-    static_libs: [
-        "libmedia_helper",
-        "libstagefright_nuplayer2",
-        "libstagefright_rtsp",
-        "libstagefright_timedtext",
-    ],
-
-    export_include_dirs: [
-        "include",
-    ],
-
-    cflags: [
-        "-Werror",
-        "-Wno-error=deprecated-declarations",
-        "-Wall",
-    ],
-
-    sanitize: {
-        misc_undefined: [
-            "unsigned-integer-overflow",
-            "signed-integer-overflow",
-        ],
-        cfi: true,
-        diag: {
-            cfi: true,
-        },
-    },
-}
diff --git a/media/libmediaplayer2/Android.bp b/media/libmediaplayer2/Android.bp
new file mode 100644
index 0000000..17fa01c
--- /dev/null
+++ b/media/libmediaplayer2/Android.bp
@@ -0,0 +1,79 @@
+cc_library_headers {
+    name: "libmediaplayer2_headers",
+    vendor_available: true,
+    export_include_dirs: ["include"],
+}
+
+cc_library {
+    name: "libmediaplayer2",
+
+    srcs: [
+        "JAudioTrack.cpp",
+        "MediaPlayer2Manager.cpp",
+        "mediaplayer2.cpp",
+    ],
+
+    shared_libs: [
+        "libandroid_runtime",
+        "libaudioclient",
+        "libbinder",
+        "libcutils",
+        "libgui",
+        "liblog",
+        "libmedia_omx",
+        "libmedia_player2_util",
+        "libmediaextractor",
+        "libstagefright_foundation",
+        "libui",
+        "libutils",
+
+        "libcrypto",
+        "libmediadrm",
+        "libmediametrics",
+        "libmediandk",
+        "libmediautils",
+        "libmemunreachable",
+        "libnativewindow",
+        "libpowermanager",
+        "libstagefright_httplive",
+        "libstagefright_player2",
+    ],
+
+    export_shared_lib_headers: [
+        "libaudioclient",
+        "libbinder",
+        "libmedia_omx",
+    ],
+
+    header_libs: [
+        "media_plugin_headers",
+    ],
+
+    static_libs: [
+        "libmedia_helper",
+        "libstagefright_nuplayer2",
+        "libstagefright_rtsp",
+        "libstagefright_timedtext",
+    ],
+
+    export_include_dirs: [
+        "include",
+    ],
+
+    cflags: [
+        "-Werror",
+        "-Wno-error=deprecated-declarations",
+        "-Wall",
+    ],
+
+    sanitize: {
+        misc_undefined: [
+            "unsigned-integer-overflow",
+            "signed-integer-overflow",
+        ],
+        cfi: true,
+        diag: {
+            cfi: true,
+        },
+    },
+}
diff --git a/media/libmedia/JAudioTrack.cpp b/media/libmediaplayer2/JAudioTrack.cpp
similarity index 99%
rename from media/libmedia/JAudioTrack.cpp
rename to media/libmediaplayer2/JAudioTrack.cpp
index 99da0f7..6d9605a 100644
--- a/media/libmedia/JAudioTrack.cpp
+++ b/media/libmediaplayer2/JAudioTrack.cpp
@@ -18,7 +18,7 @@
 
 #include "media/JAudioAttributes.h"
 #include "media/JAudioFormat.h"
-#include "media/JAudioTrack.h"
+#include "mediaplayer2/JAudioTrack.h"
 
 #include <android_media_AudioErrors.h>
 #include <android_runtime/AndroidRuntime.h>
diff --git a/media/libmedia/MediaPlayer2Manager.cpp b/media/libmediaplayer2/MediaPlayer2Manager.cpp
similarity index 99%
rename from media/libmedia/MediaPlayer2Manager.cpp
rename to media/libmediaplayer2/MediaPlayer2Manager.cpp
index 4c0a7ac..c642d89 100644
--- a/media/libmedia/MediaPlayer2Manager.cpp
+++ b/media/libmediaplayer2/MediaPlayer2Manager.cpp
@@ -47,8 +47,6 @@
 #include <media/AudioPolicyHelper.h>
 #include <media/DataSourceDesc.h>
 #include <media/MediaHTTPService.h>
-#include <media/MediaPlayer2EngineClient.h>
-#include <media/MediaPlayer2Interface.h>
 #include <media/Metadata.h>
 #include <media/AudioTrack.h>
 #include <media/MemoryLeakTrackUtil.h>
@@ -63,6 +61,9 @@
 #include <media/stagefright/SurfaceUtils.h>
 #include <mediautils/BatteryNotifier.h>
 
+#include <mediaplayer2/MediaPlayer2EngineClient.h>
+#include <mediaplayer2/MediaPlayer2Interface.h>
+
 #include <memunreachable/memunreachable.h>
 #include <system/audio.h>
 #include <system/window.h>
diff --git a/media/libmedia/MediaPlayer2Manager.h b/media/libmediaplayer2/MediaPlayer2Manager.h
similarity index 99%
rename from media/libmedia/MediaPlayer2Manager.h
rename to media/libmediaplayer2/MediaPlayer2Manager.h
index 95b875b..fde1381 100644
--- a/media/libmedia/MediaPlayer2Manager.h
+++ b/media/libmediaplayer2/MediaPlayer2Manager.h
@@ -26,10 +26,10 @@
 #include <utils/String8.h>
 #include <utils/Vector.h>
 
-#include <media/MediaPlayer2Engine.h>
-#include <media/MediaPlayer2Interface.h>
 #include <media/Metadata.h>
 #include <media/stagefright/foundation/ABase.h>
+#include <mediaplayer2/MediaPlayer2Engine.h>
+#include <mediaplayer2/MediaPlayer2Interface.h>
 
 #include <system/audio.h>
 
diff --git a/media/libmedia/include/media/JAudioTrack.h b/media/libmediaplayer2/include/mediaplayer2/JAudioTrack.h
similarity index 100%
rename from media/libmedia/include/media/JAudioTrack.h
rename to media/libmediaplayer2/include/mediaplayer2/JAudioTrack.h
diff --git a/media/libmedia/include/media/MediaPlayer2Engine.h b/media/libmediaplayer2/include/mediaplayer2/MediaPlayer2Engine.h
similarity index 100%
rename from media/libmedia/include/media/MediaPlayer2Engine.h
rename to media/libmediaplayer2/include/mediaplayer2/MediaPlayer2Engine.h
diff --git a/media/libmedia/include/media/MediaPlayer2EngineClient.h b/media/libmediaplayer2/include/mediaplayer2/MediaPlayer2EngineClient.h
similarity index 100%
rename from media/libmedia/include/media/MediaPlayer2EngineClient.h
rename to media/libmediaplayer2/include/mediaplayer2/MediaPlayer2EngineClient.h
diff --git a/media/libmedia/include/media/MediaPlayer2Interface.h b/media/libmediaplayer2/include/mediaplayer2/MediaPlayer2Interface.h
similarity index 99%
rename from media/libmedia/include/media/MediaPlayer2Interface.h
rename to media/libmediaplayer2/include/mediaplayer2/MediaPlayer2Interface.h
index be300bb..bee5175 100644
--- a/media/libmedia/include/media/MediaPlayer2Interface.h
+++ b/media/libmediaplayer2/include/mediaplayer2/MediaPlayer2Interface.h
@@ -31,8 +31,8 @@
 #include <media/AVSyncSettings.h>
 #include <media/BufferingSettings.h>
 #include <media/Metadata.h>
-#include <media/mediaplayer2.h>
 #include <media/stagefright/foundation/AHandler.h>
+#include <mediaplayer2/mediaplayer2.h>
 
 // Fwd decl to make sure everyone agrees that the scope of struct sockaddr_in is
 // global, and not in android::
diff --git a/media/libmedia/include/media/mediaplayer2.h b/media/libmediaplayer2/include/mediaplayer2/mediaplayer2.h
similarity index 98%
rename from media/libmedia/include/media/mediaplayer2.h
rename to media/libmediaplayer2/include/mediaplayer2/mediaplayer2.h
index c8b124c..35186ed 100644
--- a/media/libmedia/include/media/mediaplayer2.h
+++ b/media/libmediaplayer2/include/mediaplayer2/mediaplayer2.h
@@ -23,8 +23,8 @@
 
 #include <media/AudioResamplerPublic.h>
 #include <media/BufferingSettings.h>
-#include <media/MediaPlayer2EngineClient.h>
-#include <media/MediaPlayer2Engine.h>
+#include <mediaplayer2/MediaPlayer2EngineClient.h>
+#include <mediaplayer2/MediaPlayer2Engine.h>
 
 #include <utils/Condition.h>
 #include <utils/KeyedVector.h>
diff --git a/media/libmedia/mediaplayer2.cpp b/media/libmediaplayer2/mediaplayer2.cpp
similarity index 99%
rename from media/libmedia/mediaplayer2.cpp
rename to media/libmediaplayer2/mediaplayer2.cpp
index 1eb3795..b858783 100644
--- a/media/libmedia/mediaplayer2.cpp
+++ b/media/libmediaplayer2/mediaplayer2.cpp
@@ -29,7 +29,6 @@
 #include <binder/IServiceManager.h>
 #include <binder/IPCThreadState.h>
 
-#include <media/mediaplayer2.h>
 #include <media/AudioResamplerPublic.h>
 #include <media/AudioSystem.h>
 #include <media/AVSyncSettings.h>
@@ -37,6 +36,7 @@
 #include <media/DataSourceDesc.h>
 #include <media/MediaAnalyticsItem.h>
 #include <media/NdkWrapper.h>
+#include <mediaplayer2/mediaplayer2.h>
 
 #include <binder/MemoryBase.h>
 
diff --git a/media/libmedia/nuplayer2/Android.bp b/media/libmediaplayer2/nuplayer2/Android.bp
similarity index 97%
rename from media/libmedia/nuplayer2/Android.bp
rename to media/libmediaplayer2/nuplayer2/Android.bp
index 1f4455f..c40b361 100644
--- a/media/libmedia/nuplayer2/Android.bp
+++ b/media/libmediaplayer2/nuplayer2/Android.bp
@@ -16,6 +16,7 @@
     ],
 
     header_libs: [
+        "libmediaplayer2_headers",
         "media_plugin_headers",
     ],
 
diff --git a/media/libmedia/nuplayer2/GenericSource2.cpp b/media/libmediaplayer2/nuplayer2/GenericSource2.cpp
similarity index 100%
rename from media/libmedia/nuplayer2/GenericSource2.cpp
rename to media/libmediaplayer2/nuplayer2/GenericSource2.cpp
diff --git a/media/libmedia/nuplayer2/GenericSource2.h b/media/libmediaplayer2/nuplayer2/GenericSource2.h
similarity index 99%
rename from media/libmedia/nuplayer2/GenericSource2.h
rename to media/libmediaplayer2/nuplayer2/GenericSource2.h
index 2016304..bc13eb7 100644
--- a/media/libmedia/nuplayer2/GenericSource2.h
+++ b/media/libmediaplayer2/nuplayer2/GenericSource2.h
@@ -23,8 +23,8 @@
 
 #include "ATSParser.h"
 
-#include <media/mediaplayer2.h>
 #include <media/stagefright/MediaBuffer.h>
+#include <mediaplayer2/mediaplayer2.h>
 
 namespace android {
 
diff --git a/media/libmedia/nuplayer2/HTTPLiveSource2.cpp b/media/libmediaplayer2/nuplayer2/HTTPLiveSource2.cpp
similarity index 100%
rename from media/libmedia/nuplayer2/HTTPLiveSource2.cpp
rename to media/libmediaplayer2/nuplayer2/HTTPLiveSource2.cpp
diff --git a/media/libmedia/nuplayer2/HTTPLiveSource2.h b/media/libmediaplayer2/nuplayer2/HTTPLiveSource2.h
similarity index 100%
rename from media/libmedia/nuplayer2/HTTPLiveSource2.h
rename to media/libmediaplayer2/nuplayer2/HTTPLiveSource2.h
diff --git a/media/libmedia/nuplayer2/JWakeLock.cpp b/media/libmediaplayer2/nuplayer2/JWakeLock.cpp
similarity index 100%
rename from media/libmedia/nuplayer2/JWakeLock.cpp
rename to media/libmediaplayer2/nuplayer2/JWakeLock.cpp
diff --git a/media/libmedia/nuplayer2/JWakeLock.h b/media/libmediaplayer2/nuplayer2/JWakeLock.h
similarity index 100%
rename from media/libmedia/nuplayer2/JWakeLock.h
rename to media/libmediaplayer2/nuplayer2/JWakeLock.h
diff --git a/media/libmedia/nuplayer2/MODULE_LICENSE_APACHE2 b/media/libmediaplayer2/nuplayer2/MODULE_LICENSE_APACHE2
similarity index 100%
rename from media/libmedia/nuplayer2/MODULE_LICENSE_APACHE2
rename to media/libmediaplayer2/nuplayer2/MODULE_LICENSE_APACHE2
diff --git a/media/libmedia/nuplayer2/NOTICE b/media/libmediaplayer2/nuplayer2/NOTICE
similarity index 100%
rename from media/libmedia/nuplayer2/NOTICE
rename to media/libmediaplayer2/nuplayer2/NOTICE
diff --git a/media/libmedia/nuplayer2/NuPlayer2.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2.cpp
rename to media/libmediaplayer2/nuplayer2/NuPlayer2.cpp
diff --git a/media/libmedia/nuplayer2/NuPlayer2.h b/media/libmediaplayer2/nuplayer2/NuPlayer2.h
similarity index 99%
rename from media/libmedia/nuplayer2/NuPlayer2.h
rename to media/libmediaplayer2/nuplayer2/NuPlayer2.h
index 1d74b55..594525c 100644
--- a/media/libmedia/nuplayer2/NuPlayer2.h
+++ b/media/libmediaplayer2/nuplayer2/NuPlayer2.h
@@ -19,9 +19,10 @@
 #define NU_PLAYER2_H_
 
 #include <media/AudioResamplerPublic.h>
-#include <media/MediaPlayer2Interface.h>
 #include <media/stagefright/foundation/AHandler.h>
 
+#include <mediaplayer2/MediaPlayer2Interface.h>
+
 namespace android {
 
 struct ABuffer;
diff --git a/media/libmedia/nuplayer2/NuPlayer2CCDecoder.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2CCDecoder.cpp
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2CCDecoder.cpp
rename to media/libmediaplayer2/nuplayer2/NuPlayer2CCDecoder.cpp
diff --git a/media/libmedia/nuplayer2/NuPlayer2CCDecoder.h b/media/libmediaplayer2/nuplayer2/NuPlayer2CCDecoder.h
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2CCDecoder.h
rename to media/libmediaplayer2/nuplayer2/NuPlayer2CCDecoder.h
diff --git a/media/libmedia/nuplayer2/NuPlayer2Decoder.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2Decoder.cpp
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2Decoder.cpp
rename to media/libmediaplayer2/nuplayer2/NuPlayer2Decoder.cpp
diff --git a/media/libmedia/nuplayer2/NuPlayer2Decoder.h b/media/libmediaplayer2/nuplayer2/NuPlayer2Decoder.h
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2Decoder.h
rename to media/libmediaplayer2/nuplayer2/NuPlayer2Decoder.h
diff --git a/media/libmedia/nuplayer2/NuPlayer2DecoderBase.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2DecoderBase.cpp
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2DecoderBase.cpp
rename to media/libmediaplayer2/nuplayer2/NuPlayer2DecoderBase.cpp
diff --git a/media/libmedia/nuplayer2/NuPlayer2DecoderBase.h b/media/libmediaplayer2/nuplayer2/NuPlayer2DecoderBase.h
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2DecoderBase.h
rename to media/libmediaplayer2/nuplayer2/NuPlayer2DecoderBase.h
diff --git a/media/libmedia/nuplayer2/NuPlayer2DecoderPassThrough.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2DecoderPassThrough.cpp
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2DecoderPassThrough.cpp
rename to media/libmediaplayer2/nuplayer2/NuPlayer2DecoderPassThrough.cpp
diff --git a/media/libmedia/nuplayer2/NuPlayer2DecoderPassThrough.h b/media/libmediaplayer2/nuplayer2/NuPlayer2DecoderPassThrough.h
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2DecoderPassThrough.h
rename to media/libmediaplayer2/nuplayer2/NuPlayer2DecoderPassThrough.h
diff --git a/media/libmedia/nuplayer2/NuPlayer2Driver.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2Driver.cpp
rename to media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp
diff --git a/media/libmedia/nuplayer2/NuPlayer2Driver.h b/media/libmediaplayer2/nuplayer2/NuPlayer2Driver.h
similarity index 98%
rename from media/libmedia/nuplayer2/NuPlayer2Driver.h
rename to media/libmediaplayer2/nuplayer2/NuPlayer2Driver.h
index 55fc9ef..7156813 100644
--- a/media/libmedia/nuplayer2/NuPlayer2Driver.h
+++ b/media/libmediaplayer2/nuplayer2/NuPlayer2Driver.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <media/MediaPlayer2Interface.h>
+#include <mediaplayer2/MediaPlayer2Interface.h>
 
 #include <media/MediaAnalyticsItem.h>
 #include <media/stagefright/foundation/ABase.h>
diff --git a/media/libmedia/nuplayer2/NuPlayer2Drm.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2Drm.cpp
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2Drm.cpp
rename to media/libmediaplayer2/nuplayer2/NuPlayer2Drm.cpp
diff --git a/media/libmedia/nuplayer2/NuPlayer2Drm.h b/media/libmediaplayer2/nuplayer2/NuPlayer2Drm.h
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2Drm.h
rename to media/libmediaplayer2/nuplayer2/NuPlayer2Drm.h
diff --git a/media/libmedia/nuplayer2/NuPlayer2Renderer.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2Renderer.cpp
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2Renderer.cpp
rename to media/libmediaplayer2/nuplayer2/NuPlayer2Renderer.cpp
diff --git a/media/libmedia/nuplayer2/NuPlayer2Renderer.h b/media/libmediaplayer2/nuplayer2/NuPlayer2Renderer.h
similarity index 100%
rename from media/libmedia/nuplayer2/NuPlayer2Renderer.h
rename to media/libmediaplayer2/nuplayer2/NuPlayer2Renderer.h
diff --git a/media/libmedia/nuplayer2/NuPlayer2Source.h b/media/libmediaplayer2/nuplayer2/NuPlayer2Source.h
similarity index 98%
rename from media/libmedia/nuplayer2/NuPlayer2Source.h
rename to media/libmediaplayer2/nuplayer2/NuPlayer2Source.h
index 41ded9d..ef57bc0 100644
--- a/media/libmedia/nuplayer2/NuPlayer2Source.h
+++ b/media/libmediaplayer2/nuplayer2/NuPlayer2Source.h
@@ -20,9 +20,9 @@
 
 #include "NuPlayer2.h"
 
-#include <media/mediaplayer2.h>
 #include <media/stagefright/foundation/AMessage.h>
 #include <media/stagefright/MetaData.h>
+#include <mediaplayer2/mediaplayer2.h>
 #include <utils/Vector.h>
 
 namespace android {
diff --git a/media/libmedia/nuplayer2/RTSPSource2.cpp b/media/libmediaplayer2/nuplayer2/RTSPSource2.cpp
similarity index 100%
rename from media/libmedia/nuplayer2/RTSPSource2.cpp
rename to media/libmediaplayer2/nuplayer2/RTSPSource2.cpp
diff --git a/media/libmedia/nuplayer2/RTSPSource2.h b/media/libmediaplayer2/nuplayer2/RTSPSource2.h
similarity index 100%
rename from media/libmedia/nuplayer2/RTSPSource2.h
rename to media/libmediaplayer2/nuplayer2/RTSPSource2.h