diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckOps.h b/compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckOps.h
deleted file mode 100644
index fa1217f..0000000
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckOps.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2020 The IREE Authors
-//
-// Licensed under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-#ifndef IREE_COMPILER_DIALECT_MODULES_CHECK_IR_CHECK_OPS_H_
-#define IREE_COMPILER_DIALECT_MODULES_CHECK_IR_CHECK_OPS_H_
-
-#include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/OpDefinition.h"
-
-#define GET_OP_CLASSES
-#include "iree/compiler/Dialect/Modules/Check/IR/CheckOps.h.inc"  // IWYU pragma: export
-
-#endif  // IREE_COMPILER_DIALECT_MODULES_CHECK_IR_CHECK_OPS_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Modules/HAL/CMakeLists.txt
deleted file mode 100644
index 00e2756..0000000
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/BUILD                         #
-#                                                                              #
-# Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
-# CMake-only content.                                                          #
-#                                                                              #
-# To disable autogeneration for this file entirely, delete this header.        #
-################################################################################
-
-iree_add_all_subdirs()
-
-### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/CMakeLists.txt
deleted file mode 100644
index 9f68086..0000000
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/BUILD       #
-#                                                                              #
-# Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
-# CMake-only content.                                                          #
-#                                                                              #
-# To disable autogeneration for this file entirely, delete this header.        #
-################################################################################
-
-iree_add_all_subdirs()
-
-### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/PassDetail.h b/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/PassDetail.h
deleted file mode 100644
index 55e647e..0000000
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/PassDetail.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2022 The IREE Authors
-//
-// Licensed under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_TRANSFORMS_PASS_DETAIL_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_TRANSFORMS_PASS_DETAIL_H_
-
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h"
-#include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/Pass/Pass.h"
-
-namespace mlir {
-namespace iree_compiler {
-namespace IREE {
-namespace HAL {
-namespace Inline {
-
-#define GEN_PASS_CLASSES
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.h.inc"
-
-}  // namespace Inline
-}  // namespace HAL
-}  // namespace IREE
-}  // namespace iree_compiler
-}  // namespace mlir
-
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_TRANSFORMS_PASS_DETAIL_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/CMakeLists.txt b/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/CMakeLists.txt
deleted file mode 100644
index 4bd0760..0000000
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-# Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/BUILD       #
-#                                                                              #
-# Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
-# CMake-only content.                                                          #
-#                                                                              #
-# To disable autogeneration for this file entirely, delete this header.        #
-################################################################################
-
-iree_add_all_subdirs()
-
-### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.h b/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.h
deleted file mode 100644
index 7c5776b..0000000
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2022 The IREE Authors
-//
-// Licensed under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_IR_HALLOADEROPS_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_IR_HALLOADEROPS_H_
-
-#include <cstdint>
-
-#include "iree/compiler/Dialect/HAL/IR/HALTypes.h"
-#include "iree/compiler/Dialect/Util/IR/UtilTraits.h"
-#include "mlir/IR/Attributes.h"
-#include "mlir/IR/BuiltinOps.h"
-#include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/Dialect.h"
-#include "mlir/IR/OpDefinition.h"
-#include "mlir/IR/OpImplementation.h"
-#include "mlir/IR/SymbolTable.h"
-#include "mlir/Interfaces/SideEffectInterfaces.h"
-
-#define GET_OP_CLASSES
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.h.inc"  // IWYU pragma: keep
-
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_IR_HALLOADEROPS_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/PassDetail.h b/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/PassDetail.h
deleted file mode 100644
index 9ecc064..0000000
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/PassDetail.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2022 The IREE Authors
-//
-// Licensed under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_TRANSFORMS_PASS_DETAIL_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_TRANSFORMS_PASS_DETAIL_H_
-
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.h"
-#include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/Pass/Pass.h"
-
-namespace mlir {
-namespace iree_compiler {
-namespace IREE {
-namespace HAL {
-namespace Loader {
-
-#define GEN_PASS_CLASSES
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.h.inc"
-
-}  // namespace Loader
-}  // namespace HAL
-}  // namespace IREE
-}  // namespace iree_compiler
-}  // namespace mlir
-
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_TRANSFORMS_PASS_DETAIL_H_
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/HALToVMVX/ConvertHALToVMVX.h b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/HALToVMVX/ConvertHALToVMVX.h
index 6bd4a44..c83d1d3 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/HALToVMVX/ConvertHALToVMVX.h
+++ b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/HALToVMVX/ConvertHALToVMVX.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_VMVX_CONVERSION_HALTOVMVX_CONVERTHALTOVMVX_H_
-#define IREE_COMPILER_DIALECT_MODULES_VMVX_CONVERSION_HALTOVMVX_CONVERTHALTOVMVX_H_
+#ifndef IREE_COMPILER_DIALECT_VMVX_CONVERSION_HALTOVMVX_CONVERTHALTOVMVX_H_
+#define IREE_COMPILER_DIALECT_VMVX_CONVERSION_HALTOVMVX_CONVERTHALTOVMVX_H_
 
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Pass/Pass.h"
@@ -29,4 +29,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_VMVX_CONVERSION_HALTOVMVX_CONVERTHALTOVMVX_H_
+#endif  // IREE_COMPILER_DIALECT_VMVX_CONVERSION_HALTOVMVX_CONVERTHALTOVMVX_H_
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/VMVXToVM/ConvertVMVXToVM.h b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/VMVXToVM/ConvertVMVXToVM.h
index 546bce0..db3a103 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/Conversion/VMVXToVM/ConvertVMVXToVM.h
+++ b/compiler/src/iree/compiler/Dialect/VMVX/Conversion/VMVXToVM/ConvertVMVXToVM.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_VMVX_CONVERSION_VMVXTOVM_CONVERTVMVXTOVM_H_
-#define IREE_COMPILER_DIALECT_MODULES_VMVX_CONVERSION_VMVXTOVM_CONVERTVMVXTOVM_H_
+#ifndef IREE_COMPILER_DIALECT_VMVX_CONVERSION_VMVXTOVM_CONVERTVMVXTOVM_H_
+#define IREE_COMPILER_DIALECT_VMVX_CONVERSION_VMVXTOVM_CONVERTVMVXTOVM_H_
 
 #include "iree/compiler/Dialect/VMVX/IR/VMVXOps.h"
 #include "mlir/Pass/Pass.h"
@@ -24,4 +24,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_VMVX_CONVERSION_VMVXTOVM_CONVERTVMVXTOVM_H_
+#endif  // IREE_COMPILER_DIALECT_VMVX_CONVERSION_VMVXTOVM_CONVERTVMVXTOVM_H_
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/IR/VMVXDialect.h b/compiler/src/iree/compiler/Dialect/VMVX/IR/VMVXDialect.h
index 908852c..aac7ac0 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/IR/VMVXDialect.h
+++ b/compiler/src/iree/compiler/Dialect/VMVX/IR/VMVXDialect.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_VMVX_IR_VMVXDIALECT_H_
-#define IREE_COMPILER_DIALECT_MODULES_VMVX_IR_VMVXDIALECT_H_
+#ifndef IREE_COMPILER_DIALECT_VMVX_IR_VMVXDIALECT_H_
+#define IREE_COMPILER_DIALECT_VMVX_IR_VMVXDIALECT_H_
 
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
@@ -26,4 +26,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_VMVX_IR_VMVXDIALECT_H_
+#endif  // IREE_COMPILER_DIALECT_VMVX_IR_VMVXDIALECT_H_
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/IR/VMVXOps.h b/compiler/src/iree/compiler/Dialect/VMVX/IR/VMVXOps.h
index c742c44..418b1b1 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/IR/VMVXOps.h
+++ b/compiler/src/iree/compiler/Dialect/VMVX/IR/VMVXOps.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_VMVX_IR_VMVXOPS_H_
-#define IREE_COMPILER_DIALECT_MODULES_VMVX_IR_VMVXOPS_H_
+#ifndef IREE_COMPILER_DIALECT_VMVX_IR_VMVXOPS_H_
+#define IREE_COMPILER_DIALECT_VMVX_IR_VMVXOPS_H_
 
 #include <cstdint>
 
@@ -23,4 +23,4 @@
 #define GET_OP_CLASSES
 #include "iree/compiler/Dialect/VMVX/IR/VMVXOps.h.inc"  // IWYU pragma: keep
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_VMVX_IR_VMVXOPS_H_
+#endif  // IREE_COMPILER_DIALECT_VMVX_IR_VMVXOPS_H_
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/IR/VMVXTypes.h b/compiler/src/iree/compiler/Dialect/VMVX/IR/VMVXTypes.h
index 782bfb7..f464399 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/IR/VMVXTypes.h
+++ b/compiler/src/iree/compiler/Dialect/VMVX/IR/VMVXTypes.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_VMVX_IR_VMVXTYPES_H_
-#define IREE_COMPILER_DIALECT_MODULES_VMVX_IR_VMVXTYPES_H_
+#ifndef IREE_COMPILER_DIALECT_VMVX_IR_VMVXTYPES_H_
+#define IREE_COMPILER_DIALECT_VMVX_IR_VMVXTYPES_H_
 
 #include <cstdint>
 
@@ -26,4 +26,4 @@
 #include "iree/compiler/Dialect/VMVX/IR/VMVXOpInterfaces.h.inc"  // IWYU pragma: export
 // clang-format on
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_VMVX_IR_VMVXTYPES_H_
+#endif  // IREE_COMPILER_DIALECT_VMVX_IR_VMVXTYPES_H_
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/Transforms/PassDetail.h b/compiler/src/iree/compiler/Dialect/VMVX/Transforms/PassDetail.h
index 3d0948e..81f4d5c 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/Transforms/PassDetail.h
+++ b/compiler/src/iree/compiler/Dialect/VMVX/Transforms/PassDetail.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_VMVX_TRANSFORMS_PASS_DETAIL_H_
-#define IREE_COMPILER_DIALECT_MODULES_VMVX_TRANSFORMS_PASS_DETAIL_H_
+#ifndef IREE_COMPILER_DIALECT_VMVX_TRANSFORMS_PASS_DETAIL_H_
+#define IREE_COMPILER_DIALECT_VMVX_TRANSFORMS_PASS_DETAIL_H_
 
 #include "iree/compiler/Dialect/HAL/IR/HALOps.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
