diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
--- a/mlir/lib/Analysis/CMakeLists.txt
+++ b/mlir/lib/Analysis/CMakeLists.txt
@@ -24,7 +24,7 @@
 
 target_link_libraries(MLIRAnalysis
   PUBLIC
-  MLIRAffine
+  MLIRAffineOps
   MLIRCallInterfaces
   MLIRControlFlowInterfaces
   MLIRInferTypeOpInterface
@@ -44,7 +44,7 @@
 
 target_link_libraries(MLIRLoopAnalysis
   PUBLIC
-  MLIRAffine
+  MLIRAffineOps
   MLIRCallInterfaces
   MLIRControlFlowInterfaces
   MLIRInferTypeOpInterface
diff --git a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
--- a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
+++ b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt
@@ -10,7 +10,7 @@
 target_link_libraries(
   MLIRAffineToStandard
   PUBLIC
-  MLIRAffine
+  MLIRAffineOps
   MLIRLoopOps
   MLIRPass
   MLIRStandardOps
diff --git a/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt b/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
--- a/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
+++ b/mlir/lib/Conversion/LoopsToGPU/CMakeLists.txt
@@ -10,7 +10,7 @@
 )
 target_link_libraries(MLIRLoopsToGPU
   PUBLIC
-  MLIRAffine
+  MLIRAffineOps
   MLIRAffineToStandard
   MLIRGPU
   MLIRIR
diff --git a/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt b/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt
--- a/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt
+++ b/mlir/lib/Conversion/VectorToLoops/CMakeLists.txt
@@ -6,6 +6,7 @@
 )
 set(LIBS
   MLIREDSC
+  MLIRAffineEDSC
   MLIRLLVMIR
   MLIRTransforms
   LLVMCore
diff --git a/mlir/lib/Dialect/Affine/CMakeLists.txt b/mlir/lib/Dialect/Affine/CMakeLists.txt
--- a/mlir/lib/Dialect/Affine/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/CMakeLists.txt
@@ -1,22 +1,4 @@
-add_mlir_dialect_library(MLIRAffine
-  IR/AffineOps.cpp
-  IR/AffineValueMap.cpp
-  EDSC/Builders.cpp
-
-  ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine
-
-  DEPENDS
-  MLIRAffineOpsIncGen
-  )
-target_link_libraries(MLIRAffine
-  PUBLIC
-  MLIREDSC
-  MLIRIR
-  MLIRLoopLikeInterface
-  MLIRSideEffects
-  MLIRStandardOps
-  )
-
+add_subdirectory(IR)
+add_subdirectory(EDSC)
 add_subdirectory(Transforms)
 add_subdirectory(Utils)
diff --git a/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt b/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt
--- a/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_mlir_dialect_library(MLIRAffine
-  EDSC/Builders.cpp
+add_mlir_dialect_library(MLIRAffineEDSC
+  Builders.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine
@@ -7,8 +7,9 @@
   DEPENDS
   MLIRAffineOpsIncGen
   )
-target_link_libraries(MLIRAffine
+target_link_libraries(MLIRAffineEDSC
   PUBLIC
+  MLIRAffineOps
   MLIREDSC
   MLIRIR
   MLIRLoopLikeInterface
diff --git a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt
--- a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRAffine
+add_mlir_dialect_library(MLIRAffineOps
   AffineOps.cpp
   AffineValueMap.cpp
 
@@ -8,7 +8,7 @@
   DEPENDS
   MLIRAffineOpsIncGen
   )
-target_link_libraries(MLIRAffine
+target_link_libraries(MLIRAffineOps
   PUBLIC
   MLIREDSC
   MLIRIR
diff --git a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
--- a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
@@ -17,7 +17,7 @@
   )
 target_link_libraries(MLIRAffineTransforms
   PUBLIC
-  MLIRAffine
+  MLIRAffineOps
   MLIREDSC
   MLIRIR
   MLIRPass
diff --git a/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt b/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt
--- a/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt
@@ -7,6 +7,6 @@
   )
 target_link_libraries(MLIRAffineUtils
   PUBLIC
-  MLIRAffine
+  MLIRAffineOps
   MLIRTransformUtils
   )
diff --git a/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt b/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
--- a/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt
@@ -12,7 +12,8 @@
   PUBLIC
   MLIREDSC
   MLIRIR
-  MLIRAffine
+  MLIRAffineOps
+  MLIRAffineEDSC
   MLIRLinalgOps
   MLIRLoopOps
   MLIRStandardOps
diff --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
--- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
@@ -15,7 +15,7 @@
   )
 target_link_libraries(MLIRLinalgTransforms
   PUBLIC
-  MLIRAffine
+  MLIRAffineOps
   MLIRAnalysis
   MLIREDSC
   MLIRIR
diff --git a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
--- a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt
@@ -9,7 +9,7 @@
 
 target_link_libraries(MLIRLinalgUtils
   PUBLIC
-  MLIRAffine
+  MLIRAffineOps
   MLIREDSC
   MLIRIR
   MLIRLinalgOps
diff --git a/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt b/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
--- a/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
@@ -11,7 +11,7 @@
   )
 target_link_libraries(MLIRLoopOpsTransforms
   PUBLIC
-  MLIRAffine
+  MLIRAffineOps
   MLIRIR
   MLIRPass
   MLIRLoopOps
diff --git a/mlir/lib/Dialect/Vector/CMakeLists.txt b/mlir/lib/Dialect/Vector/CMakeLists.txt
--- a/mlir/lib/Dialect/Vector/CMakeLists.txt
+++ b/mlir/lib/Dialect/Vector/CMakeLists.txt
@@ -16,7 +16,7 @@
   MLIREDSC
   MLIRIR
   MLIRStandardOps
-  MLIRAffine
+  MLIRAffineOps
   MLIRLoopOps
   MLIRLoopAnalysis
   MLIRSideEffects
diff --git a/mlir/lib/Transforms/CMakeLists.txt b/mlir/lib/Transforms/CMakeLists.txt
--- a/mlir/lib/Transforms/CMakeLists.txt
+++ b/mlir/lib/Transforms/CMakeLists.txt
@@ -28,7 +28,7 @@
 
 target_link_libraries(MLIRTransforms
   PUBLIC
-  MLIRAffine
+  MLIRAffineOps
   MLIRAnalysis
   MLIRLoopLikeInterface
   MLIRLoopOps
diff --git a/mlir/lib/Transforms/Utils/CMakeLists.txt b/mlir/lib/Transforms/Utils/CMakeLists.txt
--- a/mlir/lib/Transforms/Utils/CMakeLists.txt
+++ b/mlir/lib/Transforms/Utils/CMakeLists.txt
@@ -16,7 +16,7 @@
 
 target_link_libraries(MLIRTransformUtils
   PUBLIC
-  MLIRAffine
+  MLIRAffineOps
   MLIRAnalysis
   MLIRLoopAnalysis
   MLIRLoopOps
diff --git a/mlir/test/EDSC/CMakeLists.txt b/mlir/test/EDSC/CMakeLists.txt
--- a/mlir/test/EDSC/CMakeLists.txt
+++ b/mlir/test/EDSC/CMakeLists.txt
@@ -6,7 +6,8 @@
 
 target_link_libraries(mlir-edsc-builder-api-test
   PRIVATE
-  MLIRAffine
+  MLIRAffineOps
+  MLIRAffineEDSC
   MLIREDSC
   MLIRIR
   MLIRLinalgEDSC
diff --git a/mlir/test/lib/Transforms/CMakeLists.txt b/mlir/test/lib/Transforms/CMakeLists.txt
--- a/mlir/test/lib/Transforms/CMakeLists.txt
+++ b/mlir/test/lib/Transforms/CMakeLists.txt
@@ -37,7 +37,7 @@
 
 target_link_libraries(MLIRTestTransforms
   PUBLIC
-  MLIRAffine
+  MLIRAffineOps
   MLIRAnalysis
   MLIREDSC
   MLIRGPU