diff --git a/modules/dml/__init__.py b/modules/dml/__init__.py
index fbda39384..90beb96d7 100644
--- a/modules/dml/__init__.py
+++ b/modules/dml/__init__.py
@@ -1,11 +1,9 @@
 import torch
 import torch_directml
 
-import modules.dml.kdiffusion
-import modules.dml.stablediffusion
-import modules.dml.torch
+import modules.dml.hijack
 
-from optimizer.unknown import UnknownOptimizer
+from modules.dml.optimizer.unknown import UnknownOptimizer
 
 class DirectML():
     def get_optimizer(self, device: torch.device):
@@ -13,11 +11,11 @@ class DirectML():
         try:
             device_name = torch_directml.device_name(device.index)
             if 'NVIDIA' in device_name or 'GeForce' in device_name:
-                from optimizer.nvidia import nVidiaOptimizer as optimizer
+                from modules.dml.optimizer.nvidia import nVidiaOptimizer as optimizer
             elif 'AMD' in device_name or 'Radeon' in device_name:
-                from optimizer.amd import AMDOptimizer as optimizer
+                from modules.dml.optimizer.amd import AMDOptimizer as optimizer
             elif 'Intel' in device_name:
-                from optimizer.intel import IntelOptimizer as optimizer
+                from modules.dml.optimizer.intel import IntelOptimizer as optimizer
             else:
                 return UnknownOptimizer
             return optimizer
diff --git a/modules/dml/hijack/__init__.py b/modules/dml/hijack/__init__.py
new file mode 100644
index 000000000..5cf59a704
--- /dev/null
+++ b/modules/dml/hijack/__init__.py
@@ -0,0 +1,3 @@
+import modules.dml.hijack.kdiffusion
+import modules.dml.hijack.stablediffusion
+import modules.dml.hijack.torch
diff --git a/modules/dml/kdiffusion.py b/modules/dml/hijack/kdiffusion.py
similarity index 100%
rename from modules/dml/kdiffusion.py
rename to modules/dml/hijack/kdiffusion.py
diff --git a/modules/dml/stablediffusion.py b/modules/dml/hijack/stablediffusion.py
similarity index 100%
rename from modules/dml/stablediffusion.py
rename to modules/dml/hijack/stablediffusion.py
diff --git a/modules/dml/torch.py b/modules/dml/hijack/torch.py
similarity index 100%
rename from modules/dml/torch.py
rename to modules/dml/hijack/torch.py
diff --git a/modules/sd_hijack_optimizations.py b/modules/sd_hijack_optimizations.py
index e9d065a32..12ee9f956 100644
--- a/modules/sd_hijack_optimizations.py
+++ b/modules/sd_hijack_optimizations.py
@@ -20,9 +20,6 @@ if shared.opts.cross_attention_optimization == "xFormers":
     except Exception:
         pass
 
-if shared.device.type == 'privateuseone':
-    import dml
-
 
 def get_available_vram():
     if shared.device.type == 'cuda':