@@ -24,4 +24,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_VMVX_TRANSFORMS_PASS_DETAIL_H_
+#endif  // IREE_COMPILER_DIALECT_VMVX_TRANSFORMS_PASS_DETAIL_H_
diff --git a/compiler/src/iree/compiler/Dialect/VMVX/Transforms/Passes.h b/compiler/src/iree/compiler/Dialect/VMVX/Transforms/Passes.h
index 3d1611f..58eff05 100644
--- a/compiler/src/iree/compiler/Dialect/VMVX/Transforms/Passes.h
+++ b/compiler/src/iree/compiler/Dialect/VMVX/Transforms/Passes.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_VMVX_TRANSFORMS_PASSES_H_
-#define IREE_COMPILER_DIALECT_MODULES_VMVX_TRANSFORMS_PASSES_H_
+#ifndef IREE_COMPILER_DIALECT_VMVX_TRANSFORMS_PASSES_H_
+#define IREE_COMPILER_DIALECT_VMVX_TRANSFORMS_PASSES_H_
 
 #include "iree/compiler/Dialect/VMVX/IR/VMVXOps.h"
 #include "llvm/ADT/StringMap.h"
@@ -56,4 +56,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_VMVX_TRANSFORMS_PASSES_H_
+#endif  // IREE_COMPILER_DIALECT_VMVX_TRANSFORMS_PASSES_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/BUILD b/compiler/src/iree/compiler/Modules/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/BUILD
rename to compiler/src/iree/compiler/Modules/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/CMakeLists.txt b/compiler/src/iree/compiler/Modules/CMakeLists.txt
similarity index 91%
copy from compiler/src/iree/compiler/Dialect/Modules/CMakeLists.txt
copy to compiler/src/iree/compiler/Modules/CMakeLists.txt
index 3ef312e..b1e16bb 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/BUILD                             #
+# compiler/src/iree/compiler/Modules/BUILD                                     #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/BUILD b/compiler/src/iree/compiler/Modules/Check/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/BUILD
rename to compiler/src/iree/compiler/Modules/Check/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/CMakeLists.txt b/compiler/src/iree/compiler/Modules/Check/CMakeLists.txt
similarity index 93%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/Check/CMakeLists.txt
index 6920b52..ddb13ff 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/Check/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/Check/BUILD                       #
+# compiler/src/iree/compiler/Modules/Check/BUILD                               #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/BUILD b/compiler/src/iree/compiler/Modules/Check/Conversion/BUILD
similarity index 92%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/BUILD
rename to compiler/src/iree/compiler/Modules/Check/Conversion/BUILD
index ea2d9a0..0644bda 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/BUILD
+++ b/compiler/src/iree/compiler/Modules/Check/Conversion/BUILD
@@ -22,8 +22,8 @@
     ],
     deps = [
         "//compiler/src/iree/compiler/Dialect/HAL/Conversion",
-        "//compiler/src/iree/compiler/Dialect/Modules/Check/IR",
         "//compiler/src/iree/compiler/Dialect/VM/Conversion",
+        "//compiler/src/iree/compiler/Modules/Check/IR",
         "@llvm-project//mlir:Pass",
         "@llvm-project//mlir:Transforms",
     ],
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/CMakeLists.txt b/compiler/src/iree/compiler/Modules/Check/Conversion/CMakeLists.txt
similarity index 88%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/Check/Conversion/CMakeLists.txt
index d558207..3d2aa11 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/Check/Conversion/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/BUILD            #
+# compiler/src/iree/compiler/Modules/Check/Conversion/BUILD                    #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
@@ -21,8 +21,8 @@
     MLIRPass
     MLIRTransforms
     iree::compiler::Dialect::HAL::Conversion
-    iree::compiler::Dialect::Modules::Check::IR
     iree::compiler::Dialect::VM::Conversion
+    iree::compiler::Modules::Check::IR
   PUBLIC
 )
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/ConversionPatterns.cpp b/compiler/src/iree/compiler/Modules/Check/Conversion/ConversionPatterns.cpp
similarity index 96%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/ConversionPatterns.cpp
rename to compiler/src/iree/compiler/Modules/Check/Conversion/ConversionPatterns.cpp
index 38b3aa8..3036f5f 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/ConversionPatterns.cpp
+++ b/compiler/src/iree/compiler/Modules/Check/Conversion/ConversionPatterns.cpp
@@ -4,11 +4,11 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/Check/Conversion/ConversionPatterns.h"
+#include "iree/compiler/Modules/Check/Conversion/ConversionPatterns.h"
 
 #include "iree/compiler/Dialect/HAL/Conversion/ConversionTarget.h"
-#include "iree/compiler/Dialect/Modules/Check/IR/CheckOps.h"
 #include "iree/compiler/Dialect/VM/Conversion/ImportUtils.h"
+#include "iree/compiler/Modules/Check/IR/CheckOps.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/ConversionPatterns.h b/compiler/src/iree/compiler/Modules/Check/Conversion/ConversionPatterns.h
similarity index 81%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/ConversionPatterns.h
rename to compiler/src/iree/compiler/Modules/Check/Conversion/ConversionPatterns.h
index a9fec56..a34472c 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/Conversion/ConversionPatterns.h
+++ b/compiler/src/iree/compiler/Modules/Check/Conversion/ConversionPatterns.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_CHECK_CONVERSION_CONVERSION_PATTERNS_H_
-#define IREE_COMPILER_DIALECT_MODULES_CHECK_CONVERSION_CONVERSION_PATTERNS_H_
+#ifndef IREE_COMPILER_MODULES_CHECK_CONVERSION_CONVERSION_PATTERNS_H_
+#define IREE_COMPILER_MODULES_CHECK_CONVERSION_CONVERSION_PATTERNS_H_
 
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
@@ -31,4 +31,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_CHECK_CONVERSION_CONVERSION_PATTERNS_H_
+#endif  // IREE_COMPILER_MODULES_CHECK_CONVERSION_CONVERSION_PATTERNS_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/BUILD b/compiler/src/iree/compiler/Modules/Check/IR/BUILD
similarity index 94%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/IR/BUILD
rename to compiler/src/iree/compiler/Modules/Check/IR/BUILD
index 33f6fbb..d3c48a8 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/BUILD
+++ b/compiler/src/iree/compiler/Modules/Check/IR/BUILD
@@ -59,9 +59,9 @@
         ":IR",
         ":check_ops_gen",
         "//compiler/src/iree/compiler/Dialect/HAL/Conversion",
-        "//compiler/src/iree/compiler/Dialect/Modules/Check:check_imports",
-        "//compiler/src/iree/compiler/Dialect/Modules/Check/Conversion",
         "//compiler/src/iree/compiler/Dialect/VM/Conversion",
+        "//compiler/src/iree/compiler/Modules/Check:check_imports",
+        "//compiler/src/iree/compiler/Modules/Check/Conversion",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Parser",
         "@llvm-project//mlir:Transforms",
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/CMakeLists.txt b/compiler/src/iree/compiler/Modules/Check/IR/CMakeLists.txt
similarity index 89%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/IR/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/Check/IR/CMakeLists.txt
index afbcbd5..65809ba 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/Check/IR/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/Check/IR/BUILD                    #
+# compiler/src/iree/compiler/Modules/Check/IR/BUILD                            #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
@@ -42,9 +42,9 @@
     MLIRParser
     MLIRTransforms
     iree::compiler::Dialect::HAL::Conversion
-    iree::compiler::Dialect::Modules::Check::Conversion
-    iree::compiler::Dialect::Modules::Check::check_imports
     iree::compiler::Dialect::VM::Conversion
+    iree::compiler::Modules::Check::Conversion
+    iree::compiler::Modules::Check::check_imports
   PUBLIC
 )
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckDialect.cpp b/compiler/src/iree/compiler/Modules/Check/IR/CheckDialect.cpp
similarity index 86%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckDialect.cpp
rename to compiler/src/iree/compiler/Modules/Check/IR/CheckDialect.cpp
index 4a307ac..244e65d 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckDialect.cpp
+++ b/compiler/src/iree/compiler/Modules/Check/IR/CheckDialect.cpp
@@ -4,13 +4,13 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/Check/IR/CheckDialect.h"
+#include "iree/compiler/Modules/Check/IR/CheckDialect.h"
 
 #include "iree/compiler/Dialect/HAL/Conversion/ConversionDialectInterface.h"
-#include "iree/compiler/Dialect/Modules/Check/Conversion/ConversionPatterns.h"
-#include "iree/compiler/Dialect/Modules/Check/IR/CheckOps.h"
-#include "iree/compiler/Dialect/Modules/Check/check.imports.h"
 #include "iree/compiler/Dialect/VM/Conversion/ConversionDialectInterface.h"
+#include "iree/compiler/Modules/Check/Conversion/ConversionPatterns.h"
+#include "iree/compiler/Modules/Check/IR/CheckOps.h"
+#include "iree/compiler/Modules/Check/check.imports.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Parser/Parser.h"
 #include "mlir/Transforms/DialectConversion.h"
@@ -60,7 +60,7 @@
   addInterfaces<CheckToHalConversionInterface>();
 #define GET_OP_LIST
   addOperations<
-#include "iree/compiler/Dialect/Modules/Check/IR/CheckOps.cpp.inc"
+#include "iree/compiler/Modules/Check/IR/CheckOps.cpp.inc"
       >();
 }
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckDialect.h b/compiler/src/iree/compiler/Modules/Check/IR/CheckDialect.h
similarity index 75%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckDialect.h
rename to compiler/src/iree/compiler/Modules/Check/IR/CheckDialect.h
index aa2dcf6..8496c87 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckDialect.h
+++ b/compiler/src/iree/compiler/Modules/Check/IR/CheckDialect.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_CHECK_IR_CHECK_DIALECT_H_
-#define IREE_COMPILER_DIALECT_MODULES_CHECK_IR_CHECK_DIALECT_H_
+#ifndef IREE_COMPILER_MODULES_CHECK_IR_CHECK_DIALECT_H_
+#define IREE_COMPILER_MODULES_CHECK_IR_CHECK_DIALECT_H_
 
 #include "mlir/IR/Dialect.h"
 
