135 files changed, 389 insertions, 389 deletions

diff --git a/cc/cc.gyp b/cc/cc.gyp
index f87864d..eba90fb 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -15,12 +15,12 @@
       'animation/animation_registrar.cc',
       'animation/animation_registrar.h',
       'append_quads_data.h',
-      'bitmap_content_layer_updater.cc',
-      'bitmap_content_layer_updater.h',
-      'bitmap_skpicture_content_layer_updater.cc',
-      'bitmap_skpicture_content_layer_updater.h',
-      'caching_bitmap_content_layer_updater.cc',
-      'caching_bitmap_content_layer_updater.h',
+      'resources/bitmap_content_layer_updater.cc',
+      'resources/bitmap_content_layer_updater.h',
+      'resources/bitmap_skpicture_content_layer_updater.cc',
+      'resources/bitmap_skpicture_content_layer_updater.h',
+      'resources/caching_bitmap_content_layer_updater.cc',
+      'resources/caching_bitmap_content_layer_updater.h',
       'quads/checkerboard_draw_quad.cc',
       'quads/checkerboard_draw_quad.h',
       'base/completion_event.h',
@@ -33,8 +33,8 @@
       'content_layer.cc',
       'content_layer.h',
       'content_layer_client.h',
-      'content_layer_updater.cc',
-      'content_layer_updater.h',
+      'resources/content_layer_updater.cc',
+      'resources/content_layer_updater.h',
       'contents_scaling_layer.cc',
       'contents_scaling_layer.h',
       'output/context_provider.h',
@@ -81,8 +81,8 @@
       'heads_up_display_layer.h',
       'heads_up_display_layer_impl.cc',
       'heads_up_display_layer_impl.h',
-      'image_layer_updater.cc',
-      'image_layer_updater.h',
+      'resources/image_layer_updater.cc',
+      'resources/image_layer_updater.h',
       'image_layer.cc',
       'image_layer.h',
       'input/input_handler.h',
@@ -105,13 +105,13 @@
       'layer_impl.h',
       'layer_iterator.cc',
       'layer_iterator.h',
-      'layer_painter.h',
-      'layer_quad.cc',
-      'layer_quad.h',
+      'resources/layer_painter.h',
+      'resources/layer_quad.cc',
+      'resources/layer_quad.h',
       'trees/layer_sorter.cc',
       'trees/layer_sorter.h',
-      'layer_tiling_data.cc',
-      'layer_tiling_data.h',
+      'resources/layer_tiling_data.cc',
+      'resources/layer_tiling_data.h',
       'debug/layer_tree_debug_state.cc',
       'debug/layer_tree_debug_state.h',
       'trees/layer_tree_host.cc',
@@ -125,16 +125,16 @@
       'trees/layer_tree_impl.h',
       'trees/layer_tree_settings.cc',
       'trees/layer_tree_settings.h',
-      'layer_updater.cc',
-      'layer_updater.h',
-      'managed_memory_policy.cc',
-      'managed_memory_policy.h',
+      'resources/layer_updater.cc',
+      'resources/layer_updater.h',
+      'resources/managed_memory_policy.cc',
+      'resources/managed_memory_policy.h',
       'managed_tile_state.cc',
       'managed_tile_state.h',
       'base/math_util.cc',
       'base/math_util.h',
-      'memory_history.cc',
-      'memory_history.h',
+      'resources/memory_history.cc',
+      'resources/memory_history.h',
       'nine_patch_layer.cc',
       'nine_patch_layer.h',
       'nine_patch_layer_impl.cc',
@@ -150,8 +150,8 @@
       'input/page_scale_animation.h',
       'debug/paint_time_counter.cc',
       'debug/paint_time_counter.h',
-      'picture.cc',
-      'picture.h',
+      'resources/picture.cc',
+      'resources/picture.h',
       'picture_image_layer.cc',
       'picture_image_layer.h',
       'picture_image_layer_impl.cc',
@@ -160,29 +160,29 @@
       'picture_layer.h',
       'picture_layer_impl.cc',
       'picture_layer_impl.h',
-      'picture_layer_tiling.cc',
-      'picture_layer_tiling.h',
-      'picture_layer_tiling_set.cc',
-      'picture_layer_tiling_set.h',
-      'picture_pile.cc',
-      'picture_pile.h',
-      'picture_pile_base.cc',
-      'picture_pile_base.h',
-      'picture_pile_impl.cc',
-      'picture_pile_impl.h',
+      'resources/picture_layer_tiling.cc',
+      'resources/picture_layer_tiling.h',
+      'resources/picture_layer_tiling_set.cc',
+      'resources/picture_layer_tiling_set.h',
+      'resources/picture_pile.cc',
+      'resources/picture_pile.h',
+      'resources/picture_pile_base.cc',
+      'resources/picture_pile_base.h',
+      'resources/picture_pile_impl.cc',
+      'resources/picture_pile_impl.h',
       'pinch_zoom_scrollbar.cc',
       'pinch_zoom_scrollbar.h',
       'pinch_zoom_scrollbar_geometry.cc',
       'pinch_zoom_scrollbar_geometry.h',
       'pinch_zoom_scrollbar_painter.cc',
       'pinch_zoom_scrollbar_painter.h',
-      'platform_color.h',
-      'prioritized_resource.cc',
-      'prioritized_resource.h',
-      'prioritized_resource_manager.cc',
-      'prioritized_resource_manager.h',
-      'priority_calculator.cc',
-      'priority_calculator.h',
+      'resources/platform_color.h',
+      'resources/prioritized_resource.cc',
+      'resources/prioritized_resource.h',
+      'resources/prioritized_resource_manager.cc',
+      'resources/prioritized_resource_manager.h',
+      'resources/priority_calculator.cc',
+      'resources/priority_calculator.h',
       'output/program_binding.cc',
       'output/program_binding.h',
       'trees/proxy.cc',
@@ -190,8 +190,8 @@
       'trees/quad_culler.cc',
       'trees/quad_culler.h',
       'quad_sink.h',
-      'raster_worker_pool.cc',
-      'raster_worker_pool.h',
+      'resources/raster_worker_pool.cc',
+      'resources/raster_worker_pool.h',
       'rate_limiter.cc',
       'rate_limiter.h',
       'base/region.cc',
@@ -211,18 +211,18 @@
       'output/renderer.h',
       'debug/rendering_stats.cc',
       'debug/rendering_stats.h',
-      'resource.cc',
-      'resource.h',
-      'resource_pool.cc',
-      'resource_pool.h',
-      'resource_provider.cc',
-      'resource_provider.h',
-      'resource_update.cc',
-      'resource_update.h',
-      'resource_update_controller.cc',
-      'resource_update_controller.h',
-      'resource_update_queue.cc',
-      'resource_update_queue.h',
+      'resources/resource.cc',
+      'resources/resource.h',
+      'resources/resource_pool.cc',
+      'resources/resource_pool.h',
+      'resources/resource_provider.cc',
+      'resources/resource_provider.h',
+      'resources/resource_update.cc',
+      'resources/resource_update.h',
+      'resources/resource_update_controller.cc',
+      'resources/resource_update_controller.h',
+      'resources/resource_update_queue.cc',
+      'resources/resource_update_queue.h',
       'debug/ring_buffer.h',
       'scheduler.cc',
       'scheduler.h',
@@ -234,8 +234,8 @@
       'base/scoped_ptr_deque.h',
       'base/scoped_ptr_hash_map.h',
       'base/scoped_ptr_vector.h',
-      'scoped_resource.cc',
-      'scoped_resource.h',
+      'resources/scoped_resource.cc',
+      'resources/scoped_resource.h',
       'animation/scrollbar_animation_controller.h',
       'animation/scrollbar_animation_controller_linear_fade.cc',
       'animation/scrollbar_animation_controller_linear_fade.h',
@@ -254,8 +254,8 @@
       'quads/shared_quad_state.h',
       'trees/single_thread_proxy.cc',
       'trees/single_thread_proxy.h',
-      'skpicture_content_layer_updater.cc',
-      'skpicture_content_layer_updater.h',
+      'resources/skpicture_content_layer_updater.cc',
+      'resources/skpicture_content_layer_updater.h',
       'output/software_frame_data.cc',
       'output/software_frame_data.h',
       'output/software_output_device.cc',
@@ -281,8 +281,8 @@
       'texture_layer_client.h',
       'texture_layer_impl.cc',
       'texture_layer_impl.h',
-      'texture_mailbox.cc',
-      'texture_mailbox.h',
+      'resources/texture_mailbox.cc',
+      'resources/texture_mailbox.h',
       'texture_uploader.cc',
       'texture_uploader.h',
       'base/thread.h',
@@ -290,14 +290,14 @@
       'base/thread_impl.h',
       'trees/thread_proxy.cc',
       'trees/thread_proxy.h',
-      'tile.cc',
-      'tile.h',
+      'resources/tile.cc',
+      'resources/tile.h',
       'quads/tile_draw_quad.cc',
       'quads/tile_draw_quad.h',
-      'tile_manager.cc',
-      'tile_manager.h',
-      'tile_priority.cc',
-      'tile_priority.h',
+      'resources/tile_manager.cc',
+      'resources/tile_manager.h',
+      'resources/tile_priority.cc',
+      'resources/tile_priority.h',
       'tiled_layer.cc',
       'tiled_layer.h',
       'tiled_layer_impl.cc',
@@ -310,8 +310,8 @@
       'input/top_controls_manager.cc',
       'input/top_controls_manager.h',
       'input/top_controls_manager_client.h',
-      'transferable_resource.cc',
-      'transferable_resource.h',
+      'resources/transferable_resource.cc',
+      'resources/transferable_resource.h',
       'transform_operation.cc',
       'transform_operation.h',
       'transform_operations.cc',
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index fd7db78..07bcb78 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -24,7 +24,7 @@
       'animation/layer_animation_controller_unittest.cc',
       'layer_impl_unittest.cc',
       'layer_iterator_unittest.cc',
-      'layer_quad_unittest.cc',
+      'resources/layer_quad_unittest.cc',
       'trees/layer_sorter_unittest.cc',
       'trees/layer_tree_host_common_unittest.cc',
       'trees/layer_tree_host_impl_unittest.cc',
@@ -41,19 +41,19 @@
       'nine_patch_layer_unittest.cc',
       'trees/occlusion_tracker_unittest.cc',
       'picture_layer_impl_unittest.cc',
-      'picture_layer_tiling_set_unittest.cc',
-      'picture_layer_tiling_unittest.cc',
-      'prioritized_resource_unittest.cc',
+      'resources/picture_layer_tiling_set_unittest.cc',
+      'resources/picture_layer_tiling_unittest.cc',
+      'resources/prioritized_resource_unittest.cc',
       'trees/quad_culler_unittest.cc',
       'base/region_unittest.cc',
       'quads/render_pass_unittest.cc',
       'output/render_surface_filters_unittest.cc',
       'render_surface_unittest.cc',
-      'resource_provider_unittest.cc',
-      'resource_update_controller_unittest.cc',
+      'resources/resource_provider_unittest.cc',
+      'resources/resource_update_controller_unittest.cc',
       'scheduler_state_machine_unittest.cc',
       'scheduler_unittest.cc',
