diff --git a/litex/gen/__init__.py b/litex/gen/__init__.py
index 56a7f89fa..507ac7efe 100644
--- a/litex/gen/__init__.py
+++ b/litex/gen/__init__.py
@@ -1,2 +1,3 @@
 from litex.gen.sim import *
 from litex.gen.common import *
+from litex.gen.fhdl.module import *
diff --git a/litex/gen/common.py b/litex/gen/common.py
index 3ce0696d1..b30047600 100644
--- a/litex/gen/common.py
+++ b/litex/gen/common.py
@@ -5,12 +5,6 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 from migen import *
-from migen.fhdl.module import _ModuleProxy
-from migen.fhdl.specials import Special
-
-from litex.soc.interconnect.csr import AutoCSR
-from litex.soc.integration.doc import AutoDoc
-
 
 # Bit/Bytes Reversing ------------------------------------------------------------------------------
 
@@ -48,42 +42,3 @@ def Reduce(operator, value):
 
     # Return Python's reduction.
     return reduce(operators[operator], value)
-
-# LiteX Module -------------------------------------------------------------------------------------
-
-class LiteXModule(Module, AutoCSR, AutoDoc):
-    def __setattr__(m, name, value):
-        # Migen:
-        if name in ["comb", "sync", "specials", "submodules", "clock_domains"]:
-            if not isinstance(value, _ModuleProxy):
-                raise AttributeError("Attempted to assign special Module property - use += instead")
-        # LiteX fix-up: Automatically collect specials/submodules/clock_domains:
-        # - m.module_x  = .. equivalent of Migen's m.submodules.module_x = ..
-        elif isinstance(value, Module)      and ((name, value) not in m._submodules):
-            setattr(m.submodules, name, value)
-        # - m.special_x = .. equivalent of Migen's m.specials.special_x  = ..
-        elif isinstance(value, Special)     and (value not in m._fragment.specials):
-            setattr(m.specials, name, value)
-        # - m.cd_x      = .. equivalent of Migen's m.clock_domains.cd_x  = ..
-        elif isinstance(value, ClockDomain) and (value not in m._fragment.clock_domains):
-            setattr(m.clock_domains, name, value)
-        # Else use default __setattr__.
-        else:
-            object.__setattr__(m, name, value)
-
-    # LiteX fix-up: Automatically collect specials/submodules/clock_domains:
-    def __iadd__(m, other):
-        # - m += module_x  equivalent of Migen's m.submodules += module_x.
-        if isinstance(other, Module):
-            print(other)
-            m.submodules += other
-        # - m += special_x  equivalent of Migen's m.specials += special_x.
-        elif isinstnace(other, Special):
-            m.specials += other
-        # - m += cd_x  equivalent of Migen's m.clock_domains += cd_x.
-        elif isinstance(other, ClockDomain):
-            m.clock_domains += other
-        # Else use default __iadd__.
-        else:
-            object.__iadd__(m, other)
-        return m
diff --git a/litex/gen/fhdl/module.py b/litex/gen/fhdl/module.py
new file mode 100644
index 000000000..16aafe92f
--- /dev/null
+++ b/litex/gen/fhdl/module.py
@@ -0,0 +1,51 @@
+#
+# This file is part of LiteX.
+#
+# This file is Copyright (c) 2022 Florent Kermarrec <florent@enjoy-digital.fr>
+# SPDX-License-Identifier: BSD-2-Clause
+
+from migen import *
+from migen.fhdl.module import _ModuleProxy
+from migen.fhdl.specials import Special
+
+from litex.soc.interconnect.csr import AutoCSR
+from litex.soc.integration.doc import AutoDoc
+
+# LiteX Module -------------------------------------------------------------------------------------
+
+class LiteXModule(Module, AutoCSR, AutoDoc):
+    def __setattr__(m, name, value):
+        # Migen:
+        if name in ["comb", "sync", "specials", "submodules", "clock_domains"]:
+            if not isinstance(value, _ModuleProxy):
+                raise AttributeError("Attempted to assign special Module property - use += instead")
+        # LiteX fix-up: Automatically collect specials/submodules/clock_domains:
+        # - m.module_x  = .. equivalent of Migen's m.submodules.module_x = ..
+        elif isinstance(value, Module)      and ((name, value) not in m._submodules):
+            setattr(m.submodules, name, value)
+        # - m.special_x = .. equivalent of Migen's m.specials.special_x  = ..
+        elif isinstance(value, Special)     and (value not in m._fragment.specials):
+            setattr(m.specials, name, value)
+        # - m.cd_x      = .. equivalent of Migen's m.clock_domains.cd_x  = ..
+        elif isinstance(value, ClockDomain) and (value not in m._fragment.clock_domains):
+            setattr(m.clock_domains, name, value)
+        # Else use default __setattr__.
+        else:
+            object.__setattr__(m, name, value)
+
+    # LiteX fix-up: Automatically collect specials/submodules/clock_domains:
+    def __iadd__(m, other):
+        # - m += module_x  equivalent of Migen's m.submodules += module_x.
+        if isinstance(other, Module):
+            print(other)
+            m.submodules += other
+        # - m += special_x  equivalent of Migen's m.specials += special_x.
+        elif isinstnace(other, Special):
+            m.specials += other
+        # - m += cd_x  equivalent of Migen's m.clock_domains += cd_x.
+        elif isinstance(other, ClockDomain):
+            m.clock_domains += other
+        # Else use default __iadd__.
+        else:
+            object.__iadd__(m, other)
+        return m