@@ -25,4 +25,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_CHECK_IR_CHECK_DIALECT_H_
+#endif  // IREE_COMPILER_MODULES_CHECK_IR_CHECK_DIALECT_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckOps.cpp b/compiler/src/iree/compiler/Modules/Check/IR/CheckOps.cpp
similarity index 92%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckOps.cpp
rename to compiler/src/iree/compiler/Modules/Check/IR/CheckOps.cpp
index 80e8bd5..4feebe4 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckOps.cpp
+++ b/compiler/src/iree/compiler/Modules/Check/IR/CheckOps.cpp
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/Check/IR/CheckOps.h"
+#include "iree/compiler/Modules/Check/IR/CheckOps.h"
 
 #include "iree/compiler/Dialect/HAL/IR/HALTypes.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
@@ -48,4 +48,4 @@
 }  // namespace mlir
 
 #define GET_OP_CLASSES
-#include "iree/compiler/Dialect/Modules/Check/IR/CheckOps.cpp.inc"
+#include "iree/compiler/Modules/Check/IR/CheckOps.cpp.inc"
diff --git a/compiler/src/iree/compiler/Modules/Check/IR/CheckOps.h b/compiler/src/iree/compiler/Modules/Check/IR/CheckOps.h
new file mode 100644
index 0000000..b3844c2
--- /dev/null
+++ b/compiler/src/iree/compiler/Modules/Check/IR/CheckOps.h
@@ -0,0 +1,16 @@
+// Copyright 2020 The IREE Authors
+//
+// Licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#ifndef IREE_COMPILER_MODULES_CHECK_IR_CHECK_OPS_H_
+#define IREE_COMPILER_MODULES_CHECK_IR_CHECK_OPS_H_
+
+#include "mlir/IR/BuiltinTypes.h"
+#include "mlir/IR/OpDefinition.h"
+
+#define GET_OP_CLASSES
+#include "iree/compiler/Modules/Check/IR/CheckOps.h.inc"  // IWYU pragma: export
+
+#endif  // IREE_COMPILER_MODULES_CHECK_IR_CHECK_OPS_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckOps.td b/compiler/src/iree/compiler/Modules/Check/IR/CheckOps.td
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/IR/CheckOps.td
rename to compiler/src/iree/compiler/Modules/Check/IR/CheckOps.td
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/check.imports.mlir b/compiler/src/iree/compiler/Modules/Check/check.imports.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/check.imports.mlir
rename to compiler/src/iree/compiler/Modules/Check/check.imports.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/test/BUILD b/compiler/src/iree/compiler/Modules/Check/test/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/test/BUILD
rename to compiler/src/iree/compiler/Modules/Check/test/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/test/CMakeLists.txt b/compiler/src/iree/compiler/Modules/Check/test/CMakeLists.txt
similarity index 92%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/test/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/Check/test/CMakeLists.txt
index cc9886d..58389eb 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/Check/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/Check/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/Check/test/BUILD                  #
+# compiler/src/iree/compiler/Modules/Check/test/BUILD                          #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/test/canonicalize.mlir b/compiler/src/iree/compiler/Modules/Check/test/canonicalize.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/test/canonicalize.mlir
rename to compiler/src/iree/compiler/Modules/Check/test/canonicalize.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/Check/test/ops.mlir b/compiler/src/iree/compiler/Modules/Check/test/ops.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/Check/test/ops.mlir
rename to compiler/src/iree/compiler/Modules/Check/test/ops.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/BUILD b/compiler/src/iree/compiler/Modules/HAL/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/CMakeLists.txt
similarity index 91%
copy from compiler/src/iree/compiler/Dialect/Modules/CMakeLists.txt
copy to compiler/src/iree/compiler/Modules/HAL/CMakeLists.txt
index 3ef312e..81938ef 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/BUILD                             #
+# compiler/src/iree/compiler/Modules/HAL/BUILD                                 #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/BUILD b/compiler/src/iree/compiler/Modules/HAL/Inline/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Inline/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/CMakeLists.txt
similarity index 93%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Inline/CMakeLists.txt
index adaedc2..9a2c30c 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/BUILD                  #
+# compiler/src/iree/compiler/Modules/HAL/Inline/BUILD                          #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/BUILD b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/CMakeLists.txt
similarity index 91%
rename from compiler/src/iree/compiler/Dialect/Modules/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/CMakeLists.txt
index 3ef312e..c7d6c9f 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/BUILD                             #
+# compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/BUILD               #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/BUILD b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/BUILD
similarity index 93%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/BUILD
index 9cfed7d..adeb8f4 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/BUILD
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/BUILD
@@ -21,11 +21,11 @@
         "ConvertHALInlineToVM.h",
     ],
     deps = [
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR",
         "//compiler/src/iree/compiler/Dialect/Util/IR",
         "//compiler/src/iree/compiler/Dialect/VM/Conversion",
         "//compiler/src/iree/compiler/Dialect/VM/Conversion/StandardToVM",
         "//compiler/src/iree/compiler/Dialect/VM/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/IR",
         "@llvm-project//mlir:ArithmeticDialect",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/CMakeLists.txt
similarity index 88%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/CMakeLists.txt
index 681218c..eb69822 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/BUILD#
+# compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/BUILD #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
@@ -23,11 +23,11 @@
     MLIRIR
     MLIRPass
     MLIRTransforms
-    iree::compiler::Dialect::Modules::HAL::Inline::IR
     iree::compiler::Dialect::Util::IR
     iree::compiler::Dialect::VM::Conversion
     iree::compiler::Dialect::VM::Conversion::StandardToVM
     iree::compiler::Dialect::VM::IR
+    iree::compiler::Modules::HAL::Inline::IR
   PUBLIC
 )
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.cpp b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.cpp
similarity index 97%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.cpp
index 095398e..c0b498d 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.cpp
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.h"
+#include "iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.h"
 
 #include "iree/compiler/Dialect/Util/IR/UtilTypes.h"
 #include "iree/compiler/Dialect/VM/Conversion/ConversionTarget.h"
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.h b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.h
similarity index 69%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.h
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.h
index 5c155c4..56e8555 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.h
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.h
@@ -4,10 +4,10 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_CONVERSION_HALINLINE_CONVERTHALINLINETOVM_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_CONVERSION_HALINLINE_CONVERTHALINLINETOVM_H_
+#ifndef IREE_COMPILER_MODULES_HAL_INLINE_CONVERSION_HALINLINE_CONVERTHALINLINETOVM_H_
+#define IREE_COMPILER_MODULES_HAL_INLINE_CONVERSION_HALINLINE_CONVERTHALINLINETOVM_H_
 
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
 
@@ -24,4 +24,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_CONVERSION_HALINLINE_CONVERTHALINLINETOVM_H_
+#endif  // IREE_COMPILER_MODULES_HAL_INLINE_CONVERSION_HALINLINE_CONVERTHALINLINETOVM_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/test/BUILD b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/test/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/test/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/test/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/test/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/test/CMakeLists.txt
similarity index 89%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/test/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/test/CMakeLists.txt
index 53c3829..f87d5df 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/test/BUILD#
+# compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/test/BUILD#
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/BUILD b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/BUILD
similarity index 88%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/BUILD
index 6791d99..aa335a8 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/BUILD
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/BUILD
@@ -26,9 +26,9 @@
         "//compiler/src/iree/compiler/Dialect/HAL/IR:HALDialect",
         "//compiler/src/iree/compiler/Dialect/HAL/Target",
         "//compiler/src/iree/compiler/Dialect/HAL/Utils",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR:HALInlineDialect",
         "//compiler/src/iree/compiler/Dialect/Util/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/IR:HALInlineDialect",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:ArithmeticDialect",
         "@llvm-project//mlir:FuncDialect",
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/CMakeLists.txt
similarity index 84%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/CMakeLists.txt
index f8d8546..e075d6c 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/BUILD#
+# compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/BUILD#
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
@@ -29,9 +29,9 @@
     iree::compiler::Dialect::HAL::IR::HALDialect
     iree::compiler::Dialect::HAL::Target
     iree::compiler::Dialect::HAL::Utils
-    iree::compiler::Dialect::Modules::HAL::Inline::IR
-    iree::compiler::Dialect::Modules::HAL::Inline::IR::HALInlineDialect
     iree::compiler::Dialect::Util::IR
+    iree::compiler::Modules::HAL::Inline::IR
+    iree::compiler::Modules::HAL::Inline::IR::HALInlineDialect
   PUBLIC
 )
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.cpp b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.cpp
similarity index 97%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.cpp
index 4c53ae9..a2a8911 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.cpp
@@ -4,14 +4,14 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.h"
+#include "iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.h"
 
 #include "iree/compiler/Dialect/HAL/IR/HALDialect.h"
 #include "iree/compiler/Dialect/HAL/IR/HALOps.h"
 #include "iree/compiler/Dialect/HAL/IR/HALTypes.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h"
 #include "iree/compiler/Dialect/Util/IR/UtilOps.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Transforms/DialectConversion.h"
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.h b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.h
similarity index 70%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.h
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.h
index 19c402f..05f1e9a 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.h
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_CONVERSION_HALTOHALINLINE_CONVERTHALTOHALINLINE_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_CONVERSION_HALTOHALINLINE_CONVERTHALTOHALINLINE_H_
+#ifndef IREE_COMPILER_MODULES_HAL_INLINE_CONVERSION_HALTOHALINLINE_CONVERTHALTOHALINLINE_H_
+#define IREE_COMPILER_MODULES_HAL_INLINE_CONVERSION_HALTOHALINLINE_CONVERTHALTOHALINLINE_H_
 
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
@@ -22,4 +22,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_CONVERSION_HALTOHALINLINE_CONVERTHALTOHALINLINE_H_
+#endif  // IREE_COMPILER_MODULES_HAL_INLINE_CONVERSION_HALTOHALINLINE_CONVERTHALTOHALINLINE_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/test/BUILD b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/test/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/test/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/test/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/test/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/test/CMakeLists.txt
similarity index 89%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/test/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/test/CMakeLists.txt
index fa35f20..fd16c97 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/test/BUILD#
+# compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/test/BUILD#
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/test/buffer_ops.mlir b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/test/buffer_ops.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/test/buffer_ops.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/test/buffer_ops.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/test/buffer_view_ops.mlir b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/test/buffer_view_ops.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/test/buffer_view_ops.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/test/buffer_view_ops.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/BUILD b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/BUILD
similarity index 88%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/BUILD
index 80498a2..2f9fafc 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/BUILD
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/BUILD
@@ -26,10 +26,10 @@
         "//compiler/src/iree/compiler/Dialect/HAL/IR:HALDialect",
         "//compiler/src/iree/compiler/Dialect/HAL/Target",
         "//compiler/src/iree/compiler/Dialect/HAL/Utils",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR:HALInlineDialect",
         "//compiler/src/iree/compiler/Dialect/Stream/IR",
         "//compiler/src/iree/compiler/Dialect/Util/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/IR:HALInlineDialect",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:ArithmeticDialect",
         "@llvm-project//mlir:FuncDialect",
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/CMakeLists.txt
similarity index 85%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/CMakeLists.txt
index b688989..571da74 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/BUILD#
+# compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/BUILD#
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
@@ -29,10 +29,10 @@
     iree::compiler::Dialect::HAL::IR::HALDialect
     iree::compiler::Dialect::HAL::Target
     iree::compiler::Dialect::HAL::Utils