-      'scoped_resource_unittest.cc',
+      'resources/scoped_resource_unittest.cc',
       'animation/scrollbar_animation_controller_linear_fade_unittest.cc',
       'scrollbar_layer_unittest.cc',
       'output/software_renderer_unittest.cc',
@@ -61,7 +61,7 @@
       'output/texture_copier_unittest.cc',
       'texture_layer_unittest.cc',
       'texture_uploader_unittest.cc',
-      'tile_priority_unittest.cc',
+      'resources/tile_priority_unittest.cc',
       'tiled_layer_impl_unittest.cc',
       'tiled_layer_unittest.cc',
       'base/tiling_data_unittest.cc',
diff --git a/cc/content_layer.cc b/cc/content_layer.cc
index 4a5999c..ad9ae4c 100644
--- a/cc/content_layer.cc
+++ b/cc/content_layer.cc
@@ -7,10 +7,10 @@
 #include "base/auto_reset.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
-#include "cc/bitmap_content_layer_updater.h"
-#include "cc/bitmap_skpicture_content_layer_updater.h"
 #include "cc/content_layer_client.h"
-#include "cc/layer_painter.h"
+#include "cc/resources/bitmap_content_layer_updater.h"
+#include "cc/resources/bitmap_skpicture_content_layer_updater.h"
+#include "cc/resources/layer_painter.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
diff --git a/cc/content_layer.h b/cc/content_layer.h
index 6092b46..36747eb 100644
--- a/cc/content_layer.h
+++ b/cc/content_layer.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
-#include "cc/layer_painter.h"
+#include "cc/resources/layer_painter.h"
 #include "cc/tiled_layer.h"
 
 class SkCanvas;
diff --git a/cc/content_layer_unittest.cc b/cc/content_layer_unittest.cc
index 0a3a419..0e94062 100644
--- a/cc/content_layer_unittest.cc
+++ b/cc/content_layer_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "cc/content_layer.h"
 
-#include "cc/bitmap_content_layer_updater.h"
 #include "cc/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"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/delegated_renderer_layer.h b/cc/delegated_renderer_layer.h
index f6288d8..0c7d463 100644
--- a/cc/delegated_renderer_layer.h
+++ b/cc/delegated_renderer_layer.h
@@ -7,7 +7,7 @@
 
 #include "cc/base/cc_export.h"
 #include "cc/layer.h"
