diff --git a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
--- a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
@@ -1,18 +1,2 @@
-add_mlir_dialect_library(MLIRSPIRVSerialization
-  Deserializer.cpp
-  Serializer.cpp
-  SPIRVBinaryUtils.cpp
-  TranslateRegistration.cpp
-
-  ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
-
-  DEPENDS
-  MLIRSPIRVSerializationGen
-
-  LINK_LIBS PUBLIC
-  MLIRIR
-  MLIRSPIRV
-  MLIRSupport
-  MLIRTranslation
-  )
+add_subdirectory(Serializer)
+add_subdirectory(Deserializer)
diff --git a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Serialization/Deserializer/CMakeLists.txt
copy from mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
copy to mlir/lib/Dialect/SPIRV/Serialization/Deserializer/CMakeLists.txt
--- a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/Serialization/Deserializer/CMakeLists.txt
@@ -1,8 +1,7 @@
-add_mlir_dialect_library(MLIRSPIRVSerialization
+add_mlir_dialect_library(MLIRSPIRVDeserialization
   Deserializer.cpp
-  Serializer.cpp
-  SPIRVBinaryUtils.cpp
-  TranslateRegistration.cpp
+  ../SPIRVBinaryUtils.cpp
+  ../TranslateRegistration.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
diff --git a/mlir/lib/Dialect/SPIRV/Serialization/Deserializer.cpp b/mlir/lib/Dialect/SPIRV/Serialization/Deserializer/Deserializer.cpp
rename from mlir/lib/Dialect/SPIRV/Serialization/Deserializer.cpp
rename to mlir/lib/Dialect/SPIRV/Serialization/Deserializer/Deserializer.cpp
diff --git a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Serialization/Serializer/CMakeLists.txt
copy from mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
copy to mlir/lib/Dialect/SPIRV/Serialization/Serializer/CMakeLists.txt
--- a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/Serialization/Serializer/CMakeLists.txt
@@ -1,8 +1,7 @@
 add_mlir_dialect_library(MLIRSPIRVSerialization
-  Deserializer.cpp
   Serializer.cpp
-  SPIRVBinaryUtils.cpp
-  TranslateRegistration.cpp
+  ../SPIRVBinaryUtils.cpp
+  ../TranslateRegistration.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
diff --git a/mlir/lib/Dialect/SPIRV/Serialization/Serializer.cpp b/mlir/lib/Dialect/SPIRV/Serialization/Serializer/Serializer.cpp
rename from mlir/lib/Dialect/SPIRV/Serialization/Serializer.cpp
rename to mlir/lib/Dialect/SPIRV/Serialization/Serializer/Serializer.cpp
diff --git a/mlir/unittests/Dialect/SPIRV/CMakeLists.txt b/mlir/unittests/Dialect/SPIRV/CMakeLists.txt
--- a/mlir/unittests/Dialect/SPIRV/CMakeLists.txt
+++ b/mlir/unittests/Dialect/SPIRV/CMakeLists.txt
@@ -1,8 +1,2 @@
-add_mlir_unittest(MLIRSPIRVTests
-  DeserializationTest.cpp
-  SerializationTest.cpp
-)
-target_link_libraries(MLIRSPIRVTests
-  PRIVATE
-  MLIRSPIRV
-  MLIRSPIRVSerialization)
+add_subdirectory(Serialization)
+add_subdirectory(Deserialization)
diff --git a/mlir/unittests/Dialect/SPIRV/Deserialization/CMakeLists.txt b/mlir/unittests/Dialect/SPIRV/Deserialization/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/mlir/unittests/Dialect/SPIRV/Deserialization/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_mlir_unittest(MLIRSPIRVDeserializationTests
+  DeserializationTest.cpp
+)
+target_link_libraries(MLIRSPIRVDeserializationTests
+  PRIVATE
+  MLIRSPIRV
+  MLIRSPIRVDeserialization)
diff --git a/mlir/unittests/Dialect/SPIRV/DeserializationTest.cpp b/mlir/unittests/Dialect/SPIRV/Deserialization/DeserializationTest.cpp
rename from mlir/unittests/Dialect/SPIRV/DeserializationTest.cpp
rename to mlir/unittests/Dialect/SPIRV/Deserialization/DeserializationTest.cpp
diff --git a/mlir/unittests/Dialect/SPIRV/Serialization/CMakeLists.txt b/mlir/unittests/Dialect/SPIRV/Serialization/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/mlir/unittests/Dialect/SPIRV/Serialization/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_mlir_unittest(MLIRSPIRVSerializationTests
+  SerializationTest.cpp
+)
+target_link_libraries(MLIRSPIRVSerializationTests
+  PRIVATE
+  MLIRSPIRV
+  MLIRSPIRVSerialization)
diff --git a/mlir/unittests/Dialect/SPIRV/SerializationTest.cpp b/mlir/unittests/Dialect/SPIRV/Serialization/SerializationTest.cpp
rename from mlir/unittests/Dialect/SPIRV/SerializationTest.cpp
rename to mlir/unittests/Dialect/SPIRV/Serialization/SerializationTest.cpp