-    iree::compiler::Dialect::Modules::HAL::Inline::IR
-    iree::compiler::Dialect::Modules::HAL::Inline::IR::HALInlineDialect
     iree::compiler::Dialect::Stream::IR
     iree::compiler::Dialect::Util::IR
+    iree::compiler::Modules::HAL::Inline::IR
+    iree::compiler::Modules::HAL::Inline::IR::HALInlineDialect
   PUBLIC
 )
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.cpp b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.cpp
similarity index 98%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.cpp
index a073c7d..3b13f27 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.cpp
@@ -4,16 +4,16 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.h"
+#include "iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.h"
 
 #include "iree/compiler/Dialect/HAL/IR/HALOps.h"
 #include "iree/compiler/Dialect/HAL/IR/HALTypes.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h"
 #include "iree/compiler/Dialect/Stream/IR/StreamDialect.h"
 #include "iree/compiler/Dialect/Stream/IR/StreamOps.h"
 #include "iree/compiler/Dialect/Stream/IR/StreamTypes.h"
 #include "iree/compiler/Dialect/Util/IR/UtilOps.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Transforms/DialectConversion.h"
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.h b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.h
similarity index 69%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.h
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.h
index 5a6e529..5a51409 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.h
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_CONVERSION_STREAMTOHALINLINE_CONVERTSTREAMTOHALINLINE_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_CONVERSION_STREAMTOHALINLINE_CONVERTSTREAMTOHALINLINE_H_
+#ifndef IREE_COMPILER_MODULES_HAL_INLINE_CONVERSION_STREAMTOHALINLINE_CONVERTSTREAMTOHALINLINE_H_
+#define IREE_COMPILER_MODULES_HAL_INLINE_CONVERSION_STREAMTOHALINLINE_CONVERTSTREAMTOHALINLINE_H_
 
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
@@ -22,4 +22,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_CONVERSION_STREAMTOHALINLINE_CONVERTSTREAMTOHALINLINE_H_
+#endif  // IREE_COMPILER_MODULES_HAL_INLINE_CONVERSION_STREAMTOHALINLINE_CONVERTSTREAMTOHALINLINE_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/BUILD b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/CMakeLists.txt
similarity index 90%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/CMakeLists.txt
index 2b2b6c5..3241150 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/BUILD#
+# compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/BUILD#
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/cmd_ops.mlir b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/cmd_ops.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/cmd_ops.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/cmd_ops.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/resource_ops.mlir b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/resource_ops.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/resource_ops.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/resource_ops.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/timepoint_ops.mlir b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/timepoint_ops.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/timepoint_ops.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/timepoint_ops.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/transfer_ops.mlir b/compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/transfer_ops.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/test/transfer_ops.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/test/transfer_ops.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/BUILD b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/BUILD
similarity index 94%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Inline/IR/BUILD
index 9cedf21..615ddef 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/BUILD
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/BUILD
@@ -68,9 +68,9 @@
     hdrs = ["HALInlineDialect.h"],
     deps = [
         ":IR",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline:hal_inline_imports",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM",
         "//compiler/src/iree/compiler/Dialect/VM/Conversion",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline:hal_inline_imports",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/CMakeLists.txt
similarity index 89%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Inline/IR/CMakeLists.txt
index 04ba81e..ea61b41 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/BUILD               #
+# compiler/src/iree/compiler/Modules/HAL/Inline/IR/BUILD                       #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
@@ -51,9 +51,9 @@
     MLIRParser
     MLIRSupport
     MLIRTransformUtils
-    iree::compiler::Dialect::Modules::HAL::Inline::Conversion::HALInlineToVM
-    iree::compiler::Dialect::Modules::HAL::Inline::hal_inline_imports
     iree::compiler::Dialect::VM::Conversion
+    iree::compiler::Modules::HAL::Inline::Conversion::HALInlineToVM
+    iree::compiler::Modules::HAL::Inline::hal_inline_imports
   PUBLIC
 )
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineBase.td b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineBase.td
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineBase.td
rename to compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineBase.td
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.cpp b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.cpp
similarity index 82%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.cpp
index 85fec80..f4e2ff9 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.cpp
@@ -4,12 +4,12 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.h"
 
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/hal_inline.imports.h"
 #include "iree/compiler/Dialect/VM/Conversion/ConversionDialectInterface.h"
+#include "iree/compiler/Modules/HAL/Inline/Conversion/HALInlineToVM/ConvertHALInlineToVM.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.h"
+#include "iree/compiler/Modules/HAL/Inline/hal_inline.imports.h"
 #include "llvm/Support/SourceMgr.h"
 #include "mlir/IR/DialectImplementation.h"
 #include "mlir/IR/OpImplementation.h"
@@ -52,7 +52,7 @@
 
 #define GET_OP_LIST
   addOperations<
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.cpp.inc"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.cpp.inc"
       >();
 }
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.h b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.h
similarity index 75%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.h
rename to compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.h
index b53b70d..c4b8f22 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.h
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_IR_HALINLINEDIALECT_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_IR_HALINLINEDIALECT_H_
+#ifndef IREE_COMPILER_MODULES_HAL_INLINE_IR_HALINLINEDIALECT_H_
+#define IREE_COMPILER_MODULES_HAL_INLINE_IR_HALINLINEDIALECT_H_
 
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
@@ -28,4 +28,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_IR_HALINLINEDIALECT_H_
+#endif  // IREE_COMPILER_MODULES_HAL_INLINE_IR_HALINLINEDIALECT_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.cpp b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.cpp
similarity index 97%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.cpp
index e8aa7e4..9b926ed 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.cpp
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.h"
 
 #include "iree/compiler/Dialect/Util/IR/UtilOps.h"
 #include "iree/compiler/Dialect/Util/IR/UtilTypes.h"
@@ -208,4 +208,4 @@
 //===----------------------------------------------------------------------===//
 
 #define GET_OP_CLASSES
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.cpp.inc"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.cpp.inc"
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.h
similarity index 68%
copy from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h
copy to compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.h
index 97af7e8..30ce5ff 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_IR_HALINLINEOPS_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_IR_HALINLINEOPS_H_
+#ifndef IREE_COMPILER_MODULES_HAL_INLINE_IR_HALINLINEOPS_H_
+#define IREE_COMPILER_MODULES_HAL_INLINE_IR_HALINLINEOPS_H_
 
 #include <cstdint>
 
@@ -21,6 +21,6 @@
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
 #define GET_OP_CLASSES
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h.inc"  // IWYU pragma: keep
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.h.inc"  // IWYU pragma: keep
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_IR_HALINLINEOPS_H_
+#endif  // IREE_COMPILER_MODULES_HAL_INLINE_IR_HALINLINEOPS_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.td b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.td
similarity index 99%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.td
rename to compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.td
index 134575f..ae9cbed 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.td
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.td
@@ -8,7 +8,7 @@
 #define IREE_DIALECT_MODULES_HAL_INLINE_OPS
 
 include "iree/compiler/Dialect/HAL/IR/HALBase.td"
-include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineBase.td"
+include "iree/compiler/Modules/HAL/Inline/IR/HALInlineBase.td"
 include "iree/compiler/Dialect/Util/IR/UtilAttrs.td"
 include "iree/compiler/Dialect/Util/IR/UtilInterfaces.td"
 include "mlir/IR/OpAsmInterface.td"
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/test/BUILD b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/test/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/test/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Inline/IR/test/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/test/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/test/CMakeLists.txt
similarity index 91%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/test/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Inline/IR/test/CMakeLists.txt
index e265ec7..6863b91 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/test/BUILD          #
+# compiler/src/iree/compiler/Modules/HAL/Inline/IR/test/BUILD                  #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/test/buffer_folding.mlir b/compiler/src/iree/compiler/Modules/HAL/Inline/IR/test/buffer_folding.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/test/buffer_folding.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Inline/IR/test/buffer_folding.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/BUILD b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/BUILD
similarity index 87%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/BUILD
index 6551edb..1d682cd 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/BUILD
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/BUILD
@@ -28,14 +28,14 @@
         "//compiler/src/iree/compiler/Dialect/HAL/IR:HALDialect",
         "//compiler/src/iree/compiler/Dialect/HAL/Target",
         "//compiler/src/iree/compiler/Dialect/HAL/Transforms",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR:HALInlineDialect",
         "//compiler/src/iree/compiler/Dialect/Stream/IR",
         "//compiler/src/iree/compiler/Dialect/Util/Conversion",
         "//compiler/src/iree/compiler/Dialect/Util/IR",
         "//compiler/src/iree/compiler/Dialect/Util/Transforms",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/IR:HALInlineDialect",
         "//compiler/src/iree/compiler/Utils",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:AffineDialect",
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/CMakeLists.txt
similarity index 84%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/CMakeLists.txt
index c33d9fe..9c53cfc 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/BUILD       #
+# compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/BUILD               #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
@@ -41,14 +41,14 @@
     iree::compiler::Dialect::HAL::IR::HALDialect
     iree::compiler::Dialect::HAL::Target
     iree::compiler::Dialect::HAL::Transforms
