94 files changed, 427 insertions, 429 deletions

diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc
index 8fb6a56..6b5c0dc 100644
--- a/media/cdm/aes_decryptor_unittest.cc
+++ b/media/cdm/aes_decryptor_unittest.cc
@@ -11,7 +11,6 @@
 #include "media/base/decrypt_config.h"
 #include "media/base/mock_filters.h"
 #include "media/cdm/aes_decryptor.h"
-#include "media/webm/webm_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index 0efb712..d2c410da 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -16,9 +16,9 @@
 #include "media/base/test_data_util.h"
 #include "media/base/test_helpers.h"
 #include "media/filters/chunk_demuxer.h"
-#include "media/webm/cluster_builder.h"
-#include "media/webm/webm_constants.h"
-#include "media/webm/webm_crypto_helpers.h"
+#include "media/formats/webm/cluster_builder.h"
+#include "media/formats/webm/webm_constants.h"
+#include "media/formats/webm/webm_crypto_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::AnyNumber;
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index a9b4d9b..e032471 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -30,7 +30,7 @@
 #include "media/filters/ffmpeg_glue.h"
 #include "media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h"
 #include "media/filters/webvtt_util.h"
-#include "media/webm/webm_crypto_helpers.h"
+#include "media/formats/webm/webm_crypto_helpers.h"
 
 namespace media {
 
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index e498d66..0a3fe64 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -17,7 +17,7 @@
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/file_data_source.h"
-#include "media/webm/webm_crypto_helpers.h"
+#include "media/formats/webm/webm_crypto_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::AnyNumber;
diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc
index 3d99e93..6b22f4d 100644
--- a/media/filters/stream_parser_factory.cc
+++ b/media/filters/stream_parser_factory.cc
@@ -10,8 +10,8 @@
 #include "base/strings/string_util.h"
 #include "media/base/media_log.h"
 #include "media/base/media_switches.h"
-#include "media/mp3/mp3_stream_parser.h"
-#include "media/webm/webm_stream_parser.h"
+#include "media/formats/mp3/mp3_stream_parser.h"
+#include "media/formats/webm/webm_stream_parser.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
@@ -19,10 +19,10 @@
 
 #if defined(USE_PROPRIETARY_CODECS)
 #if defined(ENABLE_MPEG2TS_STREAM_PARSER)
-#include "media/mp2t/mp2t_stream_parser.h"
+#include "media/formats/mp2t/mp2t_stream_parser.h"
 #endif
-#include "media/mp4/es_descriptor.h"
-#include "media/mp4/mp4_stream_parser.h"
+#include "media/formats/mp4/es_descriptor.h"
+#include "media/formats/mp4/mp4_stream_parser.h"
 #endif
 
 namespace media {
diff --git a/media/mp2t/es_parser.h b/media/formats/mp2t/es_parser.h
index da06c5e..5297d32 100644
--- a/media/mp2t/es_parser.h
+++ b/media/formats/mp2t/es_parser.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP2T_ES_PARSER_H_
-#define MEDIA_MP2T_ES_PARSER_H_
+#ifndef MEDIA_FORMATS_MP2T_ES_PARSER_H_
+#define MEDIA_FORMATS_MP2T_ES_PARSER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
diff --git a/media/mp2t/es_parser_adts.cc b/media/formats/mp2t/es_parser_adts.cc
index 85de023..d8bc407 100644
--- a/media/mp2t/es_parser_adts.cc
+++ b/media/formats/mp2t/es_parser_adts.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp2t/es_parser_adts.h"
+#include "media/formats/mp2t/es_parser_adts.h"
 
 #include <list>
 
@@ -14,7 +14,7 @@
 #include "media/base/buffers.h"
 #include "media/base/channel_layout.h"
 #include "media/base/stream_parser_buffer.h"
-#include "media/mp2t/mp2t_common.h"
+#include "media/formats/mp2t/mp2t_common.h"
 
 // Adts header is at least 7 bytes (can be 9 bytes).
 static const int kAdtsHeaderMinSize = 7;
diff --git a/media/mp2t/es_parser_adts.h b/media/formats/mp2t/es_parser_adts.h
index 0fc619f..e55eaf7 100644
--- a/media/mp2t/es_parser_adts.h
+++ b/media/formats/mp2t/es_parser_adts.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP2T_ES_PARSER_ADTS_H_
-#define MEDIA_MP2T_ES_PARSER_ADTS_H_
+#ifndef MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_H_
+#define MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_H_
 
 #include <list>
 #include <utility>
@@ -14,7 +14,7 @@
 #include "base/time/time.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/byte_queue.h"
-#include "media/mp2t/es_parser.h"
+#include "media/formats/mp2t/es_parser.h"
 
 namespace media {
 class AudioTimestampHelper;
diff --git a/media/mp2t/es_parser_h264.cc b/media/formats/mp2t/es_parser_h264.cc
index bb75106..3a834a7 100644
--- a/media/mp2t/es_parser_h264.cc
+++ b/media/formats/mp2t/es_parser_h264.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp2t/es_parser_h264.h"
+#include "media/formats/mp2t/es_parser_h264.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ -10,7 +10,7 @@
 #include "media/base/buffers.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/video_frame.h"
-#include "media/mp2t/mp2t_common.h"
+#include "media/formats/mp2t/mp2t_common.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
diff --git a/media/mp2t/es_parser_h264.h b/media/formats/mp2t/es_parser_h264.h
index 3e3d31c..b3da98c 100644
--- a/media/mp2t/es_parser_h264.h
+++ b/media/formats/mp2t/es_parser_h264.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP2T_ES_PARSER_H264_H_
-#define MEDIA_MP2T_ES_PARSER_H264_H_
+#ifndef MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
+#define MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
 
 #include <list>
 #include <utility>
@@ -14,7 +14,7 @@
 #include "base/time/time.h"
 #include "media/base/byte_queue.h"
 #include "media/base/video_decoder_config.h"
-#include "media/mp2t/es_parser.h"
+#include "media/formats/mp2t/es_parser.h"
 
 namespace media {
 class BitReader;
diff --git a/media/mp2t/mp2t_common.h b/media/formats/mp2t/mp2t_common.h
index 7bc8d7b..64446fb 100644
--- a/media/mp2t/mp2t_common.h
+++ b/media/formats/mp2t/mp2t_common.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP2T_MP2T_COMMON_H_
-#define MEDIA_MP2T_MP2T_COMMON_H_
+#ifndef MEDIA_FORMATS_MP2T_MP2T_COMMON_H_
+#define MEDIA_FORMATS_MP2T_MP2T_COMMON_H_
 
 #define LOG_LEVEL_TS  5
 #define LOG_LEVEL_PES 4
diff --git a/media/mp2t/mp2t_stream_parser.cc b/media/formats/mp2t/mp2t_stream_parser.cc
index 4a22f37..5cae16d 100644
--- a/media/mp2t/mp2t_stream_parser.cc
+++ b/media/formats/mp2t/mp2t_stream_parser.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp2t/mp2t_stream_parser.h"
+#include "media/formats/mp2t/mp2t_stream_parser.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ -12,15 +12,15 @@
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
-#include "media/mp2t/es_parser.h"
-#include "media/mp2t/es_parser_adts.h"
-#include "media/mp2t/es_parser_h264.h"
-#include "media/mp2t/mp2t_common.h"
-#include "media/mp2t/ts_packet.h"
-#include "media/mp2t/ts_section.h"
-#include "media/mp2t/ts_section_pat.h"
-#include "media/mp2t/ts_section_pes.h"
-#include "media/mp2t/ts_section_pmt.h"
+#include "media/formats/mp2t/es_parser.h"
+#include "media/formats/mp2t/es_parser_adts.h"
+#include "media/formats/mp2t/es_parser_h264.h"
+#include "media/formats/mp2t/mp2t_common.h"
+#include "media/formats/mp2t/ts_packet.h"
+#include "media/formats/mp2t/ts_section.h"
+#include "media/formats/mp2t/ts_section_pat.h"
+#include "media/formats/mp2t/ts_section_pes.h"
+#include "media/formats/mp2t/ts_section_pmt.h"
 
 namespace media {
 namespace mp2t {
diff --git a/media/mp2t/mp2t_stream_parser.h b/media/formats/mp2t/mp2t_stream_parser.h
index 11e48d1..20a1353 100644
--- a/media/mp2t/mp2t_stream_parser.h
+++ b/media/formats/mp2t/mp2t_stream_parser.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP2T_MP2T_STREAM_PARSER_H_
-#define MEDIA_MP2T_MP2T_STREAM_PARSER_H_
+#ifndef MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_
+#define MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_
 
 #include <list>
 #include <map>
diff --git a/media/mp2t/mp2t_stream_parser_unittest.cc b/media/formats/mp2t/mp2t_stream_parser_unittest.cc
index fab0a00..a88e40e 100644
--- a/media/mp2t/mp2t_stream_parser_unittest.cc
+++ b/media/formats/mp2t/mp2t_stream_parser_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -16,7 +16,7 @@
 #include "media/base/test_data_util.h"
 #include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
-#include "media/mp2t/mp2t_stream_parser.h"
+#include "media/formats/mp2t/mp2t_stream_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
diff --git a/media/mp2t/ts_packet.cc b/media/formats/mp2t/ts_packet.cc
index 6b41e90..8463c11 100644
--- a/media/mp2t/ts_packet.cc
+++ b/media/formats/mp2t/ts_packet.cc
@@ -1,12 +1,12 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp2t/ts_packet.h"
+#include "media/formats/mp2t/ts_packet.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "media/base/bit_reader.h"
-#include "media/mp2t/mp2t_common.h"
+#include "media/formats/mp2t/mp2t_common.h"
 
 namespace media {
 namespace mp2t {
diff --git a/media/mp2t/ts_packet.h b/media/formats/mp2t/ts_packet.h
index f3537bc..a232705 100644
--- a/media/mp2t/ts_packet.h
+++ b/media/formats/mp2t/ts_packet.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP2T_TS_PACKET_H_
-#define MEDIA_MP2T_TS_PACKET_H_
+#ifndef MEDIA_FORMATS_MP2T_TS_PACKET_H_
+#define MEDIA_FORMATS_MP2T_TS_PACKET_H_
 
 #include "base/basictypes.h"
 
diff --git a/media/mp2t/ts_section.h b/media/formats/mp2t/ts_section.h
index 1b7453f..9273733 100644
--- a/media/mp2t/ts_section.h
+++ b/media/formats/mp2t/ts_section.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP2T_TS_SECTION_H_
-#define MEDIA_MP2T_TS_SECTION_H_
+#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_H_
+#define MEDIA_FORMATS_MP2T_TS_SECTION_H_
 
 namespace media {
 namespace mp2t {
diff --git a/media/mp2t/ts_section_pat.cc b/media/formats/mp2t/ts_section_pat.cc
index ef5a21c..2fcc24b 100644
--- a/media/mp2t/ts_section_pat.cc
+++ b/media/formats/mp2t/ts_section_pat.cc
@@ -1,14 +1,14 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp2t/ts_section_pat.h"
+#include "media/formats/mp2t/ts_section_pat.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
-#include "media/mp2t/mp2t_common.h"
+#include "media/formats/mp2t/mp2t_common.h"
 
 namespace media {
 namespace mp2t {
diff --git a/media/mp2t/ts_section_pat.h b/media/formats/mp2t/ts_section_pat.h
index 84f33de..f8079ad 100644
--- a/media/mp2t/ts_section_pat.h
+++ b/media/formats/mp2t/ts_section_pat.h
@@ -1,13 +1,13 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP2T_TS_SECTION_PAT_H_
-#define MEDIA_MP2T_TS_SECTION_PAT_H_
+#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_
+#define MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "media/mp2t/ts_section_psi.h"
+#include "media/formats/mp2t/ts_section_psi.h"
 
 namespace media {
 namespace mp2t {
diff --git a/media/mp2t/ts_section_pes.cc b/media/formats/mp2t/ts_section_pes.cc
index ff0beaa..de69a32 100644
--- a/media/mp2t/ts_section_pes.cc
+++ b/media/formats/mp2t/ts_section_pes.cc
@@ -1,15 +1,15 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp2t/ts_section_pes.h"
+#include "media/formats/mp2t/ts_section_pes.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/base/bit_reader.h"
 #include "media/base/buffers.h"
-#include "media/mp2t/es_parser.h"
-#include "media/mp2t/mp2t_common.h"
+#include "media/formats/mp2t/es_parser.h"
+#include "media/formats/mp2t/mp2t_common.h"
 
 static const int kPesStartCode = 0x000001;
 
diff --git a/media/mp2t/ts_section_pes.h b/media/formats/mp2t/ts_section_pes.h
index b80473a..b442ae4 100644
--- a/media/mp2t/ts_section_pes.h
+++ b/media/formats/mp2t/ts_section_pes.h
@@ -1,15 +1,15 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP2T_TS_SECTION_PES_H_
-#define MEDIA_MP2T_TS_SECTION_PES_H_
+#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_
+#define MEDIA_FORMATS_MP2T_TS_SECTION_PES_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/byte_queue.h"
-#include "media/mp2t/ts_section.h"
+#include "media/formats/mp2t/ts_section.h"
 
 namespace media {
 namespace mp2t {
diff --git a/media/mp2t/ts_section_pmt.cc b/media/formats/mp2t/ts_section_pmt.cc
index f20e79f..72b492a 100644
--- a/media/mp2t/ts_section_pmt.cc
+++ b/media/formats/mp2t/ts_section_pmt.cc
@@ -1,14 +1,14 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp2t/ts_section_pmt.h"
+#include "media/formats/mp2t/ts_section_pmt.h"
 
 #include <map>
 
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
-#include "media/mp2t/mp2t_common.h"
+#include "media/formats/mp2t/mp2t_common.h"
 
 namespace media {
 namespace mp2t {
diff --git a/media/mp2t/ts_section_pmt.h b/media/formats/mp2t/ts_section_pmt.h
index ece4d16..c1b3d46 100644
--- a/media/mp2t/ts_section_pmt.h
+++ b/media/formats/mp2t/ts_section_pmt.h
@@ -1,13 +1,13 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP2T_TS_SECTION_PMT_H_
-#define MEDIA_MP2T_TS_SECTION_PMT_H_
+#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
+#define MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "media/mp2t/ts_section_psi.h"
+#include "media/formats/mp2t/ts_section_psi.h"
 
 namespace media {
 namespace mp2t {
diff --git a/media/mp2t/ts_section_psi.cc b/media/formats/mp2t/ts_section_psi.cc
index f8a6fc3..f9db880 100644
--- a/media/mp2t/ts_section_psi.cc
+++ b/media/formats/mp2t/ts_section_psi.cc
@@ -1,13 +1,13 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp2t/ts_section_psi.h"
+#include "media/formats/mp2t/ts_section_psi.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
-#include "media/mp2t/mp2t_common.h"
+#include "media/formats/mp2t/mp2t_common.h"
 
 static bool IsCrcValid(const uint8* buf, int size) {
   uint32 crc = 0xffffffffu;
diff --git a/media/mp2t/ts_section_psi.h b/media/formats/mp2t/ts_section_psi.h
index a631446..1b81884 100644
--- a/media/mp2t/ts_section_psi.h
+++ b/media/formats/mp2t/ts_section_psi.h
@@ -1,13 +1,13 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP2T_TS_SECTION_PSI_H_
-#define MEDIA_MP2T_TS_SECTION_PSI_H_
+#ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_
+#define MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_
 
 #include "base/compiler_specific.h"
 #include "media/base/byte_queue.h"
-#include "media/mp2t/ts_section.h"
+#include "media/formats/mp2t/ts_section.h"
 
 namespace media {
 
diff --git a/media/mp3/mp3_stream_parser.cc b/media/formats/mp3/mp3_stream_parser.cc
index 4b705e1..3834f7a 100644
--- a/media/mp3/mp3_stream_parser.cc
+++ b/media/formats/mp3/mp3_stream_parser.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp3/mp3_stream_parser.h"
+#include "media/formats/mp3/mp3_stream_parser.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
diff --git a/media/mp3/mp3_stream_parser.h b/media/formats/mp3/mp3_stream_parser.h
index 1e2e8c6..5d1778c 100644
--- a/media/mp3/mp3_stream_parser.h
+++ b/media/formats/mp3/mp3_stream_parser.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP3_MP3_STREAM_PARSER_H_
-#define MEDIA_MP3_MP3_STREAM_PARSER_H_
+#ifndef MEDIA_FORMATS_MP3_MP3_STREAM_PARSER_H_
+#define MEDIA_FORMATS_MP3_MP3_STREAM_PARSER_H_
 
 #include <set>
 #include <vector>
@@ -123,4 +123,4 @@ class MEDIA_EXPORT MP3StreamParser : public StreamParser {
 
 }  // namespace media
 
-#endif  // MEDIA_MP3_MP3_STREAM_PARSER_H_
+#endif  // MEDIA_FORMATS_MP3_MP3_STREAM_PARSER_H_
diff --git a/media/mp3/mp3_stream_parser_unittest.cc b/media/formats/mp3/mp3_stream_parser_unittest.cc
index f565093..a279a1c 100644
--- a/media/mp3/mp3_stream_parser_unittest.cc
+++ b/media/formats/mp3/mp3_stream_parser_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,7 +9,7 @@
 #include "media/base/test_data_util.h"
 #include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
-#include "media/mp3/mp3_stream_parser.h"
+#include "media/formats/mp3/mp3_stream_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
diff --git a/media/mp4/aac.cc b/media/formats/mp4/aac.cc
index 6604c50..fedb33f 100644
--- a/media/mp4/aac.cc
+++ b/media/formats/mp4/aac.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/aac.h"
+#include "media/formats/mp4/aac.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
 
 // The following conversion table is extracted from ISO 14496 Part 3 -
 // Table 1.16 - Sampling Frequency Index.
diff --git a/media/mp4/aac.h b/media/formats/mp4/aac.h
index 1a546b7..333d621 100644
--- a/media/mp4/aac.h
+++ b/media/formats/mp4/aac.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_AAC_H_
-#define MEDIA_MP4_AAC_H_
+#ifndef MEDIA_FORMATS_MP4_AAC_H_
+#define MEDIA_FORMATS_MP4_AAC_H_
 
 #include <vector>
 
@@ -91,4 +91,4 @@ class MEDIA_EXPORT AAC {
 
 }  // namespace media
 
-#endif  // MEDIA_MP4_AAC_H_
+#endif  // MEDIA_FORMATS_MP4_AAC_H_
diff --git a/media/mp4/aac_unittest.cc b/media/formats/mp4/aac_unittest.cc
index d9ce22d..6c2e797 100644
--- a/media/mp4/aac_unittest.cc
+++ b/media/formats/mp4/aac_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/aac.h"
+#include "media/formats/mp4/aac.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/media/mp4/avc.cc b/media/formats/mp4/avc.cc
index ae28ffd..6b670fe 100644
--- a/media/mp4/avc.cc
+++ b/media/formats/mp4/avc.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/avc.h"
+#include "media/formats/mp4/avc.h"
 
 #include <algorithm>
 #include <vector>
 
-#include "media/mp4/box_definitions.h"
-#include "media/mp4/box_reader.h"
+#include "media/formats/mp4/box_definitions.h"
+#include "media/formats/mp4/box_reader.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/mp4/avc.h b/media/formats/mp4/avc.h
index 3d815a1..731e401 100644
--- a/media/mp4/avc.h
+++ b/media/formats/mp4/avc.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_AVC_H_
-#define MEDIA_MP4_AVC_H_
+#ifndef MEDIA_FORMATS_MP4_AVC_H_
+#define MEDIA_FORMATS_MP4_AVC_H_
 
 #include <vector>
 
@@ -27,4 +27,4 @@ class MEDIA_EXPORT AVC {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_AVC_H_
+#endif  // MEDIA_FORMATS_MP4_AVC_H_
diff --git a/media/mp4/avc_unittest.cc b/media/formats/mp4/avc_unittest.cc
index 766a979..f6a1d569 100644
--- a/media/mp4/avc_unittest.cc
+++ b/media/formats/mp4/avc_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,10 +6,9 @@
 
 #include "base/basictypes.h"
 #include "media/base/stream_parser_buffer.h"
-#include "media/mp4/avc.h"
-#include "media/mp4/box_definitions.h"
+#include "media/formats/mp4/avc.h"
+#include "media/formats/mp4/box_definitions.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "testing/gtest/include/gtest/gtest-param-test.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc
index 6ceda30..8367fd4 100644
--- a/media/mp4/box_definitions.cc
+++ b/media/formats/mp4/box_definitions.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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/mp4/es_descriptor.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/es_descriptor.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/mp4/box_definitions.h b/media/formats/mp4/box_definitions.h
index 98f02ab..9daa82e 100644
--- a/media/mp4/box_definitions.h
+++ b/media/formats/mp4/box_definitions.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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>
@@ -11,10 +11,10 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "media/base/media_export.h"
-#include "media/mp4/aac.h"
-#include "media/mp4/avc.h"
-#include "media/mp4/box_reader.h"
-#include "media/mp4/fourccs.h"
+#include "media/formats/mp4/aac.h"
+#include "media/formats/mp4/avc.h"
+#include "media/formats/mp4/box_reader.h"
+#include "media/formats/mp4/fourccs.h"
 
 namespace media {
 namespace mp4 {
@@ -379,4 +379,4 @@ struct MEDIA_EXPORT MovieFragment : Box {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_BOX_DEFINITIONS_H_
+#endif  // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
diff --git a/media/mp4/box_reader.cc b/media/formats/mp4/box_reader.cc
index c788772..57e095a 100644
--- a/media/mp4/box_reader.cc
+++ b/media/formats/mp4/box_reader.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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 <string.h>
 #include <algorithm>
@@ -11,8 +11,8 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/mp4/box_definitions.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/box_definitions.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/mp4/box_reader.h b/media/formats/mp4/box_reader.h
index 43f11d56..d4b608e7 100644
--- a/media/mp4/box_reader.h
+++ b/media/formats/mp4/box_reader.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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>
@@ -12,8 +12,8 @@
 #include "base/logging.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.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 {
@@ -211,4 +211,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
index 99d9975..eae3fa5 100644
--- a/media/mp4/box_reader_unittest.cc
+++ b/media/formats/mp4/box_reader_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,8 +7,8 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/mp4/box_reader.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/box_reader.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
index 10f3a2a..001b6d8 100644
--- a/media/mp4/cenc.cc
+++ b/media/formats/mp4/cenc.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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/mp4/box_reader.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/box_reader.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace media {
 namespace mp4 {
diff --git a/media/mp4/cenc.h b/media/formats/mp4/cenc.h
index e427091..9eb3358 100644
--- a/media/mp4/cenc.h
+++ b/media/formats/mp4/cenc.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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>
 
@@ -29,4 +29,4 @@ struct FrameCENCInfo {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_CENC_H_
+#endif  // MEDIA_FORMATS_MP4_CENC_H_
diff --git a/media/mp4/es_descriptor.cc b/media/formats/mp4/es_descriptor.cc
index 8517b82..e1da28a 100644
--- a/media/mp4/es_descriptor.cc
+++ b/media/formats/mp4/es_descriptor.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
 
 // The elementary stream size is specific by up to 4 bytes.
 // The MSB of a byte indicates if there are more bytes for the size.
diff --git a/media/mp4/es_descriptor.h b/media/formats/mp4/es_descriptor.h
index 47ba06c..1df4526 100644
--- a/media/mp4/es_descriptor.h
+++ b/media/formats/mp4/es_descriptor.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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>
 
@@ -58,4 +58,4 @@ class MEDIA_EXPORT 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
index c3a39fb..6334f5b 100644
--- a/media/mp4/es_descriptor_unittest.cc
+++ b/media/formats/mp4/es_descriptor_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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
index 8f5cb90..3914221 100644
--- a/media/mp4/fourccs.h
+++ b/media/formats/mp4/fourccs.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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>
 
@@ -97,4 +97,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/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc
index 8b27a64..a8038ea 100644
--- a/media/mp4/mp4_stream_parser.cc
+++ b/media/formats/mp4/mp4_stream_parser.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/mp4/mp4_stream_parser.h"
+#include "media/formats/mp4/mp4_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ -13,10 +13,10 @@
 #include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_util.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/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"
 
 namespace media {
 namespace mp4 {
diff --git a/media/mp4/mp4_stream_parser.h b/media/formats/mp4/mp4_stream_parser.h
index 946513f..d229852 100644
--- a/media/mp4/mp4_stream_parser.h
+++ b/media/formats/mp4/mp4_stream_parser.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_MP4_MP4_STREAM_PARSER_H_
-#define MEDIA_MP4_MP4_STREAM_PARSER_H_
+#ifndef MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
+#define MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
 
 #include <set>
 #include <vector>
@@ -14,8 +14,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "media/base/stream_parser.h"
-#include "media/mp4/offset_byte_queue.h"
-#include "media/mp4/track_run_iterator.h"
+#include "media/formats/mp4/offset_byte_queue.h"
+#include "media/formats/mp4/track_run_iterator.h"
 
 namespace media {
 namespace mp4 {
@@ -118,4 +118,4 @@ class MEDIA_EXPORT MP4StreamParser : public StreamParser {
 }  // namespace mp4
 }  // namespace media
 
-#endif  // MEDIA_MP4_MP4_STREAM_PARSER_H_
+#endif  // MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
diff --git a/media/mp4/mp4_stream_parser_unittest.cc b/media/formats/mp4/mp4_stream_parser_unittest.cc
index dd394c4..0f9260a 100644
--- a/media/mp4/mp4_stream_parser_unittest.cc
+++ b/media/formats/mp4/mp4_stream_parser_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -16,8 +16,8 @@
 #include "media/base/test_data_util.h"
 #include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
-#include "media/mp4/es_descriptor.h"
-#include "media/mp4/mp4_stream_parser.h"
+#include "media/formats/mp4/es_descriptor.h"
+#include "media/formats/mp4/mp4_stream_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
diff --git a/media/mp4/offset_byte_queue.cc b/media/formats/mp4/offset_byte_queue.cc
index a530150..a23a634 100644
--- a/media/mp4/offset_byte_queue.cc
+++ b/media/formats/mp4/offset_byte_queue.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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
index 9349b96..a54ee8f 100644
--- a/media/mp4/offset_byte_queue.h
+++ b/media/formats/mp4/offset_byte_queue.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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"
@@ -63,4 +63,4 @@ class MEDIA_EXPORT OffsetByteQueue {
 
 }  // namespace media
 
-#endif  // MEDIA_MP4_MP4_STREAM_PARSER_H_
+#endif  // MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
diff --git a/media/mp4/offset_byte_queue_unittest.cc b/media/formats/mp4/offset_byte_queue_unittest.cc
index b9afbc8..d3ce32d 100644
--- a/media/mp4/offset_byte_queue_unittest.cc
+++ b/media/formats/mp4/offset_byte_queue_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -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
index 8165056..fb0f8f2 100644
--- a/media/mp4/rcheck.h
+++ b/media/formats/mp4/rcheck.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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/track_run_iterator.cc b/media/formats/mp4/track_run_iterator.cc
index 9f1c761..e2a145e 100644
--- a/media/mp4/track_run_iterator.cc
+++ b/media/formats/mp4/track_run_iterator.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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/buffers.h"
 #include "media/base/stream_parser_buffer.h"
-#include "media/mp4/rcheck.h"
+#include "media/formats/mp4/rcheck.h"
 
 namespace {
 static const uint32 kSampleIsDifferenceSampleFlagMask = 0x10000;
diff --git a/media/mp4/track_run_iterator.h b/media/formats/mp4/track_run_iterator.h
index a21c5ba..829dd11 100644
--- a/media/mp4/track_run_iterator.h
+++ b/media/formats/mp4/track_run_iterator.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // 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>
 
@@ -11,8 +11,8 @@
 #include "base/time/time.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.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 {
 
@@ -105,4 +105,4 @@ class MEDIA_EXPORT 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
index 11163d4..ea37bab 100644
--- a/media/mp4/track_run_iterator_unittest.cc
+++ b/media/formats/mp4/track_run_iterator_unittest.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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/webm/chromeos/DEPS b/media/formats/webm/chromeos/DEPS
index a4378dc..a4378dc 100644
--- a/media/webm/chromeos/DEPS
+++ b/media/formats/webm/chromeos/DEPS
diff --git a/media/webm/chromeos/ebml_writer.cc b/media/formats/webm/chromeos/ebml_writer.cc
index 84a9760..c00063f 100644
--- a/media/webm/chromeos/ebml_writer.cc
+++ b/media/formats/webm/chromeos/ebml_writer.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/chromeos/ebml_writer.h"
+#include "media/formats/webm/chromeos/ebml_writer.h"
 
 #include "media/base/media_export.h"
 
diff --git a/media/webm/chromeos/ebml_writer.h b/media/formats/webm/chromeos/ebml_writer.h
index 0714ebf..3c1faa0 100644
--- a/media/webm/chromeos/ebml_writer.h
+++ b/media/formats/webm/chromeos/ebml_writer.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_CHROMEOS_EBML_WRITER_H_
-#define MEDIA_WEBM_CHROMEOS_EBML_WRITER_H_
+#ifndef MEDIA_FORMATS_WEBM_CHROMEOS_EBML_WRITER_H_
+#define MEDIA_FORMATS_WEBM_CHROMEOS_EBML_WRITER_H_
 
 #include "base/callback.h"
 
@@ -18,4 +18,4 @@ struct EbmlGlobal {
       serialize_cb;
 };
 
-#endif  // MEDIA_WEBM_CHROMEOS_EBML_WRITER_H_
+#endif  // MEDIA_FORMATS_WEBM_CHROMEOS_EBML_WRITER_H_
diff --git a/media/webm/chromeos/webm_encoder.cc b/media/formats/webm/chromeos/webm_encoder.cc
index 059f9c6f..4b5c782 100644
--- a/media/webm/chromeos/webm_encoder.cc
+++ b/media/formats/webm/chromeos/webm_encoder.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/chromeos/webm_encoder.h"
+#include "media/formats/webm/chromeos/webm_encoder.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
diff --git a/media/webm/chromeos/webm_encoder.h b/media/formats/webm/chromeos/webm_encoder.h
index 126c0d2..fd0fc75 100644
--- a/media/webm/chromeos/webm_encoder.h
+++ b/media/formats/webm/chromeos/webm_encoder.h
@@ -1,16 +1,16 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_CHROMEOS_WEBM_ENCODER_H_
-#define MEDIA_WEBM_CHROMEOS_WEBM_ENCODER_H_
+#ifndef MEDIA_FORMATS_WEBM_CHROMEOS_WEBM_ENCODER_H_
+#define MEDIA_FORMATS_WEBM_CHROMEOS_WEBM_ENCODER_H_
 
 #include <stdio.h>
 #include <stack>
 
 #include "base/files/file_path.h"
 #include "media/base/media_export.h"
-#include "media/webm/chromeos/ebml_writer.h"
+#include "media/formats/webm/chromeos/ebml_writer.h"
 
 extern "C" {
 #define VPX_CODEC_DISABLE_COMPAT 1
@@ -103,4 +103,4 @@ class MEDIA_EXPORT WebmEncoder {
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_CHROMEOS_WEBM_ENCODER_H_
+#endif  // MEDIA_FORMATS_WEBM_CHROMEOS_WEBM_ENCODER_H_
diff --git a/media/webm/cluster_builder.cc b/media/formats/webm/cluster_builder.cc
index e320cbb..ec95616 100644
--- a/media/webm/cluster_builder.cc
+++ b/media/formats/webm/cluster_builder.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/cluster_builder.h"
+#include "media/formats/webm/cluster_builder.h"
 
 #include "base/logging.h"
 #include "media/base/data_buffer.h"
diff --git a/media/webm/cluster_builder.h b/media/formats/webm/cluster_builder.h
index 3482cfb..98f0f6c 100644
--- a/media/webm/cluster_builder.h
+++ b/media/formats/webm/cluster_builder.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_CLUSTER_BUILDER_H_
-#define MEDIA_WEBM_CLUSTER_BUILDER_H_
+#ifndef MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_
+#define MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -56,4 +56,4 @@ class ClusterBuilder {
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_CLUSTER_BUILDER_H_
+#endif  // MEDIA_FORMATS_WEBM_CLUSTER_BUILDER_H_
diff --git a/media/webm/tracks_builder.cc b/media/formats/webm/tracks_builder.cc
index 3ad5953..5a49ce0 100644
--- a/media/webm/tracks_builder.cc
+++ b/media/formats/webm/tracks_builder.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/tracks_builder.h"
+#include "media/formats/webm/tracks_builder.h"
 
-#include "media/webm/webm_constants.h"
+#include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
diff --git a/media/webm/tracks_builder.h b/media/formats/webm/tracks_builder.h
index fca9dfe..ecd0fe5 100644
--- a/media/webm/tracks_builder.h
+++ b/media/formats/webm/tracks_builder.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_TRACKS_BUILDER_H_
-#define MEDIA_WEBM_TRACKS_BUILDER_H_
+#ifndef MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
+#define MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
 
 #include <list>
 #include <string>
@@ -56,4 +56,4 @@ class TracksBuilder {
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_TRACKS_BUILDER_H_
+#endif  // MEDIA_FORMATS_WEBM_TRACKS_BUILDER_H_
diff --git a/media/webm/webm_audio_client.cc b/media/formats/webm/webm_audio_client.cc
index 1ef640c..6de4502 100644
--- a/media/webm/webm_audio_client.cc
+++ b/media/formats/webm/webm_audio_client.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/webm_audio_client.h"
+#include "media/formats/webm/webm_audio_client.h"
 
 #include "media/base/audio_decoder_config.h"
 #include "media/base/channel_layout.h"
-#include "media/webm/webm_constants.h"
+#include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
diff --git a/media/webm/webm_audio_client.h b/media/formats/webm/webm_audio_client.h
index 7874cec..a723b0d 100644
--- a/media/webm/webm_audio_client.h
+++ b/media/formats/webm/webm_audio_client.h
@@ -1,15 +1,15 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_WEBM_AUDIO_CLIENT_H_
-#define MEDIA_WEBM_WEBM_AUDIO_CLIENT_H_
+#ifndef MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_
+#define MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_
 
 #include <string>
 #include <vector>
 
 #include "media/base/media_log.h"
-#include "media/webm/webm_parser.h"
+#include "media/formats/webm/webm_parser.h"
 
 namespace media {
 class AudioDecoderConfig;
@@ -51,4 +51,4 @@ class WebMAudioClient : public WebMParserClient {
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_WEBM_AUDIO_CLIENT_H_
+#endif  // MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_
diff --git a/media/webm/webm_cluster_parser.cc b/media/formats/webm/webm_cluster_parser.cc
index db76096..e662f83 100644
--- a/media/webm/webm_cluster_parser.cc
+++ b/media/formats/webm/webm_cluster_parser.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/webm_cluster_parser.h"
+#include "media/formats/webm/webm_cluster_parser.h"
 
 #include <vector>
 
@@ -11,9 +11,9 @@
 #include "media/base/buffers.h"
 #include "media/base/decrypt_config.h"
 #include "media/filters/webvtt_util.h"
-#include "media/webm/webm_constants.h"
-#include "media/webm/webm_crypto_helpers.h"
-#include "media/webm/webm_webvtt_parser.h"
+#include "media/formats/webm/webm_constants.h"
+#include "media/formats/webm/webm_crypto_helpers.h"
+#include "media/formats/webm/webm_webvtt_parser.h"
 
 namespace media {
 
diff --git a/media/webm/webm_cluster_parser.h b/media/formats/webm/webm_cluster_parser.h
index 5aa957c..db683f6 100644
--- a/media/webm/webm_cluster_parser.h
+++ b/media/formats/webm/webm_cluster_parser.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
-#define MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
+#ifndef MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
+#define MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
 
 #include <deque>
 #include <map>
@@ -14,8 +14,8 @@
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
 #include "media/base/stream_parser_buffer.h"
-#include "media/webm/webm_parser.h"
-#include "media/webm/webm_tracks_parser.h"
+#include "media/formats/webm/webm_parser.h"
+#include "media/formats/webm/webm_tracks_parser.h"
 
 namespace media {
 
@@ -156,4 +156,4 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_WEBM_CLUSTER_PARSER_H_
+#endif  // MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
diff --git a/media/webm/webm_cluster_parser_unittest.cc b/media/formats/webm/webm_cluster_parser_unittest.cc
index a8187f5..a358cfe 100644
--- a/media/webm/webm_cluster_parser_unittest.cc
+++ b/media/formats/webm/webm_cluster_parser_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,9 +7,9 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "media/base/decrypt_config.h"
-#include "media/webm/cluster_builder.h"
-#include "media/webm/webm_cluster_parser.h"
-#include "media/webm/webm_constants.h"
+#include "media/formats/webm/cluster_builder.h"
+#include "media/formats/webm/webm_cluster_parser.h"
+#include "media/formats/webm/webm_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/media/webm/webm_constants.cc b/media/formats/webm/webm_constants.cc
index 13ae086..d6c5536 100644
--- a/media/webm/webm_constants.cc
+++ b/media/formats/webm/webm_constants.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/webm_constants.h"
+#include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
diff --git a/media/webm/webm_constants.h b/media/formats/webm/webm_constants.h
index 3a35dba..6803bf7 100644
--- a/media/webm/webm_constants.h
+++ b/media/formats/webm/webm_constants.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_WEBM_CONSTANTS_H_
-#define MEDIA_WEBM_WEBM_CONSTANTS_H_
+#ifndef MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
+#define MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
 
 #include "base/basictypes.h"
 #include "media/base/media_export.h"
@@ -226,4 +226,4 @@ MEDIA_EXPORT extern const char kWebMCodecMetadata[];
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_WEBM_CONSTANTS_H_
+#endif  // MEDIA_FORMATS_WEBM_WEBM_CONSTANTS_H_
diff --git a/media/webm/webm_content_encodings.cc b/media/formats/webm/webm_content_encodings.cc
index 9789c0f..157c6ac 100644
--- a/media/webm/webm_content_encodings.cc
+++ b/media/formats/webm/webm_content_encodings.cc
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "media/webm/webm_content_encodings.h"
+#include "media/formats/webm/webm_content_encodings.h"
 
 namespace media {
 
diff --git a/media/webm/webm_content_encodings.h b/media/formats/webm/webm_content_encodings.h
index 2866f25..5890ecf 100644
--- a/media/webm/webm_content_encodings.h
+++ b/media/formats/webm/webm_content_encodings.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_WEBM_CONTENT_ENCODINGS_H_
-#define MEDIA_WEBM_WEBM_CONTENT_ENCODINGS_H_
+#ifndef MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
+#define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
 
 #include <string>
 
@@ -85,4 +85,4 @@ class MEDIA_EXPORT ContentEncoding {
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_WEBM_CONTENT_ENCODINGS_H_
+#endif  // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_
diff --git a/media/webm/webm_content_encodings_client.cc b/media/formats/webm/webm_content_encodings_client.cc
index bcf964e..f2294de 100644
--- a/media/webm/webm_content_encodings_client.cc
+++ b/media/formats/webm/webm_content_encodings_client.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/webm_content_encodings_client.h"
+#include "media/formats/webm/webm_content_encodings_client.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "media/webm/webm_constants.h"
+#include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
diff --git a/media/webm/webm_content_encodings_client.h b/media/formats/webm/webm_content_encodings_client.h
index e477fcf3..d00281e 100644
--- a/media/webm/webm_content_encodings_client.h
+++ b/media/formats/webm/webm_content_encodings_client.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
-#define MEDIA_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
+#ifndef MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
+#define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
 
 #include <vector>
 
@@ -12,8 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
-#include "media/webm/webm_content_encodings.h"
-#include "media/webm/webm_parser.h"
+#include "media/formats/webm/webm_content_encodings.h"
+#include "media/formats/webm/webm_parser.h"
 
 namespace media {
 
@@ -47,4 +47,4 @@ class MEDIA_EXPORT WebMContentEncodingsClient : public WebMParserClient {
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
+#endif  // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_CLIENT_H_
diff --git a/media/webm/webm_content_encodings_client_unittest.cc b/media/formats/webm/webm_content_encodings_client_unittest.cc
index bb9e694..e124f2d 100644
--- a/media/webm/webm_content_encodings_client_unittest.cc
+++ b/media/formats/webm/webm_content_encodings_client_unittest.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
-#include "media/webm/webm_constants.h"
-#include "media/webm/webm_content_encodings_client.h"
-#include "media/webm/webm_parser.h"
+#include "media/formats/webm/webm_constants.h"
+#include "media/formats/webm/webm_content_encodings_client.h"
+#include "media/formats/webm/webm_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
diff --git a/media/webm/webm_crypto_helpers.cc b/media/formats/webm/webm_crypto_helpers.cc
index d6af43f..bd473bc 100644
--- a/media/webm/webm_crypto_helpers.cc
+++ b/media/formats/webm/webm_crypto_helpers.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/webm_crypto_helpers.h"
+#include "media/formats/webm/webm_crypto_helpers.h"
 
 #include "base/logging.h"
 #include "base/sys_byteorder.h"
 #include "media/base/decrypt_config.h"
-#include "media/webm/webm_constants.h"
+#include "media/formats/webm/webm_constants.h"
 
 namespace media {
 namespace {
diff --git a/media/webm/webm_crypto_helpers.h b/media/formats/webm/webm_crypto_helpers.h
index 086d745..23095f3 100644
--- a/media/webm/webm_crypto_helpers.h
+++ b/media/formats/webm/webm_crypto_helpers.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_WEBM_CRYPTO_HELPERS_H_
-#define MEDIA_WEBM_WEBM_CRYPTO_HELPERS_H_
+#ifndef MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_
+#define MEDIA_FORMATS_WEBM_WEBM_CRYPTO_HELPERS_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -30,4 +30,4 @@ bool WebMCreateDecryptConfig(const uint8* data, int data_size,
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_WEBM_CRYPT_HELPERS_H_
+#endif  // MEDIA_FORMATS_WEBM_WEBM_CRYPT_HELPERS_H_
diff --git a/media/webm/webm_info_parser.cc b/media/formats/webm/webm_info_parser.cc
index 6df1690b..ac4f08c 100644
--- a/media/webm/webm_info_parser.cc
+++ b/media/formats/webm/webm_info_parser.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/webm_info_parser.h"
+#include "media/formats/webm/webm_info_parser.h"
 
 #include "base/logging.h"
-#include "media/webm/webm_constants.h"
+#include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
diff --git a/media/webm/webm_info_parser.h b/media/formats/webm/webm_info_parser.h
index ab5de43..504b927 100644
--- a/media/webm/webm_info_parser.h
+++ b/media/formats/webm/webm_info_parser.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_WEBM_INFO_PARSER_H_
-#define MEDIA_WEBM_WEBM_INFO_PARSER_H_
+#ifndef MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_
+#define MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_
 
 #include "base/compiler_specific.h"
 #include "media/base/media_export.h"
-#include "media/webm/webm_parser.h"
+#include "media/formats/webm/webm_parser.h"
 
 namespace media {
 
@@ -44,4 +44,4 @@ class MEDIA_EXPORT WebMInfoParser : public WebMParserClient {
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_WEBM_INFO_PARSER_H_
+#endif  // MEDIA_FORMATS_WEBM_WEBM_INFO_PARSER_H_
diff --git a/media/webm/webm_parser.cc b/media/formats/webm/webm_parser.cc
index f1509ab..2f2a1d2 100644
--- a/media/webm/webm_parser.cc
+++ b/media/formats/webm/webm_parser.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/webm_parser.h"
+#include "media/formats/webm/webm_parser.h"
 
 // This file contains code to parse WebM file elements. It was created
 // from information in the Matroska spec.
@@ -14,7 +14,7 @@
 #include <iomanip>
 
 #include "base/logging.h"
-#include "media/webm/webm_constants.h"
+#include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
diff --git a/media/webm/webm_parser.h b/media/formats/webm/webm_parser.h
index 68611a8..854db68 100644
--- a/media/webm/webm_parser.h
+++ b/media/formats/webm/webm_parser.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_WEBM_PARSER_H_
-#define MEDIA_WEBM_WEBM_PARSER_H_
+#ifndef MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
+#define MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
 
 #include <string>
 #include <vector>
@@ -155,4 +155,4 @@ int MEDIA_EXPORT WebMParseElementHeader(const uint8* buf, int size,
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_WEBM_PARSER_H_
+#endif  // MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
diff --git a/media/webm/webm_parser_unittest.cc b/media/formats/webm/webm_parser_unittest.cc
index 3133d45..a1249e8 100644
--- a/media/webm/webm_parser_unittest.cc
+++ b/media/formats/webm/webm_parser_unittest.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/cluster_builder.h"
-#include "media/webm/webm_constants.h"
-#include "media/webm/webm_parser.h"
+#include "media/formats/webm/cluster_builder.h"
+#include "media/formats/webm/webm_constants.h"
+#include "media/formats/webm/webm_parser.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/media/webm/webm_stream_parser.cc b/media/formats/webm/webm_stream_parser.cc
index 49ebd01..f39a8e3 100644
--- a/media/webm/webm_stream_parser.cc
+++ b/media/formats/webm/webm_stream_parser.cc
@@ -1,19 +1,19 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/webm_stream_parser.h"
+#include "media/formats/webm/webm_stream_parser.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
-#include "media/webm/webm_cluster_parser.h"
-#include "media/webm/webm_constants.h"
-#include "media/webm/webm_content_encodings.h"
-#include "media/webm/webm_crypto_helpers.h"
-#include "media/webm/webm_info_parser.h"
-#include "media/webm/webm_tracks_parser.h"
+#include "media/formats/webm/webm_cluster_parser.h"
+#include "media/formats/webm/webm_constants.h"
+#include "media/formats/webm/webm_content_encodings.h"
+#include "media/formats/webm/webm_crypto_helpers.h"
+#include "media/formats/webm/webm_info_parser.h"
+#include "media/formats/webm/webm_tracks_parser.h"
 
 namespace media {
 
diff --git a/media/webm/webm_stream_parser.h b/media/formats/webm/webm_stream_parser.h
index 9cdb7d6..5a4173f 100644
--- a/media/webm/webm_stream_parser.h
+++ b/media/formats/webm/webm_stream_parser.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_WEBM_STREAM_PARSER_H_
-#define MEDIA_WEBM_WEBM_STREAM_PARSER_H_
+#ifndef MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
+#define MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
@@ -87,4 +87,4 @@ class WebMStreamParser : public StreamParser {
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_WEBM_STREAM_PARSER_H_
+#endif  // MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
diff --git a/media/webm/webm_tracks_parser.cc b/media/formats/webm/webm_tracks_parser.cc
index 771480f..01fc83bf 100644
--- a/media/webm/webm_tracks_parser.cc
+++ b/media/formats/webm/webm_tracks_parser.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/webm_tracks_parser.h"
+#include "media/formats/webm/webm_tracks_parser.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "media/base/buffers.h"
-#include "media/webm/webm_constants.h"
-#include "media/webm/webm_content_encodings.h"
+#include "media/formats/webm/webm_constants.h"
+#include "media/formats/webm/webm_content_encodings.h"
 
 namespace media {
 
diff --git a/media/webm/webm_tracks_parser.h b/media/formats/webm/webm_tracks_parser.h
index d489235..4ace29d 100644
--- a/media/webm/webm_tracks_parser.h
+++ b/media/formats/webm/webm_tracks_parser.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
-#define MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
+#ifndef MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
+#define MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
 
 #include <map>
 #include <set>
@@ -16,10 +16,10 @@
 #include "media/base/media_log.h"
 #include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
-#include "media/webm/webm_audio_client.h"
-#include "media/webm/webm_content_encodings_client.h"
-#include "media/webm/webm_parser.h"
-#include "media/webm/webm_video_client.h"
+#include "media/formats/webm/webm_audio_client.h"
+#include "media/formats/webm/webm_content_encodings_client.h"
+#include "media/formats/webm/webm_parser.h"
+#include "media/formats/webm/webm_video_client.h"
 
 namespace media {
 
@@ -102,4 +102,4 @@ class MEDIA_EXPORT WebMTracksParser : public WebMParserClient {
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_WEBM_TRACKS_PARSER_H_
+#endif  // MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
diff --git a/media/webm/webm_tracks_parser_unittest.cc b/media/formats/webm/webm_tracks_parser_unittest.cc
index ba1e729..0f8e351 100644
--- a/media/webm/webm_tracks_parser_unittest.cc
+++ b/media/formats/webm/webm_tracks_parser_unittest.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "media/webm/tracks_builder.h"
-#include "media/webm/webm_constants.h"
-#include "media/webm/webm_tracks_parser.h"
+#include "media/formats/webm/tracks_builder.h"
+#include "media/formats/webm/webm_constants.h"
+#include "media/formats/webm/webm_tracks_parser.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/media/webm/webm_video_client.cc b/media/formats/webm/webm_video_client.cc
index 1d0cbcb..5ea398e 100644
--- a/media/webm/webm_video_client.cc
+++ b/media/formats/webm/webm_video_client.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/webm_video_client.h"
+#include "media/formats/webm/webm_video_client.h"
 
 #include "media/base/video_decoder_config.h"
-#include "media/webm/webm_constants.h"
+#include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
diff --git a/media/webm/webm_video_client.h b/media/formats/webm/webm_video_client.h
index d1872ba..5545e0a 100644
--- a/media/webm/webm_video_client.h
+++ b/media/formats/webm/webm_video_client.h
@@ -1,15 +1,15 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_WEBM_VIDEO_CLIENT_H_
-#define MEDIA_WEBM_WEBM_VIDEO_CLIENT_H_
+#ifndef MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_
+#define MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_
 
 #include <string>
 #include <vector>
 
 #include "media/base/media_log.h"
-#include "media/webm/webm_parser.h"
+#include "media/formats/webm/webm_parser.h"
 
 namespace media {
 class VideoDecoderConfig;
@@ -58,4 +58,4 @@ class WebMVideoClient : public WebMParserClient {
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_WEBM_VIDEO_CLIENT_H_
+#endif  // MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_
diff --git a/media/webm/webm_webvtt_parser.cc b/media/formats/webm/webm_webvtt_parser.cc
index d77bfbc..64de1ef 100644
--- a/media/webm/webm_webvtt_parser.cc
+++ b/media/formats/webm/webm_webvtt_parser.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/webm_webvtt_parser.h"
+#include "media/formats/webm/webm_webvtt_parser.h"
 
 namespace media {
 
diff --git a/media/webm/webm_webvtt_parser.h b/media/formats/webm/webm_webvtt_parser.h
index a6aa316..12bbbd4 100644
--- a/media/webm/webm_webvtt_parser.h
+++ b/media/formats/webm/webm_webvtt_parser.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_WEBM_WEBM_WEBVTT_PARSER_H_
-#define MEDIA_WEBM_WEBM_WEBVTT_PARSER_H_
+#ifndef MEDIA_FORMATS_WEBM_WEBM_WEBVTT_PARSER_H_
+#define MEDIA_FORMATS_WEBM_WEBM_WEBVTT_PARSER_H_
 
 #include <string>
 
@@ -46,4 +46,4 @@ class MEDIA_EXPORT WebMWebVTTParser {
 
 }  // namespace media
 
-#endif  // MEDIA_WEBM_WEBM_WEBVTT_PARSER_H_
+#endif  // MEDIA_FORMATS_WEBM_WEBM_WEBVTT_PARSER_H_
diff --git a/media/webm/webm_webvtt_parser_unittest.cc b/media/formats/webm/webm_webvtt_parser_unittest.cc
index db514a1..ecdabd4 100644
--- a/media/webm/webm_webvtt_parser_unittest.cc
+++ b/media/formats/webm/webm_webvtt_parser_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/webm/webm_webvtt_parser.h"
+#include "media/formats/webm/webm_webvtt_parser.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/media/media.gyp b/media/media.gyp
index 373e8af..76d11af 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -479,30 +479,30 @@
         'video/video_decode_accelerator.h',
         'video/video_encode_accelerator.cc',
         'video/video_encode_accelerator.h',
-        'webm/webm_audio_client.cc',
-        'webm/webm_audio_client.h',
-        'webm/webm_cluster_parser.cc',
-        'webm/webm_cluster_parser.h',
-        'webm/webm_constants.cc',
-        'webm/webm_constants.h',
-        'webm/webm_content_encodings.cc',
-        'webm/webm_content_encodings.h',
-        'webm/webm_content_encodings_client.cc',
-        'webm/webm_content_encodings_client.h',
-        'webm/webm_crypto_helpers.cc',
-        'webm/webm_crypto_helpers.h',
-        'webm/webm_info_parser.cc',
-        'webm/webm_info_parser.h',
-        'webm/webm_parser.cc',
-        'webm/webm_parser.h',
-        'webm/webm_stream_parser.cc',
-        'webm/webm_stream_parser.h',
-        'webm/webm_tracks_parser.cc',
-        'webm/webm_tracks_parser.h',
-        'webm/webm_video_client.cc',
-        'webm/webm_video_client.h',
-        'webm/webm_webvtt_parser.cc',
-        'webm/webm_webvtt_parser.h'
+        'formats/webm/webm_audio_client.cc',
+        'formats/webm/webm_audio_client.h',
+        'formats/webm/webm_cluster_parser.cc',
+        'formats/webm/webm_cluster_parser.h',
+        'formats/webm/webm_constants.cc',
+        'formats/webm/webm_constants.h',
+        'formats/webm/webm_content_encodings.cc',
+        'formats/webm/webm_content_encodings.h',
+        'formats/webm/webm_content_encodings_client.cc',
+        'formats/webm/webm_content_encodings_client.h',
+        'formats/webm/webm_crypto_helpers.cc',
+        'formats/webm/webm_crypto_helpers.h',
+        'formats/webm/webm_info_parser.cc',
+        'formats/webm/webm_info_parser.h',
+        'formats/webm/webm_parser.cc',
+        'formats/webm/webm_parser.h',
+        'formats/webm/webm_stream_parser.cc',
+        'formats/webm/webm_stream_parser.h',
+        'formats/webm/webm_tracks_parser.cc',
+        'formats/webm/webm_tracks_parser.h',
+        'formats/webm/webm_video_client.cc',
+        'formats/webm/webm_video_client.h',
+        'formats/webm/webm_webvtt_parser.cc',
+        'formats/webm/webm_webvtt_parser.h'
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ -596,10 +596,10 @@
             '../third_party/libyuv/libyuv.gyp:libyuv',
           ],
           'sources': [
-            'webm/chromeos/ebml_writer.cc',
-            'webm/chromeos/ebml_writer.h',
-            'webm/chromeos/webm_encoder.cc',
-            'webm/chromeos/webm_encoder.h',
+            'formats/webm/chromeos/ebml_writer.cc',
+            'formats/webm/chromeos/ebml_writer.h',
+            'formats/webm/chromeos/webm_encoder.cc',
+            'formats/webm/chromeos/webm_encoder.h',
           ],
         }],
         ['use_alsa==1', {
@@ -826,45 +826,45 @@
         }],
         ['proprietary_codecs==1', {
           'sources': [
-            'mp2t/es_parser.h',
-            'mp2t/es_parser_adts.cc',
-            'mp2t/es_parser_adts.h',
-            'mp2t/es_parser_h264.cc',
-            'mp2t/es_parser_h264.h',
-            'mp2t/mp2t_common.h',
-            'mp2t/mp2t_stream_parser.cc',
-            'mp2t/mp2t_stream_parser.h',
-            'mp2t/ts_packet.cc',
-            'mp2t/ts_packet.h',
-            'mp2t/ts_section.h',
-            'mp2t/ts_section_pat.cc',
-            'mp2t/ts_section_pat.h',
-            'mp2t/ts_section_pes.cc',
-            'mp2t/ts_section_pes.h',
-            'mp2t/ts_section_pmt.cc',
-            'mp2t/ts_section_pmt.h',
-            'mp2t/ts_section_psi.cc',
-            'mp2t/ts_section_psi.h',
-            'mp3/mp3_stream_parser.cc',
-            'mp3/mp3_stream_parser.h',
-            'mp4/aac.cc',
-            'mp4/aac.h',
-            'mp4/avc.cc',
-            'mp4/avc.h',
-            'mp4/box_definitions.cc',
-            'mp4/box_definitions.h',
-            'mp4/box_reader.cc',
-            'mp4/box_reader.h',
-            'mp4/cenc.cc',
-            'mp4/cenc.h',
-            'mp4/es_descriptor.cc',
-            'mp4/es_descriptor.h',
-            'mp4/mp4_stream_parser.cc',
-            'mp4/mp4_stream_parser.h',
-            'mp4/offset_byte_queue.cc',
-            'mp4/offset_byte_queue.h',
-            'mp4/track_run_iterator.cc',
-            'mp4/track_run_iterator.h',
+            'formats/mp2t/es_parser.h',
+            'formats/mp2t/es_parser_adts.cc',
+            'formats/mp2t/es_parser_adts.h',
+            'formats/mp2t/es_parser_h264.cc',
+            'formats/mp2t/es_parser_h264.h',
+            'formats/mp2t/mp2t_common.h',
+            'formats/mp2t/mp2t_stream_parser.cc',
+            'formats/mp2t/mp2t_stream_parser.h',
+            'formats/mp2t/ts_packet.cc',
+            'formats/mp2t/ts_packet.h',
+            'formats/mp2t/ts_section.h',
+            'formats/mp2t/ts_section_pat.cc',
+            'formats/mp2t/ts_section_pat.h',
+            'formats/mp2t/ts_section_pes.cc',
+            'formats/mp2t/ts_section_pes.h',
+            'formats/mp2t/ts_section_pmt.cc',
+            'formats/mp2t/ts_section_pmt.h',
+            'formats/mp2t/ts_section_psi.cc',
+            'formats/mp2t/ts_section_psi.h',
+            'formats/mp3/mp3_stream_parser.cc',
+            'formats/mp3/mp3_stream_parser.h',
+            'formats/mp4/aac.cc',
+            'formats/mp4/aac.h',
+            'formats/mp4/avc.cc',
+            'formats/mp4/avc.h',
+            'formats/mp4/box_definitions.cc',
+            'formats/mp4/box_definitions.h',
+            'formats/mp4/box_reader.cc',
+            'formats/mp4/box_reader.h',
+            'formats/mp4/cenc.cc',
+            'formats/mp4/cenc.h',
+            'formats/mp4/es_descriptor.cc',
+            'formats/mp4/es_descriptor.h',
+            'formats/mp4/mp4_stream_parser.cc',
+            'formats/mp4/mp4_stream_parser.h',
+            'formats/mp4/offset_byte_queue.cc',
+            'formats/mp4/offset_byte_queue.h',
+            'formats/mp4/track_run_iterator.cc',
+            'formats/mp4/track_run_iterator.h',
           ],
         }],
         ['toolkit_uses_gtk==1', {
@@ -1026,15 +1026,15 @@
         'midi/usb_midi_input_stream_unittest.cc',
         'midi/usb_midi_output_stream_unittest.cc',
         'video/capture/video_capture_device_unittest.cc',
-        'webm/cluster_builder.cc',
-        'webm/cluster_builder.h',
-        'webm/tracks_builder.cc',
-        'webm/tracks_builder.h',
-        'webm/webm_cluster_parser_unittest.cc',
-        'webm/webm_content_encodings_client_unittest.cc',
-        'webm/webm_parser_unittest.cc',
-        'webm/webm_tracks_parser_unittest.cc',
-        'webm/webm_webvtt_parser_unittest.cc',
+        'formats/webm/cluster_builder.cc',
+        'formats/webm/cluster_builder.h',
+        'formats/webm/tracks_builder.cc',
+        'formats/webm/tracks_builder.h',
+        'formats/webm/webm_cluster_parser_unittest.cc',
+        'formats/webm/webm_content_encodings_client_unittest.cc',
+        'formats/webm/webm_parser_unittest.cc',
+        'formats/webm/webm_tracks_parser_unittest.cc',
+        'formats/webm/webm_webvtt_parser_unittest.cc',
       ],
       'conditions': [
         ['arm_neon==1', {
@@ -1121,15 +1121,15 @@
         }],
         ['proprietary_codecs==1', {
           'sources': [
-            'mp2t/mp2t_stream_parser_unittest.cc',
-            'mp3/mp3_stream_parser_unittest.cc',
-            'mp4/aac_unittest.cc',
-            'mp4/avc_unittest.cc',
-            'mp4/box_reader_unittest.cc',
-            'mp4/es_descriptor_unittest.cc',
-            'mp4/mp4_stream_parser_unittest.cc',
-            'mp4/offset_byte_queue_unittest.cc',
-            'mp4/track_run_iterator_unittest.cc',
+            'formats/mp2t/mp2t_stream_parser_unittest.cc',
+            'formats/mp3/mp3_stream_parser_unittest.cc',
+            'formats/mp4/aac_unittest.cc',
+            'formats/mp4/avc_unittest.cc',
+            'formats/mp4/box_reader_unittest.cc',
+            'formats/mp4/es_descriptor_unittest.cc',
+            'formats/mp4/mp4_stream_parser_unittest.cc',
+            'formats/mp4/offset_byte_queue_unittest.cc',
+            'formats/mp4/track_run_iterator_unittest.cc',
           ],
         }],
         # TODO(wolenetz): Fix size_t to int truncations in win64. See