Part 10 of cc/ directory shuffles: layers

Continuation of https://src.chromium.org/viewvc/chrome?view=rev&revision=188681

BUG=190824
TBR=enne@chromium.org, piman@chromium.org, jschuh@chromium.org, joth@chromium.org

Review URL: https://codereview.chromium.org/12916002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188703 0039d316-1c4b-4281-b951-d872f2087c98

148 files changed, 481 insertions, 483 deletions

diff --git a/cc/animation/scrollbar_animation_controller_linear_fade.cc b/cc/animation/scrollbar_animation_controller_linear_fade.cc
index 63d2f6e..88804b8 100644
--- a/cc/animation/scrollbar_animation_controller_linear_fade.cc
+++ b/cc/animation/scrollbar_animation_controller_linear_fade.cc
@@ -5,7 +5,7 @@
 #include "cc/animation/scrollbar_animation_controller_linear_fade.h"
 
 #include "base/time.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 
 namespace cc {
 
diff --git a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc
index ee6a6c2..ca92b70 100644
--- a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc
+++ b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "cc/animation/scrollbar_animation_controller_linear_fade.h"
 
-#include "cc/scrollbar_layer_impl.h"
+#include "cc/layers/scrollbar_layer_impl.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_web_scrollbar_theme_geometry.h"
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 3a8c6cb..a934729 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -14,7 +14,7 @@
       'animation/animation_id_provider.h',
       'animation/animation_registrar.cc',
       'animation/animation_registrar.h',
-      'append_quads_data.h',
+      'layers/append_quads_data.h',
       'resources/bitmap_content_layer_updater.cc',
       'resources/bitmap_content_layer_updater.h',
       'resources/bitmap_skpicture_content_layer_updater.cc',
@@ -30,13 +30,13 @@
       'output/compositor_frame_ack.h',
       'output/compositor_frame_metadata.cc',
       'output/compositor_frame_metadata.h',
-      'content_layer.cc',
-      'content_layer.h',
-      'content_layer_client.h',
+      'layers/content_layer.cc',
+      'layers/content_layer.h',
+      'layers/content_layer_client.h',
       'resources/content_layer_updater.cc',
       'resources/content_layer_updater.h',
-      'contents_scaling_layer.cc',
-      'contents_scaling_layer.h',
+      'layers/contents_scaling_layer.cc',
+      'layers/contents_scaling_layer.h',
       'output/context_provider.h',
       'trees/damage_tracker.cc',
       'trees/damage_tracker.h',
@@ -50,16 +50,16 @@
       'scheduler/delay_based_time_source.h',
       'output/delegated_frame_data.h',
       'output/delegated_frame_data.cc',
-      'delegated_renderer_layer.cc',
-      'delegated_renderer_layer.h',
-      'delegated_renderer_layer_impl.cc',
-      'delegated_renderer_layer_impl.h',
+      'layers/delegated_renderer_layer.cc',
+      'layers/delegated_renderer_layer.h',
+      'layers/delegated_renderer_layer_impl.cc',
+      'layers/delegated_renderer_layer_impl.h',
       'output/delegating_renderer.cc',
       'output/delegating_renderer.h',
       'debug/devtools_instrumentation.h',
       'output/direct_renderer.cc',
       'output/direct_renderer.h',
-      'draw_properties.h',
+      'layers/draw_properties.h',
       'quads/draw_quad.cc',
       'quads/draw_quad.h',
       'debug/fake_web_graphics_context_3d.cc',
@@ -77,34 +77,34 @@
       'output/gl_renderer_draw_cache.cc',
       'output/gl_renderer_draw_cache.h',
       'base/hash_pair.h',
-      'heads_up_display_layer.cc',
-      'heads_up_display_layer.h',
-      'heads_up_display_layer_impl.cc',
-      'heads_up_display_layer_impl.h',
+      'layers/heads_up_display_layer.cc',
+      'layers/heads_up_display_layer.h',
+      'layers/heads_up_display_layer_impl.cc',
+      'layers/heads_up_display_layer_impl.h',
       'resources/image_layer_updater.cc',
       'resources/image_layer_updater.h',
-      'image_layer.cc',
-      'image_layer.h',
+      'layers/image_layer.cc',
+      'layers/image_layer.h',
       'input/input_handler.h',
       'quads/io_surface_draw_quad.cc',
       'quads/io_surface_draw_quad.h',
-      'io_surface_layer.cc',
-      'io_surface_layer.h',
-      'io_surface_layer_impl.cc',
-      'io_surface_layer_impl.h',
+      'layers/io_surface_layer.cc',
+      'layers/io_surface_layer.h',
+      'layers/io_surface_layer_impl.cc',
+      'layers/io_surface_layer_impl.h',
       'animation/keyframed_animation_curve.cc',
       'animation/keyframed_animation_curve.h',
       'latency_info.h',
-      'layer.cc',
-      'layer.h',
+      'layers/layer.cc',
+      'layers/layer.h',
       'animation/layer_animation_controller.cc',
       'animation/layer_animation_controller.h',
       'animation/layer_animation_event_observer.h',
       'animation/layer_animation_value_observer.h',
-      'layer_impl.cc',
-      'layer_impl.h',
-      'layer_iterator.cc',
-      'layer_iterator.h',
+      'layers/layer_impl.cc',
+      'layers/layer_impl.h',
+      'layers/layer_iterator.cc',
+      'layers/layer_iterator.h',
       'resources/layer_painter.h',
       'resources/layer_quad.cc',
       'resources/layer_quad.h',
@@ -135,10 +135,10 @@
       'base/math_util.h',
       'resources/memory_history.cc',
       'resources/memory_history.h',
-      'nine_patch_layer.cc',
-      'nine_patch_layer.h',
-      'nine_patch_layer_impl.cc',
-      'nine_patch_layer_impl.h',
+      'layers/nine_patch_layer.cc',
+      'layers/nine_patch_layer.h',
+      'layers/nine_patch_layer_impl.cc',
+      'layers/nine_patch_layer_impl.h',
       'trees/occlusion_tracker.cc',
       'trees/occlusion_tracker.h',
       'output/output_surface.cc',
@@ -152,14 +152,14 @@
       'debug/paint_time_counter.h',
       'resources/picture.cc',
       'resources/picture.h',
-      'picture_image_layer.cc',
-      'picture_image_layer.h',
-      'picture_image_layer_impl.cc',
-      'picture_image_layer_impl.h',
-      'picture_layer.cc',
-      'picture_layer.h',
-      'picture_layer_impl.cc',
-      'picture_layer_impl.h',
+      'layers/picture_image_layer.cc',
+      'layers/picture_image_layer.h',
+      'layers/picture_image_layer_impl.cc',
+      'layers/picture_image_layer_impl.h',
+      'layers/picture_layer.cc',
+      'layers/picture_layer.h',
+      'layers/picture_layer_impl.cc',
+      'layers/picture_layer_impl.h',
       'resources/picture_layer_tiling.cc',
       'resources/picture_layer_tiling.h',
       'resources/picture_layer_tiling_set.cc',
@@ -189,7 +189,7 @@
       'trees/proxy.h',
       'trees/quad_culler.cc',
       'trees/quad_culler.h',
-      'quad_sink.h',
+      'layers/quad_sink.h',
       'resources/raster_worker_pool.cc',
       'resources/raster_worker_pool.h',
       'scheduler/rate_limiter.cc',
@@ -200,13 +200,13 @@
       'quads/render_pass.h',
       'quads/render_pass_draw_quad.cc',
       'quads/render_pass_draw_quad.h',
-      'render_pass_sink.h',
-      'render_surface.cc',
-      'render_surface.h',
+      'layers/render_pass_sink.h',
+      'layers/render_surface.cc',
+      'layers/render_surface.h',
       'output/render_surface_filters.cc',
       'output/render_surface_filters.h',
-      'render_surface_impl.cc',
-      'render_surface_impl.h',
+      'layers/render_surface_impl.cc',
+      'layers/render_surface_impl.h',
       'output/renderer.cc',
       'output/renderer.h',
       'debug/rendering_stats.cc',
@@ -239,15 +239,15 @@
       'animation/scrollbar_animation_controller.h',
       'animation/scrollbar_animation_controller_linear_fade.cc',
       'animation/scrollbar_animation_controller_linear_fade.h',
-      'scrollbar_geometry_fixed_thumb.cc',
-      'scrollbar_geometry_fixed_thumb.h',
-      'scrollbar_geometry_stub.cc',
-      'scrollbar_geometry_stub.h',
-      'scrollbar_layer.cc',
-      'scrollbar_layer.h',
-      'scrollbar_layer_impl.cc',
-      'scrollbar_layer_impl.h',
-      'scrollbar_layer_impl_base.h',
+      'layers/scrollbar_geometry_fixed_thumb.cc',
+      'layers/scrollbar_geometry_fixed_thumb.h',
+      'layers/scrollbar_geometry_stub.cc',
+      'layers/scrollbar_geometry_stub.h',
+      'layers/scrollbar_layer.cc',
+      'layers/scrollbar_layer.h',
+      'layers/scrollbar_layer_impl.cc',
+      'layers/scrollbar_layer_impl.h',
+      'layers/scrollbar_layer_impl_base.h',
       'output/shader.cc',
       'output/shader.h',
       'quads/shared_quad_state.cc',
@@ -264,10 +264,10 @@
       'output/software_renderer.h',
       'quads/solid_color_draw_quad.cc',
       'quads/solid_color_draw_quad.h',
-      'solid_color_layer.cc',
-      'solid_color_layer.h',
-      'solid_color_layer_impl.cc',
-      'solid_color_layer_impl.h',
+      'layers/solid_color_layer.cc',
+      'layers/solid_color_layer.h',
+      'layers/solid_color_layer_impl.cc',
+      'layers/solid_color_layer_impl.h',
       'quads/stream_video_draw_quad.cc',
       'quads/stream_video_draw_quad.h',
       'base/switches.cc',
@@ -276,11 +276,11 @@
       'output/texture_copier.h',
       'quads/texture_draw_quad.cc',
       'quads/texture_draw_quad.h',
-      'texture_layer.cc',
-      'texture_layer.h',
-      'texture_layer_client.h',
-      'texture_layer_impl.cc',
-      'texture_layer_impl.h',
+      'layers/texture_layer.cc',
+      'layers/texture_layer.h',
+      'layers/texture_layer_client.h',
+      'layers/texture_layer_impl.cc',
+      'layers/texture_layer_impl.h',
       'resources/texture_mailbox.cc',
       'resources/texture_mailbox.h',
       'scheduler/texture_uploader.cc',
@@ -298,10 +298,10 @@
       'resources/tile_manager.h',
       'resources/tile_priority.cc',
       'resources/tile_priority.h',
-      'tiled_layer.cc',
-      'tiled_layer.h',
-      'tiled_layer_impl.cc',
-      'tiled_layer_impl.h',
+      'layers/tiled_layer.cc',
+      'layers/tiled_layer.h',
+      'layers/tiled_layer_impl.cc',
+      'layers/tiled_layer_impl.h',
       'base/tiling_data.cc',
       'base/tiling_data.h',
       'scheduler/time_source.h',
@@ -319,13 +319,13 @@
       'trees/tree_synchronizer.cc',
       'trees/tree_synchronizer.h',
       'base/util.h',
-      'video_frame_provider.h',
-      'video_frame_provider_client_impl.cc',
-      'video_frame_provider_client_impl.h',
-      'video_layer.cc',
-      'video_layer.h',
-      'video_layer_impl.cc',
-      'video_layer_impl.h',
+      'layers/video_frame_provider.h',
+      'layers/video_frame_provider_client_impl.cc',
+      'layers/video_frame_provider_client_impl.h',
+      'layers/video_layer.cc',
+      'layers/video_layer.h',
+      'layers/video_layer_impl.cc',
+      'layers/video_layer_impl.h',
       'scheduler/vsync_time_source.cc',
       'scheduler/vsync_time_source.h',
       'base/worker_pool.cc',
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index 2ce29db..b8c4317 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -7,11 +7,11 @@
     'chromium_code': 0,
     'cc_unit_tests_source_files': [
       'animation/animation_unittest.cc',
-      'content_layer_unittest.cc',
-      'contents_scaling_layer_unittest.cc',
+      'layers/content_layer_unittest.cc',
+      'layers/contents_scaling_layer_unittest.cc',
       'trees/damage_tracker_unittest.cc',
       'scheduler/delay_based_time_source_unittest.cc',
-      'delegated_renderer_layer_impl_unittest.cc',
+      'layers/delegated_renderer_layer_impl_unittest.cc',
       'output/delegating_renderer_unittest.cc',
       'quads/draw_quad_unittest.cc',
       'base/float_quad_unittest.cc',
@@ -19,11 +19,11 @@
       'output/gl_renderer_unittest.cc',
       'output/gl_renderer_pixeltest.cc',
       'base/hash_pair_unittest.cc',
-      'heads_up_display_unittest.cc',
+      'layers/heads_up_display_unittest.cc',
       'animation/keyframed_animation_curve_unittest.cc',
       'animation/layer_animation_controller_unittest.cc',
-      'layer_impl_unittest.cc',
-      'layer_iterator_unittest.cc',
+      'layers/layer_impl_unittest.cc',
+      'layers/layer_iterator_unittest.cc',
       'resources/layer_quad_unittest.cc',
       'trees/layer_sorter_unittest.cc',
       'trees/layer_tree_host_common_unittest.cc',
@@ -35,12 +35,12 @@
       'trees/layer_tree_host_unittest_delegated.cc',
       'trees/layer_tree_host_unittest_occlusion.cc',
       'trees/layer_tree_host_unittest_scroll.cc',
-      'layer_unittest.cc',
+      'layers/layer_unittest.cc',
       'base/math_util_unittest.cc',
-      'nine_patch_layer_impl_unittest.cc',
-      'nine_patch_layer_unittest.cc',
+      'layers/nine_patch_layer_impl_unittest.cc',
+      'layers/nine_patch_layer_unittest.cc',
       'trees/occlusion_tracker_unittest.cc',
-      'picture_layer_impl_unittest.cc',
+      'layers/picture_layer_impl_unittest.cc',
       'resources/picture_layer_tiling_set_unittest.cc',
       'resources/picture_layer_tiling_unittest.cc',
       'resources/prioritized_resource_unittest.cc',
@@ -48,22 +48,22 @@
       'base/region_unittest.cc',
       'quads/render_pass_unittest.cc',
       'output/render_surface_filters_unittest.cc',
-      'render_surface_unittest.cc',
+      'layers/render_surface_unittest.cc',
       'resources/resource_provider_unittest.cc',
       'resources/resource_update_controller_unittest.cc',
       'scheduler/scheduler_state_machine_unittest.cc',
       'scheduler/scheduler_unittest.cc',
       'resources/scoped_resource_unittest.cc',
       'animation/scrollbar_animation_controller_linear_fade_unittest.cc',
-      'scrollbar_layer_unittest.cc',
+      'layers/scrollbar_layer_unittest.cc',
       'output/software_renderer_unittest.cc',
-      'solid_color_layer_impl_unittest.cc',
+      'layers/solid_color_layer_impl_unittest.cc',
       'output/texture_copier_unittest.cc',
-      'texture_layer_unittest.cc',
+      'layers/texture_layer_unittest.cc',
       'scheduler/texture_uploader_unittest.cc',
       'resources/tile_priority_unittest.cc',
-      'tiled_layer_impl_unittest.cc',
-      'tiled_layer_unittest.cc',
+      'layers/tiled_layer_impl_unittest.cc',
+      'layers/tiled_layer_unittest.cc',
       'base/tiling_data_unittest.cc',
       'input/top_controls_manager_unittest.cc',
       'transform_operations_unittest.cc',
diff --git a/cc/debug/debug_rect_history.cc b/cc/debug/debug_rect_history.cc
index bb38b4f..dd29d1e 100644
--- a/cc/debug/debug_rect_history.cc
+++ b/cc/debug/debug_rect_history.cc
@@ -5,7 +5,7 @@
 #include "cc/debug/debug_rect_history.h"
 
 #include "cc/base/math_util.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/trees/damage_tracker.h"
 #include "cc/trees/layer_tree_host.h"
 
diff --git a/cc/input/top_controls_manager.h b/cc/input/top_controls_manager.h
index 5a60a9a..e753846 100644
--- a/cc/input/top_controls_manager.h
+++ b/cc/input/top_controls_manager.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/vector2d_f.h"
 
diff --git a/cc/input/top_controls_manager_unittest.cc b/cc/input/top_controls_manager_unittest.cc
index 9b88d24..dbe174f 100644
--- a/cc/input/top_controls_manager_unittest.cc
+++ b/cc/input/top_controls_manager_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/input/top_controls_manager_client.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/trees/layer_tree_impl.h"
diff --git a/cc/append_quads_data.h b/cc/layers/append_quads_data.h
index 3be66bb..18580a9 100644
--- a/cc/append_quads_data.h
+++ b/cc/layers/append_quads_data.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 CC_APPEND_QUADS_DATA_H_
-#define CC_APPEND_QUADS_DATA_H_
+#ifndef CC_LAYERS_APPEND_QUADS_DATA_H_
+#define CC_LAYERS_APPEND_QUADS_DATA_H_
 
 #include "base/basictypes.h"
 #include "cc/quads/render_pass.h"
@@ -38,4 +38,4 @@ struct AppendQuadsData {
 };
 
 }
-#endif  // CC_APPEND_QUADS_DATA_H_
+#endif  // CC_LAYERS_APPEND_QUADS_DATA_H_
diff --git a/cc/content_layer.cc b/cc/layers/content_layer.cc
index ad9ae4c..b6c8d7b 100644
--- a/cc/content_layer.cc
+++ b/cc/layers/content_layer.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 "cc/content_layer.h"
+#include "cc/layers/content_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
-#include "cc/content_layer_client.h"
+#include "cc/layers/content_layer_client.h"
 #include "cc/resources/bitmap_content_layer_updater.h"
 #include "cc/resources/bitmap_skpicture_content_layer_updater.h"
 #include "cc/resources/layer_painter.h"
diff --git a/cc/content_layer.h b/cc/layers/content_layer.h
index 36747eb..94db0bf 100644
--- a/cc/content_layer.h
+++ b/cc/layers/content_layer.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_CONTENT_LAYER_H_
-#define CC_CONTENT_LAYER_H_
+#ifndef CC_LAYERS_CONTENT_LAYER_H_
+#define CC_LAYERS_CONTENT_LAYER_H_
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
+#include "cc/layers/tiled_layer.h"
 #include "cc/resources/layer_painter.h"
-#include "cc/tiled_layer.h"
 
 class SkCanvas;
 
@@ -66,4 +66,4 @@ class CC_EXPORT ContentLayer : public TiledLayer {
 };
 
 }