-    iree::compiler::Dialect::Modules::HAL::Inline::Conversion::HALToHALInline
-    iree::compiler::Dialect::Modules::HAL::Inline::Conversion::StreamToHALInline
-    iree::compiler::Dialect::Modules::HAL::Inline::IR
-    iree::compiler::Dialect::Modules::HAL::Inline::IR::HALInlineDialect
     iree::compiler::Dialect::Stream::IR
     iree::compiler::Dialect::Util::Conversion
     iree::compiler::Dialect::Util::IR
     iree::compiler::Dialect::Util::Transforms
+    iree::compiler::Modules::HAL::Inline::Conversion::HALToHALInline
+    iree::compiler::Modules::HAL::Inline::Conversion::StreamToHALInline
+    iree::compiler::Modules::HAL::Inline::IR
+    iree::compiler::Modules::HAL::Inline::IR::HALInlineDialect
     iree::compiler::Utils
   PUBLIC
 )
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Conversion.cpp b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/Conversion.cpp
similarity index 89%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Conversion.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/Conversion.cpp
index a0613f9..8ffc31b 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Conversion.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/Conversion.cpp
@@ -7,14 +7,14 @@
 #include "iree/compiler/Dialect/HAL/Conversion/StandardToHAL/ConvertStandardToHAL.h"
 #include "iree/compiler/Dialect/HAL/Conversion/UtilToHAL/ConvertUtilToHAL.h"
 #include "iree/compiler/Dialect/HAL/IR/HALDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Transforms/PassDetail.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.h"
 #include "iree/compiler/Dialect/Stream/IR/StreamDialect.h"
 #include "iree/compiler/Dialect/Util/Conversion/ConversionPatterns.h"
 #include "iree/compiler/Dialect/Util/IR/UtilDialect.h"
+#include "iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.h"
+#include "iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.h"
+#include "iree/compiler/Modules/HAL/Inline/Transforms/PassDetail.h"
+#include "iree/compiler/Modules/HAL/Inline/Transforms/Passes.h"
 #include "llvm/ADT/STLExtras.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/InlineExecutables.cpp b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/InlineExecutables.cpp
similarity index 98%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/InlineExecutables.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/InlineExecutables.cpp
index afc7ad6..24590c7 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/InlineExecutables.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/InlineExecutables.cpp
@@ -5,12 +5,12 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include "iree/compiler/Dialect/HAL/IR/HALDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Transforms/PassDetail.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.h"
 #include "iree/compiler/Dialect/Stream/IR/StreamDialect.h"
 #include "iree/compiler/Dialect/Stream/IR/StreamOps.h"
 #include "iree/compiler/Dialect/Util/IR/UtilDialect.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.h"
+#include "iree/compiler/Modules/HAL/Inline/Transforms/PassDetail.h"
+#include "iree/compiler/Modules/HAL/Inline/Transforms/Passes.h"
 #include "iree/compiler/Utils/IndexSet.h"
 #include "iree/compiler/Utils/ModuleUtils.h"
 #include "llvm/ADT/STLExtras.h"
diff --git a/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/PassDetail.h b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/PassDetail.h
new file mode 100644
index 0000000..d4c9b8e
--- /dev/null
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/PassDetail.h
@@ -0,0 +1,29 @@
+// Copyright 2022 The IREE Authors
+//
+// Licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#ifndef IREE_COMPILER_MODULES_HAL_INLINE_TRANSFORMS_PASS_DETAIL_H_
+#define IREE_COMPILER_MODULES_HAL_INLINE_TRANSFORMS_PASS_DETAIL_H_
+
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.h"
+#include "mlir/Dialect/Func/IR/FuncOps.h"
+#include "mlir/Pass/Pass.h"
+
+namespace mlir {
+namespace iree_compiler {
+namespace IREE {
+namespace HAL {
+namespace Inline {
+
+#define GEN_PASS_CLASSES
+#include "iree/compiler/Modules/HAL/Inline/Transforms/Passes.h.inc"
+
+}  // namespace Inline
+}  // namespace HAL
+}  // namespace IREE
+}  // namespace iree_compiler
+}  // namespace mlir
+
+#endif  // IREE_COMPILER_MODULES_HAL_INLINE_TRANSFORMS_PASS_DETAIL_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.cpp b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/Passes.cpp
similarity index 96%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/Passes.cpp
index ddd9f4c..eca9882 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/Passes.cpp
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.h"
+#include "iree/compiler/Modules/HAL/Inline/Transforms/Passes.h"
 
 #include <memory>
 
@@ -92,7 +92,7 @@
 
 namespace {
 #define GEN_PASS_REGISTRATION
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.h.inc"
+#include "iree/compiler/Modules/HAL/Inline/Transforms/Passes.h.inc"
 }  // namespace
 
 void registerHALInlinePasses() {
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.h b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/Passes.h
similarity index 87%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.h
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/Passes.h
index b1247fd..e611835 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.h
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/Passes.h
@@ -4,11 +4,11 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_TRANSFORMS_PASSES_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_TRANSFORMS_PASSES_H_
+#ifndef IREE_COMPILER_MODULES_HAL_INLINE_TRANSFORMS_PASSES_H_
+#define IREE_COMPILER_MODULES_HAL_INLINE_TRANSFORMS_PASSES_H_
 
 #include "iree/compiler/Dialect/HAL/Target/TargetBackend.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.h"
 #include "llvm/ADT/StringMap.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
@@ -60,4 +60,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_TRANSFORMS_PASSES_H_
+#endif  // IREE_COMPILER_MODULES_HAL_INLINE_TRANSFORMS_PASSES_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.td b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/Passes.td
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.td
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/Passes.td
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/test/BUILD b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/test/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/test/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/test/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/test/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/test/CMakeLists.txt
similarity index 91%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/test/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/test/CMakeLists.txt
index f32aeb3..f42f66f 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/test/BUILD  #
+# compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/test/BUILD          #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/test/inline_executables.mlir b/compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/test/inline_executables.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms/test/inline_executables.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Inline/Transforms/test/inline_executables.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/hal_inline.imports.mlir b/compiler/src/iree/compiler/Modules/HAL/Inline/hal_inline.imports.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/hal_inline.imports.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Inline/hal_inline.imports.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/BUILD b/compiler/src/iree/compiler/Modules/HAL/Loader/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Loader/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/CMakeLists.txt
similarity index 93%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Loader/CMakeLists.txt
index 9a3effd..cd32ed9 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/BUILD                  #
+# compiler/src/iree/compiler/Modules/HAL/Loader/BUILD                          #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/BUILD b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/CMakeLists.txt
similarity index 91%
copy from compiler/src/iree/compiler/Dialect/Modules/CMakeLists.txt
copy to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/CMakeLists.txt
index 3ef312e..71f9c85 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/BUILD                             #
+# compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/BUILD               #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/BUILD b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/BUILD
similarity index 93%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/BUILD
index a89e383..85ae845 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/BUILD
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/BUILD
@@ -22,11 +22,11 @@
     ],
     deps = [
         "//compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR",
         "//compiler/src/iree/compiler/Dialect/Util/IR",
         "//compiler/src/iree/compiler/Dialect/VM/Conversion",
         "//compiler/src/iree/compiler/Dialect/VM/Conversion/StandardToVM",
         "//compiler/src/iree/compiler/Dialect/VM/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Loader/IR",
         "@llvm-project//mlir:ArithmeticDialect",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/CMakeLists.txt
similarity index 89%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/CMakeLists.txt
index 3facc92..cd95814 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/BUILD#
+# compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/BUILD #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
@@ -24,11 +24,11 @@
     MLIRPass
     MLIRTransforms
     iree::compiler::Dialect::HAL::Conversion::HALToVM
-    iree::compiler::Dialect::Modules::HAL::Loader::IR
     iree::compiler::Dialect::Util::IR
     iree::compiler::Dialect::VM::Conversion
     iree::compiler::Dialect::VM::Conversion::StandardToVM
     iree::compiler::Dialect::VM::IR
+    iree::compiler::Modules::HAL::Loader::IR
   PUBLIC
 )
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.cpp b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.cpp
similarity index 97%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.cpp
index 5fc387f..83ed998 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.cpp
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.h"
+#include "iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.h"
 
 #include "iree/compiler/Dialect/HAL/Conversion/HALToVM/ConvertHALToVM.h"
 #include "iree/compiler/Dialect/Util/IR/UtilTypes.h"
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.h b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.h
similarity index 69%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.h
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.h
index 9a892d5..87c4b30 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.h
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.h
@@ -4,10 +4,10 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_CONVERSION_HALLOADER_CONVERTHALLOADERTOVM_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_CONVERSION_HALLOADER_CONVERTHALLOADERTOVM_H_
+#ifndef IREE_COMPILER_MODULES_HAL_LOADER_CONVERSION_HALLOADER_CONVERTHALLOADERTOVM_H_
+#define IREE_COMPILER_MODULES_HAL_LOADER_CONVERSION_HALLOADER_CONVERTHALLOADERTOVM_H_
 
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.h"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
 
@@ -24,4 +24,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_CONVERSION_HALLOADER_CONVERTHALLOADERTOVM_H_
+#endif  // IREE_COMPILER_MODULES_HAL_LOADER_CONVERSION_HALLOADER_CONVERTHALLOADERTOVM_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/BUILD b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/CMakeLists.txt
similarity index 89%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/CMakeLists.txt
index dbfca8a..9534d6c 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/BUILD#
+# compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/BUILD#
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/executable_ops.mlir b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/executable_ops.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/executable_ops.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/test/executable_ops.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/BUILD b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/BUILD
similarity index 84%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/BUILD
index 2c2b26b..9586409 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/BUILD
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/BUILD
@@ -26,11 +26,11 @@
         "//compiler/src/iree/compiler/Dialect/HAL/IR:HALDialect",
         "//compiler/src/iree/compiler/Dialect/HAL/Target",
         "//compiler/src/iree/compiler/Dialect/HAL/Utils",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR:HALLoaderDialect",
         "//compiler/src/iree/compiler/Dialect/Stream/IR",
         "//compiler/src/iree/compiler/Dialect/Util/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Loader/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Loader/IR:HALLoaderDialect",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:ArithmeticDialect",
         "@llvm-project//mlir:FuncDialect",
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/CMakeLists.txt
similarity index 82%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/CMakeLists.txt
index 9eee0b6..eada165 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/BUILD#
+# compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/BUILD#
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
@@ -29,11 +29,11 @@
     iree::compiler::Dialect::HAL::IR::HALDialect
     iree::compiler::Dialect::HAL::Target
     iree::compiler::Dialect::HAL::Utils
