diff --git a/sky/shell/BUILD.gn b/sky/shell/BUILD.gn
index f48aec0ca8b71615800ce25f7aabf9e236d21f6f..886c38abbda4d425cafda9a310ac61fe563a34fe 100644
--- a/sky/shell/BUILD.gn
+++ b/sky/shell/BUILD.gn
@@ -4,8 +4,6 @@
 
 source_set("common") {
   sources = [
-    "gpu/ganesh_canvas.cc",
-    "gpu/ganesh_canvas.h",
     "gpu/picture_serializer.cc",
     "gpu/picture_serializer.h",
     "rasterizer.cc",
@@ -68,6 +66,8 @@ source_set("gpu_direct") {
     "gpu/direct/surface_notifications_direct.h",
     "gpu/direct/rasterizer_direct.cc",
     "gpu/direct/rasterizer_direct.h",
+    "gpu/direct/ganesh_canvas.cc",
+    "gpu/direct/ganesh_canvas.h",
   ]
 
   deps = [
diff --git a/sky/shell/gpu/ganesh_canvas.cc b/sky/shell/gpu/direct/ganesh_canvas.cc
similarity index 97%
rename from sky/shell/gpu/ganesh_canvas.cc
rename to sky/shell/gpu/direct/ganesh_canvas.cc
index 70b778c67b68193ffe2628402e9d9b9999d4358d..990ad0c7d4b05a14cc0794e03d5e3e40c2214179 100644
--- a/sky/shell/gpu/ganesh_canvas.cc
+++ b/sky/shell/gpu/direct/ganesh_canvas.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/shell/gpu/ganesh_canvas.h"
+#include "sky/shell/gpu/direct/ganesh_canvas.h"
 
 #include "base/logging.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
diff --git a/sky/shell/gpu/ganesh_canvas.h b/sky/shell/gpu/direct/ganesh_canvas.h
similarity index 87%
rename from sky/shell/gpu/ganesh_canvas.h
rename to sky/shell/gpu/direct/ganesh_canvas.h
index 6f5e945fc4e953d515f24558f3b547f2721c516a..18ff730d3aea3fd417cd52d6222ca9c57784a1c0 100644
--- a/sky/shell/gpu/ganesh_canvas.h
+++ b/sky/shell/gpu/direct/ganesh_canvas.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_SHELL_GPU_GANESH_CANVAS_H_
-#define SKY_SHELL_GPU_GANESH_CANVAS_H_
+#ifndef SKY_SHELL_GPU_DIRECT_GANESH_CANVAS_H_
+#define SKY_SHELL_GPU_DIRECT_GANESH_CANVAS_H_
 
 #include "base/basictypes.h"
 #include "skia/ext/refptr.h"
@@ -38,4 +38,4 @@ class GaneshCanvas {
 }  // namespace shell
 }  // namespace sky
 
-#endif  // SKY_SHELL_GPU_GANESH_CANVAS_H_
+#endif  // SKY_SHELL_GPU_DIRECT_GANESH_CANVAS_H_
diff --git a/sky/shell/gpu/direct/rasterizer_direct.h b/sky/shell/gpu/direct/rasterizer_direct.h
index 94eaa9cd7eb5edd2f48a6fb5bf983f9253b7295a..59266f43ae8edc55eb40226101a5a8e71bc3c2ab 100644
--- a/sky/shell/gpu/direct/rasterizer_direct.h
+++ b/sky/shell/gpu/direct/rasterizer_direct.h
@@ -8,7 +8,7 @@
 #include "base/memory/weak_ptr.h"
 #include "flow/paint_context.h"
 #include "skia/ext/refptr.h"
-#include "sky/shell/gpu/ganesh_canvas.h"
+#include "sky/shell/gpu/direct/ganesh_canvas.h"
 #include "sky/shell/rasterizer.h"
 #include "ui/gfx/native_widget_types.h"