-#endif  // CC_CONTENT_LAYER_H_
+#endif  // CC_LAYERS_CONTENT_LAYER_H_
diff --git a/cc/content_layer_client.h b/cc/layers/content_layer_client.h
index ed77ac1..7d51fd9 100644
--- a/cc/content_layer_client.h
+++ b/cc/layers/content_layer_client.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 CC_CONTENT_LAYER_CLIENT_H_
-#define CC_CONTENT_LAYER_CLIENT_H_
+#ifndef CC_LAYERS_CONTENT_LAYER_CLIENT_H_
+#define CC_LAYERS_CONTENT_LAYER_CLIENT_H_
 
 #include "cc/base/cc_export.h"
 
@@ -28,4 +28,4 @@ class CC_EXPORT ContentLayerClient {
 
 }
 
-#endif  // CC_CONTENT_LAYER_CLIENT_H_
+#endif  // CC_LAYERS_CONTENT_LAYER_CLIENT_H_
diff --git a/cc/content_layer_unittest.cc b/cc/layers/content_layer_unittest.cc
index 0e94062..259e44f 100644
--- a/cc/content_layer_unittest.cc
+++ b/cc/layers/content_layer_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/content_layer.h"
+#include "cc/layers/content_layer.h"
 
-#include "cc/content_layer_client.h"
+#include "cc/layers/content_layer_client.h"
 #include "cc/resources/bitmap_content_layer_updater.h"
 #include "cc/test/geometry_test_utils.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/cc/contents_scaling_layer.cc b/cc/layers/contents_scaling_layer.cc