-    iree::compiler::Dialect::Modules::HAL::Inline::IR
-    iree::compiler::Dialect::Modules::HAL::Loader::IR
-    iree::compiler::Dialect::Modules::HAL::Loader::IR::HALLoaderDialect
     iree::compiler::Dialect::Stream::IR
     iree::compiler::Dialect::Util::IR
+    iree::compiler::Modules::HAL::Inline::IR
+    iree::compiler::Modules::HAL::Loader::IR
+    iree::compiler::Modules::HAL::Loader::IR::HALLoaderDialect
   PUBLIC
 )
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.cpp b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.cpp
similarity index 94%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.cpp
index a4ca7ba..dec0d53 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.cpp
@@ -4,17 +4,17 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.h"
+#include "iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.h"
 
 #include "iree/compiler/Dialect/HAL/IR/HALOps.h"
 #include "iree/compiler/Dialect/HAL/IR/HALTypes.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.h"
 #include "iree/compiler/Dialect/Stream/IR/StreamDialect.h"
 #include "iree/compiler/Dialect/Stream/IR/StreamOps.h"
 #include "iree/compiler/Dialect/Stream/IR/StreamTypes.h"
 #include "iree/compiler/Dialect/Util/IR/UtilOps.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineOps.h"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderDialect.h"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Transforms/DialectConversion.h"
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.h b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.h
similarity index 69%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.h
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.h
index 203bdc0..72c697a 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.h
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_CONVERSION_STREAMTOHALLOADER_CONVERTSTREAMTOHALLOADER_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_CONVERSION_STREAMTOHALLOADER_CONVERTSTREAMTOHALLOADER_H_
+#ifndef IREE_COMPILER_MODULES_HAL_LOADER_CONVERSION_STREAMTOHALLOADER_CONVERTSTREAMTOHALLOADER_H_
+#define IREE_COMPILER_MODULES_HAL_LOADER_CONVERSION_STREAMTOHALLOADER_CONVERTSTREAMTOHALLOADER_H_
 
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/DialectConversion.h"
@@ -22,4 +22,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_CONVERSION_STREAMTOHALLOADER_CONVERTSTREAMTOHALLOADER_H_
+#endif  // IREE_COMPILER_MODULES_HAL_LOADER_CONVERSION_STREAMTOHALLOADER_CONVERTSTREAMTOHALLOADER_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/BUILD b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/CMakeLists.txt
similarity index 89%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/CMakeLists.txt
index a3c0aba..5a329c4 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/BUILD#
+# compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/BUILD#
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/cmd_ops.mlir b/compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/cmd_ops.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/cmd_ops.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/test/cmd_ops.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/BUILD b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/BUILD
similarity index 94%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Loader/IR/BUILD
index 732243e..b048d4e 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/BUILD
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/BUILD
@@ -68,9 +68,9 @@
     hdrs = ["HALLoaderDialect.h"],
     deps = [
         ":IR",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Loader:hal_loader_imports",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM",
         "//compiler/src/iree/compiler/Dialect/VM/Conversion",
+        "//compiler/src/iree/compiler/Modules/HAL/Loader:hal_loader_imports",
+        "//compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:FuncDialect",
         "@llvm-project//mlir:IR",
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/CMakeLists.txt
similarity index 89%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Loader/IR/CMakeLists.txt
index d673a27..0b4d4a5 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/BUILD               #
+# compiler/src/iree/compiler/Modules/HAL/Loader/IR/BUILD                       #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
@@ -51,9 +51,9 @@
     MLIRParser
     MLIRSupport
     MLIRTransformUtils
-    iree::compiler::Dialect::Modules::HAL::Loader::Conversion::HALLoaderToVM
-    iree::compiler::Dialect::Modules::HAL::Loader::hal_loader_imports
     iree::compiler::Dialect::VM::Conversion
+    iree::compiler::Modules::HAL::Loader::Conversion::HALLoaderToVM
+    iree::compiler::Modules::HAL::Loader::hal_loader_imports
   PUBLIC
 )
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderBase.td b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderBase.td
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderBase.td
rename to compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderBase.td
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderDialect.cpp b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderDialect.cpp
similarity index 82%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderDialect.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderDialect.cpp
index 08b6418..e99d97d 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderDialect.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderDialect.cpp
@@ -4,12 +4,12 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderDialect.h"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderDialect.h"
 
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/hal_loader.imports.h"
 #include "iree/compiler/Dialect/VM/Conversion/ConversionDialectInterface.h"
+#include "iree/compiler/Modules/HAL/Loader/Conversion/HALLoaderToVM/ConvertHALLoaderToVM.h"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.h"
+#include "iree/compiler/Modules/HAL/Loader/hal_loader.imports.h"
 #include "llvm/Support/SourceMgr.h"
 #include "mlir/IR/DialectImplementation.h"
 #include "mlir/IR/OpImplementation.h"
@@ -52,7 +52,7 @@
 
 #define GET_OP_LIST
   addOperations<
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.cpp.inc"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.cpp.inc"
       >();
 }
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderDialect.h b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderDialect.h
similarity index 75%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderDialect.h
rename to compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderDialect.h
index 4676294..df5b412 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderDialect.h
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderDialect.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_IR_HALLOADERDIALECT_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_IR_HALLOADERDIALECT_H_
+#ifndef IREE_COMPILER_MODULES_HAL_LOADER_IR_HALLOADERDIALECT_H_
+#define IREE_COMPILER_MODULES_HAL_LOADER_IR_HALLOADERDIALECT_H_
 
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
@@ -28,4 +28,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_IR_HALLOADERDIALECT_H_
+#endif  // IREE_COMPILER_MODULES_HAL_LOADER_IR_HALLOADERDIALECT_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.cpp b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.cpp
similarity index 97%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.cpp
index 14586bd..05b2d88 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.cpp
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.h"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.h"
 
 #include "iree/compiler/Dialect/HAL/IR/HALOps.h"
 #include "iree/compiler/Dialect/Util/IR/UtilOps.h"
@@ -209,4 +209,4 @@
 //===----------------------------------------------------------------------===//
 
 #define GET_OP_CLASSES
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.cpp.inc"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.cpp.inc"
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.h
similarity index 68%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h
rename to compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.h
index 97af7e8..2e6e606 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_IR_HALINLINEOPS_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_IR_HALINLINEOPS_H_
+#ifndef IREE_COMPILER_MODULES_HAL_LOADER_IR_HALLOADEROPS_H_
+#define IREE_COMPILER_MODULES_HAL_LOADER_IR_HALLOADEROPS_H_
 
 #include <cstdint>
 
@@ -21,6 +21,6 @@
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
 #define GET_OP_CLASSES
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineOps.h.inc"  // IWYU pragma: keep
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.h.inc"  // IWYU pragma: keep
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_INLINE_IR_HALINLINEOPS_H_
+#endif  // IREE_COMPILER_MODULES_HAL_LOADER_IR_HALLOADEROPS_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.td b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.td
similarity index 98%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.td
rename to compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.td
index 24866e3..9162d9c 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.td
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.td
@@ -8,7 +8,7 @@
 #define IREE_DIALECT_MODULES_HAL_LOADER_OPS
 
 include "iree/compiler/Dialect/HAL/IR/HALBase.td"
-include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderBase.td"
+include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderBase.td"
 include "iree/compiler/Dialect/Util/IR/UtilAttrs.td"
 include "iree/compiler/Dialect/Util/IR/UtilInterfaces.td"
 include "mlir/IR/OpAsmInterface.td"
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/test/BUILD b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/test/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/test/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Loader/IR/test/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/test/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/test/CMakeLists.txt
similarity index 91%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/test/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Loader/IR/test/CMakeLists.txt
index 7779a10..f6809c9 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/test/BUILD          #
+# compiler/src/iree/compiler/Modules/HAL/Loader/IR/test/BUILD                  #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/test/dispatch_folding.mlir b/compiler/src/iree/compiler/Modules/HAL/Loader/IR/test/dispatch_folding.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR/test/dispatch_folding.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Loader/IR/test/dispatch_folding.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/BUILD b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/BUILD
similarity index 81%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/BUILD
index da94dd0..c3c9e0a 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/BUILD
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/BUILD
@@ -29,17 +29,17 @@
         "//compiler/src/iree/compiler/Dialect/HAL/IR:HALDialect",
         "//compiler/src/iree/compiler/Dialect/HAL/Target",
         "//compiler/src/iree/compiler/Dialect/HAL/Transforms",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR:HALInlineDialect",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR:HALLoaderDialect",
         "//compiler/src/iree/compiler/Dialect/Stream/IR",
         "//compiler/src/iree/compiler/Dialect/Util/Conversion",
         "//compiler/src/iree/compiler/Dialect/Util/IR",
         "//compiler/src/iree/compiler/Dialect/Util/Transforms",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/IR:HALInlineDialect",
+        "//compiler/src/iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader",
+        "//compiler/src/iree/compiler/Modules/HAL/Loader/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Loader/IR:HALLoaderDialect",
         "//compiler/src/iree/compiler/Utils",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:AffineDialect",
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/CMakeLists.txt
similarity index 77%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/CMakeLists.txt
index 245bcec..2d341d8 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/BUILD       #
+# compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/BUILD               #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
@@ -43,17 +43,17 @@
     iree::compiler::Dialect::HAL::IR::HALDialect
     iree::compiler::Dialect::HAL::Target
     iree::compiler::Dialect::HAL::Transforms
-    iree::compiler::Dialect::Modules::HAL::Inline::Conversion::HALToHALInline
-    iree::compiler::Dialect::Modules::HAL::Inline::Conversion::StreamToHALInline
-    iree::compiler::Dialect::Modules::HAL::Inline::IR
-    iree::compiler::Dialect::Modules::HAL::Inline::IR::HALInlineDialect
-    iree::compiler::Dialect::Modules::HAL::Loader::Conversion::StreamToHALLoader
-    iree::compiler::Dialect::Modules::HAL::Loader::IR
-    iree::compiler::Dialect::Modules::HAL::Loader::IR::HALLoaderDialect
     iree::compiler::Dialect::Stream::IR
     iree::compiler::Dialect::Util::Conversion
     iree::compiler::Dialect::Util::IR
     iree::compiler::Dialect::Util::Transforms
