diff --git a/media/libstagefright/DataSource.cpp b/media/libmediaextractor/DataSource.cpp
similarity index 100%
rename from media/libstagefright/DataSource.cpp
rename to media/libmediaextractor/DataSource.cpp
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libmediaextractor/MediaExtractor.cpp
similarity index 100%
rename from media/libstagefright/MediaExtractor.cpp
rename to media/libmediaextractor/MediaExtractor.cpp
diff --git a/media/libstagefright/MediaSource.cpp b/media/libmediaextractor/MediaSource.cpp
similarity index 100%
rename from media/libstagefright/MediaSource.cpp
rename to media/libmediaextractor/MediaSource.cpp
diff --git a/media/libstagefright/include/media/stagefright/DataSource.h b/media/libmediaextractor/include/media/DataSource.h
similarity index 100%
rename from media/libstagefright/include/media/stagefright/DataSource.h
rename to media/libmediaextractor/include/media/DataSource.h
diff --git a/media/libstagefright/include/media/stagefright/MediaExtractor.h b/media/libmediaextractor/include/media/MediaExtractor.h
similarity index 100%
rename from media/libstagefright/include/media/stagefright/MediaExtractor.h
rename to media/libmediaextractor/include/media/MediaExtractor.h
diff --git a/media/libstagefright/include/media/stagefright/MediaSource.h b/media/libmediaextractor/include/media/MediaSource.h
similarity index 100%
rename from media/libstagefright/include/media/stagefright/MediaSource.h
rename to media/libmediaextractor/include/media/MediaSource.h