index 3b72d3f..d602e88 100644
--- a/cc/contents_scaling_layer.cc
+++ b/cc/layers/contents_scaling_layer.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 "cc/contents_scaling_layer.h"
+#include "cc/layers/contents_scaling_layer.h"
 #include "ui/gfx/size_conversions.h"
 
 namespace cc {
diff --git a/cc/contents_scaling_layer.h b/cc/layers/contents_scaling_layer.h
index 816c53b..a550c26 100644
--- a/cc/contents_scaling_layer.h
+++ b/cc/layers/contents_scaling_layer.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_CONTENTS_SCALING_LAYER_H_
-#define CC_CONTENTS_SCALING_LAYER_H_
+#ifndef CC_LAYERS_CONTENTS_SCALING_LAYER_H_
+#define CC_LAYERS_CONTENTS_SCALING_LAYER_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 
 namespace cc {
 
@@ -39,4 +39,4 @@ class CC_EXPORT ContentsScalingLayer : public Layer {
 
 }  // namespace cc
 
-#endif  // CC_CONTENTS_SCALING_LAYER_H__
+#endif  // CC_LAYERS_CONTENTS_SCALING_LAYER_H__
diff --git a/cc/contents_scaling_layer_unittest.cc b/cc/layers/contents_scaling_layer_unittest.cc
index 2c350fc..69710d8 100644
--- a/cc/contents_scaling_layer_unittest.cc
+++ b/cc/layers/contents_scaling_layer_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 "cc/contents_scaling_layer.h"
+#include "cc/layers/contents_scaling_layer.h"
 
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/delegated_renderer_layer.cc b/cc/layers/delegated_renderer_layer.cc
index bdf8b37..37da92a 100644
--- a/cc/delegated_renderer_layer.cc
+++ b/cc/layers/delegated_renderer_layer.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/delegated_renderer_layer.h"
+#include "cc/layers/delegated_renderer_layer.h"
 
-#include "cc/delegated_renderer_layer_impl.h"
+#include "cc/layers/delegated_renderer_layer_impl.h"
 #include "cc/output/delegated_frame_data.h"
 
 namespace cc {
diff --git a/cc/delegated_renderer_layer.h b/cc/layers/delegated_renderer_layer.h
index 0c7d463..a789317 100644
--- a/cc/delegated_renderer_layer.h
+++ b/cc/layers/delegated_renderer_layer.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_DELEGATED_RENDERER_LAYER_H_
-#define CC_DELEGATED_RENDERER_LAYER_H_
+#ifndef CC_LAYERS_DELEGATED_RENDERER_LAYER_H_
+#define CC_LAYERS_DELEGATED_RENDERER_LAYER_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 #include "cc/resources/transferable_resource.h"
 
 namespace cc {
@@ -46,4 +46,4 @@ class CC_EXPORT DelegatedRendererLayer : public Layer {
 };
 
 }
-#endif  // CC_DELEGATED_RENDERER_LAYER_H_
+#endif  // CC_LAYERS_DELEGATED_RENDERER_LAYER_H_
diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/layers/delegated_renderer_layer_impl.cc
index 6b373b05..cfd4897 100644
--- a/cc/delegated_renderer_layer_impl.cc
+++ b/cc/layers/delegated_renderer_layer_impl.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/delegated_renderer_layer_impl.h"
+#include "cc/layers/delegated_renderer_layer_impl.h"
 
 #include "base/bind.h"
-#include "cc/append_quads_data.h"
 #include "cc/base/math_util.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/quad_sink.h"
+#include "cc/layers/render_pass_sink.h"
 #include "cc/output/delegated_frame_data.h"
-#include "cc/quad_sink.h"
 #include "cc/quads/render_pass_draw_quad.h"
-#include "cc/render_pass_sink.h"
 #include "cc/trees/layer_tree_impl.h"
 
 namespace cc {
diff --git a/cc/delegated_renderer_layer_impl.h b/cc/layers/delegated_renderer_layer_impl.h
index cf70198..1f6e214 100644
--- a/cc/delegated_renderer_layer_impl.h
+++ b/cc/layers/delegated_renderer_layer_impl.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_DELEGATED_RENDERER_LAYER_IMPL_H_
-#define CC_DELEGATED_RENDERER_LAYER_IMPL_H_
+#ifndef CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_
+#define CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 
 namespace cc {
 class DelegatedFrameData;
@@ -86,4 +86,4 @@ class CC_EXPORT DelegatedRendererLayerImpl : public LayerImpl {
 
 }
 
-#endif  // CC_DELEGATED_RENDERER_LAYER_IMPL_H_
+#endif  // CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_
diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
index 3a087a7..ca3f833 100644
--- a/cc/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/delegated_renderer_layer_impl.h"
+#include "cc/layers/delegated_renderer_layer_impl.h"
 
-#include "cc/append_quads_data.h"
 #include "cc/base/scoped_ptr_vector.h"
-#include "cc/quad_sink.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/quad_sink.h"
+#include "cc/layers/solid_color_layer_impl.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
-#include "cc/solid_color_layer_impl.h"
 #include "cc/test/fake_delegated_renderer_layer_impl.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_layer_tree_host_impl_client.h"
diff --git a/cc/draw_properties.h b/cc/layers/draw_properties.h
index 858e4ff..23db23c 100644
--- a/cc/draw_properties.h
+++ b/cc/layers/draw_properties.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 CC_DRAW_PROPERTIES_H_
-#define CC_DRAW_PROPERTIES_H_
+#ifndef CC_LAYERS_DRAW_PROPERTIES_H_
+#define CC_LAYERS_DRAW_PROPERTIES_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/rect.h"
@@ -96,4 +96,4 @@ struct CC_EXPORT DrawProperties {
 
 }  // namespace cc
 
-#endif  // CC_DRAW_PROPERTIES_H_
+#endif  // CC_LAYERS_DRAW_PROPERTIES_H_
diff --git a/cc/heads_up_display_layer.cc b/cc/layers/heads_up_display_layer.cc
index e61423d..56d7c96 100644
--- a/cc/heads_up_display_layer.cc
+++ b/cc/layers/heads_up_display_layer.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/heads_up_display_layer.h"
+#include "cc/layers/heads_up_display_layer.h"
 
 #include "base/debug/trace_event.h"
-#include "cc/heads_up_display_layer_impl.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
diff --git a/cc/heads_up_display_layer.h b/cc/layers/heads_up_display_layer.h
index 63cbf79..d7656c5 100644
--- a/cc/heads_up_display_layer.h
+++ b/cc/layers/heads_up_display_layer.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_HEADS_UP_DISPLAY_LAYER_H_
-#define CC_HEADS_UP_DISPLAY_LAYER_H_
+#ifndef CC_LAYERS_HEADS_UP_DISPLAY_LAYER_H_
+#define CC_LAYERS_HEADS_UP_DISPLAY_LAYER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 
 namespace cc {
 
@@ -32,4 +32,4 @@ class CC_EXPORT HeadsUpDisplayLayer : public Layer {
 
 }  // namespace cc
 
-#endif  // CC_HEADS_UP_DISPLAY_LAYER_H_
+#endif  // CC_LAYERS_HEADS_UP_DISPLAY_LAYER_H_
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc
index 355a51e..93c51e1 100644
--- a/cc/heads_up_display_layer_impl.cc
+++ b/cc/layers/heads_up_display_layer_impl.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 "cc/heads_up_display_layer_impl.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
 
 #include "base/stringprintf.h"
 #include "base/strings/string_split.h"
@@ -10,8 +10,8 @@
 #include "cc/debug/debug_rect_history.h"
 #include "cc/debug/frame_rate_counter.h"
 #include "cc/debug/paint_time_counter.h"
+#include "cc/layers/quad_sink.h"
 #include "cc/output/renderer.h"
-#include "cc/quad_sink.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/memory_history.h"
 #include "cc/resources/tile_manager.h"
diff --git a/cc/heads_up_display_layer_impl.h b/cc/layers/heads_up_display_layer_impl.h
index 3a95b695..3bc3cf2 100644
--- a/cc/heads_up_display_layer_impl.h
+++ b/cc/layers/heads_up_display_layer_impl.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_HEADS_UP_DISPLAY_LAYER_IMPL_H_
-#define CC_HEADS_UP_DISPLAY_LAYER_IMPL_H_
+#ifndef CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
+#define CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/base/cc_export.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/resources/memory_history.h"
 #include "cc/resources/scoped_resource.h"
 
@@ -123,4 +123,4 @@ class CC_EXPORT HeadsUpDisplayLayerImpl : public LayerImpl {
 
 }  // namespace cc
 
-#endif  // CC_HEADS_UP_DISPLAY_LAYER_IMPL_H_
+#endif  // CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
diff --git a/cc/heads_up_display_unittest.cc b/cc/layers/heads_up_display_unittest.cc
index 68bc474..1a4213e 100644
--- a/cc/heads_up_display_unittest.cc
+++ b/cc/layers/heads_up_display_unittest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/heads_up_display_layer.h"
-#include "cc/layer.h"
+#include "cc/layers/heads_up_display_layer.h"
+#include "cc/layers/layer.h"
 #include "cc/test/layer_tree_test_common.h"
 #include "cc/trees/layer_tree_host.h"
 
diff --git a/cc/image_layer.cc b/cc/layers/image_layer.cc
index d7ac960..4f5e105 100644
--- a/cc/image_layer.cc
+++ b/cc/layers/image_layer.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 "cc/image_layer.h"
+#include "cc/layers/image_layer.h"
 
 #include "base/compiler_specific.h"
 #include "cc/resources/image_layer_updater.h"
diff --git a/cc/image_layer.h b/cc/layers/image_layer.h
index 4608aff..8ba5b78 100644
--- a/cc/image_layer.h
+++ b/cc/layers/image_layer.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_IMAGE_LAYER_H_
-#define CC_IMAGE_LAYER_H_
+#ifndef CC_LAYERS_IMAGE_LAYER_H_
+#define CC_LAYERS_IMAGE_LAYER_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/content_layer.h"
+#include "cc/layers/content_layer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace cc {
@@ -53,4 +53,4 @@ class CC_EXPORT ImageLayer : public TiledLayer {
 
 }  // namespace cc
 
-#endif  // CC_IMAGE_LAYER_H_
+#endif  // CC_LAYERS_IMAGE_LAYER_H_
diff --git a/cc/io_surface_layer.cc b/cc/layers/io_surface_layer.cc
index f3e9972..3ccbdd9 100644
--- a/cc/io_surface_layer.cc
+++ b/cc/layers/io_surface_layer.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/io_surface_layer.h"
+#include "cc/layers/io_surface_layer.h"
 
-#include "cc/io_surface_layer_impl.h"
+#include "cc/layers/io_surface_layer_impl.h"
 
 namespace cc {
 
diff --git a/cc/io_surface_layer.h b/cc/layers/io_surface_layer.h
index dee8676..4073a0d 100644
--- a/cc/io_surface_layer.h
+++ b/cc/layers/io_surface_layer.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_IO_SURFACE_LAYER_H_
-#define CC_IO_SURFACE_LAYER_H_
+#ifndef CC_LAYERS_IO_SURFACE_LAYER_H_
+#define CC_LAYERS_IO_SURFACE_LAYER_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 
 namespace cc {
 
@@ -32,4 +32,4 @@ class CC_EXPORT IOSurfaceLayer : public Layer {
 };
 
 }
-#endif  // CC_IO_SURFACE_LAYER_H_
+#endif  // CC_LAYERS_IO_SURFACE_LAYER_H_
diff --git a/cc/io_surface_layer_impl.cc b/cc/layers/io_surface_layer_impl.cc
index a6d4146..3bfc1de 100644
--- a/cc/io_surface_layer_impl.cc
+++ b/cc/layers/io_surface_layer_impl.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 "cc/io_surface_layer_impl.h"
+#include "cc/layers/io_surface_layer_impl.h"
 
 #include "base/stringprintf.h"
+#include "cc/layers/quad_sink.h"
 #include "cc/output/gl_renderer.h"  // For the GLC() macro.
 #include "cc/output/output_surface.h"
-#include "cc/quad_sink.h"
 #include "cc/quads/io_surface_draw_quad.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "gpu/GLES2/gl2extchromium.h"
diff --git a/cc/io_surface_layer_impl.h b/cc/layers/io_surface_layer_impl.h
index e0d8bb1..2c04ddd 100644
--- a/cc/io_surface_layer_impl.h
+++ b/cc/layers/io_surface_layer_impl.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_IO_SURFACE_LAYER_IMPL_H_
-#define CC_IO_SURFACE_LAYER_IMPL_H_
+#ifndef CC_LAYERS_IO_SURFACE_LAYER_IMPL_H_
+#define CC_LAYERS_IO_SURFACE_LAYER_IMPL_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "ui/gfx/size.h"
 
 namespace cc {
@@ -48,4 +48,4 @@ class CC_EXPORT IOSurfaceLayerImpl : public LayerImpl {
 
 }  // namespace cc
 
-#endif  // CC_IO_SURFACE_LAYER_IMPL_H_
+#endif  // CC_LAYERS_IO_SURFACE_LAYER_IMPL_H_
diff --git a/cc/layer.cc b/cc/layers/layer.cc
index db550da..53a3390 100644
--- a/cc/layer.cc
+++ b/cc/layers/layer.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 "cc/layer.h"
+#include "cc/layers/layer.h"
 
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_events.h"
 #include "cc/animation/layer_animation_controller.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationDelegate.h"
diff --git a/cc/layer.h b/cc/layers/layer.h
index 018d401..c0c34cc 100644
--- a/cc/layer.h
+++ b/cc/layers/layer.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 CC_LAYER_H_
-#define CC_LAYER_H_
+#ifndef CC_LAYERS_LAYER_H_
+#define CC_LAYERS_LAYER_H_
 
 #include <string>
 #include <vector>
@@ -15,8 +15,8 @@
 #include "cc/animation/layer_animation_value_observer.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
-#include "cc/draw_properties.h"
-#include "cc/render_surface.h"
+#include "cc/layers/draw_properties.h"
+#include "cc/layers/render_surface.h"
 #include "cc/trees/occlusion_tracker.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
@@ -485,4 +485,4 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
 
 }  // namespace cc
 
-#endif  // CC_LAYER_H_
+#endif  // CC_LAYERS_LAYER_H_
diff --git a/cc/layer_impl.cc b/cc/layers/layer_impl.cc
index 421078f..60fbbf35 100644
--- a/cc/layer_impl.cc
+++ b/cc/layers/layer_impl.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 "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/stringprintf.h"
@@ -13,9 +13,9 @@
 #include "cc/base/math_util.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/debug/layer_tree_debug_state.h"
-#include "cc/quad_sink.h"
+#include "cc/layers/quad_sink.h"
+#include "cc/layers/scrollbar_layer_impl.h"
 #include "cc/quads/debug_border_draw_quad.h"
-#include "cc/scrollbar_layer_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "cc/trees/proxy.h"
diff --git a/cc/layer_impl.h b/cc/layers/layer_impl.h
index 0ab914e..8b09e2e 100644
--- a/cc/layer_impl.h
+++ b/cc/layers/layer_impl.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 CC_LAYER_IMPL_H_
-#define CC_LAYER_IMPL_H_
+#ifndef CC_LAYERS_LAYER_IMPL_H_
+#define CC_LAYERS_LAYER_IMPL_H_
 
 #include <string>
 
@@ -15,11 +15,11 @@
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
 #include "cc/base/scoped_ptr_vector.h"
-#include "cc/draw_properties.h"
 #include "cc/input/input_handler.h"
+#include "cc/layers/draw_properties.h"
+#include "cc/layers/render_surface_impl.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/shared_quad_state.h"
-#include "cc/render_surface_impl.h"
 #include "cc/resources/resource_provider.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
@@ -525,4 +525,4 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver {
 
 }
 
-#endif  // CC_LAYER_IMPL_H_
+#endif  // CC_LAYERS_LAYER_IMPL_H_
diff --git a/cc/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
index 0c80951..6ff279a 100644
--- a/cc/layer_impl_unittest.cc
+++ b/cc/layers/layer_impl_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 "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
diff --git a/cc/layer_iterator.cc b/cc/layers/layer_iterator.cc
index 554ef86..58a9175 100644
--- a/cc/layer_iterator.cc
+++ b/cc/layers/layer_iterator.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 "cc/layer_iterator.h"
+#include "cc/layers/layer_iterator.h"
 
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
-#include "cc/render_surface.h"
-#include "cc/render_surface_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/render_surface.h"
+#include "cc/layers/render_surface_impl.h"
 
 namespace cc {
 
diff --git a/cc/layer_iterator.h b/cc/layers/layer_iterator.h
index 9da0c5a..55b1d79 100644
--- a/cc/layer_iterator.h
+++ b/cc/layers/layer_iterator.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 CC_LAYER_ITERATOR_H_
-#define CC_LAYER_ITERATOR_H_
+#ifndef CC_LAYERS_LAYER_ITERATOR_H_
+#define CC_LAYERS_LAYER_ITERATOR_H_
 
 #include "base/memory/ref_counted.h"
 #include "cc/base/cc_export.h"
@@ -205,4 +205,4 @@ struct CC_EXPORT LayerIteratorActions {
 
 } // namespace cc
 
-#endif  // CC_LAYER_ITERATOR_H_
+#endif  // CC_LAYERS_LAYER_ITERATOR_H_
diff --git a/cc/layer_iterator_unittest.cc b/cc/layers/layer_iterator_unittest.cc
index c0ceaec..9d4dc52 100644
--- a/cc/layer_iterator_unittest.cc
+++ b/cc/layers/layer_iterator_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/layer_iterator.h"
+#include "cc/layers/layer_iterator.h"
 
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 53bd17d..7b0dbcc 100644
--- a/cc/layer_unittest.cc
+++ b/cc/layers/layer_unittest.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 "cc/layer.h"
+#include "cc/layers/layer.h"
 
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/base/math_util.h"
 #include "cc/base/thread.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/resources/layer_painter.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_impl_proxy.h"
diff --git a/cc/nine_patch_layer.cc b/cc/layers/nine_patch_layer.cc
index 9b678db..b239222 100644
--- a/cc/nine_patch_layer.cc
+++ b/cc/layers/nine_patch_layer.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/nine_patch_layer.h"
+#include "cc/layers/nine_patch_layer.h"
 
-#include "cc/nine_patch_layer_impl.h"
+#include "cc/layers/nine_patch_layer_impl.h"
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/resource_update.h"
 #include "cc/resources/resource_update_queue.h"
diff --git a/cc/nine_patch_layer.h b/cc/layers/nine_patch_layer.h
index dae094f..21b8cb9 100644
--- a/cc/nine_patch_layer.h
+++ b/cc/layers/nine_patch_layer.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_NINE_PATCH_LAYER_H_
-#define CC_NINE_PATCH_LAYER_H_
+#ifndef CC_LAYERS_NINE_PATCH_LAYER_H_
+#define CC_LAYERS_NINE_PATCH_LAYER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 #include "cc/resources/image_layer_updater.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/rect.h"
@@ -58,4 +58,4 @@ class CC_EXPORT NinePatchLayer : public Layer {
 
 }  // namespace cc
 
-#endif  // CC_NINE_PATCH_LAYER_H_
+#endif  // CC_LAYERS_NINE_PATCH_LAYER_H_
diff --git a/cc/nine_patch_layer_impl.cc b/cc/layers/nine_patch_layer_impl.cc
index 1dab059..53daedc 100644
--- a/cc/nine_patch_layer_impl.cc
+++ b/cc/layers/nine_patch_layer_impl.cc
@@ -6,7 +6,7 @@
 
 #include "base/stringprintf.h"
 #include "base/values.h"
-#include "cc/quad_sink.h"
+#include "cc/layers/quad_sink.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "ui/gfx/rect_f.h"
 
diff --git a/cc/nine_patch_layer_impl.h b/cc/layers/nine_patch_layer_impl.h
index 7744459..7091f00 100644
--- a/cc/nine_patch_layer_impl.h
+++ b/cc/layers/nine_patch_layer_impl.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_NINE_PATCH_LAYER_IMPL_H_
-#define CC_NINE_PATCH_LAYER_IMPL_H_
+#ifndef CC_LAYERS_NINE_PATCH_LAYER_IMPL_H_
+#define CC_LAYERS_NINE_PATCH_LAYER_IMPL_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/resources/resource_provider.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
@@ -60,4 +60,4 @@ class CC_EXPORT NinePatchLayerImpl : public LayerImpl {
 
 }  // namespace cc
 
-#endif  // CC_NINE_PATCH_LAYER_IMPL_H_
+#endif  // CC_LAYERS_NINE_PATCH_LAYER_IMPL_H_
diff --git a/cc/nine_patch_layer_impl_unittest.cc b/cc/layers/nine_patch_layer_impl_unittest.cc
index 3489768..b4af387 100644
--- a/cc/nine_patch_layer_impl_unittest.cc
+++ b/cc/layers/nine_patch_layer_impl_unittest.cc
@@ -4,9 +4,8 @@
 
 #include <stdio.h>
 
-#include "cc/nine_patch_layer_impl.h"
-
-#include "cc/append_quads_data.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/nine_patch_layer_impl.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
diff --git a/cc/nine_patch_layer_unittest.cc b/cc/layers/nine_patch_layer_unittest.cc
index 50e83e6..f9c00aa 100644
--- a/cc/nine_patch_layer_unittest.cc
+++ b/cc/layers/nine_patch_layer_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 "cc/nine_patch_layer.h"
+#include "cc/layers/nine_patch_layer.h"
 
 #include "cc/debug/overdraw_metrics.h"
 #include "cc/resources/prioritized_resource_manager.h"
diff --git a/cc/picture_image_layer.cc b/cc/layers/picture_image_layer.cc
index 91021c7..03e3a9e 100644
--- a/cc/picture_image_layer.cc
+++ b/cc/layers/picture_image_layer.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/picture_image_layer.h"
+#include "cc/layers/picture_image_layer.h"
 
-#include "cc/picture_image_layer_impl.h"
+#include "cc/layers/picture_image_layer_impl.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace cc {
diff --git a/cc/picture_image_layer.h b/cc/layers/picture_image_layer.h
index 0a2aa6d..fb4b5be 100644
--- a/cc/picture_image_layer.h
+++ b/cc/layers/picture_image_layer.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_PICTURE_IMAGE_LAYER_H_
-#define CC_PICTURE_IMAGE_LAYER_H_
+#ifndef CC_LAYERS_PICTURE_IMAGE_LAYER_H_
+#define CC_LAYERS_PICTURE_IMAGE_LAYER_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/content_layer_client.h"
-#include "cc/picture_layer.h"
+#include "cc/layers/content_layer_client.h"
+#include "cc/layers/picture_layer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/size.h"
 
@@ -39,4 +39,4 @@ class CC_EXPORT PictureImageLayer : public PictureLayer, ContentLayerClient {
 
 }  // namespace cc
 
-#endif  // CC_PICTURE_IMAGE_LAYER_H_
+#endif  // CC_LAYERS_PICTURE_IMAGE_LAYER_H_
diff --git a/cc/picture_image_layer_impl.cc b/cc/layers/picture_image_layer_impl.cc
index 602aae3..9c478f0 100644
--- a/cc/picture_image_layer_impl.cc
+++ b/cc/layers/picture_image_layer_impl.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 "cc/picture_image_layer_impl.h"
+#include "cc/layers/picture_image_layer_impl.h"
 
 #include "cc/debug/debug_colors.h"
 #include "cc/trees/layer_tree_impl.h"
diff --git a/cc/picture_image_layer_impl.h b/cc/layers/picture_image_layer_impl.h
index 52ea36d..9c3f46d 100644
--- a/cc/picture_image_layer_impl.h
+++ b/cc/layers/picture_image_layer_impl.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_PICTURE_IMAGE_LAYER_IMPL_H_
-#define CC_PICTURE_IMAGE_LAYER_IMPL_H_
+#ifndef CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_
+#define CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_
 
-#include "cc/picture_layer_impl.h"
+#include "cc/layers/picture_layer_impl.h"
 
 namespace cc {
 
@@ -36,4 +36,4 @@ class CC_EXPORT PictureImageLayerImpl : public PictureLayerImpl {
 
 }
 
-#endif  // CC_PICTURE_IMAGE_LAYER_IMPL_H_
+#endif  // CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_
diff --git a/cc/picture_layer.cc b/cc/layers/picture_layer.cc
index d2f8fdb..e2d49a9 100644
--- a/cc/picture_layer.cc
+++ b/cc/layers/picture_layer.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/picture_layer.h"
+#include "cc/layers/picture_layer.h"
 
 #include "cc/debug/devtools_instrumentation.h"
-#include "cc/picture_layer_impl.h"
+#include "cc/layers/picture_layer_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "ui/gfx/rect_conversions.h"
 
diff --git a/cc/picture_layer.h b/cc/layers/picture_layer.h
index 7edb883..0ba4031 100644
--- a/cc/picture_layer.h
+++ b/cc/layers/picture_layer.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_PICTURE_LAYER_H_
-#define CC_PICTURE_LAYER_H_
+#ifndef CC_LAYERS_PICTURE_LAYER_H_
+#define CC_LAYERS_PICTURE_LAYER_H_
 
-#include "cc/contents_scaling_layer.h"
 #include "cc/debug/devtools_instrumentation.h"
-#include "cc/layer.h"
+#include "cc/layers/contents_scaling_layer.h"
+#include "cc/layers/layer.h"
 #include "cc/resources/picture_pile.h"
 #include "cc/trees/occlusion_tracker.h"
 
@@ -54,4 +54,4 @@ class CC_EXPORT PictureLayer : public ContentsScalingLayer {
 
 }  // namespace cc
 
-#endif  // CC_PICTURE_LAYER_H_
+#endif  // CC_LAYERS_PICTURE_LAYER_H_
diff --git a/cc/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 1a5eff4..0255621 100644
--- a/cc/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/picture_layer_impl.h"
+#include "cc/layers/picture_layer_impl.h"
 
 #include "base/time.h"
-#include "cc/append_quads_data.h"
 #include "cc/base/math_util.h"
 #include "cc/base/util.h"
 #include "cc/debug/debug_colors.h"
-#include "cc/quad_sink.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/quad_sink.h"
 #include "cc/quads/checkerboard_draw_quad.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
diff --git a/cc/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index 0bcdb19..d10b93f 100644
--- a/cc/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_PICTURE_LAYER_IMPL_H_
-#define CC_PICTURE_LAYER_IMPL_H_
+#ifndef CC_LAYERS_PICTURE_LAYER_IMPL_H_
+#define CC_LAYERS_PICTURE_LAYER_IMPL_H_
 
 #include "cc/base/scoped_ptr_vector.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/resources/picture_layer_tiling.h"
 #include "cc/resources/picture_layer_tiling_set.h"
 #include "cc/resources/picture_pile_impl.h"
@@ -113,4 +113,4 @@ class CC_EXPORT PictureLayerImpl : public LayerImpl,
 
 }
 
-#endif  // CC_PICTURE_LAYER_IMPL_H_
+#endif  // CC_LAYERS_PICTURE_LAYER_IMPL_H_
diff --git a/cc/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 20a2209..48a5f51 100644
--- a/cc/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/picture_layer_impl.h"
+#include "cc/layers/picture_layer_impl.h"
 
-#include "cc/picture_layer.h"
+#include "cc/layers/picture_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
diff --git a/cc/quad_sink.h b/cc/layers/quad_sink.h
index 510f8f5..041b655 100644
--- a/cc/quad_sink.h
+++ b/cc/layers/quad_sink.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 CC_QUAD_SINK_H_
-#define CC_QUAD_SINK_H_
+#ifndef CC_LAYERS_QUAD_SINK_H_
+#define CC_LAYERS_QUAD_SINK_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
@@ -33,4 +33,4 @@ class CC_EXPORT QuadSink {
 
 }  // namespace cc
 
-#endif  // CC_QUAD_SINK_H_
+#endif  // CC_LAYERS_QUAD_SINK_H_
diff --git a/cc/render_pass_sink.h b/cc/layers/render_pass_sink.h
index baa7057..d307739e6 100644
--- a/cc/render_pass_sink.h
+++ b/cc/layers/render_pass_sink.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 CC_RENDER_PASS_SINK_H_
-#define CC_RENDER_PASS_SINK_H_
+#ifndef CC_LAYERS_RENDER_PASS_SINK_H_
+#define CC_LAYERS_RENDER_PASS_SINK_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
@@ -18,4 +18,4 @@ class CC_EXPORT RenderPassSink {
 
 }  // namespace cc
 
-#endif  // CC_RENDER_PASS_SINK_H_
+#endif  // CC_LAYERS_RENDER_PASS_SINK_H_
diff --git a/cc/render_surface.cc b/cc/layers/render_surface.cc
index 4f5f9ef..4eb5d34 100644
--- a/cc/render_surface.cc
+++ b/cc/layers/render_surface.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/render_surface.h"
+#include "cc/layers/render_surface.h"
 
 #include "cc/base/math_util.h"
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
diff --git a/cc/render_surface.h b/cc/layers/render_surface.h
index d0fc7ab..4373e34 100644
--- a/cc/render_surface.h
+++ b/cc/layers/render_surface.h
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 
-#ifndef CC_RENDER_SURFACE_H_
-#define CC_RENDER_SURFACE_H_
+#ifndef CC_LAYERS_RENDER_SURFACE_H_
+#define CC_LAYERS_RENDER_SURFACE_H_
 
 #include <vector>
 
@@ -136,4 +136,4 @@ class CC_EXPORT RenderSurface {
 };
 
 }
-#endif  // CC_RENDER_SURFACE_H_
+#endif  // CC_LAYERS_RENDER_SURFACE_H_
diff --git a/cc/render_surface_impl.cc b/cc/layers/render_surface_impl.cc
index 6d9de5e8..b437b2c 100644
--- a/cc/render_surface_impl.cc
+++ b/cc/layers/render_surface_impl.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 "cc/render_surface_impl.h"
+#include "cc/layers/render_surface_impl.h"
 
 #include <algorithm>
 
@@ -10,14 +10,14 @@
 #include "base/stringprintf.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/debug_colors.h"
-#include "cc/delegated_renderer_layer_impl.h"
-#include "cc/layer_impl.h"
-#include "cc/quad_sink.h"
+#include "cc/layers/delegated_renderer_layer_impl.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/quad_sink.h"
+#include "cc/layers/render_pass_sink.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
-#include "cc/render_pass_sink.h"
 #include "cc/trees/damage_tracker.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "ui/gfx/rect_conversions.h"
diff --git a/cc/render_surface_impl.h b/cc/layers/render_surface_impl.h
index 5bb0443..1466bca 100644
--- a/cc/render_surface_impl.h
+++ b/cc/layers/render_surface_impl.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 CC_RENDER_SURFACE_IMPL_H_
-#define CC_RENDER_SURFACE_IMPL_H_
+#ifndef CC_LAYERS_RENDER_SURFACE_IMPL_H_
+#define CC_LAYERS_RENDER_SURFACE_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -168,4 +168,4 @@ class CC_EXPORT RenderSurfaceImpl {
 };
 
 }
-#endif  // CC_RENDER_SURFACE_IMPL_H_
+#endif  // CC_LAYERS_RENDER_SURFACE_IMPL_H_
diff --git a/cc/render_surface_unittest.cc b/cc/layers/render_surface_unittest.cc
index df7baeb..30d9480 100644
--- a/cc/render_surface_unittest.cc
+++ b/cc/layers/render_surface_unittest.cc
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/render_surface_impl.h"
-
-#include "cc/append_quads_data.h"
 #include "cc/base/scoped_ptr_vector.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/render_pass_sink.h"
+#include "cc/layers/render_surface_impl.h"
 #include "cc/quads/shared_quad_state.h"
-#include "cc/render_pass_sink.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
diff --git a/cc/scrollbar_geometry_fixed_thumb.cc b/cc/layers/scrollbar_geometry_fixed_thumb.cc
index 4e53422..07c1cb5 100644
--- a/cc/scrollbar_geometry_fixed_thumb.cc
+++ b/cc/layers/scrollbar_geometry_fixed_thumb.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 "cc/scrollbar_geometry_fixed_thumb.h"
+#include "cc/layers/scrollbar_geometry_fixed_thumb.h"
 
 #include <cmath>
 
diff --git a/cc/scrollbar_geometry_fixed_thumb.h b/cc/layers/scrollbar_geometry_fixed_thumb.h
index 8115707..f941104 100644
--- a/cc/scrollbar_geometry_fixed_thumb.h
+++ b/cc/layers/scrollbar_geometry_fixed_thumb.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_SCROLLBAR_GEOMETRY_FIXED_THUMB_H_
-#define CC_SCROLLBAR_GEOMETRY_FIXED_THUMB_H_
+#ifndef CC_LAYERS_SCROLLBAR_GEOMETRY_FIXED_THUMB_H_
+#define CC_LAYERS_SCROLLBAR_GEOMETRY_FIXED_THUMB_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/scrollbar_geometry_stub.h"
+#include "cc/layers/scrollbar_geometry_stub.h"
 #include "ui/gfx/size.h"
 
 namespace cc {
@@ -36,4 +36,4 @@ private:
 
 }
 
-#endif  // CC_SCROLLBAR_GEOMETRY_FIXED_THUMB_H_
+#endif  // CC_LAYERS_SCROLLBAR_GEOMETRY_FIXED_THUMB_H_
diff --git a/cc/scrollbar_geometry_stub.cc b/cc/layers/scrollbar_geometry_stub.cc
index 51fc4f9..fa7b1da 100644
--- a/cc/scrollbar_geometry_stub.cc
+++ b/cc/layers/scrollbar_geometry_stub.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 "cc/scrollbar_geometry_stub.h"
+#include "cc/layers/scrollbar_geometry_stub.h"
 
 #include <cmath>
 
diff --git a/cc/scrollbar_geometry_stub.h b/cc/layers/scrollbar_geometry_stub.h
index 336a2bf..d671475 100644
--- a/cc/scrollbar_geometry_stub.h
+++ b/cc/layers/scrollbar_geometry_stub.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 CC_SCROLLBAR_GEOMETRY_STUB_H_
-#define CC_SCROLLBAR_GEOMETRY_STUB_H_
+#ifndef CC_LAYERS_SCROLLBAR_GEOMETRY_STUB_H_
+#define CC_LAYERS_SCROLLBAR_GEOMETRY_STUB_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
@@ -51,4 +51,4 @@ private:
 
 }
 
-#endif  // CC_SCROLLBAR_GEOMETRY_STUB_H_
+#endif  // CC_LAYERS_SCROLLBAR_GEOMETRY_STUB_H_
diff --git a/cc/scrollbar_layer.cc b/cc/layers/scrollbar_layer.cc
index 72ed5f5..1550ad9 100644
--- a/cc/scrollbar_layer.cc
+++ b/cc/layers/scrollbar_layer.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/scrollbar_layer.h"
+#include "cc/layers/scrollbar_layer.h"
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
+#include "cc/layers/scrollbar_layer_impl.h"
 #include "cc/resources/caching_bitmap_content_layer_updater.h"
 #include "cc/resources/layer_painter.h"
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/resource_update_queue.h"
-#include "cc/scrollbar_layer_impl.h"
 #include "cc/trees/layer_tree_host.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
 #include "ui/gfx/rect_conversions.h"
diff --git a/cc/scrollbar_layer.h b/cc/layers/scrollbar_layer.h
index e12873c..eafdde8 100644
--- a/cc/scrollbar_layer.h
+++ b/cc/layers/scrollbar_layer.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_SCROLLBAR_LAYER_H_
-#define CC_SCROLLBAR_LAYER_H_
+#ifndef CC_LAYERS_SCROLLBAR_LAYER_H_
+#define CC_LAYERS_SCROLLBAR_LAYER_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/contents_scaling_layer.h"
+#include "cc/layers/contents_scaling_layer.h"
+#include "cc/layers/scrollbar_theme_painter.h"
 #include "cc/resources/layer_updater.h"
-#include "cc/scrollbar_theme_painter.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarThemeGeometry.h"
 
@@ -96,4 +96,4 @@ class CC_EXPORT ScrollbarLayer : public ContentsScalingLayer {
 
 }  // namespace cc
 
-#endif  // CC_SCROLLBAR_LAYER_H_
+#endif  // CC_LAYERS_SCROLLBAR_LAYER_H_
diff --git a/cc/scrollbar_layer_impl.cc b/cc/layers/scrollbar_layer_impl.cc
index b9d5faa..63a17cc 100644
--- a/cc/scrollbar_layer_impl.cc
+++ b/cc/layers/scrollbar_layer_impl.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 "cc/scrollbar_layer_impl.h"
+#include "cc/layers/scrollbar_layer_impl.h"
 
 #include "cc/animation/scrollbar_animation_controller.h"
-#include "cc/layer.h"
-#include "cc/quad_sink.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/quad_sink.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/trees/layer_tree_impl.h"
diff --git a/cc/scrollbar_layer_impl.h b/cc/layers/scrollbar_layer_impl.h
index 99d709d..23422b3 100644
--- a/cc/scrollbar_layer_impl.h
+++ b/cc/layers/scrollbar_layer_impl.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_SCROLLBAR_LAYER_IMPL_H_
-#define CC_SCROLLBAR_LAYER_IMPL_H_
+#ifndef CC_LAYERS_SCROLLBAR_LAYER_IMPL_H_
+#define CC_LAYERS_SCROLLBAR_LAYER_IMPL_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/scrollbar_geometry_fixed_thumb.h"
-#include "cc/scrollbar_layer_impl_base.h"
+#include "cc/layers/scrollbar_geometry_fixed_thumb.h"
+#include "cc/layers/scrollbar_layer_impl_base.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 
@@ -147,4 +147,4 @@ class CC_EXPORT ScrollbarLayerImpl : public ScrollbarLayerImplBase {
 };
 
 }
-#endif  // CC_SCROLLBAR_LAYER_IMPL_H_
+#endif  // CC_LAYERS_SCROLLBAR_LAYER_IMPL_H_
diff --git a/cc/scrollbar_layer_impl_base.h b/cc/layers/scrollbar_layer_impl_base.h
index 0648429..714c0d7 100644
--- a/cc/scrollbar_layer_impl_base.h
+++ b/cc/layers/scrollbar_layer_impl_base.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_SCROLLBAR_LAYER_IMPL_BASE_H_
-#define CC_SCROLLBAR_LAYER_IMPL_BASE_H_
+#ifndef CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_
+#define CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h"
 
 namespace cc {
@@ -27,4 +27,4 @@ class CC_EXPORT ScrollbarLayerImplBase : public LayerImpl {
 
 } // namespace cc
 
-#endif // CC_SCROLLBAR_LAYER_IMPL_BASE_H_
+#endif // CC_LAYERS_SCROLLBAR_LAYER_IMPL_BASE_H_
diff --git a/cc/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index d1010f9..8c424a9 100644
--- a/cc/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/scrollbar_layer.h"
+#include "cc/layers/scrollbar_layer.h"
 
 #include "cc/animation/scrollbar_animation_controller.h"
-#include "cc/append_quads_data.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/scrollbar_layer_impl.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/priority_calculator.h"
 #include "cc/resources/resource_update_queue.h"
-#include "cc/scrollbar_layer_impl.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
diff --git a/cc/scrollbar_theme_painter.h b/cc/layers/scrollbar_theme_painter.h
index 1c66fbc..50fec7e 100644
--- a/cc/scrollbar_theme_painter.h
+++ b/cc/layers/scrollbar_theme_painter.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 CC_SCROLLBAR_THEME_PAINTER_H_
-#define CC_SCROLLBAR_THEME_PAINTER_H_
+#ifndef CC_LAYERS_SCROLLBAR_THEME_PAINTER_H_
+#define CC_LAYERS_SCROLLBAR_THEME_PAINTER_H_
 
 #include "cc/base/cc_export.h"
 
@@ -33,4 +33,4 @@ class CC_EXPORT ScrollbarThemePainter {
 
 }  // namespace cc
 
-#endif  // CC_SCROLLBAR_THEME_PAINTER_H_
+#endif  // CC_LAYERS_SCROLLBAR_THEME_PAINTER_H_
diff --git a/cc/solid_color_layer.cc b/cc/layers/solid_color_layer.cc
index a20db89..5a1e26f 100644
--- a/cc/solid_color_layer.cc
+++ b/cc/layers/solid_color_layer.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/solid_color_layer.h"
+#include "cc/layers/solid_color_layer.h"
 
-#include "cc/solid_color_layer_impl.h"
+#include "cc/layers/solid_color_layer_impl.h"
 
 namespace cc {
 
diff --git a/cc/solid_color_layer.h b/cc/layers/solid_color_layer.h
index 8200a27..475f3ed 100644
--- a/cc/solid_color_layer.h
+++ b/cc/layers/solid_color_layer.h
@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 
-#ifndef CC_SOLID_COLOR_LAYER_H_
-#define CC_SOLID_COLOR_LAYER_H_
+#ifndef CC_LAYERS_SOLID_COLOR_LAYER_H_
+#define CC_LAYERS_SOLID_COLOR_LAYER_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 
 namespace cc {
 
@@ -30,4 +30,4 @@ class CC_EXPORT SolidColorLayer : public Layer {
 };
 
 }
-#endif  // CC_SOLID_COLOR_LAYER_H_
+#endif  // CC_LAYERS_SOLID_COLOR_LAYER_H_
diff --git a/cc/solid_color_layer_impl.cc b/cc/layers/solid_color_layer_impl.cc
index 62e0281..114386e 100644
--- a/cc/solid_color_layer_impl.cc
+++ b/cc/layers/solid_color_layer_impl.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/solid_color_layer_impl.h"
+#include "cc/layers/solid_color_layer_impl.h"
 
-#include "cc/quad_sink.h"
+#include "cc/layers/quad_sink.h"
 #include "cc/quads/solid_color_draw_quad.h"
 
 namespace cc {
diff --git a/cc/solid_color_layer_impl.h b/cc/layers/solid_color_layer_impl.h
index 0cfbfea..db99945 100644
--- a/cc/solid_color_layer_impl.h
+++ b/cc/layers/solid_color_layer_impl.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_SOLID_COLOR_LAYER_IMPL_H_
-#define CC_SOLID_COLOR_LAYER_IMPL_H_
+#ifndef CC_LAYERS_SOLID_COLOR_LAYER_IMPL_H_
+#define CC_LAYERS_SOLID_COLOR_LAYER_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 
 namespace cc {
 
@@ -36,4 +36,4 @@ class CC_EXPORT SolidColorLayerImpl : public LayerImpl {
 
 }
 
-#endif  // CC_SOLID_COLOR_LAYER_IMPL_H_
+#endif  // CC_LAYERS_SOLID_COLOR_LAYER_IMPL_H_
diff --git a/cc/solid_color_layer_impl_unittest.cc b/cc/layers/solid_color_layer_impl_unittest.cc
index 2dd3b76..039732e 100644
--- a/cc/solid_color_layer_impl_unittest.cc
+++ b/cc/layers/solid_color_layer_impl_unittest.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 "cc/solid_color_layer_impl.h"
+#include "cc/layers/solid_color_layer_impl.h"
 
-#include "cc/append_quads_data.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/solid_color_layer.h"
 #include "cc/quads/solid_color_draw_quad.h"
-#include "cc/solid_color_layer.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/layer_test_common.h"
diff --git a/cc/texture_layer.cc b/cc/layers/texture_layer.cc
index d109f93..2590470 100644
--- a/cc/texture_layer.cc
+++ b/cc/layers/texture_layer.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 "cc/texture_layer.h"
+#include "cc/layers/texture_layer.h"
 
 #include "cc/base/thread.h"
-#include "cc/texture_layer_client.h"
-#include "cc/texture_layer_impl.h"
+#include "cc/layers/texture_layer_client.h"
+#include "cc/layers/texture_layer_impl.h"
 #include "cc/trees/layer_tree_host.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 
diff --git a/cc/texture_layer.h b/cc/layers/texture_layer.h
index c4fb9e8..a957b4c 100644
--- a/cc/texture_layer.h
+++ b/cc/layers/texture_layer.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 CC_TEXTURE_LAYER_H_
-#define CC_TEXTURE_LAYER_H_
+#ifndef CC_LAYERS_TEXTURE_LAYER_H_
+#define CC_LAYERS_TEXTURE_LAYER_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "cc/base/cc_export.h"
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 #include "cc/resources/texture_mailbox.h"
 
 namespace WebKit { class WebGraphicsContext3D; }
@@ -103,4 +103,4 @@ class CC_EXPORT TextureLayer : public Layer {
 };
 
 }
-#endif  // CC_TEXTURE_LAYER_H_
+#endif  // CC_LAYERS_TEXTURE_LAYER_H_
diff --git a/cc/texture_layer_client.h b/cc/layers/texture_layer_client.h
index ec3447f..f0a9ee0 100644
--- a/cc/texture_layer_client.h
+++ b/cc/layers/texture_layer_client.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 CC_TEXTURE_LAYER_CLIENT_H_
-#define CC_TEXTURE_LAYER_CLIENT_H_
+#ifndef CC_LAYERS_TEXTURE_LAYER_CLIENT_H_
+#define CC_LAYERS_TEXTURE_LAYER_CLIENT_H_
 
 namespace WebKit {
 class WebGraphicsContext3D;
@@ -28,4 +28,4 @@ protected:
 
 }
 
-#endif  // CC_TEXTURE_LAYER_CLIENT_H_
+#endif  // CC_LAYERS_TEXTURE_LAYER_CLIENT_H_
diff --git a/cc/texture_layer_impl.cc b/cc/layers/texture_layer_impl.cc
index d80b8ee..ac366ad 100644
--- a/cc/texture_layer_impl.cc
+++ b/cc/layers/texture_layer_impl.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 "cc/texture_layer_impl.h"
+#include "cc/layers/texture_layer_impl.h"
 
 #include "base/stringprintf.h"
+#include "cc/layers/quad_sink.h"
 #include "cc/output/renderer.h"
-#include "cc/quad_sink.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/trees/layer_tree_impl.h"
 
diff --git a/cc/texture_layer_impl.h b/cc/layers/texture_layer_impl.h
index d59c11f..bee739a 100644
--- a/cc/texture_layer_impl.h
+++ b/cc/layers/texture_layer_impl.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 CC_TEXTURE_LAYER_IMPL_H_
-#define CC_TEXTURE_LAYER_IMPL_H_
+#ifndef CC_LAYERS_TEXTURE_LAYER_IMPL_H_
+#define CC_LAYERS_TEXTURE_LAYER_IMPL_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "cc/base/cc_export.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 
 namespace cc {
 
@@ -84,4 +84,4 @@ class CC_EXPORT TextureLayerImpl : public LayerImpl {
 
 }  // namespace cc
 
-#endif  // CC_TEXTURE_LAYER_IMPL_H_
+#endif  // CC_LAYERS_TEXTURE_LAYER_IMPL_H_
diff --git a/cc/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc
index a095ae3..0e48b1b 100644
--- a/cc/texture_layer_unittest.cc
+++ b/cc/layers/texture_layer_unittest.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/texture_layer.h"
+#include "cc/layers/texture_layer.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "cc/base/thread.h"
+#include "cc/layers/texture_layer_impl.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/layer_tree_test_common.h"
-#include "cc/texture_layer_impl.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
diff --git a/cc/tiled_layer.cc b/cc/layers/tiled_layer.cc
index 6058a76..e64222b 100644
--- a/cc/tiled_layer.cc
+++ b/cc/layers/tiled_layer.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/tiled_layer.h"
+#include "cc/layers/tiled_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "build/build_config.h"
 #include "cc/debug/overdraw_metrics.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/tiled_layer_impl.h"
 #include "cc/resources/layer_updater.h"
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/priority_calculator.h"
-#include "cc/tiled_layer_impl.h"
 #include "cc/trees/layer_tree_host.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/rect_conversions.h"
diff --git a/cc/tiled_layer.h b/cc/layers/tiled_layer.h
index b5f2801..94ebada 100644
--- a/cc/tiled_layer.h
+++ b/cc/layers/tiled_layer.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_TILED_LAYER_H_
-#define CC_TILED_LAYER_H_
+#ifndef CC_LAYERS_TILED_LAYER_H_
+#define CC_LAYERS_TILED_LAYER_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/contents_scaling_layer.h"
+#include "cc/layers/contents_scaling_layer.h"
 #include "cc/resources/layer_tiling_data.h"
 
 namespace cc {
@@ -140,4 +140,4 @@ class CC_EXPORT TiledLayer : public ContentsScalingLayer {
 };
 
 }
-#endif  // CC_TILED_LAYER_H_
+#endif  // CC_LAYERS_TILED_LAYER_H_
diff --git a/cc/tiled_layer_impl.cc b/cc/layers/tiled_layer_impl.cc
index add7a98..2f098ce 100644
--- a/cc/tiled_layer_impl.cc
+++ b/cc/layers/tiled_layer_impl.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/tiled_layer_impl.h"
+#include "cc/layers/tiled_layer_impl.h"
 
 #include "base/basictypes.h"
 #include "base/stringprintf.h"
-#include "cc/append_quads_data.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/debug_colors.h"
-#include "cc/quad_sink.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/quad_sink.h"
 #include "cc/quads/checkerboard_draw_quad.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
diff --git a/cc/tiled_layer_impl.h b/cc/layers/tiled_layer_impl.h
index d3d23bd..ec0c484 100644
--- a/cc/tiled_layer_impl.h
+++ b/cc/layers/tiled_layer_impl.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_TILED_LAYER_IMPL_H_
-#define CC_TILED_LAYER_IMPL_H_
+#ifndef CC_LAYERS_TILED_LAYER_IMPL_H_
+#define CC_LAYERS_TILED_LAYER_IMPL_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 
 namespace cc {
 
@@ -67,4 +67,4 @@ class CC_EXPORT TiledLayerImpl : public LayerImpl {
 
 }  // namespace cc
 
-#endif  // CC_TILED_LAYER_IMPL_H_
+#endif  // CC_LAYERS_TILED_LAYER_IMPL_H_
diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/layers/tiled_layer_impl_unittest.cc
index 4d77f29..994e8b7 100644
--- a/cc/tiled_layer_impl_unittest.cc
+++ b/cc/layers/tiled_layer_impl_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/tiled_layer_impl.h"
+#include "cc/layers/tiled_layer_impl.h"
 
-#include "cc/append_quads_data.h"
+#include "cc/layers/append_quads_data.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/resources/layer_tiling_data.h"
 #include "cc/test/fake_impl_proxy.h"
diff --git a/cc/tiled_layer_unittest.cc b/cc/layers/tiled_layer_unittest.cc
index 3b98627..671fd0d 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/layers/tiled_layer_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 "cc/tiled_layer.h"
+#include "cc/layers/tiled_layer.h"
 
 #include "cc/debug/overdraw_metrics.h"
 #include "cc/resources/bitmap_content_layer_updater.h"
diff --git a/cc/video_frame_provider.h b/cc/layers/video_frame_provider.h
index dadcc14..ecf0024 100644
--- a/cc/video_frame_provider.h
+++ b/cc/layers/video_frame_provider.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 CC_VIDEO_FRAME_PROVIDER_H_
-#define CC_VIDEO_FRAME_PROVIDER_H_
+#ifndef CC_LAYERS_VIDEO_FRAME_PROVIDER_H_
+#define CC_LAYERS_VIDEO_FRAME_PROVIDER_H_
 
 #include "base/memory/ref_counted.h"
 
@@ -57,4 +57,4 @@ class VideoFrameProvider {
 
 }  // namespace cc
 
-#endif  // CC_VIDEO_FRAME_PROVIDER_H_
+#endif  // CC_LAYERS_VIDEO_FRAME_PROVIDER_H_
diff --git a/cc/video_frame_provider_client_impl.cc b/cc/layers/video_frame_provider_client_impl.cc
index 47ef533..2f318bf 100644
--- a/cc/video_frame_provider_client_impl.cc
+++ b/cc/layers/video_frame_provider_client_impl.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/video_frame_provider_client_impl.h"
+#include "cc/layers/video_frame_provider_client_impl.h"
 
 #include "cc/base/math_util.h"
-#include "cc/video_layer_impl.h"
+#include "cc/layers/video_layer_impl.h"
 
 namespace cc {
 
diff --git a/cc/video_frame_provider_client_impl.h b/cc/layers/video_frame_provider_client_impl.h
index a2a9fc7..c7f332e 100644
--- a/cc/video_frame_provider_client_impl.h
+++ b/cc/layers/video_frame_provider_client_impl.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_
-#define CC_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_
+#ifndef CC_LAYERS_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_
+#define CC_LAYERS_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
-#include "cc/video_frame_provider.h"
+#include "cc/layers/video_frame_provider.h"
 #include "ui/gfx/transform.h"
 
 namespace media { class VideoFrame; }
@@ -60,4 +60,4 @@ class VideoFrameProviderClientImpl
 
 }  // namespace cc
 
-#endif  // CC_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_
+#endif  // CC_LAYERS_VIDEO_FRAME_PROVIDER_CLIENT_IMPL_H_
diff --git a/cc/video_layer.cc b/cc/layers/video_layer.cc
index 06daf76..5066835 100644
--- a/cc/video_layer.cc
+++ b/cc/layers/video_layer.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/video_layer.h"
+#include "cc/layers/video_layer.h"
 
-#include "cc/video_layer_impl.h"
+#include "cc/layers/video_layer_impl.h"
 
 namespace cc {
 
diff --git a/cc/video_layer.h b/cc/layers/video_layer.h
index 4e16b1b..c9705cd 100644
--- a/cc/video_layer.h
+++ b/cc/layers/video_layer.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_VIDEO_LAYER_H_
-#define CC_VIDEO_LAYER_H_
+#ifndef CC_LAYERS_VIDEO_LAYER_H_
+#define CC_LAYERS_VIDEO_LAYER_H_
 
 #include "base/callback.h"
 #include "cc/base/cc_export.h"
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 
 namespace media { class VideoFrame; }
 
@@ -35,4 +35,4 @@ class CC_EXPORT VideoLayer : public Layer {
 
 }  // namespace cc
 
-#endif  // CC_VIDEO_LAYER_H_
+#endif  // CC_LAYERS_VIDEO_LAYER_H_
diff --git a/cc/video_layer_impl.cc b/cc/layers/video_layer_impl.cc
index 2eb6265..42d5036 100644
--- a/cc/video_layer_impl.cc
+++ b/cc/layers/video_layer_impl.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/video_layer_impl.h"
+#include "cc/layers/video_layer_impl.h"
 
 #include "base/logging.h"
 #include "cc/base/math_util.h"
+#include "cc/layers/quad_sink.h"
+#include "cc/layers/video_frame_provider_client_impl.h"
 #include "cc/output/renderer.h"
-#include "cc/quad_sink.h"
 #include "cc/quads/io_surface_draw_quad.h"
 #include "cc/quads/stream_video_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/quads/yuv_video_draw_quad.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/trees/layer_tree_impl.h"
-#include "cc/video_frame_provider_client_impl.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "media/filters/skcanvas_video_renderer.h"
 #include "third_party/khronos/GLES2/gl2.h"
diff --git a/cc/video_layer_impl.h b/cc/layers/video_layer_impl.h
index 44083a9..b7969aa 100644
--- a/cc/video_layer_impl.h
+++ b/cc/layers/video_layer_impl.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 CC_VIDEO_LAYER_IMPL_H_
-#define CC_VIDEO_LAYER_IMPL_H_
+#ifndef CC_LAYERS_VIDEO_LAYER_IMPL_H_
+#define CC_LAYERS_VIDEO_LAYER_IMPL_H_
 
 #include "base/callback.h"
 #include "base/synchronization/lock.h"
 #include "cc/base/cc_export.h"
-#include "cc/layer_impl.h"
-#include "cc/video_frame_provider.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/video_frame_provider.h"
 #include "media/base/video_frame.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/size.h"
@@ -85,4 +85,4 @@ class CC_EXPORT VideoLayerImpl : public LayerImpl {
 
 }  // namespace cc
 
-#endif  // CC_VIDEO_LAYER_IMPL_H_
+#endif  // CC_LAYERS_VIDEO_LAYER_IMPL_H_
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 90b27f3..ea337c5 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -14,6 +14,7 @@
 #include "base/strings/string_split.h"
 #include "build/build_config.h"
 #include "cc/base/math_util.h"
+#include "cc/layers/video_layer_impl.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/context_provider.h"
@@ -30,7 +31,6 @@
 #include "cc/trees/damage_tracker.h"
 #include "cc/trees/proxy.h"
 #include "cc/trees/single_thread_proxy.h"
-#include "cc/video_layer_impl.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc
index 4a22779..744ef08 100644
--- a/cc/output/software_renderer_unittest.cc
+++ b/cc/output/software_renderer_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "cc/output/software_renderer.h"
 
+#include "cc/layers/quad_sink.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/software_output_device.h"
-#include "cc/quad_sink.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
diff --git a/cc/pinch_zoom_scrollbar.cc b/cc/pinch_zoom_scrollbar.cc
index 4bba245..0f00633 100644
--- a/cc/pinch_zoom_scrollbar.cc
+++ b/cc/pinch_zoom_scrollbar.cc
@@ -4,7 +4,7 @@
 
 #include "cc/pinch_zoom_scrollbar.h"
 
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 #include "cc/pinch_zoom_scrollbar_geometry.h"
 #include "cc/trees/layer_tree_host.h"
 
diff --git a/cc/pinch_zoom_scrollbar_painter.h b/cc/pinch_zoom_scrollbar_painter.h
index ae0fc38..49aeb1b 100644
--- a/cc/pinch_zoom_scrollbar_painter.h
+++ b/cc/pinch_zoom_scrollbar_painter.h
@@ -6,7 +6,7 @@
 #define CC_PINCH_ZOOM_SCROLLBAR_PAINTER_H_
 
 #include "base/compiler_specific.h"
-#include "cc/scrollbar_theme_painter.h"
+#include "cc/layers/scrollbar_theme_painter.h"
 
 namespace cc {
 
diff --git a/cc/quads/yuv_video_draw_quad.h b/cc/quads/yuv_video_draw_quad.h
index 34f99be..dde1459 100644
--- a/cc/quads/yuv_video_draw_quad.h
+++ b/cc/quads/yuv_video_draw_quad.h
@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
+#include "cc/layers/video_layer_impl.h"
 #include "cc/quads/draw_quad.h"
-#include "cc/video_layer_impl.h"
 
 namespace cc {
 
diff --git a/cc/resources/picture.cc b/cc/resources/picture.cc
index 52ae35e..a343237 100644
--- a/cc/resources/picture.cc
+++ b/cc/resources/picture.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/debug/trace_event.h"
-#include "cc/content_layer_client.h"
 #include "cc/debug/rendering_stats.h"
+#include "cc/layers/content_layer_client.h"
 #include "cc/resources/picture.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkCanvas.h"
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
index 37710db..8711b35 100644
--- a/cc/test/animation_test_common.cc
+++ b/cc/test/animation_test_common.cc
@@ -6,8 +6,8 @@
 
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/animation/layer_animation_controller.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/transform_operations.h"
 
 using cc::Animation;
diff --git a/cc/test/fake_content_layer.h b/cc/test/fake_content_layer.h
index 0b977af..52fea8f 100644
--- a/cc/test/fake_content_layer.h
+++ b/cc/test/fake_content_layer.h
@@ -6,7 +6,7 @@
 #define CC_TEST_FAKE_CONTENT_LAYER_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/content_layer.h"
+#include "cc/layers/content_layer.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_content_layer_client.h b/cc/test/fake_content_layer_client.h
index 02cde33..df94680 100644
--- a/cc/test/fake_content_layer_client.h
+++ b/cc/test/fake_content_layer_client.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "cc/content_layer_client.h"
+#include "cc/layers/content_layer_client.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
diff --git a/cc/test/fake_content_layer_impl.h b/cc/test/fake_content_layer_impl.h
index ea81a0d..b05a5de 100644
--- a/cc/test/fake_content_layer_impl.h
+++ b/cc/test/fake_content_layer_impl.h
@@ -6,7 +6,7 @@
 #define CC_TEST_FAKE_CONTENT_LAYER_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/tiled_layer_impl.h"
+#include "cc/layers/tiled_layer_impl.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_delegated_renderer_layer.h b/cc/test/fake_delegated_renderer_layer.h
index 69a4b57..b30349b 100644
--- a/cc/test/fake_delegated_renderer_layer.h
+++ b/cc/test/fake_delegated_renderer_layer.h
@@ -5,7 +5,7 @@
 #ifndef CC_TEST_FAKE_DELEGATED_RENDERER_LAYER_H_
 #define CC_TEST_FAKE_DELEGATED_RENDERER_LAYER_H_
 
-#include "cc/delegated_renderer_layer.h"
+#include "cc/layers/delegated_renderer_layer.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_delegated_renderer_layer_impl.h b/cc/test/fake_delegated_renderer_layer_impl.h
index 42258b8..b9789f5 100644
--- a/cc/test/fake_delegated_renderer_layer_impl.h
+++ b/cc/test/fake_delegated_renderer_layer_impl.h
@@ -5,7 +5,7 @@
 #ifndef CC_TEST_FAKE_DELEGATED_RENDERER_LAYER_IMPL_H_
 #define CC_TEST_FAKE_DELEGATED_RENDERER_LAYER_IMPL_H_
 
-#include "cc/delegated_renderer_layer_impl.h"
+#include "cc/layers/delegated_renderer_layer_impl.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_scrollbar_layer.h b/cc/test/fake_scrollbar_layer.h
index 95e67f9..f06f752 100644
--- a/cc/test/fake_scrollbar_layer.h
+++ b/cc/test/fake_scrollbar_layer.h
@@ -6,7 +6,7 @@
 #define CC_TEST_FAKE_SCROLLBAR_LAYER_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/scrollbar_layer.h"
+#include "cc/layers/scrollbar_layer.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_scrollbar_theme_painter.h b/cc/test/fake_scrollbar_theme_painter.h
index 61c8dd3..cb66fb4 100644
--- a/cc/test/fake_scrollbar_theme_painter.h
+++ b/cc/test/fake_scrollbar_theme_painter.h
@@ -6,7 +6,7 @@
 #define CC_TEST_FAKE_SCROLLBAR_THEME_PAINTER_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/scrollbar_theme_painter.h"
+#include "cc/layers/scrollbar_theme_painter.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace cc {
diff --git a/cc/test/fake_video_frame_provider.h b/cc/test/fake_video_frame_provider.h
index 6cde47f..972d8f8 100644
--- a/cc/test/fake_video_frame_provider.h
+++ b/cc/test/fake_video_frame_provider.h
@@ -5,7 +5,7 @@
 #ifndef CC_TEST_FAKE_VIDEO_FRAME_PROVIDER_H_
 #define CC_TEST_FAKE_VIDEO_FRAME_PROVIDER_H_
 
-#include "cc/video_frame_provider.h"
+#include "cc/layers/video_frame_provider.h"
 #include "media/base/video_frame.h"
 
 namespace cc {
diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
index d40c5a5..3b40170 100644
--- a/cc/test/layer_tree_json_parser.cc
+++ b/cc/test/layer_tree_json_parser.cc
@@ -6,10 +6,10 @@
 
 #include "base/test/values_test_util.h"
 #include "base/values.h"
-#include "cc/content_layer.h"
-#include "cc/layer.h"
-#include "cc/nine_patch_layer.h"
-#include "cc/solid_color_layer.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/nine_patch_layer.h"
+#include "cc/layers/solid_color_layer.h"
 
 namespace cc {
 
diff --git a/cc/test/layer_tree_pixel_test.h b/cc/test/layer_tree_pixel_test.h
index 4682d9e..4759152 100644
--- a/cc/test/layer_tree_pixel_test.h
+++ b/cc/test/layer_tree_pixel_test.h
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/files/file_path.h"
-#include "cc/solid_color_layer.h"
+#include "cc/layers/solid_color_layer.h"
 #include "cc/test/layer_tree_test_common.h"
 
 #ifndef CC_TEST_LAYER_TREE_PIXEL_TEST_H_
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index c9a0e472..f3592a8 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -8,10 +8,10 @@
 #include "cc/animation/animation_registrar.h"
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/thread_impl.h"
-#include "cc/content_layer.h"
 #include "cc/input/input_handler.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_output_surface.h"
diff --git a/cc/test/mock_quad_culler.h b/cc/test/mock_quad_culler.h
index 412b374..ac413e4 100644
--- a/cc/test/mock_quad_culler.h
+++ b/cc/test/mock_quad_culler.h
@@ -6,7 +6,7 @@
 #define CC_TEST_MOCK_QUAD_CULLER_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/quad_sink.h"
+#include "cc/layers/quad_sink.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/render_pass.h"
 
diff --git a/cc/test/occlusion_tracker_test_common.h b/cc/test/occlusion_tracker_test_common.h
index 494d94d..1181b54 100644
--- a/cc/test/occlusion_tracker_test_common.h
+++ b/cc/test/occlusion_tracker_test_common.h
@@ -5,8 +5,8 @@
 #ifndef CC_TEST_OCCLUSION_TRACKER_TEST_COMMON_H_
 #define CC_TEST_OCCLUSION_TRACKER_TEST_COMMON_H_
 
-#include "cc/render_surface.h"
-#include "cc/render_surface_impl.h"
+#include "cc/layers/render_surface.h"
+#include "cc/layers/render_surface_impl.h"
 #include "cc/trees/occlusion_tracker.h"
 
 namespace cc {
diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc
index 693252b..d232f7d 100644
--- a/cc/test/render_pass_test_utils.cc
+++ b/cc/test/render_pass_test_utils.cc
@@ -4,8 +4,8 @@
 
 #include "cc/test/render_pass_test_utils.h"
 
-#include "cc/append_quads_data.h"
-#include "cc/quad_sink.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/quad_sink.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/solid_color_draw_quad.h"
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 8b49411..3b949c2 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -6,14 +6,14 @@
 #define CC_TEST_TILED_LAYER_TEST_COMMON_H_
 
 #include "cc/base/region.h"
+#include "cc/layers/tiled_layer.h"
+#include "cc/layers/tiled_layer_impl.h"
 #include "cc/output/texture_copier.h"
 #include "cc/resources/layer_updater.h"
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/resource_update_queue.h"
 #include "cc/scheduler/texture_uploader.h"
-#include "cc/tiled_layer.h"
-#include "cc/tiled_layer_impl.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
diff --git a/cc/trees/damage_tracker.cc b/cc/trees/damage_tracker.cc
index 5187a43..85ccbe4 100644
--- a/cc/trees/damage_tracker.cc
+++ b/cc/trees/damage_tracker.cc
@@ -5,8 +5,8 @@
 #include "cc/trees/damage_tracker.h"
 
 #include "cc/base/math_util.h"
-#include "cc/layer_impl.h"
-#include "cc/render_surface_impl.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/render_surface_impl.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 
diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc
index 3d82272..2fc63ce 100644
--- a/cc/trees/damage_tracker_unittest.cc
+++ b/cc/trees/damage_tracker_unittest.cc
@@ -5,7 +5,7 @@
 #include "cc/trees/damage_tracker.h"
 
 #include "cc/base/math_util.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
diff --git a/cc/trees/layer_sorter.cc b/cc/trees/layer_sorter.cc
index 3486180..16b75fa 100644
--- a/cc/trees/layer_sorter.cc
+++ b/cc/trees/layer_sorter.cc
@@ -11,7 +11,7 @@
 
 #include "base/logging.h"
 #include "cc/base/math_util.h"
-#include "cc/render_surface_impl.h"
+#include "cc/layers/render_surface_impl.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
diff --git a/cc/trees/layer_sorter.h b/cc/trees/layer_sorter.h
index 3b3e839..a1a00dd 100644
--- a/cc/trees/layer_sorter.h
+++ b/cc/trees/layer_sorter.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "cc/base/cc_export.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/quad_f.h"
 #include "ui/gfx/rect_f.h"
diff --git a/cc/trees/layer_sorter_unittest.cc b/cc/trees/layer_sorter_unittest.cc
index aacb8ac..73de79c 100644
--- a/cc/trees/layer_sorter_unittest.cc
+++ b/cc/trees/layer_sorter_unittest.cc
@@ -5,7 +5,7 @@
 #include "cc/trees/layer_sorter.h"
 
 #include "cc/base/math_util.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/trees/single_thread_proxy.h"
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 2de01a5..81ab616 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -16,16 +16,16 @@
 #include "cc/base/switches.h"
 #include "cc/base/thread.h"
 #include "cc/debug/overdraw_metrics.h"
-#include "cc/heads_up_display_layer.h"
-#include "cc/heads_up_display_layer_impl.h"
 #include "cc/input/top_controls_manager.h"
-#include "cc/layer.h"
-#include "cc/layer_iterator.h"
+#include "cc/layers/heads_up_display_layer.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_iterator.h"
+#include "cc/layers/scrollbar_layer.h"
 #include "cc/pinch_zoom_scrollbar.h"
 #include "cc/pinch_zoom_scrollbar_geometry.h"
 #include "cc/pinch_zoom_scrollbar_painter.h"
 #include "cc/resources/prioritized_resource_manager.h"
-#include "cc/scrollbar_layer.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_host_impl.h"
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index 30b8f5f..931b6f9f 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -8,12 +8,12 @@
 
 #include "base/debug/trace_event.h"
 #include "cc/base/math_util.h"
-#include "cc/heads_up_display_layer_impl.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
-#include "cc/layer_iterator.h"
-#include "cc/render_surface.h"
-#include "cc/render_surface_impl.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/layer_iterator.h"
+#include "cc/layers/render_surface.h"
+#include "cc/layers/render_surface_impl.h"
 #include "cc/trees/layer_sorter.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "ui/gfx/point_conversions.h"
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index 8cefb59..dbf7ca6 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -7,11 +7,11 @@
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/base/thread.h"
-#include "cc/content_layer.h"
-#include "cc/content_layer_client.h"
-#include "cc/heads_up_display_layer_impl.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/content_layer_client.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 0a4a584..022fff8 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -13,7 +13,6 @@
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "cc/animation/scrollbar_animation_controller.h"
-#include "cc/append_quads_data.h"
 #include "cc/base/math_util.h"
 #include "cc/base/util.h"
 #include "cc/debug/debug_rect_history.h"
@@ -21,10 +20,12 @@
 #include "cc/debug/overdraw_metrics.h"
 #include "cc/debug/paint_time_counter.h"
 #include "cc/debug/rendering_stats.h"
-#include "cc/heads_up_display_layer_impl.h"
 #include "cc/input/page_scale_animation.h"
 #include "cc/input/top_controls_manager.h"
-#include "cc/layer_iterator.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/layer_iterator.h"
+#include "cc/layers/scrollbar_layer_impl.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/delegating_renderer.h"
 #include "cc/output/gl_renderer.h"
@@ -37,7 +38,6 @@
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/scheduler/delay_based_time_source.h"
 #include "cc/scheduler/texture_uploader.h"
-#include "cc/scrollbar_layer_impl.h"
 #include "cc/trees/damage_tracker.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index 5c2dc40..e9bd4d4 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -13,10 +13,10 @@
 #include "cc/base/cc_export.h"
 #include "cc/input/input_handler.h"
 #include "cc/input/top_controls_manager_client.h"
+#include "cc/layers/render_pass_sink.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/renderer.h"
 #include "cc/quads/render_pass.h"
-#include "cc/render_pass_sink.h"
 #include "cc/resources/tile_manager.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 91f7fa0..ad27935 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -10,22 +10,25 @@
 #include "base/command_line.h"
 #include "base/hash_tables.h"
 #include "cc/base/math_util.h"
-#include "cc/delegated_renderer_layer_impl.h"
-#include "cc/heads_up_display_layer_impl.h"
 #include "cc/input/top_controls_manager.h"
-#include "cc/io_surface_layer_impl.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/delegated_renderer_layer_impl.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/io_surface_layer_impl.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/quad_sink.h"
+#include "cc/layers/scrollbar_geometry_fixed_thumb.h"
+#include "cc/layers/scrollbar_layer_impl.h"
+#include "cc/layers/solid_color_layer_impl.h"
+#include "cc/layers/texture_layer_impl.h"
+#include "cc/layers/tiled_layer_impl.h"
+#include "cc/layers/video_layer_impl.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/gl_renderer.h"
-#include "cc/quad_sink.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/resources/layer_tiling_data.h"
-#include "cc/scrollbar_geometry_fixed_thumb.h"
-#include "cc/scrollbar_layer_impl.h"
-#include "cc/solid_color_layer_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_proxy.h"
@@ -35,11 +38,8 @@
 #include "cc/test/layer_test_common.h"
 #include "cc/test/render_pass_test_common.h"
 #include "cc/test/test_web_graphics_context_3d.h"
-#include "cc/texture_layer_impl.h"
-#include "cc/tiled_layer_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
-#include "cc/video_layer_impl.h"
 #include "media/base/media.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
index 495c8bc..ab39cbb 100644
--- a/cc/trees/layer_tree_host_perftest.cc
+++ b/cc/trees/layer_tree_host_perftest.cc
@@ -8,9 +8,9 @@
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
-#include "cc/content_layer.h"
-#include "cc/nine_patch_layer.h"
-#include "cc/solid_color_layer.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/nine_patch_layer.h"
+#include "cc/layers/solid_color_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/layer_tree_json_parser.h"
 #include "cc/test/layer_tree_test_common.h"
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 97308ea..8cb0b22 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -5,16 +5,16 @@
 #include "cc/trees/layer_tree_host.h"
 
 #include "base/synchronization/lock.h"
-#include "cc/content_layer.h"
-#include "cc/content_layer_client.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/content_layer_client.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/picture_layer.h"
+#include "cc/layers/scrollbar_layer.h"
 #include "cc/output/output_surface.h"
-#include "cc/picture_layer.h"
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/resource_update_queue.h"
 #include "cc/scheduler/frame_rate_controller.h"
-#include "cc/scrollbar_layer.h"
 #include "cc/test/fake_content_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_layer_tree_host_client.h"
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
index a9430fb..1fffca8 100644
--- a/cc/trees/layer_tree_host_unittest_animation.cc
+++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -6,8 +6,8 @@
 
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/layer_animation_controller.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/fake_content_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/layer_tree_test_common.h"
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index 386bd854..6ec2534 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -5,12 +5,15 @@
 #include "cc/trees/layer_tree_host.h"
 
 #include "base/basictypes.h"
-#include "cc/content_layer.h"
-#include "cc/heads_up_display_layer.h"
-#include "cc/io_surface_layer.h"
-#include "cc/layer_impl.h"
-#include "cc/picture_layer.h"
-#include "cc/scrollbar_layer.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/heads_up_display_layer.h"
+#include "cc/layers/io_surface_layer.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/picture_layer.h"
+#include "cc/layers/scrollbar_layer.h"
+#include "cc/layers/texture_layer.h"
+#include "cc/layers/video_layer.h"
+#include "cc/layers/video_layer_impl.h"
 #include "cc/test/fake_content_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_content_layer_impl.h"
@@ -26,12 +29,9 @@
 #include "cc/test/layer_tree_test_common.h"
 #include "cc/test/render_pass_test_common.h"
 #include "cc/test/test_web_graphics_context_3d.h"
-#include "cc/texture_layer.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
-#include "cc/video_layer.h"
-#include "cc/video_layer_impl.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "media/base/media.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
index a982f3a..cf81c25 100644
--- a/cc/trees/layer_tree_host_unittest_delegated.cc
+++ b/cc/trees/layer_tree_host_unittest_delegated.cc
@@ -4,8 +4,8 @@
 
 #include "cc/trees/layer_tree_host.h"
 
-#include "cc/delegated_renderer_layer.h"
-#include "cc/delegated_renderer_layer_impl.h"
+#include "cc/layers/delegated_renderer_layer.h"
+#include "cc/layers/delegated_renderer_layer_impl.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/texture_draw_quad.h"
diff --git a/cc/trees/layer_tree_host_unittest_occlusion.cc b/cc/trees/layer_tree_host_unittest_occlusion.cc
index 10a55e4..b62c811 100644
--- a/cc/trees/layer_tree_host_unittest_occlusion.cc
+++ b/cc/trees/layer_tree_host_unittest_occlusion.cc
@@ -4,7 +4,7 @@
 
 #include "cc/trees/layer_tree_host.h"
 
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
 #include "cc/test/layer_tree_test_common.h"
 #include "cc/test/occlusion_tracker_test_common.h"
 
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index 0ba3635..09d8fbc5 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -4,9 +4,9 @@
 
 #include "cc/trees/layer_tree_host.h"
 
-#include "cc/content_layer.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/layer_tree_test_common.h"
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 7cedbc20..9b5f41d 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -9,10 +9,10 @@
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/animation/scrollbar_animation_controller.h"
-#include "cc/heads_up_display_layer_impl.h"
-#include "cc/layer.h"
+#include "cc/layers/heads_up_display_layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/scrollbar_layer_impl.h"
 #include "cc/pinch_zoom_scrollbar.h"
-#include "cc/scrollbar_layer_impl.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "ui/gfx/size_conversions.h"
diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
index f72f753..a14541d 100644
--- a/cc/trees/layer_tree_impl.h
+++ b/cc/trees/layer_tree_impl.h
@@ -7,7 +7,7 @@
 
 #include "base/hash_tables.h"
 #include "base/values.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer_impl.h"
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
diff --git a/cc/trees/occlusion_tracker.cc b/cc/trees/occlusion_tracker.cc
index 2a35adc..77b083b 100644
--- a/cc/trees/occlusion_tracker.cc
+++ b/cc/trees/occlusion_tracker.cc
@@ -8,8 +8,8 @@
 
 #include "cc/base/math_util.h"
 #include "cc/debug/overdraw_metrics.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "ui/gfx/quad_f.h"
 #include "ui/gfx/rect_conversions.h"
 
diff --git a/cc/trees/occlusion_tracker.h b/cc/trees/occlusion_tracker.h
index 01662ff..f659c31 100644
--- a/cc/trees/occlusion_tracker.h
+++ b/cc/trees/occlusion_tracker.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
-#include "cc/layer_iterator.h"
+#include "cc/layers/layer_iterator.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc
index 981ddd5..0ec71d1 100644
--- a/cc/trees/occlusion_tracker_unittest.cc
+++ b/cc/trees/occlusion_tracker_unittest.cc
@@ -7,8 +7,8 @@
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/overdraw_metrics.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
diff --git a/cc/trees/quad_culler.cc b/cc/trees/quad_culler.cc
index e65ed02..205f98b 100644
--- a/cc/trees/quad_culler.cc
+++ b/cc/trees/quad_culler.cc
@@ -4,10 +4,10 @@
 
 #include "cc/trees/quad_culler.h"
 
-#include "cc/append_quads_data.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/debug/overdraw_metrics.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/render_pass.h"
 #include "cc/trees/occlusion_tracker.h"
diff --git a/cc/trees/quad_culler.h b/cc/trees/quad_culler.h
index cadd3da..be0095f 100644
--- a/cc/trees/quad_culler.h
+++ b/cc/trees/quad_culler.h
@@ -6,7 +6,7 @@
 #define CC_TREES_QUAD_CULLER_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/quad_sink.h"
+#include "cc/layers/quad_sink.h"
 #include "cc/quads/render_pass.h"
 
 namespace cc {
diff --git a/cc/trees/quad_culler_unittest.cc b/cc/trees/quad_culler_unittest.cc
index b4e94e7..c7dad79 100644
--- a/cc/trees/quad_culler_unittest.cc
+++ b/cc/trees/quad_culler_unittest.cc
@@ -4,14 +4,14 @@
 
 #include "cc/trees/quad_culler.h"
 
-#include "cc/append_quads_data.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/overdraw_metrics.h"
+#include "cc/layers/append_quads_data.h"
+#include "cc/layers/tiled_layer_impl.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/resources/layer_tiling_data.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
-#include "cc/tiled_layer_impl.h"
 #include "cc/trees/occlusion_tracker.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/trees/tree_synchronizer.cc b/cc/trees/tree_synchronizer.cc
index ce071f2..5bbfca6 100644
--- a/cc/trees/tree_synchronizer.cc
+++ b/cc/trees/tree_synchronizer.cc
@@ -7,10 +7,10 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "cc/animation/scrollbar_animation_controller.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
-#include "cc/scrollbar_layer.h"
-#include "cc/scrollbar_layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
+#include "cc/layers/scrollbar_layer.h"
+#include "cc/layers/scrollbar_layer_impl.h"
 
 namespace cc {
 
diff --git a/cc/trees/tree_synchronizer_unittest.cc b/cc/trees/tree_synchronizer_unittest.cc
index 8629f3d..3b1632c 100644
--- a/cc/trees/tree_synchronizer_unittest.cc
+++ b/cc/trees/tree_synchronizer_unittest.cc
@@ -7,8 +7,8 @@
 #include <algorithm>
 
 #include "cc/animation/layer_animation_controller.h"
-#include "cc/layer.h"
-#include "cc/layer_impl.h"
+#include "cc/layers/layer.h"
+#include "cc/layers/layer_impl.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"