diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bcfafa39..23207a9d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -78,7 +78,6 @@ add_library(dynarmic
     common/u128.cpp
     common/u128.h
     common/variant_util.h
-    frontend/imm.h
     frontend/A32/decoder/arm.h
     frontend/A32/decoder/arm.inc
     frontend/A32/decoder/thumb16.h
@@ -95,29 +94,29 @@ add_library(dynarmic
     frontend/A32/location_descriptor.cpp
     frontend/A32/location_descriptor.h
     frontend/A32/PSR.h
+    frontend/A32/translate/impl/barrier.cpp
+    frontend/A32/translate/impl/branch.cpp
+    frontend/A32/translate/impl/coprocessor.cpp
+    frontend/A32/translate/impl/crc32.cpp
+    frontend/A32/translate/impl/data_processing.cpp
+    frontend/A32/translate/impl/divide.cpp
+    frontend/A32/translate/impl/exception_generating.cpp
+    frontend/A32/translate/impl/extension.cpp
+    frontend/A32/translate/impl/hint.cpp
+    frontend/A32/translate/impl/load_store.cpp
+    frontend/A32/translate/impl/misc.cpp
+    frontend/A32/translate/impl/multiply.cpp
+    frontend/A32/translate/impl/packing.cpp
+    frontend/A32/translate/impl/parallel.cpp
+    frontend/A32/translate/impl/reversal.cpp
+    frontend/A32/translate/impl/saturated.cpp
+    frontend/A32/translate/impl/status_register_access.cpp
+    frontend/A32/translate/impl/synchronization.cpp
+    frontend/A32/translate/impl/translate_arm.h
+    frontend/A32/translate/impl/vfp.cpp
     frontend/A32/translate/translate.cpp
     frontend/A32/translate/translate.h
     frontend/A32/translate/translate_arm.cpp
-    frontend/A32/translate/translate_arm/barrier.cpp
-    frontend/A32/translate/translate_arm/branch.cpp
-    frontend/A32/translate/translate_arm/coprocessor.cpp
-    frontend/A32/translate/translate_arm/crc32.cpp
-    frontend/A32/translate/translate_arm/data_processing.cpp
-    frontend/A32/translate/translate_arm/divide.cpp
-    frontend/A32/translate/translate_arm/exception_generating.cpp
-    frontend/A32/translate/translate_arm/extension.cpp
-    frontend/A32/translate/translate_arm/hint.cpp
-    frontend/A32/translate/translate_arm/load_store.cpp
-    frontend/A32/translate/translate_arm/misc.cpp
-    frontend/A32/translate/translate_arm/multiply.cpp
-    frontend/A32/translate/translate_arm/packing.cpp
-    frontend/A32/translate/translate_arm/parallel.cpp
-    frontend/A32/translate/translate_arm/reversal.cpp
-    frontend/A32/translate/translate_arm/saturated.cpp
-    frontend/A32/translate/translate_arm/status_register_access.cpp
-    frontend/A32/translate/translate_arm/synchronization.cpp
-    frontend/A32/translate/translate_arm/translate_arm.h
-    frontend/A32/translate/translate_arm/vfp.cpp
     frontend/A32/translate/translate_thumb.cpp
     frontend/A32/types.cpp
     frontend/A32/types.h
@@ -191,6 +190,7 @@ add_library(dynarmic
     frontend/A64/types.h
     frontend/decoder/decoder_detail.h
     frontend/decoder/matcher.h
+    frontend/imm.h
     frontend/ir/basic_block.cpp
     frontend/ir/basic_block.h
     frontend/ir/cond.h
diff --git a/src/frontend/A32/translate/translate_arm/barrier.cpp b/src/frontend/A32/translate/impl/barrier.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/barrier.cpp
rename to src/frontend/A32/translate/impl/barrier.cpp
diff --git a/src/frontend/A32/translate/translate_arm/branch.cpp b/src/frontend/A32/translate/impl/branch.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/branch.cpp
rename to src/frontend/A32/translate/impl/branch.cpp
diff --git a/src/frontend/A32/translate/translate_arm/coprocessor.cpp b/src/frontend/A32/translate/impl/coprocessor.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/coprocessor.cpp
rename to src/frontend/A32/translate/impl/coprocessor.cpp
diff --git a/src/frontend/A32/translate/translate_arm/crc32.cpp b/src/frontend/A32/translate/impl/crc32.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/crc32.cpp
rename to src/frontend/A32/translate/impl/crc32.cpp
diff --git a/src/frontend/A32/translate/translate_arm/data_processing.cpp b/src/frontend/A32/translate/impl/data_processing.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/data_processing.cpp
rename to src/frontend/A32/translate/impl/data_processing.cpp
diff --git a/src/frontend/A32/translate/translate_arm/divide.cpp b/src/frontend/A32/translate/impl/divide.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/divide.cpp
rename to src/frontend/A32/translate/impl/divide.cpp
diff --git a/src/frontend/A32/translate/translate_arm/exception_generating.cpp b/src/frontend/A32/translate/impl/exception_generating.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/exception_generating.cpp
rename to src/frontend/A32/translate/impl/exception_generating.cpp
diff --git a/src/frontend/A32/translate/translate_arm/extension.cpp b/src/frontend/A32/translate/impl/extension.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/extension.cpp
rename to src/frontend/A32/translate/impl/extension.cpp
diff --git a/src/frontend/A32/translate/translate_arm/hint.cpp b/src/frontend/A32/translate/impl/hint.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/hint.cpp
rename to src/frontend/A32/translate/impl/hint.cpp
diff --git a/src/frontend/A32/translate/translate_arm/load_store.cpp b/src/frontend/A32/translate/impl/load_store.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/load_store.cpp
rename to src/frontend/A32/translate/impl/load_store.cpp
diff --git a/src/frontend/A32/translate/translate_arm/misc.cpp b/src/frontend/A32/translate/impl/misc.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/misc.cpp
rename to src/frontend/A32/translate/impl/misc.cpp
diff --git a/src/frontend/A32/translate/translate_arm/multiply.cpp b/src/frontend/A32/translate/impl/multiply.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/multiply.cpp
rename to src/frontend/A32/translate/impl/multiply.cpp
diff --git a/src/frontend/A32/translate/translate_arm/packing.cpp b/src/frontend/A32/translate/impl/packing.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/packing.cpp
rename to src/frontend/A32/translate/impl/packing.cpp
diff --git a/src/frontend/A32/translate/translate_arm/parallel.cpp b/src/frontend/A32/translate/impl/parallel.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/parallel.cpp
rename to src/frontend/A32/translate/impl/parallel.cpp
diff --git a/src/frontend/A32/translate/translate_arm/reversal.cpp b/src/frontend/A32/translate/impl/reversal.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/reversal.cpp
rename to src/frontend/A32/translate/impl/reversal.cpp
diff --git a/src/frontend/A32/translate/translate_arm/saturated.cpp b/src/frontend/A32/translate/impl/saturated.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/saturated.cpp
rename to src/frontend/A32/translate/impl/saturated.cpp
diff --git a/src/frontend/A32/translate/translate_arm/status_register_access.cpp b/src/frontend/A32/translate/impl/status_register_access.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/status_register_access.cpp
rename to src/frontend/A32/translate/impl/status_register_access.cpp
diff --git a/src/frontend/A32/translate/translate_arm/synchronization.cpp b/src/frontend/A32/translate/impl/synchronization.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/synchronization.cpp
rename to src/frontend/A32/translate/impl/synchronization.cpp
diff --git a/src/frontend/A32/translate/translate_arm/translate_arm.h b/src/frontend/A32/translate/impl/translate_arm.h
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/translate_arm.h
rename to src/frontend/A32/translate/impl/translate_arm.h
diff --git a/src/frontend/A32/translate/translate_arm/vfp.cpp b/src/frontend/A32/translate/impl/vfp.cpp
similarity index 100%
rename from src/frontend/A32/translate/translate_arm/vfp.cpp
rename to src/frontend/A32/translate/impl/vfp.cpp
diff --git a/src/frontend/A32/translate/translate_arm.cpp b/src/frontend/A32/translate/translate_arm.cpp
index 4c557c22..247694d9 100644
--- a/src/frontend/A32/translate/translate_arm.cpp
+++ b/src/frontend/A32/translate/translate_arm.cpp
@@ -11,8 +11,8 @@
 #include "frontend/A32/decoder/arm.h"
 #include "frontend/A32/decoder/vfp.h"
 #include "frontend/A32/location_descriptor.h"
+#include "frontend/A32/translate/impl/translate_arm.h"
 #include "frontend/A32/translate/translate.h"
-#include "frontend/A32/translate/translate_arm/translate_arm.h"
 #include "frontend/A32/types.h"
 #include "frontend/ir/basic_block.h"