diff --git a/media/libstagefright/bqhelper/Android.bp b/media/module/bqhelper/Android.bp similarity index 97% rename from media/libstagefright/bqhelper/Android.bp rename to media/module/bqhelper/Android.bp index a4f0fb3d918fe5a9922889b02823c7c1be48511a..c4dadd036552f4b0de253c9b69348de6b3bc38fe 100644 --- a/media/libstagefright/bqhelper/Android.bp +++ b/media/module/bqhelper/Android.bp @@ -4,7 +4,6 @@ package { // all of the 'license_kinds' from "frameworks_av_media_libstagefright_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_av_media_libstagefright_license"], } cc_defaults { diff --git a/media/libstagefright/bqhelper/FrameDropper.cpp b/media/module/bqhelper/FrameDropper.cpp similarity index 100% rename from media/libstagefright/bqhelper/FrameDropper.cpp rename to media/module/bqhelper/FrameDropper.cpp diff --git a/media/libstagefright/bqhelper/GraphicBufferSource.cpp b/media/module/bqhelper/GraphicBufferSource.cpp similarity index 100% rename from media/libstagefright/bqhelper/GraphicBufferSource.cpp rename to media/module/bqhelper/GraphicBufferSource.cpp diff --git a/media/libstagefright/bqhelper/TEST_MAPPING b/media/module/bqhelper/TEST_MAPPING similarity index 100% rename from media/libstagefright/bqhelper/TEST_MAPPING rename to media/module/bqhelper/TEST_MAPPING diff --git a/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/ComponentWrapper.h b/media/module/bqhelper/include/media/stagefright/bqhelper/ComponentWrapper.h similarity index 100% rename from media/libstagefright/bqhelper/include/media/stagefright/bqhelper/ComponentWrapper.h rename to media/module/bqhelper/include/media/stagefright/bqhelper/ComponentWrapper.h diff --git a/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h b/media/module/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h similarity index 100% rename from media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h rename to media/module/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h diff --git a/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h b/media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h similarity index 100% rename from media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h rename to media/module/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h diff --git a/media/libstagefright/bqhelper/tests/Android.bp b/media/module/bqhelper/tests/Android.bp similarity index 88% rename from media/libstagefright/bqhelper/tests/Android.bp rename to media/module/bqhelper/tests/Android.bp index 95953eeee97bf00583ae9b922e014e7799da15f2..3004ec41c64c500375033b291553e749815e63c0 100644 --- a/media/libstagefright/bqhelper/tests/Android.bp +++ b/media/module/bqhelper/tests/Android.bp @@ -4,7 +4,6 @@ package { // all of the 'license_kinds' from "frameworks_av_media_libstagefright_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["frameworks_av_media_libstagefright_license"], } cc_test { diff --git a/media/libstagefright/bqhelper/tests/FrameDropper_test.cpp b/media/module/bqhelper/tests/FrameDropper_test.cpp similarity index 100% rename from media/libstagefright/bqhelper/tests/FrameDropper_test.cpp rename to media/module/bqhelper/tests/FrameDropper_test.cpp diff --git a/media/bufferpool/1.0/Accessor.cpp b/media/module/bufferpool/1.0/Accessor.cpp similarity index 100% rename from media/bufferpool/1.0/Accessor.cpp rename to media/module/bufferpool/1.0/Accessor.cpp diff --git a/media/bufferpool/1.0/Accessor.h b/media/module/bufferpool/1.0/Accessor.h similarity index 100% rename from media/bufferpool/1.0/Accessor.h rename to media/module/bufferpool/1.0/Accessor.h diff --git a/media/bufferpool/1.0/AccessorImpl.cpp b/media/module/bufferpool/1.0/AccessorImpl.cpp similarity index 100% rename from media/bufferpool/1.0/AccessorImpl.cpp rename to media/module/bufferpool/1.0/AccessorImpl.cpp diff --git a/media/bufferpool/1.0/AccessorImpl.h b/media/module/bufferpool/1.0/AccessorImpl.h similarity index 100% rename from media/bufferpool/1.0/AccessorImpl.h rename to media/module/bufferpool/1.0/AccessorImpl.h diff --git a/media/bufferpool/1.0/Android.bp b/media/module/bufferpool/1.0/Android.bp similarity index 100% rename from media/bufferpool/1.0/Android.bp rename to media/module/bufferpool/1.0/Android.bp diff --git a/media/bufferpool/1.0/BufferPoolClient.cpp b/media/module/bufferpool/1.0/BufferPoolClient.cpp similarity index 100% rename from media/bufferpool/1.0/BufferPoolClient.cpp rename to media/module/bufferpool/1.0/BufferPoolClient.cpp diff --git a/media/bufferpool/1.0/BufferPoolClient.h b/media/module/bufferpool/1.0/BufferPoolClient.h similarity index 100% rename from media/bufferpool/1.0/BufferPoolClient.h rename to media/module/bufferpool/1.0/BufferPoolClient.h diff --git a/media/bufferpool/1.0/BufferStatus.cpp b/media/module/bufferpool/1.0/BufferStatus.cpp similarity index 100% rename from media/bufferpool/1.0/BufferStatus.cpp rename to media/module/bufferpool/1.0/BufferStatus.cpp diff --git a/media/bufferpool/1.0/BufferStatus.h b/media/module/bufferpool/1.0/BufferStatus.h similarity index 100% rename from media/bufferpool/1.0/BufferStatus.h rename to media/module/bufferpool/1.0/BufferStatus.h diff --git a/media/bufferpool/1.0/ClientManager.cpp b/media/module/bufferpool/1.0/ClientManager.cpp similarity index 100% rename from media/bufferpool/1.0/ClientManager.cpp rename to media/module/bufferpool/1.0/ClientManager.cpp diff --git a/media/bufferpool/1.0/Connection.cpp b/media/module/bufferpool/1.0/Connection.cpp similarity index 100% rename from media/bufferpool/1.0/Connection.cpp rename to media/module/bufferpool/1.0/Connection.cpp diff --git a/media/bufferpool/1.0/Connection.h b/media/module/bufferpool/1.0/Connection.h similarity index 100% rename from media/bufferpool/1.0/Connection.h rename to media/module/bufferpool/1.0/Connection.h diff --git a/media/bufferpool/1.0/TEST_MAPPING b/media/module/bufferpool/1.0/TEST_MAPPING similarity index 100% rename from media/bufferpool/1.0/TEST_MAPPING rename to media/module/bufferpool/1.0/TEST_MAPPING diff --git a/media/bufferpool/1.0/include/bufferpool/BufferPoolTypes.h b/media/module/bufferpool/1.0/include/bufferpool/BufferPoolTypes.h similarity index 100% rename from media/bufferpool/1.0/include/bufferpool/BufferPoolTypes.h rename to media/module/bufferpool/1.0/include/bufferpool/BufferPoolTypes.h diff --git a/media/bufferpool/1.0/include/bufferpool/ClientManager.h b/media/module/bufferpool/1.0/include/bufferpool/ClientManager.h similarity index 100% rename from media/bufferpool/1.0/include/bufferpool/ClientManager.h rename to media/module/bufferpool/1.0/include/bufferpool/ClientManager.h diff --git a/media/bufferpool/1.0/vts/Android.bp b/media/module/bufferpool/1.0/vts/Android.bp similarity index 100% rename from media/bufferpool/1.0/vts/Android.bp rename to media/module/bufferpool/1.0/vts/Android.bp diff --git a/media/bufferpool/1.0/vts/OWNERS b/media/module/bufferpool/1.0/vts/OWNERS similarity index 100% rename from media/bufferpool/1.0/vts/OWNERS rename to media/module/bufferpool/1.0/vts/OWNERS diff --git a/media/bufferpool/1.0/vts/allocator.cpp b/media/module/bufferpool/1.0/vts/allocator.cpp similarity index 100% rename from media/bufferpool/1.0/vts/allocator.cpp rename to media/module/bufferpool/1.0/vts/allocator.cpp diff --git a/media/bufferpool/1.0/vts/allocator.h b/media/module/bufferpool/1.0/vts/allocator.h similarity index 100% rename from media/bufferpool/1.0/vts/allocator.h rename to media/module/bufferpool/1.0/vts/allocator.h diff --git a/media/bufferpool/1.0/vts/multi.cpp b/media/module/bufferpool/1.0/vts/multi.cpp similarity index 100% rename from media/bufferpool/1.0/vts/multi.cpp rename to media/module/bufferpool/1.0/vts/multi.cpp diff --git a/media/bufferpool/1.0/vts/single.cpp b/media/module/bufferpool/1.0/vts/single.cpp similarity index 100% rename from media/bufferpool/1.0/vts/single.cpp rename to media/module/bufferpool/1.0/vts/single.cpp diff --git a/media/bufferpool/2.0/Accessor.cpp b/media/module/bufferpool/2.0/Accessor.cpp similarity index 100% rename from media/bufferpool/2.0/Accessor.cpp rename to media/module/bufferpool/2.0/Accessor.cpp diff --git a/media/bufferpool/2.0/Accessor.h b/media/module/bufferpool/2.0/Accessor.h similarity index 100% rename from media/bufferpool/2.0/Accessor.h rename to media/module/bufferpool/2.0/Accessor.h diff --git a/media/bufferpool/2.0/AccessorImpl.cpp b/media/module/bufferpool/2.0/AccessorImpl.cpp similarity index 100% rename from media/bufferpool/2.0/AccessorImpl.cpp rename to media/module/bufferpool/2.0/AccessorImpl.cpp diff --git a/media/bufferpool/2.0/AccessorImpl.h b/media/module/bufferpool/2.0/AccessorImpl.h similarity index 100% rename from media/bufferpool/2.0/AccessorImpl.h rename to media/module/bufferpool/2.0/AccessorImpl.h diff --git a/media/bufferpool/2.0/Android.bp b/media/module/bufferpool/2.0/Android.bp similarity index 100% rename from media/bufferpool/2.0/Android.bp rename to media/module/bufferpool/2.0/Android.bp diff --git a/media/bufferpool/2.0/BufferPoolClient.cpp b/media/module/bufferpool/2.0/BufferPoolClient.cpp similarity index 100% rename from media/bufferpool/2.0/BufferPoolClient.cpp rename to media/module/bufferpool/2.0/BufferPoolClient.cpp diff --git a/media/bufferpool/2.0/BufferPoolClient.h b/media/module/bufferpool/2.0/BufferPoolClient.h similarity index 100% rename from media/bufferpool/2.0/BufferPoolClient.h rename to media/module/bufferpool/2.0/BufferPoolClient.h diff --git a/media/bufferpool/2.0/BufferStatus.cpp b/media/module/bufferpool/2.0/BufferStatus.cpp similarity index 100% rename from media/bufferpool/2.0/BufferStatus.cpp rename to media/module/bufferpool/2.0/BufferStatus.cpp diff --git a/media/bufferpool/2.0/BufferStatus.h b/media/module/bufferpool/2.0/BufferStatus.h similarity index 100% rename from media/bufferpool/2.0/BufferStatus.h rename to media/module/bufferpool/2.0/BufferStatus.h diff --git a/media/bufferpool/2.0/ClientManager.cpp b/media/module/bufferpool/2.0/ClientManager.cpp similarity index 100% rename from media/bufferpool/2.0/ClientManager.cpp rename to media/module/bufferpool/2.0/ClientManager.cpp diff --git a/media/bufferpool/2.0/Connection.cpp b/media/module/bufferpool/2.0/Connection.cpp similarity index 100% rename from media/bufferpool/2.0/Connection.cpp rename to media/module/bufferpool/2.0/Connection.cpp diff --git a/media/bufferpool/2.0/Connection.h b/media/module/bufferpool/2.0/Connection.h similarity index 100% rename from media/bufferpool/2.0/Connection.h rename to media/module/bufferpool/2.0/Connection.h diff --git a/media/bufferpool/2.0/Observer.cpp b/media/module/bufferpool/2.0/Observer.cpp similarity index 100% rename from media/bufferpool/2.0/Observer.cpp rename to media/module/bufferpool/2.0/Observer.cpp diff --git a/media/bufferpool/2.0/Observer.h b/media/module/bufferpool/2.0/Observer.h similarity index 100% rename from media/bufferpool/2.0/Observer.h rename to media/module/bufferpool/2.0/Observer.h diff --git a/media/bufferpool/2.0/TEST_MAPPING b/media/module/bufferpool/2.0/TEST_MAPPING similarity index 100% rename from media/bufferpool/2.0/TEST_MAPPING rename to media/module/bufferpool/2.0/TEST_MAPPING diff --git a/media/bufferpool/2.0/include/bufferpool/BufferPoolTypes.h b/media/module/bufferpool/2.0/include/bufferpool/BufferPoolTypes.h similarity index 100% rename from media/bufferpool/2.0/include/bufferpool/BufferPoolTypes.h rename to media/module/bufferpool/2.0/include/bufferpool/BufferPoolTypes.h diff --git a/media/bufferpool/2.0/include/bufferpool/ClientManager.h b/media/module/bufferpool/2.0/include/bufferpool/ClientManager.h similarity index 100% rename from media/bufferpool/2.0/include/bufferpool/ClientManager.h rename to media/module/bufferpool/2.0/include/bufferpool/ClientManager.h diff --git a/media/bufferpool/2.0/tests/Android.bp b/media/module/bufferpool/2.0/tests/Android.bp similarity index 100% rename from media/bufferpool/2.0/tests/Android.bp rename to media/module/bufferpool/2.0/tests/Android.bp diff --git a/media/bufferpool/2.0/tests/AndroidTest.xml b/media/module/bufferpool/2.0/tests/AndroidTest.xml similarity index 100% rename from media/bufferpool/2.0/tests/AndroidTest.xml rename to media/module/bufferpool/2.0/tests/AndroidTest.xml diff --git a/media/bufferpool/2.0/tests/BufferpoolUnitTest.cpp b/media/module/bufferpool/2.0/tests/BufferpoolUnitTest.cpp similarity index 100% rename from media/bufferpool/2.0/tests/BufferpoolUnitTest.cpp rename to media/module/bufferpool/2.0/tests/BufferpoolUnitTest.cpp diff --git a/media/bufferpool/2.0/tests/OWNERS b/media/module/bufferpool/2.0/tests/OWNERS similarity index 100% rename from media/bufferpool/2.0/tests/OWNERS rename to media/module/bufferpool/2.0/tests/OWNERS diff --git a/media/bufferpool/2.0/tests/README.md b/media/module/bufferpool/2.0/tests/README.md similarity index 100% rename from media/bufferpool/2.0/tests/README.md rename to media/module/bufferpool/2.0/tests/README.md diff --git a/media/bufferpool/2.0/tests/allocator.cpp b/media/module/bufferpool/2.0/tests/allocator.cpp similarity index 100% rename from media/bufferpool/2.0/tests/allocator.cpp rename to media/module/bufferpool/2.0/tests/allocator.cpp diff --git a/media/bufferpool/2.0/tests/allocator.h b/media/module/bufferpool/2.0/tests/allocator.h similarity index 100% rename from media/bufferpool/2.0/tests/allocator.h rename to media/module/bufferpool/2.0/tests/allocator.h diff --git a/media/bufferpool/2.0/tests/cond.cpp b/media/module/bufferpool/2.0/tests/cond.cpp similarity index 100% rename from media/bufferpool/2.0/tests/cond.cpp rename to media/module/bufferpool/2.0/tests/cond.cpp diff --git a/media/bufferpool/2.0/tests/multi.cpp b/media/module/bufferpool/2.0/tests/multi.cpp similarity index 100% rename from media/bufferpool/2.0/tests/multi.cpp rename to media/module/bufferpool/2.0/tests/multi.cpp diff --git a/media/bufferpool/2.0/tests/single.cpp b/media/module/bufferpool/2.0/tests/single.cpp similarity index 100% rename from media/bufferpool/2.0/tests/single.cpp rename to media/module/bufferpool/2.0/tests/single.cpp diff --git a/media/codecs/amrnb/TEST_MAPPING b/media/module/codecs/amrnb/TEST_MAPPING similarity index 100% rename from media/codecs/amrnb/TEST_MAPPING rename to media/module/codecs/amrnb/TEST_MAPPING diff --git a/media/codecs/amrnb/common/Android.bp b/media/module/codecs/amrnb/common/Android.bp similarity index 100% rename from media/codecs/amrnb/common/Android.bp rename to media/module/codecs/amrnb/common/Android.bp diff --git a/media/codecs/amrnb/common/MODULE_LICENSE_APACHE2 b/media/module/codecs/amrnb/common/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/codecs/amrnb/common/MODULE_LICENSE_APACHE2 rename to media/module/codecs/amrnb/common/MODULE_LICENSE_APACHE2 diff --git a/media/codecs/amrnb/common/NOTICE b/media/module/codecs/amrnb/common/NOTICE similarity index 100% rename from media/codecs/amrnb/common/NOTICE rename to media/module/codecs/amrnb/common/NOTICE diff --git a/media/codecs/amrnb/common/include/abs_s.h b/media/module/codecs/amrnb/common/include/abs_s.h similarity index 100% rename from media/codecs/amrnb/common/include/abs_s.h rename to media/module/codecs/amrnb/common/include/abs_s.h diff --git a/media/codecs/amrnb/common/include/add.h b/media/module/codecs/amrnb/common/include/add.h similarity index 100% rename from media/codecs/amrnb/common/include/add.h rename to media/module/codecs/amrnb/common/include/add.h diff --git a/media/codecs/amrnb/common/include/az_lsp.h b/media/module/codecs/amrnb/common/include/az_lsp.h similarity index 100% rename from media/codecs/amrnb/common/include/az_lsp.h rename to media/module/codecs/amrnb/common/include/az_lsp.h diff --git a/media/codecs/amrnb/common/include/basic_op.h b/media/module/codecs/amrnb/common/include/basic_op.h similarity index 100% rename from media/codecs/amrnb/common/include/basic_op.h rename to media/module/codecs/amrnb/common/include/basic_op.h diff --git a/media/codecs/amrnb/common/include/basic_op_arm_gcc_v5.h b/media/module/codecs/amrnb/common/include/basic_op_arm_gcc_v5.h similarity index 100% rename from media/codecs/amrnb/common/include/basic_op_arm_gcc_v5.h rename to media/module/codecs/amrnb/common/include/basic_op_arm_gcc_v5.h diff --git a/media/codecs/amrnb/common/include/basic_op_arm_v5.h b/media/module/codecs/amrnb/common/include/basic_op_arm_v5.h similarity index 100% rename from media/codecs/amrnb/common/include/basic_op_arm_v5.h rename to media/module/codecs/amrnb/common/include/basic_op_arm_v5.h diff --git a/media/codecs/amrnb/common/include/basic_op_c_equivalent.h b/media/module/codecs/amrnb/common/include/basic_op_c_equivalent.h similarity index 100% rename from media/codecs/amrnb/common/include/basic_op_c_equivalent.h rename to media/module/codecs/amrnb/common/include/basic_op_c_equivalent.h diff --git a/media/codecs/amrnb/common/include/basicop_malloc.h b/media/module/codecs/amrnb/common/include/basicop_malloc.h similarity index 100% rename from media/codecs/amrnb/common/include/basicop_malloc.h rename to media/module/codecs/amrnb/common/include/basicop_malloc.h diff --git a/media/codecs/amrnb/common/include/bitno_tab.h b/media/module/codecs/amrnb/common/include/bitno_tab.h similarity index 100% rename from media/codecs/amrnb/common/include/bitno_tab.h rename to media/module/codecs/amrnb/common/include/bitno_tab.h diff --git a/media/codecs/amrnb/common/include/bitreorder_tab.h b/media/module/codecs/amrnb/common/include/bitreorder_tab.h similarity index 100% rename from media/codecs/amrnb/common/include/bitreorder_tab.h rename to media/module/codecs/amrnb/common/include/bitreorder_tab.h diff --git a/media/codecs/amrnb/common/include/bits2prm.h b/media/module/codecs/amrnb/common/include/bits2prm.h similarity index 100% rename from media/codecs/amrnb/common/include/bits2prm.h rename to media/module/codecs/amrnb/common/include/bits2prm.h diff --git a/media/codecs/amrnb/common/include/cnst.h b/media/module/codecs/amrnb/common/include/cnst.h similarity index 100% rename from media/codecs/amrnb/common/include/cnst.h rename to media/module/codecs/amrnb/common/include/cnst.h diff --git a/media/codecs/amrnb/common/include/cnst_vad.h b/media/module/codecs/amrnb/common/include/cnst_vad.h similarity index 100% rename from media/codecs/amrnb/common/include/cnst_vad.h rename to media/module/codecs/amrnb/common/include/cnst_vad.h diff --git a/media/codecs/amrnb/common/include/copy.h b/media/module/codecs/amrnb/common/include/copy.h similarity index 100% rename from media/codecs/amrnb/common/include/copy.h rename to media/module/codecs/amrnb/common/include/copy.h diff --git a/media/codecs/amrnb/common/include/d_gain_c.h b/media/module/codecs/amrnb/common/include/d_gain_c.h similarity index 100% rename from media/codecs/amrnb/common/include/d_gain_c.h rename to media/module/codecs/amrnb/common/include/d_gain_c.h diff --git a/media/codecs/amrnb/common/include/d_gain_p.h b/media/module/codecs/amrnb/common/include/d_gain_p.h similarity index 100% rename from media/codecs/amrnb/common/include/d_gain_p.h rename to media/module/codecs/amrnb/common/include/d_gain_p.h diff --git a/media/codecs/amrnb/common/include/d_plsf.h b/media/module/codecs/amrnb/common/include/d_plsf.h similarity index 100% rename from media/codecs/amrnb/common/include/d_plsf.h rename to media/module/codecs/amrnb/common/include/d_plsf.h diff --git a/media/codecs/amrnb/common/include/div_32.h b/media/module/codecs/amrnb/common/include/div_32.h similarity index 100% rename from media/codecs/amrnb/common/include/div_32.h rename to media/module/codecs/amrnb/common/include/div_32.h diff --git a/media/codecs/amrnb/common/include/div_s.h b/media/module/codecs/amrnb/common/include/div_s.h similarity index 100% rename from media/codecs/amrnb/common/include/div_s.h rename to media/module/codecs/amrnb/common/include/div_s.h diff --git a/media/codecs/amrnb/common/include/dtx_common_def.h b/media/module/codecs/amrnb/common/include/dtx_common_def.h similarity index 100% rename from media/codecs/amrnb/common/include/dtx_common_def.h rename to media/module/codecs/amrnb/common/include/dtx_common_def.h diff --git a/media/codecs/amrnb/common/include/extract_h.h b/media/module/codecs/amrnb/common/include/extract_h.h similarity index 100% rename from media/codecs/amrnb/common/include/extract_h.h rename to media/module/codecs/amrnb/common/include/extract_h.h diff --git a/media/codecs/amrnb/common/include/extract_l.h b/media/module/codecs/amrnb/common/include/extract_l.h similarity index 100% rename from media/codecs/amrnb/common/include/extract_l.h rename to media/module/codecs/amrnb/common/include/extract_l.h diff --git a/media/codecs/amrnb/common/include/frame.h b/media/module/codecs/amrnb/common/include/frame.h similarity index 100% rename from media/codecs/amrnb/common/include/frame.h rename to media/module/codecs/amrnb/common/include/frame.h diff --git a/media/codecs/amrnb/common/include/frame_type_3gpp.h b/media/module/codecs/amrnb/common/include/frame_type_3gpp.h similarity index 100% rename from media/codecs/amrnb/common/include/frame_type_3gpp.h rename to media/module/codecs/amrnb/common/include/frame_type_3gpp.h diff --git a/media/codecs/amrnb/common/include/gc_pred.h b/media/module/codecs/amrnb/common/include/gc_pred.h similarity index 100% rename from media/codecs/amrnb/common/include/gc_pred.h rename to media/module/codecs/amrnb/common/include/gc_pred.h diff --git a/media/codecs/amrnb/common/include/gmed_n.h b/media/module/codecs/amrnb/common/include/gmed_n.h similarity index 100% rename from media/codecs/amrnb/common/include/gmed_n.h rename to media/module/codecs/amrnb/common/include/gmed_n.h diff --git a/media/codecs/amrnb/common/include/gsm_amr_typedefs.h b/media/module/codecs/amrnb/common/include/gsm_amr_typedefs.h similarity index 100% rename from media/codecs/amrnb/common/include/gsm_amr_typedefs.h rename to media/module/codecs/amrnb/common/include/gsm_amr_typedefs.h diff --git a/media/codecs/amrnb/common/include/int_lpc.h b/media/module/codecs/amrnb/common/include/int_lpc.h similarity index 100% rename from media/codecs/amrnb/common/include/int_lpc.h rename to media/module/codecs/amrnb/common/include/int_lpc.h diff --git a/media/codecs/amrnb/common/include/int_lsf.h b/media/module/codecs/amrnb/common/include/int_lsf.h similarity index 100% rename from media/codecs/amrnb/common/include/int_lsf.h rename to media/module/codecs/amrnb/common/include/int_lsf.h diff --git a/media/codecs/amrnb/common/include/inv_sqrt.h b/media/module/codecs/amrnb/common/include/inv_sqrt.h similarity index 100% rename from media/codecs/amrnb/common/include/inv_sqrt.h rename to media/module/codecs/amrnb/common/include/inv_sqrt.h diff --git a/media/codecs/amrnb/common/include/l_abs.h b/media/module/codecs/amrnb/common/include/l_abs.h similarity index 100% rename from media/codecs/amrnb/common/include/l_abs.h rename to media/module/codecs/amrnb/common/include/l_abs.h diff --git a/media/codecs/amrnb/common/include/l_add.h b/media/module/codecs/amrnb/common/include/l_add.h similarity index 100% rename from media/codecs/amrnb/common/include/l_add.h rename to media/module/codecs/amrnb/common/include/l_add.h diff --git a/media/codecs/amrnb/common/include/l_add_c.h b/media/module/codecs/amrnb/common/include/l_add_c.h similarity index 100% rename from media/codecs/amrnb/common/include/l_add_c.h rename to media/module/codecs/amrnb/common/include/l_add_c.h diff --git a/media/codecs/amrnb/common/include/l_comp.h b/media/module/codecs/amrnb/common/include/l_comp.h similarity index 100% rename from media/codecs/amrnb/common/include/l_comp.h rename to media/module/codecs/amrnb/common/include/l_comp.h diff --git a/media/codecs/amrnb/common/include/l_deposit_h.h b/media/module/codecs/amrnb/common/include/l_deposit_h.h similarity index 100% rename from media/codecs/amrnb/common/include/l_deposit_h.h rename to media/module/codecs/amrnb/common/include/l_deposit_h.h diff --git a/media/codecs/amrnb/common/include/l_deposit_l.h b/media/module/codecs/amrnb/common/include/l_deposit_l.h similarity index 100% rename from media/codecs/amrnb/common/include/l_deposit_l.h rename to media/module/codecs/amrnb/common/include/l_deposit_l.h diff --git a/media/codecs/amrnb/common/include/l_extract.h b/media/module/codecs/amrnb/common/include/l_extract.h similarity index 100% rename from media/codecs/amrnb/common/include/l_extract.h rename to media/module/codecs/amrnb/common/include/l_extract.h diff --git a/media/codecs/amrnb/common/include/l_mac.h b/media/module/codecs/amrnb/common/include/l_mac.h similarity index 100% rename from media/codecs/amrnb/common/include/l_mac.h rename to media/module/codecs/amrnb/common/include/l_mac.h diff --git a/media/codecs/amrnb/common/include/l_msu.h b/media/module/codecs/amrnb/common/include/l_msu.h similarity index 100% rename from media/codecs/amrnb/common/include/l_msu.h rename to media/module/codecs/amrnb/common/include/l_msu.h diff --git a/media/codecs/amrnb/common/include/l_mult.h b/media/module/codecs/amrnb/common/include/l_mult.h similarity index 100% rename from media/codecs/amrnb/common/include/l_mult.h rename to media/module/codecs/amrnb/common/include/l_mult.h diff --git a/media/codecs/amrnb/common/include/l_negate.h b/media/module/codecs/amrnb/common/include/l_negate.h similarity index 100% rename from media/codecs/amrnb/common/include/l_negate.h rename to media/module/codecs/amrnb/common/include/l_negate.h diff --git a/media/codecs/amrnb/common/include/l_shl.h b/media/module/codecs/amrnb/common/include/l_shl.h similarity index 100% rename from media/codecs/amrnb/common/include/l_shl.h rename to media/module/codecs/amrnb/common/include/l_shl.h diff --git a/media/codecs/amrnb/common/include/l_shr.h b/media/module/codecs/amrnb/common/include/l_shr.h similarity index 100% rename from media/codecs/amrnb/common/include/l_shr.h rename to media/module/codecs/amrnb/common/include/l_shr.h diff --git a/media/codecs/amrnb/common/include/l_shr_r.h b/media/module/codecs/amrnb/common/include/l_shr_r.h similarity index 100% rename from media/codecs/amrnb/common/include/l_shr_r.h rename to media/module/codecs/amrnb/common/include/l_shr_r.h diff --git a/media/codecs/amrnb/common/include/l_sub.h b/media/module/codecs/amrnb/common/include/l_sub.h similarity index 100% rename from media/codecs/amrnb/common/include/l_sub.h rename to media/module/codecs/amrnb/common/include/l_sub.h diff --git a/media/codecs/amrnb/common/include/log2.h b/media/module/codecs/amrnb/common/include/log2.h similarity index 100% rename from media/codecs/amrnb/common/include/log2.h rename to media/module/codecs/amrnb/common/include/log2.h diff --git a/media/codecs/amrnb/common/include/log2_norm.h b/media/module/codecs/amrnb/common/include/log2_norm.h similarity index 100% rename from media/codecs/amrnb/common/include/log2_norm.h rename to media/module/codecs/amrnb/common/include/log2_norm.h diff --git a/media/codecs/amrnb/common/include/lsfwt.h b/media/module/codecs/amrnb/common/include/lsfwt.h similarity index 100% rename from media/codecs/amrnb/common/include/lsfwt.h rename to media/module/codecs/amrnb/common/include/lsfwt.h diff --git a/media/codecs/amrnb/common/include/lsp.h b/media/module/codecs/amrnb/common/include/lsp.h similarity index 100% rename from media/codecs/amrnb/common/include/lsp.h rename to media/module/codecs/amrnb/common/include/lsp.h diff --git a/media/codecs/amrnb/common/include/lsp_az.h b/media/module/codecs/amrnb/common/include/lsp_az.h similarity index 100% rename from media/codecs/amrnb/common/include/lsp_az.h rename to media/module/codecs/amrnb/common/include/lsp_az.h diff --git a/media/codecs/amrnb/common/include/lsp_lsf.h b/media/module/codecs/amrnb/common/include/lsp_lsf.h similarity index 100% rename from media/codecs/amrnb/common/include/lsp_lsf.h rename to media/module/codecs/amrnb/common/include/lsp_lsf.h diff --git a/media/codecs/amrnb/common/include/lsp_tab.h b/media/module/codecs/amrnb/common/include/lsp_tab.h similarity index 100% rename from media/codecs/amrnb/common/include/lsp_tab.h rename to media/module/codecs/amrnb/common/include/lsp_tab.h diff --git a/media/codecs/amrnb/common/include/mac_32.h b/media/module/codecs/amrnb/common/include/mac_32.h similarity index 100% rename from media/codecs/amrnb/common/include/mac_32.h rename to media/module/codecs/amrnb/common/include/mac_32.h diff --git a/media/codecs/amrnb/common/include/mode.h b/media/module/codecs/amrnb/common/include/mode.h similarity index 100% rename from media/codecs/amrnb/common/include/mode.h rename to media/module/codecs/amrnb/common/include/mode.h diff --git a/media/codecs/amrnb/common/include/mpy_32.h b/media/module/codecs/amrnb/common/include/mpy_32.h similarity index 100% rename from media/codecs/amrnb/common/include/mpy_32.h rename to media/module/codecs/amrnb/common/include/mpy_32.h diff --git a/media/codecs/amrnb/common/include/mpy_32_16.h b/media/module/codecs/amrnb/common/include/mpy_32_16.h similarity index 100% rename from media/codecs/amrnb/common/include/mpy_32_16.h rename to media/module/codecs/amrnb/common/include/mpy_32_16.h diff --git a/media/codecs/amrnb/common/include/mult.h b/media/module/codecs/amrnb/common/include/mult.h similarity index 100% rename from media/codecs/amrnb/common/include/mult.h rename to media/module/codecs/amrnb/common/include/mult.h diff --git a/media/codecs/amrnb/common/include/mult_r.h b/media/module/codecs/amrnb/common/include/mult_r.h similarity index 100% rename from media/codecs/amrnb/common/include/mult_r.h rename to media/module/codecs/amrnb/common/include/mult_r.h diff --git a/media/codecs/amrnb/common/include/n_proc.h b/media/module/codecs/amrnb/common/include/n_proc.h similarity index 100% rename from media/codecs/amrnb/common/include/n_proc.h rename to media/module/codecs/amrnb/common/include/n_proc.h diff --git a/media/codecs/amrnb/common/include/negate.h b/media/module/codecs/amrnb/common/include/negate.h similarity index 100% rename from media/codecs/amrnb/common/include/negate.h rename to media/module/codecs/amrnb/common/include/negate.h diff --git a/media/codecs/amrnb/common/include/norm_l.h b/media/module/codecs/amrnb/common/include/norm_l.h similarity index 100% rename from media/codecs/amrnb/common/include/norm_l.h rename to media/module/codecs/amrnb/common/include/norm_l.h diff --git a/media/codecs/amrnb/common/include/norm_s.h b/media/module/codecs/amrnb/common/include/norm_s.h similarity index 100% rename from media/codecs/amrnb/common/include/norm_s.h rename to media/module/codecs/amrnb/common/include/norm_s.h diff --git a/media/codecs/amrnb/common/include/oper_32b.h b/media/module/codecs/amrnb/common/include/oper_32b.h similarity index 100% rename from media/codecs/amrnb/common/include/oper_32b.h rename to media/module/codecs/amrnb/common/include/oper_32b.h diff --git a/media/codecs/amrnb/common/include/p_ol_wgh.h b/media/module/codecs/amrnb/common/include/p_ol_wgh.h similarity index 100% rename from media/codecs/amrnb/common/include/p_ol_wgh.h rename to media/module/codecs/amrnb/common/include/p_ol_wgh.h diff --git a/media/codecs/amrnb/common/include/pow2.h b/media/module/codecs/amrnb/common/include/pow2.h similarity index 100% rename from media/codecs/amrnb/common/include/pow2.h rename to media/module/codecs/amrnb/common/include/pow2.h diff --git a/media/codecs/amrnb/common/include/pred_lt.h b/media/module/codecs/amrnb/common/include/pred_lt.h similarity index 100% rename from media/codecs/amrnb/common/include/pred_lt.h rename to media/module/codecs/amrnb/common/include/pred_lt.h diff --git a/media/codecs/amrnb/common/include/q_plsf.h b/media/module/codecs/amrnb/common/include/q_plsf.h similarity index 100% rename from media/codecs/amrnb/common/include/q_plsf.h rename to media/module/codecs/amrnb/common/include/q_plsf.h diff --git a/media/codecs/amrnb/common/include/q_plsf_3_tbl.h b/media/module/codecs/amrnb/common/include/q_plsf_3_tbl.h similarity index 100% rename from media/codecs/amrnb/common/include/q_plsf_3_tbl.h rename to media/module/codecs/amrnb/common/include/q_plsf_3_tbl.h diff --git a/media/codecs/amrnb/common/include/q_plsf_5_tbl.h b/media/module/codecs/amrnb/common/include/q_plsf_5_tbl.h similarity index 100% rename from media/codecs/amrnb/common/include/q_plsf_5_tbl.h rename to media/module/codecs/amrnb/common/include/q_plsf_5_tbl.h diff --git a/media/codecs/amrnb/common/include/qgain475_tab.h b/media/module/codecs/amrnb/common/include/qgain475_tab.h similarity index 100% rename from media/codecs/amrnb/common/include/qgain475_tab.h rename to media/module/codecs/amrnb/common/include/qgain475_tab.h diff --git a/media/codecs/amrnb/common/include/qua_gain.h b/media/module/codecs/amrnb/common/include/qua_gain.h similarity index 100% rename from media/codecs/amrnb/common/include/qua_gain.h rename to media/module/codecs/amrnb/common/include/qua_gain.h diff --git a/media/codecs/amrnb/common/include/qua_gain_tbl.h b/media/module/codecs/amrnb/common/include/qua_gain_tbl.h similarity index 100% rename from media/codecs/amrnb/common/include/qua_gain_tbl.h rename to media/module/codecs/amrnb/common/include/qua_gain_tbl.h diff --git a/media/codecs/amrnb/common/include/reorder.h b/media/module/codecs/amrnb/common/include/reorder.h similarity index 100% rename from media/codecs/amrnb/common/include/reorder.h rename to media/module/codecs/amrnb/common/include/reorder.h diff --git a/media/codecs/amrnb/common/include/residu.h b/media/module/codecs/amrnb/common/include/residu.h similarity index 100% rename from media/codecs/amrnb/common/include/residu.h rename to media/module/codecs/amrnb/common/include/residu.h diff --git a/media/codecs/amrnb/common/include/reverse_bits.h b/media/module/codecs/amrnb/common/include/reverse_bits.h similarity index 100% rename from media/codecs/amrnb/common/include/reverse_bits.h rename to media/module/codecs/amrnb/common/include/reverse_bits.h diff --git a/media/codecs/amrnb/common/include/round.h b/media/module/codecs/amrnb/common/include/round.h similarity index 100% rename from media/codecs/amrnb/common/include/round.h rename to media/module/codecs/amrnb/common/include/round.h diff --git a/media/codecs/amrnb/common/include/set_zero.h b/media/module/codecs/amrnb/common/include/set_zero.h similarity index 100% rename from media/codecs/amrnb/common/include/set_zero.h rename to media/module/codecs/amrnb/common/include/set_zero.h diff --git a/media/codecs/amrnb/common/include/shl.h b/media/module/codecs/amrnb/common/include/shl.h similarity index 100% rename from media/codecs/amrnb/common/include/shl.h rename to media/module/codecs/amrnb/common/include/shl.h diff --git a/media/codecs/amrnb/common/include/shr.h b/media/module/codecs/amrnb/common/include/shr.h similarity index 100% rename from media/codecs/amrnb/common/include/shr.h rename to media/module/codecs/amrnb/common/include/shr.h diff --git a/media/codecs/amrnb/common/include/shr_r.h b/media/module/codecs/amrnb/common/include/shr_r.h similarity index 100% rename from media/codecs/amrnb/common/include/shr_r.h rename to media/module/codecs/amrnb/common/include/shr_r.h diff --git a/media/codecs/amrnb/common/include/sqrt_l.h b/media/module/codecs/amrnb/common/include/sqrt_l.h similarity index 100% rename from media/codecs/amrnb/common/include/sqrt_l.h rename to media/module/codecs/amrnb/common/include/sqrt_l.h diff --git a/media/codecs/amrnb/common/include/sub.h b/media/module/codecs/amrnb/common/include/sub.h similarity index 100% rename from media/codecs/amrnb/common/include/sub.h rename to media/module/codecs/amrnb/common/include/sub.h diff --git a/media/codecs/amrnb/common/include/syn_filt.h b/media/module/codecs/amrnb/common/include/syn_filt.h similarity index 100% rename from media/codecs/amrnb/common/include/syn_filt.h rename to media/module/codecs/amrnb/common/include/syn_filt.h diff --git a/media/codecs/amrnb/common/include/typedef.h b/media/module/codecs/amrnb/common/include/typedef.h similarity index 100% rename from media/codecs/amrnb/common/include/typedef.h rename to media/module/codecs/amrnb/common/include/typedef.h diff --git a/media/codecs/amrnb/common/include/vad.h b/media/module/codecs/amrnb/common/include/vad.h similarity index 100% rename from media/codecs/amrnb/common/include/vad.h rename to media/module/codecs/amrnb/common/include/vad.h diff --git a/media/codecs/amrnb/common/include/vad1.h b/media/module/codecs/amrnb/common/include/vad1.h similarity index 100% rename from media/codecs/amrnb/common/include/vad1.h rename to media/module/codecs/amrnb/common/include/vad1.h diff --git a/media/codecs/amrnb/common/include/vad2.h b/media/module/codecs/amrnb/common/include/vad2.h similarity index 100% rename from media/codecs/amrnb/common/include/vad2.h rename to media/module/codecs/amrnb/common/include/vad2.h diff --git a/media/codecs/amrnb/common/include/weight_a.h b/media/module/codecs/amrnb/common/include/weight_a.h similarity index 100% rename from media/codecs/amrnb/common/include/weight_a.h rename to media/module/codecs/amrnb/common/include/weight_a.h diff --git a/media/codecs/amrnb/common/include/window_tab.h b/media/module/codecs/amrnb/common/include/window_tab.h similarity index 100% rename from media/codecs/amrnb/common/include/window_tab.h rename to media/module/codecs/amrnb/common/include/window_tab.h diff --git a/media/codecs/amrnb/common/include/wmf_to_ets.h b/media/module/codecs/amrnb/common/include/wmf_to_ets.h similarity index 100% rename from media/codecs/amrnb/common/include/wmf_to_ets.h rename to media/module/codecs/amrnb/common/include/wmf_to_ets.h diff --git a/media/codecs/amrnb/common/src/add.cpp b/media/module/codecs/amrnb/common/src/add.cpp similarity index 100% rename from media/codecs/amrnb/common/src/add.cpp rename to media/module/codecs/amrnb/common/src/add.cpp diff --git a/media/codecs/amrnb/common/src/az_lsp.cpp b/media/module/codecs/amrnb/common/src/az_lsp.cpp similarity index 100% rename from media/codecs/amrnb/common/src/az_lsp.cpp rename to media/module/codecs/amrnb/common/src/az_lsp.cpp diff --git a/media/codecs/amrnb/common/src/bitno_tab.cpp b/media/module/codecs/amrnb/common/src/bitno_tab.cpp similarity index 100% rename from media/codecs/amrnb/common/src/bitno_tab.cpp rename to media/module/codecs/amrnb/common/src/bitno_tab.cpp diff --git a/media/codecs/amrnb/common/src/bitreorder_tab.cpp b/media/module/codecs/amrnb/common/src/bitreorder_tab.cpp similarity index 100% rename from media/codecs/amrnb/common/src/bitreorder_tab.cpp rename to media/module/codecs/amrnb/common/src/bitreorder_tab.cpp diff --git a/media/codecs/amrnb/common/src/bits2prm.cpp b/media/module/codecs/amrnb/common/src/bits2prm.cpp similarity index 100% rename from media/codecs/amrnb/common/src/bits2prm.cpp rename to media/module/codecs/amrnb/common/src/bits2prm.cpp diff --git a/media/codecs/amrnb/common/src/c2_9pf_tab.cpp b/media/module/codecs/amrnb/common/src/c2_9pf_tab.cpp similarity index 100% rename from media/codecs/amrnb/common/src/c2_9pf_tab.cpp rename to media/module/codecs/amrnb/common/src/c2_9pf_tab.cpp diff --git a/media/codecs/amrnb/common/src/copy.cpp b/media/module/codecs/amrnb/common/src/copy.cpp similarity index 100% rename from media/codecs/amrnb/common/src/copy.cpp rename to media/module/codecs/amrnb/common/src/copy.cpp diff --git a/media/codecs/amrnb/common/src/div_32.cpp b/media/module/codecs/amrnb/common/src/div_32.cpp similarity index 100% rename from media/codecs/amrnb/common/src/div_32.cpp rename to media/module/codecs/amrnb/common/src/div_32.cpp diff --git a/media/codecs/amrnb/common/src/div_s.cpp b/media/module/codecs/amrnb/common/src/div_s.cpp similarity index 100% rename from media/codecs/amrnb/common/src/div_s.cpp rename to media/module/codecs/amrnb/common/src/div_s.cpp diff --git a/media/codecs/amrnb/common/src/extract_h.cpp b/media/module/codecs/amrnb/common/src/extract_h.cpp similarity index 100% rename from media/codecs/amrnb/common/src/extract_h.cpp rename to media/module/codecs/amrnb/common/src/extract_h.cpp diff --git a/media/codecs/amrnb/common/src/extract_l.cpp b/media/module/codecs/amrnb/common/src/extract_l.cpp similarity index 100% rename from media/codecs/amrnb/common/src/extract_l.cpp rename to media/module/codecs/amrnb/common/src/extract_l.cpp diff --git a/media/codecs/amrnb/common/src/gains_tbl.cpp b/media/module/codecs/amrnb/common/src/gains_tbl.cpp similarity index 100% rename from media/codecs/amrnb/common/src/gains_tbl.cpp rename to media/module/codecs/amrnb/common/src/gains_tbl.cpp diff --git a/media/codecs/amrnb/common/src/gc_pred.cpp b/media/module/codecs/amrnb/common/src/gc_pred.cpp similarity index 100% rename from media/codecs/amrnb/common/src/gc_pred.cpp rename to media/module/codecs/amrnb/common/src/gc_pred.cpp diff --git a/media/codecs/amrnb/common/src/gmed_n.cpp b/media/module/codecs/amrnb/common/src/gmed_n.cpp similarity index 100% rename from media/codecs/amrnb/common/src/gmed_n.cpp rename to media/module/codecs/amrnb/common/src/gmed_n.cpp diff --git a/media/codecs/amrnb/common/src/gray_tbl.cpp b/media/module/codecs/amrnb/common/src/gray_tbl.cpp similarity index 100% rename from media/codecs/amrnb/common/src/gray_tbl.cpp rename to media/module/codecs/amrnb/common/src/gray_tbl.cpp diff --git a/media/codecs/amrnb/common/src/grid_tbl.cpp b/media/module/codecs/amrnb/common/src/grid_tbl.cpp similarity index 100% rename from media/codecs/amrnb/common/src/grid_tbl.cpp rename to media/module/codecs/amrnb/common/src/grid_tbl.cpp diff --git a/media/codecs/amrnb/common/src/int_lpc.cpp b/media/module/codecs/amrnb/common/src/int_lpc.cpp similarity index 100% rename from media/codecs/amrnb/common/src/int_lpc.cpp rename to media/module/codecs/amrnb/common/src/int_lpc.cpp diff --git a/media/codecs/amrnb/common/src/inv_sqrt.cpp b/media/module/codecs/amrnb/common/src/inv_sqrt.cpp similarity index 100% rename from media/codecs/amrnb/common/src/inv_sqrt.cpp rename to media/module/codecs/amrnb/common/src/inv_sqrt.cpp diff --git a/media/codecs/amrnb/common/src/inv_sqrt_tbl.cpp b/media/module/codecs/amrnb/common/src/inv_sqrt_tbl.cpp similarity index 100% rename from media/codecs/amrnb/common/src/inv_sqrt_tbl.cpp rename to media/module/codecs/amrnb/common/src/inv_sqrt_tbl.cpp diff --git a/media/codecs/amrnb/common/src/l_abs.cpp b/media/module/codecs/amrnb/common/src/l_abs.cpp similarity index 100% rename from media/codecs/amrnb/common/src/l_abs.cpp rename to media/module/codecs/amrnb/common/src/l_abs.cpp diff --git a/media/codecs/amrnb/common/src/l_deposit_h.cpp b/media/module/codecs/amrnb/common/src/l_deposit_h.cpp similarity index 100% rename from media/codecs/amrnb/common/src/l_deposit_h.cpp rename to media/module/codecs/amrnb/common/src/l_deposit_h.cpp diff --git a/media/codecs/amrnb/common/src/l_deposit_l.cpp b/media/module/codecs/amrnb/common/src/l_deposit_l.cpp similarity index 100% rename from media/codecs/amrnb/common/src/l_deposit_l.cpp rename to media/module/codecs/amrnb/common/src/l_deposit_l.cpp diff --git a/media/codecs/amrnb/common/src/l_shr_r.cpp b/media/module/codecs/amrnb/common/src/l_shr_r.cpp similarity index 100% rename from media/codecs/amrnb/common/src/l_shr_r.cpp rename to media/module/codecs/amrnb/common/src/l_shr_r.cpp diff --git a/media/codecs/amrnb/common/src/log2.cpp b/media/module/codecs/amrnb/common/src/log2.cpp similarity index 100% rename from media/codecs/amrnb/common/src/log2.cpp rename to media/module/codecs/amrnb/common/src/log2.cpp diff --git a/media/codecs/amrnb/common/src/log2_norm.cpp b/media/module/codecs/amrnb/common/src/log2_norm.cpp similarity index 100% rename from media/codecs/amrnb/common/src/log2_norm.cpp rename to media/module/codecs/amrnb/common/src/log2_norm.cpp diff --git a/media/codecs/amrnb/common/src/log2_tbl.cpp b/media/module/codecs/amrnb/common/src/log2_tbl.cpp similarity index 100% rename from media/codecs/amrnb/common/src/log2_tbl.cpp rename to media/module/codecs/amrnb/common/src/log2_tbl.cpp diff --git a/media/codecs/amrnb/common/src/lsfwt.cpp b/media/module/codecs/amrnb/common/src/lsfwt.cpp similarity index 100% rename from media/codecs/amrnb/common/src/lsfwt.cpp rename to media/module/codecs/amrnb/common/src/lsfwt.cpp diff --git a/media/codecs/amrnb/common/src/lsp.cpp b/media/module/codecs/amrnb/common/src/lsp.cpp similarity index 100% rename from media/codecs/amrnb/common/src/lsp.cpp rename to media/module/codecs/amrnb/common/src/lsp.cpp diff --git a/media/codecs/amrnb/common/src/lsp_az.cpp b/media/module/codecs/amrnb/common/src/lsp_az.cpp similarity index 100% rename from media/codecs/amrnb/common/src/lsp_az.cpp rename to media/module/codecs/amrnb/common/src/lsp_az.cpp diff --git a/media/codecs/amrnb/common/src/lsp_lsf.cpp b/media/module/codecs/amrnb/common/src/lsp_lsf.cpp similarity index 100% rename from media/codecs/amrnb/common/src/lsp_lsf.cpp rename to media/module/codecs/amrnb/common/src/lsp_lsf.cpp diff --git a/media/codecs/amrnb/common/src/lsp_lsf_tbl.cpp b/media/module/codecs/amrnb/common/src/lsp_lsf_tbl.cpp similarity index 100% rename from media/codecs/amrnb/common/src/lsp_lsf_tbl.cpp rename to media/module/codecs/amrnb/common/src/lsp_lsf_tbl.cpp diff --git a/media/codecs/amrnb/common/src/lsp_tab.cpp b/media/module/codecs/amrnb/common/src/lsp_tab.cpp similarity index 100% rename from media/codecs/amrnb/common/src/lsp_tab.cpp rename to media/module/codecs/amrnb/common/src/lsp_tab.cpp diff --git a/media/codecs/amrnb/common/src/mult_r.cpp b/media/module/codecs/amrnb/common/src/mult_r.cpp similarity index 100% rename from media/codecs/amrnb/common/src/mult_r.cpp rename to media/module/codecs/amrnb/common/src/mult_r.cpp diff --git a/media/codecs/amrnb/common/src/negate.cpp b/media/module/codecs/amrnb/common/src/negate.cpp similarity index 100% rename from media/codecs/amrnb/common/src/negate.cpp rename to media/module/codecs/amrnb/common/src/negate.cpp diff --git a/media/codecs/amrnb/common/src/norm_l.cpp b/media/module/codecs/amrnb/common/src/norm_l.cpp similarity index 100% rename from media/codecs/amrnb/common/src/norm_l.cpp rename to media/module/codecs/amrnb/common/src/norm_l.cpp diff --git a/media/codecs/amrnb/common/src/norm_s.cpp b/media/module/codecs/amrnb/common/src/norm_s.cpp similarity index 100% rename from media/codecs/amrnb/common/src/norm_s.cpp rename to media/module/codecs/amrnb/common/src/norm_s.cpp diff --git a/media/codecs/amrnb/common/src/ph_disp_tab.cpp b/media/module/codecs/amrnb/common/src/ph_disp_tab.cpp similarity index 100% rename from media/codecs/amrnb/common/src/ph_disp_tab.cpp rename to media/module/codecs/amrnb/common/src/ph_disp_tab.cpp diff --git a/media/codecs/amrnb/common/src/pow2.cpp b/media/module/codecs/amrnb/common/src/pow2.cpp similarity index 100% rename from media/codecs/amrnb/common/src/pow2.cpp rename to media/module/codecs/amrnb/common/src/pow2.cpp diff --git a/media/codecs/amrnb/common/src/pow2_tbl.cpp b/media/module/codecs/amrnb/common/src/pow2_tbl.cpp similarity index 100% rename from media/codecs/amrnb/common/src/pow2_tbl.cpp rename to media/module/codecs/amrnb/common/src/pow2_tbl.cpp diff --git a/media/codecs/amrnb/common/src/pred_lt.cpp b/media/module/codecs/amrnb/common/src/pred_lt.cpp similarity index 100% rename from media/codecs/amrnb/common/src/pred_lt.cpp rename to media/module/codecs/amrnb/common/src/pred_lt.cpp diff --git a/media/codecs/amrnb/common/src/q_plsf.cpp b/media/module/codecs/amrnb/common/src/q_plsf.cpp similarity index 100% rename from media/codecs/amrnb/common/src/q_plsf.cpp rename to media/module/codecs/amrnb/common/src/q_plsf.cpp diff --git a/media/codecs/amrnb/common/src/q_plsf_3.cpp b/media/module/codecs/amrnb/common/src/q_plsf_3.cpp similarity index 100% rename from media/codecs/amrnb/common/src/q_plsf_3.cpp rename to media/module/codecs/amrnb/common/src/q_plsf_3.cpp diff --git a/media/codecs/amrnb/common/src/q_plsf_3_tbl.cpp b/media/module/codecs/amrnb/common/src/q_plsf_3_tbl.cpp similarity index 100% rename from media/codecs/amrnb/common/src/q_plsf_3_tbl.cpp rename to media/module/codecs/amrnb/common/src/q_plsf_3_tbl.cpp diff --git a/media/codecs/amrnb/common/src/q_plsf_5.cpp b/media/module/codecs/amrnb/common/src/q_plsf_5.cpp similarity index 100% rename from media/codecs/amrnb/common/src/q_plsf_5.cpp rename to media/module/codecs/amrnb/common/src/q_plsf_5.cpp diff --git a/media/codecs/amrnb/common/src/q_plsf_5_tbl.cpp b/media/module/codecs/amrnb/common/src/q_plsf_5_tbl.cpp similarity index 100% rename from media/codecs/amrnb/common/src/q_plsf_5_tbl.cpp rename to media/module/codecs/amrnb/common/src/q_plsf_5_tbl.cpp diff --git a/media/codecs/amrnb/common/src/qua_gain_tbl.cpp b/media/module/codecs/amrnb/common/src/qua_gain_tbl.cpp similarity index 100% rename from media/codecs/amrnb/common/src/qua_gain_tbl.cpp rename to media/module/codecs/amrnb/common/src/qua_gain_tbl.cpp diff --git a/media/codecs/amrnb/common/src/reorder.cpp b/media/module/codecs/amrnb/common/src/reorder.cpp similarity index 100% rename from media/codecs/amrnb/common/src/reorder.cpp rename to media/module/codecs/amrnb/common/src/reorder.cpp diff --git a/media/codecs/amrnb/common/src/residu.cpp b/media/module/codecs/amrnb/common/src/residu.cpp similarity index 100% rename from media/codecs/amrnb/common/src/residu.cpp rename to media/module/codecs/amrnb/common/src/residu.cpp diff --git a/media/codecs/amrnb/common/src/round.cpp b/media/module/codecs/amrnb/common/src/round.cpp similarity index 100% rename from media/codecs/amrnb/common/src/round.cpp rename to media/module/codecs/amrnb/common/src/round.cpp diff --git a/media/codecs/amrnb/common/src/set_zero.cpp b/media/module/codecs/amrnb/common/src/set_zero.cpp similarity index 100% rename from media/codecs/amrnb/common/src/set_zero.cpp rename to media/module/codecs/amrnb/common/src/set_zero.cpp diff --git a/media/codecs/amrnb/common/src/shr.cpp b/media/module/codecs/amrnb/common/src/shr.cpp similarity index 100% rename from media/codecs/amrnb/common/src/shr.cpp rename to media/module/codecs/amrnb/common/src/shr.cpp diff --git a/media/codecs/amrnb/common/src/shr_r.cpp b/media/module/codecs/amrnb/common/src/shr_r.cpp similarity index 100% rename from media/codecs/amrnb/common/src/shr_r.cpp rename to media/module/codecs/amrnb/common/src/shr_r.cpp diff --git a/media/codecs/amrnb/common/src/sqrt_l.cpp b/media/module/codecs/amrnb/common/src/sqrt_l.cpp similarity index 100% rename from media/codecs/amrnb/common/src/sqrt_l.cpp rename to media/module/codecs/amrnb/common/src/sqrt_l.cpp diff --git a/media/codecs/amrnb/common/src/sqrt_l_tbl.cpp b/media/module/codecs/amrnb/common/src/sqrt_l_tbl.cpp similarity index 100% rename from media/codecs/amrnb/common/src/sqrt_l_tbl.cpp rename to media/module/codecs/amrnb/common/src/sqrt_l_tbl.cpp diff --git a/media/codecs/amrnb/common/src/sub.cpp b/media/module/codecs/amrnb/common/src/sub.cpp similarity index 100% rename from media/codecs/amrnb/common/src/sub.cpp rename to media/module/codecs/amrnb/common/src/sub.cpp diff --git a/media/codecs/amrnb/common/src/syn_filt.cpp b/media/module/codecs/amrnb/common/src/syn_filt.cpp similarity index 100% rename from media/codecs/amrnb/common/src/syn_filt.cpp rename to media/module/codecs/amrnb/common/src/syn_filt.cpp diff --git a/media/codecs/amrnb/common/src/vad1.cpp b/media/module/codecs/amrnb/common/src/vad1.cpp similarity index 100% rename from media/codecs/amrnb/common/src/vad1.cpp rename to media/module/codecs/amrnb/common/src/vad1.cpp diff --git a/media/codecs/amrnb/common/src/weight_a.cpp b/media/module/codecs/amrnb/common/src/weight_a.cpp similarity index 100% rename from media/codecs/amrnb/common/src/weight_a.cpp rename to media/module/codecs/amrnb/common/src/weight_a.cpp diff --git a/media/codecs/amrnb/common/src/window_tab.cpp b/media/module/codecs/amrnb/common/src/window_tab.cpp similarity index 100% rename from media/codecs/amrnb/common/src/window_tab.cpp rename to media/module/codecs/amrnb/common/src/window_tab.cpp diff --git a/media/codecs/amrnb/dec/Android.bp b/media/module/codecs/amrnb/dec/Android.bp similarity index 100% rename from media/codecs/amrnb/dec/Android.bp rename to media/module/codecs/amrnb/dec/Android.bp diff --git a/media/codecs/amrnb/dec/MODULE_LICENSE_APACHE2 b/media/module/codecs/amrnb/dec/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/codecs/amrnb/dec/MODULE_LICENSE_APACHE2 rename to media/module/codecs/amrnb/dec/MODULE_LICENSE_APACHE2 diff --git a/media/codecs/amrnb/dec/NOTICE b/media/module/codecs/amrnb/dec/NOTICE similarity index 100% rename from media/codecs/amrnb/dec/NOTICE rename to media/module/codecs/amrnb/dec/NOTICE diff --git a/media/codecs/amrnb/dec/src/a_refl.cpp b/media/module/codecs/amrnb/dec/src/a_refl.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/a_refl.cpp rename to media/module/codecs/amrnb/dec/src/a_refl.cpp diff --git a/media/codecs/amrnb/dec/src/a_refl.h b/media/module/codecs/amrnb/dec/src/a_refl.h similarity index 100% rename from media/codecs/amrnb/dec/src/a_refl.h rename to media/module/codecs/amrnb/dec/src/a_refl.h diff --git a/media/codecs/amrnb/dec/src/agc.cpp b/media/module/codecs/amrnb/dec/src/agc.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/agc.cpp rename to media/module/codecs/amrnb/dec/src/agc.cpp diff --git a/media/codecs/amrnb/dec/src/agc.h b/media/module/codecs/amrnb/dec/src/agc.h similarity index 100% rename from media/codecs/amrnb/dec/src/agc.h rename to media/module/codecs/amrnb/dec/src/agc.h diff --git a/media/codecs/amrnb/dec/src/amrdecode.cpp b/media/module/codecs/amrnb/dec/src/amrdecode.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/amrdecode.cpp rename to media/module/codecs/amrnb/dec/src/amrdecode.cpp diff --git a/media/codecs/amrnb/dec/src/amrdecode.h b/media/module/codecs/amrnb/dec/src/amrdecode.h similarity index 100% rename from media/codecs/amrnb/dec/src/amrdecode.h rename to media/module/codecs/amrnb/dec/src/amrdecode.h diff --git a/media/codecs/amrnb/dec/src/b_cn_cod.cpp b/media/module/codecs/amrnb/dec/src/b_cn_cod.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/b_cn_cod.cpp rename to media/module/codecs/amrnb/dec/src/b_cn_cod.cpp diff --git a/media/codecs/amrnb/dec/src/b_cn_cod.h b/media/module/codecs/amrnb/dec/src/b_cn_cod.h similarity index 100% rename from media/codecs/amrnb/dec/src/b_cn_cod.h rename to media/module/codecs/amrnb/dec/src/b_cn_cod.h diff --git a/media/codecs/amrnb/dec/src/bgnscd.cpp b/media/module/codecs/amrnb/dec/src/bgnscd.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/bgnscd.cpp rename to media/module/codecs/amrnb/dec/src/bgnscd.cpp diff --git a/media/codecs/amrnb/dec/src/bgnscd.h b/media/module/codecs/amrnb/dec/src/bgnscd.h similarity index 100% rename from media/codecs/amrnb/dec/src/bgnscd.h rename to media/module/codecs/amrnb/dec/src/bgnscd.h diff --git a/media/codecs/amrnb/dec/src/c_g_aver.cpp b/media/module/codecs/amrnb/dec/src/c_g_aver.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/c_g_aver.cpp rename to media/module/codecs/amrnb/dec/src/c_g_aver.cpp diff --git a/media/codecs/amrnb/dec/src/c_g_aver.h b/media/module/codecs/amrnb/dec/src/c_g_aver.h similarity index 100% rename from media/codecs/amrnb/dec/src/c_g_aver.h rename to media/module/codecs/amrnb/dec/src/c_g_aver.h diff --git a/media/codecs/amrnb/dec/src/d1035pf.cpp b/media/module/codecs/amrnb/dec/src/d1035pf.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/d1035pf.cpp rename to media/module/codecs/amrnb/dec/src/d1035pf.cpp diff --git a/media/codecs/amrnb/dec/src/d1035pf.h b/media/module/codecs/amrnb/dec/src/d1035pf.h similarity index 100% rename from media/codecs/amrnb/dec/src/d1035pf.h rename to media/module/codecs/amrnb/dec/src/d1035pf.h diff --git a/media/codecs/amrnb/dec/src/d2_11pf.cpp b/media/module/codecs/amrnb/dec/src/d2_11pf.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/d2_11pf.cpp rename to media/module/codecs/amrnb/dec/src/d2_11pf.cpp diff --git a/media/codecs/amrnb/dec/src/d2_11pf.h b/media/module/codecs/amrnb/dec/src/d2_11pf.h similarity index 100% rename from media/codecs/amrnb/dec/src/d2_11pf.h rename to media/module/codecs/amrnb/dec/src/d2_11pf.h diff --git a/media/codecs/amrnb/dec/src/d2_9pf.cpp b/media/module/codecs/amrnb/dec/src/d2_9pf.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/d2_9pf.cpp rename to media/module/codecs/amrnb/dec/src/d2_9pf.cpp diff --git a/media/codecs/amrnb/dec/src/d2_9pf.h b/media/module/codecs/amrnb/dec/src/d2_9pf.h similarity index 100% rename from media/codecs/amrnb/dec/src/d2_9pf.h rename to media/module/codecs/amrnb/dec/src/d2_9pf.h diff --git a/media/codecs/amrnb/dec/src/d3_14pf.cpp b/media/module/codecs/amrnb/dec/src/d3_14pf.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/d3_14pf.cpp rename to media/module/codecs/amrnb/dec/src/d3_14pf.cpp diff --git a/media/codecs/amrnb/dec/src/d3_14pf.h b/media/module/codecs/amrnb/dec/src/d3_14pf.h similarity index 100% rename from media/codecs/amrnb/dec/src/d3_14pf.h rename to media/module/codecs/amrnb/dec/src/d3_14pf.h diff --git a/media/codecs/amrnb/dec/src/d4_17pf.cpp b/media/module/codecs/amrnb/dec/src/d4_17pf.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/d4_17pf.cpp rename to media/module/codecs/amrnb/dec/src/d4_17pf.cpp diff --git a/media/codecs/amrnb/dec/src/d4_17pf.h b/media/module/codecs/amrnb/dec/src/d4_17pf.h similarity index 100% rename from media/codecs/amrnb/dec/src/d4_17pf.h rename to media/module/codecs/amrnb/dec/src/d4_17pf.h diff --git a/media/codecs/amrnb/dec/src/d8_31pf.cpp b/media/module/codecs/amrnb/dec/src/d8_31pf.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/d8_31pf.cpp rename to media/module/codecs/amrnb/dec/src/d8_31pf.cpp diff --git a/media/codecs/amrnb/dec/src/d8_31pf.h b/media/module/codecs/amrnb/dec/src/d8_31pf.h similarity index 100% rename from media/codecs/amrnb/dec/src/d8_31pf.h rename to media/module/codecs/amrnb/dec/src/d8_31pf.h diff --git a/media/codecs/amrnb/dec/src/d_gain_c.cpp b/media/module/codecs/amrnb/dec/src/d_gain_c.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/d_gain_c.cpp rename to media/module/codecs/amrnb/dec/src/d_gain_c.cpp diff --git a/media/codecs/amrnb/dec/src/d_gain_p.cpp b/media/module/codecs/amrnb/dec/src/d_gain_p.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/d_gain_p.cpp rename to media/module/codecs/amrnb/dec/src/d_gain_p.cpp diff --git a/media/codecs/amrnb/dec/src/d_plsf.cpp b/media/module/codecs/amrnb/dec/src/d_plsf.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/d_plsf.cpp rename to media/module/codecs/amrnb/dec/src/d_plsf.cpp diff --git a/media/codecs/amrnb/dec/src/d_plsf_3.cpp b/media/module/codecs/amrnb/dec/src/d_plsf_3.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/d_plsf_3.cpp rename to media/module/codecs/amrnb/dec/src/d_plsf_3.cpp diff --git a/media/codecs/amrnb/dec/src/d_plsf_5.cpp b/media/module/codecs/amrnb/dec/src/d_plsf_5.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/d_plsf_5.cpp rename to media/module/codecs/amrnb/dec/src/d_plsf_5.cpp diff --git a/media/codecs/amrnb/dec/src/dec_amr.cpp b/media/module/codecs/amrnb/dec/src/dec_amr.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/dec_amr.cpp rename to media/module/codecs/amrnb/dec/src/dec_amr.cpp diff --git a/media/codecs/amrnb/dec/src/dec_amr.h b/media/module/codecs/amrnb/dec/src/dec_amr.h similarity index 100% rename from media/codecs/amrnb/dec/src/dec_amr.h rename to media/module/codecs/amrnb/dec/src/dec_amr.h diff --git a/media/codecs/amrnb/dec/src/dec_gain.cpp b/media/module/codecs/amrnb/dec/src/dec_gain.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/dec_gain.cpp rename to media/module/codecs/amrnb/dec/src/dec_gain.cpp diff --git a/media/codecs/amrnb/dec/src/dec_gain.h b/media/module/codecs/amrnb/dec/src/dec_gain.h similarity index 100% rename from media/codecs/amrnb/dec/src/dec_gain.h rename to media/module/codecs/amrnb/dec/src/dec_gain.h diff --git a/media/codecs/amrnb/dec/src/dec_input_format_tab.cpp b/media/module/codecs/amrnb/dec/src/dec_input_format_tab.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/dec_input_format_tab.cpp rename to media/module/codecs/amrnb/dec/src/dec_input_format_tab.cpp diff --git a/media/codecs/amrnb/dec/src/dec_lag3.cpp b/media/module/codecs/amrnb/dec/src/dec_lag3.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/dec_lag3.cpp rename to media/module/codecs/amrnb/dec/src/dec_lag3.cpp diff --git a/media/codecs/amrnb/dec/src/dec_lag3.h b/media/module/codecs/amrnb/dec/src/dec_lag3.h similarity index 100% rename from media/codecs/amrnb/dec/src/dec_lag3.h rename to media/module/codecs/amrnb/dec/src/dec_lag3.h diff --git a/media/codecs/amrnb/dec/src/dec_lag6.cpp b/media/module/codecs/amrnb/dec/src/dec_lag6.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/dec_lag6.cpp rename to media/module/codecs/amrnb/dec/src/dec_lag6.cpp diff --git a/media/codecs/amrnb/dec/src/dec_lag6.h b/media/module/codecs/amrnb/dec/src/dec_lag6.h similarity index 100% rename from media/codecs/amrnb/dec/src/dec_lag6.h rename to media/module/codecs/amrnb/dec/src/dec_lag6.h diff --git a/media/codecs/amrnb/dec/src/dtx_dec.cpp b/media/module/codecs/amrnb/dec/src/dtx_dec.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/dtx_dec.cpp rename to media/module/codecs/amrnb/dec/src/dtx_dec.cpp diff --git a/media/codecs/amrnb/dec/src/dtx_dec.h b/media/module/codecs/amrnb/dec/src/dtx_dec.h similarity index 100% rename from media/codecs/amrnb/dec/src/dtx_dec.h rename to media/module/codecs/amrnb/dec/src/dtx_dec.h diff --git a/media/codecs/amrnb/dec/src/ec_gains.cpp b/media/module/codecs/amrnb/dec/src/ec_gains.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/ec_gains.cpp rename to media/module/codecs/amrnb/dec/src/ec_gains.cpp diff --git a/media/codecs/amrnb/dec/src/ec_gains.h b/media/module/codecs/amrnb/dec/src/ec_gains.h similarity index 100% rename from media/codecs/amrnb/dec/src/ec_gains.h rename to media/module/codecs/amrnb/dec/src/ec_gains.h diff --git a/media/codecs/amrnb/dec/src/ex_ctrl.cpp b/media/module/codecs/amrnb/dec/src/ex_ctrl.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/ex_ctrl.cpp rename to media/module/codecs/amrnb/dec/src/ex_ctrl.cpp diff --git a/media/codecs/amrnb/dec/src/ex_ctrl.h b/media/module/codecs/amrnb/dec/src/ex_ctrl.h similarity index 100% rename from media/codecs/amrnb/dec/src/ex_ctrl.h rename to media/module/codecs/amrnb/dec/src/ex_ctrl.h diff --git a/media/codecs/amrnb/dec/src/gsmamr_dec.h b/media/module/codecs/amrnb/dec/src/gsmamr_dec.h similarity index 100% rename from media/codecs/amrnb/dec/src/gsmamr_dec.h rename to media/module/codecs/amrnb/dec/src/gsmamr_dec.h diff --git a/media/codecs/amrnb/dec/src/if2_to_ets.cpp b/media/module/codecs/amrnb/dec/src/if2_to_ets.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/if2_to_ets.cpp rename to media/module/codecs/amrnb/dec/src/if2_to_ets.cpp diff --git a/media/codecs/amrnb/dec/src/if2_to_ets.h b/media/module/codecs/amrnb/dec/src/if2_to_ets.h similarity index 100% rename from media/codecs/amrnb/dec/src/if2_to_ets.h rename to media/module/codecs/amrnb/dec/src/if2_to_ets.h diff --git a/media/codecs/amrnb/dec/src/int_lsf.cpp b/media/module/codecs/amrnb/dec/src/int_lsf.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/int_lsf.cpp rename to media/module/codecs/amrnb/dec/src/int_lsf.cpp diff --git a/media/codecs/amrnb/dec/src/lsp_avg.cpp b/media/module/codecs/amrnb/dec/src/lsp_avg.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/lsp_avg.cpp rename to media/module/codecs/amrnb/dec/src/lsp_avg.cpp diff --git a/media/codecs/amrnb/dec/src/lsp_avg.h b/media/module/codecs/amrnb/dec/src/lsp_avg.h similarity index 100% rename from media/codecs/amrnb/dec/src/lsp_avg.h rename to media/module/codecs/amrnb/dec/src/lsp_avg.h diff --git a/media/codecs/amrnb/dec/src/ph_disp.cpp b/media/module/codecs/amrnb/dec/src/ph_disp.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/ph_disp.cpp rename to media/module/codecs/amrnb/dec/src/ph_disp.cpp diff --git a/media/codecs/amrnb/dec/src/ph_disp.h b/media/module/codecs/amrnb/dec/src/ph_disp.h similarity index 100% rename from media/codecs/amrnb/dec/src/ph_disp.h rename to media/module/codecs/amrnb/dec/src/ph_disp.h diff --git a/media/codecs/amrnb/dec/src/post_pro.cpp b/media/module/codecs/amrnb/dec/src/post_pro.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/post_pro.cpp rename to media/module/codecs/amrnb/dec/src/post_pro.cpp diff --git a/media/codecs/amrnb/dec/src/post_pro.h b/media/module/codecs/amrnb/dec/src/post_pro.h similarity index 100% rename from media/codecs/amrnb/dec/src/post_pro.h rename to media/module/codecs/amrnb/dec/src/post_pro.h diff --git a/media/codecs/amrnb/dec/src/preemph.cpp b/media/module/codecs/amrnb/dec/src/preemph.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/preemph.cpp rename to media/module/codecs/amrnb/dec/src/preemph.cpp diff --git a/media/codecs/amrnb/dec/src/preemph.h b/media/module/codecs/amrnb/dec/src/preemph.h similarity index 100% rename from media/codecs/amrnb/dec/src/preemph.h rename to media/module/codecs/amrnb/dec/src/preemph.h diff --git a/media/codecs/amrnb/dec/src/pstfilt.cpp b/media/module/codecs/amrnb/dec/src/pstfilt.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/pstfilt.cpp rename to media/module/codecs/amrnb/dec/src/pstfilt.cpp diff --git a/media/codecs/amrnb/dec/src/pstfilt.h b/media/module/codecs/amrnb/dec/src/pstfilt.h similarity index 100% rename from media/codecs/amrnb/dec/src/pstfilt.h rename to media/module/codecs/amrnb/dec/src/pstfilt.h diff --git a/media/codecs/amrnb/dec/src/qgain475_tab.cpp b/media/module/codecs/amrnb/dec/src/qgain475_tab.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/qgain475_tab.cpp rename to media/module/codecs/amrnb/dec/src/qgain475_tab.cpp diff --git a/media/codecs/amrnb/dec/src/sp_dec.cpp b/media/module/codecs/amrnb/dec/src/sp_dec.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/sp_dec.cpp rename to media/module/codecs/amrnb/dec/src/sp_dec.cpp diff --git a/media/codecs/amrnb/dec/src/sp_dec.h b/media/module/codecs/amrnb/dec/src/sp_dec.h similarity index 100% rename from media/codecs/amrnb/dec/src/sp_dec.h rename to media/module/codecs/amrnb/dec/src/sp_dec.h diff --git a/media/codecs/amrnb/dec/src/wmf_to_ets.cpp b/media/module/codecs/amrnb/dec/src/wmf_to_ets.cpp similarity index 100% rename from media/codecs/amrnb/dec/src/wmf_to_ets.cpp rename to media/module/codecs/amrnb/dec/src/wmf_to_ets.cpp diff --git a/media/codecs/amrnb/dec/test/AmrnbDecTestEnvironment.h b/media/module/codecs/amrnb/dec/test/AmrnbDecTestEnvironment.h similarity index 100% rename from media/codecs/amrnb/dec/test/AmrnbDecTestEnvironment.h rename to media/module/codecs/amrnb/dec/test/AmrnbDecTestEnvironment.h diff --git a/media/codecs/amrnb/dec/test/AmrnbDecoderTest.cpp b/media/module/codecs/amrnb/dec/test/AmrnbDecoderTest.cpp similarity index 100% rename from media/codecs/amrnb/dec/test/AmrnbDecoderTest.cpp rename to media/module/codecs/amrnb/dec/test/AmrnbDecoderTest.cpp diff --git a/media/codecs/amrnb/dec/test/Android.bp b/media/module/codecs/amrnb/dec/test/Android.bp similarity index 100% rename from media/codecs/amrnb/dec/test/Android.bp rename to media/module/codecs/amrnb/dec/test/Android.bp diff --git a/media/codecs/amrnb/dec/test/AndroidTest.xml b/media/module/codecs/amrnb/dec/test/AndroidTest.xml similarity index 100% rename from media/codecs/amrnb/dec/test/AndroidTest.xml rename to media/module/codecs/amrnb/dec/test/AndroidTest.xml diff --git a/media/codecs/amrnb/dec/test/README.md b/media/module/codecs/amrnb/dec/test/README.md similarity index 100% rename from media/codecs/amrnb/dec/test/README.md rename to media/module/codecs/amrnb/dec/test/README.md diff --git a/media/codecs/amrnb/dec/test/amrnbdec_test.cpp b/media/module/codecs/amrnb/dec/test/amrnbdec_test.cpp similarity index 100% rename from media/codecs/amrnb/dec/test/amrnbdec_test.cpp rename to media/module/codecs/amrnb/dec/test/amrnbdec_test.cpp diff --git a/media/codecs/amrnb/enc/Android.bp b/media/module/codecs/amrnb/enc/Android.bp similarity index 100% rename from media/codecs/amrnb/enc/Android.bp rename to media/module/codecs/amrnb/enc/Android.bp diff --git a/media/codecs/amrnb/enc/MODULE_LICENSE_APACHE2 b/media/module/codecs/amrnb/enc/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/codecs/amrnb/enc/MODULE_LICENSE_APACHE2 rename to media/module/codecs/amrnb/enc/MODULE_LICENSE_APACHE2 diff --git a/media/codecs/amrnb/enc/NOTICE b/media/module/codecs/amrnb/enc/NOTICE similarity index 100% rename from media/codecs/amrnb/enc/NOTICE rename to media/module/codecs/amrnb/enc/NOTICE diff --git a/media/codecs/amrnb/enc/fuzzer/Android.bp b/media/module/codecs/amrnb/enc/fuzzer/Android.bp similarity index 100% rename from media/codecs/amrnb/enc/fuzzer/Android.bp rename to media/module/codecs/amrnb/enc/fuzzer/Android.bp diff --git a/media/codecs/amrnb/enc/fuzzer/README.md b/media/module/codecs/amrnb/enc/fuzzer/README.md similarity index 100% rename from media/codecs/amrnb/enc/fuzzer/README.md rename to media/module/codecs/amrnb/enc/fuzzer/README.md diff --git a/media/codecs/amrnb/enc/fuzzer/amrnb_enc_fuzzer.cpp b/media/module/codecs/amrnb/enc/fuzzer/amrnb_enc_fuzzer.cpp similarity index 100% rename from media/codecs/amrnb/enc/fuzzer/amrnb_enc_fuzzer.cpp rename to media/module/codecs/amrnb/enc/fuzzer/amrnb_enc_fuzzer.cpp diff --git a/media/codecs/amrnb/enc/src/amrencode.cpp b/media/module/codecs/amrnb/enc/src/amrencode.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/amrencode.cpp rename to media/module/codecs/amrnb/enc/src/amrencode.cpp diff --git a/media/codecs/amrnb/enc/src/amrencode.h b/media/module/codecs/amrnb/enc/src/amrencode.h similarity index 100% rename from media/codecs/amrnb/enc/src/amrencode.h rename to media/module/codecs/amrnb/enc/src/amrencode.h diff --git a/media/codecs/amrnb/enc/src/autocorr.cpp b/media/module/codecs/amrnb/enc/src/autocorr.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/autocorr.cpp rename to media/module/codecs/amrnb/enc/src/autocorr.cpp diff --git a/media/codecs/amrnb/enc/src/autocorr.h b/media/module/codecs/amrnb/enc/src/autocorr.h similarity index 100% rename from media/codecs/amrnb/enc/src/autocorr.h rename to media/module/codecs/amrnb/enc/src/autocorr.h diff --git a/media/codecs/amrnb/enc/src/c1035pf.cpp b/media/module/codecs/amrnb/enc/src/c1035pf.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/c1035pf.cpp rename to media/module/codecs/amrnb/enc/src/c1035pf.cpp diff --git a/media/codecs/amrnb/enc/src/c1035pf.h b/media/module/codecs/amrnb/enc/src/c1035pf.h similarity index 100% rename from media/codecs/amrnb/enc/src/c1035pf.h rename to media/module/codecs/amrnb/enc/src/c1035pf.h diff --git a/media/codecs/amrnb/enc/src/c2_11pf.cpp b/media/module/codecs/amrnb/enc/src/c2_11pf.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/c2_11pf.cpp rename to media/module/codecs/amrnb/enc/src/c2_11pf.cpp diff --git a/media/codecs/amrnb/enc/src/c2_11pf.h b/media/module/codecs/amrnb/enc/src/c2_11pf.h similarity index 100% rename from media/codecs/amrnb/enc/src/c2_11pf.h rename to media/module/codecs/amrnb/enc/src/c2_11pf.h diff --git a/media/codecs/amrnb/enc/src/c2_9pf.cpp b/media/module/codecs/amrnb/enc/src/c2_9pf.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/c2_9pf.cpp rename to media/module/codecs/amrnb/enc/src/c2_9pf.cpp diff --git a/media/codecs/amrnb/enc/src/c2_9pf.h b/media/module/codecs/amrnb/enc/src/c2_9pf.h similarity index 100% rename from media/codecs/amrnb/enc/src/c2_9pf.h rename to media/module/codecs/amrnb/enc/src/c2_9pf.h diff --git a/media/codecs/amrnb/enc/src/c3_14pf.cpp b/media/module/codecs/amrnb/enc/src/c3_14pf.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/c3_14pf.cpp rename to media/module/codecs/amrnb/enc/src/c3_14pf.cpp diff --git a/media/codecs/amrnb/enc/src/c3_14pf.h b/media/module/codecs/amrnb/enc/src/c3_14pf.h similarity index 100% rename from media/codecs/amrnb/enc/src/c3_14pf.h rename to media/module/codecs/amrnb/enc/src/c3_14pf.h diff --git a/media/codecs/amrnb/enc/src/c4_17pf.cpp b/media/module/codecs/amrnb/enc/src/c4_17pf.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/c4_17pf.cpp rename to media/module/codecs/amrnb/enc/src/c4_17pf.cpp diff --git a/media/codecs/amrnb/enc/src/c4_17pf.h b/media/module/codecs/amrnb/enc/src/c4_17pf.h similarity index 100% rename from media/codecs/amrnb/enc/src/c4_17pf.h rename to media/module/codecs/amrnb/enc/src/c4_17pf.h diff --git a/media/codecs/amrnb/enc/src/c8_31pf.cpp b/media/module/codecs/amrnb/enc/src/c8_31pf.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/c8_31pf.cpp rename to media/module/codecs/amrnb/enc/src/c8_31pf.cpp diff --git a/media/codecs/amrnb/enc/src/c8_31pf.h b/media/module/codecs/amrnb/enc/src/c8_31pf.h similarity index 100% rename from media/codecs/amrnb/enc/src/c8_31pf.h rename to media/module/codecs/amrnb/enc/src/c8_31pf.h diff --git a/media/codecs/amrnb/enc/src/calc_cor.cpp b/media/module/codecs/amrnb/enc/src/calc_cor.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/calc_cor.cpp rename to media/module/codecs/amrnb/enc/src/calc_cor.cpp diff --git a/media/codecs/amrnb/enc/src/calc_cor.h b/media/module/codecs/amrnb/enc/src/calc_cor.h similarity index 100% rename from media/codecs/amrnb/enc/src/calc_cor.h rename to media/module/codecs/amrnb/enc/src/calc_cor.h diff --git a/media/codecs/amrnb/enc/src/calc_en.cpp b/media/module/codecs/amrnb/enc/src/calc_en.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/calc_en.cpp rename to media/module/codecs/amrnb/enc/src/calc_en.cpp diff --git a/media/codecs/amrnb/enc/src/calc_en.h b/media/module/codecs/amrnb/enc/src/calc_en.h similarity index 100% rename from media/codecs/amrnb/enc/src/calc_en.h rename to media/module/codecs/amrnb/enc/src/calc_en.h diff --git a/media/codecs/amrnb/enc/src/cbsearch.cpp b/media/module/codecs/amrnb/enc/src/cbsearch.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/cbsearch.cpp rename to media/module/codecs/amrnb/enc/src/cbsearch.cpp diff --git a/media/codecs/amrnb/enc/src/cbsearch.h b/media/module/codecs/amrnb/enc/src/cbsearch.h similarity index 100% rename from media/codecs/amrnb/enc/src/cbsearch.h rename to media/module/codecs/amrnb/enc/src/cbsearch.h diff --git a/media/codecs/amrnb/enc/src/cl_ltp.cpp b/media/module/codecs/amrnb/enc/src/cl_ltp.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/cl_ltp.cpp rename to media/module/codecs/amrnb/enc/src/cl_ltp.cpp diff --git a/media/codecs/amrnb/enc/src/cl_ltp.h b/media/module/codecs/amrnb/enc/src/cl_ltp.h similarity index 100% rename from media/codecs/amrnb/enc/src/cl_ltp.h rename to media/module/codecs/amrnb/enc/src/cl_ltp.h diff --git a/media/codecs/amrnb/enc/src/cod_amr.cpp b/media/module/codecs/amrnb/enc/src/cod_amr.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/cod_amr.cpp rename to media/module/codecs/amrnb/enc/src/cod_amr.cpp diff --git a/media/codecs/amrnb/enc/src/cod_amr.h b/media/module/codecs/amrnb/enc/src/cod_amr.h similarity index 100% rename from media/codecs/amrnb/enc/src/cod_amr.h rename to media/module/codecs/amrnb/enc/src/cod_amr.h diff --git a/media/codecs/amrnb/enc/src/convolve.cpp b/media/module/codecs/amrnb/enc/src/convolve.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/convolve.cpp rename to media/module/codecs/amrnb/enc/src/convolve.cpp diff --git a/media/codecs/amrnb/enc/src/convolve.h b/media/module/codecs/amrnb/enc/src/convolve.h similarity index 100% rename from media/codecs/amrnb/enc/src/convolve.h rename to media/module/codecs/amrnb/enc/src/convolve.h diff --git a/media/codecs/amrnb/enc/src/cor_h.cpp b/media/module/codecs/amrnb/enc/src/cor_h.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/cor_h.cpp rename to media/module/codecs/amrnb/enc/src/cor_h.cpp diff --git a/media/codecs/amrnb/enc/src/cor_h.h b/media/module/codecs/amrnb/enc/src/cor_h.h similarity index 100% rename from media/codecs/amrnb/enc/src/cor_h.h rename to media/module/codecs/amrnb/enc/src/cor_h.h diff --git a/media/codecs/amrnb/enc/src/cor_h_x.cpp b/media/module/codecs/amrnb/enc/src/cor_h_x.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/cor_h_x.cpp rename to media/module/codecs/amrnb/enc/src/cor_h_x.cpp diff --git a/media/codecs/amrnb/enc/src/cor_h_x.h b/media/module/codecs/amrnb/enc/src/cor_h_x.h similarity index 100% rename from media/codecs/amrnb/enc/src/cor_h_x.h rename to media/module/codecs/amrnb/enc/src/cor_h_x.h diff --git a/media/codecs/amrnb/enc/src/cor_h_x2.cpp b/media/module/codecs/amrnb/enc/src/cor_h_x2.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/cor_h_x2.cpp rename to media/module/codecs/amrnb/enc/src/cor_h_x2.cpp diff --git a/media/codecs/amrnb/enc/src/cor_h_x2.h b/media/module/codecs/amrnb/enc/src/cor_h_x2.h similarity index 100% rename from media/codecs/amrnb/enc/src/cor_h_x2.h rename to media/module/codecs/amrnb/enc/src/cor_h_x2.h diff --git a/media/codecs/amrnb/enc/src/corrwght_tab.cpp b/media/module/codecs/amrnb/enc/src/corrwght_tab.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/corrwght_tab.cpp rename to media/module/codecs/amrnb/enc/src/corrwght_tab.cpp diff --git a/media/codecs/amrnb/enc/src/dtx_enc.cpp b/media/module/codecs/amrnb/enc/src/dtx_enc.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/dtx_enc.cpp rename to media/module/codecs/amrnb/enc/src/dtx_enc.cpp diff --git a/media/codecs/amrnb/enc/src/dtx_enc.h b/media/module/codecs/amrnb/enc/src/dtx_enc.h similarity index 100% rename from media/codecs/amrnb/enc/src/dtx_enc.h rename to media/module/codecs/amrnb/enc/src/dtx_enc.h diff --git a/media/codecs/amrnb/enc/src/enc_lag3.cpp b/media/module/codecs/amrnb/enc/src/enc_lag3.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/enc_lag3.cpp rename to media/module/codecs/amrnb/enc/src/enc_lag3.cpp diff --git a/media/codecs/amrnb/enc/src/enc_lag3.h b/media/module/codecs/amrnb/enc/src/enc_lag3.h similarity index 100% rename from media/codecs/amrnb/enc/src/enc_lag3.h rename to media/module/codecs/amrnb/enc/src/enc_lag3.h diff --git a/media/codecs/amrnb/enc/src/enc_lag6.cpp b/media/module/codecs/amrnb/enc/src/enc_lag6.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/enc_lag6.cpp rename to media/module/codecs/amrnb/enc/src/enc_lag6.cpp diff --git a/media/codecs/amrnb/enc/src/enc_lag6.h b/media/module/codecs/amrnb/enc/src/enc_lag6.h similarity index 100% rename from media/codecs/amrnb/enc/src/enc_lag6.h rename to media/module/codecs/amrnb/enc/src/enc_lag6.h diff --git a/media/codecs/amrnb/enc/src/enc_output_format_tab.cpp b/media/module/codecs/amrnb/enc/src/enc_output_format_tab.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/enc_output_format_tab.cpp rename to media/module/codecs/amrnb/enc/src/enc_output_format_tab.cpp diff --git a/media/codecs/amrnb/enc/src/ets_to_if2.cpp b/media/module/codecs/amrnb/enc/src/ets_to_if2.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/ets_to_if2.cpp rename to media/module/codecs/amrnb/enc/src/ets_to_if2.cpp diff --git a/media/codecs/amrnb/enc/src/ets_to_if2.h b/media/module/codecs/amrnb/enc/src/ets_to_if2.h similarity index 100% rename from media/codecs/amrnb/enc/src/ets_to_if2.h rename to media/module/codecs/amrnb/enc/src/ets_to_if2.h diff --git a/media/codecs/amrnb/enc/src/ets_to_wmf.cpp b/media/module/codecs/amrnb/enc/src/ets_to_wmf.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/ets_to_wmf.cpp rename to media/module/codecs/amrnb/enc/src/ets_to_wmf.cpp diff --git a/media/codecs/amrnb/enc/src/ets_to_wmf.h b/media/module/codecs/amrnb/enc/src/ets_to_wmf.h similarity index 100% rename from media/codecs/amrnb/enc/src/ets_to_wmf.h rename to media/module/codecs/amrnb/enc/src/ets_to_wmf.h diff --git a/media/codecs/amrnb/enc/src/g_adapt.cpp b/media/module/codecs/amrnb/enc/src/g_adapt.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/g_adapt.cpp rename to media/module/codecs/amrnb/enc/src/g_adapt.cpp diff --git a/media/codecs/amrnb/enc/src/g_adapt.h b/media/module/codecs/amrnb/enc/src/g_adapt.h similarity index 100% rename from media/codecs/amrnb/enc/src/g_adapt.h rename to media/module/codecs/amrnb/enc/src/g_adapt.h diff --git a/media/codecs/amrnb/enc/src/g_code.cpp b/media/module/codecs/amrnb/enc/src/g_code.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/g_code.cpp rename to media/module/codecs/amrnb/enc/src/g_code.cpp diff --git a/media/codecs/amrnb/enc/src/g_code.h b/media/module/codecs/amrnb/enc/src/g_code.h similarity index 100% rename from media/codecs/amrnb/enc/src/g_code.h rename to media/module/codecs/amrnb/enc/src/g_code.h diff --git a/media/codecs/amrnb/enc/src/g_pitch.cpp b/media/module/codecs/amrnb/enc/src/g_pitch.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/g_pitch.cpp rename to media/module/codecs/amrnb/enc/src/g_pitch.cpp diff --git a/media/codecs/amrnb/enc/src/g_pitch.h b/media/module/codecs/amrnb/enc/src/g_pitch.h similarity index 100% rename from media/codecs/amrnb/enc/src/g_pitch.h rename to media/module/codecs/amrnb/enc/src/g_pitch.h diff --git a/media/codecs/amrnb/enc/src/gain_q.cpp b/media/module/codecs/amrnb/enc/src/gain_q.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/gain_q.cpp rename to media/module/codecs/amrnb/enc/src/gain_q.cpp diff --git a/media/codecs/amrnb/enc/src/gain_q.h b/media/module/codecs/amrnb/enc/src/gain_q.h similarity index 100% rename from media/codecs/amrnb/enc/src/gain_q.h rename to media/module/codecs/amrnb/enc/src/gain_q.h diff --git a/media/codecs/amrnb/enc/src/gsmamr_enc.h b/media/module/codecs/amrnb/enc/src/gsmamr_enc.h similarity index 100% rename from media/codecs/amrnb/enc/src/gsmamr_enc.h rename to media/module/codecs/amrnb/enc/src/gsmamr_enc.h diff --git a/media/codecs/amrnb/enc/src/hp_max.cpp b/media/module/codecs/amrnb/enc/src/hp_max.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/hp_max.cpp rename to media/module/codecs/amrnb/enc/src/hp_max.cpp diff --git a/media/codecs/amrnb/enc/src/hp_max.h b/media/module/codecs/amrnb/enc/src/hp_max.h similarity index 100% rename from media/codecs/amrnb/enc/src/hp_max.h rename to media/module/codecs/amrnb/enc/src/hp_max.h diff --git a/media/codecs/amrnb/enc/src/inter_36.cpp b/media/module/codecs/amrnb/enc/src/inter_36.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/inter_36.cpp rename to media/module/codecs/amrnb/enc/src/inter_36.cpp diff --git a/media/codecs/amrnb/enc/src/inter_36.h b/media/module/codecs/amrnb/enc/src/inter_36.h similarity index 100% rename from media/codecs/amrnb/enc/src/inter_36.h rename to media/module/codecs/amrnb/enc/src/inter_36.h diff --git a/media/codecs/amrnb/enc/src/inter_36_tab.cpp b/media/module/codecs/amrnb/enc/src/inter_36_tab.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/inter_36_tab.cpp rename to media/module/codecs/amrnb/enc/src/inter_36_tab.cpp diff --git a/media/codecs/amrnb/enc/src/inter_36_tab.h b/media/module/codecs/amrnb/enc/src/inter_36_tab.h similarity index 100% rename from media/codecs/amrnb/enc/src/inter_36_tab.h rename to media/module/codecs/amrnb/enc/src/inter_36_tab.h diff --git a/media/codecs/amrnb/enc/src/l_comp.cpp b/media/module/codecs/amrnb/enc/src/l_comp.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/l_comp.cpp rename to media/module/codecs/amrnb/enc/src/l_comp.cpp diff --git a/media/codecs/amrnb/enc/src/l_extract.cpp b/media/module/codecs/amrnb/enc/src/l_extract.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/l_extract.cpp rename to media/module/codecs/amrnb/enc/src/l_extract.cpp diff --git a/media/codecs/amrnb/enc/src/l_negate.cpp b/media/module/codecs/amrnb/enc/src/l_negate.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/l_negate.cpp rename to media/module/codecs/amrnb/enc/src/l_negate.cpp diff --git a/media/codecs/amrnb/enc/src/lag_wind.cpp b/media/module/codecs/amrnb/enc/src/lag_wind.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/lag_wind.cpp rename to media/module/codecs/amrnb/enc/src/lag_wind.cpp diff --git a/media/codecs/amrnb/enc/src/lag_wind.h b/media/module/codecs/amrnb/enc/src/lag_wind.h similarity index 100% rename from media/codecs/amrnb/enc/src/lag_wind.h rename to media/module/codecs/amrnb/enc/src/lag_wind.h diff --git a/media/codecs/amrnb/enc/src/lag_wind_tab.cpp b/media/module/codecs/amrnb/enc/src/lag_wind_tab.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/lag_wind_tab.cpp rename to media/module/codecs/amrnb/enc/src/lag_wind_tab.cpp diff --git a/media/codecs/amrnb/enc/src/lag_wind_tab.h b/media/module/codecs/amrnb/enc/src/lag_wind_tab.h similarity index 100% rename from media/codecs/amrnb/enc/src/lag_wind_tab.h rename to media/module/codecs/amrnb/enc/src/lag_wind_tab.h diff --git a/media/codecs/amrnb/enc/src/levinson.cpp b/media/module/codecs/amrnb/enc/src/levinson.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/levinson.cpp rename to media/module/codecs/amrnb/enc/src/levinson.cpp diff --git a/media/codecs/amrnb/enc/src/levinson.h b/media/module/codecs/amrnb/enc/src/levinson.h similarity index 100% rename from media/codecs/amrnb/enc/src/levinson.h rename to media/module/codecs/amrnb/enc/src/levinson.h diff --git a/media/codecs/amrnb/enc/src/lpc.cpp b/media/module/codecs/amrnb/enc/src/lpc.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/lpc.cpp rename to media/module/codecs/amrnb/enc/src/lpc.cpp diff --git a/media/codecs/amrnb/enc/src/lpc.h b/media/module/codecs/amrnb/enc/src/lpc.h similarity index 100% rename from media/codecs/amrnb/enc/src/lpc.h rename to media/module/codecs/amrnb/enc/src/lpc.h diff --git a/media/codecs/amrnb/enc/src/ol_ltp.cpp b/media/module/codecs/amrnb/enc/src/ol_ltp.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/ol_ltp.cpp rename to media/module/codecs/amrnb/enc/src/ol_ltp.cpp diff --git a/media/codecs/amrnb/enc/src/ol_ltp.h b/media/module/codecs/amrnb/enc/src/ol_ltp.h similarity index 100% rename from media/codecs/amrnb/enc/src/ol_ltp.h rename to media/module/codecs/amrnb/enc/src/ol_ltp.h diff --git a/media/codecs/amrnb/enc/src/p_ol_wgh.cpp b/media/module/codecs/amrnb/enc/src/p_ol_wgh.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/p_ol_wgh.cpp rename to media/module/codecs/amrnb/enc/src/p_ol_wgh.cpp diff --git a/media/codecs/amrnb/enc/src/pitch_fr.cpp b/media/module/codecs/amrnb/enc/src/pitch_fr.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/pitch_fr.cpp rename to media/module/codecs/amrnb/enc/src/pitch_fr.cpp diff --git a/media/codecs/amrnb/enc/src/pitch_fr.h b/media/module/codecs/amrnb/enc/src/pitch_fr.h similarity index 100% rename from media/codecs/amrnb/enc/src/pitch_fr.h rename to media/module/codecs/amrnb/enc/src/pitch_fr.h diff --git a/media/codecs/amrnb/enc/src/pitch_ol.cpp b/media/module/codecs/amrnb/enc/src/pitch_ol.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/pitch_ol.cpp rename to media/module/codecs/amrnb/enc/src/pitch_ol.cpp diff --git a/media/codecs/amrnb/enc/src/pitch_ol.h b/media/module/codecs/amrnb/enc/src/pitch_ol.h similarity index 100% rename from media/codecs/amrnb/enc/src/pitch_ol.h rename to media/module/codecs/amrnb/enc/src/pitch_ol.h diff --git a/media/codecs/amrnb/enc/src/pre_big.cpp b/media/module/codecs/amrnb/enc/src/pre_big.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/pre_big.cpp rename to media/module/codecs/amrnb/enc/src/pre_big.cpp diff --git a/media/codecs/amrnb/enc/src/pre_big.h b/media/module/codecs/amrnb/enc/src/pre_big.h similarity index 100% rename from media/codecs/amrnb/enc/src/pre_big.h rename to media/module/codecs/amrnb/enc/src/pre_big.h diff --git a/media/codecs/amrnb/enc/src/pre_proc.cpp b/media/module/codecs/amrnb/enc/src/pre_proc.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/pre_proc.cpp rename to media/module/codecs/amrnb/enc/src/pre_proc.cpp diff --git a/media/codecs/amrnb/enc/src/pre_proc.h b/media/module/codecs/amrnb/enc/src/pre_proc.h similarity index 100% rename from media/codecs/amrnb/enc/src/pre_proc.h rename to media/module/codecs/amrnb/enc/src/pre_proc.h diff --git a/media/codecs/amrnb/enc/src/prm2bits.cpp b/media/module/codecs/amrnb/enc/src/prm2bits.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/prm2bits.cpp rename to media/module/codecs/amrnb/enc/src/prm2bits.cpp diff --git a/media/codecs/amrnb/enc/src/prm2bits.h b/media/module/codecs/amrnb/enc/src/prm2bits.h similarity index 100% rename from media/codecs/amrnb/enc/src/prm2bits.h rename to media/module/codecs/amrnb/enc/src/prm2bits.h diff --git a/media/codecs/amrnb/enc/src/q_gain_c.cpp b/media/module/codecs/amrnb/enc/src/q_gain_c.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/q_gain_c.cpp rename to media/module/codecs/amrnb/enc/src/q_gain_c.cpp diff --git a/media/codecs/amrnb/enc/src/q_gain_c.h b/media/module/codecs/amrnb/enc/src/q_gain_c.h similarity index 100% rename from media/codecs/amrnb/enc/src/q_gain_c.h rename to media/module/codecs/amrnb/enc/src/q_gain_c.h diff --git a/media/codecs/amrnb/enc/src/q_gain_p.cpp b/media/module/codecs/amrnb/enc/src/q_gain_p.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/q_gain_p.cpp rename to media/module/codecs/amrnb/enc/src/q_gain_p.cpp diff --git a/media/codecs/amrnb/enc/src/q_gain_p.h b/media/module/codecs/amrnb/enc/src/q_gain_p.h similarity index 100% rename from media/codecs/amrnb/enc/src/q_gain_p.h rename to media/module/codecs/amrnb/enc/src/q_gain_p.h diff --git a/media/codecs/amrnb/enc/src/qgain475.cpp b/media/module/codecs/amrnb/enc/src/qgain475.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/qgain475.cpp rename to media/module/codecs/amrnb/enc/src/qgain475.cpp diff --git a/media/codecs/amrnb/enc/src/qgain475.h b/media/module/codecs/amrnb/enc/src/qgain475.h similarity index 100% rename from media/codecs/amrnb/enc/src/qgain475.h rename to media/module/codecs/amrnb/enc/src/qgain475.h diff --git a/media/codecs/amrnb/enc/src/qgain795.cpp b/media/module/codecs/amrnb/enc/src/qgain795.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/qgain795.cpp rename to media/module/codecs/amrnb/enc/src/qgain795.cpp diff --git a/media/codecs/amrnb/enc/src/qgain795.h b/media/module/codecs/amrnb/enc/src/qgain795.h similarity index 100% rename from media/codecs/amrnb/enc/src/qgain795.h rename to media/module/codecs/amrnb/enc/src/qgain795.h diff --git a/media/codecs/amrnb/enc/src/qua_gain.cpp b/media/module/codecs/amrnb/enc/src/qua_gain.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/qua_gain.cpp rename to media/module/codecs/amrnb/enc/src/qua_gain.cpp diff --git a/media/codecs/amrnb/enc/src/s10_8pf.cpp b/media/module/codecs/amrnb/enc/src/s10_8pf.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/s10_8pf.cpp rename to media/module/codecs/amrnb/enc/src/s10_8pf.cpp diff --git a/media/codecs/amrnb/enc/src/s10_8pf.h b/media/module/codecs/amrnb/enc/src/s10_8pf.h similarity index 100% rename from media/codecs/amrnb/enc/src/s10_8pf.h rename to media/module/codecs/amrnb/enc/src/s10_8pf.h diff --git a/media/codecs/amrnb/enc/src/set_sign.cpp b/media/module/codecs/amrnb/enc/src/set_sign.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/set_sign.cpp rename to media/module/codecs/amrnb/enc/src/set_sign.cpp diff --git a/media/codecs/amrnb/enc/src/set_sign.h b/media/module/codecs/amrnb/enc/src/set_sign.h similarity index 100% rename from media/codecs/amrnb/enc/src/set_sign.h rename to media/module/codecs/amrnb/enc/src/set_sign.h diff --git a/media/codecs/amrnb/enc/src/sid_sync.cpp b/media/module/codecs/amrnb/enc/src/sid_sync.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/sid_sync.cpp rename to media/module/codecs/amrnb/enc/src/sid_sync.cpp diff --git a/media/codecs/amrnb/enc/src/sid_sync.h b/media/module/codecs/amrnb/enc/src/sid_sync.h similarity index 100% rename from media/codecs/amrnb/enc/src/sid_sync.h rename to media/module/codecs/amrnb/enc/src/sid_sync.h diff --git a/media/codecs/amrnb/enc/src/sp_enc.cpp b/media/module/codecs/amrnb/enc/src/sp_enc.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/sp_enc.cpp rename to media/module/codecs/amrnb/enc/src/sp_enc.cpp diff --git a/media/codecs/amrnb/enc/src/sp_enc.h b/media/module/codecs/amrnb/enc/src/sp_enc.h similarity index 100% rename from media/codecs/amrnb/enc/src/sp_enc.h rename to media/module/codecs/amrnb/enc/src/sp_enc.h diff --git a/media/codecs/amrnb/enc/src/spreproc.cpp b/media/module/codecs/amrnb/enc/src/spreproc.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/spreproc.cpp rename to media/module/codecs/amrnb/enc/src/spreproc.cpp diff --git a/media/codecs/amrnb/enc/src/spreproc.h b/media/module/codecs/amrnb/enc/src/spreproc.h similarity index 100% rename from media/codecs/amrnb/enc/src/spreproc.h rename to media/module/codecs/amrnb/enc/src/spreproc.h diff --git a/media/codecs/amrnb/enc/src/spstproc.cpp b/media/module/codecs/amrnb/enc/src/spstproc.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/spstproc.cpp rename to media/module/codecs/amrnb/enc/src/spstproc.cpp diff --git a/media/codecs/amrnb/enc/src/spstproc.h b/media/module/codecs/amrnb/enc/src/spstproc.h similarity index 100% rename from media/codecs/amrnb/enc/src/spstproc.h rename to media/module/codecs/amrnb/enc/src/spstproc.h diff --git a/media/codecs/amrnb/enc/src/ton_stab.cpp b/media/module/codecs/amrnb/enc/src/ton_stab.cpp similarity index 100% rename from media/codecs/amrnb/enc/src/ton_stab.cpp rename to media/module/codecs/amrnb/enc/src/ton_stab.cpp diff --git a/media/codecs/amrnb/enc/src/ton_stab.h b/media/module/codecs/amrnb/enc/src/ton_stab.h similarity index 100% rename from media/codecs/amrnb/enc/src/ton_stab.h rename to media/module/codecs/amrnb/enc/src/ton_stab.h diff --git a/media/codecs/amrnb/enc/test/AmrnbEncTestEnvironment.h b/media/module/codecs/amrnb/enc/test/AmrnbEncTestEnvironment.h similarity index 100% rename from media/codecs/amrnb/enc/test/AmrnbEncTestEnvironment.h rename to media/module/codecs/amrnb/enc/test/AmrnbEncTestEnvironment.h diff --git a/media/codecs/amrnb/enc/test/AmrnbEncoderTest.cpp b/media/module/codecs/amrnb/enc/test/AmrnbEncoderTest.cpp similarity index 100% rename from media/codecs/amrnb/enc/test/AmrnbEncoderTest.cpp rename to media/module/codecs/amrnb/enc/test/AmrnbEncoderTest.cpp diff --git a/media/codecs/amrnb/enc/test/Android.bp b/media/module/codecs/amrnb/enc/test/Android.bp similarity index 100% rename from media/codecs/amrnb/enc/test/Android.bp rename to media/module/codecs/amrnb/enc/test/Android.bp diff --git a/media/codecs/amrnb/enc/test/AndroidTest.xml b/media/module/codecs/amrnb/enc/test/AndroidTest.xml similarity index 100% rename from media/codecs/amrnb/enc/test/AndroidTest.xml rename to media/module/codecs/amrnb/enc/test/AndroidTest.xml diff --git a/media/codecs/amrnb/enc/test/README.md b/media/module/codecs/amrnb/enc/test/README.md similarity index 100% rename from media/codecs/amrnb/enc/test/README.md rename to media/module/codecs/amrnb/enc/test/README.md diff --git a/media/codecs/amrnb/enc/test/amrnb_enc_test.cpp b/media/module/codecs/amrnb/enc/test/amrnb_enc_test.cpp similarity index 100% rename from media/codecs/amrnb/enc/test/amrnb_enc_test.cpp rename to media/module/codecs/amrnb/enc/test/amrnb_enc_test.cpp diff --git a/media/codecs/amrnb/fuzzer/Android.bp b/media/module/codecs/amrnb/fuzzer/Android.bp similarity index 100% rename from media/codecs/amrnb/fuzzer/Android.bp rename to media/module/codecs/amrnb/fuzzer/Android.bp diff --git a/media/codecs/amrnb/fuzzer/README.md b/media/module/codecs/amrnb/fuzzer/README.md similarity index 100% rename from media/codecs/amrnb/fuzzer/README.md rename to media/module/codecs/amrnb/fuzzer/README.md diff --git a/media/codecs/amrnb/fuzzer/amrnb_dec_fuzzer.cpp b/media/module/codecs/amrnb/fuzzer/amrnb_dec_fuzzer.cpp similarity index 100% rename from media/codecs/amrnb/fuzzer/amrnb_dec_fuzzer.cpp rename to media/module/codecs/amrnb/fuzzer/amrnb_dec_fuzzer.cpp diff --git a/media/codecs/amrnb/patent_disclaimer.txt b/media/module/codecs/amrnb/patent_disclaimer.txt similarity index 100% rename from media/codecs/amrnb/patent_disclaimer.txt rename to media/module/codecs/amrnb/patent_disclaimer.txt diff --git a/media/codecs/amrwb/dec/Android.bp b/media/module/codecs/amrwb/dec/Android.bp similarity index 100% rename from media/codecs/amrwb/dec/Android.bp rename to media/module/codecs/amrwb/dec/Android.bp diff --git a/media/codecs/amrwb/dec/MODULE_LICENSE_APACHE2 b/media/module/codecs/amrwb/dec/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/codecs/amrwb/dec/MODULE_LICENSE_APACHE2 rename to media/module/codecs/amrwb/dec/MODULE_LICENSE_APACHE2 diff --git a/media/codecs/amrwb/dec/NOTICE b/media/module/codecs/amrwb/dec/NOTICE similarity index 100% rename from media/codecs/amrwb/dec/NOTICE rename to media/module/codecs/amrwb/dec/NOTICE diff --git a/media/codecs/amrwb/dec/TEST_MAPPING b/media/module/codecs/amrwb/dec/TEST_MAPPING similarity index 100% rename from media/codecs/amrwb/dec/TEST_MAPPING rename to media/module/codecs/amrwb/dec/TEST_MAPPING diff --git a/media/codecs/amrwb/dec/fuzzer/Android.bp b/media/module/codecs/amrwb/dec/fuzzer/Android.bp similarity index 100% rename from media/codecs/amrwb/dec/fuzzer/Android.bp rename to media/module/codecs/amrwb/dec/fuzzer/Android.bp diff --git a/media/codecs/amrwb/dec/fuzzer/README.md b/media/module/codecs/amrwb/dec/fuzzer/README.md similarity index 100% rename from media/codecs/amrwb/dec/fuzzer/README.md rename to media/module/codecs/amrwb/dec/fuzzer/README.md diff --git a/media/codecs/amrwb/dec/fuzzer/amrwb_dec_fuzzer.cpp b/media/module/codecs/amrwb/dec/fuzzer/amrwb_dec_fuzzer.cpp similarity index 100% rename from media/codecs/amrwb/dec/fuzzer/amrwb_dec_fuzzer.cpp rename to media/module/codecs/amrwb/dec/fuzzer/amrwb_dec_fuzzer.cpp diff --git a/media/codecs/amrwb/dec/include/pvamrwbdecoder_api.h b/media/module/codecs/amrwb/dec/include/pvamrwbdecoder_api.h similarity index 100% rename from media/codecs/amrwb/dec/include/pvamrwbdecoder_api.h rename to media/module/codecs/amrwb/dec/include/pvamrwbdecoder_api.h diff --git a/media/codecs/amrwb/dec/patent_disclaimer.txt b/media/module/codecs/amrwb/dec/patent_disclaimer.txt similarity index 100% rename from media/codecs/amrwb/dec/patent_disclaimer.txt rename to media/module/codecs/amrwb/dec/patent_disclaimer.txt diff --git a/media/codecs/amrwb/dec/src/agc2_amr_wb.cpp b/media/module/codecs/amrwb/dec/src/agc2_amr_wb.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/agc2_amr_wb.cpp rename to media/module/codecs/amrwb/dec/src/agc2_amr_wb.cpp diff --git a/media/codecs/amrwb/dec/src/band_pass_6k_7k.cpp b/media/module/codecs/amrwb/dec/src/band_pass_6k_7k.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/band_pass_6k_7k.cpp rename to media/module/codecs/amrwb/dec/src/band_pass_6k_7k.cpp diff --git a/media/codecs/amrwb/dec/src/dec_acelp_2p_in_64.cpp b/media/module/codecs/amrwb/dec/src/dec_acelp_2p_in_64.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/dec_acelp_2p_in_64.cpp rename to media/module/codecs/amrwb/dec/src/dec_acelp_2p_in_64.cpp diff --git a/media/codecs/amrwb/dec/src/dec_acelp_4p_in_64.cpp b/media/module/codecs/amrwb/dec/src/dec_acelp_4p_in_64.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/dec_acelp_4p_in_64.cpp rename to media/module/codecs/amrwb/dec/src/dec_acelp_4p_in_64.cpp diff --git a/media/codecs/amrwb/dec/src/dec_alg_codebook.cpp b/media/module/codecs/amrwb/dec/src/dec_alg_codebook.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/dec_alg_codebook.cpp rename to media/module/codecs/amrwb/dec/src/dec_alg_codebook.cpp diff --git a/media/codecs/amrwb/dec/src/dec_gain2_amr_wb.cpp b/media/module/codecs/amrwb/dec/src/dec_gain2_amr_wb.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/dec_gain2_amr_wb.cpp rename to media/module/codecs/amrwb/dec/src/dec_gain2_amr_wb.cpp diff --git a/media/codecs/amrwb/dec/src/deemphasis_32.cpp b/media/module/codecs/amrwb/dec/src/deemphasis_32.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/deemphasis_32.cpp rename to media/module/codecs/amrwb/dec/src/deemphasis_32.cpp diff --git a/media/codecs/amrwb/dec/src/dtx.h b/media/module/codecs/amrwb/dec/src/dtx.h similarity index 100% rename from media/codecs/amrwb/dec/src/dtx.h rename to media/module/codecs/amrwb/dec/src/dtx.h diff --git a/media/codecs/amrwb/dec/src/dtx_decoder_amr_wb.cpp b/media/module/codecs/amrwb/dec/src/dtx_decoder_amr_wb.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/dtx_decoder_amr_wb.cpp rename to media/module/codecs/amrwb/dec/src/dtx_decoder_amr_wb.cpp diff --git a/media/codecs/amrwb/dec/src/e_pv_amrwbdec.h b/media/module/codecs/amrwb/dec/src/e_pv_amrwbdec.h similarity index 100% rename from media/codecs/amrwb/dec/src/e_pv_amrwbdec.h rename to media/module/codecs/amrwb/dec/src/e_pv_amrwbdec.h diff --git a/media/codecs/amrwb/dec/src/get_amr_wb_bits.cpp b/media/module/codecs/amrwb/dec/src/get_amr_wb_bits.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/get_amr_wb_bits.cpp rename to media/module/codecs/amrwb/dec/src/get_amr_wb_bits.cpp diff --git a/media/codecs/amrwb/dec/src/get_amr_wb_bits.h b/media/module/codecs/amrwb/dec/src/get_amr_wb_bits.h similarity index 100% rename from media/codecs/amrwb/dec/src/get_amr_wb_bits.h rename to media/module/codecs/amrwb/dec/src/get_amr_wb_bits.h diff --git a/media/codecs/amrwb/dec/src/highpass_400hz_at_12k8.cpp b/media/module/codecs/amrwb/dec/src/highpass_400hz_at_12k8.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/highpass_400hz_at_12k8.cpp rename to media/module/codecs/amrwb/dec/src/highpass_400hz_at_12k8.cpp diff --git a/media/codecs/amrwb/dec/src/highpass_50hz_at_12k8.cpp b/media/module/codecs/amrwb/dec/src/highpass_50hz_at_12k8.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/highpass_50hz_at_12k8.cpp rename to media/module/codecs/amrwb/dec/src/highpass_50hz_at_12k8.cpp diff --git a/media/codecs/amrwb/dec/src/homing_amr_wb_dec.cpp b/media/module/codecs/amrwb/dec/src/homing_amr_wb_dec.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/homing_amr_wb_dec.cpp rename to media/module/codecs/amrwb/dec/src/homing_amr_wb_dec.cpp diff --git a/media/codecs/amrwb/dec/src/interpolate_isp.cpp b/media/module/codecs/amrwb/dec/src/interpolate_isp.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/interpolate_isp.cpp rename to media/module/codecs/amrwb/dec/src/interpolate_isp.cpp diff --git a/media/codecs/amrwb/dec/src/isf_extrapolation.cpp b/media/module/codecs/amrwb/dec/src/isf_extrapolation.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/isf_extrapolation.cpp rename to media/module/codecs/amrwb/dec/src/isf_extrapolation.cpp diff --git a/media/codecs/amrwb/dec/src/isp_az.cpp b/media/module/codecs/amrwb/dec/src/isp_az.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/isp_az.cpp rename to media/module/codecs/amrwb/dec/src/isp_az.cpp diff --git a/media/codecs/amrwb/dec/src/isp_isf.cpp b/media/module/codecs/amrwb/dec/src/isp_isf.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/isp_isf.cpp rename to media/module/codecs/amrwb/dec/src/isp_isf.cpp diff --git a/media/codecs/amrwb/dec/src/lagconceal.cpp b/media/module/codecs/amrwb/dec/src/lagconceal.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/lagconceal.cpp rename to media/module/codecs/amrwb/dec/src/lagconceal.cpp diff --git a/media/codecs/amrwb/dec/src/low_pass_filt_7k.cpp b/media/module/codecs/amrwb/dec/src/low_pass_filt_7k.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/low_pass_filt_7k.cpp rename to media/module/codecs/amrwb/dec/src/low_pass_filt_7k.cpp diff --git a/media/codecs/amrwb/dec/src/median5.cpp b/media/module/codecs/amrwb/dec/src/median5.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/median5.cpp rename to media/module/codecs/amrwb/dec/src/median5.cpp diff --git a/media/codecs/amrwb/dec/src/mime_io.cpp b/media/module/codecs/amrwb/dec/src/mime_io.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/mime_io.cpp rename to media/module/codecs/amrwb/dec/src/mime_io.cpp diff --git a/media/codecs/amrwb/dec/src/mime_io.h b/media/module/codecs/amrwb/dec/src/mime_io.h similarity index 100% rename from media/codecs/amrwb/dec/src/mime_io.h rename to media/module/codecs/amrwb/dec/src/mime_io.h diff --git a/media/codecs/amrwb/dec/src/noise_gen_amrwb.cpp b/media/module/codecs/amrwb/dec/src/noise_gen_amrwb.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/noise_gen_amrwb.cpp rename to media/module/codecs/amrwb/dec/src/noise_gen_amrwb.cpp diff --git a/media/codecs/amrwb/dec/src/normalize_amr_wb.cpp b/media/module/codecs/amrwb/dec/src/normalize_amr_wb.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/normalize_amr_wb.cpp rename to media/module/codecs/amrwb/dec/src/normalize_amr_wb.cpp diff --git a/media/codecs/amrwb/dec/src/normalize_amr_wb.h b/media/module/codecs/amrwb/dec/src/normalize_amr_wb.h similarity index 100% rename from media/codecs/amrwb/dec/src/normalize_amr_wb.h rename to media/module/codecs/amrwb/dec/src/normalize_amr_wb.h diff --git a/media/codecs/amrwb/dec/src/oversamp_12k8_to_16k.cpp b/media/module/codecs/amrwb/dec/src/oversamp_12k8_to_16k.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/oversamp_12k8_to_16k.cpp rename to media/module/codecs/amrwb/dec/src/oversamp_12k8_to_16k.cpp diff --git a/media/codecs/amrwb/dec/src/phase_dispersion.cpp b/media/module/codecs/amrwb/dec/src/phase_dispersion.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/phase_dispersion.cpp rename to media/module/codecs/amrwb/dec/src/phase_dispersion.cpp diff --git a/media/codecs/amrwb/dec/src/pit_shrp.cpp b/media/module/codecs/amrwb/dec/src/pit_shrp.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/pit_shrp.cpp rename to media/module/codecs/amrwb/dec/src/pit_shrp.cpp diff --git a/media/codecs/amrwb/dec/src/pred_lt4.cpp b/media/module/codecs/amrwb/dec/src/pred_lt4.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/pred_lt4.cpp rename to media/module/codecs/amrwb/dec/src/pred_lt4.cpp diff --git a/media/codecs/amrwb/dec/src/preemph_amrwb_dec.cpp b/media/module/codecs/amrwb/dec/src/preemph_amrwb_dec.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/preemph_amrwb_dec.cpp rename to media/module/codecs/amrwb/dec/src/preemph_amrwb_dec.cpp diff --git a/media/codecs/amrwb/dec/src/pv_amr_wb_type_defs.h b/media/module/codecs/amrwb/dec/src/pv_amr_wb_type_defs.h similarity index 100% rename from media/codecs/amrwb/dec/src/pv_amr_wb_type_defs.h rename to media/module/codecs/amrwb/dec/src/pv_amr_wb_type_defs.h diff --git a/media/codecs/amrwb/dec/src/pvamrwb_math_op.cpp b/media/module/codecs/amrwb/dec/src/pvamrwb_math_op.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/pvamrwb_math_op.cpp rename to media/module/codecs/amrwb/dec/src/pvamrwb_math_op.cpp diff --git a/media/codecs/amrwb/dec/src/pvamrwb_math_op.h b/media/module/codecs/amrwb/dec/src/pvamrwb_math_op.h similarity index 100% rename from media/codecs/amrwb/dec/src/pvamrwb_math_op.h rename to media/module/codecs/amrwb/dec/src/pvamrwb_math_op.h diff --git a/media/codecs/amrwb/dec/src/pvamrwbdecoder.cpp b/media/module/codecs/amrwb/dec/src/pvamrwbdecoder.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/pvamrwbdecoder.cpp rename to media/module/codecs/amrwb/dec/src/pvamrwbdecoder.cpp diff --git a/media/codecs/amrwb/dec/src/pvamrwbdecoder.h b/media/module/codecs/amrwb/dec/src/pvamrwbdecoder.h similarity index 100% rename from media/codecs/amrwb/dec/src/pvamrwbdecoder.h rename to media/module/codecs/amrwb/dec/src/pvamrwbdecoder.h diff --git a/media/codecs/amrwb/dec/src/pvamrwbdecoder_acelp.h b/media/module/codecs/amrwb/dec/src/pvamrwbdecoder_acelp.h similarity index 100% rename from media/codecs/amrwb/dec/src/pvamrwbdecoder_acelp.h rename to media/module/codecs/amrwb/dec/src/pvamrwbdecoder_acelp.h diff --git a/media/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op.h b/media/module/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op.h similarity index 100% rename from media/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op.h rename to media/module/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op.h diff --git a/media/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op_armv5.h b/media/module/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op_armv5.h similarity index 100% rename from media/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op_armv5.h rename to media/module/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op_armv5.h diff --git a/media/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op_cequivalent.h b/media/module/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op_cequivalent.h similarity index 100% rename from media/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op_cequivalent.h rename to media/module/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op_cequivalent.h diff --git a/media/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op_gcc_armv5.h b/media/module/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op_gcc_armv5.h similarity index 100% rename from media/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op_gcc_armv5.h rename to media/module/codecs/amrwb/dec/src/pvamrwbdecoder_basic_op_gcc_armv5.h diff --git a/media/codecs/amrwb/dec/src/pvamrwbdecoder_cnst.h b/media/module/codecs/amrwb/dec/src/pvamrwbdecoder_cnst.h similarity index 100% rename from media/codecs/amrwb/dec/src/pvamrwbdecoder_cnst.h rename to media/module/codecs/amrwb/dec/src/pvamrwbdecoder_cnst.h diff --git a/media/codecs/amrwb/dec/src/pvamrwbdecoder_mem_funcs.h b/media/module/codecs/amrwb/dec/src/pvamrwbdecoder_mem_funcs.h similarity index 100% rename from media/codecs/amrwb/dec/src/pvamrwbdecoder_mem_funcs.h rename to media/module/codecs/amrwb/dec/src/pvamrwbdecoder_mem_funcs.h diff --git a/media/codecs/amrwb/dec/src/q_gain2_tab.cpp b/media/module/codecs/amrwb/dec/src/q_gain2_tab.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/q_gain2_tab.cpp rename to media/module/codecs/amrwb/dec/src/q_gain2_tab.cpp diff --git a/media/codecs/amrwb/dec/src/q_pulse.h b/media/module/codecs/amrwb/dec/src/q_pulse.h similarity index 100% rename from media/codecs/amrwb/dec/src/q_pulse.h rename to media/module/codecs/amrwb/dec/src/q_pulse.h diff --git a/media/codecs/amrwb/dec/src/qisf_ns.cpp b/media/module/codecs/amrwb/dec/src/qisf_ns.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/qisf_ns.cpp rename to media/module/codecs/amrwb/dec/src/qisf_ns.cpp diff --git a/media/codecs/amrwb/dec/src/qisf_ns.h b/media/module/codecs/amrwb/dec/src/qisf_ns.h similarity index 100% rename from media/codecs/amrwb/dec/src/qisf_ns.h rename to media/module/codecs/amrwb/dec/src/qisf_ns.h diff --git a/media/codecs/amrwb/dec/src/qisf_ns_tab.cpp b/media/module/codecs/amrwb/dec/src/qisf_ns_tab.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/qisf_ns_tab.cpp rename to media/module/codecs/amrwb/dec/src/qisf_ns_tab.cpp diff --git a/media/codecs/amrwb/dec/src/qpisf_2s.cpp b/media/module/codecs/amrwb/dec/src/qpisf_2s.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/qpisf_2s.cpp rename to media/module/codecs/amrwb/dec/src/qpisf_2s.cpp diff --git a/media/codecs/amrwb/dec/src/qpisf_2s.h b/media/module/codecs/amrwb/dec/src/qpisf_2s.h similarity index 100% rename from media/codecs/amrwb/dec/src/qpisf_2s.h rename to media/module/codecs/amrwb/dec/src/qpisf_2s.h diff --git a/media/codecs/amrwb/dec/src/qpisf_2s_tab.cpp b/media/module/codecs/amrwb/dec/src/qpisf_2s_tab.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/qpisf_2s_tab.cpp rename to media/module/codecs/amrwb/dec/src/qpisf_2s_tab.cpp diff --git a/media/codecs/amrwb/dec/src/scale_signal.cpp b/media/module/codecs/amrwb/dec/src/scale_signal.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/scale_signal.cpp rename to media/module/codecs/amrwb/dec/src/scale_signal.cpp diff --git a/media/codecs/amrwb/dec/src/synthesis_amr_wb.cpp b/media/module/codecs/amrwb/dec/src/synthesis_amr_wb.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/synthesis_amr_wb.cpp rename to media/module/codecs/amrwb/dec/src/synthesis_amr_wb.cpp diff --git a/media/codecs/amrwb/dec/src/synthesis_amr_wb.h b/media/module/codecs/amrwb/dec/src/synthesis_amr_wb.h similarity index 100% rename from media/codecs/amrwb/dec/src/synthesis_amr_wb.h rename to media/module/codecs/amrwb/dec/src/synthesis_amr_wb.h diff --git a/media/codecs/amrwb/dec/src/voice_factor.cpp b/media/module/codecs/amrwb/dec/src/voice_factor.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/voice_factor.cpp rename to media/module/codecs/amrwb/dec/src/voice_factor.cpp diff --git a/media/codecs/amrwb/dec/src/wb_syn_filt.cpp b/media/module/codecs/amrwb/dec/src/wb_syn_filt.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/wb_syn_filt.cpp rename to media/module/codecs/amrwb/dec/src/wb_syn_filt.cpp diff --git a/media/codecs/amrwb/dec/src/weight_amrwb_lpc.cpp b/media/module/codecs/amrwb/dec/src/weight_amrwb_lpc.cpp similarity index 100% rename from media/codecs/amrwb/dec/src/weight_amrwb_lpc.cpp rename to media/module/codecs/amrwb/dec/src/weight_amrwb_lpc.cpp diff --git a/media/codecs/amrwb/dec/test/AmrwbDecTestEnvironment.h b/media/module/codecs/amrwb/dec/test/AmrwbDecTestEnvironment.h similarity index 100% rename from media/codecs/amrwb/dec/test/AmrwbDecTestEnvironment.h rename to media/module/codecs/amrwb/dec/test/AmrwbDecTestEnvironment.h diff --git a/media/codecs/amrwb/dec/test/AmrwbDecoderTest.cpp b/media/module/codecs/amrwb/dec/test/AmrwbDecoderTest.cpp similarity index 100% rename from media/codecs/amrwb/dec/test/AmrwbDecoderTest.cpp rename to media/module/codecs/amrwb/dec/test/AmrwbDecoderTest.cpp diff --git a/media/codecs/amrwb/dec/test/Android.bp b/media/module/codecs/amrwb/dec/test/Android.bp similarity index 100% rename from media/codecs/amrwb/dec/test/Android.bp rename to media/module/codecs/amrwb/dec/test/Android.bp diff --git a/media/codecs/amrwb/dec/test/AndroidTest.xml b/media/module/codecs/amrwb/dec/test/AndroidTest.xml similarity index 100% rename from media/codecs/amrwb/dec/test/AndroidTest.xml rename to media/module/codecs/amrwb/dec/test/AndroidTest.xml diff --git a/media/codecs/amrwb/dec/test/README.md b/media/module/codecs/amrwb/dec/test/README.md similarity index 100% rename from media/codecs/amrwb/dec/test/README.md rename to media/module/codecs/amrwb/dec/test/README.md diff --git a/media/codecs/amrwb/dec/test/amrwbdec_test.cpp b/media/module/codecs/amrwb/dec/test/amrwbdec_test.cpp similarity index 100% rename from media/codecs/amrwb/dec/test/amrwbdec_test.cpp rename to media/module/codecs/amrwb/dec/test/amrwbdec_test.cpp diff --git a/media/codecs/amrwb/enc/Android.bp b/media/module/codecs/amrwb/enc/Android.bp similarity index 100% rename from media/codecs/amrwb/enc/Android.bp rename to media/module/codecs/amrwb/enc/Android.bp diff --git a/media/codecs/amrwb/enc/MODULE_LICENSE_APACHE2 b/media/module/codecs/amrwb/enc/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/codecs/amrwb/enc/MODULE_LICENSE_APACHE2 rename to media/module/codecs/amrwb/enc/MODULE_LICENSE_APACHE2 diff --git a/media/codecs/amrwb/enc/NOTICE b/media/module/codecs/amrwb/enc/NOTICE similarity index 100% rename from media/codecs/amrwb/enc/NOTICE rename to media/module/codecs/amrwb/enc/NOTICE diff --git a/media/codecs/amrwb/enc/SampleCode/AMRWB_E_SAMPLE.c b/media/module/codecs/amrwb/enc/SampleCode/AMRWB_E_SAMPLE.c similarity index 100% rename from media/codecs/amrwb/enc/SampleCode/AMRWB_E_SAMPLE.c rename to media/module/codecs/amrwb/enc/SampleCode/AMRWB_E_SAMPLE.c diff --git a/media/codecs/amrwb/enc/SampleCode/Android.bp b/media/module/codecs/amrwb/enc/SampleCode/Android.bp similarity index 100% rename from media/codecs/amrwb/enc/SampleCode/Android.bp rename to media/module/codecs/amrwb/enc/SampleCode/Android.bp diff --git a/media/codecs/amrwb/enc/SampleCode/MODULE_LICENSE_APACHE2 b/media/module/codecs/amrwb/enc/SampleCode/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/codecs/amrwb/enc/SampleCode/MODULE_LICENSE_APACHE2 rename to media/module/codecs/amrwb/enc/SampleCode/MODULE_LICENSE_APACHE2 diff --git a/media/codecs/amrwb/enc/SampleCode/NOTICE b/media/module/codecs/amrwb/enc/SampleCode/NOTICE similarity index 100% rename from media/codecs/amrwb/enc/SampleCode/NOTICE rename to media/module/codecs/amrwb/enc/SampleCode/NOTICE diff --git a/media/codecs/amrwb/enc/TEST_MAPPING b/media/module/codecs/amrwb/enc/TEST_MAPPING similarity index 100% rename from media/codecs/amrwb/enc/TEST_MAPPING rename to media/module/codecs/amrwb/enc/TEST_MAPPING diff --git a/media/codecs/amrwb/enc/doc/voAMRWBEncoderSDK.pdf b/media/module/codecs/amrwb/enc/doc/voAMRWBEncoderSDK.pdf similarity index 100% rename from media/codecs/amrwb/enc/doc/voAMRWBEncoderSDK.pdf rename to media/module/codecs/amrwb/enc/doc/voAMRWBEncoderSDK.pdf diff --git a/media/codecs/amrwb/enc/fuzzer/Android.bp b/media/module/codecs/amrwb/enc/fuzzer/Android.bp similarity index 100% rename from media/codecs/amrwb/enc/fuzzer/Android.bp rename to media/module/codecs/amrwb/enc/fuzzer/Android.bp diff --git a/media/codecs/amrwb/enc/fuzzer/README.md b/media/module/codecs/amrwb/enc/fuzzer/README.md similarity index 100% rename from media/codecs/amrwb/enc/fuzzer/README.md rename to media/module/codecs/amrwb/enc/fuzzer/README.md diff --git a/media/codecs/amrwb/enc/fuzzer/amrwb_enc_fuzzer.cpp b/media/module/codecs/amrwb/enc/fuzzer/amrwb_enc_fuzzer.cpp similarity index 100% rename from media/codecs/amrwb/enc/fuzzer/amrwb_enc_fuzzer.cpp rename to media/module/codecs/amrwb/enc/fuzzer/amrwb_enc_fuzzer.cpp diff --git a/media/codecs/amrwb/enc/inc/acelp.h b/media/module/codecs/amrwb/enc/inc/acelp.h similarity index 100% rename from media/codecs/amrwb/enc/inc/acelp.h rename to media/module/codecs/amrwb/enc/inc/acelp.h diff --git a/media/codecs/amrwb/enc/inc/basic_op.h b/media/module/codecs/amrwb/enc/inc/basic_op.h similarity index 100% rename from media/codecs/amrwb/enc/inc/basic_op.h rename to media/module/codecs/amrwb/enc/inc/basic_op.h diff --git a/media/codecs/amrwb/enc/inc/bits.h b/media/module/codecs/amrwb/enc/inc/bits.h similarity index 100% rename from media/codecs/amrwb/enc/inc/bits.h rename to media/module/codecs/amrwb/enc/inc/bits.h diff --git a/media/codecs/amrwb/enc/inc/cnst.h b/media/module/codecs/amrwb/enc/inc/cnst.h similarity index 100% rename from media/codecs/amrwb/enc/inc/cnst.h rename to media/module/codecs/amrwb/enc/inc/cnst.h diff --git a/media/codecs/amrwb/enc/inc/cod_main.h b/media/module/codecs/amrwb/enc/inc/cod_main.h similarity index 100% rename from media/codecs/amrwb/enc/inc/cod_main.h rename to media/module/codecs/amrwb/enc/inc/cod_main.h diff --git a/media/codecs/amrwb/enc/inc/dtx.h b/media/module/codecs/amrwb/enc/inc/dtx.h similarity index 100% rename from media/codecs/amrwb/enc/inc/dtx.h rename to media/module/codecs/amrwb/enc/inc/dtx.h diff --git a/media/codecs/amrwb/enc/inc/grid100.tab b/media/module/codecs/amrwb/enc/inc/grid100.tab similarity index 100% rename from media/codecs/amrwb/enc/inc/grid100.tab rename to media/module/codecs/amrwb/enc/inc/grid100.tab diff --git a/media/codecs/amrwb/enc/inc/ham_wind.tab b/media/module/codecs/amrwb/enc/inc/ham_wind.tab similarity index 100% rename from media/codecs/amrwb/enc/inc/ham_wind.tab rename to media/module/codecs/amrwb/enc/inc/ham_wind.tab diff --git a/media/codecs/amrwb/enc/inc/homing.tab b/media/module/codecs/amrwb/enc/inc/homing.tab similarity index 100% rename from media/codecs/amrwb/enc/inc/homing.tab rename to media/module/codecs/amrwb/enc/inc/homing.tab diff --git a/media/codecs/amrwb/enc/inc/isp_isf.tab b/media/module/codecs/amrwb/enc/inc/isp_isf.tab similarity index 100% rename from media/codecs/amrwb/enc/inc/isp_isf.tab rename to media/module/codecs/amrwb/enc/inc/isp_isf.tab diff --git a/media/codecs/amrwb/enc/inc/lag_wind.tab b/media/module/codecs/amrwb/enc/inc/lag_wind.tab similarity index 100% rename from media/codecs/amrwb/enc/inc/lag_wind.tab rename to media/module/codecs/amrwb/enc/inc/lag_wind.tab diff --git a/media/codecs/amrwb/enc/inc/log2.h b/media/module/codecs/amrwb/enc/inc/log2.h similarity index 100% rename from media/codecs/amrwb/enc/inc/log2.h rename to media/module/codecs/amrwb/enc/inc/log2.h diff --git a/media/codecs/amrwb/enc/inc/log2_tab.h b/media/module/codecs/amrwb/enc/inc/log2_tab.h similarity index 100% rename from media/codecs/amrwb/enc/inc/log2_tab.h rename to media/module/codecs/amrwb/enc/inc/log2_tab.h diff --git a/media/codecs/amrwb/enc/inc/main.h b/media/module/codecs/amrwb/enc/inc/main.h similarity index 100% rename from media/codecs/amrwb/enc/inc/main.h rename to media/module/codecs/amrwb/enc/inc/main.h diff --git a/media/codecs/amrwb/enc/inc/math_op.h b/media/module/codecs/amrwb/enc/inc/math_op.h similarity index 100% rename from media/codecs/amrwb/enc/inc/math_op.h rename to media/module/codecs/amrwb/enc/inc/math_op.h diff --git a/media/codecs/amrwb/enc/inc/mem_align.h b/media/module/codecs/amrwb/enc/inc/mem_align.h similarity index 100% rename from media/codecs/amrwb/enc/inc/mem_align.h rename to media/module/codecs/amrwb/enc/inc/mem_align.h diff --git a/media/codecs/amrwb/enc/inc/mime_io.tab b/media/module/codecs/amrwb/enc/inc/mime_io.tab similarity index 100% rename from media/codecs/amrwb/enc/inc/mime_io.tab rename to media/module/codecs/amrwb/enc/inc/mime_io.tab diff --git a/media/codecs/amrwb/enc/inc/oper_32b.h b/media/module/codecs/amrwb/enc/inc/oper_32b.h similarity index 100% rename from media/codecs/amrwb/enc/inc/oper_32b.h rename to media/module/codecs/amrwb/enc/inc/oper_32b.h diff --git a/media/codecs/amrwb/enc/inc/p_med_o.h b/media/module/codecs/amrwb/enc/inc/p_med_o.h similarity index 100% rename from media/codecs/amrwb/enc/inc/p_med_o.h rename to media/module/codecs/amrwb/enc/inc/p_med_o.h diff --git a/media/codecs/amrwb/enc/inc/p_med_ol.tab b/media/module/codecs/amrwb/enc/inc/p_med_ol.tab similarity index 100% rename from media/codecs/amrwb/enc/inc/p_med_ol.tab rename to media/module/codecs/amrwb/enc/inc/p_med_ol.tab diff --git a/media/codecs/amrwb/enc/inc/q_gain2.tab b/media/module/codecs/amrwb/enc/inc/q_gain2.tab similarity index 100% rename from media/codecs/amrwb/enc/inc/q_gain2.tab rename to media/module/codecs/amrwb/enc/inc/q_gain2.tab diff --git a/media/codecs/amrwb/enc/inc/q_pulse.h b/media/module/codecs/amrwb/enc/inc/q_pulse.h similarity index 100% rename from media/codecs/amrwb/enc/inc/q_pulse.h rename to media/module/codecs/amrwb/enc/inc/q_pulse.h diff --git a/media/codecs/amrwb/enc/inc/qisf_ns.tab b/media/module/codecs/amrwb/enc/inc/qisf_ns.tab similarity index 100% rename from media/codecs/amrwb/enc/inc/qisf_ns.tab rename to media/module/codecs/amrwb/enc/inc/qisf_ns.tab diff --git a/media/codecs/amrwb/enc/inc/qpisf_2s.tab b/media/module/codecs/amrwb/enc/inc/qpisf_2s.tab similarity index 100% rename from media/codecs/amrwb/enc/inc/qpisf_2s.tab rename to media/module/codecs/amrwb/enc/inc/qpisf_2s.tab diff --git a/media/codecs/amrwb/enc/inc/stream.h b/media/module/codecs/amrwb/enc/inc/stream.h similarity index 100% rename from media/codecs/amrwb/enc/inc/stream.h rename to media/module/codecs/amrwb/enc/inc/stream.h diff --git a/media/codecs/amrwb/enc/inc/typedef.h b/media/module/codecs/amrwb/enc/inc/typedef.h similarity index 100% rename from media/codecs/amrwb/enc/inc/typedef.h rename to media/module/codecs/amrwb/enc/inc/typedef.h diff --git a/media/codecs/amrwb/enc/inc/typedefs.h b/media/module/codecs/amrwb/enc/inc/typedefs.h similarity index 100% rename from media/codecs/amrwb/enc/inc/typedefs.h rename to media/module/codecs/amrwb/enc/inc/typedefs.h diff --git a/media/codecs/amrwb/enc/inc/wb_vad.h b/media/module/codecs/amrwb/enc/inc/wb_vad.h similarity index 100% rename from media/codecs/amrwb/enc/inc/wb_vad.h rename to media/module/codecs/amrwb/enc/inc/wb_vad.h diff --git a/media/codecs/amrwb/enc/inc/wb_vad_c.h b/media/module/codecs/amrwb/enc/inc/wb_vad_c.h similarity index 100% rename from media/codecs/amrwb/enc/inc/wb_vad_c.h rename to media/module/codecs/amrwb/enc/inc/wb_vad_c.h diff --git a/media/codecs/amrwb/enc/patent_disclaimer.txt b/media/module/codecs/amrwb/enc/patent_disclaimer.txt similarity index 100% rename from media/codecs/amrwb/enc/patent_disclaimer.txt rename to media/module/codecs/amrwb/enc/patent_disclaimer.txt diff --git a/media/codecs/amrwb/enc/src/asm/ARMV5E/Deemph_32_opt.s b/media/module/codecs/amrwb/enc/src/asm/ARMV5E/Deemph_32_opt.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV5E/Deemph_32_opt.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV5E/Deemph_32_opt.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV5E/Dot_p_opt.s b/media/module/codecs/amrwb/enc/src/asm/ARMV5E/Dot_p_opt.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV5E/Dot_p_opt.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV5E/Dot_p_opt.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV5E/Filt_6k_7k_opt.s b/media/module/codecs/amrwb/enc/src/asm/ARMV5E/Filt_6k_7k_opt.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV5E/Filt_6k_7k_opt.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV5E/Filt_6k_7k_opt.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV5E/Norm_Corr_opt.s b/media/module/codecs/amrwb/enc/src/asm/ARMV5E/Norm_Corr_opt.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV5E/Norm_Corr_opt.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV5E/Norm_Corr_opt.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV5E/Syn_filt_32_opt.s b/media/module/codecs/amrwb/enc/src/asm/ARMV5E/Syn_filt_32_opt.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV5E/Syn_filt_32_opt.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV5E/Syn_filt_32_opt.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV5E/convolve_opt.s b/media/module/codecs/amrwb/enc/src/asm/ARMV5E/convolve_opt.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV5E/convolve_opt.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV5E/convolve_opt.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV5E/cor_h_vec_opt.s b/media/module/codecs/amrwb/enc/src/asm/ARMV5E/cor_h_vec_opt.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV5E/cor_h_vec_opt.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV5E/cor_h_vec_opt.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV5E/pred_lt4_1_opt.s b/media/module/codecs/amrwb/enc/src/asm/ARMV5E/pred_lt4_1_opt.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV5E/pred_lt4_1_opt.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV5E/pred_lt4_1_opt.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV5E/residu_asm_opt.s b/media/module/codecs/amrwb/enc/src/asm/ARMV5E/residu_asm_opt.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV5E/residu_asm_opt.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV5E/residu_asm_opt.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV5E/scale_sig_opt.s b/media/module/codecs/amrwb/enc/src/asm/ARMV5E/scale_sig_opt.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV5E/scale_sig_opt.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV5E/scale_sig_opt.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV5E/syn_filt_opt.s b/media/module/codecs/amrwb/enc/src/asm/ARMV5E/syn_filt_opt.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV5E/syn_filt_opt.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV5E/syn_filt_opt.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV7/Deemph_32_neon.s b/media/module/codecs/amrwb/enc/src/asm/ARMV7/Deemph_32_neon.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV7/Deemph_32_neon.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV7/Deemph_32_neon.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV7/Dot_p_neon.s b/media/module/codecs/amrwb/enc/src/asm/ARMV7/Dot_p_neon.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV7/Dot_p_neon.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV7/Dot_p_neon.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV7/Filt_6k_7k_neon.s b/media/module/codecs/amrwb/enc/src/asm/ARMV7/Filt_6k_7k_neon.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV7/Filt_6k_7k_neon.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV7/Filt_6k_7k_neon.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV7/Norm_Corr_neon.s b/media/module/codecs/amrwb/enc/src/asm/ARMV7/Norm_Corr_neon.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV7/Norm_Corr_neon.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV7/Norm_Corr_neon.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV7/Syn_filt_32_neon.s b/media/module/codecs/amrwb/enc/src/asm/ARMV7/Syn_filt_32_neon.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV7/Syn_filt_32_neon.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV7/Syn_filt_32_neon.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV7/convolve_neon.s b/media/module/codecs/amrwb/enc/src/asm/ARMV7/convolve_neon.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV7/convolve_neon.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV7/convolve_neon.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV7/cor_h_vec_neon.s b/media/module/codecs/amrwb/enc/src/asm/ARMV7/cor_h_vec_neon.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV7/cor_h_vec_neon.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV7/cor_h_vec_neon.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV7/pred_lt4_1_neon.s b/media/module/codecs/amrwb/enc/src/asm/ARMV7/pred_lt4_1_neon.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV7/pred_lt4_1_neon.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV7/pred_lt4_1_neon.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV7/residu_asm_neon.s b/media/module/codecs/amrwb/enc/src/asm/ARMV7/residu_asm_neon.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV7/residu_asm_neon.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV7/residu_asm_neon.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV7/scale_sig_neon.s b/media/module/codecs/amrwb/enc/src/asm/ARMV7/scale_sig_neon.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV7/scale_sig_neon.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV7/scale_sig_neon.s diff --git a/media/codecs/amrwb/enc/src/asm/ARMV7/syn_filt_neon.s b/media/module/codecs/amrwb/enc/src/asm/ARMV7/syn_filt_neon.s similarity index 100% rename from media/codecs/amrwb/enc/src/asm/ARMV7/syn_filt_neon.s rename to media/module/codecs/amrwb/enc/src/asm/ARMV7/syn_filt_neon.s diff --git a/media/codecs/amrwb/enc/src/autocorr.c b/media/module/codecs/amrwb/enc/src/autocorr.c similarity index 100% rename from media/codecs/amrwb/enc/src/autocorr.c rename to media/module/codecs/amrwb/enc/src/autocorr.c diff --git a/media/codecs/amrwb/enc/src/az_isp.c b/media/module/codecs/amrwb/enc/src/az_isp.c similarity index 100% rename from media/codecs/amrwb/enc/src/az_isp.c rename to media/module/codecs/amrwb/enc/src/az_isp.c diff --git a/media/codecs/amrwb/enc/src/bits.c b/media/module/codecs/amrwb/enc/src/bits.c similarity index 100% rename from media/codecs/amrwb/enc/src/bits.c rename to media/module/codecs/amrwb/enc/src/bits.c diff --git a/media/codecs/amrwb/enc/src/c2t64fx.c b/media/module/codecs/amrwb/enc/src/c2t64fx.c similarity index 100% rename from media/codecs/amrwb/enc/src/c2t64fx.c rename to media/module/codecs/amrwb/enc/src/c2t64fx.c diff --git a/media/codecs/amrwb/enc/src/c4t64fx.c b/media/module/codecs/amrwb/enc/src/c4t64fx.c similarity index 100% rename from media/codecs/amrwb/enc/src/c4t64fx.c rename to media/module/codecs/amrwb/enc/src/c4t64fx.c diff --git a/media/codecs/amrwb/enc/src/convolve.c b/media/module/codecs/amrwb/enc/src/convolve.c similarity index 100% rename from media/codecs/amrwb/enc/src/convolve.c rename to media/module/codecs/amrwb/enc/src/convolve.c diff --git a/media/codecs/amrwb/enc/src/cor_h_x.c b/media/module/codecs/amrwb/enc/src/cor_h_x.c similarity index 100% rename from media/codecs/amrwb/enc/src/cor_h_x.c rename to media/module/codecs/amrwb/enc/src/cor_h_x.c diff --git a/media/codecs/amrwb/enc/src/decim54.c b/media/module/codecs/amrwb/enc/src/decim54.c similarity index 100% rename from media/codecs/amrwb/enc/src/decim54.c rename to media/module/codecs/amrwb/enc/src/decim54.c diff --git a/media/codecs/amrwb/enc/src/deemph.c b/media/module/codecs/amrwb/enc/src/deemph.c similarity index 100% rename from media/codecs/amrwb/enc/src/deemph.c rename to media/module/codecs/amrwb/enc/src/deemph.c diff --git a/media/codecs/amrwb/enc/src/dtx.c b/media/module/codecs/amrwb/enc/src/dtx.c similarity index 100% rename from media/codecs/amrwb/enc/src/dtx.c rename to media/module/codecs/amrwb/enc/src/dtx.c diff --git a/media/codecs/amrwb/enc/src/g_pitch.c b/media/module/codecs/amrwb/enc/src/g_pitch.c similarity index 100% rename from media/codecs/amrwb/enc/src/g_pitch.c rename to media/module/codecs/amrwb/enc/src/g_pitch.c diff --git a/media/codecs/amrwb/enc/src/gpclip.c b/media/module/codecs/amrwb/enc/src/gpclip.c similarity index 100% rename from media/codecs/amrwb/enc/src/gpclip.c rename to media/module/codecs/amrwb/enc/src/gpclip.c diff --git a/media/codecs/amrwb/enc/src/homing.c b/media/module/codecs/amrwb/enc/src/homing.c similarity index 100% rename from media/codecs/amrwb/enc/src/homing.c rename to media/module/codecs/amrwb/enc/src/homing.c diff --git a/media/codecs/amrwb/enc/src/hp400.c b/media/module/codecs/amrwb/enc/src/hp400.c similarity index 100% rename from media/codecs/amrwb/enc/src/hp400.c rename to media/module/codecs/amrwb/enc/src/hp400.c diff --git a/media/codecs/amrwb/enc/src/hp50.c b/media/module/codecs/amrwb/enc/src/hp50.c similarity index 100% rename from media/codecs/amrwb/enc/src/hp50.c rename to media/module/codecs/amrwb/enc/src/hp50.c diff --git a/media/codecs/amrwb/enc/src/hp6k.c b/media/module/codecs/amrwb/enc/src/hp6k.c similarity index 100% rename from media/codecs/amrwb/enc/src/hp6k.c rename to media/module/codecs/amrwb/enc/src/hp6k.c diff --git a/media/codecs/amrwb/enc/src/hp_wsp.c b/media/module/codecs/amrwb/enc/src/hp_wsp.c similarity index 100% rename from media/codecs/amrwb/enc/src/hp_wsp.c rename to media/module/codecs/amrwb/enc/src/hp_wsp.c diff --git a/media/codecs/amrwb/enc/src/int_lpc.c b/media/module/codecs/amrwb/enc/src/int_lpc.c similarity index 100% rename from media/codecs/amrwb/enc/src/int_lpc.c rename to media/module/codecs/amrwb/enc/src/int_lpc.c diff --git a/media/codecs/amrwb/enc/src/isp_az.c b/media/module/codecs/amrwb/enc/src/isp_az.c similarity index 100% rename from media/codecs/amrwb/enc/src/isp_az.c rename to media/module/codecs/amrwb/enc/src/isp_az.c diff --git a/media/codecs/amrwb/enc/src/isp_isf.c b/media/module/codecs/amrwb/enc/src/isp_isf.c similarity index 100% rename from media/codecs/amrwb/enc/src/isp_isf.c rename to media/module/codecs/amrwb/enc/src/isp_isf.c diff --git a/media/codecs/amrwb/enc/src/lag_wind.c b/media/module/codecs/amrwb/enc/src/lag_wind.c similarity index 100% rename from media/codecs/amrwb/enc/src/lag_wind.c rename to media/module/codecs/amrwb/enc/src/lag_wind.c diff --git a/media/codecs/amrwb/enc/src/levinson.c b/media/module/codecs/amrwb/enc/src/levinson.c similarity index 100% rename from media/codecs/amrwb/enc/src/levinson.c rename to media/module/codecs/amrwb/enc/src/levinson.c diff --git a/media/codecs/amrwb/enc/src/log2.c b/media/module/codecs/amrwb/enc/src/log2.c similarity index 100% rename from media/codecs/amrwb/enc/src/log2.c rename to media/module/codecs/amrwb/enc/src/log2.c diff --git a/media/codecs/amrwb/enc/src/lp_dec2.c b/media/module/codecs/amrwb/enc/src/lp_dec2.c similarity index 100% rename from media/codecs/amrwb/enc/src/lp_dec2.c rename to media/module/codecs/amrwb/enc/src/lp_dec2.c diff --git a/media/codecs/amrwb/enc/src/math_op.c b/media/module/codecs/amrwb/enc/src/math_op.c similarity index 100% rename from media/codecs/amrwb/enc/src/math_op.c rename to media/module/codecs/amrwb/enc/src/math_op.c diff --git a/media/codecs/amrwb/enc/src/mem_align.c b/media/module/codecs/amrwb/enc/src/mem_align.c similarity index 100% rename from media/codecs/amrwb/enc/src/mem_align.c rename to media/module/codecs/amrwb/enc/src/mem_align.c diff --git a/media/codecs/amrwb/enc/src/oper_32b.c b/media/module/codecs/amrwb/enc/src/oper_32b.c similarity index 100% rename from media/codecs/amrwb/enc/src/oper_32b.c rename to media/module/codecs/amrwb/enc/src/oper_32b.c diff --git a/media/codecs/amrwb/enc/src/p_med_ol.c b/media/module/codecs/amrwb/enc/src/p_med_ol.c similarity index 100% rename from media/codecs/amrwb/enc/src/p_med_ol.c rename to media/module/codecs/amrwb/enc/src/p_med_ol.c diff --git a/media/codecs/amrwb/enc/src/pit_shrp.c b/media/module/codecs/amrwb/enc/src/pit_shrp.c similarity index 100% rename from media/codecs/amrwb/enc/src/pit_shrp.c rename to media/module/codecs/amrwb/enc/src/pit_shrp.c diff --git a/media/codecs/amrwb/enc/src/pitch_f4.c b/media/module/codecs/amrwb/enc/src/pitch_f4.c similarity index 100% rename from media/codecs/amrwb/enc/src/pitch_f4.c rename to media/module/codecs/amrwb/enc/src/pitch_f4.c diff --git a/media/codecs/amrwb/enc/src/pred_lt4.c b/media/module/codecs/amrwb/enc/src/pred_lt4.c similarity index 100% rename from media/codecs/amrwb/enc/src/pred_lt4.c rename to media/module/codecs/amrwb/enc/src/pred_lt4.c diff --git a/media/codecs/amrwb/enc/src/preemph.c b/media/module/codecs/amrwb/enc/src/preemph.c similarity index 100% rename from media/codecs/amrwb/enc/src/preemph.c rename to media/module/codecs/amrwb/enc/src/preemph.c diff --git a/media/codecs/amrwb/enc/src/q_gain2.c b/media/module/codecs/amrwb/enc/src/q_gain2.c similarity index 100% rename from media/codecs/amrwb/enc/src/q_gain2.c rename to media/module/codecs/amrwb/enc/src/q_gain2.c diff --git a/media/codecs/amrwb/enc/src/q_pulse.c b/media/module/codecs/amrwb/enc/src/q_pulse.c similarity index 100% rename from media/codecs/amrwb/enc/src/q_pulse.c rename to media/module/codecs/amrwb/enc/src/q_pulse.c diff --git a/media/codecs/amrwb/enc/src/qisf_ns.c b/media/module/codecs/amrwb/enc/src/qisf_ns.c similarity index 100% rename from media/codecs/amrwb/enc/src/qisf_ns.c rename to media/module/codecs/amrwb/enc/src/qisf_ns.c diff --git a/media/codecs/amrwb/enc/src/qpisf_2s.c b/media/module/codecs/amrwb/enc/src/qpisf_2s.c similarity index 100% rename from media/codecs/amrwb/enc/src/qpisf_2s.c rename to media/module/codecs/amrwb/enc/src/qpisf_2s.c diff --git a/media/codecs/amrwb/enc/src/random.c b/media/module/codecs/amrwb/enc/src/random.c similarity index 100% rename from media/codecs/amrwb/enc/src/random.c rename to media/module/codecs/amrwb/enc/src/random.c diff --git a/media/codecs/amrwb/enc/src/residu.c b/media/module/codecs/amrwb/enc/src/residu.c similarity index 100% rename from media/codecs/amrwb/enc/src/residu.c rename to media/module/codecs/amrwb/enc/src/residu.c diff --git a/media/codecs/amrwb/enc/src/scale.c b/media/module/codecs/amrwb/enc/src/scale.c similarity index 100% rename from media/codecs/amrwb/enc/src/scale.c rename to media/module/codecs/amrwb/enc/src/scale.c diff --git a/media/codecs/amrwb/enc/src/stream.c b/media/module/codecs/amrwb/enc/src/stream.c similarity index 100% rename from media/codecs/amrwb/enc/src/stream.c rename to media/module/codecs/amrwb/enc/src/stream.c diff --git a/media/codecs/amrwb/enc/src/syn_filt.c b/media/module/codecs/amrwb/enc/src/syn_filt.c similarity index 100% rename from media/codecs/amrwb/enc/src/syn_filt.c rename to media/module/codecs/amrwb/enc/src/syn_filt.c diff --git a/media/codecs/amrwb/enc/src/updt_tar.c b/media/module/codecs/amrwb/enc/src/updt_tar.c similarity index 100% rename from media/codecs/amrwb/enc/src/updt_tar.c rename to media/module/codecs/amrwb/enc/src/updt_tar.c diff --git a/media/codecs/amrwb/enc/src/util.c b/media/module/codecs/amrwb/enc/src/util.c similarity index 100% rename from media/codecs/amrwb/enc/src/util.c rename to media/module/codecs/amrwb/enc/src/util.c diff --git a/media/codecs/amrwb/enc/src/voAMRWBEnc.c b/media/module/codecs/amrwb/enc/src/voAMRWBEnc.c similarity index 100% rename from media/codecs/amrwb/enc/src/voAMRWBEnc.c rename to media/module/codecs/amrwb/enc/src/voAMRWBEnc.c diff --git a/media/codecs/amrwb/enc/src/voicefac.c b/media/module/codecs/amrwb/enc/src/voicefac.c similarity index 100% rename from media/codecs/amrwb/enc/src/voicefac.c rename to media/module/codecs/amrwb/enc/src/voicefac.c diff --git a/media/codecs/amrwb/enc/src/wb_vad.c b/media/module/codecs/amrwb/enc/src/wb_vad.c similarity index 100% rename from media/codecs/amrwb/enc/src/wb_vad.c rename to media/module/codecs/amrwb/enc/src/wb_vad.c diff --git a/media/codecs/amrwb/enc/src/weight_a.c b/media/module/codecs/amrwb/enc/src/weight_a.c similarity index 100% rename from media/codecs/amrwb/enc/src/weight_a.c rename to media/module/codecs/amrwb/enc/src/weight_a.c diff --git a/media/codecs/amrwb/enc/test/AmrwbEncTestEnvironment.h b/media/module/codecs/amrwb/enc/test/AmrwbEncTestEnvironment.h similarity index 100% rename from media/codecs/amrwb/enc/test/AmrwbEncTestEnvironment.h rename to media/module/codecs/amrwb/enc/test/AmrwbEncTestEnvironment.h diff --git a/media/codecs/amrwb/enc/test/AmrwbEncoderTest.cpp b/media/module/codecs/amrwb/enc/test/AmrwbEncoderTest.cpp similarity index 100% rename from media/codecs/amrwb/enc/test/AmrwbEncoderTest.cpp rename to media/module/codecs/amrwb/enc/test/AmrwbEncoderTest.cpp diff --git a/media/codecs/amrwb/enc/test/Android.bp b/media/module/codecs/amrwb/enc/test/Android.bp similarity index 100% rename from media/codecs/amrwb/enc/test/Android.bp rename to media/module/codecs/amrwb/enc/test/Android.bp diff --git a/media/codecs/amrwb/enc/test/AndroidTest.xml b/media/module/codecs/amrwb/enc/test/AndroidTest.xml similarity index 100% rename from media/codecs/amrwb/enc/test/AndroidTest.xml rename to media/module/codecs/amrwb/enc/test/AndroidTest.xml diff --git a/media/codecs/amrwb/enc/test/README.md b/media/module/codecs/amrwb/enc/test/README.md similarity index 100% rename from media/codecs/amrwb/enc/test/README.md rename to media/module/codecs/amrwb/enc/test/README.md diff --git a/media/libstagefright/codecs/common/Android.bp b/media/module/codecs/common/Android.bp similarity index 100% rename from media/libstagefright/codecs/common/Android.bp rename to media/module/codecs/common/Android.bp diff --git a/media/codecs/m4v_h263/dec/MODULE_LICENSE_APACHE2 b/media/module/codecs/common/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/codecs/m4v_h263/dec/MODULE_LICENSE_APACHE2 rename to media/module/codecs/common/MODULE_LICENSE_APACHE2 diff --git a/media/codecs/m4v_h263/dec/NOTICE b/media/module/codecs/common/NOTICE similarity index 100% rename from media/codecs/m4v_h263/dec/NOTICE rename to media/module/codecs/common/NOTICE diff --git a/media/libstagefright/codecs/common/cmnMemory.c b/media/module/codecs/common/cmnMemory.c similarity index 100% rename from media/libstagefright/codecs/common/cmnMemory.c rename to media/module/codecs/common/cmnMemory.c diff --git a/media/libstagefright/codecs/common/include/cmnMemory.h b/media/module/codecs/common/include/cmnMemory.h similarity index 100% rename from media/libstagefright/codecs/common/include/cmnMemory.h rename to media/module/codecs/common/include/cmnMemory.h diff --git a/media/libstagefright/codecs/common/include/voAAC.h b/media/module/codecs/common/include/voAAC.h similarity index 100% rename from media/libstagefright/codecs/common/include/voAAC.h rename to media/module/codecs/common/include/voAAC.h diff --git a/media/libstagefright/codecs/common/include/voAMRWB.h b/media/module/codecs/common/include/voAMRWB.h similarity index 100% rename from media/libstagefright/codecs/common/include/voAMRWB.h rename to media/module/codecs/common/include/voAMRWB.h diff --git a/media/libstagefright/codecs/common/include/voAudio.h b/media/module/codecs/common/include/voAudio.h similarity index 100% rename from media/libstagefright/codecs/common/include/voAudio.h rename to media/module/codecs/common/include/voAudio.h diff --git a/media/libstagefright/codecs/common/include/voIndex.h b/media/module/codecs/common/include/voIndex.h similarity index 100% rename from media/libstagefright/codecs/common/include/voIndex.h rename to media/module/codecs/common/include/voIndex.h diff --git a/media/libstagefright/codecs/common/include/voMem.h b/media/module/codecs/common/include/voMem.h similarity index 100% rename from media/libstagefright/codecs/common/include/voMem.h rename to media/module/codecs/common/include/voMem.h diff --git a/media/libstagefright/codecs/common/include/voType.h b/media/module/codecs/common/include/voType.h similarity index 100% rename from media/libstagefright/codecs/common/include/voType.h rename to media/module/codecs/common/include/voType.h diff --git a/media/codecs/g711/decoder/Android.bp b/media/module/codecs/g711/decoder/Android.bp similarity index 100% rename from media/codecs/g711/decoder/Android.bp rename to media/module/codecs/g711/decoder/Android.bp diff --git a/media/codecs/g711/decoder/g711Dec.h b/media/module/codecs/g711/decoder/g711Dec.h similarity index 100% rename from media/codecs/g711/decoder/g711Dec.h rename to media/module/codecs/g711/decoder/g711Dec.h diff --git a/media/codecs/g711/decoder/g711DecAlaw.cpp b/media/module/codecs/g711/decoder/g711DecAlaw.cpp similarity index 100% rename from media/codecs/g711/decoder/g711DecAlaw.cpp rename to media/module/codecs/g711/decoder/g711DecAlaw.cpp diff --git a/media/codecs/g711/decoder/g711DecMlaw.cpp b/media/module/codecs/g711/decoder/g711DecMlaw.cpp similarity index 100% rename from media/codecs/g711/decoder/g711DecMlaw.cpp rename to media/module/codecs/g711/decoder/g711DecMlaw.cpp diff --git a/media/codecs/g711/fuzzer/Android.bp b/media/module/codecs/g711/fuzzer/Android.bp similarity index 100% rename from media/codecs/g711/fuzzer/Android.bp rename to media/module/codecs/g711/fuzzer/Android.bp diff --git a/media/codecs/g711/fuzzer/README.md b/media/module/codecs/g711/fuzzer/README.md similarity index 100% rename from media/codecs/g711/fuzzer/README.md rename to media/module/codecs/g711/fuzzer/README.md diff --git a/media/codecs/g711/fuzzer/g711_dec_fuzzer.cpp b/media/module/codecs/g711/fuzzer/g711_dec_fuzzer.cpp similarity index 100% rename from media/codecs/g711/fuzzer/g711_dec_fuzzer.cpp rename to media/module/codecs/g711/fuzzer/g711_dec_fuzzer.cpp diff --git a/media/codecs/m4v_h263/TEST_MAPPING b/media/module/codecs/m4v_h263/TEST_MAPPING similarity index 100% rename from media/codecs/m4v_h263/TEST_MAPPING rename to media/module/codecs/m4v_h263/TEST_MAPPING diff --git a/media/codecs/m4v_h263/dec/Android.bp b/media/module/codecs/m4v_h263/dec/Android.bp similarity index 100% rename from media/codecs/m4v_h263/dec/Android.bp rename to media/module/codecs/m4v_h263/dec/Android.bp diff --git a/media/codecs/m4v_h263/enc/MODULE_LICENSE_APACHE2 b/media/module/codecs/m4v_h263/dec/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/codecs/m4v_h263/enc/MODULE_LICENSE_APACHE2 rename to media/module/codecs/m4v_h263/dec/MODULE_LICENSE_APACHE2 diff --git a/media/codecs/m4v_h263/enc/NOTICE b/media/module/codecs/m4v_h263/dec/NOTICE similarity index 100% rename from media/codecs/m4v_h263/enc/NOTICE rename to media/module/codecs/m4v_h263/dec/NOTICE diff --git a/media/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h b/media/module/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h similarity index 100% rename from media/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h rename to media/module/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h diff --git a/media/codecs/m4v_h263/dec/include/mp4dec_api.h b/media/module/codecs/m4v_h263/dec/include/mp4dec_api.h similarity index 100% rename from media/codecs/m4v_h263/dec/include/mp4dec_api.h rename to media/module/codecs/m4v_h263/dec/include/mp4dec_api.h diff --git a/media/codecs/m4v_h263/dec/include/visual_header.h b/media/module/codecs/m4v_h263/dec/include/visual_header.h similarity index 100% rename from media/codecs/m4v_h263/dec/include/visual_header.h rename to media/module/codecs/m4v_h263/dec/include/visual_header.h diff --git a/media/codecs/m4v_h263/dec/src/bitstream.cpp b/media/module/codecs/m4v_h263/dec/src/bitstream.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/bitstream.cpp rename to media/module/codecs/m4v_h263/dec/src/bitstream.cpp diff --git a/media/codecs/m4v_h263/dec/src/bitstream.h b/media/module/codecs/m4v_h263/dec/src/bitstream.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/bitstream.h rename to media/module/codecs/m4v_h263/dec/src/bitstream.h diff --git a/media/codecs/m4v_h263/dec/src/block_idct.cpp b/media/module/codecs/m4v_h263/dec/src/block_idct.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/block_idct.cpp rename to media/module/codecs/m4v_h263/dec/src/block_idct.cpp diff --git a/media/codecs/m4v_h263/dec/src/cal_dc_scaler.cpp b/media/module/codecs/m4v_h263/dec/src/cal_dc_scaler.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/cal_dc_scaler.cpp rename to media/module/codecs/m4v_h263/dec/src/cal_dc_scaler.cpp diff --git a/media/codecs/m4v_h263/dec/src/combined_decode.cpp b/media/module/codecs/m4v_h263/dec/src/combined_decode.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/combined_decode.cpp rename to media/module/codecs/m4v_h263/dec/src/combined_decode.cpp diff --git a/media/codecs/m4v_h263/dec/src/conceal.cpp b/media/module/codecs/m4v_h263/dec/src/conceal.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/conceal.cpp rename to media/module/codecs/m4v_h263/dec/src/conceal.cpp diff --git a/media/codecs/m4v_h263/dec/src/datapart_decode.cpp b/media/module/codecs/m4v_h263/dec/src/datapart_decode.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/datapart_decode.cpp rename to media/module/codecs/m4v_h263/dec/src/datapart_decode.cpp diff --git a/media/codecs/m4v_h263/dec/src/dcac_prediction.cpp b/media/module/codecs/m4v_h263/dec/src/dcac_prediction.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/dcac_prediction.cpp rename to media/module/codecs/m4v_h263/dec/src/dcac_prediction.cpp diff --git a/media/codecs/m4v_h263/dec/src/dec_pred_intra_dc.cpp b/media/module/codecs/m4v_h263/dec/src/dec_pred_intra_dc.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/dec_pred_intra_dc.cpp rename to media/module/codecs/m4v_h263/dec/src/dec_pred_intra_dc.cpp diff --git a/media/codecs/m4v_h263/dec/src/get_pred_adv_b_add.cpp b/media/module/codecs/m4v_h263/dec/src/get_pred_adv_b_add.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/get_pred_adv_b_add.cpp rename to media/module/codecs/m4v_h263/dec/src/get_pred_adv_b_add.cpp diff --git a/media/codecs/m4v_h263/dec/src/get_pred_outside.cpp b/media/module/codecs/m4v_h263/dec/src/get_pred_outside.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/get_pred_outside.cpp rename to media/module/codecs/m4v_h263/dec/src/get_pred_outside.cpp diff --git a/media/codecs/m4v_h263/dec/src/idct.cpp b/media/module/codecs/m4v_h263/dec/src/idct.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/idct.cpp rename to media/module/codecs/m4v_h263/dec/src/idct.cpp diff --git a/media/codecs/m4v_h263/dec/src/idct.h b/media/module/codecs/m4v_h263/dec/src/idct.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/idct.h rename to media/module/codecs/m4v_h263/dec/src/idct.h diff --git a/media/codecs/m4v_h263/dec/src/idct_vca.cpp b/media/module/codecs/m4v_h263/dec/src/idct_vca.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/idct_vca.cpp rename to media/module/codecs/m4v_h263/dec/src/idct_vca.cpp diff --git a/media/codecs/m4v_h263/dec/src/max_level.h b/media/module/codecs/m4v_h263/dec/src/max_level.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/max_level.h rename to media/module/codecs/m4v_h263/dec/src/max_level.h diff --git a/media/codecs/m4v_h263/dec/src/mb_motion_comp.cpp b/media/module/codecs/m4v_h263/dec/src/mb_motion_comp.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/mb_motion_comp.cpp rename to media/module/codecs/m4v_h263/dec/src/mb_motion_comp.cpp diff --git a/media/codecs/m4v_h263/dec/src/mb_utils.cpp b/media/module/codecs/m4v_h263/dec/src/mb_utils.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/mb_utils.cpp rename to media/module/codecs/m4v_h263/dec/src/mb_utils.cpp diff --git a/media/codecs/m4v_h263/dec/src/mbtype_mode.h b/media/module/codecs/m4v_h263/dec/src/mbtype_mode.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/mbtype_mode.h rename to media/module/codecs/m4v_h263/dec/src/mbtype_mode.h diff --git a/media/codecs/m4v_h263/dec/src/motion_comp.h b/media/module/codecs/m4v_h263/dec/src/motion_comp.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/motion_comp.h rename to media/module/codecs/m4v_h263/dec/src/motion_comp.h diff --git a/media/codecs/m4v_h263/dec/src/mp4dec_lib.h b/media/module/codecs/m4v_h263/dec/src/mp4dec_lib.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/mp4dec_lib.h rename to media/module/codecs/m4v_h263/dec/src/mp4dec_lib.h diff --git a/media/codecs/m4v_h263/dec/src/mp4def.h b/media/module/codecs/m4v_h263/dec/src/mp4def.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/mp4def.h rename to media/module/codecs/m4v_h263/dec/src/mp4def.h diff --git a/media/codecs/m4v_h263/dec/src/mp4lib_int.h b/media/module/codecs/m4v_h263/dec/src/mp4lib_int.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/mp4lib_int.h rename to media/module/codecs/m4v_h263/dec/src/mp4lib_int.h diff --git a/media/codecs/m4v_h263/dec/src/packet_util.cpp b/media/module/codecs/m4v_h263/dec/src/packet_util.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/packet_util.cpp rename to media/module/codecs/m4v_h263/dec/src/packet_util.cpp diff --git a/media/codecs/m4v_h263/dec/src/post_filter.cpp b/media/module/codecs/m4v_h263/dec/src/post_filter.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/post_filter.cpp rename to media/module/codecs/m4v_h263/dec/src/post_filter.cpp diff --git a/media/codecs/m4v_h263/dec/src/post_proc.h b/media/module/codecs/m4v_h263/dec/src/post_proc.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/post_proc.h rename to media/module/codecs/m4v_h263/dec/src/post_proc.h diff --git a/media/codecs/m4v_h263/dec/src/pvdec_api.cpp b/media/module/codecs/m4v_h263/dec/src/pvdec_api.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/pvdec_api.cpp rename to media/module/codecs/m4v_h263/dec/src/pvdec_api.cpp diff --git a/media/codecs/m4v_h263/dec/src/scaling.h b/media/module/codecs/m4v_h263/dec/src/scaling.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/scaling.h rename to media/module/codecs/m4v_h263/dec/src/scaling.h diff --git a/media/codecs/m4v_h263/dec/src/scaling_tab.cpp b/media/module/codecs/m4v_h263/dec/src/scaling_tab.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/scaling_tab.cpp rename to media/module/codecs/m4v_h263/dec/src/scaling_tab.cpp diff --git a/media/codecs/m4v_h263/dec/src/vlc_dec_tab.h b/media/module/codecs/m4v_h263/dec/src/vlc_dec_tab.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/vlc_dec_tab.h rename to media/module/codecs/m4v_h263/dec/src/vlc_dec_tab.h diff --git a/media/codecs/m4v_h263/dec/src/vlc_decode.cpp b/media/module/codecs/m4v_h263/dec/src/vlc_decode.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/vlc_decode.cpp rename to media/module/codecs/m4v_h263/dec/src/vlc_decode.cpp diff --git a/media/codecs/m4v_h263/dec/src/vlc_decode.h b/media/module/codecs/m4v_h263/dec/src/vlc_decode.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/vlc_decode.h rename to media/module/codecs/m4v_h263/dec/src/vlc_decode.h diff --git a/media/codecs/m4v_h263/dec/src/vlc_dequant.cpp b/media/module/codecs/m4v_h263/dec/src/vlc_dequant.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/vlc_dequant.cpp rename to media/module/codecs/m4v_h263/dec/src/vlc_dequant.cpp diff --git a/media/codecs/m4v_h263/dec/src/vlc_tab.cpp b/media/module/codecs/m4v_h263/dec/src/vlc_tab.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/vlc_tab.cpp rename to media/module/codecs/m4v_h263/dec/src/vlc_tab.cpp diff --git a/media/codecs/m4v_h263/dec/src/vop.cpp b/media/module/codecs/m4v_h263/dec/src/vop.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/vop.cpp rename to media/module/codecs/m4v_h263/dec/src/vop.cpp diff --git a/media/codecs/m4v_h263/dec/src/zigzag.h b/media/module/codecs/m4v_h263/dec/src/zigzag.h similarity index 100% rename from media/codecs/m4v_h263/dec/src/zigzag.h rename to media/module/codecs/m4v_h263/dec/src/zigzag.h diff --git a/media/codecs/m4v_h263/dec/src/zigzag_tab.cpp b/media/module/codecs/m4v_h263/dec/src/zigzag_tab.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/src/zigzag_tab.cpp rename to media/module/codecs/m4v_h263/dec/src/zigzag_tab.cpp diff --git a/media/codecs/m4v_h263/dec/test/Android.bp b/media/module/codecs/m4v_h263/dec/test/Android.bp similarity index 100% rename from media/codecs/m4v_h263/dec/test/Android.bp rename to media/module/codecs/m4v_h263/dec/test/Android.bp diff --git a/media/codecs/m4v_h263/dec/test/AndroidTest.xml b/media/module/codecs/m4v_h263/dec/test/AndroidTest.xml similarity index 100% rename from media/codecs/m4v_h263/dec/test/AndroidTest.xml rename to media/module/codecs/m4v_h263/dec/test/AndroidTest.xml diff --git a/media/codecs/m4v_h263/dec/test/Mpeg4H263DecoderTest.cpp b/media/module/codecs/m4v_h263/dec/test/Mpeg4H263DecoderTest.cpp similarity index 100% rename from media/codecs/m4v_h263/dec/test/Mpeg4H263DecoderTest.cpp rename to media/module/codecs/m4v_h263/dec/test/Mpeg4H263DecoderTest.cpp diff --git a/media/codecs/m4v_h263/dec/test/Mpeg4H263DecoderTestEnvironment.h b/media/module/codecs/m4v_h263/dec/test/Mpeg4H263DecoderTestEnvironment.h similarity index 100% rename from media/codecs/m4v_h263/dec/test/Mpeg4H263DecoderTestEnvironment.h rename to media/module/codecs/m4v_h263/dec/test/Mpeg4H263DecoderTestEnvironment.h diff --git a/media/codecs/m4v_h263/dec/test/README.md b/media/module/codecs/m4v_h263/dec/test/README.md similarity index 100% rename from media/codecs/m4v_h263/dec/test/README.md rename to media/module/codecs/m4v_h263/dec/test/README.md diff --git a/media/codecs/m4v_h263/enc/Android.bp b/media/module/codecs/m4v_h263/enc/Android.bp similarity index 100% rename from media/codecs/m4v_h263/enc/Android.bp rename to media/module/codecs/m4v_h263/enc/Android.bp diff --git a/media/codecs/mp3dec/MODULE_LICENSE_APACHE2 b/media/module/codecs/m4v_h263/enc/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/codecs/mp3dec/MODULE_LICENSE_APACHE2 rename to media/module/codecs/m4v_h263/enc/MODULE_LICENSE_APACHE2 diff --git a/media/codecs/mp3dec/NOTICE b/media/module/codecs/m4v_h263/enc/NOTICE similarity index 100% rename from media/codecs/mp3dec/NOTICE rename to media/module/codecs/m4v_h263/enc/NOTICE diff --git a/media/codecs/m4v_h263/enc/include/cvei.h b/media/module/codecs/m4v_h263/enc/include/cvei.h similarity index 100% rename from media/codecs/m4v_h263/enc/include/cvei.h rename to media/module/codecs/m4v_h263/enc/include/cvei.h diff --git a/media/codecs/m4v_h263/enc/include/mp4enc_api.h b/media/module/codecs/m4v_h263/enc/include/mp4enc_api.h similarity index 100% rename from media/codecs/m4v_h263/enc/include/mp4enc_api.h rename to media/module/codecs/m4v_h263/enc/include/mp4enc_api.h diff --git a/media/codecs/m4v_h263/enc/src/bitstream_io.cpp b/media/module/codecs/m4v_h263/enc/src/bitstream_io.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/bitstream_io.cpp rename to media/module/codecs/m4v_h263/enc/src/bitstream_io.cpp diff --git a/media/codecs/m4v_h263/enc/src/bitstream_io.h b/media/module/codecs/m4v_h263/enc/src/bitstream_io.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/bitstream_io.h rename to media/module/codecs/m4v_h263/enc/src/bitstream_io.h diff --git a/media/codecs/m4v_h263/enc/src/combined_encode.cpp b/media/module/codecs/m4v_h263/enc/src/combined_encode.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/combined_encode.cpp rename to media/module/codecs/m4v_h263/enc/src/combined_encode.cpp diff --git a/media/codecs/m4v_h263/enc/src/datapart_encode.cpp b/media/module/codecs/m4v_h263/enc/src/datapart_encode.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/datapart_encode.cpp rename to media/module/codecs/m4v_h263/enc/src/datapart_encode.cpp diff --git a/media/codecs/m4v_h263/enc/src/dct.cpp b/media/module/codecs/m4v_h263/enc/src/dct.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/dct.cpp rename to media/module/codecs/m4v_h263/enc/src/dct.cpp diff --git a/media/codecs/m4v_h263/enc/src/dct.h b/media/module/codecs/m4v_h263/enc/src/dct.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/dct.h rename to media/module/codecs/m4v_h263/enc/src/dct.h diff --git a/media/codecs/m4v_h263/enc/src/dct_inline.h b/media/module/codecs/m4v_h263/enc/src/dct_inline.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/dct_inline.h rename to media/module/codecs/m4v_h263/enc/src/dct_inline.h diff --git a/media/codecs/m4v_h263/enc/src/fastcodemb.cpp b/media/module/codecs/m4v_h263/enc/src/fastcodemb.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/fastcodemb.cpp rename to media/module/codecs/m4v_h263/enc/src/fastcodemb.cpp diff --git a/media/codecs/m4v_h263/enc/src/fastcodemb.h b/media/module/codecs/m4v_h263/enc/src/fastcodemb.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/fastcodemb.h rename to media/module/codecs/m4v_h263/enc/src/fastcodemb.h diff --git a/media/codecs/m4v_h263/enc/src/fastidct.cpp b/media/module/codecs/m4v_h263/enc/src/fastidct.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/fastidct.cpp rename to media/module/codecs/m4v_h263/enc/src/fastidct.cpp diff --git a/media/codecs/m4v_h263/enc/src/fastquant.cpp b/media/module/codecs/m4v_h263/enc/src/fastquant.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/fastquant.cpp rename to media/module/codecs/m4v_h263/enc/src/fastquant.cpp diff --git a/media/codecs/m4v_h263/enc/src/fastquant_inline.h b/media/module/codecs/m4v_h263/enc/src/fastquant_inline.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/fastquant_inline.h rename to media/module/codecs/m4v_h263/enc/src/fastquant_inline.h diff --git a/media/codecs/m4v_h263/enc/src/findhalfpel.cpp b/media/module/codecs/m4v_h263/enc/src/findhalfpel.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/findhalfpel.cpp rename to media/module/codecs/m4v_h263/enc/src/findhalfpel.cpp diff --git a/media/codecs/m4v_h263/enc/src/m4venc_oscl.h b/media/module/codecs/m4v_h263/enc/src/m4venc_oscl.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/m4venc_oscl.h rename to media/module/codecs/m4v_h263/enc/src/m4venc_oscl.h diff --git a/media/codecs/m4v_h263/enc/src/me_utils.cpp b/media/module/codecs/m4v_h263/enc/src/me_utils.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/me_utils.cpp rename to media/module/codecs/m4v_h263/enc/src/me_utils.cpp diff --git a/media/codecs/m4v_h263/enc/src/motion_comp.cpp b/media/module/codecs/m4v_h263/enc/src/motion_comp.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/motion_comp.cpp rename to media/module/codecs/m4v_h263/enc/src/motion_comp.cpp diff --git a/media/codecs/m4v_h263/enc/src/motion_est.cpp b/media/module/codecs/m4v_h263/enc/src/motion_est.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/motion_est.cpp rename to media/module/codecs/m4v_h263/enc/src/motion_est.cpp diff --git a/media/codecs/m4v_h263/enc/src/mp4def.h b/media/module/codecs/m4v_h263/enc/src/mp4def.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/mp4def.h rename to media/module/codecs/m4v_h263/enc/src/mp4def.h diff --git a/media/codecs/m4v_h263/enc/src/mp4enc_api.cpp b/media/module/codecs/m4v_h263/enc/src/mp4enc_api.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/mp4enc_api.cpp rename to media/module/codecs/m4v_h263/enc/src/mp4enc_api.cpp diff --git a/media/codecs/m4v_h263/enc/src/mp4enc_lib.h b/media/module/codecs/m4v_h263/enc/src/mp4enc_lib.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/mp4enc_lib.h rename to media/module/codecs/m4v_h263/enc/src/mp4enc_lib.h diff --git a/media/codecs/m4v_h263/enc/src/mp4lib_int.h b/media/module/codecs/m4v_h263/enc/src/mp4lib_int.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/mp4lib_int.h rename to media/module/codecs/m4v_h263/enc/src/mp4lib_int.h diff --git a/media/codecs/m4v_h263/enc/src/rate_control.cpp b/media/module/codecs/m4v_h263/enc/src/rate_control.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/rate_control.cpp rename to media/module/codecs/m4v_h263/enc/src/rate_control.cpp diff --git a/media/codecs/m4v_h263/enc/src/rate_control.h b/media/module/codecs/m4v_h263/enc/src/rate_control.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/rate_control.h rename to media/module/codecs/m4v_h263/enc/src/rate_control.h diff --git a/media/codecs/m4v_h263/enc/src/sad.cpp b/media/module/codecs/m4v_h263/enc/src/sad.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/sad.cpp rename to media/module/codecs/m4v_h263/enc/src/sad.cpp diff --git a/media/codecs/m4v_h263/enc/src/sad_halfpel.cpp b/media/module/codecs/m4v_h263/enc/src/sad_halfpel.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/sad_halfpel.cpp rename to media/module/codecs/m4v_h263/enc/src/sad_halfpel.cpp diff --git a/media/codecs/m4v_h263/enc/src/sad_halfpel_inline.h b/media/module/codecs/m4v_h263/enc/src/sad_halfpel_inline.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/sad_halfpel_inline.h rename to media/module/codecs/m4v_h263/enc/src/sad_halfpel_inline.h diff --git a/media/codecs/m4v_h263/enc/src/sad_inline.h b/media/module/codecs/m4v_h263/enc/src/sad_inline.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/sad_inline.h rename to media/module/codecs/m4v_h263/enc/src/sad_inline.h diff --git a/media/codecs/m4v_h263/enc/src/sad_mb_offset.h b/media/module/codecs/m4v_h263/enc/src/sad_mb_offset.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/sad_mb_offset.h rename to media/module/codecs/m4v_h263/enc/src/sad_mb_offset.h diff --git a/media/codecs/m4v_h263/enc/src/vlc_enc_tab.h b/media/module/codecs/m4v_h263/enc/src/vlc_enc_tab.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/vlc_enc_tab.h rename to media/module/codecs/m4v_h263/enc/src/vlc_enc_tab.h diff --git a/media/codecs/m4v_h263/enc/src/vlc_encode.cpp b/media/module/codecs/m4v_h263/enc/src/vlc_encode.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/vlc_encode.cpp rename to media/module/codecs/m4v_h263/enc/src/vlc_encode.cpp diff --git a/media/codecs/m4v_h263/enc/src/vlc_encode.h b/media/module/codecs/m4v_h263/enc/src/vlc_encode.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/vlc_encode.h rename to media/module/codecs/m4v_h263/enc/src/vlc_encode.h diff --git a/media/codecs/m4v_h263/enc/src/vlc_encode_inline.h b/media/module/codecs/m4v_h263/enc/src/vlc_encode_inline.h similarity index 100% rename from media/codecs/m4v_h263/enc/src/vlc_encode_inline.h rename to media/module/codecs/m4v_h263/enc/src/vlc_encode_inline.h diff --git a/media/codecs/m4v_h263/enc/src/vop.cpp b/media/module/codecs/m4v_h263/enc/src/vop.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/src/vop.cpp rename to media/module/codecs/m4v_h263/enc/src/vop.cpp diff --git a/media/codecs/m4v_h263/enc/test/Android.bp b/media/module/codecs/m4v_h263/enc/test/Android.bp similarity index 100% rename from media/codecs/m4v_h263/enc/test/Android.bp rename to media/module/codecs/m4v_h263/enc/test/Android.bp diff --git a/media/codecs/m4v_h263/enc/test/AndroidTest.xml b/media/module/codecs/m4v_h263/enc/test/AndroidTest.xml similarity index 100% rename from media/codecs/m4v_h263/enc/test/AndroidTest.xml rename to media/module/codecs/m4v_h263/enc/test/AndroidTest.xml diff --git a/media/codecs/m4v_h263/enc/test/Mpeg4H263EncoderTest.cpp b/media/module/codecs/m4v_h263/enc/test/Mpeg4H263EncoderTest.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/test/Mpeg4H263EncoderTest.cpp rename to media/module/codecs/m4v_h263/enc/test/Mpeg4H263EncoderTest.cpp diff --git a/media/codecs/m4v_h263/enc/test/Mpeg4H263EncoderTestEnvironment.h b/media/module/codecs/m4v_h263/enc/test/Mpeg4H263EncoderTestEnvironment.h similarity index 100% rename from media/codecs/m4v_h263/enc/test/Mpeg4H263EncoderTestEnvironment.h rename to media/module/codecs/m4v_h263/enc/test/Mpeg4H263EncoderTestEnvironment.h diff --git a/media/codecs/m4v_h263/enc/test/README.md b/media/module/codecs/m4v_h263/enc/test/README.md similarity index 100% rename from media/codecs/m4v_h263/enc/test/README.md rename to media/module/codecs/m4v_h263/enc/test/README.md diff --git a/media/codecs/m4v_h263/enc/test/m4v_h263_enc_test.cpp b/media/module/codecs/m4v_h263/enc/test/m4v_h263_enc_test.cpp similarity index 100% rename from media/codecs/m4v_h263/enc/test/m4v_h263_enc_test.cpp rename to media/module/codecs/m4v_h263/enc/test/m4v_h263_enc_test.cpp diff --git a/media/codecs/m4v_h263/fuzzer/Android.bp b/media/module/codecs/m4v_h263/fuzzer/Android.bp similarity index 100% rename from media/codecs/m4v_h263/fuzzer/Android.bp rename to media/module/codecs/m4v_h263/fuzzer/Android.bp diff --git a/media/codecs/m4v_h263/fuzzer/README.md b/media/module/codecs/m4v_h263/fuzzer/README.md similarity index 100% rename from media/codecs/m4v_h263/fuzzer/README.md rename to media/module/codecs/m4v_h263/fuzzer/README.md diff --git a/media/codecs/m4v_h263/fuzzer/h263_dec_fuzzer.dict b/media/module/codecs/m4v_h263/fuzzer/h263_dec_fuzzer.dict similarity index 100% rename from media/codecs/m4v_h263/fuzzer/h263_dec_fuzzer.dict rename to media/module/codecs/m4v_h263/fuzzer/h263_dec_fuzzer.dict diff --git a/media/codecs/m4v_h263/fuzzer/mpeg4_dec_fuzzer.dict b/media/module/codecs/m4v_h263/fuzzer/mpeg4_dec_fuzzer.dict similarity index 100% rename from media/codecs/m4v_h263/fuzzer/mpeg4_dec_fuzzer.dict rename to media/module/codecs/m4v_h263/fuzzer/mpeg4_dec_fuzzer.dict diff --git a/media/codecs/m4v_h263/fuzzer/mpeg4_h263_dec_fuzzer.cpp b/media/module/codecs/m4v_h263/fuzzer/mpeg4_h263_dec_fuzzer.cpp similarity index 100% rename from media/codecs/m4v_h263/fuzzer/mpeg4_h263_dec_fuzzer.cpp rename to media/module/codecs/m4v_h263/fuzzer/mpeg4_h263_dec_fuzzer.cpp diff --git a/media/codecs/m4v_h263/fuzzer/mpeg4_h263_enc_fuzzer.cpp b/media/module/codecs/m4v_h263/fuzzer/mpeg4_h263_enc_fuzzer.cpp similarity index 100% rename from media/codecs/m4v_h263/fuzzer/mpeg4_h263_enc_fuzzer.cpp rename to media/module/codecs/m4v_h263/fuzzer/mpeg4_h263_enc_fuzzer.cpp diff --git a/media/codecs/m4v_h263/patent_disclaimer.txt b/media/module/codecs/m4v_h263/patent_disclaimer.txt similarity index 100% rename from media/codecs/m4v_h263/patent_disclaimer.txt rename to media/module/codecs/m4v_h263/patent_disclaimer.txt diff --git a/media/codecs/mp3dec/Android.bp b/media/module/codecs/mp3dec/Android.bp similarity index 100% rename from media/codecs/mp3dec/Android.bp rename to media/module/codecs/mp3dec/Android.bp diff --git a/media/extractors/aac/MODULE_LICENSE_APACHE2 b/media/module/codecs/mp3dec/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/extractors/aac/MODULE_LICENSE_APACHE2 rename to media/module/codecs/mp3dec/MODULE_LICENSE_APACHE2 diff --git a/media/extractors/aac/NOTICE b/media/module/codecs/mp3dec/NOTICE similarity index 100% rename from media/extractors/aac/NOTICE rename to media/module/codecs/mp3dec/NOTICE diff --git a/media/codecs/mp3dec/TEST_MAPPING b/media/module/codecs/mp3dec/TEST_MAPPING similarity index 100% rename from media/codecs/mp3dec/TEST_MAPPING rename to media/module/codecs/mp3dec/TEST_MAPPING diff --git a/media/codecs/mp3dec/fuzzer/Android.bp b/media/module/codecs/mp3dec/fuzzer/Android.bp similarity index 100% rename from media/codecs/mp3dec/fuzzer/Android.bp rename to media/module/codecs/mp3dec/fuzzer/Android.bp diff --git a/media/codecs/mp3dec/fuzzer/README.md b/media/module/codecs/mp3dec/fuzzer/README.md similarity index 100% rename from media/codecs/mp3dec/fuzzer/README.md rename to media/module/codecs/mp3dec/fuzzer/README.md diff --git a/media/codecs/mp3dec/fuzzer/mp3_dec_fuzzer.cpp b/media/module/codecs/mp3dec/fuzzer/mp3_dec_fuzzer.cpp similarity index 100% rename from media/codecs/mp3dec/fuzzer/mp3_dec_fuzzer.cpp rename to media/module/codecs/mp3dec/fuzzer/mp3_dec_fuzzer.cpp diff --git a/media/codecs/mp3dec/include/mp3_decoder_selection.h b/media/module/codecs/mp3dec/include/mp3_decoder_selection.h similarity index 100% rename from media/codecs/mp3dec/include/mp3_decoder_selection.h rename to media/module/codecs/mp3dec/include/mp3_decoder_selection.h diff --git a/media/codecs/mp3dec/include/pvmp3_audio_type_defs.h b/media/module/codecs/mp3dec/include/pvmp3_audio_type_defs.h similarity index 100% rename from media/codecs/mp3dec/include/pvmp3_audio_type_defs.h rename to media/module/codecs/mp3dec/include/pvmp3_audio_type_defs.h diff --git a/media/codecs/mp3dec/include/pvmp3decoder_api.h b/media/module/codecs/mp3dec/include/pvmp3decoder_api.h similarity index 100% rename from media/codecs/mp3dec/include/pvmp3decoder_api.h rename to media/module/codecs/mp3dec/include/pvmp3decoder_api.h diff --git a/media/codecs/mp3dec/patent_disclaimer.txt b/media/module/codecs/mp3dec/patent_disclaimer.txt similarity index 100% rename from media/codecs/mp3dec/patent_disclaimer.txt rename to media/module/codecs/mp3dec/patent_disclaimer.txt diff --git a/media/codecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s b/media/module/codecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s similarity index 100% rename from media/codecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s rename to media/module/codecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s diff --git a/media/codecs/mp3dec/src/asm/pvmp3_dct_9_gcc.s b/media/module/codecs/mp3dec/src/asm/pvmp3_dct_9_gcc.s similarity index 100% rename from media/codecs/mp3dec/src/asm/pvmp3_dct_9_gcc.s rename to media/module/codecs/mp3dec/src/asm/pvmp3_dct_9_gcc.s diff --git a/media/codecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s b/media/module/codecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s similarity index 100% rename from media/codecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s rename to media/module/codecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s diff --git a/media/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s b/media/module/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s similarity index 100% rename from media/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s rename to media/module/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s diff --git a/media/codecs/mp3dec/src/mp3_mem_funcs.h b/media/module/codecs/mp3dec/src/mp3_mem_funcs.h similarity index 100% rename from media/codecs/mp3dec/src/mp3_mem_funcs.h rename to media/module/codecs/mp3dec/src/mp3_mem_funcs.h diff --git a/media/codecs/mp3dec/src/pv_mp3_huffman.h b/media/module/codecs/mp3dec/src/pv_mp3_huffman.h similarity index 100% rename from media/codecs/mp3dec/src/pv_mp3_huffman.h rename to media/module/codecs/mp3dec/src/pv_mp3_huffman.h diff --git a/media/codecs/mp3dec/src/pv_mp3dec_fxd_op.h b/media/module/codecs/mp3dec/src/pv_mp3dec_fxd_op.h similarity index 100% rename from media/codecs/mp3dec/src/pv_mp3dec_fxd_op.h rename to media/module/codecs/mp3dec/src/pv_mp3dec_fxd_op.h diff --git a/media/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm.h b/media/module/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm.h similarity index 100% rename from media/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm.h rename to media/module/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm.h diff --git a/media/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm_gcc.h b/media/module/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm_gcc.h similarity index 100% rename from media/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm_gcc.h rename to media/module/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm_gcc.h diff --git a/media/codecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h b/media/module/codecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h similarity index 100% rename from media/codecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h rename to media/module/codecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h diff --git a/media/codecs/mp3dec/src/pv_mp3dec_fxd_op_msc_evc.h b/media/module/codecs/mp3dec/src/pv_mp3dec_fxd_op_msc_evc.h similarity index 100% rename from media/codecs/mp3dec/src/pv_mp3dec_fxd_op_msc_evc.h rename to media/module/codecs/mp3dec/src/pv_mp3dec_fxd_op_msc_evc.h diff --git a/media/codecs/mp3dec/src/pvmp3_alias_reduction.cpp b/media/module/codecs/mp3dec/src/pvmp3_alias_reduction.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_alias_reduction.cpp rename to media/module/codecs/mp3dec/src/pvmp3_alias_reduction.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_alias_reduction.h b/media/module/codecs/mp3dec/src/pvmp3_alias_reduction.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_alias_reduction.h rename to media/module/codecs/mp3dec/src/pvmp3_alias_reduction.h diff --git a/media/codecs/mp3dec/src/pvmp3_crc.cpp b/media/module/codecs/mp3dec/src/pvmp3_crc.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_crc.cpp rename to media/module/codecs/mp3dec/src/pvmp3_crc.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_crc.h b/media/module/codecs/mp3dec/src/pvmp3_crc.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_crc.h rename to media/module/codecs/mp3dec/src/pvmp3_crc.h diff --git a/media/codecs/mp3dec/src/pvmp3_dct_16.cpp b/media/module/codecs/mp3dec/src/pvmp3_dct_16.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_dct_16.cpp rename to media/module/codecs/mp3dec/src/pvmp3_dct_16.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_dct_16.h b/media/module/codecs/mp3dec/src/pvmp3_dct_16.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_dct_16.h rename to media/module/codecs/mp3dec/src/pvmp3_dct_16.h diff --git a/media/codecs/mp3dec/src/pvmp3_dct_6.cpp b/media/module/codecs/mp3dec/src/pvmp3_dct_6.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_dct_6.cpp rename to media/module/codecs/mp3dec/src/pvmp3_dct_6.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_dct_9.cpp b/media/module/codecs/mp3dec/src/pvmp3_dct_9.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_dct_9.cpp rename to media/module/codecs/mp3dec/src/pvmp3_dct_9.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_dec_defs.h b/media/module/codecs/mp3dec/src/pvmp3_dec_defs.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_dec_defs.h rename to media/module/codecs/mp3dec/src/pvmp3_dec_defs.h diff --git a/media/codecs/mp3dec/src/pvmp3_decode_header.cpp b/media/module/codecs/mp3dec/src/pvmp3_decode_header.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_decode_header.cpp rename to media/module/codecs/mp3dec/src/pvmp3_decode_header.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_decode_header.h b/media/module/codecs/mp3dec/src/pvmp3_decode_header.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_decode_header.h rename to media/module/codecs/mp3dec/src/pvmp3_decode_header.h diff --git a/media/codecs/mp3dec/src/pvmp3_decode_huff_cw.cpp b/media/module/codecs/mp3dec/src/pvmp3_decode_huff_cw.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_decode_huff_cw.cpp rename to media/module/codecs/mp3dec/src/pvmp3_decode_huff_cw.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_decode_huff_cw.h b/media/module/codecs/mp3dec/src/pvmp3_decode_huff_cw.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_decode_huff_cw.h rename to media/module/codecs/mp3dec/src/pvmp3_decode_huff_cw.h diff --git a/media/codecs/mp3dec/src/pvmp3_dequantize_sample.cpp b/media/module/codecs/mp3dec/src/pvmp3_dequantize_sample.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_dequantize_sample.cpp rename to media/module/codecs/mp3dec/src/pvmp3_dequantize_sample.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_dequantize_sample.h b/media/module/codecs/mp3dec/src/pvmp3_dequantize_sample.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_dequantize_sample.h rename to media/module/codecs/mp3dec/src/pvmp3_dequantize_sample.h diff --git a/media/codecs/mp3dec/src/pvmp3_equalizer.cpp b/media/module/codecs/mp3dec/src/pvmp3_equalizer.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_equalizer.cpp rename to media/module/codecs/mp3dec/src/pvmp3_equalizer.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_equalizer.h b/media/module/codecs/mp3dec/src/pvmp3_equalizer.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_equalizer.h rename to media/module/codecs/mp3dec/src/pvmp3_equalizer.h diff --git a/media/codecs/mp3dec/src/pvmp3_framedecoder.cpp b/media/module/codecs/mp3dec/src/pvmp3_framedecoder.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_framedecoder.cpp rename to media/module/codecs/mp3dec/src/pvmp3_framedecoder.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_framedecoder.h b/media/module/codecs/mp3dec/src/pvmp3_framedecoder.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_framedecoder.h rename to media/module/codecs/mp3dec/src/pvmp3_framedecoder.h diff --git a/media/codecs/mp3dec/src/pvmp3_get_main_data_size.cpp b/media/module/codecs/mp3dec/src/pvmp3_get_main_data_size.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_get_main_data_size.cpp rename to media/module/codecs/mp3dec/src/pvmp3_get_main_data_size.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_get_main_data_size.h b/media/module/codecs/mp3dec/src/pvmp3_get_main_data_size.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_get_main_data_size.h rename to media/module/codecs/mp3dec/src/pvmp3_get_main_data_size.h diff --git a/media/codecs/mp3dec/src/pvmp3_get_scale_factors.cpp b/media/module/codecs/mp3dec/src/pvmp3_get_scale_factors.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_get_scale_factors.cpp rename to media/module/codecs/mp3dec/src/pvmp3_get_scale_factors.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_get_scale_factors.h b/media/module/codecs/mp3dec/src/pvmp3_get_scale_factors.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_get_scale_factors.h rename to media/module/codecs/mp3dec/src/pvmp3_get_scale_factors.h diff --git a/media/codecs/mp3dec/src/pvmp3_get_side_info.cpp b/media/module/codecs/mp3dec/src/pvmp3_get_side_info.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_get_side_info.cpp rename to media/module/codecs/mp3dec/src/pvmp3_get_side_info.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_get_side_info.h b/media/module/codecs/mp3dec/src/pvmp3_get_side_info.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_get_side_info.h rename to media/module/codecs/mp3dec/src/pvmp3_get_side_info.h diff --git a/media/codecs/mp3dec/src/pvmp3_getbits.cpp b/media/module/codecs/mp3dec/src/pvmp3_getbits.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_getbits.cpp rename to media/module/codecs/mp3dec/src/pvmp3_getbits.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_getbits.h b/media/module/codecs/mp3dec/src/pvmp3_getbits.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_getbits.h rename to media/module/codecs/mp3dec/src/pvmp3_getbits.h diff --git a/media/codecs/mp3dec/src/pvmp3_huffman_decoding.cpp b/media/module/codecs/mp3dec/src/pvmp3_huffman_decoding.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_huffman_decoding.cpp rename to media/module/codecs/mp3dec/src/pvmp3_huffman_decoding.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_huffman_parsing.cpp b/media/module/codecs/mp3dec/src/pvmp3_huffman_parsing.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_huffman_parsing.cpp rename to media/module/codecs/mp3dec/src/pvmp3_huffman_parsing.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_imdct_synth.cpp b/media/module/codecs/mp3dec/src/pvmp3_imdct_synth.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_imdct_synth.cpp rename to media/module/codecs/mp3dec/src/pvmp3_imdct_synth.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_imdct_synth.h b/media/module/codecs/mp3dec/src/pvmp3_imdct_synth.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_imdct_synth.h rename to media/module/codecs/mp3dec/src/pvmp3_imdct_synth.h diff --git a/media/codecs/mp3dec/src/pvmp3_mdct_18.cpp b/media/module/codecs/mp3dec/src/pvmp3_mdct_18.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_mdct_18.cpp rename to media/module/codecs/mp3dec/src/pvmp3_mdct_18.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_mdct_18.h b/media/module/codecs/mp3dec/src/pvmp3_mdct_18.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_mdct_18.h rename to media/module/codecs/mp3dec/src/pvmp3_mdct_18.h diff --git a/media/codecs/mp3dec/src/pvmp3_mdct_6.cpp b/media/module/codecs/mp3dec/src/pvmp3_mdct_6.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_mdct_6.cpp rename to media/module/codecs/mp3dec/src/pvmp3_mdct_6.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_mdct_6.h b/media/module/codecs/mp3dec/src/pvmp3_mdct_6.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_mdct_6.h rename to media/module/codecs/mp3dec/src/pvmp3_mdct_6.h diff --git a/media/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.cpp b/media/module/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.cpp rename to media/module/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.h b/media/module/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.h rename to media/module/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.h diff --git a/media/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.cpp b/media/module/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.cpp rename to media/module/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.h b/media/module/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.h rename to media/module/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.h diff --git a/media/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.cpp b/media/module/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.cpp rename to media/module/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.h b/media/module/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.h rename to media/module/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.h diff --git a/media/codecs/mp3dec/src/pvmp3_normalize.cpp b/media/module/codecs/mp3dec/src/pvmp3_normalize.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_normalize.cpp rename to media/module/codecs/mp3dec/src/pvmp3_normalize.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_normalize.h b/media/module/codecs/mp3dec/src/pvmp3_normalize.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_normalize.h rename to media/module/codecs/mp3dec/src/pvmp3_normalize.h diff --git a/media/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.cpp b/media/module/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.cpp rename to media/module/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.h b/media/module/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.h rename to media/module/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.h diff --git a/media/codecs/mp3dec/src/pvmp3_polyphase_filter_window.cpp b/media/module/codecs/mp3dec/src/pvmp3_polyphase_filter_window.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_polyphase_filter_window.cpp rename to media/module/codecs/mp3dec/src/pvmp3_polyphase_filter_window.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_polyphase_filter_window.h b/media/module/codecs/mp3dec/src/pvmp3_polyphase_filter_window.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_polyphase_filter_window.h rename to media/module/codecs/mp3dec/src/pvmp3_polyphase_filter_window.h diff --git a/media/codecs/mp3dec/src/pvmp3_reorder.cpp b/media/module/codecs/mp3dec/src/pvmp3_reorder.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_reorder.cpp rename to media/module/codecs/mp3dec/src/pvmp3_reorder.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_reorder.h b/media/module/codecs/mp3dec/src/pvmp3_reorder.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_reorder.h rename to media/module/codecs/mp3dec/src/pvmp3_reorder.h diff --git a/media/codecs/mp3dec/src/pvmp3_seek_synch.cpp b/media/module/codecs/mp3dec/src/pvmp3_seek_synch.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_seek_synch.cpp rename to media/module/codecs/mp3dec/src/pvmp3_seek_synch.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_seek_synch.h b/media/module/codecs/mp3dec/src/pvmp3_seek_synch.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_seek_synch.h rename to media/module/codecs/mp3dec/src/pvmp3_seek_synch.h diff --git a/media/codecs/mp3dec/src/pvmp3_stereo_proc.cpp b/media/module/codecs/mp3dec/src/pvmp3_stereo_proc.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_stereo_proc.cpp rename to media/module/codecs/mp3dec/src/pvmp3_stereo_proc.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_stereo_proc.h b/media/module/codecs/mp3dec/src/pvmp3_stereo_proc.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_stereo_proc.h rename to media/module/codecs/mp3dec/src/pvmp3_stereo_proc.h diff --git a/media/codecs/mp3dec/src/pvmp3_tables.cpp b/media/module/codecs/mp3dec/src/pvmp3_tables.cpp similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_tables.cpp rename to media/module/codecs/mp3dec/src/pvmp3_tables.cpp diff --git a/media/codecs/mp3dec/src/pvmp3_tables.h b/media/module/codecs/mp3dec/src/pvmp3_tables.h similarity index 100% rename from media/codecs/mp3dec/src/pvmp3_tables.h rename to media/module/codecs/mp3dec/src/pvmp3_tables.h diff --git a/media/codecs/mp3dec/src/s_huffcodetab.h b/media/module/codecs/mp3dec/src/s_huffcodetab.h similarity index 100% rename from media/codecs/mp3dec/src/s_huffcodetab.h rename to media/module/codecs/mp3dec/src/s_huffcodetab.h diff --git a/media/codecs/mp3dec/src/s_mp3bits.h b/media/module/codecs/mp3dec/src/s_mp3bits.h similarity index 100% rename from media/codecs/mp3dec/src/s_mp3bits.h rename to media/module/codecs/mp3dec/src/s_mp3bits.h diff --git a/media/codecs/mp3dec/src/s_tmp3dec_chan.h b/media/module/codecs/mp3dec/src/s_tmp3dec_chan.h similarity index 100% rename from media/codecs/mp3dec/src/s_tmp3dec_chan.h rename to media/module/codecs/mp3dec/src/s_tmp3dec_chan.h diff --git a/media/codecs/mp3dec/src/s_tmp3dec_file.h b/media/module/codecs/mp3dec/src/s_tmp3dec_file.h similarity index 100% rename from media/codecs/mp3dec/src/s_tmp3dec_file.h rename to media/module/codecs/mp3dec/src/s_tmp3dec_file.h diff --git a/media/codecs/mp3dec/test/Android.bp b/media/module/codecs/mp3dec/test/Android.bp similarity index 100% rename from media/codecs/mp3dec/test/Android.bp rename to media/module/codecs/mp3dec/test/Android.bp diff --git a/media/codecs/mp3dec/test/AndroidTest.xml b/media/module/codecs/mp3dec/test/AndroidTest.xml similarity index 100% rename from media/codecs/mp3dec/test/AndroidTest.xml rename to media/module/codecs/mp3dec/test/AndroidTest.xml diff --git a/media/codecs/mp3dec/test/Mp3DecoderTest.cpp b/media/module/codecs/mp3dec/test/Mp3DecoderTest.cpp similarity index 100% rename from media/codecs/mp3dec/test/Mp3DecoderTest.cpp rename to media/module/codecs/mp3dec/test/Mp3DecoderTest.cpp diff --git a/media/codecs/mp3dec/test/Mp3DecoderTestEnvironment.h b/media/module/codecs/mp3dec/test/Mp3DecoderTestEnvironment.h similarity index 100% rename from media/codecs/mp3dec/test/Mp3DecoderTestEnvironment.h rename to media/module/codecs/mp3dec/test/Mp3DecoderTestEnvironment.h diff --git a/media/codecs/mp3dec/test/README.md b/media/module/codecs/mp3dec/test/README.md similarity index 100% rename from media/codecs/mp3dec/test/README.md rename to media/module/codecs/mp3dec/test/README.md diff --git a/media/codecs/mp3dec/test/mp3dec_test.cpp b/media/module/codecs/mp3dec/test/mp3dec_test.cpp similarity index 100% rename from media/codecs/mp3dec/test/mp3dec_test.cpp rename to media/module/codecs/mp3dec/test/mp3dec_test.cpp diff --git a/media/codecs/mp3dec/test/mp3reader.cpp b/media/module/codecs/mp3dec/test/mp3reader.cpp similarity index 100% rename from media/codecs/mp3dec/test/mp3reader.cpp rename to media/module/codecs/mp3dec/test/mp3reader.cpp diff --git a/media/codecs/mp3dec/test/mp3reader.h b/media/module/codecs/mp3dec/test/mp3reader.h similarity index 100% rename from media/codecs/mp3dec/test/mp3reader.h rename to media/module/codecs/mp3dec/test/mp3reader.h diff --git a/media/extractors/Android.bp b/media/module/extractors/Android.bp similarity index 100% rename from media/extractors/Android.bp rename to media/module/extractors/Android.bp diff --git a/media/extractors/TEST_MAPPING b/media/module/extractors/TEST_MAPPING similarity index 100% rename from media/extractors/TEST_MAPPING rename to media/module/extractors/TEST_MAPPING diff --git a/media/extractors/aac/AACExtractor.cpp b/media/module/extractors/aac/AACExtractor.cpp similarity index 100% rename from media/extractors/aac/AACExtractor.cpp rename to media/module/extractors/aac/AACExtractor.cpp diff --git a/media/extractors/aac/Android.bp b/media/module/extractors/aac/Android.bp similarity index 100% rename from media/extractors/aac/Android.bp rename to media/module/extractors/aac/Android.bp diff --git a/media/extractors/amr/MODULE_LICENSE_APACHE2 b/media/module/extractors/aac/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/extractors/amr/MODULE_LICENSE_APACHE2 rename to media/module/extractors/aac/MODULE_LICENSE_APACHE2 diff --git a/media/extractors/amr/NOTICE b/media/module/extractors/aac/NOTICE similarity index 100% rename from media/extractors/amr/NOTICE rename to media/module/extractors/aac/NOTICE diff --git a/media/extractors/aac/exports.lds b/media/module/extractors/aac/exports.lds similarity index 100% rename from media/extractors/aac/exports.lds rename to media/module/extractors/aac/exports.lds diff --git a/media/extractors/aac/include/AACExtractor.h b/media/module/extractors/aac/include/AACExtractor.h similarity index 100% rename from media/extractors/aac/include/AACExtractor.h rename to media/module/extractors/aac/include/AACExtractor.h diff --git a/media/extractors/amr/AMRExtractor.cpp b/media/module/extractors/amr/AMRExtractor.cpp similarity index 100% rename from media/extractors/amr/AMRExtractor.cpp rename to media/module/extractors/amr/AMRExtractor.cpp diff --git a/media/extractors/amr/Android.bp b/media/module/extractors/amr/Android.bp similarity index 100% rename from media/extractors/amr/Android.bp rename to media/module/extractors/amr/Android.bp diff --git a/media/extractors/flac/MODULE_LICENSE_APACHE2 b/media/module/extractors/amr/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/extractors/flac/MODULE_LICENSE_APACHE2 rename to media/module/extractors/amr/MODULE_LICENSE_APACHE2 diff --git a/media/extractors/flac/NOTICE b/media/module/extractors/amr/NOTICE similarity index 100% rename from media/extractors/flac/NOTICE rename to media/module/extractors/amr/NOTICE diff --git a/media/extractors/amr/exports.lds b/media/module/extractors/amr/exports.lds similarity index 100% rename from media/extractors/amr/exports.lds rename to media/module/extractors/amr/exports.lds diff --git a/media/extractors/amr/include/AMRExtractor.h b/media/module/extractors/amr/include/AMRExtractor.h similarity index 100% rename from media/extractors/amr/include/AMRExtractor.h rename to media/module/extractors/amr/include/AMRExtractor.h diff --git a/media/extractors/flac/Android.bp b/media/module/extractors/flac/Android.bp similarity index 100% rename from media/extractors/flac/Android.bp rename to media/module/extractors/flac/Android.bp diff --git a/media/extractors/flac/FLACExtractor.cpp b/media/module/extractors/flac/FLACExtractor.cpp similarity index 100% rename from media/extractors/flac/FLACExtractor.cpp rename to media/module/extractors/flac/FLACExtractor.cpp diff --git a/media/extractors/midi/MODULE_LICENSE_APACHE2 b/media/module/extractors/flac/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/extractors/midi/MODULE_LICENSE_APACHE2 rename to media/module/extractors/flac/MODULE_LICENSE_APACHE2 diff --git a/media/extractors/midi/NOTICE b/media/module/extractors/flac/NOTICE similarity index 100% rename from media/extractors/midi/NOTICE rename to media/module/extractors/flac/NOTICE diff --git a/media/extractors/flac/exports.lds b/media/module/extractors/flac/exports.lds similarity index 100% rename from media/extractors/flac/exports.lds rename to media/module/extractors/flac/exports.lds diff --git a/media/extractors/flac/include/FLACExtractor.h b/media/module/extractors/flac/include/FLACExtractor.h similarity index 100% rename from media/extractors/flac/include/FLACExtractor.h rename to media/module/extractors/flac/include/FLACExtractor.h diff --git a/media/extractors/fuzzers/Android.bp b/media/module/extractors/fuzzers/Android.bp similarity index 100% rename from media/extractors/fuzzers/Android.bp rename to media/module/extractors/fuzzers/Android.bp diff --git a/media/extractors/fuzzers/ExtractorFuzzerBase.cpp b/media/module/extractors/fuzzers/ExtractorFuzzerBase.cpp similarity index 100% rename from media/extractors/fuzzers/ExtractorFuzzerBase.cpp rename to media/module/extractors/fuzzers/ExtractorFuzzerBase.cpp diff --git a/media/extractors/fuzzers/README.md b/media/module/extractors/fuzzers/README.md similarity index 100% rename from media/extractors/fuzzers/README.md rename to media/module/extractors/fuzzers/README.md diff --git a/media/extractors/fuzzers/aac_extractor_fuzzer.cpp b/media/module/extractors/fuzzers/aac_extractor_fuzzer.cpp similarity index 100% rename from media/extractors/fuzzers/aac_extractor_fuzzer.cpp rename to media/module/extractors/fuzzers/aac_extractor_fuzzer.cpp diff --git a/media/extractors/fuzzers/amr_extractor_fuzzer.cpp b/media/module/extractors/fuzzers/amr_extractor_fuzzer.cpp similarity index 100% rename from media/extractors/fuzzers/amr_extractor_fuzzer.cpp rename to media/module/extractors/fuzzers/amr_extractor_fuzzer.cpp diff --git a/media/extractors/fuzzers/amr_extractor_fuzzer.dict b/media/module/extractors/fuzzers/amr_extractor_fuzzer.dict similarity index 100% rename from media/extractors/fuzzers/amr_extractor_fuzzer.dict rename to media/module/extractors/fuzzers/amr_extractor_fuzzer.dict diff --git a/media/extractors/fuzzers/flac_extractor_fuzzer.cpp b/media/module/extractors/fuzzers/flac_extractor_fuzzer.cpp similarity index 100% rename from media/extractors/fuzzers/flac_extractor_fuzzer.cpp rename to media/module/extractors/fuzzers/flac_extractor_fuzzer.cpp diff --git a/media/extractors/fuzzers/flac_extractor_fuzzer.dict b/media/module/extractors/fuzzers/flac_extractor_fuzzer.dict similarity index 100% rename from media/extractors/fuzzers/flac_extractor_fuzzer.dict rename to media/module/extractors/fuzzers/flac_extractor_fuzzer.dict diff --git a/media/extractors/fuzzers/include/ExtractorFuzzerBase.h b/media/module/extractors/fuzzers/include/ExtractorFuzzerBase.h similarity index 100% rename from media/extractors/fuzzers/include/ExtractorFuzzerBase.h rename to media/module/extractors/fuzzers/include/ExtractorFuzzerBase.h diff --git a/media/extractors/fuzzers/midi_extractor_fuzzer.cpp b/media/module/extractors/fuzzers/midi_extractor_fuzzer.cpp similarity index 100% rename from media/extractors/fuzzers/midi_extractor_fuzzer.cpp rename to media/module/extractors/fuzzers/midi_extractor_fuzzer.cpp diff --git a/media/extractors/fuzzers/midi_extractor_fuzzer.dict b/media/module/extractors/fuzzers/midi_extractor_fuzzer.dict similarity index 100% rename from media/extractors/fuzzers/midi_extractor_fuzzer.dict rename to media/module/extractors/fuzzers/midi_extractor_fuzzer.dict diff --git a/media/extractors/fuzzers/mkv_extractor_fuzzer.cpp b/media/module/extractors/fuzzers/mkv_extractor_fuzzer.cpp similarity index 100% rename from media/extractors/fuzzers/mkv_extractor_fuzzer.cpp rename to media/module/extractors/fuzzers/mkv_extractor_fuzzer.cpp diff --git a/media/extractors/fuzzers/mkv_extractor_fuzzer.dict b/media/module/extractors/fuzzers/mkv_extractor_fuzzer.dict similarity index 100% rename from media/extractors/fuzzers/mkv_extractor_fuzzer.dict rename to media/module/extractors/fuzzers/mkv_extractor_fuzzer.dict diff --git a/media/extractors/fuzzers/mp3_extractor_fuzzer.cpp b/media/module/extractors/fuzzers/mp3_extractor_fuzzer.cpp similarity index 100% rename from media/extractors/fuzzers/mp3_extractor_fuzzer.cpp rename to media/module/extractors/fuzzers/mp3_extractor_fuzzer.cpp diff --git a/media/extractors/fuzzers/mp4_extractor_fuzzer.cpp b/media/module/extractors/fuzzers/mp4_extractor_fuzzer.cpp similarity index 100% rename from media/extractors/fuzzers/mp4_extractor_fuzzer.cpp rename to media/module/extractors/fuzzers/mp4_extractor_fuzzer.cpp diff --git a/media/extractors/fuzzers/mp4_extractor_fuzzer.dict b/media/module/extractors/fuzzers/mp4_extractor_fuzzer.dict similarity index 100% rename from media/extractors/fuzzers/mp4_extractor_fuzzer.dict rename to media/module/extractors/fuzzers/mp4_extractor_fuzzer.dict diff --git a/media/extractors/fuzzers/mpeg2_extractor_fuzzer.cpp b/media/module/extractors/fuzzers/mpeg2_extractor_fuzzer.cpp similarity index 100% rename from media/extractors/fuzzers/mpeg2_extractor_fuzzer.cpp rename to media/module/extractors/fuzzers/mpeg2_extractor_fuzzer.cpp diff --git a/media/extractors/fuzzers/mpeg2ps_extractor_fuzzer.dict b/media/module/extractors/fuzzers/mpeg2ps_extractor_fuzzer.dict similarity index 100% rename from media/extractors/fuzzers/mpeg2ps_extractor_fuzzer.dict rename to media/module/extractors/fuzzers/mpeg2ps_extractor_fuzzer.dict diff --git a/media/extractors/fuzzers/mpeg2ts_extractor_fuzzer.dict b/media/module/extractors/fuzzers/mpeg2ts_extractor_fuzzer.dict similarity index 100% rename from media/extractors/fuzzers/mpeg2ts_extractor_fuzzer.dict rename to media/module/extractors/fuzzers/mpeg2ts_extractor_fuzzer.dict diff --git a/media/extractors/fuzzers/ogg_extractor_fuzzer.cpp b/media/module/extractors/fuzzers/ogg_extractor_fuzzer.cpp similarity index 100% rename from media/extractors/fuzzers/ogg_extractor_fuzzer.cpp rename to media/module/extractors/fuzzers/ogg_extractor_fuzzer.cpp diff --git a/media/extractors/fuzzers/ogg_extractor_fuzzer.dict b/media/module/extractors/fuzzers/ogg_extractor_fuzzer.dict similarity index 100% rename from media/extractors/fuzzers/ogg_extractor_fuzzer.dict rename to media/module/extractors/fuzzers/ogg_extractor_fuzzer.dict diff --git a/media/extractors/fuzzers/wav_extractor_fuzzer.cpp b/media/module/extractors/fuzzers/wav_extractor_fuzzer.cpp similarity index 100% rename from media/extractors/fuzzers/wav_extractor_fuzzer.cpp rename to media/module/extractors/fuzzers/wav_extractor_fuzzer.cpp diff --git a/media/extractors/midi/Android.bp b/media/module/extractors/midi/Android.bp similarity index 100% rename from media/extractors/midi/Android.bp rename to media/module/extractors/midi/Android.bp diff --git a/media/extractors/mkv/MODULE_LICENSE_APACHE2 b/media/module/extractors/midi/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/extractors/mkv/MODULE_LICENSE_APACHE2 rename to media/module/extractors/midi/MODULE_LICENSE_APACHE2 diff --git a/media/extractors/midi/MidiExtractor.cpp b/media/module/extractors/midi/MidiExtractor.cpp similarity index 100% rename from media/extractors/midi/MidiExtractor.cpp rename to media/module/extractors/midi/MidiExtractor.cpp diff --git a/media/extractors/mkv/NOTICE b/media/module/extractors/midi/NOTICE similarity index 100% rename from media/extractors/mkv/NOTICE rename to media/module/extractors/midi/NOTICE diff --git a/media/extractors/midi/exports.lds b/media/module/extractors/midi/exports.lds similarity index 100% rename from media/extractors/midi/exports.lds rename to media/module/extractors/midi/exports.lds diff --git a/media/extractors/midi/include/MidiExtractor.h b/media/module/extractors/midi/include/MidiExtractor.h similarity index 100% rename from media/extractors/midi/include/MidiExtractor.h rename to media/module/extractors/midi/include/MidiExtractor.h diff --git a/media/extractors/mkv/Android.bp b/media/module/extractors/mkv/Android.bp similarity index 100% rename from media/extractors/mkv/Android.bp rename to media/module/extractors/mkv/Android.bp diff --git a/media/extractors/mp4/MODULE_LICENSE_APACHE2 b/media/module/extractors/mkv/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/extractors/mp4/MODULE_LICENSE_APACHE2 rename to media/module/extractors/mkv/MODULE_LICENSE_APACHE2 diff --git a/media/extractors/mkv/MatroskaExtractor.cpp b/media/module/extractors/mkv/MatroskaExtractor.cpp similarity index 100% rename from media/extractors/mkv/MatroskaExtractor.cpp rename to media/module/extractors/mkv/MatroskaExtractor.cpp diff --git a/media/extractors/mp4/NOTICE b/media/module/extractors/mkv/NOTICE similarity index 100% rename from media/extractors/mp4/NOTICE rename to media/module/extractors/mkv/NOTICE diff --git a/media/extractors/mkv/exports.lds b/media/module/extractors/mkv/exports.lds similarity index 100% rename from media/extractors/mkv/exports.lds rename to media/module/extractors/mkv/exports.lds diff --git a/media/extractors/mkv/include/MatroskaExtractor.h b/media/module/extractors/mkv/include/MatroskaExtractor.h similarity index 100% rename from media/extractors/mkv/include/MatroskaExtractor.h rename to media/module/extractors/mkv/include/MatroskaExtractor.h diff --git a/media/extractors/mp3/Android.bp b/media/module/extractors/mp3/Android.bp similarity index 100% rename from media/extractors/mp3/Android.bp rename to media/module/extractors/mp3/Android.bp diff --git a/media/extractors/mp3/MP3Extractor.cpp b/media/module/extractors/mp3/MP3Extractor.cpp similarity index 100% rename from media/extractors/mp3/MP3Extractor.cpp rename to media/module/extractors/mp3/MP3Extractor.cpp diff --git a/media/extractors/mp3/VBRISeeker.cpp b/media/module/extractors/mp3/VBRISeeker.cpp similarity index 100% rename from media/extractors/mp3/VBRISeeker.cpp rename to media/module/extractors/mp3/VBRISeeker.cpp diff --git a/media/extractors/mp3/XINGSeeker.cpp b/media/module/extractors/mp3/XINGSeeker.cpp similarity index 100% rename from media/extractors/mp3/XINGSeeker.cpp rename to media/module/extractors/mp3/XINGSeeker.cpp diff --git a/media/extractors/mp3/exports.lds b/media/module/extractors/mp3/exports.lds similarity index 100% rename from media/extractors/mp3/exports.lds rename to media/module/extractors/mp3/exports.lds diff --git a/media/extractors/mp3/include/MP3Extractor.h b/media/module/extractors/mp3/include/MP3Extractor.h similarity index 100% rename from media/extractors/mp3/include/MP3Extractor.h rename to media/module/extractors/mp3/include/MP3Extractor.h diff --git a/media/extractors/mp3/include/MP3Seeker.h b/media/module/extractors/mp3/include/MP3Seeker.h similarity index 100% rename from media/extractors/mp3/include/MP3Seeker.h rename to media/module/extractors/mp3/include/MP3Seeker.h diff --git a/media/extractors/mp3/include/VBRISeeker.h b/media/module/extractors/mp3/include/VBRISeeker.h similarity index 100% rename from media/extractors/mp3/include/VBRISeeker.h rename to media/module/extractors/mp3/include/VBRISeeker.h diff --git a/media/extractors/mp3/include/XINGSeeker.h b/media/module/extractors/mp3/include/XINGSeeker.h similarity index 100% rename from media/extractors/mp3/include/XINGSeeker.h rename to media/module/extractors/mp3/include/XINGSeeker.h diff --git a/media/extractors/mp4/AC4Parser.cpp b/media/module/extractors/mp4/AC4Parser.cpp similarity index 100% rename from media/extractors/mp4/AC4Parser.cpp rename to media/module/extractors/mp4/AC4Parser.cpp diff --git a/media/extractors/mp4/Android.bp b/media/module/extractors/mp4/Android.bp similarity index 100% rename from media/extractors/mp4/Android.bp rename to media/module/extractors/mp4/Android.bp diff --git a/media/extractors/mp4/ItemTable.cpp b/media/module/extractors/mp4/ItemTable.cpp similarity index 100% rename from media/extractors/mp4/ItemTable.cpp rename to media/module/extractors/mp4/ItemTable.cpp diff --git a/media/extractors/mpeg2/MODULE_LICENSE_APACHE2 b/media/module/extractors/mp4/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/extractors/mpeg2/MODULE_LICENSE_APACHE2 rename to media/module/extractors/mp4/MODULE_LICENSE_APACHE2 diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/module/extractors/mp4/MPEG4Extractor.cpp similarity index 100% rename from media/extractors/mp4/MPEG4Extractor.cpp rename to media/module/extractors/mp4/MPEG4Extractor.cpp diff --git a/media/extractors/mpeg2/NOTICE b/media/module/extractors/mp4/NOTICE similarity index 100% rename from media/extractors/mpeg2/NOTICE rename to media/module/extractors/mp4/NOTICE diff --git a/media/extractors/mp4/SampleIterator.cpp b/media/module/extractors/mp4/SampleIterator.cpp similarity index 100% rename from media/extractors/mp4/SampleIterator.cpp rename to media/module/extractors/mp4/SampleIterator.cpp diff --git a/media/extractors/mp4/SampleTable.cpp b/media/module/extractors/mp4/SampleTable.cpp similarity index 100% rename from media/extractors/mp4/SampleTable.cpp rename to media/module/extractors/mp4/SampleTable.cpp diff --git a/media/extractors/mp4/exports.lds b/media/module/extractors/mp4/exports.lds similarity index 100% rename from media/extractors/mp4/exports.lds rename to media/module/extractors/mp4/exports.lds diff --git a/media/extractors/mp4/include/AC4Parser.h b/media/module/extractors/mp4/include/AC4Parser.h similarity index 100% rename from media/extractors/mp4/include/AC4Parser.h rename to media/module/extractors/mp4/include/AC4Parser.h diff --git a/media/extractors/mp4/include/ItemTable.h b/media/module/extractors/mp4/include/ItemTable.h similarity index 100% rename from media/extractors/mp4/include/ItemTable.h rename to media/module/extractors/mp4/include/ItemTable.h diff --git a/media/extractors/mp4/include/MPEG4Extractor.h b/media/module/extractors/mp4/include/MPEG4Extractor.h similarity index 100% rename from media/extractors/mp4/include/MPEG4Extractor.h rename to media/module/extractors/mp4/include/MPEG4Extractor.h diff --git a/media/extractors/mp4/include/SampleIterator.h b/media/module/extractors/mp4/include/SampleIterator.h similarity index 100% rename from media/extractors/mp4/include/SampleIterator.h rename to media/module/extractors/mp4/include/SampleIterator.h diff --git a/media/extractors/mp4/include/SampleTable.h b/media/module/extractors/mp4/include/SampleTable.h similarity index 100% rename from media/extractors/mp4/include/SampleTable.h rename to media/module/extractors/mp4/include/SampleTable.h diff --git a/media/extractors/mpeg2/Android.bp b/media/module/extractors/mpeg2/Android.bp similarity index 100% rename from media/extractors/mpeg2/Android.bp rename to media/module/extractors/mpeg2/Android.bp diff --git a/media/extractors/mpeg2/ExtractorBundle.cpp b/media/module/extractors/mpeg2/ExtractorBundle.cpp similarity index 100% rename from media/extractors/mpeg2/ExtractorBundle.cpp rename to media/module/extractors/mpeg2/ExtractorBundle.cpp diff --git a/media/extractors/ogg/MODULE_LICENSE_APACHE2 b/media/module/extractors/mpeg2/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/extractors/ogg/MODULE_LICENSE_APACHE2 rename to media/module/extractors/mpeg2/MODULE_LICENSE_APACHE2 diff --git a/media/extractors/mpeg2/MPEG2PSExtractor.cpp b/media/module/extractors/mpeg2/MPEG2PSExtractor.cpp similarity index 100% rename from media/extractors/mpeg2/MPEG2PSExtractor.cpp rename to media/module/extractors/mpeg2/MPEG2PSExtractor.cpp diff --git a/media/extractors/mpeg2/MPEG2TSExtractor.cpp b/media/module/extractors/mpeg2/MPEG2TSExtractor.cpp similarity index 100% rename from media/extractors/mpeg2/MPEG2TSExtractor.cpp rename to media/module/extractors/mpeg2/MPEG2TSExtractor.cpp diff --git a/media/extractors/ogg/NOTICE b/media/module/extractors/mpeg2/NOTICE similarity index 100% rename from media/extractors/ogg/NOTICE rename to media/module/extractors/mpeg2/NOTICE diff --git a/media/extractors/mpeg2/exports.lds b/media/module/extractors/mpeg2/exports.lds similarity index 100% rename from media/extractors/mpeg2/exports.lds rename to media/module/extractors/mpeg2/exports.lds diff --git a/media/extractors/mpeg2/include/MPEG2PSExtractor.h b/media/module/extractors/mpeg2/include/MPEG2PSExtractor.h similarity index 100% rename from media/extractors/mpeg2/include/MPEG2PSExtractor.h rename to media/module/extractors/mpeg2/include/MPEG2PSExtractor.h diff --git a/media/extractors/mpeg2/include/MPEG2TSExtractor.h b/media/module/extractors/mpeg2/include/MPEG2TSExtractor.h similarity index 100% rename from media/extractors/mpeg2/include/MPEG2TSExtractor.h rename to media/module/extractors/mpeg2/include/MPEG2TSExtractor.h diff --git a/media/extractors/ogg/Android.bp b/media/module/extractors/ogg/Android.bp similarity index 100% rename from media/extractors/ogg/Android.bp rename to media/module/extractors/ogg/Android.bp diff --git a/media/extractors/wav/MODULE_LICENSE_APACHE2 b/media/module/extractors/ogg/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/extractors/wav/MODULE_LICENSE_APACHE2 rename to media/module/extractors/ogg/MODULE_LICENSE_APACHE2 diff --git a/media/extractors/wav/NOTICE b/media/module/extractors/ogg/NOTICE similarity index 100% rename from media/extractors/wav/NOTICE rename to media/module/extractors/ogg/NOTICE diff --git a/media/extractors/ogg/OggExtractor.cpp b/media/module/extractors/ogg/OggExtractor.cpp similarity index 100% rename from media/extractors/ogg/OggExtractor.cpp rename to media/module/extractors/ogg/OggExtractor.cpp diff --git a/media/extractors/ogg/exports.lds b/media/module/extractors/ogg/exports.lds similarity index 100% rename from media/extractors/ogg/exports.lds rename to media/module/extractors/ogg/exports.lds diff --git a/media/extractors/ogg/include/OggExtractor.h b/media/module/extractors/ogg/include/OggExtractor.h similarity index 100% rename from media/extractors/ogg/include/OggExtractor.h rename to media/module/extractors/ogg/include/OggExtractor.h diff --git a/media/extractors/tests/Android.bp b/media/module/extractors/tests/Android.bp similarity index 100% rename from media/extractors/tests/Android.bp rename to media/module/extractors/tests/Android.bp diff --git a/media/extractors/tests/AndroidTest.xml b/media/module/extractors/tests/AndroidTest.xml similarity index 100% rename from media/extractors/tests/AndroidTest.xml rename to media/module/extractors/tests/AndroidTest.xml diff --git a/media/extractors/tests/ExtractorUnitTest.cpp b/media/module/extractors/tests/ExtractorUnitTest.cpp similarity index 100% rename from media/extractors/tests/ExtractorUnitTest.cpp rename to media/module/extractors/tests/ExtractorUnitTest.cpp diff --git a/media/extractors/tests/ExtractorUnitTestEnvironment.h b/media/module/extractors/tests/ExtractorUnitTestEnvironment.h similarity index 100% rename from media/extractors/tests/ExtractorUnitTestEnvironment.h rename to media/module/extractors/tests/ExtractorUnitTestEnvironment.h diff --git a/media/extractors/tests/README.md b/media/module/extractors/tests/README.md similarity index 100% rename from media/extractors/tests/README.md rename to media/module/extractors/tests/README.md diff --git a/media/extractors/wav/Android.bp b/media/module/extractors/wav/Android.bp similarity index 100% rename from media/extractors/wav/Android.bp rename to media/module/extractors/wav/Android.bp diff --git a/media/libstagefright/codecs/common/MODULE_LICENSE_APACHE2 b/media/module/extractors/wav/MODULE_LICENSE_APACHE2 similarity index 100% rename from media/libstagefright/codecs/common/MODULE_LICENSE_APACHE2 rename to media/module/extractors/wav/MODULE_LICENSE_APACHE2 diff --git a/media/libstagefright/codecs/common/NOTICE b/media/module/extractors/wav/NOTICE similarity index 100% rename from media/libstagefright/codecs/common/NOTICE rename to media/module/extractors/wav/NOTICE diff --git a/media/extractors/wav/WAVExtractor.cpp b/media/module/extractors/wav/WAVExtractor.cpp similarity index 100% rename from media/extractors/wav/WAVExtractor.cpp rename to media/module/extractors/wav/WAVExtractor.cpp diff --git a/media/extractors/wav/exports.lds b/media/module/extractors/wav/exports.lds similarity index 100% rename from media/extractors/wav/exports.lds rename to media/module/extractors/wav/exports.lds diff --git a/media/extractors/wav/include/WAVExtractor.h b/media/module/extractors/wav/include/WAVExtractor.h similarity index 100% rename from media/extractors/wav/include/WAVExtractor.h rename to media/module/extractors/wav/include/WAVExtractor.h diff --git a/media/libmediaformatshaper/Android.bp b/media/module/libmediaformatshaper/Android.bp similarity index 100% rename from media/libmediaformatshaper/Android.bp rename to media/module/libmediaformatshaper/Android.bp diff --git a/media/libmediaformatshaper/CodecProperties.cpp b/media/module/libmediaformatshaper/CodecProperties.cpp similarity index 100% rename from media/libmediaformatshaper/CodecProperties.cpp rename to media/module/libmediaformatshaper/CodecProperties.cpp diff --git a/media/libmediaformatshaper/CodecProperties.h b/media/module/libmediaformatshaper/CodecProperties.h similarity index 100% rename from media/libmediaformatshaper/CodecProperties.h rename to media/module/libmediaformatshaper/CodecProperties.h diff --git a/media/libmediaformatshaper/CodecSeeding.cpp b/media/module/libmediaformatshaper/CodecSeeding.cpp similarity index 100% rename from media/libmediaformatshaper/CodecSeeding.cpp rename to media/module/libmediaformatshaper/CodecSeeding.cpp diff --git a/media/libmediaformatshaper/FormatShaper.cpp b/media/module/libmediaformatshaper/FormatShaper.cpp similarity index 100% rename from media/libmediaformatshaper/FormatShaper.cpp rename to media/module/libmediaformatshaper/FormatShaper.cpp diff --git a/media/libmediaformatshaper/ManageShapingCodecs.cpp b/media/module/libmediaformatshaper/ManageShapingCodecs.cpp similarity index 100% rename from media/libmediaformatshaper/ManageShapingCodecs.cpp rename to media/module/libmediaformatshaper/ManageShapingCodecs.cpp diff --git a/media/libmediaformatshaper/VQApply.cpp b/media/module/libmediaformatshaper/VQApply.cpp similarity index 100% rename from media/libmediaformatshaper/VQApply.cpp rename to media/module/libmediaformatshaper/VQApply.cpp diff --git a/media/libmediaformatshaper/VQops.h b/media/module/libmediaformatshaper/VQops.h similarity index 100% rename from media/libmediaformatshaper/VQops.h rename to media/module/libmediaformatshaper/VQops.h diff --git a/media/libmediaformatshaper/VideoShaper.cpp b/media/module/libmediaformatshaper/VideoShaper.cpp similarity index 100% rename from media/libmediaformatshaper/VideoShaper.cpp rename to media/module/libmediaformatshaper/VideoShaper.cpp diff --git a/media/libmediaformatshaper/VideoShaper.h b/media/module/libmediaformatshaper/VideoShaper.h similarity index 100% rename from media/libmediaformatshaper/VideoShaper.h rename to media/module/libmediaformatshaper/VideoShaper.h diff --git a/media/libmediaformatshaper/exports.lds b/media/module/libmediaformatshaper/exports.lds similarity index 100% rename from media/libmediaformatshaper/exports.lds rename to media/module/libmediaformatshaper/exports.lds diff --git a/media/libmediaformatshaper/include/media/formatshaper/FormatShaper.h b/media/module/libmediaformatshaper/include/media/formatshaper/FormatShaper.h similarity index 100% rename from media/libmediaformatshaper/include/media/formatshaper/FormatShaper.h rename to media/module/libmediaformatshaper/include/media/formatshaper/FormatShaper.h diff --git a/media/libmediatranscoding/.clang-format b/media/module/libmediatranscoding/.clang-format similarity index 100% rename from media/libmediatranscoding/.clang-format rename to media/module/libmediatranscoding/.clang-format diff --git a/media/libmediatranscoding/Android.bp b/media/module/libmediatranscoding/Android.bp similarity index 100% rename from media/libmediatranscoding/Android.bp rename to media/module/libmediatranscoding/Android.bp diff --git a/media/libmediatranscoding/OWNERS b/media/module/libmediatranscoding/OWNERS similarity index 100% rename from media/libmediatranscoding/OWNERS rename to media/module/libmediatranscoding/OWNERS diff --git a/media/libmediatranscoding/TEST_MAPPING b/media/module/libmediatranscoding/TEST_MAPPING similarity index 100% rename from media/libmediatranscoding/TEST_MAPPING rename to media/module/libmediatranscoding/TEST_MAPPING diff --git a/media/libmediatranscoding/TranscoderWrapper.cpp b/media/module/libmediatranscoding/TranscoderWrapper.cpp similarity index 100% rename from media/libmediatranscoding/TranscoderWrapper.cpp rename to media/module/libmediatranscoding/TranscoderWrapper.cpp diff --git a/media/libmediatranscoding/TranscodingClientManager.cpp b/media/module/libmediatranscoding/TranscodingClientManager.cpp similarity index 100% rename from media/libmediatranscoding/TranscodingClientManager.cpp rename to media/module/libmediatranscoding/TranscodingClientManager.cpp diff --git a/media/libmediatranscoding/TranscodingLogger.cpp b/media/module/libmediatranscoding/TranscodingLogger.cpp similarity index 100% rename from media/libmediatranscoding/TranscodingLogger.cpp rename to media/module/libmediatranscoding/TranscodingLogger.cpp diff --git a/media/libmediatranscoding/TranscodingResourcePolicy.cpp b/media/module/libmediatranscoding/TranscodingResourcePolicy.cpp similarity index 100% rename from media/libmediatranscoding/TranscodingResourcePolicy.cpp rename to media/module/libmediatranscoding/TranscodingResourcePolicy.cpp diff --git a/media/libmediatranscoding/TranscodingSessionController.cpp b/media/module/libmediatranscoding/TranscodingSessionController.cpp similarity index 100% rename from media/libmediatranscoding/TranscodingSessionController.cpp rename to media/module/libmediatranscoding/TranscodingSessionController.cpp diff --git a/media/libmediatranscoding/TranscodingThermalPolicy.cpp b/media/module/libmediatranscoding/TranscodingThermalPolicy.cpp similarity index 100% rename from media/libmediatranscoding/TranscodingThermalPolicy.cpp rename to media/module/libmediatranscoding/TranscodingThermalPolicy.cpp diff --git a/media/libmediatranscoding/TranscodingUidPolicy.cpp b/media/module/libmediatranscoding/TranscodingUidPolicy.cpp similarity index 100% rename from media/libmediatranscoding/TranscodingUidPolicy.cpp rename to media/module/libmediatranscoding/TranscodingUidPolicy.cpp diff --git a/media/libmediatranscoding/aidl/android/media/IMediaTranscodingService.aidl b/media/module/libmediatranscoding/aidl/android/media/IMediaTranscodingService.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/IMediaTranscodingService.aidl rename to media/module/libmediatranscoding/aidl/android/media/IMediaTranscodingService.aidl diff --git a/media/libmediatranscoding/aidl/android/media/ITranscodingClient.aidl b/media/module/libmediatranscoding/aidl/android/media/ITranscodingClient.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/ITranscodingClient.aidl rename to media/module/libmediatranscoding/aidl/android/media/ITranscodingClient.aidl diff --git a/media/libmediatranscoding/aidl/android/media/ITranscodingClientCallback.aidl b/media/module/libmediatranscoding/aidl/android/media/ITranscodingClientCallback.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/ITranscodingClientCallback.aidl rename to media/module/libmediatranscoding/aidl/android/media/ITranscodingClientCallback.aidl diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingErrorCode.aidl b/media/module/libmediatranscoding/aidl/android/media/TranscodingErrorCode.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/TranscodingErrorCode.aidl rename to media/module/libmediatranscoding/aidl/android/media/TranscodingErrorCode.aidl diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingRequestParcel.aidl b/media/module/libmediatranscoding/aidl/android/media/TranscodingRequestParcel.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/TranscodingRequestParcel.aidl rename to media/module/libmediatranscoding/aidl/android/media/TranscodingRequestParcel.aidl diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingResultParcel.aidl b/media/module/libmediatranscoding/aidl/android/media/TranscodingResultParcel.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/TranscodingResultParcel.aidl rename to media/module/libmediatranscoding/aidl/android/media/TranscodingResultParcel.aidl diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingSessionParcel.aidl b/media/module/libmediatranscoding/aidl/android/media/TranscodingSessionParcel.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/TranscodingSessionParcel.aidl rename to media/module/libmediatranscoding/aidl/android/media/TranscodingSessionParcel.aidl diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingSessionPriority.aidl b/media/module/libmediatranscoding/aidl/android/media/TranscodingSessionPriority.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/TranscodingSessionPriority.aidl rename to media/module/libmediatranscoding/aidl/android/media/TranscodingSessionPriority.aidl diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingSessionStats.aidl b/media/module/libmediatranscoding/aidl/android/media/TranscodingSessionStats.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/TranscodingSessionStats.aidl rename to media/module/libmediatranscoding/aidl/android/media/TranscodingSessionStats.aidl diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingTestConfig.aidl b/media/module/libmediatranscoding/aidl/android/media/TranscodingTestConfig.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/TranscodingTestConfig.aidl rename to media/module/libmediatranscoding/aidl/android/media/TranscodingTestConfig.aidl diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingType.aidl b/media/module/libmediatranscoding/aidl/android/media/TranscodingType.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/TranscodingType.aidl rename to media/module/libmediatranscoding/aidl/android/media/TranscodingType.aidl diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingVideoCodecType.aidl b/media/module/libmediatranscoding/aidl/android/media/TranscodingVideoCodecType.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/TranscodingVideoCodecType.aidl rename to media/module/libmediatranscoding/aidl/android/media/TranscodingVideoCodecType.aidl diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingVideoTrackFormat.aidl b/media/module/libmediatranscoding/aidl/android/media/TranscodingVideoTrackFormat.aidl similarity index 100% rename from media/libmediatranscoding/aidl/android/media/TranscodingVideoTrackFormat.aidl rename to media/module/libmediatranscoding/aidl/android/media/TranscodingVideoTrackFormat.aidl diff --git a/media/libmediatranscoding/build_and_run_all_unit_tests.sh b/media/module/libmediatranscoding/build_and_run_all_unit_tests.sh similarity index 100% rename from media/libmediatranscoding/build_and_run_all_unit_tests.sh rename to media/module/libmediatranscoding/build_and_run_all_unit_tests.sh diff --git a/media/libmediatranscoding/include/media/AdjustableMaxPriorityQueue.h b/media/module/libmediatranscoding/include/media/AdjustableMaxPriorityQueue.h similarity index 100% rename from media/libmediatranscoding/include/media/AdjustableMaxPriorityQueue.h rename to media/module/libmediatranscoding/include/media/AdjustableMaxPriorityQueue.h diff --git a/media/libmediatranscoding/include/media/ControllerClientInterface.h b/media/module/libmediatranscoding/include/media/ControllerClientInterface.h similarity index 100% rename from media/libmediatranscoding/include/media/ControllerClientInterface.h rename to media/module/libmediatranscoding/include/media/ControllerClientInterface.h diff --git a/media/libmediatranscoding/include/media/ResourcePolicyInterface.h b/media/module/libmediatranscoding/include/media/ResourcePolicyInterface.h similarity index 100% rename from media/libmediatranscoding/include/media/ResourcePolicyInterface.h rename to media/module/libmediatranscoding/include/media/ResourcePolicyInterface.h diff --git a/media/libmediatranscoding/include/media/ThermalPolicyInterface.h b/media/module/libmediatranscoding/include/media/ThermalPolicyInterface.h similarity index 100% rename from media/libmediatranscoding/include/media/ThermalPolicyInterface.h rename to media/module/libmediatranscoding/include/media/ThermalPolicyInterface.h diff --git a/media/libmediatranscoding/include/media/TranscoderInterface.h b/media/module/libmediatranscoding/include/media/TranscoderInterface.h similarity index 100% rename from media/libmediatranscoding/include/media/TranscoderInterface.h rename to media/module/libmediatranscoding/include/media/TranscoderInterface.h diff --git a/media/libmediatranscoding/include/media/TranscoderWrapper.h b/media/module/libmediatranscoding/include/media/TranscoderWrapper.h similarity index 100% rename from media/libmediatranscoding/include/media/TranscoderWrapper.h rename to media/module/libmediatranscoding/include/media/TranscoderWrapper.h diff --git a/media/libmediatranscoding/include/media/TranscodingClientManager.h b/media/module/libmediatranscoding/include/media/TranscodingClientManager.h similarity index 100% rename from media/libmediatranscoding/include/media/TranscodingClientManager.h rename to media/module/libmediatranscoding/include/media/TranscodingClientManager.h diff --git a/media/libmediatranscoding/include/media/TranscodingDefs.h b/media/module/libmediatranscoding/include/media/TranscodingDefs.h similarity index 100% rename from media/libmediatranscoding/include/media/TranscodingDefs.h rename to media/module/libmediatranscoding/include/media/TranscodingDefs.h diff --git a/media/libmediatranscoding/include/media/TranscodingLogger.h b/media/module/libmediatranscoding/include/media/TranscodingLogger.h similarity index 100% rename from media/libmediatranscoding/include/media/TranscodingLogger.h rename to media/module/libmediatranscoding/include/media/TranscodingLogger.h diff --git a/media/libmediatranscoding/include/media/TranscodingRequest.h b/media/module/libmediatranscoding/include/media/TranscodingRequest.h similarity index 100% rename from media/libmediatranscoding/include/media/TranscodingRequest.h rename to media/module/libmediatranscoding/include/media/TranscodingRequest.h diff --git a/media/libmediatranscoding/include/media/TranscodingResourcePolicy.h b/media/module/libmediatranscoding/include/media/TranscodingResourcePolicy.h similarity index 100% rename from media/libmediatranscoding/include/media/TranscodingResourcePolicy.h rename to media/module/libmediatranscoding/include/media/TranscodingResourcePolicy.h diff --git a/media/libmediatranscoding/include/media/TranscodingSessionController.h b/media/module/libmediatranscoding/include/media/TranscodingSessionController.h similarity index 100% rename from media/libmediatranscoding/include/media/TranscodingSessionController.h rename to media/module/libmediatranscoding/include/media/TranscodingSessionController.h diff --git a/media/libmediatranscoding/include/media/TranscodingThermalPolicy.h b/media/module/libmediatranscoding/include/media/TranscodingThermalPolicy.h similarity index 100% rename from media/libmediatranscoding/include/media/TranscodingThermalPolicy.h rename to media/module/libmediatranscoding/include/media/TranscodingThermalPolicy.h diff --git a/media/libmediatranscoding/include/media/TranscodingUidPolicy.h b/media/module/libmediatranscoding/include/media/TranscodingUidPolicy.h similarity index 100% rename from media/libmediatranscoding/include/media/TranscodingUidPolicy.h rename to media/module/libmediatranscoding/include/media/TranscodingUidPolicy.h diff --git a/media/libmediatranscoding/include/media/UidPolicyInterface.h b/media/module/libmediatranscoding/include/media/UidPolicyInterface.h similarity index 100% rename from media/libmediatranscoding/include/media/UidPolicyInterface.h rename to media/module/libmediatranscoding/include/media/UidPolicyInterface.h diff --git a/media/libmediatranscoding/tests/AdjustableMaxPriorityQueue_tests.cpp b/media/module/libmediatranscoding/tests/AdjustableMaxPriorityQueue_tests.cpp similarity index 100% rename from media/libmediatranscoding/tests/AdjustableMaxPriorityQueue_tests.cpp rename to media/module/libmediatranscoding/tests/AdjustableMaxPriorityQueue_tests.cpp diff --git a/media/libmediatranscoding/tests/Android.bp b/media/module/libmediatranscoding/tests/Android.bp similarity index 100% rename from media/libmediatranscoding/tests/Android.bp rename to media/module/libmediatranscoding/tests/Android.bp diff --git a/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp b/media/module/libmediatranscoding/tests/TranscodingClientManager_tests.cpp similarity index 100% rename from media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp rename to media/module/libmediatranscoding/tests/TranscodingClientManager_tests.cpp diff --git a/media/libmediatranscoding/tests/TranscodingLogger_tests.cpp b/media/module/libmediatranscoding/tests/TranscodingLogger_tests.cpp similarity index 100% rename from media/libmediatranscoding/tests/TranscodingLogger_tests.cpp rename to media/module/libmediatranscoding/tests/TranscodingLogger_tests.cpp diff --git a/media/libmediatranscoding/tests/TranscodingSessionController_tests.cpp b/media/module/libmediatranscoding/tests/TranscodingSessionController_tests.cpp similarity index 100% rename from media/libmediatranscoding/tests/TranscodingSessionController_tests.cpp rename to media/module/libmediatranscoding/tests/TranscodingSessionController_tests.cpp diff --git a/media/libmediatranscoding/tests/assets/TranscodingTestAssets/Video_4K_HEVC_10Frames_Audio.mp4 b/media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/Video_4K_HEVC_10Frames_Audio.mp4 similarity index 100% rename from media/libmediatranscoding/tests/assets/TranscodingTestAssets/Video_4K_HEVC_10Frames_Audio.mp4 rename to media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/Video_4K_HEVC_10Frames_Audio.mp4 diff --git a/media/libmediatranscoding/tests/assets/TranscodingTestAssets/backyard_hevc_1920x1080_20Mbps.mp4 b/media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/backyard_hevc_1920x1080_20Mbps.mp4 similarity index 100% rename from media/libmediatranscoding/tests/assets/TranscodingTestAssets/backyard_hevc_1920x1080_20Mbps.mp4 rename to media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/backyard_hevc_1920x1080_20Mbps.mp4 diff --git a/media/libmediatranscoding/tests/assets/TranscodingTestAssets/cubicle_avc_480x240_aac_24KHz.mp4 b/media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/cubicle_avc_480x240_aac_24KHz.mp4 similarity index 100% rename from media/libmediatranscoding/tests/assets/TranscodingTestAssets/cubicle_avc_480x240_aac_24KHz.mp4 rename to media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/cubicle_avc_480x240_aac_24KHz.mp4 diff --git a/media/libmediatranscoding/tests/assets/TranscodingTestAssets/desk_hevc_1920x1080_aac_48KHz_rot90.mp4 b/media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/desk_hevc_1920x1080_aac_48KHz_rot90.mp4 similarity index 100% rename from media/libmediatranscoding/tests/assets/TranscodingTestAssets/desk_hevc_1920x1080_aac_48KHz_rot90.mp4 rename to media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/desk_hevc_1920x1080_aac_48KHz_rot90.mp4 diff --git a/media/libmediatranscoding/tests/assets/TranscodingTestAssets/jets_hevc_1280x720_20Mbps.mp4 b/media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/jets_hevc_1280x720_20Mbps.mp4 similarity index 100% rename from media/libmediatranscoding/tests/assets/TranscodingTestAssets/jets_hevc_1280x720_20Mbps.mp4 rename to media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/jets_hevc_1280x720_20Mbps.mp4 diff --git a/media/libmediatranscoding/tests/assets/TranscodingTestAssets/longtest_15s.mp4 b/media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/longtest_15s.mp4 similarity index 100% rename from media/libmediatranscoding/tests/assets/TranscodingTestAssets/longtest_15s.mp4 rename to media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/longtest_15s.mp4 diff --git a/media/libmediatranscoding/tests/assets/TranscodingTestAssets/plex_hevc_3840x2160_12Mbps.mp4 b/media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/plex_hevc_3840x2160_12Mbps.mp4 similarity index 100% rename from media/libmediatranscoding/tests/assets/TranscodingTestAssets/plex_hevc_3840x2160_12Mbps.mp4 rename to media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/plex_hevc_3840x2160_12Mbps.mp4 diff --git a/media/libmediatranscoding/tests/assets/TranscodingTestAssets/plex_hevc_3840x2160_20Mbps.mp4 b/media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/plex_hevc_3840x2160_20Mbps.mp4 similarity index 100% rename from media/libmediatranscoding/tests/assets/TranscodingTestAssets/plex_hevc_3840x2160_20Mbps.mp4 rename to media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/plex_hevc_3840x2160_20Mbps.mp4 diff --git a/media/libmediatranscoding/tests/assets/TranscodingTestAssets/video_1280x720_hevc_hdr10_static_3mbps.mp4 b/media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/video_1280x720_hevc_hdr10_static_3mbps.mp4 similarity index 100% rename from media/libmediatranscoding/tests/assets/TranscodingTestAssets/video_1280x720_hevc_hdr10_static_3mbps.mp4 rename to media/module/libmediatranscoding/tests/assets/TranscodingTestAssets/video_1280x720_hevc_hdr10_static_3mbps.mp4 diff --git a/media/libmediatranscoding/tests/build_and_run_all_unit_tests.sh b/media/module/libmediatranscoding/tests/build_and_run_all_unit_tests.sh similarity index 100% rename from media/libmediatranscoding/tests/build_and_run_all_unit_tests.sh rename to media/module/libmediatranscoding/tests/build_and_run_all_unit_tests.sh diff --git a/media/libmediatranscoding/tests/push_assets.sh b/media/module/libmediatranscoding/tests/push_assets.sh similarity index 100% rename from media/libmediatranscoding/tests/push_assets.sh rename to media/module/libmediatranscoding/tests/push_assets.sh diff --git a/media/libmediatranscoding/transcoder/Android.bp b/media/module/libmediatranscoding/transcoder/Android.bp similarity index 100% rename from media/libmediatranscoding/transcoder/Android.bp rename to media/module/libmediatranscoding/transcoder/Android.bp diff --git a/media/libmediatranscoding/transcoder/MediaSampleQueue.cpp b/media/module/libmediatranscoding/transcoder/MediaSampleQueue.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/MediaSampleQueue.cpp rename to media/module/libmediatranscoding/transcoder/MediaSampleQueue.cpp diff --git a/media/libmediatranscoding/transcoder/MediaSampleReaderNDK.cpp b/media/module/libmediatranscoding/transcoder/MediaSampleReaderNDK.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/MediaSampleReaderNDK.cpp rename to media/module/libmediatranscoding/transcoder/MediaSampleReaderNDK.cpp diff --git a/media/libmediatranscoding/transcoder/MediaSampleWriter.cpp b/media/module/libmediatranscoding/transcoder/MediaSampleWriter.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/MediaSampleWriter.cpp rename to media/module/libmediatranscoding/transcoder/MediaSampleWriter.cpp diff --git a/media/libmediatranscoding/transcoder/MediaTrackTranscoder.cpp b/media/module/libmediatranscoding/transcoder/MediaTrackTranscoder.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/MediaTrackTranscoder.cpp rename to media/module/libmediatranscoding/transcoder/MediaTrackTranscoder.cpp diff --git a/media/libmediatranscoding/transcoder/MediaTranscoder.cpp b/media/module/libmediatranscoding/transcoder/MediaTranscoder.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/MediaTranscoder.cpp rename to media/module/libmediatranscoding/transcoder/MediaTranscoder.cpp diff --git a/media/libmediatranscoding/transcoder/NdkCommon.cpp b/media/module/libmediatranscoding/transcoder/NdkCommon.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/NdkCommon.cpp rename to media/module/libmediatranscoding/transcoder/NdkCommon.cpp diff --git a/media/libmediatranscoding/transcoder/PassthroughTrackTranscoder.cpp b/media/module/libmediatranscoding/transcoder/PassthroughTrackTranscoder.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/PassthroughTrackTranscoder.cpp rename to media/module/libmediatranscoding/transcoder/PassthroughTrackTranscoder.cpp diff --git a/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp b/media/module/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp rename to media/module/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp diff --git a/media/libmediatranscoding/transcoder/benchmark/Android.bp b/media/module/libmediatranscoding/transcoder/benchmark/Android.bp similarity index 100% rename from media/libmediatranscoding/transcoder/benchmark/Android.bp rename to media/module/libmediatranscoding/transcoder/benchmark/Android.bp diff --git a/media/libmediatranscoding/transcoder/benchmark/AndroidTestTemplate.xml b/media/module/libmediatranscoding/transcoder/benchmark/AndroidTestTemplate.xml similarity index 100% rename from media/libmediatranscoding/transcoder/benchmark/AndroidTestTemplate.xml rename to media/module/libmediatranscoding/transcoder/benchmark/AndroidTestTemplate.xml diff --git a/media/libmediatranscoding/transcoder/benchmark/MediaSampleReaderBenchmark.cpp b/media/module/libmediatranscoding/transcoder/benchmark/MediaSampleReaderBenchmark.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/benchmark/MediaSampleReaderBenchmark.cpp rename to media/module/libmediatranscoding/transcoder/benchmark/MediaSampleReaderBenchmark.cpp diff --git a/media/libmediatranscoding/transcoder/benchmark/MediaTrackTranscoderBenchmark.cpp b/media/module/libmediatranscoding/transcoder/benchmark/MediaTrackTranscoderBenchmark.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/benchmark/MediaTrackTranscoderBenchmark.cpp rename to media/module/libmediatranscoding/transcoder/benchmark/MediaTrackTranscoderBenchmark.cpp diff --git a/media/libmediatranscoding/transcoder/benchmark/MediaTranscoderBenchmark.cpp b/media/module/libmediatranscoding/transcoder/benchmark/MediaTranscoderBenchmark.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/benchmark/MediaTranscoderBenchmark.cpp rename to media/module/libmediatranscoding/transcoder/benchmark/MediaTranscoderBenchmark.cpp diff --git a/media/libmediatranscoding/transcoder/include/media/MediaSample.h b/media/module/libmediatranscoding/transcoder/include/media/MediaSample.h similarity index 100% rename from media/libmediatranscoding/transcoder/include/media/MediaSample.h rename to media/module/libmediatranscoding/transcoder/include/media/MediaSample.h diff --git a/media/libmediatranscoding/transcoder/include/media/MediaSampleQueue.h b/media/module/libmediatranscoding/transcoder/include/media/MediaSampleQueue.h similarity index 100% rename from media/libmediatranscoding/transcoder/include/media/MediaSampleQueue.h rename to media/module/libmediatranscoding/transcoder/include/media/MediaSampleQueue.h diff --git a/media/libmediatranscoding/transcoder/include/media/MediaSampleReader.h b/media/module/libmediatranscoding/transcoder/include/media/MediaSampleReader.h similarity index 100% rename from media/libmediatranscoding/transcoder/include/media/MediaSampleReader.h rename to media/module/libmediatranscoding/transcoder/include/media/MediaSampleReader.h diff --git a/media/libmediatranscoding/transcoder/include/media/MediaSampleReaderNDK.h b/media/module/libmediatranscoding/transcoder/include/media/MediaSampleReaderNDK.h similarity index 100% rename from media/libmediatranscoding/transcoder/include/media/MediaSampleReaderNDK.h rename to media/module/libmediatranscoding/transcoder/include/media/MediaSampleReaderNDK.h diff --git a/media/libmediatranscoding/transcoder/include/media/MediaSampleWriter.h b/media/module/libmediatranscoding/transcoder/include/media/MediaSampleWriter.h similarity index 100% rename from media/libmediatranscoding/transcoder/include/media/MediaSampleWriter.h rename to media/module/libmediatranscoding/transcoder/include/media/MediaSampleWriter.h diff --git a/media/libmediatranscoding/transcoder/include/media/MediaTrackTranscoder.h b/media/module/libmediatranscoding/transcoder/include/media/MediaTrackTranscoder.h similarity index 100% rename from media/libmediatranscoding/transcoder/include/media/MediaTrackTranscoder.h rename to media/module/libmediatranscoding/transcoder/include/media/MediaTrackTranscoder.h diff --git a/media/libmediatranscoding/transcoder/include/media/MediaTrackTranscoderCallback.h b/media/module/libmediatranscoding/transcoder/include/media/MediaTrackTranscoderCallback.h similarity index 100% rename from media/libmediatranscoding/transcoder/include/media/MediaTrackTranscoderCallback.h rename to media/module/libmediatranscoding/transcoder/include/media/MediaTrackTranscoderCallback.h diff --git a/media/libmediatranscoding/transcoder/include/media/MediaTranscoder.h b/media/module/libmediatranscoding/transcoder/include/media/MediaTranscoder.h similarity index 100% rename from media/libmediatranscoding/transcoder/include/media/MediaTranscoder.h rename to media/module/libmediatranscoding/transcoder/include/media/MediaTranscoder.h diff --git a/media/libmediatranscoding/transcoder/include/media/NdkCommon.h b/media/module/libmediatranscoding/transcoder/include/media/NdkCommon.h similarity index 100% rename from media/libmediatranscoding/transcoder/include/media/NdkCommon.h rename to media/module/libmediatranscoding/transcoder/include/media/NdkCommon.h diff --git a/media/libmediatranscoding/transcoder/include/media/PassthroughTrackTranscoder.h b/media/module/libmediatranscoding/transcoder/include/media/PassthroughTrackTranscoder.h similarity index 100% rename from media/libmediatranscoding/transcoder/include/media/PassthroughTrackTranscoder.h rename to media/module/libmediatranscoding/transcoder/include/media/PassthroughTrackTranscoder.h diff --git a/media/libmediatranscoding/transcoder/include/media/VideoTrackTranscoder.h b/media/module/libmediatranscoding/transcoder/include/media/VideoTrackTranscoder.h similarity index 100% rename from media/libmediatranscoding/transcoder/include/media/VideoTrackTranscoder.h rename to media/module/libmediatranscoding/transcoder/include/media/VideoTrackTranscoder.h diff --git a/media/libmediatranscoding/transcoder/setloglevel.sh b/media/module/libmediatranscoding/transcoder/setloglevel.sh similarity index 100% rename from media/libmediatranscoding/transcoder/setloglevel.sh rename to media/module/libmediatranscoding/transcoder/setloglevel.sh diff --git a/media/libmediatranscoding/transcoder/tests/Android.bp b/media/module/libmediatranscoding/transcoder/tests/Android.bp similarity index 100% rename from media/libmediatranscoding/transcoder/tests/Android.bp rename to media/module/libmediatranscoding/transcoder/tests/Android.bp diff --git a/media/libmediatranscoding/transcoder/tests/AndroidTestTemplate.xml b/media/module/libmediatranscoding/transcoder/tests/AndroidTestTemplate.xml similarity index 100% rename from media/libmediatranscoding/transcoder/tests/AndroidTestTemplate.xml rename to media/module/libmediatranscoding/transcoder/tests/AndroidTestTemplate.xml diff --git a/media/libmediatranscoding/transcoder/tests/HdrTranscodeTests.cpp b/media/module/libmediatranscoding/transcoder/tests/HdrTranscodeTests.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/tests/HdrTranscodeTests.cpp rename to media/module/libmediatranscoding/transcoder/tests/HdrTranscodeTests.cpp diff --git a/media/libmediatranscoding/transcoder/tests/MediaSampleQueueTests.cpp b/media/module/libmediatranscoding/transcoder/tests/MediaSampleQueueTests.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/tests/MediaSampleQueueTests.cpp rename to media/module/libmediatranscoding/transcoder/tests/MediaSampleQueueTests.cpp diff --git a/media/libmediatranscoding/transcoder/tests/MediaSampleReaderNDKTests.cpp b/media/module/libmediatranscoding/transcoder/tests/MediaSampleReaderNDKTests.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/tests/MediaSampleReaderNDKTests.cpp rename to media/module/libmediatranscoding/transcoder/tests/MediaSampleReaderNDKTests.cpp diff --git a/media/libmediatranscoding/transcoder/tests/MediaSampleWriterTests.cpp b/media/module/libmediatranscoding/transcoder/tests/MediaSampleWriterTests.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/tests/MediaSampleWriterTests.cpp rename to media/module/libmediatranscoding/transcoder/tests/MediaSampleWriterTests.cpp diff --git a/media/libmediatranscoding/transcoder/tests/MediaTrackTranscoderTests.cpp b/media/module/libmediatranscoding/transcoder/tests/MediaTrackTranscoderTests.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/tests/MediaTrackTranscoderTests.cpp rename to media/module/libmediatranscoding/transcoder/tests/MediaTrackTranscoderTests.cpp diff --git a/media/libmediatranscoding/transcoder/tests/MediaTranscoderTests.cpp b/media/module/libmediatranscoding/transcoder/tests/MediaTranscoderTests.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/tests/MediaTranscoderTests.cpp rename to media/module/libmediatranscoding/transcoder/tests/MediaTranscoderTests.cpp diff --git a/media/libmediatranscoding/transcoder/tests/PassthroughTrackTranscoderTests.cpp b/media/module/libmediatranscoding/transcoder/tests/PassthroughTrackTranscoderTests.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/tests/PassthroughTrackTranscoderTests.cpp rename to media/module/libmediatranscoding/transcoder/tests/PassthroughTrackTranscoderTests.cpp diff --git a/media/libmediatranscoding/transcoder/tests/README.md b/media/module/libmediatranscoding/transcoder/tests/README.md similarity index 100% rename from media/libmediatranscoding/transcoder/tests/README.md rename to media/module/libmediatranscoding/transcoder/tests/README.md diff --git a/media/libmediatranscoding/transcoder/tests/TranscoderTestUtils.h b/media/module/libmediatranscoding/transcoder/tests/TranscoderTestUtils.h similarity index 100% rename from media/libmediatranscoding/transcoder/tests/TranscoderTestUtils.h rename to media/module/libmediatranscoding/transcoder/tests/TranscoderTestUtils.h diff --git a/media/libmediatranscoding/transcoder/tests/VideoTrackTranscoderTests.cpp b/media/module/libmediatranscoding/transcoder/tests/VideoTrackTranscoderTests.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/tests/VideoTrackTranscoderTests.cpp rename to media/module/libmediatranscoding/transcoder/tests/VideoTrackTranscoderTests.cpp diff --git a/media/libmediatranscoding/transcoder/tests/build_and_run_all_unit_tests.sh b/media/module/libmediatranscoding/transcoder/tests/build_and_run_all_unit_tests.sh similarity index 100% rename from media/libmediatranscoding/transcoder/tests/build_and_run_all_unit_tests.sh rename to media/module/libmediatranscoding/transcoder/tests/build_and_run_all_unit_tests.sh diff --git a/media/libmediatranscoding/transcoder/tests/fuzzer/Android.bp b/media/module/libmediatranscoding/transcoder/tests/fuzzer/Android.bp similarity index 100% rename from media/libmediatranscoding/transcoder/tests/fuzzer/Android.bp rename to media/module/libmediatranscoding/transcoder/tests/fuzzer/Android.bp diff --git a/media/libmediatranscoding/transcoder/tests/fuzzer/README.md b/media/module/libmediatranscoding/transcoder/tests/fuzzer/README.md similarity index 100% rename from media/libmediatranscoding/transcoder/tests/fuzzer/README.md rename to media/module/libmediatranscoding/transcoder/tests/fuzzer/README.md diff --git a/media/libmediatranscoding/transcoder/tests/fuzzer/media_transcoder_fuzzer.cpp b/media/module/libmediatranscoding/transcoder/tests/fuzzer/media_transcoder_fuzzer.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/tests/fuzzer/media_transcoder_fuzzer.cpp rename to media/module/libmediatranscoding/transcoder/tests/fuzzer/media_transcoder_fuzzer.cpp diff --git a/media/libmediatranscoding/transcoder/tools/Android.bp b/media/module/libmediatranscoding/transcoder/tools/Android.bp similarity index 100% rename from media/libmediatranscoding/transcoder/tools/Android.bp rename to media/module/libmediatranscoding/transcoder/tools/Android.bp diff --git a/media/libmediatranscoding/transcoder/tools/Transcode.cpp b/media/module/libmediatranscoding/transcoder/tools/Transcode.cpp similarity index 100% rename from media/libmediatranscoding/transcoder/tools/Transcode.cpp rename to media/module/libmediatranscoding/transcoder/tools/Transcode.cpp