75 files changed, 214 insertions, 214 deletions

diff --git a/cc/cc.gyp b/cc/cc.gyp
index 730ce44..48c6a3b 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -24,12 +24,12 @@
       'checkerboard_draw_quad.cc',
       'checkerboard_draw_quad.h',
       'base/completion_event.h',
-      'compositor_frame.cc',
-      'compositor_frame.h',
-      'compositor_frame_ack.cc',
-      'compositor_frame_ack.h',
-      'compositor_frame_metadata.cc',
-      'compositor_frame_metadata.h',
+      'output/compositor_frame.cc',
+      'output/compositor_frame.h',
+      'output/compositor_frame_ack.cc',
+      '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',
@@ -37,7 +37,7 @@
       'content_layer_updater.h',
       'contents_scaling_layer.cc',
       'contents_scaling_layer.h',
-      'context_provider.h',
+      'output/context_provider.h',
       'damage_tracker.cc',
       'damage_tracker.h',
       'debug_border_draw_quad.cc',
@@ -48,17 +48,17 @@
       'debug/debug_rect_history.h',
       'delay_based_time_source.cc',
       'delay_based_time_source.h',
-      'delegated_frame_data.h',
-      'delegated_frame_data.cc',
+      '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',
-      'delegating_renderer.cc',
-      'delegating_renderer.h',
+      'output/delegating_renderer.cc',
+      'output/delegating_renderer.h',
       'debug/devtools_instrumentation.h',
-      'direct_renderer.cc',
-      'direct_renderer.h',
+      'output/direct_renderer.cc',
+      'output/direct_renderer.h',
       'draw_properties.h',
       'draw_quad.cc',
       'draw_quad.h',
@@ -68,14 +68,14 @@
       'frame_rate_controller.h',
       'debug/frame_rate_counter.cc',
       'debug/frame_rate_counter.h',
-      'geometry_binding.cc',
-      'geometry_binding.h',
-      'gl_frame_data.h',
-      'gl_frame_data.cc',
-      'gl_renderer.cc',
-      'gl_renderer.h',
-      'gl_renderer_draw_cache.cc',
-      'gl_renderer_draw_cache.h',
+      'output/geometry_binding.cc',
+      'output/geometry_binding.h',
+      'output/gl_frame_data.h',
+      'output/gl_frame_data.cc',
+      'output/gl_renderer.cc',
+      'output/gl_renderer.h',
+      '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',
@@ -141,9 +141,9 @@
       'nine_patch_layer_impl.h',
       'occlusion_tracker.cc',
       'occlusion_tracker.h',
-      'output_surface.cc',
-      'output_surface.h',
-      'output_surface_client.h',
+      'output/output_surface.cc',
+      'output/output_surface.h',
+      'output/output_surface_client.h',
       'debug/overdraw_metrics.cc',
       'debug/overdraw_metrics.h',
       'page_scale_animation.cc',
@@ -183,8 +183,8 @@
       'prioritized_resource_manager.h',
       'priority_calculator.cc',
       'priority_calculator.h',
-      'program_binding.cc',
-      'program_binding.h',
+      'output/program_binding.cc',
+      'output/program_binding.h',
       'proxy.cc',
       'proxy.h',
       'quad_culler.cc',
@@ -203,12 +203,12 @@
       'render_pass_sink.h',
       'render_surface.cc',
       'render_surface.h',
-      'render_surface_filters.cc',
-      'render_surface_filters.h',
+      'output/render_surface_filters.cc',
+      'output/render_surface_filters.h',
       'render_surface_impl.cc',
       'render_surface_impl.h',
-      'renderer.cc',
-      'renderer.h',
+      'output/renderer.cc',
+      'output/renderer.h',
       'debug/rendering_stats.cc',
       'debug/rendering_stats.h',
       'resource.cc',
@@ -248,20 +248,20 @@
       'scrollbar_layer_impl.cc',
       'scrollbar_layer_impl.h',
       'scrollbar_layer_impl_base.h',
-      'shader.cc',
-      'shader.h',
+      'output/shader.cc',
+      'output/shader.h',
       'shared_quad_state.cc',
       'shared_quad_state.h',
       'single_thread_proxy.cc',
       'single_thread_proxy.h',
       'skpicture_content_layer_updater.cc',
       'skpicture_content_layer_updater.h',
-      'software_frame_data.cc',
-      'software_frame_data.h',
-      'software_output_device.cc',
-      'software_output_device.h',
-      'software_renderer.cc',
-      'software_renderer.h',
+      'output/software_frame_data.cc',
+      'output/software_frame_data.h',
+      'output/software_output_device.cc',
+      'output/software_output_device.h',
+      'output/software_renderer.cc',
+      'output/software_renderer.h',
       'solid_color_draw_quad.cc',
       'solid_color_draw_quad.h',
       'solid_color_layer.cc',
@@ -272,8 +272,8 @@
       'stream_video_draw_quad.h',
       'base/switches.cc',
       'base/switches.h',
-      'texture_copier.cc',
-      'texture_copier.h',
+      'output/texture_copier.cc',
+      'output/texture_copier.h',
       'texture_draw_quad.cc',
       'texture_draw_quad.h',
       'texture_layer.cc',
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index a4e010d..67382cf 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -12,12 +12,12 @@
       'damage_tracker_unittest.cc',
       'delay_based_time_source_unittest.cc',
       'delegated_renderer_layer_impl_unittest.cc',
-      'delegating_renderer_unittest.cc',
+      'output/delegating_renderer_unittest.cc',
       'draw_quad_unittest.cc',
       'base/float_quad_unittest.cc',
       'frame_rate_controller_unittest.cc',
-      'gl_renderer_unittest.cc',
-      'gl_renderer_pixeltest.cc',
+      'output/gl_renderer_unittest.cc',
+      'output/gl_renderer_pixeltest.cc',
       'base/hash_pair_unittest.cc',
       'heads_up_display_unittest.cc',
       'animation/keyframed_animation_curve_unittest.cc',
@@ -47,7 +47,7 @@
       'quad_culler_unittest.cc',
       'base/region_unittest.cc',
       'render_pass_unittest.cc',
-      'render_surface_filters_unittest.cc',
+      'output/render_surface_filters_unittest.cc',
       'render_surface_unittest.cc',
       'resource_provider_unittest.cc',
       'resource_update_controller_unittest.cc',
