diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 83658571..67ed133 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -7,10 +7,9 @@
 
 cc_component("cc") {
   sources = [
+    # TODO(chrishtr): move these to cc/benchmarks/
     "debug/benchmark_instrumentation.cc",
     "debug/benchmark_instrumentation.h",
-    "debug/debug_colors.cc",
-    "debug/debug_colors.h",
     "debug/debug_rect_history.cc",
     "debug/debug_rect_history.h",
     "debug/devtools_instrumentation.cc",
@@ -23,8 +22,6 @@
     "debug/invalidation_benchmark.h",
     "debug/lap_timer.cc",
     "debug/lap_timer.h",
-    "debug/layer_tree_debug_state.cc",
-    "debug/layer_tree_debug_state.h",
     "debug/micro_benchmark.cc",
     "debug/micro_benchmark.h",
     "debug/micro_benchmark_controller.cc",
@@ -33,19 +30,11 @@
     "debug/micro_benchmark_controller_impl.h",
     "debug/micro_benchmark_impl.cc",
     "debug/micro_benchmark_impl.h",
-    "debug/picture_debug_util.cc",
-    "debug/picture_debug_util.h",
     "debug/rasterize_and_record_benchmark.cc",
     "debug/rasterize_and_record_benchmark.h",
     "debug/rasterize_and_record_benchmark_impl.cc",
     "debug/rasterize_and_record_benchmark_impl.h",
-    "debug/rendering_stats.cc",
-    "debug/rendering_stats.h",
-    "debug/rendering_stats_instrumentation.cc",
-    "debug/rendering_stats_instrumentation.h",
     "debug/ring_buffer.h",
-    "debug/traced_value.cc",
-    "debug/traced_value.h",
     "debug/unittest_only_benchmark.cc",
     "debug/unittest_only_benchmark.h",
     "debug/unittest_only_benchmark_impl.cc",
@@ -115,6 +104,8 @@
     "layers/picture_layer.h",
     "layers/picture_layer_impl.cc",
     "layers/picture_layer_impl.h",
+    "layers/recording_source.cc",
+    "layers/recording_source.h",
     "layers/render_surface_impl.cc",
     "layers/render_surface_impl.h",
     "layers/scrollbar_layer_impl_base.cc",
@@ -183,10 +174,6 @@
     "output/direct_renderer.h",
     "output/dynamic_geometry_binding.cc",
     "output/dynamic_geometry_binding.h",
-    "output/filter_operation.cc",
-    "output/filter_operation.h",
-    "output/filter_operations.cc",
-    "output/filter_operations.h",
     "output/geometry_binding.cc",
     "output/geometry_binding.h",
     "output/gl_renderer.cc",
@@ -221,8 +208,6 @@
     "output/overlay_strategy_underlay_cast.h",
     "output/program_binding.cc",
     "output/program_binding.h",
-    "output/render_surface_filters.cc",
-    "output/render_surface_filters.h",
     "output/renderer_settings.cc",
     "output/renderer_settings.h",
     "output/shader.cc",
@@ -239,40 +224,6 @@
     "output/vulkan_context_provider.h",
     "output/vulkan_in_process_context_provider.cc",
     "output/vulkan_in_process_context_provider.h",
-    "playback/clip_display_item.cc",
-    "playback/clip_display_item.h",
-    "playback/clip_path_display_item.cc",
-    "playback/clip_path_display_item.h",
-    "playback/compositing_display_item.cc",
-    "playback/compositing_display_item.h",
-    "playback/decoded_draw_image.cc",
-    "playback/decoded_draw_image.h",
-    "playback/discardable_image_map.cc",
-    "playback/discardable_image_map.h",
-    "playback/display_item.h",
-    "playback/display_item_list.cc",
-    "playback/display_item_list.h",
-    "playback/draw_image.cc",
-    "playback/draw_image.h",
-    "playback/drawing_display_item.cc",
-    "playback/drawing_display_item.h",
-    "playback/filter_display_item.cc",
-    "playback/filter_display_item.h",
-    "playback/float_clip_display_item.cc",
-    "playback/float_clip_display_item.h",
-    "playback/image_hijack_canvas.cc",
-    "playback/image_hijack_canvas.h",
-    "playback/image_id.h",
-    "playback/largest_display_item.cc",
-    "playback/largest_display_item.h",
-    "playback/raster_source.cc",
-    "playback/raster_source.h",
-    "playback/recording_source.cc",
-    "playback/recording_source.h",
-    "playback/skip_image_canvas.cc",
-    "playback/skip_image_canvas.h",
-    "playback/transform_display_item.cc",
-    "playback/transform_display_item.h",
     "quads/content_draw_quad_base.cc",
     "quads/content_draw_quad_base.h",
     "quads/debug_border_draw_quad.cc",
@@ -309,16 +260,22 @@
     "raster/bitmap_raster_buffer_provider.h",
     "raster/gpu_raster_buffer_provider.cc",
     "raster/gpu_raster_buffer_provider.h",
+    "raster/image_hijack_canvas.cc",
+    "raster/image_hijack_canvas.h",
     "raster/one_copy_raster_buffer_provider.cc",
     "raster/one_copy_raster_buffer_provider.h",
     "raster/raster_buffer.cc",
     "raster/raster_buffer.h",
     "raster/raster_buffer_provider.cc",
     "raster/raster_buffer_provider.h",
+    "raster/raster_source.cc",
+    "raster/raster_source.h",
     "raster/scoped_gpu_raster.cc",
     "raster/scoped_gpu_raster.h",
     "raster/single_thread_task_graph_runner.cc",
     "raster/single_thread_task_graph_runner.h",
+    "raster/skip_image_canvas.cc",
+    "raster/skip_image_canvas.h",
     "raster/staging_buffer_pool.cc",
     "raster/staging_buffer_pool.h",
     "raster/synchronous_task_graph_runner.cc",
@@ -395,6 +352,8 @@
     "scheduler/video_frame_controller.h",
     "tiles/checker_image_tracker.cc",
     "tiles/checker_image_tracker.h",
+    "tiles/decoded_draw_image.cc",
+    "tiles/decoded_draw_image.h",
     "tiles/decoded_image_tracker.cc",
     "tiles/decoded_image_tracker.h",
     "tiles/eviction_tile_priority_queue.cc",
@@ -741,6 +700,7 @@
   sources = [
     "base/contiguous_container_unittest.cc",
     "base/delayed_unique_notifier_unittest.cc",
+    "base/filter_operations_unittest.cc",
     "base/float_quad_unittest.cc",
     "base/histograms_unittest.cc",
     "base/index_rect_unittest.cc",
@@ -777,6 +737,7 @@
     "layers/picture_image_layer_unittest.cc",
     "layers/picture_layer_impl_unittest.cc",
     "layers/picture_layer_unittest.cc",
+    "layers/recording_source_unittest.cc",
     "layers/render_surface_impl_unittest.cc",
     "layers/render_surface_unittest.cc",
     "layers/scrollbar_layer_unittest.cc",
@@ -796,7 +757,6 @@
     "output/buffer_to_texture_target_map_unittest.cc",
     "output/compositor_frame_sink_unittest.cc",
     "output/context_cache_controller_unittest.cc",
-    "output/filter_operations_unittest.cc",
     "output/gl_renderer_unittest.cc",
     "output/layer_quad_unittest.cc",
     "output/overlay_unittest.cc",
@@ -804,16 +764,15 @@
     "output/shader_unittest.cc",
     "output/software_renderer_unittest.cc",
     "output/texture_mailbox_deleter_unittest.cc",
-    "playback/discardable_image_map_unittest.cc",
-    "playback/display_item_list_unittest.cc",
-    "playback/image_hijack_canvas_unittest.cc",
-    "playback/raster_source_unittest.cc",
-    "playback/recording_source_unittest.cc",
+    "paint/discardable_image_map_unittest.cc",
+    "paint/display_item_list_unittest.cc",
     "quads/draw_polygon_unittest.cc",
     "quads/draw_quad_unittest.cc",
     "quads/nine_patch_generator_unittest.cc",
     "quads/render_pass_unittest.cc",
+    "raster/image_hijack_canvas_unittest.cc",
     "raster/raster_buffer_provider_unittest.cc",
+    "raster/raster_source_unittest.cc",
     "raster/scoped_gpu_raster_unittest.cc",
     "raster/single_thread_task_graph_runner_unittest.cc",
     "raster/synchronous_task_graph_runner_unittest.cc",
@@ -974,6 +933,7 @@
     "//base/test:test_support",
     "//cc/ipc",
     "//cc/ipc:interfaces",
+    "//cc/paint",
     "//cc/surfaces",
     "//cc/surfaces:surface_id",
     "//gpu",