diff --git a/viewer/BUILD.gn b/viewer/BUILD.gn
index 5db00001443..d4a5544e4d3 100644
--- a/viewer/BUILD.gn
+++ b/viewer/BUILD.gn
@@ -50,12 +50,12 @@ mojo_native_application("viewer") {
     "//mojo/services/view_manager/public/cpp",
     "//mojo/services/view_manager/public/interfaces",
     "//skia",
-    "//sky/compositor",
     "//sky/engine",
     "//sky/engine/tonic",
     "//sky/services/platform",
     "//sky/services/testing:bindings",
     "//sky/shell/dart",
+    "//sky/viewer/compositor",
     "//third_party/icu",
     "//ui/events",
     "//url",
diff --git a/compositor/BUILD.gn b/viewer/compositor/BUILD.gn
similarity index 100%
rename from compositor/BUILD.gn
rename to viewer/compositor/BUILD.gn
diff --git a/compositor/layer.cc b/viewer/compositor/layer.cc
similarity index 87%
rename from compositor/layer.cc
rename to viewer/compositor/layer.cc
index 5c05fdf5c64..9fff2ba56a8 100644
--- a/compositor/layer.cc
+++ b/viewer/compositor/layer.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/compositor/layer.h"
+#include "sky/viewer/compositor/layer.h"
 
 #include "base/trace_event/trace_event.h"
-#include "sky/compositor/layer_host.h"
-#include "sky/compositor/picture_serializer.h"
-#include "sky/compositor/rasterizer.h"
+#include "sky/viewer/compositor/layer_host.h"
+#include "sky/viewer/compositor/picture_serializer.h"
+#include "sky/viewer/compositor/rasterizer.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 
diff --git a/compositor/layer.h b/viewer/compositor/layer.h
similarity index 82%
rename from compositor/layer.h
rename to viewer/compositor/layer.h
index 761d2bdbf8c..f52f1b4950d 100644
--- a/compositor/layer.h
+++ b/viewer/compositor/layer.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_COMPOSITOR_LAYER_H_
-#define SKY_COMPOSITOR_LAYER_H_
+#ifndef SKY_VIEWER_COMPOSITOR_LAYER_H_
+#define SKY_VIEWER_COMPOSITOR_LAYER_H_
 
 #include "base/memory/ref_counted.h"
 #include "mojo/gpu/gl_texture.h"
 #include "skia/ext/refptr.h"
-#include "sky/compositor/layer_client.h"
-#include "sky/compositor/rasterizer.h"
+#include "sky/viewer/compositor/layer_client.h"
+#include "sky/viewer/compositor/rasterizer.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ -48,4 +48,4 @@ class Layer : public base::RefCounted<Layer> {
 
 }  // namespace sky
 