@@ -56,9 +56,9 @@
       'scoped_resource_unittest.cc',
       'animation/scrollbar_animation_controller_linear_fade_unittest.cc',
       'scrollbar_layer_unittest.cc',
-      'software_renderer_unittest.cc',
+      'output/software_renderer_unittest.cc',
       'solid_color_layer_impl_unittest.cc',
-      'texture_copier_unittest.cc',
+      'output/texture_copier_unittest.cc',
       'texture_layer_unittest.cc',
       'texture_uploader_unittest.cc',
       'tile_priority_unittest.cc',
diff --git a/cc/delegated_renderer_layer.cc b/cc/delegated_renderer_layer.cc
index cc4c10f..bdf8b37 100644
--- a/cc/delegated_renderer_layer.cc
+++ b/cc/delegated_renderer_layer.cc
@@ -4,8 +4,8 @@
 
 #include "cc/delegated_renderer_layer.h"
 
-#include "cc/delegated_frame_data.h"
 #include "cc/delegated_renderer_layer_impl.h"
+#include "cc/output/delegated_frame_data.h"
 
 namespace cc {
 
diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc
index 2b4731e..6b91502 100644
--- a/cc/delegated_renderer_layer_impl.cc
+++ b/cc/delegated_renderer_layer_impl.cc
@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "cc/append_quads_data.h"
 #include "cc/base/math_util.h"
-#include "cc/delegated_frame_data.h"
 #include "cc/layer_tree_impl.h"
+#include "cc/output/delegated_frame_data.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass_draw_quad.h"
 #include "cc/render_pass_sink.h"
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc
index 7adaa99..b021dd1 100644
--- a/cc/heads_up_display_layer_impl.cc
+++ b/cc/heads_up_display_layer_impl.cc
@@ -12,8 +12,8 @@
 #include "cc/debug/paint_time_counter.h"
 #include "cc/layer_tree_impl.h"
 #include "cc/memory_history.h"
+#include "cc/output/renderer.h"
 #include "cc/quad_sink.h"
-#include "cc/renderer.h"
 #include "cc/texture_draw_quad.h"
 #include "cc/tile_manager.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc
index f9394f6..56bef43 100644
--- a/cc/io_surface_layer_impl.cc
+++ b/cc/io_surface_layer_impl.cc
@@ -5,10 +5,10 @@
 #include "cc/io_surface_layer_impl.h"
 
 #include "base/stringprintf.h"
-#include "cc/gl_renderer.h"  // For the GLC() macro.
 #include "cc/io_surface_draw_quad.h"
 #include "cc/layer_tree_impl.h"
-#include "cc/output_surface.h"
+#include "cc/output/gl_renderer.h"  // For the GLC() macro.
+#include "cc/output/output_surface.h"
 #include "cc/quad_sink.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index 1a2774d..c6dfb1c 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -22,7 +22,7 @@
 #include "cc/layer_tree_host_common.h"
 #include "cc/layer_tree_settings.h"
 #include "cc/occlusion_tracker.h"
-#include "cc/output_surface.h"
+#include "cc/output/output_surface.h"
 #include "cc/proxy.h"
 #include "cc/rate_limiter.h"
 #include "skia/ext/refptr.h"
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index a0a26a8..8bcb8b8 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -16,7 +16,6 @@
 #include "cc/append_quads_data.h"
 #include "cc/base/math_util.h"
 #include "cc/base/util.h"
-#include "cc/compositor_frame_metadata.h"
 #include "cc/damage_tracker.h"
 #include "cc/debug/debug_rect_history.h"
 #include "cc/debug/frame_rate_counter.h"
@@ -24,14 +23,16 @@
 #include "cc/debug/paint_time_counter.h"
 #include "cc/debug/rendering_stats.h"
 #include "cc/delay_based_time_source.h"
-#include "cc/delegating_renderer.h"
-#include "cc/gl_renderer.h"
 #include "cc/heads_up_display_layer_impl.h"
 #include "cc/layer_iterator.h"
 #include "cc/layer_tree_host.h"
 #include "cc/layer_tree_host_common.h"
 #include "cc/layer_tree_impl.h"
 #include "cc/memory_history.h"
+#include "cc/output/compositor_frame_metadata.h"
+#include "cc/output/delegating_renderer.h"
+#include "cc/output/gl_renderer.h"
+#include "cc/output/software_renderer.h"
 #include "cc/page_scale_animation.h"
 #include "cc/picture_layer_tiling.h"
 #include "cc/prioritized_resource_manager.h"
@@ -40,7 +41,6 @@
 #include "cc/scrollbar_layer_impl.h"
 #include "cc/shared_quad_state.h"
 #include "cc/single_thread_proxy.h"
-#include "cc/software_renderer.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/texture_uploader.h"
 #include "cc/top_controls_manager.h"
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index bc8a8d7..172b8f1 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -12,10 +12,10 @@
 #include "cc/animation/animation_registrar.h"
 #include "cc/base/cc_export.h"
 #include "cc/input_handler.h"
-#include "cc/output_surface_client.h"
+#include "cc/output/output_surface_client.h"
+#include "cc/output/renderer.h"
 #include "cc/render_pass.h"
 #include "cc/render_pass_sink.h"
-#include "cc/renderer.h"
 #include "cc/tile_manager.h"
 #include "cc/top_controls_manager_client.h"
 #include "skia/ext/refptr.h"
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 0f8024f..4c12629 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -10,14 +10,14 @@
 #include "base/command_line.h"
 #include "base/hash_tables.h"
 #include "cc/base/math_util.h"
-#include "cc/compositor_frame_metadata.h"
 #include "cc/delegated_renderer_layer_impl.h"
-#include "cc/gl_renderer.h"
 #include "cc/heads_up_display_layer_impl.h"
 #include "cc/io_surface_layer_impl.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_tiling_data.h"
 #include "cc/layer_tree_impl.h"
+#include "cc/output/compositor_frame_metadata.h"
+#include "cc/output/gl_renderer.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass_draw_quad.h"
 #include "cc/scrollbar_geometry_fixed_thumb.h"
diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
index 05f1d6d..73bea6b 100644
--- a/cc/layer_tree_host_unittest.cc
+++ b/cc/layer_tree_host_unittest.cc
@@ -11,7 +11,7 @@
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/layer_tree_impl.h"
-#include "cc/output_surface.h"
+#include "cc/output/output_surface.h"
 #include "cc/picture_layer.h"
 #include "cc/prioritized_resource.h"
 #include "cc/prioritized_resource_manager.h"
diff --git a/cc/layer_tree_host_unittest_delegated.cc b/cc/layer_tree_host_unittest_delegated.cc
index dfc5fca..84ae85e 100644
--- a/cc/layer_tree_host_unittest_delegated.cc
+++ b/cc/layer_tree_host_unittest_delegated.cc
@@ -4,10 +4,10 @@
 
 #include "cc/layer_tree_host.h"
 
-#include "cc/delegated_frame_data.h"
 #include "cc/delegated_renderer_layer.h"
 #include "cc/delegated_renderer_layer_impl.h"
 #include "cc/layer_tree_impl.h"
+#include "cc/output/delegated_frame_data.h"
 #include "cc/shared_quad_state.h"
 #include "cc/test/fake_delegated_renderer_layer.h"
 #include "cc/test/fake_delegated_renderer_layer_impl.h"
diff --git a/cc/compositor_frame.cc b/cc/output/compositor_frame.cc
index d8a5511..e6d713d 100644
--- a/cc/compositor_frame.cc
+++ b/cc/output/compositor_frame.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/compositor_frame.h"
+#include "cc/output/compositor_frame.h"
 
 namespace cc {
 
diff --git a/cc/compositor_frame.h b/cc/output/compositor_frame.h
index 7559419..bf3ae3e 100644
--- a/cc/compositor_frame.h
+++ b/cc/output/compositor_frame.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_COMPOSITOR_FRAME_H_
-#define CC_COMPOSITOR_FRAME_H_
+#ifndef CC_OUTPUT_COMPOSITOR_FRAME_H_
+#define CC_OUTPUT_COMPOSITOR_FRAME_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/compositor_frame_metadata.h"
-#include "cc/delegated_frame_data.h"
-#include "cc/gl_frame_data.h"
-#include "cc/software_frame_data.h"
+#include "cc/output/compositor_frame_metadata.h"
+#include "cc/output/delegated_frame_data.h"
+#include "cc/output/gl_frame_data.h"
+#include "cc/output/software_frame_data.h"
 
 namespace cc {
 
@@ -29,4 +29,4 @@ class CC_EXPORT CompositorFrame {
 
 }  // namespace cc
 
-#endif  // CC_COMPOSITOR_FRAME_H_
+#endif  // CC_OUTPUT_COMPOSITOR_FRAME_H_
diff --git a/cc/compositor_frame_ack.cc b/cc/output/compositor_frame_ack.cc
index 1ad1093..781c67d 100644
--- a/cc/compositor_frame_ack.cc
+++ b/cc/output/compositor_frame_ack.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/compositor_frame_ack.h"
+#include "cc/output/compositor_frame_ack.h"
 
 namespace cc {
 
diff --git a/cc/compositor_frame_ack.h b/cc/output/compositor_frame_ack.h
index eb03321..be15c61 100644
--- a/cc/compositor_frame_ack.h
+++ b/cc/output/compositor_frame_ack.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_COMPOSITOR_FRAME_ACK_H_
-#define CC_COMPOSITOR_FRAME_ACK_H_
+#ifndef CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_
+#define CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/gl_frame_data.h"
+#include "cc/output/gl_frame_data.h"
 #include "cc/transferable_resource.h"
 #include "ui/surface/transport_dib.h"
 
@@ -25,4 +25,4 @@ class CC_EXPORT CompositorFrameAck {
 
 }  // namespace cc
 
-#endif  // CC_COMPOSITOR_FRAME_ACK_H_
+#endif  // CC_OUTPUT_COMPOSITOR_FRAME_ACK_H_
diff --git a/cc/compositor_frame_metadata.cc b/cc/output/compositor_frame_metadata.cc
index 73aa975..e202c30 100644
--- a/cc/compositor_frame_metadata.cc
+++ b/cc/output/compositor_frame_metadata.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/compositor_frame_metadata.h"
+#include "cc/output/compositor_frame_metadata.h"
 
 namespace cc {
 
diff --git a/cc/compositor_frame_metadata.h b/cc/output/compositor_frame_metadata.h
index 9d1d455..c451a5b 100644
--- a/cc/compositor_frame_metadata.h
+++ b/cc/output/compositor_frame_metadata.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_COMPOSITOR_FRAME_METADATA_H_
-#define CC_COMPOSITOR_FRAME_METADATA_H_
+#ifndef CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_
+#define CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_
 
 #include "cc/base/cc_export.h"
 #include "ui/gfx/size_f.h"
@@ -40,4 +40,4 @@ class CC_EXPORT CompositorFrameMetadata
 
 }  // namespace cc
 
-#endif  // CC_COMPOSITOR_FRAME_METADATA_H_
+#endif  // CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_
diff --git a/cc/context_provider.h b/cc/output/context_provider.h
index e8e3f18..3b489c7 100644
--- a/cc/context_provider.h
+++ b/cc/output/context_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_CONTEXT_PROVIDER_H_
-#define CC_CONTEXT_PROVIDER_H_
+#ifndef CC_OUTPUT_CONTEXT_PROVIDER_H_
+#define CC_OUTPUT_CONTEXT_PROVIDER_H_
 
 #include "base/memory/ref_counted.h"
 
@@ -39,4 +39,4 @@ class ContextProvider : public base::RefCountedThreadSafe<ContextProvider> {
 
 }  // namespace cc
 
-#endif  // CC_CONTEXT_PROVIDER_H_
+#endif  // CC_OUTPUT_CONTEXT_PROVIDER_H_
diff --git a/cc/delegated_frame_data.cc b/cc/output/delegated_frame_data.cc
index 4c08041..516a3ec 100644
--- a/cc/delegated_frame_data.cc
+++ b/cc/output/delegated_frame_data.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/delegated_frame_data.h"
+#include "cc/output/delegated_frame_data.h"
 
 namespace cc {
 
diff --git a/cc/delegated_frame_data.h b/cc/output/delegated_frame_data.h
index 6d8f608..499b549 100644
--- a/cc/delegated_frame_data.h
+++ b/cc/output/delegated_frame_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_DELEGATED_FRAME_DATA_H_
-#define CC_DELEGATED_FRAME_DATA_H_
+#ifndef CC_OUTPUT_DELEGATED_FRAME_DATA_H_
+#define CC_OUTPUT_DELEGATED_FRAME_DATA_H_
 
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
@@ -24,4 +24,4 @@ class CC_EXPORT DelegatedFrameData {
 
 }  // namespace cc
 
-#endif  // CC_DELEGATED_FRAME_DATA_H_
+#endif  // CC_OUTPUT_DELEGATED_FRAME_DATA_H_
diff --git a/cc/delegating_renderer.cc b/cc/output/delegating_renderer.cc
index 9792974..26a3f19 100644
--- a/cc/delegating_renderer.cc
+++ b/cc/output/delegating_renderer.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/delegating_renderer.h"
+#include "cc/output/delegating_renderer.h"
 
 #include <set>
 #include <string>
@@ -12,9 +12,9 @@
 #include "base/string_util.h"
 #include "base/strings/string_split.h"
 #include "cc/checkerboard_draw_quad.h"
-#include "cc/compositor_frame.h"
-#include "cc/compositor_frame_ack.h"
 #include "cc/debug_border_draw_quad.h"
+#include "cc/output/compositor_frame.h"
+#include "cc/output/compositor_frame_ack.h"
 #include "cc/render_pass.h"
 #include "cc/render_pass_draw_quad.h"
 #include "cc/resource_provider.h"
diff --git a/cc/delegating_renderer.h b/cc/output/delegating_renderer.h
index cd3d593..8b938cd 100644
--- a/cc/delegating_renderer.h
+++ b/cc/output/delegating_renderer.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_DELEGATING_RENDERER_H_
-#define CC_DELEGATING_RENDERER_H_
+#ifndef CC_OUTPUT_DELEGATING_RENDERER_H_
+#define CC_OUTPUT_DELEGATING_RENDERER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/renderer.h"
+#include "cc/output/renderer.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 
 namespace cc {
@@ -66,4 +66,4 @@ private:
 
 }  // namespace cc
 
-#endif  // CC_DELEGATING_RENDERER_H_
+#endif  // CC_OUTPUT_DELEGATING_RENDERER_H_
diff --git a/cc/delegating_renderer_unittest.cc b/cc/output/delegating_renderer_unittest.cc
index 69e5a46..5dcdc8c 100644
--- a/cc/delegating_renderer_unittest.cc
+++ b/cc/output/delegating_renderer_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/delegating_renderer.h"
+#include "cc/output/delegating_renderer.h"
 
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/layer_tree_test_common.h"
diff --git a/cc/direct_renderer.cc b/cc/output/direct_renderer.cc
index 06fde86..3aed731 100644
--- a/cc/direct_renderer.cc
+++ b/cc/output/direct_renderer.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/direct_renderer.h"
+#include "cc/output/direct_renderer.h"
 
 #include <vector>
 
diff --git a/cc/direct_renderer.h b/cc/output/direct_renderer.h
index de65251..72dff5d 100644
--- a/cc/direct_renderer.h
+++ b/cc/output/direct_renderer.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_DIRECT_RENDERER_H_
-#define CC_DIRECT_RENDERER_H_
+#ifndef CC_OUTPUT_DIRECT_RENDERER_H_
+#define CC_OUTPUT_DIRECT_RENDERER_H_
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
-#include "cc/renderer.h"
+#include "cc/output/renderer.h"
 #include "cc/resource_provider.h"
 #include "cc/scoped_resource.h"
 
@@ -121,4 +121,4 @@ class CC_EXPORT DirectRenderer : public Renderer {
 
 }  // namespace cc
 
-#endif  // CC_DIRECT_RENDERER_H_
+#endif  // CC_OUTPUT_DIRECT_RENDERER_H_
diff --git a/cc/geometry_binding.cc b/cc/output/geometry_binding.cc
index 4bfa7f0..5c3db34 100644
--- a/cc/geometry_binding.cc
+++ b/cc/output/geometry_binding.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/geometry_binding.h"
+#include "cc/output/geometry_binding.h"
 
-#include "cc/gl_renderer.h"  // For the GLC() macro.
+#include "cc/output/gl_renderer.h"  // For the GLC() macro.
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/rect_f.h"
diff --git a/cc/geometry_binding.h b/cc/output/geometry_binding.h
index 2d5aed1..74321aa 100644
--- a/cc/geometry_binding.h
+++ b/cc/output/geometry_binding.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_GEOMETRY_BINDING_H_
-#define CC_GEOMETRY_BINDING_H_
+#ifndef CC_OUTPUT_GEOMETRY_BINDING_H_
+#define CC_OUTPUT_GEOMETRY_BINDING_H_
 
 namespace gfx { class RectF; }
 
@@ -35,4 +35,4 @@ class GeometryBinding {
 
 }  // namespace cc
 
-#endif  // CC_GEOMETRY_BINDING_H_
+#endif  // CC_OUTPUT_GEOMETRY_BINDING_H_
diff --git a/cc/gl_frame_data.cc b/cc/output/gl_frame_data.cc
index 9895c79..b5b5721 100644
--- a/cc/gl_frame_data.cc
+++ b/cc/output/gl_frame_data.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/gl_frame_data.h"
+#include "cc/output/gl_frame_data.h"
 
 namespace cc {
 
diff --git a/cc/gl_frame_data.h b/cc/output/gl_frame_data.h
index b7dd611..e6d227f 100644
--- a/cc/gl_frame_data.h
+++ b/cc/output/gl_frame_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_GL_FRAME_DATA_H_
-#define CC_GL_FRAME_DATA_H_
+#ifndef CC_OUTPUT_GL_FRAME_DATA_H_
+#define CC_OUTPUT_GL_FRAME_DATA_H_
 
 #include <string>
 
@@ -26,4 +26,4 @@ class CC_EXPORT GLFrameData {
 
 }  // namespace cc
 
-#endif  // CC_GL_FRAME_DATA_H_
+#endif  // CC_OUTPUT_GL_FRAME_DATA_H_
diff --git a/cc/gl_renderer.cc b/cc/output/gl_renderer.cc
index 63a35d2..1de4180 100644
--- a/cc/gl_renderer.cc
+++ b/cc/output/gl_renderer.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/gl_renderer.h"
+#include "cc/output/gl_renderer.h"
 
 #include <set>
 #include <string>
@@ -14,18 +14,18 @@
 #include "base/strings/string_split.h"
 #include "build/build_config.h"
 #include "cc/base/math_util.h"
-#include "cc/compositor_frame.h"
-#include "cc/compositor_frame_metadata.h"
-#include "cc/context_provider.h"
 #include "cc/damage_tracker.h"
-#include "cc/geometry_binding.h"
-#include "cc/gl_frame_data.h"
 #include "cc/layer_quad.h"
-#include "cc/output_surface.h"
+#include "cc/output/compositor_frame.h"
+#include "cc/output/compositor_frame_metadata.h"
+#include "cc/output/context_provider.h"
+#include "cc/output/geometry_binding.h"
+#include "cc/output/gl_frame_data.h"
+#include "cc/output/output_surface.h"
+#include "cc/output/render_surface_filters.h"
 #include "cc/priority_calculator.h"
 #include "cc/proxy.h"
 #include "cc/render_pass.h"
-#include "cc/render_surface_filters.h"
 #include "cc/scoped_resource.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/stream_video_draw_quad.h"
diff --git a/cc/gl_renderer.h b/cc/output/gl_renderer.h
index f8651a8..faa7176 100644
--- a/cc/gl_renderer.h
+++ b/cc/output/gl_renderer.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_GL_RENDERER_H_
-#define CC_GL_RENDERER_H_
+#ifndef CC_OUTPUT_GL_RENDERER_H_
+#define CC_OUTPUT_GL_RENDERER_H_
 
 #include "cc/base/cc_export.h"
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/debug_border_draw_quad.h"
-#include "cc/direct_renderer.h"
-#include "cc/gl_renderer_draw_cache.h"
 #include "cc/io_surface_draw_quad.h"
+#include "cc/output/direct_renderer.h"
+#include "cc/output/gl_renderer_draw_cache.h"
+#include "cc/output/renderer.h"
 #include "cc/render_pass_draw_quad.h"
-#include "cc/renderer.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/tile_draw_quad.h"
 #include "cc/yuv_video_draw_quad.h"
@@ -337,4 +337,4 @@ class CC_EXPORT GLRenderer :
 
 }
 
-#endif  // CC_GL_RENDERER_H_
+#endif  // CC_OUTPUT_GL_RENDERER_H_
diff --git a/cc/gl_renderer_draw_cache.cc b/cc/output/gl_renderer_draw_cache.cc
index 41bbce2..51834c4 100644
--- a/cc/gl_renderer_draw_cache.cc
+++ b/cc/output/gl_renderer_draw_cache.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/gl_renderer_draw_cache.h"
+#include "cc/output/gl_renderer_draw_cache.h"
 
 namespace cc {
 
diff --git a/cc/gl_renderer_draw_cache.h b/cc/output/gl_renderer_draw_cache.h
index 4b955dc..28d4e71 100644
--- a/cc/gl_renderer_draw_cache.h
+++ b/cc/output/gl_renderer_draw_cache.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_GL_RENDERER_DRAW_CACHE_H_
-#define CC_GL_RENDERER_DRAW_CACHE_H_
+#ifndef CC_OUTPUT_GL_RENDERER_DRAW_CACHE_H_
+#define CC_OUTPUT_GL_RENDERER_DRAW_CACHE_H_
 
 #include <vector>
 
@@ -46,4 +46,4 @@ struct TexturedQuadDrawCache {
 
 }  // namespace cc
 
-#endif  // CC_GL_RENDERER_DRAW_CACHE_H_
+#endif  // CC_OUTPUT_GL_RENDERER_DRAW_CACHE_H_
diff --git a/cc/gl_renderer_pixeltest.cc b/cc/output/gl_renderer_pixeltest.cc
index 71e89b3..b8492e6 100644
--- a/cc/gl_renderer_pixeltest.cc
+++ b/cc/output/gl_renderer_pixeltest.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/gl_renderer.h"
+#include "cc/output/gl_renderer.h"
 
 #include "cc/draw_quad.h"
 #include "cc/test/pixel_test.h"
diff --git a/cc/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 31847cc..eca58a7 100644
--- a/cc/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.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/gl_renderer.h"
+#include "cc/output/gl_renderer.h"
 
-#include "cc/compositor_frame_metadata.h"
 #include "cc/draw_quad.h"
+#include "cc/output/compositor_frame_metadata.h"
 #include "cc/prioritized_resource_manager.h"
 #include "cc/resource_provider.h"
 #include "cc/test/fake_impl_proxy.h"
diff --git a/cc/output_surface.cc b/cc/output/output_surface.cc
index d1da25c..34ba8d0 100644
--- a/cc/output_surface.cc
+++ b/cc/output/output_surface.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/output_surface.h"
+#include "cc/output/output_surface.h"
 
 #include <set>
 #include <string>
diff --git a/cc/output_surface.h b/cc/output/output_surface.h
index 9bfbc08..ce425ed 100644
--- a/cc/output_surface.h
+++ b/cc/output/output_surface.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_OUTPUT_SURFACE_H_
-#define CC_OUTPUT_SURFACE_H_
+#ifndef CC_OUTPUT_OUTPUT_SURFACE_H_
+#define CC_OUTPUT_OUTPUT_SURFACE_H_
 
 #define USE_CC_OUTPUT_SURFACE // TODO(danakj): Remove this.
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/software_output_device.h"
+#include "cc/output/software_output_device.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 
 namespace gfx {
@@ -104,4 +104,4 @@ class CC_EXPORT OutputSurface {
 
 }  // namespace cc
 
-#endif  // CC_OUTPUT_SURFACE_H_
+#endif  // CC_OUTPUT_OUTPUT_SURFACE_H_
diff --git a/cc/output_surface_client.h b/cc/output/output_surface_client.h
index 5040e10..b8d0ad7 100644
--- a/cc/output_surface_client.h
+++ b/cc/output/output_surface_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_OUTPUT_SURFACE_CLIENT_H_
-#define CC_OUTPUT_SURFACE_CLIENT_H_
+#ifndef CC_OUTPUT_OUTPUT_SURFACE_CLIENT_H_
+#define CC_OUTPUT_OUTPUT_SURFACE_CLIENT_H_
 
 #include "base/time.h"
 #include "cc/base/cc_export.h"
@@ -24,4 +24,4 @@ class CC_EXPORT OutputSurfaceClient {
 
 }  // namespace cc
 
-#endif  // CC_OUTPUT_SURFACE_CLIENT_H_
+#endif  // CC_OUTPUT_OUTPUT_SURFACE_CLIENT_H_
diff --git a/cc/program_binding.cc b/cc/output/program_binding.cc
index 08960f0..7793d36 100644
--- a/cc/program_binding.cc
+++ b/cc/output/program_binding.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/program_binding.h"
+#include "cc/output/program_binding.h"
 
 #include "base/debug/trace_event.h"
-#include "cc/geometry_binding.h"
-#include "cc/gl_renderer.h"  // For the GLC() macro.
+#include "cc/output/geometry_binding.h"
+#include "cc/output/gl_renderer.h"  // For the GLC() macro.
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
diff --git a/cc/program_binding.h b/cc/output/program_binding.h
index 4fa6c7b..77396cc 100644
--- a/cc/program_binding.h
+++ b/cc/output/program_binding.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_PROGRAM_BINDING_H_
-#define CC_PROGRAM_BINDING_H_
+#ifndef CC_OUTPUT_PROGRAM_BINDING_H_
+#define CC_OUTPUT_PROGRAM_BINDING_H_
 
 #include <string>
 
@@ -87,4 +87,4 @@ class ProgramBinding : public ProgramBindingBase {
 
 }  // namespace cc
 
-#endif  // CC_PROGRAM_BINDING_H_
+#endif  // CC_OUTPUT_PROGRAM_BINDING_H_
diff --git a/cc/render_surface_filters.cc b/cc/output/render_surface_filters.cc
index 8f61c69..dd5e1a1 100644
--- a/cc/render_surface_filters.cc
+++ b/cc/output/render_surface_filters.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_filters.h"
+#include "cc/output/render_surface_filters.h"
 
 #include "base/logging.h"
 #include "skia/ext/refptr.h"
diff --git a/cc/render_surface_filters.h b/cc/output/render_surface_filters.h
index ef65d4c..62dde8e3 100644
--- a/cc/render_surface_filters.h
+++ b/cc/output/render_surface_filters.h
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 
-#ifndef CC_RENDER_SURFACE_FILTERS_H_
-#define CC_RENDER_SURFACE_FILTERS_H_
+#ifndef CC_OUTPUT_RENDER_SURFACE_FILTERS_H_
+#define CC_OUTPUT_RENDER_SURFACE_FILTERS_H_
 
 #include "cc/base/cc_export.h"
 
@@ -35,4 +35,4 @@ class CC_EXPORT RenderSurfaceFilters {
 };
 
 }
-#endif  // CC_RENDER_SURFACE_FILTERS_H_
+#endif  // CC_OUTPUT_RENDER_SURFACE_FILTERS_H_
diff --git a/cc/render_surface_filters_unittest.cc b/cc/output/render_surface_filters_unittest.cc
index fdd0371..6898f23 100644
--- a/cc/render_surface_filters_unittest.cc
+++ b/cc/output/render_surface_filters_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/render_surface_filters.h"
+#include "cc/output/render_surface_filters.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
diff --git a/cc/renderer.cc b/cc/output/renderer.cc
index 110f6b1..7627db7 100644
--- a/cc/renderer.cc
+++ b/cc/output/renderer.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/renderer.h"
+#include "cc/output/renderer.h"
 
 namespace cc {
 
diff --git a/cc/renderer.h b/cc/output/renderer.h
index b8136ce..1c309ac 100644
--- a/cc/renderer.h
+++ b/cc/output/renderer.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_RENDERER_H_
-#define CC_RENDERER_H_
+#ifndef CC_OUTPUT_RENDERER_H_
+#define CC_OUTPUT_RENDERER_H_
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
@@ -87,4 +87,4 @@ class CC_EXPORT Renderer {
 
 }
 
-#endif  // CC_RENDERER_H_
+#endif  // CC_OUTPUT_RENDERER_H_
diff --git a/cc/shader.cc b/cc/output/shader.cc
index eaf4b56..c4ca0a9 100644
--- a/cc/shader.cc
+++ b/cc/output/shader.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/shader.h"
+#include "cc/output/shader.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
diff --git a/cc/shader.h b/cc/output/shader.h
index 1923e9e..4afd3a8 100644
--- a/cc/shader.h
+++ b/cc/output/shader.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_SHADER_H_
-#define CC_SHADER_H_
+#ifndef CC_OUTPUT_SHADER_H_
+#define CC_OUTPUT_SHADER_H_
 
-#include "third_party/skia/include/core/SkColorPriv.h"
 #include <string>
+#include "third_party/skia/include/core/SkColorPriv.h"
 
 namespace WebKit {
 class WebGraphicsContext3D;
@@ -363,4 +363,4 @@ private:
 
 } // namespace cc
 
-#endif  // CC_SHADER_H_
+#endif  // CC_OUTPUT_SHADER_H_
diff --git a/cc/software_frame_data.cc b/cc/output/software_frame_data.cc
index f7d3b9a..ffecc3b 100644
--- a/cc/software_frame_data.cc
+++ b/cc/output/software_frame_data.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/software_frame_data.h"
+#include "cc/output/software_frame_data.h"
 
 namespace cc {
  
diff --git a/cc/software_frame_data.h b/cc/output/software_frame_data.h
index 1058b6f..aef9635 100644
--- a/cc/software_frame_data.h
+++ b/cc/output/software_frame_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_SOFTWARE_FRAME_DATA_H_
-#define CC_SOFTWARE_FRAME_DATA_H_
+#ifndef CC_OUTPUT_SOFTWARE_FRAME_DATA_H_
+#define CC_OUTPUT_SOFTWARE_FRAME_DATA_H_
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
@@ -24,4 +24,4 @@ class CC_EXPORT SoftwareFrameData {
 
 }  // namespace cc
 
-#endif  // CC_SOFTWARE_FRAME_DATA_H_
+#endif  // CC_OUTPUT_SOFTWARE_FRAME_DATA_H_
diff --git a/cc/software_output_device.cc b/cc/output/software_output_device.cc
index 1e693e7..174fb4b 100644
--- a/cc/software_output_device.cc
+++ b/cc/output/software_output_device.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/software_output_device.h"
+#include "cc/output/software_output_device.h"
 
 #include "base/logging.h"
-#include "cc/software_frame_data.h"
+#include "cc/output/software_frame_data.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 
diff --git a/cc/software_output_device.h b/cc/output/software_output_device.h
index f1a795f..5ee08e2 100644
--- a/cc/software_output_device.h
+++ b/cc/output/software_output_device.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_SOFTWARE_OUTPUT_DEVICE_H_
-#define CC_SOFTWARE_OUTPUT_DEVICE_H_
+#ifndef CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
+#define CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
@@ -53,4 +53,4 @@ protected:
 
 }  // namespace cc
 
-#endif // CC_SOFTWARE_OUTPUT_DEVICE_H_
+#endif // CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
diff --git a/cc/software_renderer.cc b/cc/output/software_renderer.cc
index 78a8a8d..036c611 100644
--- a/cc/software_renderer.cc
+++ b/cc/output/software_renderer.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/software_renderer.h"
+#include "cc/output/software_renderer.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/base/math_util.h"
-#include "cc/compositor_frame.h"
-#include "cc/compositor_frame_ack.h"
-#include "cc/compositor_frame_metadata.h"
 #include "cc/debug_border_draw_quad.h"
-#include "cc/output_surface.h"
+#include "cc/output/compositor_frame.h"
+#include "cc/output/compositor_frame_ack.h"
+#include "cc/output/compositor_frame_metadata.h"
+#include "cc/output/output_surface.h"
+#include "cc/output/software_output_device.h"
 #include "cc/render_pass_draw_quad.h"
-#include "cc/software_output_device.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/texture_draw_quad.h"
 #include "cc/tile_draw_quad.h"
diff --git a/cc/software_renderer.h b/cc/output/software_renderer.h
index 08069f1..5e2c4c1 100644
--- a/cc/software_renderer.h
+++ b/cc/output/software_renderer.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_SOFTWARE_RENDERER_H_
-#define CC_SOFTWARE_RENDERER_H_
+#ifndef CC_OUTPUT_SOFTWARE_RENDERER_H_
+#define CC_OUTPUT_SOFTWARE_RENDERER_H_
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
-#include "cc/compositor_frame.h"
-#include "cc/direct_renderer.h"
+#include "cc/output/compositor_frame.h"
+#include "cc/output/direct_renderer.h"
 
 namespace cc {
 
@@ -101,4 +101,4 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
 
 }
 
-#endif  // CC_SOFTWARE_RENDERER_H_
+#endif  // CC_OUTPUT_SOFTWARE_RENDERER_H_
diff --git a/cc/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc
index 79a04f8..93b82b0 100644
--- a/cc/software_renderer_unittest.cc
+++ b/cc/output/software_renderer_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/software_renderer.h"
+#include "cc/output/software_renderer.h"
 
-#include "cc/compositor_frame_metadata.h"
+#include "cc/output/compositor_frame_metadata.h"
+#include "cc/output/software_output_device.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass.h"
 #include "cc/render_pass_draw_quad.h"
-#include "cc/software_output_device.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_output_surface.h"
diff --git a/cc/texture_copier.cc b/cc/output/texture_copier.cc
index 0495d79..5a8a41d 100644
--- a/cc/texture_copier.cc
+++ b/cc/output/texture_copier.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_copier.h"
+#include "cc/output/texture_copier.h"
 
 #include "base/debug/trace_event.h"
 #include "build/build_config.h"
-#include "cc/gl_renderer.h"  // For the GLC() macro.
+#include "cc/output/gl_renderer.h"  // For the GLC() macro.
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
diff --git a/cc/texture_copier.h b/cc/output/texture_copier.h
index c1d53e0..8500310 100644
--- a/cc/texture_copier.h
+++ b/cc/output/texture_copier.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_COPIER_H_
-#define CC_TEXTURE_COPIER_H_
+#ifndef CC_OUTPUT_TEXTURE_COPIER_H_
+#define CC_OUTPUT_TEXTURE_COPIER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/program_binding.h"
-#include "cc/shader.h"
+#include "cc/output/program_binding.h"
+#include "cc/output/shader.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/size.h"
 
@@ -66,4 +66,4 @@ class CC_EXPORT AcceleratedTextureCopier : public TextureCopier {
 
 }
 
-#endif  // CC_TEXTURE_COPIER_H_
+#endif  // CC_OUTPUT_TEXTURE_COPIER_H_
diff --git a/cc/texture_copier_unittest.cc b/cc/output/texture_copier_unittest.cc
index 40c5370..4069bbf 100644
--- a/cc/texture_copier_unittest.cc
+++ b/cc/output/texture_copier_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/texture_copier.h"
+#include "cc/output/texture_copier.h"
 
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/resource_pool.h b/cc/resource_pool.h
index 48cc526..b477aa6 100644
--- a/cc/resource_pool.h
+++ b/cc/resource_pool.h
@@ -9,7 +9,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/renderer.h"
+#include "cc/output/renderer.h"
 #include "cc/resource.h"
 
 namespace cc {
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index 092a3b3..f92bb89 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -11,7 +11,7 @@
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/strings/string_split.h"
-#include "cc/gl_renderer.h"  // For the GLC() macro.
+#include "cc/output/gl_renderer.h"  // For the GLC() macro.
 #include "cc/platform_color.h"
 #include "cc/texture_uploader.h"
 #include "cc/transferable_resource.h"
diff --git a/cc/resource_provider.h b/cc/resource_provider.h
index bf9c1c4..249e006 100644
--- a/cc/resource_provider.h
+++ b/cc/resource_provider.h
@@ -16,9 +16,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "cc/base/cc_export.h"
-#include "cc/context_provider.h"
-#include "cc/output_surface.h"
-#include "cc/texture_copier.h"
+#include "cc/output/context_provider.h"
+#include "cc/output/output_surface.h"
+#include "cc/output/texture_copier.h"
 #include "cc/texture_mailbox.h"
 #include "cc/transferable_resource.h"
 #include "third_party/khronos/GLES2/gl2.h"
diff --git a/cc/resource_provider_unittest.cc b/cc/resource_provider_unittest.cc
index 528118f..936b2c5 100644
--- a/cc/resource_provider_unittest.cc
+++ b/cc/resource_provider_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "cc/base/scoped_ptr_deque.h"
 #include "cc/base/scoped_ptr_hash_map.h"
-#include "cc/output_surface.h"
+#include "cc/output/output_surface.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "gpu/GLES2/gl2extchromium.h"
diff --git a/cc/resource_update_controller.cc b/cc/resource_update_controller.cc
index 443d71ae..27e8e1d 100644
--- a/cc/resource_update_controller.cc
+++ b/cc/resource_update_controller.cc
@@ -8,10 +8,10 @@
 
 #include "base/debug/trace_event.h"
 #include "cc/base/thread.h"
-#include "cc/context_provider.h"
+#include "cc/output/context_provider.h"
+#include "cc/output/texture_copier.h"
 #include "cc/prioritized_resource.h"
 #include "cc/resource_provider.h"
-#include "cc/texture_copier.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
diff --git a/cc/resource_update_queue.h b/cc/resource_update_queue.h
index c36260d..b172a07 100644
--- a/cc/resource_update_queue.h
+++ b/cc/resource_update_queue.h
@@ -8,8 +8,8 @@
 #include <deque>
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
+#include "cc/output/texture_copier.h"
 #include "cc/resource_update.h"
-#include "cc/texture_copier.h"
 
 namespace cc {
 
diff --git a/cc/scoped_resource_unittest.cc b/cc/scoped_resource_unittest.cc
index 6c985f6..fa097f3 100644
--- a/cc/scoped_resource_unittest.cc
+++ b/cc/scoped_resource_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "cc/scoped_resource.h"
 
-#include "cc/renderer.h"
+#include "cc/output/renderer.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/tiled_layer_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc
index c44b281..b71a4b5 100644
--- a/cc/single_thread_proxy.cc
+++ b/cc/single_thread_proxy.cc
@@ -7,11 +7,11 @@
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
 #include "cc/base/thread.h"
-#include "cc/context_provider.h"
 #include "cc/draw_quad.h"
 #include "cc/layer_tree_host.h"
 #include "cc/layer_tree_impl.h"
-#include "cc/output_surface.h"
+#include "cc/output/context_provider.h"
+#include "cc/output/output_surface.h"
 #include "cc/prioritized_resource_manager.h"
 #include "cc/resource_update_controller.h"
 
diff --git a/cc/test/fake_context_provider.h b/cc/test/fake_context_provider.h
index abdd324..9ab1abd 100644
--- a/cc/test/fake_context_provider.h
+++ b/cc/test/fake_context_provider.h
@@ -8,7 +8,7 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "cc/context_provider.h"
+#include "cc/output/context_provider.h"
 
 namespace cc {
 class TestWebGraphicsContext3D;
diff --git a/cc/test/fake_delegated_renderer_layer_impl.cc b/cc/test/fake_delegated_renderer_layer_impl.cc
index 3f39472..d45fd81 100644
--- a/cc/test/fake_delegated_renderer_layer_impl.cc
+++ b/cc/test/fake_delegated_renderer_layer_impl.cc
@@ -5,8 +5,8 @@
 #include "cc/test/fake_delegated_renderer_layer_impl.h"
 
 #include "base/bind.h"
-#include "cc/delegated_frame_data.h"
 #include "cc/draw_quad.h"
+#include "cc/output/delegated_frame_data.h"
 
 namespace cc {
 
diff --git a/cc/test/fake_layer_tree_host_client.cc b/cc/test/fake_layer_tree_host_client.cc
index a3251bb..83ca327 100644
--- a/cc/test/fake_layer_tree_host_client.cc
+++ b/cc/test/fake_layer_tree_host_client.cc
@@ -4,7 +4,7 @@
 
 #include "cc/test/fake_layer_tree_host_client.h"
 
-#include "cc/context_provider.h"
+#include "cc/output/context_provider.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 
 namespace cc {
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
index aaf0ec6..1b5036e 100644
--- a/cc/test/fake_output_surface.h
+++ b/cc/test/fake_output_surface.h
@@ -5,9 +5,9 @@
 #ifndef CC_TEST_FAKE_OUTPUT_SURFACE_H_
 #define CC_TEST_FAKE_OUTPUT_SURFACE_H_
 
-#include "cc/compositor_frame.h"
-#include "cc/output_surface.h"
-#include "cc/software_output_device.h"
+#include "cc/output/compositor_frame.h"
+#include "cc/output/output_surface.h"
+#include "cc/output/software_output_device.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 
diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc
index 13e780c..9632354 100644
--- a/cc/test/pixel_test.cc
+++ b/cc/test/pixel_test.cc
@@ -5,9 +5,9 @@
 #include "cc/test/pixel_test.h"
 
 #include "base/path_service.h"
-#include "cc/compositor_frame_metadata.h"
-#include "cc/gl_renderer.h"
-#include "cc/output_surface.h"
+#include "cc/output/compositor_frame_metadata.h"
+#include "cc/output/gl_renderer.h"
+#include "cc/output/output_surface.h"
 #include "cc/resource_provider.h"
 #include "cc/test/paths.h"
 #include "cc/test/pixel_test_utils.h"
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 549360f..2f86ed4 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -7,10 +7,10 @@
 
 #include "cc/base/region.h"
 #include "cc/layer_updater.h"
+#include "cc/output/texture_copier.h"
 #include "cc/prioritized_resource.h"
 #include "cc/resource_provider.h"
 #include "cc/resource_update_queue.h"
-#include "cc/texture_copier.h"
 #include "cc/texture_uploader.h"
 #include "cc/tiled_layer.h"
 #include "cc/tiled_layer_impl.h"
diff --git a/cc/texture_layer_impl.cc b/cc/texture_layer_impl.cc
index 0f2b9b1..051f8f2 100644
--- a/cc/texture_layer_impl.cc
+++ b/cc/texture_layer_impl.cc
@@ -6,8 +6,8 @@
 
 #include "base/stringprintf.h"
 #include "cc/layer_tree_impl.h"
+#include "cc/output/renderer.h"
 #include "cc/quad_sink.h"
-#include "cc/renderer.h"
 #include "cc/texture_draw_quad.h"
 
 namespace cc {
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc
index 661ba77..f2eb5a9 100644
--- a/cc/thread_proxy.cc
+++ b/cc/thread_proxy.cc
@@ -8,14 +8,14 @@
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "cc/base/thread.h"
-#include "cc/context_provider.h"
 #include "cc/delay_based_time_source.h"
 #include "cc/draw_quad.h"
 #include "cc/frame_rate_controller.h"
 #include "cc/input_handler.h"
 #include "cc/layer_tree_host.h"
 #include "cc/layer_tree_impl.h"
-#include "cc/output_surface.h"
+#include "cc/output/context_provider.h"
+#include "cc/output/output_surface.h"
 #include "cc/prioritized_resource_manager.h"
 #include "cc/scheduler.h"
 
diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc
index 3ecb7dd..2aef8e0 100644
--- a/cc/video_layer_impl.cc
+++ b/cc/video_layer_impl.cc
@@ -8,8 +8,8 @@
 #include "cc/base/math_util.h"
 #include "cc/io_surface_draw_quad.h"
 #include "cc/layer_tree_impl.h"
+#include "cc/output/renderer.h"
 #include "cc/quad_sink.h"
-#include "cc/renderer.h"
 #include "cc/resource_provider.h"
 #include "cc/stream_video_draw_quad.h"
 #include "cc/texture_draw_quad.h"