100 files changed, 153 insertions, 153 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 61ad64af5a..e529ded76f 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -18,7 +18,7 @@
 #include "SkColorPriv.h"
 #include "SkGeometry.h"
 
-#include "batches/GrTestMeshDrawOp.h"
+#include "ops/GrTestMeshDrawOp.h"
 
 #include "effects/GrBezierEffect.h"
 
diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp
index 3b4ffe2f79..372858ee69 100644
--- a/gm/bigrrectaaeffect.cpp
+++ b/gm/bigrrectaaeffect.cpp
@@ -10,9 +10,9 @@
 #include "GrContext.h"
 #include "GrRenderTargetContextPriv.h"
 #include "SkRRect.h"
-#include "batches/GrDrawOp.h"
-#include "batches/GrRectOpFactory.h"
 #include "effects/GrRRectEffect.h"
+#include "ops/GrDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 
 namespace skiagm {
 
diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp
index 11883d2fa3..0e3c56f293 100644
--- a/gm/constcolorprocessor.cpp
+++ b/gm/constcolorprocessor.cpp
@@ -15,9 +15,9 @@
 #include "GrRenderTargetContextPriv.h"
 #include "SkGrPriv.h"
 #include "SkGradientShader.h"
-#include "batches/GrDrawOp.h"
-#include "batches/GrRectOpFactory.h"
 #include "effects/GrConstColorProcessor.h"
+#include "ops/GrDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 
 namespace skiagm {
 /**
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index f3b7294f2c..d6decb93c4 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -20,8 +20,8 @@
 #include "SkGeometry.h"
 #include "SkTLList.h"
 
-#include "batches/GrMeshDrawOp.h"
-#include "batches/GrTestMeshDrawOp.h"
+#include "ops/GrMeshDrawOp.h"
+#include "ops/GrTestMeshDrawOp.h"
 
 #include "effects/GrConvexPolyEffect.h"
 
diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index 0810f274de..4649a688e3 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -9,9 +9,9 @@
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrRenderTargetContextPriv.h"
-#include "batches/GrDrawOp.h"
-#include "batches/GrRectOpFactory.h"
 #include "effects/GrRRectEffect.h"
+#include "ops/GrDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 #endif
 #include "SkRRect.h"
 
diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
index 417d99a3a4..cf7ec41d62 100644
--- a/gm/texturedomaineffect.cpp
+++ b/gm/texturedomaineffect.cpp
@@ -16,9 +16,9 @@
 #include "SkBitmap.h"
 #include "SkGr.h"
 #include "SkGradientShader.h"
-#include "batches/GrDrawOp.h"
-#include "batches/GrRectOpFactory.h"
 #include "effects/GrTextureDomain.h"
+#include "ops/GrDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 
 namespace skiagm {
 /**
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp
index ac96303940..32c20d24d0 100644
--- a/gm/yuvtorgbeffect.cpp
+++ b/gm/yuvtorgbeffect.cpp
@@ -16,9 +16,9 @@
 #include "SkBitmap.h"
 #include "SkGr.h"
 #include "SkGradientShader.h"
-#include "batches/GrDrawOp.h"
-#include "batches/GrRectOpFactory.h"
 #include "effects/GrYUVEffect.h"
+#include "ops/GrDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 
 #define YSIZE 8
 #define USIZE 4
diff --git a/gn/gpu.gni b/gn/gpu.gni
index dfef54606a..155eac67f5 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -224,73 +224,73 @@ skia_gpu_sources = [
   "$_src/gpu/GrYUVProvider.cpp",
   "$_src/gpu/GrYUVProvider.h",
 
-  # Batches
-  "$_src/gpu/batches/GrAAHairLinePathRenderer.cpp",
-  "$_src/gpu/batches/GrAAHairLinePathRenderer.h",
-  "$_src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp",
-  "$_src/gpu/batches/GrAALinearizingConvexPathRenderer.h",
-  "$_src/gpu/batches/GrAAConvexTessellator.cpp",
-  "$_src/gpu/batches/GrAAConvexTessellator.h",
-  "$_src/gpu/batches/GrAADistanceFieldPathRenderer.cpp",
-  "$_src/gpu/batches/GrAADistanceFieldPathRenderer.h",
-  "$_src/gpu/batches/GrAAConvexPathRenderer.cpp",
-  "$_src/gpu/batches/GrAAConvexPathRenderer.h",
-  "$_src/gpu/batches/GrAAFillRectOp.cpp",
-  "$_src/gpu/batches/GrAAFillRectOp.h",
-  "$_src/gpu/batches/GrAAStrokeRectOp.cpp",
-  "$_src/gpu/batches/GrAAStrokeRectOp.h",
-  "$_src/gpu/batches/GrAnalyticRectOp.cpp",
-  "$_src/gpu/batches/GrAnalyticRectOp.h",
-  "$_src/gpu/batches/GrAtlasTextOp.cpp",
-  "$_src/gpu/batches/GrAtlasTextOp.h",
-  "$_src/gpu/batches/GrClearOp.h",
-  "$_src/gpu/batches/GrClearStencilClipOp.h",
-  "$_src/gpu/batches/GrCopySurfaceOp.cpp",
-  "$_src/gpu/batches/GrCopySurfaceOp.h",
-  "$_src/gpu/batches/GrDashLinePathRenderer.cpp",
-  "$_src/gpu/batches/GrDashLinePathRenderer.h",
-  "$_src/gpu/batches/GrDashOp.cpp",
-  "$_src/gpu/batches/GrDashOp.h",
-  "$_src/gpu/batches/GrDefaultPathRenderer.cpp",
-  "$_src/gpu/batches/GrDefaultPathRenderer.h",
-  "$_src/gpu/batches/GrDiscardOp.h",
-  "$_src/gpu/batches/GrDrawAtlasOp.cpp",
-  "$_src/gpu/batches/GrDrawAtlasOp.h",
-  "$_src/gpu/batches/GrDrawOp.cpp",
-  "$_src/gpu/batches/GrDrawOp.h",
-  "$_src/gpu/batches/GrDrawPathOp.cpp",
-  "$_src/gpu/batches/GrDrawPathOp.h",
-  "$_src/gpu/batches/GrDrawVerticesOp.cpp",
-  "$_src/gpu/batches/GrDrawVerticesOp.h",
-  "$_src/gpu/batches/GrMSAAPathRenderer.cpp",
-  "$_src/gpu/batches/GrMSAAPathRenderer.h",
-  "$_src/gpu/batches/GrNonAAFillRectOp.h",
-  "$_src/gpu/batches/GrNonAAFillRectOp.cpp",
-  "$_src/gpu/batches/GrNonAAFillRectPerspectiveOp.cpp",
-  "$_src/gpu/batches/GrNonAAStrokeRectOp.cpp",
-  "$_src/gpu/batches/GrNonAAStrokeRectOp.h",
-  "$_src/gpu/batches/GrLatticeOp.cpp",
-  "$_src/gpu/batches/GrLatticeOp.h",
-  "$_src/gpu/batches/GrOp.cpp",
-  "$_src/gpu/batches/GrOp.h",
-  "$_src/gpu/batches/GrOvalOpFactory.cpp",
-  "$_src/gpu/batches/GrOvalOpFactory.h",
-  "$_src/gpu/batches/GrPLSPathRenderer.cpp",
-  "$_src/gpu/batches/GrPLSPathRenderer.h",
-  "$_src/gpu/batches/GrRectOpFactory.h",
-  "$_src/gpu/batches/GrRectOpFactory.cpp",
-  "$_src/gpu/batches/GrRegionOp.cpp",
-  "$_src/gpu/batches/GrRegionOp.h",
-  "$_src/gpu/batches/GrShadowRRectOp.cpp",
-  "$_src/gpu/batches/GrShadowRRectOp.h",
-  "$_src/gpu/batches/GrStencilAndCoverPathRenderer.cpp",
-  "$_src/gpu/batches/GrStencilAndCoverPathRenderer.h",
-  "$_src/gpu/batches/GrStencilPathOp.h",
-  "$_src/gpu/batches/GrTessellatingPathRenderer.cpp",
-  "$_src/gpu/batches/GrTessellatingPathRenderer.h",
-  "$_src/gpu/batches/GrTestMeshDrawOp.h",
-  "$_src/gpu/batches/GrMeshDrawOp.cpp",
-  "$_src/gpu/batches/GrMeshDrawOp.h",
+  # Ops
+  "$_src/gpu/ops/GrAAHairLinePathRenderer.cpp",
+  "$_src/gpu/ops/GrAAHairLinePathRenderer.h",
+  "$_src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp",
+  "$_src/gpu/ops/GrAALinearizingConvexPathRenderer.h",
+  "$_src/gpu/ops/GrAAConvexTessellator.cpp",
+  "$_src/gpu/ops/GrAAConvexTessellator.h",
+  "$_src/gpu/ops/GrAADistanceFieldPathRenderer.cpp",
+  "$_src/gpu/ops/GrAADistanceFieldPathRenderer.h",
+  "$_src/gpu/ops/GrAAConvexPathRenderer.cpp",
+  "$_src/gpu/ops/GrAAConvexPathRenderer.h",
+  "$_src/gpu/ops/GrAAFillRectOp.cpp",
+  "$_src/gpu/ops/GrAAFillRectOp.h",
+  "$_src/gpu/ops/GrAAStrokeRectOp.cpp",
+  "$_src/gpu/ops/GrAAStrokeRectOp.h",
+  "$_src/gpu/ops/GrAnalyticRectOp.cpp",
+  "$_src/gpu/ops/GrAnalyticRectOp.h",
+  "$_src/gpu/ops/GrAtlasTextOp.cpp",
+  "$_src/gpu/ops/GrAtlasTextOp.h",
+  "$_src/gpu/ops/GrClearOp.h",
+  "$_src/gpu/ops/GrClearStencilClipOp.h",
+  "$_src/gpu/ops/GrCopySurfaceOp.cpp",
+  "$_src/gpu/ops/GrCopySurfaceOp.h",
+  "$_src/gpu/ops/GrDashLinePathRenderer.cpp",
+  "$_src/gpu/ops/GrDashLinePathRenderer.h",
+  "$_src/gpu/ops/GrDashOp.cpp",
+  "$_src/gpu/ops/GrDashOp.h",
+  "$_src/gpu/ops/GrDefaultPathRenderer.cpp",
+  "$_src/gpu/ops/GrDefaultPathRenderer.h",
+  "$_src/gpu/ops/GrDiscardOp.h",
+  "$_src/gpu/ops/GrDrawAtlasOp.cpp",
+  "$_src/gpu/ops/GrDrawAtlasOp.h",
+  "$_src/gpu/ops/GrDrawOp.cpp",
+  "$_src/gpu/ops/GrDrawOp.h",
+  "$_src/gpu/ops/GrDrawPathOp.cpp",
+  "$_src/gpu/ops/GrDrawPathOp.h",
+  "$_src/gpu/ops/GrDrawVerticesOp.cpp",
+  "$_src/gpu/ops/GrDrawVerticesOp.h",
+  "$_src/gpu/ops/GrMeshDrawOp.cpp",
+  "$_src/gpu/ops/GrMeshDrawOp.h",
+  "$_src/gpu/ops/GrMSAAPathRenderer.cpp",
+  "$_src/gpu/ops/GrMSAAPathRenderer.h",
+  "$_src/gpu/ops/GrNonAAFillRectOp.h",
+  "$_src/gpu/ops/GrNonAAFillRectOp.cpp",
+  "$_src/gpu/ops/GrNonAAFillRectPerspectiveOp.cpp",
+  "$_src/gpu/ops/GrNonAAStrokeRectOp.cpp",
+  "$_src/gpu/ops/GrNonAAStrokeRectOp.h",
+  "$_src/gpu/ops/GrLatticeOp.cpp",
+  "$_src/gpu/ops/GrLatticeOp.h",
+  "$_src/gpu/ops/GrOp.cpp",
+  "$_src/gpu/ops/GrOp.h",
+  "$_src/gpu/ops/GrOvalOpFactory.cpp",
+  "$_src/gpu/ops/GrOvalOpFactory.h",
+  "$_src/gpu/ops/GrPLSPathRenderer.cpp",
+  "$_src/gpu/ops/GrPLSPathRenderer.h",
+  "$_src/gpu/ops/GrRectOpFactory.h",
+  "$_src/gpu/ops/GrRectOpFactory.cpp",
+  "$_src/gpu/ops/GrRegionOp.cpp",
+  "$_src/gpu/ops/GrRegionOp.h",
+  "$_src/gpu/ops/GrShadowRRectOp.cpp",
+  "$_src/gpu/ops/GrShadowRRectOp.h",
+  "$_src/gpu/ops/GrStencilAndCoverPathRenderer.cpp",
+  "$_src/gpu/ops/GrStencilAndCoverPathRenderer.h",
+  "$_src/gpu/ops/GrStencilPathOp.h",
+  "$_src/gpu/ops/GrTessellatingPathRenderer.cpp",
+  "$_src/gpu/ops/GrTessellatingPathRenderer.h",
+  "$_src/gpu/ops/GrTestMeshDrawOp.h",
 
   "$_src/gpu/effects/Gr1DKernelEffect.h",
   "$_src/gpu/effects/GrConfigConversionEffect.cpp",
diff --git a/src/gpu/GrAuditTrail.cpp b/src/gpu/GrAuditTrail.cpp
index 8f6f566456..effa08a35f 100644
--- a/src/gpu/GrAuditTrail.cpp
+++ b/src/gpu/GrAuditTrail.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "GrAuditTrail.h"
-#include "batches/GrOp.h"
+#include "ops/GrOp.h"
 
 const int GrAuditTrail::kGrAuditTrailInvalidID = -1;
 
diff --git a/src/gpu/GrBatchAtlas.h b/src/gpu/GrBatchAtlas.h
index 2019131379..11270f3df4 100644
--- a/src/gpu/GrBatchAtlas.h
+++ b/src/gpu/GrBatchAtlas.h
@@ -13,7 +13,7 @@
 #include "SkTDArray.h"
 #include "SkTInternalLList.h"
 
-#include "batches/GrDrawOp.h"
+#include "ops/GrDrawOp.h"
 
 class GrRectanizer;
 
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 3e3bc0e6a8..67ef83a89d 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -21,9 +21,9 @@
 #include "SkConfig8888.h"
 #include "SkGrPriv.h"
 
-#include "batches/GrCopySurfaceOp.h"
 #include "effects/GrConfigConversionEffect.h"
 #include "effects/GrGammaEffect.h"
+#include "ops/GrCopySurfaceOp.h"
 #include "text/GrTextBlobCache.h"
 
 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == this)
diff --git a/src/gpu/GrGpuCommandBuffer.h b/src/gpu/GrGpuCommandBuffer.h
index 13b73346e3..879de49d84 100644
--- a/src/gpu/GrGpuCommandBuffer.h
+++ b/src/gpu/GrGpuCommandBuffer.h
@@ -9,7 +9,7 @@
 #define GrGpuCommandBuffer_DEFINED
 
 #include "GrColor.h"
-#include "batches/GrDrawOp.h"
+#include "ops/GrDrawOp.h"
 
 class GrOpFlushState;
 class GrFixedClip;
diff --git a/src/gpu/GrOpFlushState.h b/src/gpu/GrOpFlushState.h
index 9b8baffcb2..01d84c8fea 100644
--- a/src/gpu/GrOpFlushState.h
+++ b/src/gpu/GrOpFlushState.h
@@ -10,7 +10,7 @@
 
 #include "GrBufferAllocPool.h"
 #include "GrGpu.h"
-#include "batches/GrMeshDrawOp.h"
+#include "ops/GrMeshDrawOp.h"
 
 class GrGpuCommandBuffer;
 class GrResourceProvider;
diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp
index ee31686a5c..c0cac80dff 100644
--- a/src/gpu/GrPathRendererChain.cpp
+++ b/src/gpu/GrPathRendererChain.cpp
@@ -14,16 +14,16 @@
 #include "GrContext.h"
 #include "GrGpu.h"
 
-#include "batches/GrAAConvexPathRenderer.h"
-#include "batches/GrAADistanceFieldPathRenderer.h"
-#include "batches/GrAAHairLinePathRenderer.h"
-#include "batches/GrAALinearizingConvexPathRenderer.h"
-#include "batches/GrDashLinePathRenderer.h"
-#include "batches/GrDefaultPathRenderer.h"
-#include "batches/GrMSAAPathRenderer.h"
-#include "batches/GrPLSPathRenderer.h"
-#include "batches/GrStencilAndCoverPathRenderer.h"
-#include "batches/GrTessellatingPathRenderer.h"
+#include "ops/GrAAConvexPathRenderer.h"
+#include "ops/GrAADistanceFieldPathRenderer.h"
+#include "ops/GrAAHairLinePathRenderer.h"
+#include "ops/GrAALinearizingConvexPathRenderer.h"
+#include "ops/GrDashLinePathRenderer.h"
+#include "ops/GrDefaultPathRenderer.h"
+#include "ops/GrMSAAPathRenderer.h"
+#include "ops/GrPLSPathRenderer.h"
+#include "ops/GrStencilAndCoverPathRenderer.h"
+#include "ops/GrTessellatingPathRenderer.h"
 
 GrPathRendererChain::GrPathRendererChain(GrContext* context, const Options& options) {
     if (!options.fDisableAllPathRenderers) {
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index 0e4cac5ac1..13ff2b084b 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -16,7 +16,7 @@
 #include "GrRenderTargetPriv.h"
 #include "GrXferProcessor.h"
 
-#include "batches/GrOp.h"
+#include "ops/GrOp.h"
 
 GrPipeline* GrPipeline::CreateAt(void* memory, const CreateArgs& args,
                                  GrXPOverridesForBatch* overrides) {
diff --git a/src/gpu/GrPipelineBuilder.cpp b/src/gpu/GrPipelineBuilder.cpp
index 6a0dd1992e..dd8b2e926f 100644
--- a/src/gpu/GrPipelineBuilder.cpp
+++ b/src/gpu/GrPipelineBuilder.cpp
@@ -12,8 +12,8 @@
 #include "GrPipeline.h"
 #include "GrProcOptInfo.h"
 #include "GrXferProcessor.h"
-#include "batches/GrOp.h"
 #include "effects/GrPorterDuffXferProcessor.h"
+#include "ops/GrOp.h"
 
 GrPipelineBuilder::GrPipelineBuilder(const GrPaint& paint, GrAAType aaType)
         : fFlags(0x0)
diff --git a/src/gpu/GrProcOptInfo.cpp b/src/gpu/GrProcOptInfo.cpp
index 76e13b60d7..fc0323220c 100644
--- a/src/gpu/GrProcOptInfo.cpp
+++ b/src/gpu/GrProcOptInfo.cpp
@@ -9,7 +9,7 @@
 
 #include "GrGeometryProcessor.h"
 
-#include "batches/GrDrawOp.h"
+#include "ops/GrDrawOp.h"
 
 void GrProcOptInfo::calcWithInitialValues(const GrFragmentProcessor * const processors[],
                                           int cnt,
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 7b15c31c40..60a213fd47 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -19,15 +19,15 @@
 #include "GrResourceProvider.h"
 #include "SkSurfacePriv.h"
 
-#include "batches/GrClearOp.h"
-#include "batches/GrDrawAtlasOp.h"
-#include "batches/GrDrawVerticesOp.h"
-#include "batches/GrLatticeOp.h"
-#include "batches/GrOp.h"
-#include "batches/GrOvalOpFactory.h"
-#include "batches/GrRectOpFactory.h"
-#include "batches/GrRegionOp.h"
-#include "batches/GrShadowRRectOp.h"
+#include "ops/GrClearOp.h"
+#include "ops/GrDrawAtlasOp.h"
+#include "ops/GrDrawVerticesOp.h"
+#include "ops/GrLatticeOp.h"
+#include "ops/GrOp.h"
+#include "ops/GrOvalOpFactory.h"
+#include "ops/GrRectOpFactory.h"
+#include "ops/GrRegionOp.h"
+#include "ops/GrShadowRRectOp.h"
 
 #include "effects/GrRRectEffect.h"
 
diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp
index 61d341e0ab..79fed4a28a 100644
--- a/src/gpu/GrRenderTargetOpList.cpp
+++ b/src/gpu/GrRenderTargetOpList.cpp
@@ -27,14 +27,14 @@
 
 #include "SkStrokeRec.h"
 
-#include "batches/GrClearOp.h"
-#include "batches/GrClearStencilClipOp.h"
-#include "batches/GrCopySurfaceOp.h"
-#include "batches/GrDiscardOp.h"
-#include "batches/GrDrawOp.h"
-#include "batches/GrDrawPathOp.h"
-#include "batches/GrRectOpFactory.h"
-#include "batches/GrStencilPathOp.h"
+#include "ops/GrClearOp.h"
+#include "ops/GrClearStencilClipOp.h"
+#include "ops/GrCopySurfaceOp.h"
+#include "ops/GrDiscardOp.h"
+#include "ops/GrDrawOp.h"
+#include "ops/GrDrawPathOp.h"
+#include "ops/GrRectOpFactory.h"
+#include "ops/GrStencilPathOp.h"
 
 #include "instanced/InstancedRendering.h"
 
diff --git a/src/gpu/GrRenderTargetOpList.h b/src/gpu/GrRenderTargetOpList.h
index 41d5d23dfd..5b2e5e1098 100644
--- a/src/gpu/GrRenderTargetOpList.h
+++ b/src/gpu/GrRenderTargetOpList.h
@@ -16,7 +16,7 @@
 #include "GrPathRendering.h"
 #include "GrXferProcessor.h"
 
-#include "batches/GrDrawOp.h"
+#include "ops/GrDrawOp.h"
 
 #include "SkClipStack.h"
 #include "SkMatrix.h"
diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp
index caa244860b..be56ad5266 100644
--- a/src/gpu/GrSWMaskHelper.cpp
+++ b/src/gpu/GrSWMaskHelper.cpp
@@ -10,16 +10,16 @@
 #include "GrCaps.h"
 #include "GrContext.h"
 #include "GrContextPriv.h"
-#include "batches/GrDrawOp.h"
-#include "GrRenderTargetContext.h"
 #include "GrPipelineBuilder.h"
+#include "GrRenderTargetContext.h"
 #include "GrShape.h"
 #include "GrSurfaceContext.h"
 #include "GrTextureProxy.h"
+#include "ops/GrDrawOp.h"
 
 #include "SkDistanceFieldGen.h"
 
-#include "batches/GrRectOpFactory.h"
+#include "ops/GrRectOpFactory.h"
 
 /*
  * Convert a boolean operation into a transfer mode code
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index dac88d4d68..86fb5ea837 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -13,7 +13,7 @@
 #include "GrSWMaskHelper.h"
 #include "GrSurfaceContextPriv.h"
 #include "GrTextureProvider.h"
-#include "batches/GrRectOpFactory.h"
+#include "ops/GrRectOpFactory.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 bool GrSoftwarePathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
diff --git a/src/gpu/GrTextureOpList.cpp b/src/gpu/GrTextureOpList.cpp
index 454f498041..c7d80c0d95 100644
--- a/src/gpu/GrTextureOpList.cpp
+++ b/src/gpu/GrTextureOpList.cpp
@@ -11,7 +11,7 @@
 #include "GrGpu.h"
 #include "GrTextureProxy.h"
 
-#include "batches/GrCopySurfaceOp.h"
+#include "ops/GrCopySurfaceOp.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/gpu/instanced/InstancedRendering.h b/src/gpu/instanced/InstancedRendering.h
index 078e52cee3..a50df5768f 100644
--- a/src/gpu/instanced/InstancedRendering.h
+++ b/src/gpu/instanced/InstancedRendering.h
@@ -8,12 +8,12 @@
 #ifndef gr_instanced_InstancedRendering_DEFINED
 #define gr_instanced_InstancedRendering_DEFINED
 
+#include "../private/GrInstancedPipelineInfo.h"
 #include "GrGpu.h"
 #include "GrMemoryPool.h"
 #include "SkTInternalLList.h"
-#include "batches/GrDrawOp.h"
 #include "instanced/InstancedRenderingTypes.h"
-#include "../private/GrInstancedPipelineInfo.h"
+#include "ops/GrDrawOp.h"
 
 class GrResourceProvider;
 
@@ -23,8 +23,8 @@ class InstanceProcessor;
 
 /**
  * This class serves as a centralized clearinghouse for instanced rendering. It accumulates data for
- * instanced draws into one location, and creates special ops that pull from this data. The nature
- * of instanced rendering allows these ops to combine well and render efficiently.
+ * instanced draws into one location, and creates special ops that pull from this data. The
+ * nature of instanced rendering allows these ops to combine well and render efficiently.
  *
  * During a flush, this class assembles the accumulated draw data into a single vertex and texel
  * buffer, and its subclass draws the ops using backend-specific instanced rendering APIs.
diff --git a/src/gpu/batches/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp
index f8282b6a71..40f4284b31 100644
--- a/src/gpu/batches/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp
@@ -22,13 +22,13 @@
 #include "SkPathPriv.h"
 #include "SkString.h"
 #include "SkTraceEvent.h"
-#include "batches/GrMeshDrawOp.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
 #include "glsl/GrGLSLGeometryProcessor.h"
 #include "glsl/GrGLSLProgramDataManager.h"
 #include "glsl/GrGLSLUniformHandler.h"
 #include "glsl/GrGLSLVarying.h"
 #include "glsl/GrGLSLVertexShaderBuilder.h"
+#include "ops/GrMeshDrawOp.h"
 
 GrAAConvexPathRenderer::GrAAConvexPathRenderer() {
 }
diff --git a/src/gpu/batches/GrAAConvexPathRenderer.h b/src/gpu/ops/GrAAConvexPathRenderer.h
index 420ca60139..420ca60139 100644
--- a/src/gpu/batches/GrAAConvexPathRenderer.h
+++ b/src/gpu/ops/GrAAConvexPathRenderer.h
diff --git a/src/gpu/batches/GrAAConvexTessellator.cpp b/src/gpu/ops/GrAAConvexTessellator.cpp
index b9c44ff9b7..b9c44ff9b7 100644
--- a/src/gpu/batches/GrAAConvexTessellator.cpp
+++ b/src/gpu/ops/GrAAConvexTessellator.cpp
diff --git a/src/gpu/batches/GrAAConvexTessellator.h b/src/gpu/ops/GrAAConvexTessellator.h
index 2fdde10324..2fdde10324 100644
--- a/src/gpu/batches/GrAAConvexTessellator.h
+++ b/src/gpu/ops/GrAAConvexTessellator.h
diff --git a/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp b/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp
index 569c2cd7ce..4daa48f039 100644
--- a/src/gpu/batches/GrAADistanceFieldPathRenderer.cpp
+++ b/src/gpu/ops/GrAADistanceFieldPathRenderer.cpp
@@ -16,8 +16,8 @@
 #include "GrSWMaskHelper.h"
 #include "GrSurfacePriv.h"
 #include "GrTexturePriv.h"
-#include "batches/GrMeshDrawOp.h"
 #include "effects/GrDistanceFieldGeoProc.h"
+#include "ops/GrMeshDrawOp.h"
 
 #include "SkDistanceFieldGen.h"
 
diff --git a/src/gpu/batches/GrAADistanceFieldPathRenderer.h b/src/gpu/ops/GrAADistanceFieldPathRenderer.h
index 37c6099db3..37c6099db3 100644
--- a/src/gpu/batches/GrAADistanceFieldPathRenderer.h
+++ b/src/gpu/ops/GrAADistanceFieldPathRenderer.h
diff --git a/src/gpu/batches/GrAAFillRectOp.cpp b/src/gpu/ops/GrAAFillRectOp.cpp
index 9f7b0e0205..9f7b0e0205 100644
--- a/src/gpu/batches/GrAAFillRectOp.cpp
+++ b/src/gpu/ops/GrAAFillRectOp.cpp
diff --git a/src/gpu/batches/GrAAFillRectOp.h b/src/gpu/ops/GrAAFillRectOp.h
index b611ff98f8..b611ff98f8 100644
--- a/src/gpu/batches/GrAAFillRectOp.h
+++ b/src/gpu/ops/GrAAFillRectOp.h
diff --git a/src/gpu/batches/GrAAHairLinePathRenderer.cpp b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
index 16fc63e500..7707afa6e2 100644
--- a/src/gpu/batches/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.cpp
@@ -21,7 +21,7 @@
 #include "SkStroke.h"
 #include "SkTemplates.h"
 
-#include "batches/GrMeshDrawOp.h"
+#include "ops/GrMeshDrawOp.h"
 
 #include "effects/GrBezierEffect.h"
 
diff --git a/src/gpu/batches/GrAAHairLinePathRenderer.h b/src/gpu/ops/GrAAHairLinePathRenderer.h
index e2406a5c01..e2406a5c01 100644
--- a/src/gpu/batches/GrAAHairLinePathRenderer.h
+++ b/src/gpu/ops/GrAAHairLinePathRenderer.h
diff --git a/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
index c8c5885915..c2473535f7 100644
--- a/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.cpp
@@ -22,8 +22,8 @@
 #include "SkPathPriv.h"
 #include "SkString.h"
 #include "SkTraceEvent.h"
-#include "batches/GrMeshDrawOp.h"
 #include "glsl/GrGLSLGeometryProcessor.h"
+#include "ops/GrMeshDrawOp.h"
 
 static const int DEFAULT_BUFFER_SIZE = 100;
 
diff --git a/src/gpu/batches/GrAALinearizingConvexPathRenderer.h b/src/gpu/ops/GrAALinearizingConvexPathRenderer.h
index afee5db4d4..afee5db4d4 100644
--- a/src/gpu/batches/GrAALinearizingConvexPathRenderer.h
+++ b/src/gpu/ops/GrAALinearizingConvexPathRenderer.h
diff --git a/src/gpu/batches/GrAAStrokeRectOp.cpp b/src/gpu/ops/GrAAStrokeRectOp.cpp
index 2b68636dee..2b68636dee 100644
--- a/src/gpu/batches/GrAAStrokeRectOp.cpp
+++ b/src/gpu/ops/GrAAStrokeRectOp.cpp
diff --git a/src/gpu/batches/GrAAStrokeRectOp.h b/src/gpu/ops/GrAAStrokeRectOp.h
index fe8f55c00a..fe8f55c00a 100644
--- a/src/gpu/batches/GrAAStrokeRectOp.h
+++ b/src/gpu/ops/GrAAStrokeRectOp.h
diff --git a/src/gpu/batches/GrAnalyticRectOp.cpp b/src/gpu/ops/GrAnalyticRectOp.cpp
index c71fb58ea8..63e15482b2 100644
--- a/src/gpu/batches/GrAnalyticRectOp.cpp
+++ b/src/gpu/ops/GrAnalyticRectOp.cpp
@@ -15,7 +15,6 @@
 #include "GrResourceProvider.h"
 #include "SkRRect.h"
 #include "SkStrokeRec.h"
-#include "batches/GrMeshDrawOp.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
 #include "glsl/GrGLSLGeometryProcessor.h"
 #include "glsl/GrGLSLProgramDataManager.h"
@@ -23,6 +22,7 @@
 #include "glsl/GrGLSLUtil.h"
 #include "glsl/GrGLSLVarying.h"
 #include "glsl/GrGLSLVertexShaderBuilder.h"
+#include "ops/GrMeshDrawOp.h"
 
 namespace {
 
diff --git a/src/gpu/batches/GrAnalyticRectOp.h b/src/gpu/ops/GrAnalyticRectOp.h
index 77d17ed7c7..77d17ed7c7 100644
--- a/src/gpu/batches/GrAnalyticRectOp.h
+++ b/src/gpu/ops/GrAnalyticRectOp.h
diff --git a/src/gpu/batches/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index d576789e26..d576789e26 100644
--- a/src/gpu/batches/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
diff --git a/src/gpu/batches/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index 6cb269c099..6bb0474f0f 100644
--- a/src/gpu/batches/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@@ -8,7 +8,7 @@
 #ifndef GrAtlasTextOp_DEFINED
 #define GrAtlasTextOp_DEFINED
 
-#include "batches/GrMeshDrawOp.h"
+#include "ops/GrMeshDrawOp.h"
 
 #include "text/GrAtlasTextContext.h"
 #include "text/GrDistanceFieldAdjustTable.h"
diff --git a/src/gpu/batches/GrClearOp.h b/src/gpu/ops/GrClearOp.h
index f2baefd697..f2baefd697 100644
--- a/src/gpu/batches/GrClearOp.h
+++ b/src/gpu/ops/GrClearOp.h
diff --git a/src/gpu/batches/GrClearStencilClipOp.h b/src/gpu/ops/GrClearStencilClipOp.h
index 1d3b4b1281..1d3b4b1281 100644
--- a/src/gpu/batches/GrClearStencilClipOp.h
+++ b/src/gpu/ops/GrClearStencilClipOp.h
diff --git a/src/gpu/batches/GrCopySurfaceOp.cpp b/src/gpu/ops/GrCopySurfaceOp.cpp
index 3283517efe..3283517efe 100644
--- a/src/gpu/batches/GrCopySurfaceOp.cpp
+++ b/src/gpu/ops/GrCopySurfaceOp.cpp
diff --git a/src/gpu/batches/GrCopySurfaceOp.h b/src/gpu/ops/GrCopySurfaceOp.h
index 77b4009b37..77b4009b37 100644
--- a/src/gpu/batches/GrCopySurfaceOp.h
+++ b/src/gpu/ops/GrCopySurfaceOp.h
diff --git a/src/gpu/batches/GrDashLinePathRenderer.cpp b/src/gpu/ops/GrDashLinePathRenderer.cpp
index 94bf26c7a3..10e4342224 100644
--- a/src/gpu/batches/GrDashLinePathRenderer.cpp
+++ b/src/gpu/ops/GrDashLinePathRenderer.cpp
@@ -10,7 +10,7 @@
 #include "GrAuditTrail.h"
 #include "GrGpu.h"
 #include "GrPipelineBuilder.h"
-#include "batches/GrDashOp.h"
+#include "ops/GrDashOp.h"
 
 bool GrDashLinePathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
     SkPoint pts[2];
diff --git a/src/gpu/batches/GrDashLinePathRenderer.h b/src/gpu/ops/GrDashLinePathRenderer.h
index 482c1a024e..482c1a024e 100644
--- a/src/gpu/batches/GrDashLinePathRenderer.h
+++ b/src/gpu/ops/GrDashLinePathRenderer.h
diff --git a/src/gpu/batches/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index 266cf4a880..92184825ac 100644
--- a/src/gpu/batches/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -18,13 +18,13 @@
 #include "GrProcessor.h"
 #include "GrStyle.h"
 #include "SkGr.h"
-#include "batches/GrMeshDrawOp.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
 #include "glsl/GrGLSLGeometryProcessor.h"
 #include "glsl/GrGLSLProgramDataManager.h"
 #include "glsl/GrGLSLUniformHandler.h"
 #include "glsl/GrGLSLVarying.h"
 #include "glsl/GrGLSLVertexShaderBuilder.h"
+#include "ops/GrMeshDrawOp.h"
 
 using AAMode = GrDashOp::AAMode;
 
diff --git a/src/gpu/batches/GrDashOp.h b/src/gpu/ops/GrDashOp.h
index 56e2ba8f8b..56e2ba8f8b 100644
--- a/src/gpu/batches/GrDashOp.h
+++ b/src/gpu/ops/GrDashOp.h
diff --git a/src/gpu/batches/GrDefaultPathRenderer.cpp b/src/gpu/ops/GrDefaultPathRenderer.cpp
index a5955adfc8..b979d9171d 100644
--- a/src/gpu/batches/GrDefaultPathRenderer.cpp
+++ b/src/gpu/ops/GrDefaultPathRenderer.cpp
@@ -21,8 +21,8 @@
 #include "SkTLazy.h"
 #include "SkTraceEvent.h"
 
-#include "batches/GrMeshDrawOp.h"
-#include "batches/GrRectOpFactory.h"
+#include "ops/GrMeshDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 
 GrDefaultPathRenderer::GrDefaultPathRenderer(bool separateStencilSupport,
                                              bool stencilWrapOpsSupport)
diff --git a/src/gpu/batches/GrDefaultPathRenderer.h b/src/gpu/ops/GrDefaultPathRenderer.h
index 8e192478b1..8e192478b1 100644
--- a/src/gpu/batches/GrDefaultPathRenderer.h
+++ b/src/gpu/ops/GrDefaultPathRenderer.h
diff --git a/src/gpu/batches/GrDiscardOp.h b/src/gpu/ops/GrDiscardOp.h
index b97879097c..b97879097c 100644
--- a/src/gpu/batches/GrDiscardOp.h
+++ b/src/gpu/ops/GrDiscardOp.h
diff --git a/src/gpu/batches/GrDrawAtlasOp.cpp b/src/gpu/ops/GrDrawAtlasOp.cpp
index 3dafbda732..3dafbda732 100644
--- a/src/gpu/batches/GrDrawAtlasOp.cpp
+++ b/src/gpu/ops/GrDrawAtlasOp.cpp
diff --git a/src/gpu/batches/GrDrawAtlasOp.h b/src/gpu/ops/GrDrawAtlasOp.h
index 9913ec2906..9913ec2906 100644
--- a/src/gpu/batches/GrDrawAtlasOp.h
+++ b/src/gpu/ops/GrDrawAtlasOp.h
diff --git a/src/gpu/batches/GrDrawOp.cpp b/src/gpu/ops/GrDrawOp.cpp
index 3abf2ceba1..3abf2ceba1 100644
--- a/src/gpu/batches/GrDrawOp.cpp
+++ b/src/gpu/ops/GrDrawOp.cpp
diff --git a/src/gpu/batches/GrDrawOp.h b/src/gpu/ops/GrDrawOp.h
index 7606b0c27c..7606b0c27c 100644
--- a/src/gpu/batches/GrDrawOp.h
+++ b/src/gpu/ops/GrDrawOp.h
diff --git a/src/gpu/batches/GrDrawPathOp.cpp b/src/gpu/ops/GrDrawPathOp.cpp
index 43e1c38b88..43e1c38b88 100644
--- a/src/gpu/batches/GrDrawPathOp.cpp
+++ b/src/gpu/ops/GrDrawPathOp.cpp
diff --git a/src/gpu/batches/GrDrawPathOp.h b/src/gpu/ops/GrDrawPathOp.h
index f85e6fd13d..f85e6fd13d 100644
--- a/src/gpu/batches/GrDrawPathOp.h
+++ b/src/gpu/ops/GrDrawPathOp.h
diff --git a/src/gpu/batches/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index 37be6d0d17..37be6d0d17 100644
--- a/src/gpu/batches/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
diff --git a/src/gpu/batches/GrDrawVerticesOp.h b/src/gpu/ops/GrDrawVerticesOp.h
index 7cbf24f951..7cbf24f951 100644
--- a/src/gpu/batches/GrDrawVerticesOp.h
+++ b/src/gpu/ops/GrDrawVerticesOp.h
diff --git a/src/gpu/batches/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index 119032209d..119032209d 100644
--- a/src/gpu/batches/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
diff --git a/src/gpu/batches/GrLatticeOp.h b/src/gpu/ops/GrLatticeOp.h
index 2908461a29..2908461a29 100644
--- a/src/gpu/batches/GrLatticeOp.h
+++ b/src/gpu/ops/GrLatticeOp.h
diff --git a/src/gpu/batches/GrMSAAPathRenderer.cpp b/src/gpu/ops/GrMSAAPathRenderer.cpp
index 19ddc910a3..c77c8e7fa4 100644
--- a/src/gpu/batches/GrMSAAPathRenderer.cpp
+++ b/src/gpu/ops/GrMSAAPathRenderer.cpp
@@ -18,14 +18,14 @@
 #include "GrPipelineBuilder.h"
 #include "SkGeometry.h"
 #include "SkTraceEvent.h"
-#include "batches/GrMeshDrawOp.h"
-#include "batches/GrRectOpFactory.h"
 #include "gl/GrGLVaryingHandler.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
 #include "glsl/GrGLSLGeometryProcessor.h"
 #include "glsl/GrGLSLProgramDataManager.h"
 #include "glsl/GrGLSLUtil.h"
 #include "glsl/GrGLSLVertexShaderBuilder.h"
+#include "ops/GrMeshDrawOp.h"
+#include "ops/GrRectOpFactory.h"
 
 static const float kTolerance = 0.5f;
 
diff --git a/src/gpu/batches/GrMSAAPathRenderer.h b/src/gpu/ops/GrMSAAPathRenderer.h
index a112c6253b..a112c6253b 100644
--- a/src/gpu/batches/GrMSAAPathRenderer.h
+++ b/src/gpu/ops/GrMSAAPathRenderer.h
diff --git a/src/gpu/batches/GrMeshDrawOp.cpp b/src/gpu/ops/GrMeshDrawOp.cpp
index 5f132eeccc..5f132eeccc 100644
--- a/src/gpu/batches/GrMeshDrawOp.cpp
+++ b/src/gpu/ops/GrMeshDrawOp.cpp
diff --git a/src/gpu/batches/GrMeshDrawOp.h b/src/gpu/ops/GrMeshDrawOp.h
index 6100166126..6100166126 100644
--- a/src/gpu/batches/GrMeshDrawOp.h
+++ b/src/gpu/ops/GrMeshDrawOp.h
diff --git a/src/gpu/batches/GrNonAAFillRectOp.cpp b/src/gpu/ops/GrNonAAFillRectOp.cpp
index de000e2ce7..de000e2ce7 100644
--- a/src/gpu/batches/GrNonAAFillRectOp.cpp
+++ b/src/gpu/ops/GrNonAAFillRectOp.cpp
diff --git a/src/gpu/batches/GrNonAAFillRectOp.h b/src/gpu/ops/GrNonAAFillRectOp.h
index 3d983e15f1..3d983e15f1 100644
--- a/src/gpu/batches/GrNonAAFillRectOp.h
+++ b/src/gpu/ops/GrNonAAFillRectOp.h
diff --git a/src/gpu/batches/GrNonAAFillRectPerspectiveOp.cpp b/src/gpu/ops/GrNonAAFillRectPerspectiveOp.cpp
index 443c511ec4..443c511ec4 100644
--- a/src/gpu/batches/GrNonAAFillRectPerspectiveOp.cpp
+++ b/src/gpu/ops/GrNonAAFillRectPerspectiveOp.cpp
diff --git a/src/gpu/batches/GrNonAAStrokeRectOp.cpp b/src/gpu/ops/GrNonAAStrokeRectOp.cpp
index b74cd502c8..b74cd502c8 100644
--- a/src/gpu/batches/GrNonAAStrokeRectOp.cpp
+++ b/src/gpu/ops/GrNonAAStrokeRectOp.cpp
diff --git a/src/gpu/batches/GrNonAAStrokeRectOp.h b/src/gpu/ops/GrNonAAStrokeRectOp.h
index 1e067fa9ea..1e067fa9ea 100644
--- a/src/gpu/batches/GrNonAAStrokeRectOp.h
+++ b/src/gpu/ops/GrNonAAStrokeRectOp.h
diff --git a/src/gpu/batches/GrOp.cpp b/src/gpu/ops/GrOp.cpp
index 1d86419c77..1d86419c77 100644
--- a/src/gpu/batches/GrOp.cpp
+++ b/src/gpu/ops/GrOp.cpp
diff --git a/src/gpu/batches/GrOp.h b/src/gpu/ops/GrOp.h
index 827e58e77f..827e58e77f 100644
--- a/src/gpu/batches/GrOp.h
+++ b/src/gpu/ops/GrOp.h
diff --git a/src/gpu/batches/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index ca38bf2232..b4213ea9a4 100644
--- a/src/gpu/batches/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -17,7 +17,6 @@
 #include "GrStyle.h"
 #include "SkRRect.h"
 #include "SkStrokeRec.h"
-#include "batches/GrMeshDrawOp.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
 #include "glsl/GrGLSLGeometryProcessor.h"
 #include "glsl/GrGLSLProgramDataManager.h"
@@ -25,6 +24,7 @@
 #include "glsl/GrGLSLUtil.h"
 #include "glsl/GrGLSLVarying.h"
 #include "glsl/GrGLSLVertexShaderBuilder.h"
+#include "ops/GrMeshDrawOp.h"
 
 // TODO(joshualitt) - Break this file up during GrOp post implementation cleanup
 
diff --git a/src/gpu/batches/GrOvalOpFactory.h b/src/gpu/ops/GrOvalOpFactory.h
index dfe7ebf37f..dfe7ebf37f 100644
--- a/src/gpu/batches/GrOvalOpFactory.h
+++ b/src/gpu/ops/GrOvalOpFactory.h
diff --git a/src/gpu/batches/GrPLSPathRenderer.cpp b/src/gpu/ops/GrPLSPathRenderer.cpp
index d6f3574ca2..38b3075698 100644
--- a/src/gpu/batches/GrPLSPathRenderer.cpp
+++ b/src/gpu/ops/GrPLSPathRenderer.cpp
@@ -25,10 +25,10 @@
 #include "SkString.h"
 #include "SkTSort.h"
 #include "SkTraceEvent.h"
-#include "batches/GrMeshDrawOp.h"
 #include "gl/builders/GrGLProgramBuilder.h"
 #include "glsl/GrGLSLGeometryProcessor.h"
 #include "glsl/GrGLSLPLSPathRendering.h"
+#include "ops/GrMeshDrawOp.h"
 
 GrPLSPathRenderer::GrPLSPathRenderer() {
 }
diff --git a/src/gpu/batches/GrPLSPathRenderer.h b/src/gpu/ops/GrPLSPathRenderer.h
index 39f21ba68c..39f21ba68c 100644
--- a/src/gpu/batches/GrPLSPathRenderer.h
+++ b/src/gpu/ops/GrPLSPathRenderer.h
diff --git a/src/gpu/batches/GrPathStencilSettings.h b/src/gpu/ops/GrPathStencilSettings.h
index f37d1b2f18..f37d1b2f18 100644
--- a/src/gpu/batches/GrPathStencilSettings.h
+++ b/src/gpu/ops/GrPathStencilSettings.h
diff --git a/src/gpu/batches/GrRectOpFactory.cpp b/src/gpu/ops/GrRectOpFactory.cpp
index fd73624254..fd73624254 100644
--- a/src/gpu/batches/GrRectOpFactory.cpp
+++ b/src/gpu/ops/GrRectOpFactory.cpp
diff --git a/src/gpu/batches/GrRectOpFactory.h b/src/gpu/ops/GrRectOpFactory.h
index 6a54f96c92..8d06cda19c 100644
--- a/src/gpu/batches/GrRectOpFactory.h
+++ b/src/gpu/ops/GrRectOpFactory.h
@@ -17,7 +17,7 @@
 #include "GrPaint.h"
 #include "SkMatrix.h"
 #include "SkRefCnt.h"
-#include "batches/GrDrawOp.h"
+#include "ops/GrDrawOp.h"
 
 struct SkRect;
 class SkStrokeRec;
diff --git a/src/gpu/batches/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp
index e98bbf0261..e98bbf0261 100644
--- a/src/gpu/batches/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
diff --git a/src/gpu/batches/GrRegionOp.h b/src/gpu/ops/GrRegionOp.h
index 24230604ba..24230604ba 100644
--- a/src/gpu/batches/GrRegionOp.h
+++ b/src/gpu/ops/GrRegionOp.h
diff --git a/src/gpu/batches/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp
index e099edb000..e099edb000 100755
--- a/src/gpu/batches/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
diff --git a/src/gpu/batches/GrShadowRRectOp.h b/src/gpu/ops/GrShadowRRectOp.h
index 3508cb8fab..3508cb8fab 100755
--- a/src/gpu/batches/GrShadowRRectOp.h
+++ b/src/gpu/ops/GrShadowRRectOp.h
diff --git a/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp b/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
index c6d4ef9455..16765e0bac 100644
--- a/src/gpu/batches/GrStencilAndCoverPathRenderer.cpp
+++ b/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
@@ -18,7 +18,7 @@
 #include "GrResourceProvider.h"
 #include "GrStencilPathOp.h"
 #include "GrStyle.h"
-#include "batches/GrRectOpFactory.h"
+#include "ops/GrRectOpFactory.h"
 
 GrPathRenderer* GrStencilAndCoverPathRenderer::Create(GrResourceProvider* resourceProvider,
                                                       const GrCaps& caps) {
diff --git a/src/gpu/batches/GrStencilAndCoverPathRenderer.h b/src/gpu/ops/GrStencilAndCoverPathRenderer.h
index c896e61545..c896e61545 100644
--- a/src/gpu/batches/GrStencilAndCoverPathRenderer.h
+++ b/src/gpu/ops/GrStencilAndCoverPathRenderer.h
diff --git a/src/gpu/batches/GrStencilPathOp.h b/src/gpu/ops/GrStencilPathOp.h
index 364dc64bd1..364dc64bd1 100644
--- a/src/gpu/batches/GrStencilPathOp.h
+++ b/src/gpu/ops/GrStencilPathOp.h
diff --git a/src/gpu/batches/GrTessellatingPathRenderer.cpp b/src/gpu/ops/GrTessellatingPathRenderer.cpp
index faca060580..5f6eb581e3 100644
--- a/src/gpu/batches/GrTessellatingPathRenderer.cpp
+++ b/src/gpu/ops/GrTessellatingPathRenderer.cpp
@@ -20,7 +20,7 @@
 #include "GrTessellator.h"
 #include "SkGeometry.h"
 
-#include "batches/GrMeshDrawOp.h"
+#include "ops/GrMeshDrawOp.h"
 
 #include <stdio.h>
 
diff --git a/src/gpu/batches/GrTessellatingPathRenderer.h b/src/gpu/ops/GrTessellatingPathRenderer.h
index d5f2c7af9b..d5f2c7af9b 100644
--- a/src/gpu/batches/GrTessellatingPathRenderer.h
+++ b/src/gpu/ops/GrTessellatingPathRenderer.h
diff --git a/src/gpu/batches/GrTestMeshDrawOp.h b/src/gpu/ops/GrTestMeshDrawOp.h
index 414c74a9c2..65ee727bc5 100644
--- a/src/gpu/batches/GrTestMeshDrawOp.h
+++ b/src/gpu/ops/GrTestMeshDrawOp.h
@@ -11,7 +11,7 @@
 #include "GrGeometryProcessor.h"
 #include "GrOpFlushState.h"
 
-#include "batches/GrMeshDrawOp.h"
+#include "ops/GrMeshDrawOp.h"
 
 /*
  * A simple solid color batch only for testing purposes which actually doesn't batch at all. It
diff --git a/src/gpu/text/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp
index f2f031238b..1420ad0d01 100644
--- a/src/gpu/text/GrAtlasTextBlob.cpp
+++ b/src/gpu/text/GrAtlasTextBlob.cpp
@@ -16,7 +16,7 @@
 #include "SkDrawFilter.h"
 #include "SkGlyphCache.h"
 #include "SkTextBlobRunIterator.h"
-#include "batches/GrAtlasTextOp.h"
+#include "ops/GrAtlasTextOp.h"
 
 GrAtlasTextBlob* GrAtlasTextBlob::Create(GrMemoryPool* pool, int glyphCount, int runCount) {
     // We allocate size for the GrAtlasTextBlob itself, plus size for the vertices array,
diff --git a/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp b/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp
index d1c47367d4..88321b9536 100644
--- a/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp
+++ b/src/gpu/text/GrAtlasTextBlob_regenInBatch.cpp
@@ -13,7 +13,7 @@
 #include "SkDistanceFieldGen.h"
 #include "SkGlyphCache.h"
 
-#include "batches/GrAtlasTextOp.h"
+#include "ops/GrAtlasTextOp.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // A large template to handle regenerating the vertices of a textblob with as few branches as
diff --git a/src/gpu/text/GrStencilAndCoverTextContext.cpp b/src/gpu/text/GrStencilAndCoverTextContext.cpp
index 44ab9765a1..ed77e5cb3d 100644
--- a/src/gpu/text/GrStencilAndCoverTextContext.cpp
+++ b/src/gpu/text/GrStencilAndCoverTextContext.cpp
@@ -25,7 +25,7 @@
 #include "SkTextMapStateProc.h"
 #include "SkTextFormatParams.h"
 
-#include "batches/GrDrawPathOp.h"
+#include "ops/GrDrawPathOp.h"
 
 template<typename Key, typename Val> static void delete_hash_map_entry(const Key&, Val* val) {
     SkASSERT(*val);
diff --git a/src/gpu/text/GrStencilAndCoverTextContext.h b/src/gpu/text/GrStencilAndCoverTextContext.h
index 0edac25617..719d338f30 100644
--- a/src/gpu/text/GrStencilAndCoverTextContext.h
+++ b/src/gpu/text/GrStencilAndCoverTextContext.h
@@ -16,7 +16,7 @@
 #include "SkTInternalLList.h"
 #include "SkTLList.h"
 #include "SkTextBlob.h"
-#include "batches/GrDrawPathOp.h"
+#include "ops/GrDrawPathOp.h"
 
 class GrAtlasTextContext;
 class GrTextStrike;
diff --git a/tests/DFPathRendererTest.cpp b/tests/DFPathRendererTest.cpp
index e473434bf4..c499c081e0 100644
--- a/tests/DFPathRendererTest.cpp
+++ b/tests/DFPathRendererTest.cpp
@@ -10,8 +10,8 @@
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrTest.h"
-#include "batches/GrAADistanceFieldPathRenderer.h"
 #include "SkPath.h"
+#include "ops/GrAADistanceFieldPathRenderer.h"
 
 // This test case including path coords and matrix taken from crbug.com/627443.
 // Because of inaccuracies in large floating point values this causes the
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 3335237a17..3e47dd7dad 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -26,7 +26,7 @@
 #include "SkRandom.h"
 #include "Test.h"
 
-#include "batches/GrDrawOp.h"
+#include "ops/GrDrawOp.h"
 
 #include "effects/GrConfigConversionEffect.h"
 #include "effects/GrPorterDuffXferProcessor.h"
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
index 27573b0b42..e568e50e04 100644
--- a/tests/GrPorterDuffTest.cpp
+++ b/tests/GrPorterDuffTest.cpp
@@ -14,9 +14,9 @@
 #include "GrGpu.h"
 #include "GrResourceProvider.h"
 #include "GrXferProcessor.h"
-#include "batches/GrMeshDrawOp.h"
 #include "effects/GrPorterDuffXferProcessor.h"
 #include "gl/GrGLCaps.h"
+#include "ops/GrMeshDrawOp.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
index 63740b45bb..875c1a6e65 100644
--- a/tests/PrimitiveProcessorTest.cpp
+++ b/tests/PrimitiveProcessorTest.cpp
@@ -11,18 +11,18 @@
 #include "Test.h"
 
 #if SK_SUPPORT_GPU
-#include "GrOpFlushState.h"
 #include "GrContext.h"
 #include "GrGeometryProcessor.h"
 #include "GrGpu.h"
+#include "GrOpFlushState.h"
 #include "GrRenderTargetContext.h"
 #include "GrRenderTargetContextPriv.h"
 #include "GrTextureProvider.h"
 #include "SkString.h"
-#include "batches/GrMeshDrawOp.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
 #include "glsl/GrGLSLGeometryProcessor.h"
 #include "glsl/GrGLSLVarying.h"
+#include "ops/GrMeshDrawOp.h"
 
 namespace {
 class Batch : public GrMeshDrawOp {
diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp
index 51b8c5eaf4..ccc24a4aa8 100644
--- a/tests/TessellatingPathRendererTests.cpp
+++ b/tests/TessellatingPathRendererTests.cpp
@@ -11,7 +11,7 @@
 #include "GrContext.h"
 #include "GrTest.h"
 #include "Test.h"
-#include "batches/GrTessellatingPathRenderer.h"
+#include "ops/GrTessellatingPathRenderer.h"
 
 /*
  * These tests pass by not crashing, hanging or asserting in Debug.