diff --git a/flang/lib/Optimizer/HLFIR/CMakeLists.txt b/flang/lib/Optimizer/HLFIR/CMakeLists.txt
--- a/flang/lib/Optimizer/HLFIR/CMakeLists.txt
+++ b/flang/lib/Optimizer/HLFIR/CMakeLists.txt
@@ -1,20 +1 @@
-get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
-
-add_flang_library(HLFIRDialect
-  HLFIRDialect.cpp
-
-  DEPENDS
-  FIRDialect
-  HLFIROpsIncGen
-  ${dialect_libs}
-
-  LINK_LIBS
-  FIRDialect
-  MLIRIR
-  ${dialect_libs}
-
-  LINK_COMPONENTS
-  AsmParser
-  AsmPrinter
-  Remarks
-)
+add_subdirectory(IR)
diff --git a/flang/lib/Optimizer/HLFIR/CMakeLists.txt b/flang/lib/Optimizer/HLFIR/IR/CMakeLists.txt
copy from flang/lib/Optimizer/HLFIR/CMakeLists.txt
copy to flang/lib/Optimizer/HLFIR/IR/CMakeLists.txt
diff --git a/flang/lib/Optimizer/HLFIR/HLFIRDialect.cpp b/flang/lib/Optimizer/HLFIR/IR/HLFIRDialect.cpp
rename from flang/lib/Optimizer/HLFIR/HLFIRDialect.cpp
rename to flang/lib/Optimizer/HLFIR/IR/HLFIRDialect.cpp