diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 29d99dc3..c3bf2e8d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -207,51 +207,51 @@ add_library(dynarmic
 
 if (ARCHITECTURE_x86_64)
     target_sources(dynarmic PRIVATE
-         backend_x64/a32_emit_x64.cpp
-         backend_x64/a32_emit_x64.h
-         backend_x64/a32_interface.cpp
-         backend_x64/a32_jitstate.cpp
-         backend_x64/a32_jitstate.h
-         backend_x64/a64_emit_x64.cpp
-         backend_x64/a64_emit_x64.h
-         backend_x64/a64_exclusive_monitor.cpp
-         backend_x64/a64_interface.cpp
-         backend_x64/a64_jitstate.cpp
-         backend_x64/a64_jitstate.h
-         backend_x64/abi.cpp
-         backend_x64/abi.h
-         backend_x64/block_of_code.cpp
-         backend_x64/block_of_code.h
-         backend_x64/block_range_information.cpp
-         backend_x64/block_range_information.h
-         backend_x64/callback.cpp
-         backend_x64/callback.h
-         backend_x64/constant_pool.cpp
-         backend_x64/constant_pool.h
-         backend_x64/devirtualize.h
-         backend_x64/emit_x64.cpp
-         backend_x64/emit_x64.h
-         backend_x64/emit_x64_aes.cpp
-         backend_x64/emit_x64_crc32.cpp
-         backend_x64/emit_x64_data_processing.cpp
-         backend_x64/emit_x64_floating_point.cpp
-         backend_x64/emit_x64_packed.cpp
-         backend_x64/emit_x64_saturation.cpp
-         backend_x64/emit_x64_sm4.cpp
-         backend_x64/emit_x64_vector.cpp
-         backend_x64/emit_x64_vector_floating_point.cpp
-         backend_x64/hostloc.cpp
-         backend_x64/hostloc.h
-         backend_x64/jitstate_info.h
-         backend_x64/oparg.h
-         backend_x64/reg_alloc.cpp
-         backend_x64/reg_alloc.h
+         backend/x64/a32_emit_x64.cpp
+         backend/x64/a32_emit_x64.h
+         backend/x64/a32_interface.cpp
+         backend/x64/a32_jitstate.cpp
+         backend/x64/a32_jitstate.h
+         backend/x64/a64_emit_x64.cpp
+         backend/x64/a64_emit_x64.h
+         backend/x64/a64_exclusive_monitor.cpp
+         backend/x64/a64_interface.cpp
+         backend/x64/a64_jitstate.cpp
+         backend/x64/a64_jitstate.h
+         backend/x64/abi.cpp
+         backend/x64/abi.h
+         backend/x64/block_of_code.cpp
+         backend/x64/block_of_code.h
+         backend/x64/block_range_information.cpp
+         backend/x64/block_range_information.h
+         backend/x64/callback.cpp
+         backend/x64/callback.h
+         backend/x64/constant_pool.cpp
+         backend/x64/constant_pool.h
+         backend/x64/devirtualize.h
+         backend/x64/emit_x64.cpp
+         backend/x64/emit_x64.h
+         backend/x64/emit_x64_aes.cpp
+         backend/x64/emit_x64_crc32.cpp
+         backend/x64/emit_x64_data_processing.cpp
+         backend/x64/emit_x64_floating_point.cpp
+         backend/x64/emit_x64_packed.cpp
+         backend/x64/emit_x64_saturation.cpp
+         backend/x64/emit_x64_sm4.cpp
+         backend/x64/emit_x64_vector.cpp
+         backend/x64/emit_x64_vector_floating_point.cpp
+         backend/x64/hostloc.cpp
+         backend/x64/hostloc.h
+         backend/x64/jitstate_info.h
+         backend/x64/oparg.h
+         backend/x64/reg_alloc.cpp
+         backend/x64/reg_alloc.h
     )
 
     if (WIN32)
-        target_sources(dynarmic PRIVATE backend_x64/exception_handler_windows.cpp)
+        target_sources(dynarmic PRIVATE backend/x64/exception_handler_windows.cpp)
     else()
-        target_sources(dynarmic PRIVATE backend_x64/exception_handler_generic.cpp)
+        target_sources(dynarmic PRIVATE backend/x64/exception_handler_generic.cpp)
     endif()
 else()
     message(FATAL_ERROR "Unsupported architecture")
diff --git a/src/backend_x64/a32_emit_x64.cpp b/src/backend/x64/a32_emit_x64.cpp
similarity index 99%
rename from src/backend_x64/a32_emit_x64.cpp
rename to src/backend/x64/a32_emit_x64.cpp
index c4050faa..62320873 100644
--- a/src/backend_x64/a32_emit_x64.cpp
+++ b/src/backend/x64/a32_emit_x64.cpp
@@ -12,12 +12,12 @@
 
 #include <dynarmic/A32/coprocessor.h>
 
-#include "backend_x64/a32_emit_x64.h"
-#include "backend_x64/a32_jitstate.h"
-#include "backend_x64/abi.h"
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/devirtualize.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/a32_emit_x64.h"
+#include "backend/x64/a32_jitstate.h"
+#include "backend/x64/abi.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/devirtualize.h"
+#include "backend/x64/emit_x64.h"
 #include "common/address_range.h"
 #include "common/assert.h"
 #include "common/bit_util.h"
diff --git a/src/backend_x64/a32_emit_x64.h b/src/backend/x64/a32_emit_x64.h
similarity index 96%
rename from src/backend_x64/a32_emit_x64.h
rename to src/backend/x64/a32_emit_x64.h
index b50f03be..96772f95 100644
--- a/src/backend_x64/a32_emit_x64.h
+++ b/src/backend/x64/a32_emit_x64.h
@@ -8,9 +8,9 @@
 
 #include <boost/optional.hpp>
 
-#include "backend_x64/a32_jitstate.h"
-#include "backend_x64/block_range_information.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/a32_jitstate.h"
+#include "backend/x64/block_range_information.h"
+#include "backend/x64/emit_x64.h"
 #include "dynarmic/A32/a32.h"
 #include "dynarmic/A32/config.h"
 #include "frontend/A32/location_descriptor.h"
diff --git a/src/backend_x64/a32_interface.cpp b/src/backend/x64/a32_interface.cpp
similarity index 97%
rename from src/backend_x64/a32_interface.cpp
rename to src/backend/x64/a32_interface.cpp
index ef71ce2d..d7287acb 100644
--- a/src/backend_x64/a32_interface.cpp
+++ b/src/backend/x64/a32_interface.cpp
@@ -9,12 +9,12 @@
 #include <boost/icl/interval_set.hpp>
 #include <fmt/format.h>
 
-#include "backend_x64/a32_emit_x64.h"
-#include "backend_x64/a32_jitstate.h"
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/callback.h"
-#include "backend_x64/devirtualize.h"
-#include "backend_x64/jitstate_info.h"
+#include "backend/x64/a32_emit_x64.h"
+#include "backend/x64/a32_jitstate.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/callback.h"
+#include "backend/x64/devirtualize.h"
+#include "backend/x64/jitstate_info.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/llvm_disassemble.h"
@@ -49,6 +49,7 @@ struct Jit::Impl {
     A32JitState jit_state;
     BlockOfCode block_of_code;
     A32EmitX64 emitter;
+
     const A32::UserConfig config;
 
     // Requests made during execution to invalidate the cache are queued up here.
diff --git a/src/backend_x64/a32_jitstate.cpp b/src/backend/x64/a32_jitstate.cpp
similarity index 98%
rename from src/backend_x64/a32_jitstate.cpp
rename to src/backend/x64/a32_jitstate.cpp
index c274d7fc..bd170345 100644
--- a/src/backend_x64/a32_jitstate.cpp
+++ b/src/backend/x64/a32_jitstate.cpp
@@ -4,8 +4,8 @@
  * General Public License version 2 or any later version.
  */
 
-#include "backend_x64/a32_jitstate.h"
-#include "backend_x64/block_of_code.h"
+#include "backend/x64/a32_jitstate.h"
+#include "backend/x64/block_of_code.h"
 #include "common/assert.h"
 #include "common/bit_util.h"
 #include "common/common_types.h"
diff --git a/src/backend_x64/a32_jitstate.h b/src/backend/x64/a32_jitstate.h
similarity index 100%
rename from src/backend_x64/a32_jitstate.h
rename to src/backend/x64/a32_jitstate.h
diff --git a/src/backend_x64/a64_emit_x64.cpp b/src/backend/x64/a64_emit_x64.cpp
similarity index 99%
rename from src/backend_x64/a64_emit_x64.cpp
rename to src/backend/x64/a64_emit_x64.cpp
index 086e64b1..909de239 100644
--- a/src/backend_x64/a64_emit_x64.cpp
+++ b/src/backend/x64/a64_emit_x64.cpp
@@ -9,12 +9,12 @@
 #include <dynarmic/A64/exclusive_monitor.h>
 #include <fmt/ostream.h>
 
-#include "backend_x64/a64_emit_x64.h"
-#include "backend_x64/a64_jitstate.h"
-#include "backend_x64/abi.h"
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/devirtualize.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/a64_emit_x64.h"
+#include "backend/x64/a64_jitstate.h"
+#include "backend/x64/abi.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/devirtualize.h"
+#include "backend/x64/emit_x64.h"
 #include "common/address_range.h"
 #include "common/assert.h"
 #include "common/bit_util.h"
diff --git a/src/backend_x64/a64_emit_x64.h b/src/backend/x64/a64_emit_x64.h
similarity index 96%
rename from src/backend_x64/a64_emit_x64.h
rename to src/backend/x64/a64_emit_x64.h
index 0958defc..1ceb2bd6 100644
--- a/src/backend_x64/a64_emit_x64.h
+++ b/src/backend/x64/a64_emit_x64.h
@@ -9,9 +9,9 @@
 #include <map>
 #include <tuple>
 
-#include "backend_x64/a64_jitstate.h"
-#include "backend_x64/block_range_information.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/a64_jitstate.h"
+#include "backend/x64/block_range_information.h"
+#include "backend/x64/emit_x64.h"
 #include "dynarmic/A64/a64.h"
 #include "dynarmic/A64/config.h"
 #include "frontend/A64/location_descriptor.h"
diff --git a/src/backend_x64/a64_exclusive_monitor.cpp b/src/backend/x64/a64_exclusive_monitor.cpp
similarity index 100%
rename from src/backend_x64/a64_exclusive_monitor.cpp
rename to src/backend/x64/a64_exclusive_monitor.cpp
diff --git a/src/backend_x64/a64_interface.cpp b/src/backend/x64/a64_interface.cpp
similarity index 97%
rename from src/backend_x64/a64_interface.cpp
rename to src/backend/x64/a64_interface.cpp
index 62538bcd..b0608dbb 100644
--- a/src/backend_x64/a64_interface.cpp
+++ b/src/backend/x64/a64_interface.cpp
@@ -9,14 +9,14 @@
 
 #include <boost/icl/interval_set.hpp>
 
-#include "backend_x64/a64_emit_x64.h"
-#include "backend_x64/a64_jitstate.h"
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/devirtualize.h"
-#include "backend_x64/jitstate_info.h"
+#include "backend/x64/a64_emit_x64.h"
+#include "backend/x64/a64_jitstate.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/devirtualize.h"
+#include "backend/x64/jitstate_info.h"
 #include "common/assert.h"
-#include "common/scope_exit.h"
 #include "common/llvm_disassemble.h"
+#include "common/scope_exit.h"
 #include "dynarmic/A64/a64.h"
 #include "frontend/A64/translate/translate.h"
 #include "frontend/ir/basic_block.h"
diff --git a/src/backend_x64/a64_jitstate.cpp b/src/backend/x64/a64_jitstate.cpp
similarity index 98%
rename from src/backend_x64/a64_jitstate.cpp
rename to src/backend/x64/a64_jitstate.cpp
index 194a7041..030b0bfb 100644
--- a/src/backend_x64/a64_jitstate.cpp
+++ b/src/backend/x64/a64_jitstate.cpp
@@ -4,7 +4,7 @@
  * General Public License version 2 or any later version.
  */
 
-#include "backend_x64/a64_jitstate.h"
+#include "backend/x64/a64_jitstate.h"
 #include "common/bit_util.h"
 #include "frontend/A64/location_descriptor.h"
 
diff --git a/src/backend_x64/a64_jitstate.h b/src/backend/x64/a64_jitstate.h
similarity index 100%
rename from src/backend_x64/a64_jitstate.h
rename to src/backend/x64/a64_jitstate.h
diff --git a/src/backend_x64/abi.cpp b/src/backend/x64/abi.cpp
similarity index 99%
rename from src/backend_x64/abi.cpp
rename to src/backend/x64/abi.cpp
index 09c144b2..7684110d 100644
--- a/src/backend_x64/abi.cpp
+++ b/src/backend/x64/abi.cpp
@@ -19,7 +19,7 @@
 
 #include <xbyak.h>
 
-#include "backend_x64/abi.h"
+#include "backend/x64/abi.h"
 #include "common/common_types.h"
 #include "common/iterator_util.h"
 
diff --git a/src/backend_x64/abi.h b/src/backend/x64/abi.h
similarity index 98%
rename from src/backend_x64/abi.h
rename to src/backend/x64/abi.h
index 1b13271c..5a3a6548 100644
--- a/src/backend_x64/abi.h
+++ b/src/backend/x64/abi.h
@@ -7,7 +7,7 @@
 
 #include <array>
 
-#include "backend_x64/hostloc.h"
+#include "backend/x64/hostloc.h"
 
 namespace Dynarmic::BackendX64 {
 
diff --git a/src/backend_x64/block_of_code.cpp b/src/backend/x64/block_of_code.cpp
similarity index 98%
rename from src/backend_x64/block_of_code.cpp
rename to src/backend/x64/block_of_code.cpp
index dd9e650b..8dbd08c2 100644
--- a/src/backend_x64/block_of_code.cpp
+++ b/src/backend/x64/block_of_code.cpp
@@ -10,9 +10,9 @@
 
 #include <xbyak.h>
 
-#include "backend_x64/a32_jitstate.h"
-#include "backend_x64/abi.h"
-#include "backend_x64/block_of_code.h"
+#include "backend/x64/a32_jitstate.h"
+#include "backend/x64/abi.h"
+#include "backend/x64/block_of_code.h"
 #include "common/assert.h"
 
 namespace Dynarmic::BackendX64 {
diff --git a/src/backend_x64/block_of_code.h b/src/backend/x64/block_of_code.h
similarity index 97%
rename from src/backend_x64/block_of_code.h
rename to src/backend/x64/block_of_code.h
index 64bae281..32627396 100644
--- a/src/backend_x64/block_of_code.h
+++ b/src/backend/x64/block_of_code.h
@@ -13,9 +13,9 @@
 #include <xbyak.h>
 #include <xbyak_util.h>
 
-#include "backend_x64/callback.h"
-#include "backend_x64/constant_pool.h"
-#include "backend_x64/jitstate_info.h"
+#include "backend/x64/callback.h"
+#include "backend/x64/constant_pool.h"
+#include "backend/x64/jitstate_info.h"
 #include "common/common_types.h"
 
 namespace Dynarmic::BackendX64 {
diff --git a/src/backend_x64/block_range_information.cpp b/src/backend/x64/block_range_information.cpp
similarity index 97%
rename from src/backend_x64/block_range_information.cpp
rename to src/backend/x64/block_range_information.cpp
index df1f854f..5f05c27d 100644
--- a/src/backend_x64/block_range_information.cpp
+++ b/src/backend/x64/block_range_information.cpp
@@ -9,7 +9,7 @@
 #include <boost/icl/interval_map.hpp>
 #include <boost/icl/interval_set.hpp>
 
-#include "backend_x64/block_range_information.h"
+#include "backend/x64/block_range_information.h"
 #include "common/common_types.h"
 
 namespace Dynarmic::BackendX64 {
diff --git a/src/backend_x64/block_range_information.h b/src/backend/x64/block_range_information.h
similarity index 100%
rename from src/backend_x64/block_range_information.h
rename to src/backend/x64/block_range_information.h
diff --git a/src/backend_x64/callback.cpp b/src/backend/x64/callback.cpp
similarity index 94%
rename from src/backend_x64/callback.cpp
rename to src/backend/x64/callback.cpp
index c868bfb1..081f4817 100644
--- a/src/backend_x64/callback.cpp
+++ b/src/backend/x64/callback.cpp
@@ -4,8 +4,8 @@
  * General Public License version 2 or any later version.
  */
 
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/callback.h"
+#include "backend/x64/callback.h"
+#include "backend/x64/block_of_code.h"
 
 namespace Dynarmic::BackendX64 {
 
diff --git a/src/backend_x64/callback.h b/src/backend/x64/callback.h
similarity index 100%
rename from src/backend_x64/callback.h
rename to src/backend/x64/callback.h
diff --git a/src/backend_x64/constant_pool.cpp b/src/backend/x64/constant_pool.cpp
similarity index 93%
rename from src/backend_x64/constant_pool.cpp
rename to src/backend/x64/constant_pool.cpp
index fc903f65..ee94f55d 100644
--- a/src/backend_x64/constant_pool.cpp
+++ b/src/backend/x64/constant_pool.cpp
@@ -6,8 +6,8 @@
 
 #include <cstring>
 
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/constant_pool.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/constant_pool.h"
 #include "common/assert.h"
 
 namespace Dynarmic::BackendX64 {
diff --git a/src/backend_x64/constant_pool.h b/src/backend/x64/constant_pool.h
similarity index 100%
rename from src/backend_x64/constant_pool.h
rename to src/backend/x64/constant_pool.h
diff --git a/src/backend_x64/devirtualize.h b/src/backend/x64/devirtualize.h
similarity index 98%
rename from src/backend_x64/devirtualize.h
rename to src/backend/x64/devirtualize.h
index 59857fd2..8be6197b 100644
--- a/src/backend_x64/devirtualize.h
+++ b/src/backend/x64/devirtualize.h
@@ -9,7 +9,7 @@
 #include <cstring>
 #include <memory>
 
-#include "backend_x64/callback.h"
+#include "backend/x64/callback.h"
 #include "common/assert.h"
 #include "common/cast_util.h"
 #include "common/common_types.h"
diff --git a/src/backend_x64/emit_x64.cpp b/src/backend/x64/emit_x64.cpp
similarity index 99%
rename from src/backend_x64/emit_x64.cpp
rename to src/backend/x64/emit_x64.cpp
index 2875f596..7dd35885 100644
--- a/src/backend_x64/emit_x64.cpp
+++ b/src/backend/x64/emit_x64.cpp
@@ -6,8 +6,8 @@
 
 #include <unordered_map>
 
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/emit_x64.h"
 #include "common/assert.h"
 #include "common/bit_util.h"
 #include "common/common_types.h"
diff --git a/src/backend_x64/emit_x64.h b/src/backend/x64/emit_x64.h
similarity index 99%
rename from src/backend_x64/emit_x64.h
rename to src/backend/x64/emit_x64.h
index 0f2a3e99..80b89f56 100644
--- a/src/backend_x64/emit_x64.h
+++ b/src/backend/x64/emit_x64.h
@@ -16,7 +16,7 @@
 
 #include <xbyak_util.h>
 
-#include "backend_x64/reg_alloc.h"
+#include "backend/x64/reg_alloc.h"
 #include "common/address_range.h"
 #include "common/bit_util.h"
 #include "common/fp/rounding_mode.h"
diff --git a/src/backend_x64/emit_x64_aes.cpp b/src/backend/x64/emit_x64_aes.cpp
similarity index 95%
rename from src/backend_x64/emit_x64_aes.cpp
rename to src/backend/x64/emit_x64_aes.cpp
index 669e923d..b13f0791 100644
--- a/src/backend_x64/emit_x64_aes.cpp
+++ b/src/backend/x64/emit_x64_aes.cpp
@@ -4,9 +4,9 @@
  * General Public License version 2 or any later version.
  */
 
-#include "backend_x64/abi.h"
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/abi.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/emit_x64.h"
 #include "common/common_types.h"
 #include "common/crypto/aes.h"
 #include "frontend/ir/microinstruction.h"
diff --git a/src/backend_x64/emit_x64_crc32.cpp b/src/backend/x64/emit_x64_crc32.cpp
similarity index 97%
rename from src/backend_x64/emit_x64_crc32.cpp
rename to src/backend/x64/emit_x64_crc32.cpp
index e24a72ed..20a676c2 100644
--- a/src/backend_x64/emit_x64_crc32.cpp
+++ b/src/backend/x64/emit_x64_crc32.cpp
@@ -7,8 +7,8 @@
 #include <array>
 #include <climits>
 
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/emit_x64.h"
 #include "common/common_types.h"
 #include "common/crypto/crc32.h"
 #include "frontend/ir/microinstruction.h"
diff --git a/src/backend_x64/emit_x64_data_processing.cpp b/src/backend/x64/emit_x64_data_processing.cpp
similarity index 99%
rename from src/backend_x64/emit_x64_data_processing.cpp
rename to src/backend/x64/emit_x64_data_processing.cpp
index 96509a68..a265a3f3 100644
--- a/src/backend_x64/emit_x64_data_processing.cpp
+++ b/src/backend/x64/emit_x64_data_processing.cpp
@@ -4,8 +4,8 @@
  * General Public License version 2 or any later version.
  */
 
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/emit_x64.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "frontend/ir/basic_block.h"
diff --git a/src/backend_x64/emit_x64_floating_point.cpp b/src/backend/x64/emit_x64_floating_point.cpp
similarity index 99%
rename from src/backend_x64/emit_x64_floating_point.cpp
rename to src/backend/x64/emit_x64_floating_point.cpp
index 44181f7b..314f386b 100644
--- a/src/backend_x64/emit_x64_floating_point.cpp
+++ b/src/backend/x64/emit_x64_floating_point.cpp
@@ -7,9 +7,9 @@
 #include <type_traits>
 #include <utility>
 
-#include "backend_x64/abi.h"
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/abi.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/emit_x64.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/fp/fpcr.h"
diff --git a/src/backend_x64/emit_x64_packed.cpp b/src/backend/x64/emit_x64_packed.cpp
similarity index 99%
rename from src/backend_x64/emit_x64_packed.cpp
rename to src/backend/x64/emit_x64_packed.cpp
index a2a543cb..1137923d 100644
--- a/src/backend_x64/emit_x64_packed.cpp
+++ b/src/backend/x64/emit_x64_packed.cpp
@@ -4,8 +4,8 @@
  * General Public License version 2 or any later version.
  */
 
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/emit_x64.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "frontend/ir/basic_block.h"
diff --git a/src/backend_x64/emit_x64_saturation.cpp b/src/backend/x64/emit_x64_saturation.cpp
similarity index 99%
rename from src/backend_x64/emit_x64_saturation.cpp
rename to src/backend/x64/emit_x64_saturation.cpp
index fdbace17..2f5a2879 100644
--- a/src/backend_x64/emit_x64_saturation.cpp
+++ b/src/backend/x64/emit_x64_saturation.cpp
@@ -6,8 +6,8 @@
 
 #include <limits>
 
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/emit_x64.h"
 #include "common/assert.h"
 #include "common/bit_util.h"
 #include "common/common_types.h"
diff --git a/src/backend_x64/emit_x64_sm4.cpp b/src/backend/x64/emit_x64_sm4.cpp
similarity index 90%
rename from src/backend_x64/emit_x64_sm4.cpp
rename to src/backend/x64/emit_x64_sm4.cpp
index ca589893..51507f0d 100644
--- a/src/backend_x64/emit_x64_sm4.cpp
+++ b/src/backend/x64/emit_x64_sm4.cpp
@@ -4,8 +4,8 @@
  * General Public icense version 2 or any later version.
  */
 
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/emit_x64.h"
 #include "common/common_types.h"
 #include "common/crypto/sm4.h"
 #include "frontend/ir/microinstruction.h"
diff --git a/src/backend_x64/emit_x64_vector.cpp b/src/backend/x64/emit_x64_vector.cpp
similarity index 99%
rename from src/backend_x64/emit_x64_vector.cpp
rename to src/backend/x64/emit_x64_vector.cpp
index e315a1a9..2f8aa317 100644
--- a/src/backend_x64/emit_x64_vector.cpp
+++ b/src/backend/x64/emit_x64_vector.cpp
@@ -9,9 +9,9 @@
 #include <functional>
 #include <type_traits>
 
-#include "backend_x64/abi.h"
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/abi.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/emit_x64.h"
 #include "common/assert.h"
 #include "common/bit_util.h"
 #include "common/common_types.h"
diff --git a/src/backend_x64/emit_x64_vector_floating_point.cpp b/src/backend/x64/emit_x64_vector_floating_point.cpp
similarity index 99%
rename from src/backend_x64/emit_x64_vector_floating_point.cpp
rename to src/backend/x64/emit_x64_vector_floating_point.cpp
index 88fa909b..1cf41322 100644
--- a/src/backend_x64/emit_x64_vector_floating_point.cpp
+++ b/src/backend/x64/emit_x64_vector_floating_point.cpp
@@ -9,9 +9,9 @@
 #include <type_traits>
 #include <utility>
 
-#include "backend_x64/abi.h"
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/emit_x64.h"
+#include "backend/x64/abi.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/emit_x64.h"
 #include "common/assert.h"
 #include "common/bit_util.h"
 #include "common/fp/fpcr.h"
diff --git a/src/backend_x64/exception_handler_generic.cpp b/src/backend/x64/exception_handler_generic.cpp
similarity index 93%
rename from src/backend_x64/exception_handler_generic.cpp
rename to src/backend/x64/exception_handler_generic.cpp
index 5f6904b5..5009ae70 100644
--- a/src/backend_x64/exception_handler_generic.cpp
+++ b/src/backend/x64/exception_handler_generic.cpp
@@ -4,7 +4,7 @@
  * General Public License version 2 or any later version.
  */
 
-#include "backend_x64/block_of_code.h"
+#include "backend/x64/block_of_code.h"
 
 namespace Dynarmic::BackendX64 {
 
diff --git a/src/backend_x64/exception_handler_windows.cpp b/src/backend/x64/exception_handler_windows.cpp
similarity index 99%
rename from src/backend_x64/exception_handler_windows.cpp
rename to src/backend/x64/exception_handler_windows.cpp
index c6871f88..810f2ce6 100644
--- a/src/backend_x64/exception_handler_windows.cpp
+++ b/src/backend/x64/exception_handler_windows.cpp
@@ -10,7 +10,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#include "backend_x64/block_of_code.h"
+#include "backend/x64/block_of_code.h"
 #include "common/assert.h"
 #include "common/common_types.h"
 
diff --git a/src/backend_x64/hostloc.cpp b/src/backend/x64/hostloc.cpp
similarity index 94%
rename from src/backend_x64/hostloc.cpp
rename to src/backend/x64/hostloc.cpp
index 9361342a..fb090bd2 100644
--- a/src/backend_x64/hostloc.cpp
+++ b/src/backend/x64/hostloc.cpp
@@ -6,7 +6,7 @@
 
 #include <xbyak.h>
 
-#include "backend_x64/hostloc.h"
+#include "backend/x64/hostloc.h"
 
 namespace Dynarmic::BackendX64 {
 
diff --git a/src/backend_x64/hostloc.h b/src/backend/x64/hostloc.h
similarity index 100%
rename from src/backend_x64/hostloc.h
rename to src/backend/x64/hostloc.h
diff --git a/src/backend_x64/jitstate_info.h b/src/backend/x64/jitstate_info.h
similarity index 100%
rename from src/backend_x64/jitstate_info.h
rename to src/backend/x64/jitstate_info.h
diff --git a/src/backend_x64/oparg.h b/src/backend/x64/oparg.h
similarity index 100%
rename from src/backend_x64/oparg.h
rename to src/backend/x64/oparg.h
diff --git a/src/backend_x64/reg_alloc.cpp b/src/backend/x64/reg_alloc.cpp
similarity index 99%
rename from src/backend_x64/reg_alloc.cpp
rename to src/backend/x64/reg_alloc.cpp
index 38bc1ce0..d4fa932d 100644
--- a/src/backend_x64/reg_alloc.cpp
+++ b/src/backend/x64/reg_alloc.cpp
@@ -11,8 +11,8 @@
 #include <fmt/ostream.h>
 #include <xbyak.h>
 
-#include "backend_x64/abi.h"
-#include "backend_x64/reg_alloc.h"
+#include "backend/x64/abi.h"
+#include "backend/x64/reg_alloc.h"
 #include "common/assert.h"
 
 namespace Dynarmic::BackendX64 {
diff --git a/src/backend_x64/reg_alloc.h b/src/backend/x64/reg_alloc.h
similarity index 97%
rename from src/backend_x64/reg_alloc.h
rename to src/backend/x64/reg_alloc.h
index 2022ac6c..39fac368 100644
--- a/src/backend_x64/reg_alloc.h
+++ b/src/backend/x64/reg_alloc.h
@@ -14,9 +14,9 @@
 #include <boost/optional.hpp>
 #include <xbyak.h>
 
-#include "backend_x64/block_of_code.h"
-#include "backend_x64/hostloc.h"
-#include "backend_x64/oparg.h"
+#include "backend/x64/block_of_code.h"
+#include "backend/x64/hostloc.h"
+#include "backend/x64/oparg.h"
 #include "common/common_types.h"
 #include "frontend/ir/cond.h"
 #include "frontend/ir/microinstruction.h"