-#endif  // SKY_COMPOSITOR_LAYER_H_
+#endif  // SKY_VIEWER_COMPOSITOR_LAYER_H_
diff --git a/compositor/layer_client.cc b/viewer/compositor/layer_client.cc
similarity index 83%
rename from compositor/layer_client.cc
rename to viewer/compositor/layer_client.cc
index 229482af622..863fa432f4d 100644
--- a/compositor/layer_client.cc
+++ b/viewer/compositor/layer_client.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 "sky/compositor/layer_client.h"
+#include "sky/viewer/compositor/layer_client.h"
 
 namespace sky {
 
diff --git a/compositor/layer_client.h b/viewer/compositor/layer_client.h
similarity index 73%
rename from compositor/layer_client.h
rename to viewer/compositor/layer_client.h
index c0673fae734..52f3c8f8365 100644
--- a/compositor/layer_client.h
+++ b/viewer/compositor/layer_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_COMPOSITOR_LAYER_CLIENT_H_
-#define SKY_COMPOSITOR_LAYER_CLIENT_H_
+#ifndef SKY_VIEWER_COMPOSITOR_LAYER_CLIENT_H_
+#define SKY_VIEWER_COMPOSITOR_LAYER_CLIENT_H_
 
 class SkCanvas;
 
@@ -23,4 +23,4 @@ class LayerClient {
 
 }  // namespace sky
 
-#endif  // SKY_COMPOSITOR_LAYER_CLIENT_H_
+#endif  // SKY_VIEWER_COMPOSITOR_LAYER_CLIENT_H_
diff --git a/compositor/layer_host.cc b/viewer/compositor/layer_host.cc
similarity index 98%
rename from compositor/layer_host.cc
rename to viewer/compositor/layer_host.cc
index bf4661805e6..63c152f1deb 100644
--- a/compositor/layer_host.cc
+++ b/viewer/compositor/layer_host.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 "sky/compositor/layer_host.h"
+#include "sky/viewer/compositor/layer_host.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/trace_event/trace_event.h"
@@ -10,7 +10,7 @@
 #include "mojo/gpu/gl_context.h"
 #include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
 #include "mojo/skia/ganesh_context.h"
-#include "sky/compositor/layer.h"
+#include "sky/viewer/compositor/layer.h"
 
 namespace sky {
 
diff --git a/compositor/layer_host.h b/viewer/compositor/layer_host.h
similarity index 85%
rename from compositor/layer_host.h
rename to viewer/compositor/layer_host.h
index 36bf2df53a5..4205f493a4a 100644
--- a/compositor/layer_host.h
+++ b/viewer/compositor/layer_host.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_COMPOSITOR_LAYER_HOST_H_
-#define SKY_COMPOSITOR_LAYER_HOST_H_
+#ifndef SKY_VIEWER_COMPOSITOR_LAYER_HOST_H_
+#define SKY_VIEWER_COMPOSITOR_LAYER_HOST_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/gpu/gl_context_owner.h"
 #include "mojo/skia/ganesh_context.h"
-#include "sky/compositor/layer_host_client.h"
-#include "sky/compositor/resource_manager.h"
-#include "sky/compositor/surface_holder.h"
+#include "sky/viewer/compositor/layer_host_client.h"
+#include "sky/viewer/compositor/resource_manager.h"
+#include "sky/viewer/compositor/surface_holder.h"
 
 namespace sky {
 class ResourceManager;
@@ -74,4 +74,4 @@ class LayerHost : public SurfaceHolder::Client {
 
 }  // namespace sky
 
-#endif  // SKY_COMPOSITOR_LAYER_HOST_H_
+#endif  // SKY_VIEWER_COMPOSITOR_LAYER_HOST_H_
diff --git a/compositor/layer_host_client.cc b/viewer/compositor/layer_host_client.cc
similarity index 82%
rename from compositor/layer_host_client.cc
rename to viewer/compositor/layer_host_client.cc
index 13a25b02824..49ee475489d 100644
--- a/compositor/layer_host_client.cc
+++ b/viewer/compositor/layer_host_client.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 "sky/compositor/layer_host_client.h"
+#include "sky/viewer/compositor/layer_host_client.h"
 
 namespace sky {
 
diff --git a/compositor/layer_host_client.h b/viewer/compositor/layer_host_client.h
similarity index 79%
rename from compositor/layer_host_client.h
rename to viewer/compositor/layer_host_client.h
index f2146d64d6a..d30251ed6f6 100644
--- a/compositor/layer_host_client.h
+++ b/viewer/compositor/layer_host_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_COMPOSITOR_LAYER_HOST_CLIENT_H_
-#define SKY_COMPOSITOR_LAYER_HOST_CLIENT_H_
+#ifndef SKY_VIEWER_COMPOSITOR_LAYER_HOST_CLIENT_H_
+#define SKY_VIEWER_COMPOSITOR_LAYER_HOST_CLIENT_H_
 
 #include "base/time/time.h"
 #include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
@@ -26,4 +26,4 @@ class LayerHostClient {
 
 }  // namespace sky
 
-#endif  // SKY_COMPOSITOR_LAYER_HOST_CLIENT_H_
+#endif  // SKY_VIEWER_COMPOSITOR_LAYER_HOST_CLIENT_H_
diff --git a/compositor/picture_serializer.cc b/viewer/compositor/picture_serializer.cc
similarity index 95%
rename from compositor/picture_serializer.cc
rename to viewer/compositor/picture_serializer.cc
index 47117e718af..19feba5ec17 100644
--- a/compositor/picture_serializer.cc
+++ b/viewer/compositor/picture_serializer.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 "sky/compositor/picture_serializer.h"
+#include "sky/viewer/compositor/picture_serializer.h"
 
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkPixelSerializer.h"
diff --git a/compositor/picture_serializer.h b/viewer/compositor/picture_serializer.h
similarity index 66%
rename from compositor/picture_serializer.h
rename to viewer/compositor/picture_serializer.h
index e2b192db7ff..dfddb2b287e 100644
--- a/compositor/picture_serializer.h
+++ b/viewer/compositor/picture_serializer.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 SKY_COMPOSITOR_PICTURE_SERIALIZER_H_
-#define SKY_COMPOSITOR_PICTURE_SERIALIZER_H_
+#ifndef SKY_VIEWER_COMPOSITOR_PICTURE_SERIALIZER_H_
+#define SKY_VIEWER_COMPOSITOR_PICTURE_SERIALIZER_H_
 
 #include "third_party/skia/include/core/SkPicture.h"
 
@@ -13,4 +13,4 @@ void SerializePicture(const char* file_name, SkPicture*);
 
 }  // namespace sky
 
-#endif  // SKY_COMPOSITOR_PICTURE_SERIALIZER_H_
+#endif  // SKY_VIEWER_COMPOSITOR_PICTURE_SERIALIZER_H_
diff --git a/compositor/rasterizer.cc b/viewer/compositor/rasterizer.cc
similarity index 85%
rename from compositor/rasterizer.cc
rename to viewer/compositor/rasterizer.cc
index e0eb2d5c189..54579594df5 100644
--- a/compositor/rasterizer.cc
+++ b/viewer/compositor/rasterizer.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 "sky/compositor/rasterizer.h"
+#include "sky/viewer/compositor/rasterizer.h"
 
 namespace sky {
 
diff --git a/compositor/rasterizer.h b/viewer/compositor/rasterizer.h
similarity index 78%
rename from compositor/rasterizer.h
rename to viewer/compositor/rasterizer.h
index 7b1a4fad5a2..68f0f5ee6e8 100644
--- a/compositor/rasterizer.h
+++ b/viewer/compositor/rasterizer.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 SKY_COMPOSITOR_RASTERIZER_H_
-#define SKY_COMPOSITOR_RASTERIZER_H_
+#ifndef SKY_VIEWER_COMPOSITOR_RASTERIZER_H_
+#define SKY_VIEWER_COMPOSITOR_RASTERIZER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "mojo/gpu/gl_texture.h"
@@ -25,4 +25,4 @@ class Rasterizer {
 
 }  // namespace sky
 
-#endif  // SKY_COMPOSITOR_RASTERIZER_H_
+#endif  // SKY_VIEWER_COMPOSITOR_RASTERIZER_H_
diff --git a/compositor/rasterizer_bitmap.cc b/viewer/compositor/rasterizer_bitmap.cc
similarity index 88%
rename from compositor/rasterizer_bitmap.cc
rename to viewer/compositor/rasterizer_bitmap.cc
index ee926f212de..0cec1419045 100644
--- a/compositor/rasterizer_bitmap.cc
+++ b/viewer/compositor/rasterizer_bitmap.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 "sky/compositor/rasterizer_bitmap.h"
+#include "sky/viewer/compositor/rasterizer_bitmap.h"
 
-#include "sky/compositor/layer_client.h"
-#include "sky/compositor/layer_host.h"
+#include "sky/viewer/compositor/layer_client.h"
+#include "sky/viewer/compositor/layer_host.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
diff --git a/compositor/rasterizer_bitmap.h b/viewer/compositor/rasterizer_bitmap.h
similarity index 74%
rename from compositor/rasterizer_bitmap.h
rename to viewer/compositor/rasterizer_bitmap.h
index 22886233ab3..663f7089e0e 100644
--- a/compositor/rasterizer_bitmap.h
+++ b/viewer/compositor/rasterizer_bitmap.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 SKY_COMPOSITOR_DISPLAY_RASTERIZER_BITMAP_H_
-#define SKY_COMPOSITOR_DISPLAY_RASTERIZER_BITMAP_H_
+#ifndef SKY_VIEWER_COMPOSITOR_DISPLAY_RASTERIZER_BITMAP_H_
+#define SKY_VIEWER_COMPOSITOR_DISPLAY_RASTERIZER_BITMAP_H_
 
-#include "sky/compositor/rasterizer.h"
+#include "sky/viewer/compositor/rasterizer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace sky {
@@ -28,4 +28,4 @@ class RasterizerBitmap : public Rasterizer {
 
 }  // namespace sky
 
-#endif  // SKY_COMPOSITOR_DISPLAY_RASTERIZER_BITMAP_H_
+#endif  // SKY_VIEWER_COMPOSITOR_DISPLAY_RASTERIZER_BITMAP_H_
diff --git a/compositor/rasterizer_ganesh.cc b/viewer/compositor/rasterizer_ganesh.cc
similarity index 91%
rename from compositor/rasterizer_ganesh.cc
rename to viewer/compositor/rasterizer_ganesh.cc
index 46ac59be5d8..178c6abbe2d 100644
--- a/compositor/rasterizer_ganesh.cc
+++ b/viewer/compositor/rasterizer_ganesh.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/compositor/rasterizer_ganesh.h"
+#include "sky/viewer/compositor/rasterizer_ganesh.h"
 
 #include "base/trace_event/trace_event.h"
 #include "mojo/skia/ganesh_surface.h"
-#include "sky/compositor/layer_host.h"
+#include "sky/viewer/compositor/layer_host.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
diff --git a/compositor/rasterizer_ganesh.h b/viewer/compositor/rasterizer_ganesh.h
similarity index 69%
rename from compositor/rasterizer_ganesh.h
rename to viewer/compositor/rasterizer_ganesh.h
index 6ee23f518a1..d96ee62a14e 100644
--- a/compositor/rasterizer_ganesh.h
+++ b/viewer/compositor/rasterizer_ganesh.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 SKY_COMPOSITOR_DISPLAY_RASTERIZER_GANESH_H_
-#define SKY_COMPOSITOR_DISPLAY_RASTERIZER_GANESH_H_
+#ifndef SKY_VIEWER_COMPOSITOR_DISPLAY_RASTERIZER_GANESH_H_
+#define SKY_VIEWER_COMPOSITOR_DISPLAY_RASTERIZER_GANESH_H_
 
-#include "sky/compositor/rasterizer.h"
+#include "sky/viewer/compositor/rasterizer.h"
 
 namespace sky {
 class LayerHost;
@@ -25,4 +25,4 @@ class RasterizerGanesh : public Rasterizer {
 
 }  // namespace sky
 
-#endif  // SKY_COMPOSITOR_DISPLAY_RASTERIZER_GANESH_H_
+#endif  // SKY_VIEWER_COMPOSITOR_DISPLAY_RASTERIZER_GANESH_H_
diff --git a/compositor/resource_manager.cc b/viewer/compositor/resource_manager.cc
similarity index 97%
rename from compositor/resource_manager.cc
rename to viewer/compositor/resource_manager.cc
index 9a5eecd249f..172dc124b3d 100644
--- a/compositor/resource_manager.cc
+++ b/viewer/compositor/resource_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 "sky/compositor/resource_manager.h"
+#include "sky/viewer/compositor/resource_manager.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
@@ -16,7 +16,7 @@
 #include "mojo/gpu/gl_context.h"
 #include "mojo/gpu/gl_texture.h"
 #include "mojo/public/c/gles2/gles2.h"
-#include "sky/compositor/layer.h"
+#include "sky/viewer/compositor/layer.h"
 
 namespace sky {
 
diff --git a/compositor/resource_manager.h b/viewer/compositor/resource_manager.h
similarity index 84%
rename from compositor/resource_manager.h
rename to viewer/compositor/resource_manager.h
index e6fd329dd4e..afef2b22249 100644
--- a/compositor/resource_manager.h
+++ b/viewer/compositor/resource_manager.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 SKY_COMPOSITOR_RESOURCE_MANAGER_H_
-#define SKY_COMPOSITOR_RESOURCE_MANAGER_H_
+#ifndef SKY_VIEWER_COMPOSITOR_RESOURCE_MANAGER_H_
+#define SKY_VIEWER_COMPOSITOR_RESOURCE_MANAGER_H_
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
-#include "sky/compositor/texture_cache.h"
+#include "sky/viewer/compositor/texture_cache.h"
 
 namespace gfx {
 class Size;
@@ -46,4 +46,4 @@ class ResourceManager {
 
 }  // namespace sky
 
-#endif  // SKY_COMPOSITOR_RESOURCE_MANAGER_H_
+#endif  // SKY_VIEWER_COMPOSITOR_RESOURCE_MANAGER_H_
diff --git a/compositor/surface_allocator.cc b/viewer/compositor/surface_allocator.cc
similarity index 91%
rename from compositor/surface_allocator.cc
rename to viewer/compositor/surface_allocator.cc
index 7b3d381b411..00392c9657e 100644
--- a/compositor/surface_allocator.cc
+++ b/viewer/compositor/surface_allocator.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 "sky/compositor/surface_allocator.h"
+#include "sky/viewer/compositor/surface_allocator.h"
 
 #include "base/logging.h"
 
diff --git a/compositor/surface_allocator.h b/viewer/compositor/surface_allocator.h
similarity index 78%
rename from compositor/surface_allocator.h
rename to viewer/compositor/surface_allocator.h
index 5da7c6f11ec..86c350e92dd 100644
--- a/compositor/surface_allocator.h
+++ b/viewer/compositor/surface_allocator.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 SKY_COMPOSITOR_SURFACE_ALLOCATOR_H_
-#define SKY_COMPOSITOR_SURFACE_ALLOCATOR_H_
+#ifndef SKY_VIEWER_COMPOSITOR_SURFACE_ALLOCATOR_H_
+#define SKY_VIEWER_COMPOSITOR_SURFACE_ALLOCATOR_H_
 
 #include "base/basictypes.h"
 #include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
@@ -26,4 +26,4 @@ class SurfaceAllocator {
 
 }  // namespace sky
 
-#endif  // SKY_COMPOSITOR_SURFACE_ALLOCATOR_H_
+#endif  // SKY_VIEWER_COMPOSITOR_SURFACE_ALLOCATOR_H_
diff --git a/compositor/surface_holder.cc b/viewer/compositor/surface_holder.cc
similarity index 95%
rename from compositor/surface_holder.cc
rename to viewer/compositor/surface_holder.cc
index 3b130cee56d..6c5698341d1 100644
--- a/compositor/surface_holder.cc
+++ b/viewer/compositor/surface_holder.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 "sky/compositor/surface_holder.h"
+#include "sky/viewer/compositor/surface_holder.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
-#include "sky/compositor/surface_allocator.h"
+#include "sky/viewer/compositor/surface_allocator.h"
 
 namespace sky {
 
diff --git a/compositor/surface_holder.h b/viewer/compositor/surface_holder.h
similarity index 91%
rename from compositor/surface_holder.h
rename to viewer/compositor/surface_holder.h
index 607d2e4af11..bf017c21c7a 100644
--- a/compositor/surface_holder.h
+++ b/viewer/compositor/surface_holder.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 SKY_COMPOSITOR_SURFACE_HOLDER_H_
-#define SKY_COMPOSITOR_SURFACE_HOLDER_H_
+#ifndef SKY_VIEWER_COMPOSITOR_SURFACE_HOLDER_H_
+#define SKY_VIEWER_COMPOSITOR_SURFACE_HOLDER_H_
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
@@ -59,4 +59,4 @@ class SurfaceHolder : public mojo::ResourceReturner {
 
 }  // namespace sky
 
-#endif  // SKY_COMPOSITOR_SURFACE_HOLDER_H_
+#endif  // SKY_VIEWER_COMPOSITOR_SURFACE_HOLDER_H_
diff --git a/compositor/texture_cache.cc b/viewer/compositor/texture_cache.cc
similarity index 94%
rename from compositor/texture_cache.cc
rename to viewer/compositor/texture_cache.cc
index 05fa7d58ebc..deff4443bc3 100644
--- a/compositor/texture_cache.cc
+++ b/viewer/compositor/texture_cache.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sky/compositor/texture_cache.h"
+#include "sky/viewer/compositor/texture_cache.h"
 
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/gpu/gl_texture.h"
diff --git a/compositor/texture_cache.h b/viewer/compositor/texture_cache.h
similarity index 82%
rename from compositor/texture_cache.h
rename to viewer/compositor/texture_cache.h
index 056112e0fa5..33b6f3cd102 100644
--- a/compositor/texture_cache.h
+++ b/viewer/compositor/texture_cache.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_COMPOSITOR_TEXTURE_CACHE_H_
-#define SKY_COMPOSITOR_TEXTURE_CACHE_H_
+#ifndef SKY_VIEWER_COMPOSITOR_TEXTURE_CACHE_H_
+#define SKY_VIEWER_COMPOSITOR_TEXTURE_CACHE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
@@ -32,4 +32,4 @@ class TextureCache {
 
 }  // namespace sky
 
-#endif  // SKY_COMPOSITOR_TEXTURE_CACHE_H_
+#endif  // SKY_VIEWER_COMPOSITOR_TEXTURE_CACHE_H_
diff --git a/viewer/document_view.cc b/viewer/document_view.cc
index 9e22009d38b..8ae022c0561 100644
--- a/viewer/document_view.cc
+++ b/viewer/document_view.cc
@@ -18,10 +18,6 @@
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
 #include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
 #include "skia/ext/refptr.h"
-#include "sky/compositor/layer.h"
-#include "sky/compositor/layer_host.h"
-#include "sky/compositor/rasterizer_bitmap.h"
-#include "sky/compositor/rasterizer_ganesh.h"
 #include "sky/engine/public/platform/Platform.h"
 #include "sky/engine/public/platform/WebHTTPHeaderVisitor.h"
 #include "sky/engine/public/platform/WebInputEvent.h"
@@ -35,6 +31,10 @@
 #include "sky/engine/public/web/WebSettings.h"
 #include "sky/engine/public/web/WebView.h"
 #include "sky/services/platform/url_request_types.h"
+#include "sky/viewer/compositor/layer.h"
+#include "sky/viewer/compositor/layer_host.h"
+#include "sky/viewer/compositor/rasterizer_bitmap.h"
+#include "sky/viewer/compositor/rasterizer_ganesh.h"
 #include "sky/viewer/converters/input_event_types.h"
 #include "sky/viewer/dart_library_provider_impl.h"
 #include "sky/viewer/internals.h"
diff --git a/viewer/document_view.h b/viewer/document_view.h
index 6b6c798e04e..c2dc6c5ae77 100644
--- a/viewer/document_view.h
+++ b/viewer/document_view.h
@@ -19,14 +19,14 @@
 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
-#include "sky/compositor/layer_client.h"
-#include "sky/compositor/layer_host_client.h"
 #include "sky/engine/public/platform/ServiceProvider.h"
 #include "sky/engine/public/sky/sky_view.h"
 #include "sky/engine/public/sky/sky_view_client.h"
 #include "sky/engine/public/web/WebFrameClient.h"
 #include "sky/engine/public/web/WebViewClient.h"
 #include "sky/services/testing/test_harness.mojom.h"
+#include "sky/viewer/compositor/layer_client.h"
+#include "sky/viewer/compositor/layer_host_client.h"
 #include "ui/events/gestures/gesture_types.h"
 
 namespace mojo {