-#include "cc/transferable_resource.h"
+#include "cc/resources/transferable_resource.h"
 
 namespace cc {
 class DelegatedFrameData;
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc
index 37781d3..355a51e 100644
--- a/cc/heads_up_display_layer_impl.cc
+++ b/cc/heads_up_display_layer_impl.cc
@@ -10,11 +10,11 @@
 #include "cc/debug/debug_rect_history.h"
 #include "cc/debug/frame_rate_counter.h"
 #include "cc/debug/paint_time_counter.h"
-#include "cc/memory_history.h"
 #include "cc/output/renderer.h"
 #include "cc/quad_sink.h"
 #include "cc/quads/texture_draw_quad.h"
-#include "cc/tile_manager.h"
+#include "cc/resources/memory_history.h"
+#include "cc/resources/tile_manager.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/cc/heads_up_display_layer_impl.h b/cc/heads_up_display_layer_impl.h
index 33c3eae..3a95b695 100644
--- a/cc/heads_up_display_layer_impl.h
+++ b/cc/heads_up_display_layer_impl.h
@@ -9,8 +9,8 @@
 #include "base/time.h"
 #include "cc/base/cc_export.h"
 #include "cc/layer_impl.h"
-#include "cc/memory_history.h"
-#include "cc/scoped_resource.h"
+#include "cc/resources/memory_history.h"
+#include "cc/resources/scoped_resource.h"
 
 class SkCanvas;
 class SkPaint;
diff --git a/cc/image_layer.cc b/cc/image_layer.cc
index 981f57c..d7ac960 100644
--- a/cc/image_layer.cc
+++ b/cc/image_layer.cc
@@ -5,10 +5,10 @@
 #include "cc/image_layer.h"
 
 #include "base/compiler_specific.h"
-#include "cc/image_layer_updater.h"
-#include "cc/layer_updater.h"
-#include "cc/prioritized_resource.h"
-#include "cc/resource_update_queue.h"
+#include "cc/resources/image_layer_updater.h"
+#include "cc/resources/layer_updater.h"
+#include "cc/resources/prioritized_resource.h"
+#include "cc/resources/resource_update_queue.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
diff --git a/cc/layer_impl.h b/cc/layer_impl.h
index 3710f06..0ab914e 100644
--- a/cc/layer_impl.h
+++ b/cc/layer_impl.h
@@ -20,7 +20,7 @@
 #include "cc/quads/render_pass.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/render_surface_impl.h"
-#include "cc/resource_provider.h"
+#include "cc/resources/resource_provider.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "third_party/skia/include/core/SkColor.h"
diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc
index 3e45754..53bd17d 100644
--- a/cc/layer_unittest.cc
+++ b/cc/layer_unittest.cc
@@ -8,7 +8,7 @@
 #include "cc/base/math_util.h"
 #include "cc/base/thread.h"
 #include "cc/layer_impl.h"
-#include "cc/layer_painter.h"
+#include "cc/resources/layer_painter.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_client.h"
diff --git a/cc/managed_tile_state.h b/cc/managed_tile_state.h
index 20e783e..c701f00 100644
--- a/cc/managed_tile_state.h
+++ b/cc/managed_tile_state.h
@@ -8,9 +8,9 @@
 #include <list>
 
 #include "base/memory/scoped_ptr.h"
-#include "cc/resource_pool.h"
-#include "cc/resource_provider.h"
-#include "cc/tile_manager.h"
+#include "cc/resources/resource_pool.h"
+#include "cc/resources/resource_provider.h"
+#include "cc/resources/tile_manager.h"
 
 namespace cc {
 
diff --git a/cc/nine_patch_layer.cc b/cc/nine_patch_layer.cc
index 514a3ef..9b678db 100644
--- a/cc/nine_patch_layer.cc
+++ b/cc/nine_patch_layer.cc
@@ -5,9 +5,9 @@
 #include "cc/nine_patch_layer.h"
 
 #include "cc/nine_patch_layer_impl.h"
-#include "cc/prioritized_resource.h"
-#include "cc/resource_update.h"
-#include "cc/resource_update_queue.h"
+#include "cc/resources/prioritized_resource.h"
+#include "cc/resources/resource_update.h"
+#include "cc/resources/resource_update_queue.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
diff --git a/cc/nine_patch_layer.h b/cc/nine_patch_layer.h
index d6359db..dae094f 100644
--- a/cc/nine_patch_layer.h
+++ b/cc/nine_patch_layer.h
@@ -7,8 +7,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/image_layer_updater.h"
 #include "cc/layer.h"
+#include "cc/resources/image_layer_updater.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/rect.h"
 
diff --git a/cc/nine_patch_layer_impl.h b/cc/nine_patch_layer_impl.h
index 1e68ad2..7744459 100644
--- a/cc/nine_patch_layer_impl.h
+++ b/cc/nine_patch_layer_impl.h
@@ -7,7 +7,7 @@
 
 #include "cc/base/cc_export.h"
 #include "cc/layer_impl.h"
-#include "cc/resource_provider.h"
+#include "cc/resources/resource_provider.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
diff --git a/cc/nine_patch_layer_unittest.cc b/cc/nine_patch_layer_unittest.cc
index 237c1f3..a090e2f 100644
--- a/cc/nine_patch_layer_unittest.cc
+++ b/cc/nine_patch_layer_unittest.cc
@@ -5,9 +5,9 @@
 #include "cc/nine_patch_layer.h"
 
 #include "cc/debug/overdraw_metrics.h"
-#include "cc/prioritized_resource_manager.h"
-#include "cc/resource_provider.h"
-#include "cc/resource_update_queue.h"
+#include "cc/resources/prioritized_resource_manager.h"
+#include "cc/resources/resource_provider.h"
+#include "cc/resources/resource_update_queue.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/geometry_test_utils.h"
diff --git a/cc/output/compositor_frame_ack.h b/cc/output/compositor_frame_ack.h
index be15c61..73b7b1a 100644
--- a/cc/output/compositor_frame_ack.h
+++ b/cc/output/compositor_frame_ack.h
@@ -8,7 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/gl_frame_data.h"
-#include "cc/transferable_resource.h"
+#include "cc/resources/transferable_resource.h"
 #include "ui/surface/transport_dib.h"
 
 namespace cc {
diff --git a/cc/output/delegated_frame_data.h b/cc/output/delegated_frame_data.h
index 9321fff..7402da1 100644
--- a/cc/output/delegated_frame_data.h
+++ b/cc/output/delegated_frame_data.h
@@ -8,7 +8,7 @@
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/quads/render_pass.h"
-#include "cc/transferable_resource.h"
+#include "cc/resources/transferable_resource.h"
 #include "ui/gfx/size.h"
 
 namespace cc {
diff --git a/cc/output/delegating_renderer.cc b/cc/output/delegating_renderer.cc
index b4d257a..238d051 100644
--- a/cc/output/delegating_renderer.cc
+++ b/cc/output/delegating_renderer.cc
@@ -21,7 +21,7 @@
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/quads/yuv_video_draw_quad.h"
-#include "cc/resource_provider.h"
+#include "cc/resources/resource_provider.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
 using WebKit::WebGraphicsContext3D;
diff --git a/cc/output/direct_renderer.h b/cc/output/direct_renderer.h
index 72dff5d..6797fc8 100644
--- a/cc/output/direct_renderer.h
+++ b/cc/output/direct_renderer.h
@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/renderer.h"
-#include "cc/resource_provider.h"
-#include "cc/scoped_resource.h"
+#include "cc/resources/resource_provider.h"
+#include "cc/resources/scoped_resource.h"
 
 namespace cc {
 
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index ad6d1cb..90b27f3 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -14,7 +14,6 @@
 #include "base/strings/string_split.h"
 #include "build/build_config.h"
 #include "cc/base/math_util.h"
-#include "cc/layer_quad.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/context_provider.h"
@@ -22,11 +21,12 @@
 #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/quads/render_pass.h"
 #include "cc/quads/stream_video_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
-#include "cc/scoped_resource.h"
+#include "cc/resources/layer_quad.h"
+#include "cc/resources/priority_calculator.h"
+#include "cc/resources/scoped_resource.h"
 #include "cc/trees/damage_tracker.h"
 #include "cc/trees/proxy.h"
 #include "cc/trees/single_thread_proxy.h"
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 7be6375..c7181a0 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -5,9 +5,9 @@
 #include "cc/output/gl_renderer.h"
 
 #include "cc/output/compositor_frame_metadata.h"
-#include "cc/prioritized_resource_manager.h"
 #include "cc/quads/draw_quad.h"
-#include "cc/resource_provider.h"
+#include "cc/resources/prioritized_resource_manager.h"
+#include "cc/resources/resource_provider.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.h"
diff --git a/cc/output/renderer.h b/cc/output/renderer.h
index 3669dc5..4a6dea2 100644
--- a/cc/output/renderer.h
+++ b/cc/output/renderer.h
@@ -7,8 +7,8 @@
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
-#include "cc/managed_memory_policy.h"
 #include "cc/quads/render_pass.h"
+#include "cc/resources/managed_memory_policy.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
diff --git a/cc/picture_layer.h b/cc/picture_layer.h
index e5d4573..7edb883 100644
--- a/cc/picture_layer.h
+++ b/cc/picture_layer.h
@@ -8,7 +8,7 @@
 #include "cc/contents_scaling_layer.h"
 #include "cc/debug/devtools_instrumentation.h"
 #include "cc/layer.h"
-#include "cc/picture_pile.h"
+#include "cc/resources/picture_pile.h"
 #include "cc/trees/occlusion_tracker.h"
 
 namespace cc {
diff --git a/cc/picture_layer_impl.h b/cc/picture_layer_impl.h
index 1d1e7a2..0bcdb19 100644
--- a/cc/picture_layer_impl.h
+++ b/cc/picture_layer_impl.h
@@ -7,9 +7,9 @@
 
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/layer_impl.h"
-#include "cc/picture_layer_tiling.h"
-#include "cc/picture_layer_tiling_set.h"
-#include "cc/picture_pile_impl.h"
+#include "cc/resources/picture_layer_tiling.h"
+#include "cc/resources/picture_layer_tiling_set.h"
+#include "cc/resources/picture_pile_impl.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
diff --git a/cc/quads/draw_quad.h b/cc/quads/draw_quad.h
index a924330..952472d 100644
--- a/cc/quads/draw_quad.h
+++ b/cc/quads/draw_quad.h
@@ -8,7 +8,7 @@
 #include "base/callback.h"
 #include "cc/base/cc_export.h"
 #include "cc/quads/shared_quad_state.h"
-#include "cc/resource_provider.h"
+#include "cc/resources/resource_provider.h"
 
 namespace cc {
 
diff --git a/cc/quads/render_pass_draw_quad.h b/cc/quads/render_pass_draw_quad.h
index 8c330d7..8a403cd 100644
--- a/cc/quads/render_pass_draw_quad.h
+++ b/cc/quads/render_pass_draw_quad.h
@@ -10,7 +10,7 @@
 #include "cc/base/cc_export.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/render_pass.h"
-#include "cc/resource_provider.h"
+#include "cc/resources/resource_provider.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 
 namespace cc {
diff --git a/cc/bitmap_content_layer_updater.cc b/cc/resources/bitmap_content_layer_updater.cc
index 19d4912..a6d2a7c 100644
--- a/cc/bitmap_content_layer_updater.cc
+++ b/cc/resources/bitmap_content_layer_updater.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/bitmap_content_layer_updater.h"
+#include "cc/resources/bitmap_content_layer_updater.h"
 
 #include "cc/debug/rendering_stats.h"
-#include "cc/layer_painter.h"
-#include "cc/prioritized_resource.h"
-#include "cc/resource_update.h"
-#include "cc/resource_update_queue.h"
+#include "cc/resources/layer_painter.h"
+#include "cc/resources/prioritized_resource.h"
+#include "cc/resources/resource_update.h"
+#include "cc/resources/resource_update_queue.h"
 #include "skia/ext/platform_canvas.h"
 
 namespace cc {
diff --git a/cc/bitmap_content_layer_updater.h b/cc/resources/bitmap_content_layer_updater.h
index 7f24c50..0597f82 100644
--- a/cc/bitmap_content_layer_updater.h
+++ b/cc/resources/bitmap_content_layer_updater.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_BITMAP_CONTENT_LAYER_UPDATER_H_
-#define CC_BITMAP_CONTENT_LAYER_UPDATER_H_
+#ifndef CC_RESOURCES_BITMAP_CONTENT_LAYER_UPDATER_H_
+#define CC_RESOURCES_BITMAP_CONTENT_LAYER_UPDATER_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/content_layer_updater.h"
+#include "cc/resources/content_layer_updater.h"
 
 class SkCanvas;
 
@@ -69,4 +69,4 @@ class CC_EXPORT BitmapContentLayerUpdater : public ContentLayerUpdater {
 
 }  // namespace cc
 
-#endif  // CC_BITMAP_CONTENT_LAYER_UPDATER_H_
+#endif  // CC_RESOURCES_BITMAP_CONTENT_LAYER_UPDATER_H_
diff --git a/cc/bitmap_skpicture_content_layer_updater.cc b/cc/resources/bitmap_skpicture_content_layer_updater.cc
index 77949a5..9931e11 100644
--- a/cc/bitmap_skpicture_content_layer_updater.cc
+++ b/cc/resources/bitmap_skpicture_content_layer_updater.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/bitmap_skpicture_content_layer_updater.h"
+#include "cc/resources/bitmap_skpicture_content_layer_updater.h"
 
 #include "base/time.h"
 #include "cc/debug/rendering_stats.h"
-#include "cc/layer_painter.h"
-#include "cc/prioritized_resource.h"
-#include "cc/resource_update_queue.h"
+#include "cc/resources/layer_painter.h"
+#include "cc/resources/prioritized_resource.h"
+#include "cc/resources/resource_update_queue.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 
diff --git a/cc/bitmap_skpicture_content_layer_updater.h b/cc/resources/bitmap_skpicture_content_layer_updater.h
index 3600432..07bef12 100644
--- a/cc/bitmap_skpicture_content_layer_updater.h
+++ b/cc/resources/bitmap_skpicture_content_layer_updater.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_BITMAP_SKPICTURE_CONTENT_LAYER_UPDATER_H_
-#define CC_BITMAP_SKPICTURE_CONTENT_LAYER_UPDATER_H_
+#ifndef CC_RESOURCES_BITMAP_SKPICTURE_CONTENT_LAYER_UPDATER_H_
+#define CC_RESOURCES_BITMAP_SKPICTURE_CONTENT_LAYER_UPDATER_H_
 
-#include "cc/skpicture_content_layer_updater.h"
+#include "cc/resources/skpicture_content_layer_updater.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace cc {
@@ -51,4 +51,4 @@ class BitmapSkPictureContentLayerUpdater : public SkPictureContentLayerUpdater {
 
 }  // namespace cc
 
-#endif  // CC_BITMAP_SKPICTURE_CONTENT_LAYER_UPDATER_H_
+#endif  // CC_RESOURCES_BITMAP_SKPICTURE_CONTENT_LAYER_UPDATER_H_
diff --git a/cc/caching_bitmap_content_layer_updater.cc b/cc/resources/caching_bitmap_content_layer_updater.cc
index 063ffc8..f6bb426 100644
--- a/cc/caching_bitmap_content_layer_updater.cc
+++ b/cc/resources/caching_bitmap_content_layer_updater.cc
@@ -5,7 +5,7 @@
 #include "caching_bitmap_content_layer_updater.h"
 
 #include "base/logging.h"
-#include "cc/layer_painter.h"
+#include "cc/resources/layer_painter.h"
 #include "skia/ext/platform_canvas.h"
 
 namespace cc {
diff --git a/cc/caching_bitmap_content_layer_updater.h b/cc/resources/caching_bitmap_content_layer_updater.h
index 323bbce..420d6d5 100644
--- a/cc/caching_bitmap_content_layer_updater.h
+++ b/cc/resources/caching_bitmap_content_layer_updater.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_CACHING_BITMAP_CONTENT_LAYER_UPDATER_H_
-#define CC_CACHING_BITMAP_CONTENT_LAYER_UPDATER_H_
+#ifndef CC_RESOURCES_CACHING_BITMAP_CONTENT_LAYER_UPDATER_H_
+#define CC_RESOURCES_CACHING_BITMAP_CONTENT_LAYER_UPDATER_H_
 
 #include "base/compiler_specific.h"
-#include "cc/bitmap_content_layer_updater.h"
+#include "cc/resources/bitmap_content_layer_updater.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace cc {
@@ -39,4 +39,4 @@ class CachingBitmapContentLayerUpdater : public BitmapContentLayerUpdater {
 
 }  // namespace cc
 
-#endif  // CC_CACHING_BITMAP_CONTENT_LAYER_UPDATER_H_
+#endif  // CC_RESOURCES_CACHING_BITMAP_CONTENT_LAYER_UPDATER_H_
diff --git a/cc/content_layer_updater.cc b/cc/resources/content_layer_updater.cc
index 82fa4a3..b4eb1d2 100644
--- a/cc/content_layer_updater.cc
+++ b/cc/resources/content_layer_updater.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_updater.h"
+#include "cc/resources/content_layer_updater.h"
 
 #include "base/debug/trace_event.h"
 #include "base/time.h"
 #include "cc/debug/rendering_stats.h"
-#include "cc/layer_painter.h"
+#include "cc/resources/layer_painter.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
diff --git a/cc/content_layer_updater.h b/cc/resources/content_layer_updater.h
index b639102..bedc614 100644
--- a/cc/content_layer_updater.h
+++ b/cc/resources/content_layer_updater.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_CONTENT_LAYER_UPDATER_H_
-#define CC_CONTENT_LAYER_UPDATER_H_
+#ifndef CC_RESOURCES_CONTENT_LAYER_UPDATER_H_
+#define CC_RESOURCES_CONTENT_LAYER_UPDATER_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/layer_updater.h"
+#include "cc/resources/layer_updater.h"
 #include "ui/gfx/rect.h"
 
 class SkCanvas;
@@ -40,4 +40,4 @@ class CC_EXPORT ContentLayerUpdater : public LayerUpdater {
 
 }  // namespace cc
 
-#endif  // CC_CONTENT_LAYER_UPDATER_H_
+#endif  // CC_RESOURCES_CONTENT_LAYER_UPDATER_H_
diff --git a/cc/image_layer_updater.cc b/cc/resources/image_layer_updater.cc
index 04db9aa..e76d5b0 100644
--- a/cc/image_layer_updater.cc
+++ b/cc/resources/image_layer_updater.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/image_layer_updater.h"
-#include "cc/prioritized_resource.h"
-#include "cc/resource_update_queue.h"
+#include "cc/resources/image_layer_updater.h"
+#include "cc/resources/prioritized_resource.h"
+#include "cc/resources/resource_update_queue.h"
 
 namespace cc {
 
diff --git a/cc/image_layer_updater.h b/cc/resources/image_layer_updater.h
index 031ec60..f9fca00 100644
--- a/cc/image_layer_updater.h
+++ b/cc/resources/image_layer_updater.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_IMAGE_LAYER_UPDATER_H_
-#define CC_IMAGE_LAYER_UPDATER_H_
+#ifndef CC_RESOURCES_IMAGE_LAYER_UPDATER_H_
+#define CC_RESOURCES_IMAGE_LAYER_UPDATER_H_
 
-#include "cc/layer_updater.h"
+#include "cc/resources/layer_updater.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace cc {
@@ -56,4 +56,4 @@ class ImageLayerUpdater : public LayerUpdater {
 
 }  // namespace cc
 
-#endif  // CC_IMAGE_LAYER_UPDATER_H_
+#endif  // CC_RESOURCES_IMAGE_LAYER_UPDATER_H_
diff --git a/cc/layer_painter.h b/cc/resources/layer_painter.h
index 6368c4b..89a1424 100644
--- a/cc/layer_painter.h
+++ b/cc/resources/layer_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_LAYER_PAINTER_H_
-#define CC_LAYER_PAINTER_H_
+#ifndef CC_RESOURCES_LAYER_PAINTER_H_
+#define CC_RESOURCES_LAYER_PAINTER_H_
 
 #include "cc/base/cc_export.h"
 
@@ -26,4 +26,4 @@ class CC_EXPORT LayerPainter {
 
 }  // namespace cc
 
-#endif  // CC_LAYER_PAINTER_H_
+#endif  // CC_RESOURCES_LAYER_PAINTER_H_
diff --git a/cc/layer_quad.cc b/cc/resources/layer_quad.cc
index 4ad0f76..3e1955d 100644
--- a/cc/layer_quad.cc
+++ b/cc/resources/layer_quad.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_quad.h"
+#include "cc/resources/layer_quad.h"
 
 #include "base/logging.h"
 #include "ui/gfx/quad_f.h"
diff --git a/cc/layer_quad.h b/cc/resources/layer_quad.h
index 11137a8..9c5a116 100644
--- a/cc/layer_quad.h
+++ b/cc/resources/layer_quad.h
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 
-#ifndef CC_LAYER_QUAD_H_
-#define CC_LAYER_QUAD_H_
+#ifndef CC_RESOURCES_LAYER_QUAD_H_
+#define CC_RESOURCES_LAYER_QUAD_H_
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
@@ -102,4 +102,4 @@ class CC_EXPORT LayerQuad {
 
 }
 
-#endif  // CC_LAYER_QUAD_H_
+#endif  // CC_RESOURCES_LAYER_QUAD_H_
diff --git a/cc/layer_quad_unittest.cc b/cc/resources/layer_quad_unittest.cc
index 71a3b297a..21779fc 100644
--- a/cc/layer_quad_unittest.cc
+++ b/cc/resources/layer_quad_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_quad.h"
+#include "cc/resources/layer_quad.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/quad_f.h"
diff --git a/cc/layer_tiling_data.cc b/cc/resources/layer_tiling_data.cc
index aaf6ee9..81cb21a 100644
--- a/cc/layer_tiling_data.cc
+++ b/cc/resources/layer_tiling_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/layer_tiling_data.h"
+#include "cc/resources/layer_tiling_data.h"
 
 #include "base/logging.h"
 
diff --git a/cc/layer_tiling_data.h b/cc/resources/layer_tiling_data.h
index a00fb46..255bbdc8 100644
--- a/cc/layer_tiling_data.h
+++ b/cc/resources/layer_tiling_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_LAYER_TILING_DATA_H_
-#define CC_LAYER_TILING_DATA_H_
+#ifndef CC_RESOURCES_LAYER_TILING_DATA_H_
+#define CC_RESOURCES_LAYER_TILING_DATA_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -102,4 +102,4 @@ class CC_EXPORT LayerTilingData {
 
 }  // namespace cc
 
-#endif  // CC_LAYER_TILING_DATA_H_
+#endif  // CC_RESOURCES_LAYER_TILING_DATA_H_
diff --git a/cc/layer_updater.cc b/cc/resources/layer_updater.cc
index 43073aa..aa7d1a4 100644
--- a/cc/layer_updater.cc
+++ b/cc/resources/layer_updater.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_updater.h"
+#include "cc/resources/layer_updater.h"
 
-#include "cc/prioritized_resource.h"
+#include "cc/resources/prioritized_resource.h"
 
 namespace cc {
 
diff --git a/cc/layer_updater.h b/cc/resources/layer_updater.h
index 6f44be5..a8b7657 100644
--- a/cc/layer_updater.h
+++ b/cc/resources/layer_updater.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_UPDATER_H_
-#define CC_LAYER_UPDATER_H_
+#ifndef CC_RESOURCES_LAYER_UPDATER_H_
+#define CC_RESOURCES_LAYER_UPDATER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -72,4 +72,4 @@ class CC_EXPORT LayerUpdater : public base::RefCounted<LayerUpdater> {
 
 }  // namespace cc
 
-#endif  // CC_LAYER_UPDATER_H_
+#endif  // CC_RESOURCES_LAYER_UPDATER_H_
diff --git a/cc/managed_memory_policy.cc b/cc/resources/managed_memory_policy.cc
index 05f4949..05f4949 100644
--- a/cc/managed_memory_policy.cc
+++ b/cc/resources/managed_memory_policy.cc
diff --git a/cc/managed_memory_policy.h b/cc/resources/managed_memory_policy.h
index b8c1b3f..ae7336d 100644
--- a/cc/managed_memory_policy.h
+++ b/cc/resources/managed_memory_policy.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_MANAGED_MEMORY_POLICY_H_
-#define CC_MANAGED_MEMORY_POLICY_H_
+#ifndef CC_RESOURCES_MANAGED_MEMORY_POLICY_H_
+#define CC_RESOURCES_MANAGED_MEMORY_POLICY_H_
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
-#include "cc/tile_priority.h"
+#include "cc/resources/tile_priority.h"
 
 namespace cc {
 
@@ -38,4 +38,4 @@ struct CC_EXPORT ManagedMemoryPolicy {
 
 }  // namespace cc
 
-#endif  // CC_MANAGED_MEMORY_POLICY_H_
+#endif  // CC_RESOURCES_MANAGED_MEMORY_POLICY_H_
diff --git a/cc/memory_history.cc b/cc/resources/memory_history.cc
index b441938..13b71c7 100644
--- a/cc/memory_history.cc
+++ b/cc/resources/memory_history.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/memory_history.h"
+#include "cc/resources/memory_history.h"
 
 namespace cc {
 
diff --git a/cc/memory_history.h b/cc/resources/memory_history.h
index fc5bd71..43762bc 100644
--- a/cc/memory_history.h
+++ b/cc/resources/memory_history.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_MEMORY_HISTORY_H_
-#define CC_MEMORY_HISTORY_H_
+#ifndef CC_RESOURCES_MEMORY_HISTORY_H_
+#define CC_RESOURCES_MEMORY_HISTORY_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -52,4 +52,4 @@ class MemoryHistory {
 
 }  // namespace cc
 
-#endif  // CC_MEMORY_HISTORY_H_
+#endif  // CC_RESOURCES_MEMORY_HISTORY_H_
diff --git a/cc/picture.cc b/cc/resources/picture.cc
index 789bedb..52ae35e 100644
--- a/cc/picture.cc
+++ b/cc/resources/picture.cc
@@ -5,7 +5,7 @@
 #include "base/debug/trace_event.h"
 #include "cc/content_layer_client.h"
 #include "cc/debug/rendering_stats.h"
-#include "cc/picture.h"
+#include "cc/resources/picture.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkData.h"
diff --git a/cc/picture.h b/cc/resources/picture.h
index 942a9cb..e04c1fb 100644
--- a/cc/picture.h
+++ b/cc/resources/picture.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_PICTURE_H_
-#define CC_PICTURE_H_
+#ifndef CC_RESOURCES_PICTURE_H_
+#define CC_RESOURCES_PICTURE_H_
 
 #include <list>
 
@@ -77,4 +77,4 @@ class CC_EXPORT Picture
 
 }  // namespace cc
 
-#endif  // CC_PICTURE_H_
+#endif  // CC_RESOURCES_PICTURE_H_
diff --git a/cc/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
index ff59757..1ddd460 100644
--- a/cc/picture_layer_tiling.cc
+++ b/cc/resources/picture_layer_tiling.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_layer_tiling.h"
+#include "cc/resources/picture_layer_tiling.h"
 
 #include <cmath>
 
diff --git a/cc/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h
index 5049be1..e21cf7b 100644
--- a/cc/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.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_PICTURE_LAYER_TILING_H_
-#define CC_PICTURE_LAYER_TILING_H_
+#ifndef CC_RESOURCES_PICTURE_LAYER_TILING_H_
+#define CC_RESOURCES_PICTURE_LAYER_TILING_H_
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
@@ -12,8 +12,8 @@
 #include "cc/base/hash_pair.h"
 #include "cc/base/region.h"
 #include "cc/base/tiling_data.h"
-#include "cc/tile.h"
-#include "cc/tile_priority.h"
+#include "cc/resources/tile.h"
+#include "cc/resources/tile_priority.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
@@ -173,4 +173,4 @@ class CC_EXPORT PictureLayerTiling {
 
 }  // namespace cc
 
-#endif  // CC_PICTURE_LAYER_TILING_H_
+#endif  // CC_RESOURCES_PICTURE_LAYER_TILING_H_
diff --git a/cc/picture_layer_tiling_set.cc b/cc/resources/picture_layer_tiling_set.cc
index f8ea9eb..9c22ac0 100644
--- a/cc/picture_layer_tiling_set.cc
+++ b/cc/resources/picture_layer_tiling_set.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_layer_tiling_set.h"
+#include "cc/resources/picture_layer_tiling_set.h"
 
 namespace cc {
 
diff --git a/cc/picture_layer_tiling_set.h b/cc/resources/picture_layer_tiling_set.h
index 6cdb833..eab4314 100644
--- a/cc/picture_layer_tiling_set.h
+++ b/cc/resources/picture_layer_tiling_set.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_TILING_SET_H_
-#define CC_PICTURE_LAYER_TILING_SET_H_
+#ifndef CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_
+#define CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_
 
 #include "cc/base/region.h"
 #include "cc/base/scoped_ptr_vector.h"
-#include "cc/picture_layer_tiling.h"
+#include "cc/resources/picture_layer_tiling.h"
 #include "ui/gfx/size.h"
 
 namespace cc {
@@ -122,4 +122,4 @@ class CC_EXPORT PictureLayerTilingSet {
 
 }  // namespace cc
 
-#endif  // CC_PICTURE_LAYER_TILING_SET_H_
+#endif  // CC_RESOURCES_PICTURE_LAYER_TILING_SET_H_
diff --git a/cc/picture_layer_tiling_set_unittest.cc b/cc/resources/picture_layer_tiling_set_unittest.cc
index 0279ae2..76110b0 100644
--- a/cc/picture_layer_tiling_set_unittest.cc
+++ b/cc/resources/picture_layer_tiling_set_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/picture_layer_tiling_set.h"
+#include "cc/resources/picture_layer_tiling_set.h"
 
-#include "cc/resource_pool.h"
-#include "cc/resource_provider.h"
+#include "cc/resources/resource_pool.h"
+#include "cc/resources/resource_provider.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_picture_layer_tiling_client.h"
 #include "cc/test/fake_tile_manager_client.h"
diff --git a/cc/picture_layer_tiling_unittest.cc b/cc/resources/picture_layer_tiling_unittest.cc
index c0fd3f2..9f41b6c 100644
--- a/cc/picture_layer_tiling_unittest.cc
+++ b/cc/resources/picture_layer_tiling_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/picture_layer_tiling.h"
+#include "cc/resources/picture_layer_tiling.h"
 
 #include "cc/test/fake_picture_layer_tiling_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/picture_pile.cc b/cc/resources/picture_pile.cc
index eac27b0..e57a103 100644
--- a/cc/picture_pile.cc
+++ b/cc/resources/picture_pile.cc
@@ -5,8 +5,8 @@
 #include <algorithm>
 
 #include "cc/base/region.h"
-#include "cc/picture_pile.h"
-#include "cc/picture_pile_impl.h"
+#include "cc/resources/picture_pile.h"
+#include "cc/resources/picture_pile_impl.h"
 
 namespace {
 // Maximum number of pictures that can overlap before we collapse them into
diff --git a/cc/picture_pile.h b/cc/resources/picture_pile.h
index b9480d5..cc92bf8 100644
--- a/cc/picture_pile.h
+++ b/cc/resources/picture_pile.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_PILE_H_
-#define CC_PICTURE_PILE_H_
+#ifndef CC_RESOURCES_PICTURE_PILE_H_
+#define CC_RESOURCES_PICTURE_PILE_H_
 
-#include "cc/picture_pile_base.h"
+#include "cc/resources/picture_pile_base.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
@@ -49,4 +49,4 @@ class CC_EXPORT PicturePile : public PicturePileBase {
 
 }  // namespace cc
 
-#endif  // CC_PICTURE_PILE_H_
+#endif  // CC_RESOURCES_PICTURE_PILE_H_
diff --git a/cc/picture_pile_base.cc b/cc/resources/picture_pile_base.cc
index 3ba5734..f650f1c 100644
--- a/cc/picture_pile_base.cc
+++ b/cc/resources/picture_pile_base.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_pile_base.h"
+#include "cc/resources/picture_pile_base.h"
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkColor.h"
diff --git a/cc/picture_pile_base.h b/cc/resources/picture_pile_base.h
index c900c7f..7014107 100644
--- a/cc/picture_pile_base.h
+++ b/cc/resources/picture_pile_base.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_PICTURE_PILE_BASE_H_
-#define CC_PICTURE_PILE_BASE_H_
+#ifndef CC_RESOURCES_PICTURE_PILE_BASE_H_
+#define CC_RESOURCES_PICTURE_PILE_BASE_H_
 
 #include <list>
 
@@ -13,7 +13,7 @@
 #include "cc/base/hash_pair.h"
 #include "cc/base/region.h"
 #include "cc/base/tiling_data.h"
-#include "cc/picture.h"
+#include "cc/resources/picture.h"
 #include "ui/gfx/size.h"
 
 namespace cc {
@@ -70,4 +70,4 @@ class CC_EXPORT PicturePileBase : public base::RefCounted<PicturePileBase> {
 
 }  // namespace cc
 
-#endif  // CC_PICTURE_PILE_H_
+#endif  // CC_RESOURCES_PICTURE_PILE_BASE_H_
diff --git a/cc/picture_pile_impl.cc b/cc/resources/picture_pile_impl.cc
index 0470371..9520448 100644
--- a/cc/picture_pile_impl.cc
+++ b/cc/resources/picture_pile_impl.cc
@@ -6,7 +6,7 @@
 #include "cc/base/region.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/debug/rendering_stats.h"
-#include "cc/picture_pile_impl.h"
+#include "cc/resources/picture_pile_impl.h"
 #include "skia/ext/analysis_canvas.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSize.h"
diff --git a/cc/picture_pile_impl.h b/cc/resources/picture_pile_impl.h
index 6ecf9fa..ce64333 100644
--- a/cc/picture_pile_impl.h
+++ b/cc/resources/picture_pile_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_PICTURE_PILE_IMPL_H_
-#define CC_PICTURE_PILE_IMPL_H_
+#ifndef CC_RESOURCES_PICTURE_PILE_IMPL_H_
+#define CC_RESOURCES_PICTURE_PILE_IMPL_H_
 
 #include <list>
 #include <map>
 
 #include "cc/base/cc_export.h"
-#include "cc/picture_pile_base.h"
+#include "cc/resources/picture_pile_base.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
@@ -86,4 +86,4 @@ class CC_EXPORT PicturePileImpl : public PicturePileBase {
 
 }  // namespace cc
 
-#endif  // CC_PICTURE_PILE_IMPL_H_
+#endif  // CC_RESOURCES_PICTURE_PILE_IMPL_H_
diff --git a/cc/platform_color.h b/cc/resources/platform_color.h
index add1933..f1b1cc6 100644
--- a/cc/platform_color.h
+++ b/cc/resources/platform_color.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_PLATFORM_COLOR_H_
-#define CC_PLATFORM_COLOR_H_
+#ifndef CC_RESOURCES_PLATFORM_COLOR_H_
+#define CC_RESOURCES_PLATFORM_COLOR_H_
 
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
@@ -58,4 +58,4 @@ class PlatformColor {
 
 }  // namespace cc
 
-#endif  // CC_PLATFORM_COLOR_H_
+#endif  // CC_RESOURCES_PLATFORM_COLOR_H_
diff --git a/cc/prioritized_resource.cc b/cc/resources/prioritized_resource.cc
index ccc2f66..ac1be69 100644
--- a/cc/prioritized_resource.cc
+++ b/cc/resources/prioritized_resource.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/prioritized_resource.h"
+#include "cc/resources/prioritized_resource.h"
 
 #include <algorithm>
 
-#include "cc/platform_color.h"
-#include "cc/prioritized_resource_manager.h"
-#include "cc/priority_calculator.h"
+#include "cc/resources/platform_color.h"
+#include "cc/resources/prioritized_resource_manager.h"
+#include "cc/resources/priority_calculator.h"
 #include "cc/trees/proxy.h"
 
 namespace cc {
diff --git a/cc/prioritized_resource.h b/cc/resources/prioritized_resource.h
index 27e5e73..566dce4 100644
--- a/cc/prioritized_resource.h
+++ b/cc/resources/prioritized_resource.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_PRIORITIZED_RESOURCE_H_
-#define CC_PRIORITIZED_RESOURCE_H_
+#ifndef CC_RESOURCES_PRIORITIZED_RESOURCE_H_
+#define CC_RESOURCES_PRIORITIZED_RESOURCE_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/priority_calculator.h"
-#include "cc/resource.h"
-#include "cc/resource_provider.h"
+#include "cc/resources/priority_calculator.h"
+#include "cc/resources/resource.h"
+#include "cc/resources/resource_provider.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
@@ -155,4 +155,4 @@ private:
 
 }  // namespace cc
 
-#endif  // CC_PRIORITIZED_RESOURCE_H_
+#endif  // CC_RESOURCES_PRIORITIZED_RESOURCE_H_
diff --git a/cc/prioritized_resource_manager.cc b/cc/resources/prioritized_resource_manager.cc
index ffd3194..010968e 100644
--- a/cc/prioritized_resource_manager.cc
+++ b/cc/resources/prioritized_resource_manager.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/prioritized_resource_manager.h"
+#include "cc/resources/prioritized_resource_manager.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/stl_util.h"
-#include "cc/prioritized_resource.h"
-#include "cc/priority_calculator.h"
+#include "cc/resources/prioritized_resource.h"
+#include "cc/resources/priority_calculator.h"
 #include "cc/trees/proxy.h"
 
 namespace cc {
diff --git a/cc/prioritized_resource_manager.h b/cc/resources/prioritized_resource_manager.h
index 4e2579e..fb68545 100644
--- a/cc/prioritized_resource_manager.h
+++ b/cc/resources/prioritized_resource_manager.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_PRIORITIZED_RESOURCE_MANAGER_H_
-#define CC_PRIORITIZED_RESOURCE_MANAGER_H_
+#ifndef CC_RESOURCES_PRIORITIZED_RESOURCE_MANAGER_H_
+#define CC_RESOURCES_PRIORITIZED_RESOURCE_MANAGER_H_
 
 #include <list>
 #include <vector>
@@ -13,9 +13,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "cc/base/cc_export.h"
-#include "cc/prioritized_resource.h"
-#include "cc/priority_calculator.h"
-#include "cc/resource.h"
+#include "cc/resources/prioritized_resource.h"
+#include "cc/resources/priority_calculator.h"
+#include "cc/resources/resource.h"
 #include "cc/trees/proxy.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/size.h"
@@ -215,4 +215,4 @@ private:
 
 }  // namespace cc
 
-#endif  // CC_PRIORITIZED_RESOURCE_MANAGER_H_
+#endif  // CC_RESOURCES_PRIORITIZED_RESOURCE_MANAGER_H_
diff --git a/cc/prioritized_resource_unittest.cc b/cc/resources/prioritized_resource_unittest.cc
index 3c4a42e..0d11615 100644
--- a/cc/prioritized_resource_unittest.cc
+++ b/cc/resources/prioritized_resource_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/prioritized_resource.h"
+#include "cc/resources/prioritized_resource.h"
 
-#include "cc/prioritized_resource_manager.h"
-#include "cc/resource.h"
+#include "cc/resources/prioritized_resource_manager.h"
+#include "cc/resources/resource.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/tiled_layer_test_common.h"
diff --git a/cc/priority_calculator.cc b/cc/resources/priority_calculator.cc
index 182b8c4..aaeb6bb 100644
--- a/cc/priority_calculator.cc
+++ b/cc/resources/priority_calculator.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/priority_calculator.h"
+#include "cc/resources/priority_calculator.h"
 
 #include "ui/gfx/rect.h"
 
diff --git a/cc/priority_calculator.h b/cc/resources/priority_calculator.h
index b528259..6ab54bd 100644
--- a/cc/priority_calculator.h
+++ b/cc/resources/priority_calculator.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_PRIORITY_CALCULATOR_H_
-#define CC_PRIORITY_CALCULATOR_H_
+#ifndef CC_RESOURCES_PRIORITY_CALCULATOR_H_
+#define CC_RESOURCES_PRIORITY_CALCULATOR_H_
 
 #include "cc/base/cc_export.h"
 
@@ -38,4 +38,4 @@ class CC_EXPORT PriorityCalculator {
 
 }
 
-#endif  // CC_PRIORITY_CALCULATOR_H_
+#endif  // CC_RESOURCES_PRIORITY_CALCULATOR_H_
diff --git a/cc/raster_worker_pool.cc b/cc/resources/raster_worker_pool.cc
index 25ee33b..369a0e5 100644
--- a/cc/raster_worker_pool.cc
+++ b/cc/resources/raster_worker_pool.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/raster_worker_pool.h"
+#include "cc/resources/raster_worker_pool.h"
 
-#include "cc/picture_pile_impl.h"
+#include "cc/resources/picture_pile_impl.h"
 
 namespace cc {
 
diff --git a/cc/raster_worker_pool.h b/cc/resources/raster_worker_pool.h
index c0dfb90..4422860 100644
--- a/cc/raster_worker_pool.h
+++ b/cc/resources/raster_worker_pool.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_RASTER_WORKER_POOL_H_
-#define CC_RASTER_WORKER_POOL_H_
+#ifndef CC_RESOURCES_RASTER_WORKER_POOL_H_
+#define CC_RESOURCES_RASTER_WORKER_POOL_H_
 
 #include <string>
 
@@ -38,4 +38,4 @@ class RasterWorkerPool : public WorkerPool {
 
 }  // namespace cc
 
-#endif  // CC_RASTER_WORKER_POOL_H_
+#endif  // CC_RESOURCES_RASTER_WORKER_POOL_H_
diff --git a/cc/resource.cc b/cc/resources/resource.cc
index 1fca7d7..6c06c3e 100644
--- a/cc/resource.cc
+++ b/cc/resources/resource.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/resource.h"
+#include "cc/resources/resource.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
 namespace cc {
diff --git a/cc/resource.h b/cc/resources/resource.h
index f8c2192..f21a174 100644
--- a/cc/resource.h
+++ b/cc/resources/resource.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_RESOURCE_H_
-#define CC_RESOURCE_H_
+#ifndef CC_RESOURCES_RESOURCE_H_
+#define CC_RESOURCES_RESOURCE_H_
 
 #include "cc/base/cc_export.h"
-#include "cc/resource_provider.h"
+#include "cc/resources/resource_provider.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/size.h"
 
@@ -39,4 +39,4 @@ class CC_EXPORT Resource {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCE_H_
+#endif  // CC_RESOURCES_RESOURCE_H_
diff --git a/cc/resource_pool.cc b/cc/resources/resource_pool.cc
index 2b43693..3cd45d8 100644
--- a/cc/resource_pool.cc
+++ b/cc/resources/resource_pool.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/resource_pool.h"
+#include "cc/resources/resource_pool.h"
 
-#include "cc/resource_provider.h"
+#include "cc/resources/resource_provider.h"
 
 namespace cc {
 
diff --git a/cc/resource_pool.h b/cc/resources/resource_pool.h
index b477aa6..f3ef9bb 100644
--- a/cc/resource_pool.h
+++ b/cc/resources/resource_pool.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_RESOURCE_POOL_H_
-#define CC_RESOURCE_POOL_H_
+#ifndef CC_RESOURCES_RESOURCE_POOL_H_
+#define CC_RESOURCES_RESOURCE_POOL_H_
 
 #include <list>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/renderer.h"
-#include "cc/resource.h"
+#include "cc/resources/resource.h"
 
 namespace cc {
 class ResourceProvider;
@@ -60,4 +60,4 @@ class CC_EXPORT ResourcePool {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCE_POOL_H_
+#endif  // CC_RESOURCES_RESOURCE_POOL_H_
diff --git a/cc/resource_provider.cc b/cc/resources/resource_provider.cc
index f92bb89..27a9c8e 100644
--- a/cc/resource_provider.cc
+++ b/cc/resources/resource_provider.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/resource_provider.h"
+#include "cc/resources/resource_provider.h"
 
 #include <limits.h>
 
@@ -12,9 +12,9 @@
 #include "base/string_util.h"
 #include "base/strings/string_split.h"
 #include "cc/output/gl_renderer.h"  // For the GLC() macro.
-#include "cc/platform_color.h"
+#include "cc/resources/platform_color.h"
+#include "cc/resources/transferable_resource.h"
 #include "cc/texture_uploader.h"
-#include "cc/transferable_resource.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/resource_provider.h b/cc/resources/resource_provider.h
index 249e006..acd404f 100644
--- a/cc/resource_provider.h
+++ b/cc/resources/resource_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_RESOURCE_PROVIDER_H_
-#define CC_RESOURCE_PROVIDER_H_
+#ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_
+#define CC_RESOURCES_RESOURCE_PROVIDER_H_
 
 #include <deque>
 #include <set>
@@ -19,8 +19,8 @@
 #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 "cc/resources/texture_mailbox.h"
+#include "cc/resources/transferable_resource.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -397,4 +397,4 @@ class CC_EXPORT ResourceProvider {
 
 }
 
-#endif  // CC_RESOURCE_PROVIDER_H_
+#endif  // CC_RESOURCES_RESOURCE_PROVIDER_H_
diff --git a/cc/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 936b2c5..63c0ac5 100644
--- a/cc/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_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/resource_provider.h"
+#include "cc/resources/resource_provider.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
diff --git a/cc/resource_update.cc b/cc/resources/resource_update.cc
index 2f3d312..9be2de2 100644
--- a/cc/resource_update.cc
+++ b/cc/resources/resource_update.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/resource_update.h"
+#include "cc/resources/resource_update.h"
 
 #include "base/logging.h"
 
diff --git a/cc/resource_update.h b/cc/resources/resource_update.h
index 9ad5166..1158e61 100644
--- a/cc/resource_update.h
+++ b/cc/resources/resource_update.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_RESOURCE_UPDATE_H_
-#define CC_RESOURCE_UPDATE_H_
+#ifndef CC_RESOURCES_RESOURCE_UPDATE_H_
+#define CC_RESOURCES_RESOURCE_UPDATE_H_
 
 #include "cc/base/cc_export.h"
 #include "ui/gfx/rect.h"
@@ -41,4 +41,4 @@ struct CC_EXPORT ResourceUpdate {
 
 }
 
-#endif  // CC_RESOURCE_UPDATE_H_
+#endif  // CC_RESOURCES_RESOURCE_UPDATE_H_
diff --git a/cc/resource_update_controller.cc b/cc/resources/resource_update_controller.cc
index 27e8e1d..112ebe4 100644
--- a/cc/resource_update_controller.cc
+++ b/cc/resources/resource_update_controller.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/resource_update_controller.h"
+#include "cc/resources/resource_update_controller.h"
 
 #include <limits>
 
@@ -10,8 +10,8 @@
 #include "cc/base/thread.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/resources/prioritized_resource.h"
+#include "cc/resources/resource_provider.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_controller.h b/cc/resources/resource_update_controller.h
index 229e0e0..39ce75d9 100644
--- a/cc/resource_update_controller.h
+++ b/cc/resources/resource_update_controller.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_RESOURCE_UPDATE_CONTROLLER_H_
-#define CC_RESOURCE_UPDATE_CONTROLLER_H_
+#ifndef CC_RESOURCES_RESOURCE_UPDATE_CONTROLLER_H_
+#define CC_RESOURCES_RESOURCE_UPDATE_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "cc/base/cc_export.h"
-#include "cc/resource_update_queue.h"
+#include "cc/resources/resource_update_queue.h"
 
 namespace cc {
 
@@ -86,4 +86,4 @@ class CC_EXPORT ResourceUpdateController {
 
 }  // namespace cc
 
-#endif  // CC_RESOURCE_UPDATE_CONTROLLER_H_
+#endif  // CC_RESOURCES_RESOURCE_UPDATE_CONTROLLER_H_
diff --git a/cc/resource_update_controller_unittest.cc b/cc/resources/resource_update_controller_unittest.cc
index 0c97ce1..752abd2 100644
--- a/cc/resource_update_controller_unittest.cc
+++ b/cc/resources/resource_update_controller_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/resource_update_controller.h"
+#include "cc/resources/resource_update_controller.h"
 
-#include "cc/prioritized_resource_manager.h"
+#include "cc/resources/prioritized_resource_manager.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/scheduler_test_common.h"
diff --git a/cc/resource_update_queue.cc b/cc/resources/resource_update_queue.cc
index 14ecab0..d301638 100644
--- a/cc/resource_update_queue.cc
+++ b/cc/resources/resource_update_queue.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/resource_update_queue.h"
+#include "cc/resources/resource_update_queue.h"
 
-#include "cc/prioritized_resource.h"
+#include "cc/resources/prioritized_resource.h"
 
 namespace cc {
 
diff --git a/cc/resource_update_queue.h b/cc/resources/resource_update_queue.h
index b172a07..c8bb69b 100644
--- a/cc/resource_update_queue.h
+++ b/cc/resources/resource_update_queue.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_RESOURCE_UPDATE_QUEUE_H_
-#define CC_RESOURCE_UPDATE_QUEUE_H_
+#ifndef CC_RESOURCES_RESOURCE_UPDATE_QUEUE_H_
+#define CC_RESOURCES_RESOURCE_UPDATE_QUEUE_H_
 
 #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/resources/resource_update.h"
 
 namespace cc {
 
@@ -45,4 +45,4 @@ private:
 
 }
 
-#endif  // CC_RESOURCE_UPDATE_QUEUE_H_
+#endif  // CC_RESOURCES_RESOURCE_UPDATE_QUEUE_H_
diff --git a/cc/scoped_resource.cc b/cc/resources/scoped_resource.cc
index 709c73d..b31272f 100644
--- a/cc/scoped_resource.cc
+++ b/cc/resources/scoped_resource.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/scoped_resource.h"
+#include "cc/resources/scoped_resource.h"
 
 namespace cc {
 
diff --git a/cc/scoped_resource.h b/cc/resources/scoped_resource.h
index 53b0ba1..f6151b6 100644
--- a/cc/scoped_resource.h
+++ b/cc/resources/scoped_resource.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_SCOPED_RESOURCE_H_
-#define CC_SCOPED_RESOURCE_H_
+#ifndef CC_RESOURCES_SCOPED_RESOURCE_H_
+#define CC_RESOURCES_SCOPED_RESOURCE_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "cc/resource.h"
+#include "cc/resources/resource.h"
 
 #ifndef NDEBUG
 #include "base/threading/platform_thread.h"
@@ -45,4 +45,4 @@ class CC_EXPORT ScopedResource : public Resource {
 
 }
 
-#endif  // CC_SCOPED_RESOURCE_H_
+#endif  // CC_RESOURCES_SCOPED_RESOURCE_H_
diff --git a/cc/scoped_resource_unittest.cc b/cc/resources/scoped_resource_unittest.cc
index fa097f3..3e11658b 100644
--- a/cc/scoped_resource_unittest.cc
+++ b/cc/resources/scoped_resource_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/scoped_resource.h"
+#include "cc/resources/scoped_resource.h"
 
 #include "cc/output/renderer.h"
 #include "cc/test/fake_output_surface.h"
diff --git a/cc/skpicture_content_layer_updater.cc b/cc/resources/skpicture_content_layer_updater.cc
index d4213fb..a44dcc3 100644
--- a/cc/skpicture_content_layer_updater.cc
+++ b/cc/resources/skpicture_content_layer_updater.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/skpicture_content_layer_updater.h"
+#include "cc/resources/skpicture_content_layer_updater.h"
 
 #include "base/debug/trace_event.h"
-#include "cc/layer_painter.h"
-#include "cc/prioritized_resource.h"
-#include "cc/resource_update_queue.h"
+#include "cc/resources/layer_painter.h"
+#include "cc/resources/prioritized_resource.h"
+#include "cc/resources/resource_update_queue.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace cc {
diff --git a/cc/skpicture_content_layer_updater.h b/cc/resources/skpicture_content_layer_updater.h
index 1befd971..218bbc9 100644
--- a/cc/skpicture_content_layer_updater.h
+++ b/cc/resources/skpicture_content_layer_updater.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_SKPICTURE_CONTENT_LAYER_UPDATER_H_
-#define CC_SKPICTURE_CONTENT_LAYER_UPDATER_H_
+#ifndef CC_RESOURCES_SKPICTURE_CONTENT_LAYER_UPDATER_H_
+#define CC_RESOURCES_SKPICTURE_CONTENT_LAYER_UPDATER_H_
 
-#include "cc/content_layer_updater.h"
+#include "cc/resources/content_layer_updater.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 class SkCanvas;
@@ -76,4 +76,4 @@ class SkPictureContentLayerUpdater : public ContentLayerUpdater {
 
 }  // namespace cc
 
-#endif  // CC_SKPICTURE_CONTENT_LAYER_UPDATER_H_
+#endif  // CC_RESOURCES_SKPICTURE_CONTENT_LAYER_UPDATER_H_
diff --git a/cc/texture_mailbox.cc b/cc/resources/texture_mailbox.cc
index b534605..b08ba6c 100644
--- a/cc/texture_mailbox.cc
+++ b/cc/resources/texture_mailbox.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "cc/texture_mailbox.h"
+#include "cc/resources/texture_mailbox.h"
 
 namespace cc {
 
diff --git a/cc/texture_mailbox.h b/cc/resources/texture_mailbox.h
index 2292c97..2cf3de1 100644
--- a/cc/texture_mailbox.h
+++ b/cc/resources/texture_mailbox.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_MAILBOX_H_
-#define CC_TEXTURE_MAILBOX_H_
+#ifndef CC_RESOURCES_TEXTURE_MAILBOX_H_
+#define CC_RESOURCES_TEXTURE_MAILBOX_H_
 
 #include <string>
 
@@ -47,4 +47,4 @@ class CC_EXPORT TextureMailbox {
 
 }  // namespace cc
 
-#endif  // CC_TEXTURE_MAILBOX_H_
+#endif  // CC_RESOURCES_TEXTURE_MAILBOX_H_
diff --git a/cc/tile.cc b/cc/resources/tile.cc
index d39aeea..48f3ae7 100644
--- a/cc/tile.cc
+++ b/cc/resources/tile.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/tile.h"
+#include "cc/resources/tile.h"
 
 #include "base/stringprintf.h"
-#include "cc/tile_manager.h"
+#include "cc/resources/tile_manager.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
 namespace cc {
diff --git a/cc/tile.h b/cc/resources/tile.h
index 63dd5a7..edf5645 100644
--- a/cc/tile.h
+++ b/cc/resources/tile.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_TILE_H_
-#define CC_TILE_H_
+#ifndef CC_RESOURCES_TILE_H_
+#define CC_RESOURCES_TILE_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "cc/managed_tile_state.h"
-#include "cc/picture_pile_impl.h"
-#include "cc/tile_priority.h"
+#include "cc/resources/picture_pile_impl.h"
+#include "cc/resources/tile_priority.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
@@ -99,4 +99,4 @@ class CC_EXPORT Tile : public base::RefCounted<Tile> {
 
 }  // namespace cc
 
-#endif  // CC_TILE_H_
+#endif  // CC_RESOURCES_TILE_H_
diff --git a/cc/tile_manager.cc b/cc/resources/tile_manager.cc
index b7bd9dc..d455606 100644
--- a/cc/tile_manager.cc
+++ b/cc/resources/tile_manager.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/tile_manager.h"
+#include "cc/resources/tile_manager.h"
 
 #include <algorithm>
 
@@ -12,10 +12,10 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "cc/debug/devtools_instrumentation.h"
-#include "cc/platform_color.h"
-#include "cc/raster_worker_pool.h"
-#include "cc/resource_pool.h"
-#include "cc/tile.h"
+#include "cc/resources/platform_color.h"
+#include "cc/resources/raster_worker_pool.h"
+#include "cc/resources/resource_pool.h"
+#include "cc/resources/tile.h"
 #include "third_party/skia/include/core/SkDevice.h"
 
 namespace cc {
diff --git a/cc/tile_manager.h b/cc/resources/tile_manager.h
index 4da9d4b..b67e269 100644
--- a/cc/tile_manager.h
+++ b/cc/resources/tile_manager.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_TILE_MANAGER_H_
-#define CC_TILE_MANAGER_H_
+#ifndef CC_RESOURCES_TILE_MANAGER_H_
+#define CC_RESOURCES_TILE_MANAGER_H_
 
 #include <list>
 #include <queue>
@@ -15,10 +15,10 @@
 #include "base/values.h"
 #include "cc/base/worker_pool.h"
 #include "cc/debug/rendering_stats.h"
-#include "cc/memory_history.h"
-#include "cc/picture_pile_impl.h"
-#include "cc/resource_pool.h"
-#include "cc/tile_priority.h"
+#include "cc/resources/memory_history.h"
+#include "cc/resources/picture_pile_impl.h"
+#include "cc/resources/resource_pool.h"
+#include "cc/resources/tile_priority.h"
 
 namespace cc {
 class RasterWorkerPool;
@@ -228,4 +228,4 @@ class CC_EXPORT TileManager : public WorkerPoolClient {
 
 }  // namespace cc
 
-#endif  // CC_TILE_MANAGER_H_
+#endif  // CC_RESOURCES_TILE_MANAGER_H_
diff --git a/cc/tile_priority.cc b/cc/resources/tile_priority.cc
index 2f1000d..5206f7a 100644
--- a/cc/tile_priority.cc
+++ b/cc/resources/tile_priority.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/tile_priority.h"
+#include "cc/resources/tile_priority.h"
 
 #include "base/values.h"
 #include "cc/base/math_util.h"
diff --git a/cc/tile_priority.h b/cc/resources/tile_priority.h
index ea23df4..29feb6c 100644
--- a/cc/tile_priority.h
+++ b/cc/resources/tile_priority.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_TILE_PRIORITY_H_
-#define CC_TILE_PRIORITY_H_
+#ifndef CC_RESOURCES_TILE_PRIORITY_H_
+#define CC_RESOURCES_TILE_PRIORITY_H_
 
 #include <limits>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "cc/picture_pile.h"
+#include "cc/resources/picture_pile.h"
 #include "ui/gfx/quad_f.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
@@ -177,4 +177,4 @@ class GlobalStateThatImpactsTilePriority {
 
 }  // namespace cc
 
-#endif  // CC_TILE_PRIORITY_H_
+#endif  // CC_RESOURCES_TILE_PRIORITY_H_
diff --git a/cc/tile_priority_unittest.cc b/cc/resources/tile_priority_unittest.cc
index 5eea2b4..97de199 100644
--- a/cc/tile_priority_unittest.cc
+++ b/cc/resources/tile_priority_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/tile_priority.h"
+#include "cc/resources/tile_priority.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/cc/transferable_resource.cc b/cc/resources/transferable_resource.cc
index ce26434..be2be1a 100644
--- a/cc/transferable_resource.cc
+++ b/cc/resources/transferable_resource.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "cc/transferable_resource.h"
+#include "cc/resources/transferable_resource.h"
 
 namespace cc {
 
diff --git a/cc/transferable_resource.h b/cc/resources/transferable_resource.h
index fdc6c5b..5c979433 100644
--- a/cc/transferable_resource.h
+++ b/cc/resources/transferable_resource.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_TRANSFERABLE_RESOURCE_H_
-#define CC_TRANSFERABLE_RESOURCE_H_
+#ifndef CC_RESOURCES_TRANSFERABLE_RESOURCE_H_
+#define CC_RESOURCES_TRANSFERABLE_RESOURCE_H_
 
 #include <vector>
 
@@ -30,4 +30,4 @@ typedef std::vector<TransferableResource> TransferableResourceArray;
 
 }  // namespace cc
 
-#endif  // CC_TRANSFERABLE_RESOURCE_H_
+#endif  // CC_RESOURCES_TRANSFERABLE_RESOURCE_H_
diff --git a/cc/scrollbar_layer.cc b/cc/scrollbar_layer.cc
index 00941d8..72ed5f5 100644
--- a/cc/scrollbar_layer.cc
+++ b/cc/scrollbar_layer.cc
@@ -6,10 +6,10 @@
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
-#include "cc/caching_bitmap_content_layer_updater.h"
-#include "cc/layer_painter.h"
-#include "cc/prioritized_resource.h"
-#include "cc/resource_update_queue.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"
diff --git a/cc/scrollbar_layer.h b/cc/scrollbar_layer.h
index 0da18a5..e12873c 100644
--- a/cc/scrollbar_layer.h
+++ b/cc/scrollbar_layer.h
@@ -7,7 +7,7 @@
 
 #include "cc/base/cc_export.h"
 #include "cc/contents_scaling_layer.h"
-#include "cc/layer_updater.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"
diff --git a/cc/scrollbar_layer_unittest.cc b/cc/scrollbar_layer_unittest.cc
index 0cad90c..d1010f9 100644
--- a/cc/scrollbar_layer_unittest.cc
+++ b/cc/scrollbar_layer_unittest.cc
@@ -6,10 +6,10 @@
 
 #include "cc/animation/scrollbar_animation_controller.h"
 #include "cc/append_quads_data.h"
-#include "cc/prioritized_resource_manager.h"
-#include "cc/priority_calculator.h"
 #include "cc/quads/solid_color_draw_quad.h"
-#include "cc/resource_update_queue.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"
diff --git a/cc/test/fake_content_layer.cc b/cc/test/fake_content_layer.cc
index d485b7c..69cdb1f 100644
--- a/cc/test/fake_content_layer.cc
+++ b/cc/test/fake_content_layer.cc
@@ -4,7 +4,7 @@
 
 #include "cc/test/fake_content_layer.h"
 
-#include "cc/prioritized_resource.h"
+#include "cc/resources/prioritized_resource.h"
 #include "cc/test/fake_content_layer_impl.h"
 
 namespace cc {
diff --git a/cc/test/fake_picture_layer_tiling_client.h b/cc/test/fake_picture_layer_tiling_client.h
index 5935ae3..9f2e77d 100644
--- a/cc/test/fake_picture_layer_tiling_client.h
+++ b/cc/test/fake_picture_layer_tiling_client.h
@@ -5,11 +5,11 @@
 #ifndef CC_TEST_FAKE_PICTURE_LAYER_TILING_CLIENT_H_
 #define CC_TEST_FAKE_PICTURE_LAYER_TILING_CLIENT_H_
 
-#include "cc/picture_layer_tiling.h"
-#include "cc/picture_pile_impl.h"
+#include "cc/resources/picture_layer_tiling.h"
+#include "cc/resources/picture_pile_impl.h"
+#include "cc/resources/tile.h"
+#include "cc/resources/tile_manager.h"
 #include "cc/test/fake_tile_manager_client.h"
-#include "cc/tile.h"
-#include "cc/tile_manager.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
diff --git a/cc/test/fake_scrollbar_layer.cc b/cc/test/fake_scrollbar_layer.cc
index 9c24a85..ea1ce9f 100644
--- a/cc/test/fake_scrollbar_layer.cc
+++ b/cc/test/fake_scrollbar_layer.cc
@@ -4,7 +4,7 @@
 
 #include "cc/test/fake_scrollbar_layer.h"
 
-#include "cc/resource_update_queue.h"
+#include "cc/resources/resource_update_queue.h"
 #include "cc/test/fake_scrollbar_theme_painter.h"
 #include "cc/test/fake_web_scrollbar.h"
 #include "cc/test/fake_web_scrollbar_theme_geometry.h"
diff --git a/cc/test/fake_tile_manager_client.h b/cc/test/fake_tile_manager_client.h
index 0365297..244f5f0 100644
--- a/cc/test/fake_tile_manager_client.h
+++ b/cc/test/fake_tile_manager_client.h
@@ -5,7 +5,7 @@
 #ifndef CC_TEST_FAKE_TILE_MANAGER_CLIENT_H_
 #define CC_TEST_FAKE_TILE_MANAGER_CLIENT_H_
 
-#include "cc/tile_manager.h"
+#include "cc/resources/tile_manager.h"
 
 namespace cc {
 
diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc
index 9632354..c0fc395 100644
--- a/cc/test/pixel_test.cc
+++ b/cc/test/pixel_test.cc
@@ -8,7 +8,7 @@
 #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/resources/resource_provider.h"
 #include "cc/test/paths.h"
 #include "cc/test/pixel_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/test/render_pass_test_common.cc b/cc/test/render_pass_test_common.cc
index 42aefe2..ec2199f 100644
--- a/cc/test/render_pass_test_common.cc
+++ b/cc/test/render_pass_test_common.cc
@@ -14,7 +14,7 @@
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/quads/yuv_video_draw_quad.h"
-#include "cc/resource_provider.h"
+#include "cc/resources/resource_provider.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 2f86ed4..8648455 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -6,11 +6,11 @@
 #define CC_TEST_TILED_LAYER_TEST_COMMON_H_
 
 #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/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/texture_uploader.h"
 #include "cc/tiled_layer.h"
 #include "cc/tiled_layer_impl.h"
diff --git a/cc/texture_layer.h b/cc/texture_layer.h
index 1dd5ce5..c4fb9e8 100644
--- a/cc/texture_layer.h
+++ b/cc/texture_layer.h
@@ -10,7 +10,7 @@
 #include "base/callback.h"
 #include "cc/base/cc_export.h"
 #include "cc/layer.h"
-#include "cc/texture_mailbox.h"
+#include "cc/resources/texture_mailbox.h"
 
 namespace WebKit { class WebGraphicsContext3D; }
 
diff --git a/cc/texture_uploader.cc b/cc/texture_uploader.cc
index 26ca774..0adf734 100644
--- a/cc/texture_uploader.cc
+++ b/cc/texture_uploader.cc
@@ -11,8 +11,8 @@
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
 #include "cc/base/util.h"
-#include "cc/prioritized_resource.h"
-#include "cc/resource.h"
+#include "cc/resources/prioritized_resource.h"
+#include "cc/resources/resource.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/texture_uploader_unittest.cc b/cc/texture_uploader_unittest.cc
index 07af523..04d322f 100644
--- a/cc/texture_uploader_unittest.cc
+++ b/cc/texture_uploader_unittest.cc
@@ -5,7 +5,7 @@
 #include "cc/texture_uploader.h"
 
 #include "cc/base/util.h"
-#include "cc/prioritized_resource.h"
+#include "cc/resources/prioritized_resource.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index 1329b10..6058a76 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -9,9 +9,9 @@
 #include "build/build_config.h"
 #include "cc/debug/overdraw_metrics.h"
 #include "cc/layer_impl.h"
-#include "cc/layer_updater.h"
-#include "cc/prioritized_resource.h"
-#include "cc/priority_calculator.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"
diff --git a/cc/tiled_layer.h b/cc/tiled_layer.h
index 47cebb5..b5f2801 100644
--- a/cc/tiled_layer.h
+++ b/cc/tiled_layer.h
@@ -7,7 +7,7 @@
 
 #include "cc/base/cc_export.h"
 #include "cc/contents_scaling_layer.h"
-#include "cc/layer_tiling_data.h"
+#include "cc/resources/layer_tiling_data.h"
 
 namespace cc {
 class LayerUpdater;
diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc
index 6c91415..add7a98 100644
--- a/cc/tiled_layer_impl.cc
+++ b/cc/tiled_layer_impl.cc
@@ -9,12 +9,12 @@
 #include "cc/append_quads_data.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/debug_colors.h"
-#include "cc/layer_tiling_data.h"
 #include "cc/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"
 #include "cc/quads/tile_draw_quad.h"
+#include "cc/resources/layer_tiling_data.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/quad_f.h"
diff --git a/cc/tiled_layer_impl_unittest.cc b/cc/tiled_layer_impl_unittest.cc
index 1893e59..4d77f29 100644
--- a/cc/tiled_layer_impl_unittest.cc
+++ b/cc/tiled_layer_impl_unittest.cc
@@ -5,8 +5,8 @@
 #include "cc/tiled_layer_impl.h"
 
 #include "cc/append_quads_data.h"
-#include "cc/layer_tiling_data.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/test/layer_test_common.h"
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index 20113ca..3b98627 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -4,11 +4,11 @@
 
 #include "cc/tiled_layer.h"
 
-#include "cc/bitmap_content_layer_updater.h"
 #include "cc/debug/overdraw_metrics.h"
-#include "cc/layer_painter.h"
-#include "cc/prioritized_resource_manager.h"
-#include "cc/resource_update_controller.h"
+#include "cc/resources/bitmap_content_layer_updater.h"
+#include "cc/resources/layer_painter.h"
+#include "cc/resources/prioritized_resource_manager.h"
+#include "cc/resources/resource_update_controller.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 0a5cce2..2de01a5 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -24,7 +24,7 @@
 #include "cc/pinch_zoom_scrollbar.h"
 #include "cc/pinch_zoom_scrollbar_geometry.h"
 #include "cc/pinch_zoom_scrollbar_painter.h"
-#include "cc/prioritized_resource_manager.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"
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 302acef..17cd62f 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -26,16 +26,16 @@
 #include "cc/input/page_scale_animation.h"
 #include "cc/input/top_controls_manager.h"
 #include "cc/layer_iterator.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/picture_layer_tiling.h"
-#include "cc/prioritized_resource_manager.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/solid_color_draw_quad.h"
+#include "cc/resources/memory_history.h"
+#include "cc/resources/picture_layer_tiling.h"
+#include "cc/resources/prioritized_resource_manager.h"
 #include "cc/scrollbar_layer_impl.h"
 #include "cc/texture_uploader.h"
 #include "cc/trees/damage_tracker.h"
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index 485e880..5c2dc40 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -17,7 +17,7 @@
 #include "cc/output/renderer.h"
 #include "cc/quads/render_pass.h"
 #include "cc/render_pass_sink.h"
-#include "cc/tile_manager.h"
+#include "cc/resources/tile_manager.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPicture.h"
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 4c6fa94..91f7fa0 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -15,7 +15,6 @@
 #include "cc/input/top_controls_manager.h"
 #include "cc/io_surface_layer_impl.h"
 #include "cc/layer_impl.h"
-#include "cc/layer_tiling_data.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/quad_sink.h"
@@ -23,6 +22,7 @@
 #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"
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index d0a792e..fa5c420 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -11,9 +11,9 @@
 #include "cc/layer_impl.h"
 #include "cc/output/output_surface.h"
 #include "cc/picture_layer.h"
-#include "cc/prioritized_resource.h"
-#include "cc/prioritized_resource_manager.h"
-#include "cc/resource_update_queue.h"
+#include "cc/resources/prioritized_resource.h"
+#include "cc/resources/prioritized_resource_manager.h"
+#include "cc/resources/resource_update_queue.h"
 #include "cc/scrollbar_layer.h"
 #include "cc/test/fake_content_layer.h"
 #include "cc/test/fake_content_layer_client.h"
diff --git a/cc/trees/quad_culler_unittest.cc b/cc/trees/quad_culler_unittest.cc
index cd2e036..b4e94e7 100644
--- a/cc/trees/quad_culler_unittest.cc
+++ b/cc/trees/quad_culler_unittest.cc
@@ -7,8 +7,8 @@
 #include "cc/append_quads_data.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/overdraw_metrics.h"
-#include "cc/layer_tiling_data.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"
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index 96516ed..c7a1d24 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -9,9 +9,9 @@
 #include "cc/base/thread.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
-#include "cc/prioritized_resource_manager.h"
 #include "cc/quads/draw_quad.h"
-#include "cc/resource_update_controller.h"
+#include "cc/resources/prioritized_resource_manager.h"
+#include "cc/resources/resource_update_controller.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
 
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index b9daebe..e33f0e2 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -13,8 +13,8 @@
 #include "cc/input/input_handler.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
-#include "cc/prioritized_resource_manager.h"
 #include "cc/quads/draw_quad.h"
+#include "cc/resources/prioritized_resource_manager.h"
 #include "cc/scheduler.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
index 50df936..6241f27 100644
--- a/cc/trees/thread_proxy.h
+++ b/cc/trees/thread_proxy.h
@@ -10,7 +10,7 @@
 #include "base/time.h"
 #include "cc/animation/animation_events.h"
 #include "cc/base/completion_event.h"
-#include "cc/resource_update_controller.h"
+#include "cc/resources/resource_update_controller.h"
 #include "cc/scheduler.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/proxy.h"
diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc
index c1e47de..2eb6265 100644
--- a/cc/video_layer_impl.cc
+++ b/cc/video_layer_impl.cc
@@ -12,7 +12,7 @@
 #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/resource_provider.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"
diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h
index 9057f37..b0c13eb 100644
--- a/content/common/cc_messages.h
+++ b/content/common/cc_messages.h
@@ -18,7 +18,7 @@
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/quads/yuv_video_draw_quad.h"
-#include "cc/transferable_resource.h"
+#include "cc/resources/transferable_resource.h"
 #include "cc/video_layer_impl.h"
 #include "content/common/content_export.h"
 #include "gpu/ipc/gpu_command_buffer_traits.h"
diff --git a/content/renderer/gpu/mailbox_output_surface.h b/content/renderer/gpu/mailbox_output_surface.h
index 745a812..96306b8 100644
--- a/content/renderer/gpu/mailbox_output_surface.h
+++ b/content/renderer/gpu/mailbox_output_surface.h
@@ -7,7 +7,7 @@
 
 #include <queue>
 
-#include "cc/transferable_resource.h"
+#include "cc/resources/transferable_resource.h"
 #include "content/renderer/gpu/compositor_output_surface.h"
 #include "ui/gfx/size.h"
 
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index dafb35c..a41e82d 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -14,9 +14,9 @@
 #include "cc/content_layer.h"
 #include "cc/delegated_renderer_layer.h"
 #include "cc/output/delegated_frame_data.h"
+#include "cc/resources/transferable_resource.h"
 #include "cc/solid_color_layer.h"
 #include "cc/texture_layer.h"
-#include "cc/transferable_resource.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
 #include "ui/base/animation/animation.h"
diff --git a/webkit/compositor_bindings/web_external_texture_layer_impl.cc b/webkit/compositor_bindings/web_external_texture_layer_impl.cc
index 979e754..a79492a 100644
--- a/webkit/compositor_bindings/web_external_texture_layer_impl.cc
+++ b/webkit/compositor_bindings/web_external_texture_layer_impl.cc
@@ -4,7 +4,7 @@
 
 #include "webkit/compositor_bindings/web_external_texture_layer_impl.h"
 
-#include "cc/resource_update_queue.h"
+#include "cc/resources/resource_update_queue.h"
 #include "cc/texture_layer.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayerClient.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"