+    iree::compiler::Modules::HAL::Inline::Conversion::HALToHALInline
+    iree::compiler::Modules::HAL::Inline::Conversion::StreamToHALInline
+    iree::compiler::Modules::HAL::Inline::IR
+    iree::compiler::Modules::HAL::Inline::IR::HALInlineDialect
+    iree::compiler::Modules::HAL::Loader::Conversion::StreamToHALLoader
+    iree::compiler::Modules::HAL::Loader::IR
+    iree::compiler::Modules::HAL::Loader::IR::HALLoaderDialect
     iree::compiler::Utils
   PUBLIC
 )
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Conversion.cpp b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/Conversion.cpp
similarity index 87%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Conversion.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/Conversion.cpp
index b94a529..2107691 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Conversion.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/Conversion.cpp
@@ -7,16 +7,16 @@
 #include "iree/compiler/Dialect/HAL/Conversion/StandardToHAL/ConvertStandardToHAL.h"
 #include "iree/compiler/Dialect/HAL/Conversion/UtilToHAL/ConvertUtilToHAL.h"
 #include "iree/compiler/Dialect/HAL/IR/HALDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Transforms/PassDetail.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.h"
 #include "iree/compiler/Dialect/Stream/IR/StreamDialect.h"
 #include "iree/compiler/Dialect/Util/Conversion/ConversionPatterns.h"
 #include "iree/compiler/Dialect/Util/IR/UtilDialect.h"
+#include "iree/compiler/Modules/HAL/Inline/Conversion/HALToHALInline/ConvertHALToHALInline.h"
+#include "iree/compiler/Modules/HAL/Inline/Conversion/StreamToHALInline/ConvertStreamToHALInline.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.h"
+#include "iree/compiler/Modules/HAL/Loader/Conversion/StreamToHALLoader/ConvertStreamToHALLoader.h"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderDialect.h"
+#include "iree/compiler/Modules/HAL/Loader/Transforms/PassDetail.h"
+#include "iree/compiler/Modules/HAL/Loader/Transforms/Passes.h"
 #include "llvm/ADT/STLExtras.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/MaterializeExecutables.cpp b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/MaterializeExecutables.cpp
similarity index 96%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/MaterializeExecutables.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/MaterializeExecutables.cpp
index c62ea78..9091641 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/MaterializeExecutables.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/MaterializeExecutables.cpp
@@ -5,10 +5,10 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include "iree/compiler/Dialect/HAL/IR/HALDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Transforms/PassDetail.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.h"
 #include "iree/compiler/Dialect/Util/IR/UtilDialect.h"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderDialect.h"
+#include "iree/compiler/Modules/HAL/Loader/Transforms/PassDetail.h"
+#include "iree/compiler/Modules/HAL/Loader/Transforms/Passes.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
 #include "mlir/Dialect/ControlFlow/IR/ControlFlow.h"
 #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h"
diff --git a/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/PassDetail.h b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/PassDetail.h
new file mode 100644
index 0000000..55fdb52
--- /dev/null
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/PassDetail.h
@@ -0,0 +1,29 @@
+// Copyright 2022 The IREE Authors
+//
+// Licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#ifndef IREE_COMPILER_MODULES_HAL_LOADER_TRANSFORMS_PASS_DETAIL_H_
+#define IREE_COMPILER_MODULES_HAL_LOADER_TRANSFORMS_PASS_DETAIL_H_
+
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.h"
+#include "mlir/Dialect/Func/IR/FuncOps.h"
+#include "mlir/Pass/Pass.h"
+
+namespace mlir {
+namespace iree_compiler {
+namespace IREE {
+namespace HAL {
+namespace Loader {
+
+#define GEN_PASS_CLASSES
+#include "iree/compiler/Modules/HAL/Loader/Transforms/Passes.h.inc"
+
+}  // namespace Loader
+}  // namespace HAL
+}  // namespace IREE
+}  // namespace iree_compiler
+}  // namespace mlir
+
+#endif  // IREE_COMPILER_MODULES_HAL_LOADER_TRANSFORMS_PASS_DETAIL_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.cpp b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/Passes.cpp
similarity index 96%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/Passes.cpp
index afd4763..10ffdf0 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/Passes.cpp
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.h"
+#include "iree/compiler/Modules/HAL/Loader/Transforms/Passes.h"
 
 #include <memory>
 
@@ -112,7 +112,7 @@
 
 namespace {
 #define GEN_PASS_REGISTRATION
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.h.inc"
+#include "iree/compiler/Modules/HAL/Loader/Transforms/Passes.h.inc"
 }  // namespace
 
 void registerHALLoaderPasses() {
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.h b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/Passes.h
similarity index 88%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.h
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/Passes.h
index 4396977..1d93a00 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.h
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/Passes.h
@@ -4,11 +4,11 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_TRANSFORMS_PASSES_H_
-#define IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_TRANSFORMS_PASSES_H_
+#ifndef IREE_COMPILER_MODULES_HAL_LOADER_TRANSFORMS_PASSES_H_
+#define IREE_COMPILER_MODULES_HAL_LOADER_TRANSFORMS_PASSES_H_
 
 #include "iree/compiler/Dialect/HAL/Target/TargetBackend.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.h"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.h"
 #include "llvm/ADT/StringMap.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
@@ -65,4 +65,4 @@
 }  // namespace iree_compiler
 }  // namespace mlir
 
-#endif  // IREE_COMPILER_DIALECT_MODULES_HAL_LOADER_TRANSFORMS_PASSES_H_
+#endif  // IREE_COMPILER_MODULES_HAL_LOADER_TRANSFORMS_PASSES_H_
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.td b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/Passes.td
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.td
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/Passes.td
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/ResolveExportOrdinals.cpp b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/ResolveExportOrdinals.cpp
similarity index 87%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/ResolveExportOrdinals.cpp
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/ResolveExportOrdinals.cpp
index 3932a71..24e2026 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/ResolveExportOrdinals.cpp
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/ResolveExportOrdinals.cpp
@@ -4,10 +4,10 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderOps.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Transforms/PassDetail.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.h"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderDialect.h"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderOps.h"
+#include "iree/compiler/Modules/HAL/Loader/Transforms/PassDetail.h"
+#include "iree/compiler/Modules/HAL/Loader/Transforms/Passes.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/test/BUILD b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/test/BUILD
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/test/BUILD
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/test/BUILD
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/test/CMakeLists.txt b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/test/CMakeLists.txt
similarity index 91%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/test/CMakeLists.txt
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/test/CMakeLists.txt
index 11f6cf0..e83d447 100644
--- a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 ################################################################################
 # Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from           #
-# compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/test/BUILD  #
+# compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/test/BUILD          #
 #                                                                              #
 # Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary   #
 # CMake-only content.                                                          #
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/test/materialize_executables.mlir b/compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/test/materialize_executables.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms/test/materialize_executables.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Loader/Transforms/test/materialize_executables.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/hal_loader.imports.mlir b/compiler/src/iree/compiler/Modules/HAL/Loader/hal_loader.imports.mlir
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/hal_loader.imports.mlir
rename to compiler/src/iree/compiler/Modules/HAL/Loader/hal_loader.imports.mlir
diff --git a/compiler/src/iree/compiler/Dialect/Modules/README.md b/compiler/src/iree/compiler/Modules/README.md
similarity index 100%
rename from compiler/src/iree/compiler/Dialect/Modules/README.md
rename to compiler/src/iree/compiler/Modules/README.md
diff --git a/compiler/src/iree/compiler/Pipelines/BUILD b/compiler/src/iree/compiler/Pipelines/BUILD
index a5751f0..4dec7ed 100644
--- a/compiler/src/iree/compiler/Pipelines/BUILD
+++ b/compiler/src/iree/compiler/Pipelines/BUILD
@@ -39,8 +39,6 @@
         "//compiler/src/iree/compiler/Dialect/Flow/Transforms",
         "//compiler/src/iree/compiler/Dialect/HAL/Conversion/HALToVM",
         "//compiler/src/iree/compiler/Dialect/HAL/Transforms",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms",
         "//compiler/src/iree/compiler/Dialect/Stream/Transforms",
         "//compiler/src/iree/compiler/Dialect/Util/Transforms",
         "//compiler/src/iree/compiler/Dialect/VM/Conversion",
@@ -51,6 +49,8 @@
         "//compiler/src/iree/compiler/InputConversion/MHLO",
         "//compiler/src/iree/compiler/InputConversion/TMTensor",
         "//compiler/src/iree/compiler/InputConversion/TOSA",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/Transforms",
+        "//compiler/src/iree/compiler/Modules/HAL/Loader/Transforms",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:IR",
         "@llvm-project//mlir:Pass",
diff --git a/compiler/src/iree/compiler/Pipelines/CMakeLists.txt b/compiler/src/iree/compiler/Pipelines/CMakeLists.txt
index 3be2507..b30a860 100644
--- a/compiler/src/iree/compiler/Pipelines/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Pipelines/CMakeLists.txt
@@ -48,14 +48,14 @@
     iree::compiler::Dialect::Flow::Transforms
     iree::compiler::Dialect::HAL::Conversion::HALToVM
     iree::compiler::Dialect::HAL::Transforms
-    iree::compiler::Dialect::Modules::HAL::Inline::Transforms
-    iree::compiler::Dialect::Modules::HAL::Loader::Transforms
     iree::compiler::Dialect::Stream::Transforms
     iree::compiler::Dialect::Util::Transforms
     iree::compiler::Dialect::VM::Conversion
     iree::compiler::Dialect::VM::Conversion::StandardToVM
     iree::compiler::Dialect::VM::Target::Bytecode
     iree::compiler::Dialect::VM::Transforms
+    iree::compiler::Modules::HAL::Inline::Transforms
+    iree::compiler::Modules::HAL::Loader::Transforms
     iree::compiler::InputConversion::Common
   PUBLIC
 )
