diff --git a/app/packager_main.cc b/app/packager_main.cc
index 2ae77e77d5..b13603f9a8 100644
--- a/app/packager_main.cc
+++ b/app/packager_main.cc
@@ -24,7 +24,7 @@
 #include "media/event/vod_media_info_dump_muxer_listener.h"
 #include "media/file/file.h"
 #include "media/file/file_closer.h"
-#include "media/mp4/mp4_muxer.h"
+#include "media/formats/mp4/mp4_muxer.h"
 
 DEFINE_bool(dump_stream_info, false, "Dump demuxed stream info.");
 
diff --git a/media/base/demuxer.cc b/media/base/demuxer.cc
index 936bfac332..5480039058 100644
--- a/media/base/demuxer.cc
+++ b/media/base/demuxer.cc
@@ -15,7 +15,7 @@
 #include "media/base/media_stream.h"
 #include "media/base/stream_info.h"
 #include "media/file/file.h"
-#include "media/mp4/mp4_media_parser.h"
+#include "media/formats/mp4/mp4_media_parser.h"
 
 namespace {
 const size_t kBufSize = 0x40000;  // 256KB.
diff --git a/media/mp4/aac_audio_specific_config.cc b/media/formats/mp4/aac_audio_specific_config.cc
similarity index 98%
rename from media/mp4/aac_audio_specific_config.cc
rename to media/formats/mp4/aac_audio_specific_config.cc
index a7f02f2c24..e70537912e 100644
--- a/media/mp4/aac_audio_specific_config.cc
+++ b/media/formats/mp4/aac_audio_specific_config.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/aac_audio_specific_config.h"
+#include "media/formats/mp4/aac_audio_specific_config.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace {
 
diff --git a/media/mp4/aac_audio_specific_config.h b/media/formats/mp4/aac_audio_specific_config.h
similarity index 94%
rename from media/mp4/aac_audio_specific_config.h
rename to media/formats/mp4/aac_audio_specific_config.h
index 7aec9667d2..a51efac6bd 100644
--- a/media/mp4/aac_audio_specific_config.h
+++ b/media/formats/mp4/aac_audio_specific_config.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_
-#define MEDIA_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_
+#ifndef MEDIA_FORMATS_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_
+#define MEDIA_FORMATS_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_
 
 #include <vector>
 
@@ -91,4 +91,4 @@ class AACAudioSpecificConfig {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_
+#endif  // MEDIA_FORMATS_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_
diff --git a/media/mp4/aac_audio_specific_config_unittest.cc b/media/formats/mp4/aac_audio_specific_config_unittest.cc
similarity index 98%
rename from media/mp4/aac_audio_specific_config_unittest.cc
rename to media/formats/mp4/aac_audio_specific_config_unittest.cc
index 9dc87b13ed..bf0155df11 100644
--- a/media/mp4/aac_audio_specific_config_unittest.cc
+++ b/media/formats/mp4/aac_audio_specific_config_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/aac_audio_specific_config.h"
+#include "media/formats/mp4/aac_audio_specific_config.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/media/mp4/box.cc b/media/formats/mp4/box.cc
similarity index 95%
rename from media/mp4/box.cc
rename to media/formats/mp4/box.cc
index 33ed16667f..e2e8e784b7 100644
--- a/media/mp4/box.cc
+++ b/media/formats/mp4/box.cc
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/box.h"
+#include "media/formats/mp4/box.h"
 
 #include "base/logging.h"
-#include "media/mp4/box_buffer.h"
+#include "media/formats/mp4/box_buffer.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/mp4/box.h b/media/formats/mp4/box.h
similarity index 92%
rename from media/mp4/box.h
rename to media/formats/mp4/box.h
index 95af52fc32..a16062586a 100644
--- a/media/mp4/box.h
+++ b/media/formats/mp4/box.h
@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_BOX_H_
-#define MEDIA_MP4_BOX_H_
+#ifndef MEDIA_FORMATS_MP4_BOX_H_
+#define MEDIA_FORMATS_MP4_BOX_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "media/mp4/fourccs.h"
+#include "media/formats/mp4/fourccs.h"
 
 namespace media {
 
@@ -68,4 +68,4 @@ struct FullBox : Box {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_BOX_H_
+#endif  // MEDIA_FORMATS_MP4_BOX_H_
diff --git a/media/mp4/box_buffer.h b/media/formats/mp4/box_buffer.h
similarity index 96%
rename from media/mp4/box_buffer.h
rename to media/formats/mp4/box_buffer.h
index 9a054ce830..f03e4afebd 100644
--- a/media/mp4/box_buffer.h
+++ b/media/formats/mp4/box_buffer.h
@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_BOX_BUFFER_H_
-#define MEDIA_MP4_BOX_BUFFER_H_
+#ifndef MEDIA_FORMATS_MP4_BOX_BUFFER_H_
+#define MEDIA_FORMATS_MP4_BOX_BUFFER_H_
 
 #include "base/compiler_specific.h"
 #include "media/base/buffer_writer.h"
-#include "media/mp4/box.h"
-#include "media/mp4/box_reader.h"
+#include "media/formats/mp4/box.h"
+#include "media/formats/mp4/box_reader.h"
 
 namespace media {
 namespace mp4 {
@@ -186,4 +186,4 @@ class BoxBuffer {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_BOX_BUFFER_H_
+#endif  // MEDIA_FORMATS_MP4_BOX_BUFFER_H_
diff --git a/media/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc
similarity index 99%
rename from media/mp4/box_definitions.cc
rename to media/formats/mp4/box_definitions.cc
index 460fe9f49b..706ff1eeb9 100644
--- a/media/mp4/box_definitions.cc
+++ b/media/formats/mp4/box_definitions.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
-#include "media/mp4/box_buffer.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/box_buffer.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace {
 const uint32 kFourCCSize = 4;
diff --git a/media/mp4/box_definitions.h b/media/formats/mp4/box_definitions.h
similarity index 97%
rename from media/mp4/box_definitions.h
rename to media/formats/mp4/box_definitions.h
index e11baea633..51e8399322 100644
--- a/media/mp4/box_definitions.h
+++ b/media/formats/mp4/box_definitions.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_BOX_DEFINITIONS_H_
-#define MEDIA_MP4_BOX_DEFINITIONS_H_
+#ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
+#define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
 
 #include <string>
 #include <vector>
 
-#include "media/mp4/aac_audio_specific_config.h"
-#include "media/mp4/box.h"
-#include "media/mp4/es_descriptor.h"
-#include "media/mp4/fourccs.h"
+#include "media/formats/mp4/aac_audio_specific_config.h"
+#include "media/formats/mp4/box.h"
+#include "media/formats/mp4/es_descriptor.h"
+#include "media/formats/mp4/fourccs.h"
 
 namespace media {
 
@@ -595,4 +595,4 @@ struct MediaData {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_BOX_DEFINITIONS_H_
+#endif  // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
diff --git a/media/mp4/box_definitions_comparison.h b/media/formats/mp4/box_definitions_comparison.h
similarity index 98%
rename from media/mp4/box_definitions_comparison.h
rename to media/formats/mp4/box_definitions_comparison.h
index df71db91d1..ea8e8e6719 100644
--- a/media/mp4/box_definitions_comparison.h
+++ b/media/formats/mp4/box_definitions_comparison.h
@@ -6,10 +6,10 @@
 //
 // Overloads operator== for mp4 boxes, mainly used for testing.
 
-#ifndef MEDIA_MP4_BOX_DEFINITIONS_COMPARISON_H_
-#define MEDIA_MP4_BOX_DEFINITIONS_COMPARISON_H_
+#ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_
+#define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {
@@ -362,4 +362,4 @@ inline bool operator==(const SegmentIndex& lhs, const SegmentIndex& rhs) {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_BOX_DEFINITIONS_COMPARISON_H_
+#endif  // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_
diff --git a/media/mp4/box_definitions_unittest.cc b/media/formats/mp4/box_definitions_unittest.cc
similarity index 99%
rename from media/mp4/box_definitions_unittest.cc
rename to media/formats/mp4/box_definitions_unittest.cc
index ddf6d0002b..ac3de91a3a 100644
--- a/media/mp4/box_definitions_unittest.cc
+++ b/media/formats/mp4/box_definitions_unittest.cc
@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "media/base/buffer_writer.h"
-#include "media/mp4/box_definitions_comparison.h"
-#include "media/mp4/box_reader.h"
+#include "media/formats/mp4/box_definitions_comparison.h"
+#include "media/formats/mp4/box_reader.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/media/mp4/box_reader.cc b/media/formats/mp4/box_reader.cc
similarity index 98%
rename from media/mp4/box_reader.cc
rename to media/formats/mp4/box_reader.cc
index 7f9190906a..2af79c3554 100644
--- a/media/mp4/box_reader.cc
+++ b/media/formats/mp4/box_reader.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/box_reader.h"
+#include "media/formats/mp4/box_reader.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/mp4/box.h"
+#include "media/formats/mp4/box.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/mp4/box_reader.h b/media/formats/mp4/box_reader.h
similarity index 96%
rename from media/mp4/box_reader.h
rename to media/formats/mp4/box_reader.h
index 2a38d36da1..a0ab06610a 100644
--- a/media/mp4/box_reader.h
+++ b/media/formats/mp4/box_reader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_BOX_READER_H_
-#define MEDIA_MP4_BOX_READER_H_
+#ifndef MEDIA_FORMATS_MP4_BOX_READER_H_
+#define MEDIA_FORMATS_MP4_BOX_READER_H_
 
 #include <map>
 #include <vector>
@@ -11,8 +11,8 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "media/base/buffer_reader.h"
-#include "media/mp4/fourccs.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/fourccs.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace media {
 namespace mp4 {
@@ -181,4 +181,4 @@ bool BoxReader::ReadAllChildren(std::vector<T>* children) {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_BOX_READER_H_
+#endif  // MEDIA_FORMATS_MP4_BOX_READER_H_
diff --git a/media/mp4/box_reader_unittest.cc b/media/formats/mp4/box_reader_unittest.cc
similarity index 98%
rename from media/mp4/box_reader_unittest.cc
rename to media/formats/mp4/box_reader_unittest.cc
index 1a758dfaf4..f35d2eedcb 100644
--- a/media/mp4/box_reader_unittest.cc
+++ b/media/formats/mp4/box_reader_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/mp4/box_buffer.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/box_buffer.h"
+#include "media/formats/mp4/rcheck.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
diff --git a/media/mp4/cenc.cc b/media/formats/mp4/cenc.cc
similarity index 97%
rename from media/mp4/cenc.cc
rename to media/formats/mp4/cenc.cc
index cdb60d79e9..4014b83636 100644
--- a/media/mp4/cenc.cc
+++ b/media/formats/mp4/cenc.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/cenc.h"
+#include "media/formats/mp4/cenc.h"
 
 #include <cstring>
 
 #include "media/base/buffer_reader.h"
 #include "media/base/buffer_writer.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace {
 // According to ISO/IEC FDIS 23001-7: CENC spec, IV should be either
diff --git a/media/mp4/cenc.h b/media/formats/mp4/cenc.h
similarity index 91%
rename from media/mp4/cenc.h
rename to media/formats/mp4/cenc.h
index dd459c854a..70aaa9ecb0 100644
--- a/media/mp4/cenc.h
+++ b/media/formats/mp4/cenc.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_CENC_H_
-#define MEDIA_MP4_CENC_H_
+#ifndef MEDIA_FORMATS_MP4_CENC_H_
+#define MEDIA_FORMATS_MP4_CENC_H_
 
 #include <vector>
 
@@ -46,4 +46,4 @@ class FrameCENCInfo {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_CENC_H_
+#endif  // MEDIA_FORMATS_MP4_CENC_H_
diff --git a/media/mp4/chunk_info_iterator.cc b/media/formats/mp4/chunk_info_iterator.cc
similarity index 97%
rename from media/mp4/chunk_info_iterator.cc
rename to media/formats/mp4/chunk_info_iterator.cc
index a7313628ba..fac864e8e0 100644
--- a/media/mp4/chunk_info_iterator.cc
+++ b/media/formats/mp4/chunk_info_iterator.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/chunk_info_iterator.h"
+#include "media/formats/mp4/chunk_info_iterator.h"
 
 #include <algorithm>
 #include <limits>
diff --git a/media/mp4/chunk_info_iterator.h b/media/formats/mp4/chunk_info_iterator.h
similarity index 91%
rename from media/mp4/chunk_info_iterator.h
rename to media/formats/mp4/chunk_info_iterator.h
index 524119ca1e..5cec7e2d2d 100644
--- a/media/mp4/chunk_info_iterator.h
+++ b/media/formats/mp4/chunk_info_iterator.h
@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_CHUNK_INFO_ITERATOR_H_
-#define MEDIA_MP4_CHUNK_INFO_ITERATOR_H_
+#ifndef MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
+#define MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
 
 #include <vector>
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {
@@ -67,4 +67,4 @@ class ChunkInfoIterator {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_CHUNK_INFO_ITERATOR_H_
+#endif  // MEDIA_FORMATS_MP4_CHUNK_INFO_ITERATOR_H_
diff --git a/media/mp4/chunk_info_iterator_unittest.cc b/media/formats/mp4/chunk_info_iterator_unittest.cc
similarity index 98%
rename from media/mp4/chunk_info_iterator_unittest.cc
rename to media/formats/mp4/chunk_info_iterator_unittest.cc
index 402ec5bc71..823c7c157a 100644
--- a/media/mp4/chunk_info_iterator_unittest.cc
+++ b/media/formats/mp4/chunk_info_iterator_unittest.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/chunk_info_iterator.h"
+#include "media/formats/mp4/chunk_info_iterator.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/media/mp4/composition_offset_iterator.cc b/media/formats/mp4/composition_offset_iterator.cc
similarity index 96%
rename from media/mp4/composition_offset_iterator.cc
rename to media/formats/mp4/composition_offset_iterator.cc
index 60b8f3064c..90aad10d1d 100644
--- a/media/mp4/composition_offset_iterator.cc
+++ b/media/formats/mp4/composition_offset_iterator.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/composition_offset_iterator.h"
+#include "media/formats/mp4/composition_offset_iterator.h"
 
 #include "base/logging.h"
 
diff --git a/media/mp4/composition_offset_iterator.h b/media/formats/mp4/composition_offset_iterator.h
similarity index 87%
rename from media/mp4/composition_offset_iterator.h
rename to media/formats/mp4/composition_offset_iterator.h
index ce4db69c6d..550898bbeb 100644
--- a/media/mp4/composition_offset_iterator.h
+++ b/media/formats/mp4/composition_offset_iterator.h
@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_COMPOSITION_OFFSET_ITERATOR_H_
-#define MEDIA_MP4_COMPOSITION_OFFSET_ITERATOR_H_
+#ifndef MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
+#define MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
 
 #include <vector>
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {
@@ -52,4 +52,4 @@ class CompositionOffsetIterator {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_COMPOSITION_OFFSET_ITERATOR_H_
+#endif  // MEDIA_FORMATS_MP4_COMPOSITION_OFFSET_ITERATOR_H_
diff --git a/media/mp4/composition_offset_iterator_unittest.cc b/media/formats/mp4/composition_offset_iterator_unittest.cc
similarity index 97%
rename from media/mp4/composition_offset_iterator_unittest.cc
rename to media/formats/mp4/composition_offset_iterator_unittest.cc
index 88d825388e..ecf071e3bf 100644
--- a/media/mp4/composition_offset_iterator_unittest.cc
+++ b/media/formats/mp4/composition_offset_iterator_unittest.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/composition_offset_iterator.h"
+#include "media/formats/mp4/composition_offset_iterator.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/mp4/decoding_time_iterator.cc b/media/formats/mp4/decoding_time_iterator.cc
similarity index 97%
rename from media/mp4/decoding_time_iterator.cc
rename to media/formats/mp4/decoding_time_iterator.cc
index 9657ea61ce..c1a45d336a 100644
--- a/media/mp4/decoding_time_iterator.cc
+++ b/media/formats/mp4/decoding_time_iterator.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/decoding_time_iterator.h"
+#include "media/formats/mp4/decoding_time_iterator.h"
 
 #include <algorithm>
 
diff --git a/media/mp4/decoding_time_iterator.h b/media/formats/mp4/decoding_time_iterator.h
similarity index 88%
rename from media/mp4/decoding_time_iterator.h
rename to media/formats/mp4/decoding_time_iterator.h
index 2781053f90..dc1fe398af 100644
--- a/media/mp4/decoding_time_iterator.h
+++ b/media/formats/mp4/decoding_time_iterator.h
@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_DECODING_TIME_ITERATOR_H_
-#define MEDIA_MP4_DECODING_TIME_ITERATOR_H_
+#ifndef MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
+#define MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
 
 #include <vector>
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {
@@ -52,4 +52,4 @@ class DecodingTimeIterator {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_DECODING_TIME_ITERATOR_H_
+#endif  // MEDIA_FORMATS_MP4_DECODING_TIME_ITERATOR_H_
diff --git a/media/mp4/decoding_time_iterator_unittest.cc b/media/formats/mp4/decoding_time_iterator_unittest.cc
similarity index 98%
rename from media/mp4/decoding_time_iterator_unittest.cc
rename to media/formats/mp4/decoding_time_iterator_unittest.cc
index c5e5eecacd..838039bef1 100644
--- a/media/mp4/decoding_time_iterator_unittest.cc
+++ b/media/formats/mp4/decoding_time_iterator_unittest.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/decoding_time_iterator.h"
+#include "media/formats/mp4/decoding_time_iterator.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/mp4/es_descriptor.cc b/media/formats/mp4/es_descriptor.cc
similarity index 98%
rename from media/mp4/es_descriptor.cc
rename to media/formats/mp4/es_descriptor.cc
index 064849d3d2..c0be0b27b5 100644
--- a/media/mp4/es_descriptor.cc
+++ b/media/formats/mp4/es_descriptor.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/es_descriptor.h"
+#include "media/formats/mp4/es_descriptor.h"
 
 #include "media/base/bit_reader.h"
 #include "media/base/buffer_writer.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace {
 
diff --git a/media/mp4/es_descriptor.h b/media/formats/mp4/es_descriptor.h
similarity index 93%
rename from media/mp4/es_descriptor.h
rename to media/formats/mp4/es_descriptor.h
index d75fd3c2cd..df8346e6d1 100644
--- a/media/mp4/es_descriptor.h
+++ b/media/formats/mp4/es_descriptor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_ES_DESCRIPTOR_H_
-#define MEDIA_MP4_ES_DESCRIPTOR_H_
+#ifndef MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_
+#define MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_
 
 #include <vector>
 
@@ -76,4 +76,4 @@ class ESDescriptor {
 
 }  // namespace media
 
-#endif  // MEDIA_MP4_ES_DESCRIPTOR_H_
+#endif  // MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_
diff --git a/media/mp4/es_descriptor_unittest.cc b/media/formats/mp4/es_descriptor_unittest.cc
similarity index 98%
rename from media/mp4/es_descriptor_unittest.cc
rename to media/formats/mp4/es_descriptor_unittest.cc
index c3a39fbefc..2e1d707f3d 100644
--- a/media/mp4/es_descriptor_unittest.cc
+++ b/media/formats/mp4/es_descriptor_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/es_descriptor.h"
+#include "media/formats/mp4/es_descriptor.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/media/mp4/fourccs.h b/media/formats/mp4/fourccs.h
similarity index 96%
rename from media/mp4/fourccs.h
rename to media/formats/mp4/fourccs.h
index ee86dd7a3b..8a56422a9f 100644
--- a/media/mp4/fourccs.h
+++ b/media/formats/mp4/fourccs.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_FOURCCS_H_
-#define MEDIA_MP4_FOURCCS_H_
+#ifndef MEDIA_FORMATS_MP4_FOURCCS_H_
+#define MEDIA_FORMATS_MP4_FOURCCS_H_
 
 #include <string>
 
@@ -107,4 +107,4 @@ const inline std::string FourCCToString(FourCC fourcc) {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_FOURCCS_H_
+#endif  // MEDIA_FORMATS_MP4_FOURCCS_H_
diff --git a/media/mp4/fragmenter.cc b/media/formats/mp4/fragmenter.cc
similarity index 98%
rename from media/mp4/fragmenter.cc
rename to media/formats/mp4/fragmenter.cc
index 440a4fdac1..6698764af0 100644
--- a/media/mp4/fragmenter.cc
+++ b/media/formats/mp4/fragmenter.cc
@@ -4,14 +4,14 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/fragmenter.h"
+#include "media/formats/mp4/fragmenter.h"
 
 #include "media/base/aes_encryptor.h"
 #include "media/base/buffer_reader.h"
 #include "media/base/buffer_writer.h"
 #include "media/base/media_sample.h"
-#include "media/mp4/box_definitions.h"
-#include "media/mp4/cenc.h"
+#include "media/formats/mp4/box_definitions.h"
+#include "media/formats/mp4/cenc.h"
 
 namespace {
 const int64 kInvalidTime = kint64max;
diff --git a/media/mp4/fragmenter.h b/media/formats/mp4/fragmenter.h
similarity index 96%
rename from media/mp4/fragmenter.h
rename to media/formats/mp4/fragmenter.h
index da19aa61eb..6183da6c07 100644
--- a/media/mp4/fragmenter.h
+++ b/media/formats/mp4/fragmenter.h
@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_FRAGMENTER_H_
-#define MEDIA_MP4_FRAGMENTER_H_
+#ifndef MEDIA_FORMATS_MP4_FRAGMENTER_H_
+#define MEDIA_FORMATS_MP4_FRAGMENTER_H_
 
 #include <vector>
 
@@ -103,4 +103,4 @@ class Fragmenter {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_FRAGMENTER_H_
+#endif  // MEDIA_FORMATS_MP4_FRAGMENTER_H_
diff --git a/media/mp4/mp4.gyp b/media/formats/mp4/mp4.gyp
similarity index 92%
rename from media/mp4/mp4.gyp
rename to media/formats/mp4/mp4.gyp
index a7206e9f6a..4e90d48082 100644
--- a/media/mp4/mp4.gyp
+++ b/media/formats/mp4/mp4.gyp
@@ -11,7 +11,7 @@
   },
   'target_defaults': {
     'include_dirs': [
-      '../..',
+      '../../..',
     ],
   },
   'targets': [
@@ -61,7 +61,7 @@
         'track_run_iterator.h',
       ],
       'dependencies': [
-        '../base/media_base.gyp:base',
+        '../../base/media_base.gyp:base',
       ],
     },
     {
@@ -81,9 +81,9 @@
         'track_run_iterator_unittest.cc',
       ],
       'dependencies': [
-        '../../testing/gtest.gyp:gtest',
-        '../../testing/gmock.gyp:gmock',
-        '../test/media_test.gyp:media_test_support',
+        '../../../testing/gtest.gyp:gtest',
+        '../../../testing/gmock.gyp:gmock',
+        '../../test/media_test.gyp:media_test_support',
         'mp4',
       ]
     },
diff --git a/media/mp4/mp4_media_parser.cc b/media/formats/mp4/mp4_media_parser.cc
similarity index 98%
rename from media/mp4/mp4_media_parser.cc
rename to media/formats/mp4/mp4_media_parser.cc
index 8f1dfc0337..5c1c277b33 100644
--- a/media/mp4/mp4_media_parser.cc
+++ b/media/formats/mp4/mp4_media_parser.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/mp4_media_parser.h"
+#include "media/formats/mp4/mp4_media_parser.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ -11,11 +11,11 @@
 #include "media/base/audio_stream_info.h"
 #include "media/base/media_sample.h"
 #include "media/base/video_stream_info.h"
-#include "media/mp4/box_definitions.h"
-#include "media/mp4/box_reader.h"
-#include "media/mp4/es_descriptor.h"
-#include "media/mp4/rcheck.h"
-#include "media/mp4/track_run_iterator.h"
+#include "media/formats/mp4/box_definitions.h"
+#include "media/formats/mp4/box_reader.h"
+#include "media/formats/mp4/es_descriptor.h"
+#include "media/formats/mp4/rcheck.h"
+#include "media/formats/mp4/track_run_iterator.h"
 
 namespace {
 
diff --git a/media/mp4/mp4_media_parser.h b/media/formats/mp4/mp4_media_parser.h
similarity index 93%
rename from media/mp4/mp4_media_parser.h
rename to media/formats/mp4/mp4_media_parser.h
index 7a729e58bf..c26cdd5904 100644
--- a/media/mp4/mp4_media_parser.h
+++ b/media/formats/mp4/mp4_media_parser.h
@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_MP4_MEDIA_PARSER_H_
-#define MEDIA_MP4_MP4_MEDIA_PARSER_H_
+#ifndef MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
+#define MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
 
 #include <vector>
 
@@ -14,7 +14,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_parser.h"
-#include "media/mp4/offset_byte_queue.h"
+#include "media/formats/mp4/offset_byte_queue.h"
 
 namespace media {
 
@@ -95,4 +95,4 @@ class MP4MediaParser : public MediaParser {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_MP4_MEDIA_PARSER_H_
+#endif  // MEDIA_FORMATS_MP4_MP4_MEDIA_PARSER_H_
diff --git a/media/mp4/mp4_media_parser_unittest.cc b/media/formats/mp4/mp4_media_parser_unittest.cc
similarity index 98%
rename from media/mp4/mp4_media_parser_unittest.cc
rename to media/formats/mp4/mp4_media_parser_unittest.cc
index b92fb8a898..43bff9e4b7 100644
--- a/media/mp4/mp4_media_parser_unittest.cc
+++ b/media/formats/mp4/mp4_media_parser_unittest.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/mp4_media_parser.h"
+#include "media/formats/mp4/mp4_media_parser.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
diff --git a/media/mp4/mp4_muxer.cc b/media/formats/mp4/mp4_muxer.cc
similarity index 97%
rename from media/mp4/mp4_muxer.cc
rename to media/formats/mp4/mp4_muxer.cc
index c336b6369c..3aa23d83c3 100644
--- a/media/mp4/mp4_muxer.cc
+++ b/media/formats/mp4/mp4_muxer.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/mp4_muxer.h"
+#include "media/formats/mp4/mp4_muxer.h"
 
 #include "base/time/clock.h"
 #include "base/time/time.h"
@@ -16,11 +16,11 @@
 #include "media/base/video_stream_info.h"
 #include "media/event/muxer_listener.h"
 #include "media/file/file.h"
-#include "media/mp4/box_definitions.h"
-#include "media/mp4/es_descriptor.h"
-#include "media/mp4/fourccs.h"
-#include "media/mp4/multi_segment_segmenter.h"
-#include "media/mp4/single_segment_segmenter.h"
+#include "media/formats/mp4/box_definitions.h"
+#include "media/formats/mp4/es_descriptor.h"
+#include "media/formats/mp4/fourccs.h"
+#include "media/formats/mp4/multi_segment_segmenter.h"
+#include "media/formats/mp4/single_segment_segmenter.h"
 
 namespace {
 // The version of cenc implemented here. CENC 4.
diff --git a/media/mp4/mp4_muxer.h b/media/formats/mp4/mp4_muxer.h
similarity index 94%
rename from media/mp4/mp4_muxer.h
rename to media/formats/mp4/mp4_muxer.h
index 10da781dd1..840e122ecf 100644
--- a/media/mp4/mp4_muxer.h
+++ b/media/formats/mp4/mp4_muxer.h
@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_MP4_MUXER_H_
-#define MEDIA_MP4_MP4_MUXER_H_
+#ifndef MEDIA_FORMATS_MP4_MP4_MUXER_H_
+#define MEDIA_FORMATS_MP4_MP4_MUXER_H_
 
 #include <vector>
 
 #include "media/base/muxer.h"
-#include "media/mp4/fourccs.h"
+#include "media/formats/mp4/fourccs.h"
 
 namespace media {
 
@@ -85,4 +85,4 @@ class MP4Muxer : public Muxer {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_MP4_MUXER_H_
+#endif  // MEDIA_FORMATS_MP4_MP4_MUXER_H_
diff --git a/media/mp4/multi_segment_segmenter.cc b/media/formats/mp4/multi_segment_segmenter.cc
similarity index 98%
rename from media/mp4/multi_segment_segmenter.cc
rename to media/formats/mp4/multi_segment_segmenter.cc
index 74179937f5..27c75c6b22 100644
--- a/media/mp4/multi_segment_segmenter.cc
+++ b/media/formats/mp4/multi_segment_segmenter.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/multi_segment_segmenter.h"
+#include "media/formats/mp4/multi_segment_segmenter.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ -12,7 +12,7 @@
 #include "media/base/media_stream.h"
 #include "media/base/muxer_options.h"
 #include "media/file/file.h"
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/mp4/multi_segment_segmenter.h b/media/formats/mp4/multi_segment_segmenter.h
similarity index 91%
rename from media/mp4/multi_segment_segmenter.h
rename to media/formats/mp4/multi_segment_segmenter.h
index bdb2ac8656..36fd4a994a 100644
--- a/media/mp4/multi_segment_segmenter.h
+++ b/media/formats/mp4/multi_segment_segmenter.h
@@ -4,10 +4,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_MULTI_SEGMENT_SEGMENTER_H_
-#define MEDIA_MP4_MULTI_SEGMENT_SEGMENTER_H_
+#ifndef MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
+#define MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
 
-#include "media/mp4/segmenter.h"
+#include "media/formats/mp4/segmenter.h"
 
 namespace media {
 namespace mp4 {
@@ -60,4 +60,4 @@ class MultiSegmentSegmenter : public Segmenter {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_MULTI_SEGMENT_SEGMENTER_H_
+#endif  // MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_
diff --git a/media/mp4/offset_byte_queue.cc b/media/formats/mp4/offset_byte_queue.cc
similarity index 96%
rename from media/mp4/offset_byte_queue.cc
rename to media/formats/mp4/offset_byte_queue.cc
index a530150899..c785b864aa 100644
--- a/media/mp4/offset_byte_queue.cc
+++ b/media/formats/mp4/offset_byte_queue.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/offset_byte_queue.h"
+#include "media/formats/mp4/offset_byte_queue.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
diff --git a/media/mp4/offset_byte_queue.h b/media/formats/mp4/offset_byte_queue.h
similarity index 93%
rename from media/mp4/offset_byte_queue.h
rename to media/formats/mp4/offset_byte_queue.h
index f5a395042c..ce718154d4 100644
--- a/media/mp4/offset_byte_queue.h
+++ b/media/formats/mp4/offset_byte_queue.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_OFFSET_BYTE_QUEUE_H_
-#define MEDIA_MP4_OFFSET_BYTE_QUEUE_H_
+#ifndef MEDIA_FORMATS_MP4_OFFSET_BYTE_QUEUE_H_
+#define MEDIA_FORMATS_MP4_OFFSET_BYTE_QUEUE_H_
 
 #include "base/basictypes.h"
 #include "media/base/byte_queue.h"
@@ -66,4 +66,4 @@ class OffsetByteQueue {
 
 }  // namespace media
 
-#endif  // MEDIA_MP4_OFFSET_BYTE_QUEUE_H_
+#endif  // MEDIA_FORMATS_MP4_OFFSET_BYTE_QUEUE_H_
diff --git a/media/mp4/offset_byte_queue_unittest.cc b/media/formats/mp4/offset_byte_queue_unittest.cc
similarity index 97%
rename from media/mp4/offset_byte_queue_unittest.cc
rename to media/formats/mp4/offset_byte_queue_unittest.cc
index b9afbc8e1b..44cdb63890 100644
--- a/media/mp4/offset_byte_queue_unittest.cc
+++ b/media/formats/mp4/offset_byte_queue_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/mp4/offset_byte_queue.h"
+#include "media/formats/mp4/offset_byte_queue.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
diff --git a/media/mp4/rcheck.h b/media/formats/mp4/rcheck.h
similarity index 84%
rename from media/mp4/rcheck.h
rename to media/formats/mp4/rcheck.h
index b401bf1fcd..e27e638eb0 100644
--- a/media/mp4/rcheck.h
+++ b/media/formats/mp4/rcheck.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_RCHECK_H_
-#define MEDIA_MP4_RCHECK_H_
+#ifndef MEDIA_FORMATS_MP4_RCHECK_H_
+#define MEDIA_FORMATS_MP4_RCHECK_H_
 
 #include "base/logging.h"
 
@@ -15,4 +15,4 @@
     }                                                       \
   } while (0)
 
-#endif  // MEDIA_MP4_RCHECK_H_
+#endif  // MEDIA_FORMATS_MP4_RCHECK_H_
diff --git a/media/mp4/segmenter.cc b/media/formats/mp4/segmenter.cc
similarity index 98%
rename from media/mp4/segmenter.cc
rename to media/formats/mp4/segmenter.cc
index 807fb16ad2..ae56efdbf8 100644
--- a/media/mp4/segmenter.cc
+++ b/media/formats/mp4/segmenter.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/segmenter.h"
+#include "media/formats/mp4/segmenter.h"
 
 #include <algorithm>
 
@@ -15,8 +15,8 @@
 #include "media/base/media_stream.h"
 #include "media/base/muxer_options.h"
 #include "media/base/video_stream_info.h"
-#include "media/mp4/box_definitions.h"
-#include "media/mp4/fragmenter.h"
+#include "media/formats/mp4/box_definitions.h"
+#include "media/formats/mp4/fragmenter.h"
 
 namespace {
 uint64 Rescale(uint64 time_in_old_scale, uint32 old_scale, uint32 new_scale) {
diff --git a/media/mp4/segmenter.h b/media/formats/mp4/segmenter.h
similarity index 96%
rename from media/mp4/segmenter.h
rename to media/formats/mp4/segmenter.h
index 5089f5c46a..db4625e749 100644
--- a/media/mp4/segmenter.h
+++ b/media/formats/mp4/segmenter.h
@@ -4,8 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_SEGMENTER_H_
-#define MEDIA_MP4_SEGMENTER_H_
+#ifndef MEDIA_FORMATS_MP4_SEGMENTER_H_
+#define MEDIA_FORMATS_MP4_SEGMENTER_H_
 
 #include <map>
 #include <vector>
@@ -106,4 +106,4 @@ class Segmenter {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_SEGMENTER_H_
+#endif  // MEDIA_FORMATS_MP4_SEGMENTER_H_
diff --git a/media/mp4/single_segment_segmenter.cc b/media/formats/mp4/single_segment_segmenter.cc
similarity index 98%
rename from media/mp4/single_segment_segmenter.cc
rename to media/formats/mp4/single_segment_segmenter.cc
index 21176e8264..5480fc76b9 100644
--- a/media/mp4/single_segment_segmenter.cc
+++ b/media/formats/mp4/single_segment_segmenter.cc
@@ -4,13 +4,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/single_segment_segmenter.h"
+#include "media/formats/mp4/single_segment_segmenter.h"
 
 #include "media/base/buffer_writer.h"
 #include "media/base/media_stream.h"
 #include "media/base/muxer_options.h"
 #include "media/file/file.h"
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/mp4/single_segment_segmenter.h b/media/formats/mp4/single_segment_segmenter.h
similarity index 90%
rename from media/mp4/single_segment_segmenter.h
rename to media/formats/mp4/single_segment_segmenter.h
index 03dc578835..51153f2399 100644
--- a/media/mp4/single_segment_segmenter.h
+++ b/media/formats/mp4/single_segment_segmenter.h
@@ -4,11 +4,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_SINGLE_SEGMENT_SEGMENTER_H_
-#define MEDIA_MP4_SINGLE_SEGMENT_SEGMENTER_H_
+#ifndef MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_
+#define MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_
 
 #include "media/file/file_closer.h"
-#include "media/mp4/segmenter.h"
+#include "media/formats/mp4/segmenter.h"
 
 namespace media {
 namespace mp4 {
@@ -55,4 +55,4 @@ class SingleSegmentSegmenter : public Segmenter {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_SINGLE_SEGMENT_SEGMENTER_H_
+#endif  // MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_
diff --git a/media/mp4/sync_sample_iterator.cc b/media/formats/mp4/sync_sample_iterator.cc
similarity index 96%
rename from media/mp4/sync_sample_iterator.cc
rename to media/formats/mp4/sync_sample_iterator.cc
index 4a185685ad..0c114da1d4 100644
--- a/media/mp4/sync_sample_iterator.cc
+++ b/media/formats/mp4/sync_sample_iterator.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/sync_sample_iterator.h"
+#include "media/formats/mp4/sync_sample_iterator.h"
 
 #include <algorithm>
 
diff --git a/media/mp4/sync_sample_iterator.h b/media/formats/mp4/sync_sample_iterator.h
similarity index 85%
rename from media/mp4/sync_sample_iterator.h
rename to media/formats/mp4/sync_sample_iterator.h
index 37e2160de3..00d7f8183f 100644
--- a/media/mp4/sync_sample_iterator.h
+++ b/media/formats/mp4/sync_sample_iterator.h
@@ -4,12 +4,12 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#ifndef MEDIA_MP4_SYNC_SAMPLE_ITERATOR_H_
-#define MEDIA_MP4_SYNC_SAMPLE_ITERATOR_H_
+#ifndef MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
+#define MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
 
 #include <vector>
 
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 namespace mp4 {
@@ -44,4 +44,4 @@ class SyncSampleIterator {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_SYNC_SAMPLE_ITERATOR_H_
+#endif  // MEDIA_FORMATS_MP4_SYNC_SAMPLE_ITERATOR_H_
diff --git a/media/mp4/sync_sample_iterator_unittest.cc b/media/formats/mp4/sync_sample_iterator_unittest.cc
similarity index 96%
rename from media/mp4/sync_sample_iterator_unittest.cc
rename to media/formats/mp4/sync_sample_iterator_unittest.cc
index 59ec73bc9d..5ebab60544 100644
--- a/media/mp4/sync_sample_iterator_unittest.cc
+++ b/media/formats/mp4/sync_sample_iterator_unittest.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "media/mp4/sync_sample_iterator.h"
+#include "media/formats/mp4/sync_sample_iterator.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/media/mp4/track_run_iterator.cc b/media/formats/mp4/track_run_iterator.cc
similarity index 98%
rename from media/mp4/track_run_iterator.cc
rename to media/formats/mp4/track_run_iterator.cc
index 0ae7eeb284..510e6630c2 100644
--- a/media/mp4/track_run_iterator.cc
+++ b/media/formats/mp4/track_run_iterator.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/track_run_iterator.h"
+#include "media/formats/mp4/track_run_iterator.h"
 
 #include <algorithm>
 
 #include "media/base/buffer_reader.h"
-#include "media/mp4/chunk_info_iterator.h"
-#include "media/mp4/composition_offset_iterator.h"
-#include "media/mp4/decoding_time_iterator.h"
-#include "media/mp4/rcheck.h"
-#include "media/mp4/sync_sample_iterator.h"
+#include "media/formats/mp4/chunk_info_iterator.h"
+#include "media/formats/mp4/composition_offset_iterator.h"
+#include "media/formats/mp4/decoding_time_iterator.h"
+#include "media/formats/mp4/rcheck.h"
+#include "media/formats/mp4/sync_sample_iterator.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/mp4/track_run_iterator.h b/media/formats/mp4/track_run_iterator.h
similarity index 94%
rename from media/mp4/track_run_iterator.h
rename to media/formats/mp4/track_run_iterator.h
index ff3bd726c3..00b9992ac7 100644
--- a/media/mp4/track_run_iterator.h
+++ b/media/formats/mp4/track_run_iterator.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_TRACK_RUN_ITERATOR_H_
-#define MEDIA_MP4_TRACK_RUN_ITERATOR_H_
+#ifndef MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
+#define MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "media/mp4/box_definitions.h"
-#include "media/mp4/cenc.h"
+#include "media/formats/mp4/box_definitions.h"
+#include "media/formats/mp4/cenc.h"
 
 namespace media {
 
@@ -121,4 +121,4 @@ class TrackRunIterator {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_TRACK_RUN_ITERATOR_H_
+#endif  // MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
diff --git a/media/mp4/track_run_iterator_unittest.cc b/media/formats/mp4/track_run_iterator_unittest.cc
similarity index 99%
rename from media/mp4/track_run_iterator_unittest.cc
rename to media/formats/mp4/track_run_iterator_unittest.cc
index 8902778896..1b0aeba8f2 100644
--- a/media/mp4/track_run_iterator_unittest.cc
+++ b/media/formats/mp4/track_run_iterator_unittest.cc
@@ -5,9 +5,9 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/mp4/box_definitions.h"
-#include "media/mp4/rcheck.h"
-#include "media/mp4/track_run_iterator.h"
+#include "media/formats/mp4/box_definitions.h"
+#include "media/formats/mp4/rcheck.h"
+#include "media/formats/mp4/track_run_iterator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The sum of the elements in a vector initialized with SumAscending,
diff --git a/media/test/packager_test.cc b/media/test/packager_test.cc
index 6c34ce8da8..3859c9419a 100644
--- a/media/test/packager_test.cc
+++ b/media/test/packager_test.cc
@@ -14,7 +14,7 @@
 #include "media/base/muxer.h"
 #include "media/base/status_test_util.h"
 #include "media/base/stream_info.h"
-#include "media/mp4/mp4_muxer.h"
+#include "media/formats/mp4/mp4_muxer.h"
 #include "media/test/test_data_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/packager.gyp b/packager.gyp
index 723f2e9dd5..908f1a702c 100644
--- a/packager.gyp
+++ b/packager.gyp
@@ -27,7 +27,7 @@
       'dependencies': [
         'media/event/media_event.gyp:media_event',
         'media/file/file.gyp:file',
-        'media/mp4/mp4.gyp:mp4',
+        'media/formats/mp4/mp4.gyp:mp4',
         'third_party/gflags/gflags.gyp:gflags',
       ],
     },
@@ -52,7 +52,7 @@
       ],
       'dependencies': [
         'media/file/file.gyp:file',
-        'media/mp4/mp4.gyp:mp4',
+        'media/formats/mp4/mp4.gyp:mp4',
         'media/test/media_test.gyp:media_test_support',
         'testing/gtest.gyp:gtest',
       ],
@@ -64,7 +64,7 @@
         'media/base/media_base.gyp:*',
         'media/event/media_event.gyp:*',
         'media/file/file.gyp:*',
-        'media/mp4/mp4.gyp:*',
+        'media/formats/mp4/mp4.gyp:*',
         'mpd/mpd.gyp:*',
       ],
     },
@@ -75,7 +75,7 @@
         'media/base/media_base.gyp:media_base_unittest',
         'media/event/media_event.gyp:media_event_unittest',
         'media/file/file.gyp:file_unittest',
-        'media/mp4/mp4.gyp:mp4_unittest',
+        'media/formats/mp4/mp4.gyp:mp4_unittest',
         'mpd/mpd.gyp:mpd_unittest',
         'packager_test',
       ],