diff --git a/compiler/src/iree/compiler/Pipelines/Pipelines.cpp b/compiler/src/iree/compiler/Pipelines/Pipelines.cpp
index 671d046..82ed296 100644
--- a/compiler/src/iree/compiler/Pipelines/Pipelines.cpp
+++ b/compiler/src/iree/compiler/Pipelines/Pipelines.cpp
@@ -10,12 +10,12 @@
 #include "iree/compiler/Bindings/TFLite/Transforms/Passes.h"
 #include "iree/compiler/Dialect/Flow/Transforms/Passes.h"
 #include "iree/compiler/Dialect/HAL/Transforms/Passes.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.h"
 #include "iree/compiler/Dialect/Stream/Transforms/Passes.h"
 #include "iree/compiler/Dialect/Util/Transforms/Passes.h"
 #include "iree/compiler/Dialect/VM/Transforms/Passes.h"
 #include "iree/compiler/InputConversion/Common/Passes.h"
+#include "iree/compiler/Modules/HAL/Inline/Transforms/Passes.h"
+#include "iree/compiler/Modules/HAL/Loader/Transforms/Passes.h"
 
 #ifdef IREE_HAVE_MHLO_INPUT
 #include "iree/compiler/InputConversion/MHLO/Passes.h"
diff --git a/compiler/src/iree/compiler/Tools/BUILD b/compiler/src/iree/compiler/Tools/BUILD
index 4ab41f6..37b44a0 100644
--- a/compiler/src/iree/compiler/Tools/BUILD
+++ b/compiler/src/iree/compiler/Tools/BUILD
@@ -51,10 +51,6 @@
         "//compiler/src/iree/compiler/Dialect/Flow/Transforms",
         "//compiler/src/iree/compiler/Dialect/HAL/IR:HALDialect",
         "//compiler/src/iree/compiler/Dialect/HAL/Transforms",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/IR:HALInlineDialect",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Inline/Transforms",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/IR:HALLoaderDialect",
-        "//compiler/src/iree/compiler/Dialect/Modules/HAL/Loader/Transforms",
         "//compiler/src/iree/compiler/Dialect/Stream/IR",
         "//compiler/src/iree/compiler/Dialect/Stream/Transforms",
         "//compiler/src/iree/compiler/Dialect/Util/IR",
@@ -67,6 +63,10 @@
         "//compiler/src/iree/compiler/Dialect/VMVX/IR:VMVXDialect",
         "//compiler/src/iree/compiler/Dialect/VMVX/Transforms",
         "//compiler/src/iree/compiler/Dialect/Vulkan/IR",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/IR:HALInlineDialect",
+        "//compiler/src/iree/compiler/Modules/HAL/Inline/Transforms",
+        "//compiler/src/iree/compiler/Modules/HAL/Loader/IR:HALLoaderDialect",
+        "//compiler/src/iree/compiler/Modules/HAL/Loader/Transforms",
         "//compiler/src/iree/compiler/Pipelines",
         "//llvm-external-projects/iree-dialects:IREEInputDialect",
         "//llvm-external-projects/iree-dialects:IREELinalgExtDialect",
@@ -140,7 +140,7 @@
     name = "init_compiler_modules",
     hdrs = ["init_compiler_modules.h"],
     deps = [
-        "//compiler/src/iree/compiler/Dialect/Modules/Check/IR:CheckDialect",
+        "//compiler/src/iree/compiler/Modules/Check/IR:CheckDialect",
     ],
 )
 
diff --git a/compiler/src/iree/compiler/Tools/CMakeLists.txt b/compiler/src/iree/compiler/Tools/CMakeLists.txt
index e491baf..93d59e4 100644
--- a/compiler/src/iree/compiler/Tools/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Tools/CMakeLists.txt
@@ -89,14 +89,11 @@
     iree::compiler::Bindings::TFLite::Transforms
     iree::compiler::Codegen::Dialect::IREECodegenDialect
     iree::compiler::Codegen::Interfaces::Interfaces
+    iree::compiler::ConstEval
     iree::compiler::Dialect::Flow::IR
     iree::compiler::Dialect::Flow::Transforms
     iree::compiler::Dialect::HAL::IR::HALDialect
     iree::compiler::Dialect::HAL::Transforms
-    iree::compiler::Dialect::Modules::HAL::Inline::IR::HALInlineDialect
-    iree::compiler::Dialect::Modules::HAL::Inline::Transforms
-    iree::compiler::Dialect::Modules::HAL::Loader::IR::HALLoaderDialect
-    iree::compiler::Dialect::Modules::HAL::Loader::Transforms
     iree::compiler::Dialect::Stream::IR
     iree::compiler::Dialect::Stream::Transforms
     iree::compiler::Dialect::Util::IR
@@ -109,7 +106,10 @@
     iree::compiler::Dialect::VMVX::IR::VMVXDialect
     iree::compiler::Dialect::VMVX::Transforms
     iree::compiler::Dialect::Vulkan::IR
-    iree::compiler::ConstEval
+    iree::compiler::Modules::HAL::Inline::IR::HALInlineDialect
+    iree::compiler::Modules::HAL::Inline::Transforms
+    iree::compiler::Modules::HAL::Loader::IR::HALLoaderDialect
+    iree::compiler::Modules::HAL::Loader::Transforms
     iree::compiler::Pipelines
   PUBLIC
 )
@@ -185,7 +185,7 @@
   HDRS
     "init_compiler_modules.h"
   DEPS
-    iree::compiler::Dialect::Modules::Check::IR::CheckDialect
+    iree::compiler::Modules::Check::IR::CheckDialect
 )
 
 iree_cc_library(
diff --git a/compiler/src/iree/compiler/Tools/init_compiler_modules.h b/compiler/src/iree/compiler/Tools/init_compiler_modules.h
index c04f310..090c14b 100644
--- a/compiler/src/iree/compiler/Tools/init_compiler_modules.h
+++ b/compiler/src/iree/compiler/Tools/init_compiler_modules.h
@@ -7,7 +7,7 @@
 #ifndef IREE_COMPILER_TOOLS_INIT_COMPILER_MODULES_H_
 #define IREE_COMPILER_TOOLS_INIT_COMPILER_MODULES_H_
 
-#include "iree/compiler/Dialect/Modules/Check/IR/CheckDialect.h"
+#include "iree/compiler/Modules/Check/IR/CheckDialect.h"
 
 namespace mlir {
 namespace iree_compiler {
diff --git a/compiler/src/iree/compiler/Tools/init_iree_dialects.h b/compiler/src/iree/compiler/Tools/init_iree_dialects.h
index 9af5377..5472749 100644
--- a/compiler/src/iree/compiler/Tools/init_iree_dialects.h
+++ b/compiler/src/iree/compiler/Tools/init_iree_dialects.h
@@ -21,14 +21,14 @@
 #include "iree/compiler/Codegen/Interfaces/Interfaces.h"
 #include "iree/compiler/Dialect/Flow/IR/FlowDialect.h"
 #include "iree/compiler/Dialect/HAL/IR/HALDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/IR/HALInlineDialect.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/IR/HALLoaderDialect.h"
 #include "iree/compiler/Dialect/Stream/IR/StreamDialect.h"
 #include "iree/compiler/Dialect/Util/IR/UtilDialect.h"
 #include "iree/compiler/Dialect/Util/IR/UtilExternalModels.h"
 #include "iree/compiler/Dialect/VM/IR/VMDialect.h"
 #include "iree/compiler/Dialect/VMVX/IR/VMVXDialect.h"
 #include "iree/compiler/Dialect/Vulkan/IR/VulkanDialect.h"
+#include "iree/compiler/Modules/HAL/Inline/IR/HALInlineDialect.h"
+#include "iree/compiler/Modules/HAL/Loader/IR/HALLoaderDialect.h"
 #include "mlir/IR/Dialect.h"
 
 namespace mlir {
diff --git a/compiler/src/iree/compiler/Tools/init_iree_passes.h b/compiler/src/iree/compiler/Tools/init_iree_passes.h
index 443523c..4e6cb8e 100644
--- a/compiler/src/iree/compiler/Tools/init_iree_passes.h
+++ b/compiler/src/iree/compiler/Tools/init_iree_passes.h
@@ -20,13 +20,13 @@
 #include "iree/compiler/ConstEval/Passes.h"
 #include "iree/compiler/Dialect/Flow/Transforms/Passes.h"
 #include "iree/compiler/Dialect/HAL/Transforms/Passes.h"
-#include "iree/compiler/Dialect/Modules/HAL/Inline/Transforms/Passes.h"
-#include "iree/compiler/Dialect/Modules/HAL/Loader/Transforms/Passes.h"
 #include "iree/compiler/Dialect/Stream/Transforms/Passes.h"
 #include "iree/compiler/Dialect/Util/Transforms/Passes.h"
 #include "iree/compiler/Dialect/VM/Analysis/TestPasses.h"
 #include "iree/compiler/Dialect/VM/Transforms/Passes.h"
 #include "iree/compiler/Dialect/VMVX/Transforms/Passes.h"
+#include "iree/compiler/Modules/HAL/Inline/Transforms/Passes.h"
+#include "iree/compiler/Modules/HAL/Loader/Transforms/Passes.h"
 #include "iree/compiler/Pipelines/Pipelines.h"
 
 #ifdef IREE_HAVE_C_OUTPUT_FORMAT
diff --git a/docs/developers/developing_iree/testing_guide.md b/docs/developers/developing_iree/testing_guide.md
index db1207b..f15e70f 100644
--- a/docs/developers/developing_iree/testing_guide.md
+++ b/docs/developers/developing_iree/testing_guide.md
@@ -277,7 +277,7 @@
 Next we use this input constant to exercise the runtime feature under test (in
 this case, just a single floor operation). Finally, we use a check dialect
 operation to make an assertion about the output. There are a few different
-[assertion operations](https://github.com/iree-org/iree/tree/main/iree/compiler/Dialect/Modules/Check).
+[assertion operations](https://github.com/iree-org/iree/tree/main/iree/compiler/Modules/Check).
 Here we use the `expect_almost_eq_const` op: *almost* because we are comparing
 floats and want to allow for floating-point imprecision, and *const* because we
 want to compare it to a constant value. This last part is just syntactic sugar