diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index df331a92..04a808be 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,7 @@ set(SRCS
     backend_x64/jitstate.cpp
     backend_x64/reg_alloc.cpp
     common/memory_pool.cpp
-    frontend/arm_types.cpp
+    frontend/arm/types.cpp
     frontend/disassembler/disassembler_arm.cpp
     frontend/disassembler/disassembler_thumb.cpp
     frontend/ir/basic_block.cpp
@@ -56,7 +56,7 @@ set(HEADERS
     common/string_util.h
     frontend/arm/FPSCR.h
     frontend/arm/PSR.h
-    frontend/arm_types.h
+    frontend/arm/types.h
     frontend/decoder/arm.h
     frontend/decoder/decoder_detail.h
     frontend/decoder/thumb16.h
diff --git a/src/backend_x64/emit_x64.cpp b/src/backend_x64/emit_x64.cpp
index 25d078d3..dab271cd 100644
--- a/src/backend_x64/emit_x64.cpp
+++ b/src/backend_x64/emit_x64.cpp
@@ -12,7 +12,7 @@
 #include "backend_x64/abi.h"
 #include "backend_x64/emit_x64.h"
 #include "backend_x64/jitstate.h"
-#include "frontend/arm_types.h"
+#include "frontend/arm/types.h"
 #include "frontend/ir/basic_block.h"
 #include "frontend/ir/location_descriptor.h"
 #include "frontend/ir/microinstruction.h"
diff --git a/src/frontend/arm_types.cpp b/src/frontend/arm/types.cpp
similarity index 98%
rename from src/frontend/arm_types.cpp
rename to src/frontend/arm/types.cpp
index 140d4fc6..3246a145 100644
--- a/src/frontend/arm_types.cpp
+++ b/src/frontend/arm/types.cpp
@@ -7,7 +7,7 @@
 #include <array>
 
 #include "common/bit_util.h"
-#include "frontend/arm_types.h"
+#include "frontend/arm/types.h"
 
 namespace Dynarmic {
 namespace Arm {
diff --git a/src/frontend/arm_types.h b/src/frontend/arm/types.h
similarity index 100%
rename from src/frontend/arm_types.h
rename to src/frontend/arm/types.h
diff --git a/src/frontend/disassembler/disassembler_arm.cpp b/src/frontend/disassembler/disassembler_arm.cpp
index f2ebbdac..d5b66c4b 100644
--- a/src/frontend/disassembler/disassembler_arm.cpp
+++ b/src/frontend/disassembler/disassembler_arm.cpp
@@ -11,7 +11,7 @@
 
 #include "common/bit_util.h"
 #include "common/string_util.h"
-#include "frontend/arm_types.h"
+#include "frontend/arm/types.h"
 #include "frontend/decoder/arm.h"
 #include "frontend/decoder/vfp2.h"
 
diff --git a/src/frontend/disassembler/disassembler_thumb.cpp b/src/frontend/disassembler/disassembler_thumb.cpp
index 9b107f32..5e48dd95 100644
--- a/src/frontend/disassembler/disassembler_thumb.cpp
+++ b/src/frontend/disassembler/disassembler_thumb.cpp
@@ -11,7 +11,7 @@
 
 #include "common/bit_util.h"
 #include "common/string_util.h"
-#include "frontend/arm_types.h"
+#include "frontend/arm/types.h"
 #include "frontend/decoder/thumb16.h"
 
 namespace Dynarmic {
diff --git a/src/frontend/ir/value.h b/src/frontend/ir/value.h
index cc839b07..62e61e39 100644
--- a/src/frontend/ir/value.h
+++ b/src/frontend/ir/value.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "common/common_types.h"
-#include "frontend/arm_types.h"
+#include "frontend/arm/types.h"
 
 namespace Dynarmic {
 namespace IR {
diff --git a/src/frontend/translate/translate_arm.cpp b/src/frontend/translate/translate_arm.cpp
index d6cb4d85..2c1d1700 100644
--- a/src/frontend/translate/translate_arm.cpp
+++ b/src/frontend/translate/translate_arm.cpp
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 #include "common/assert.h"
-#include "frontend/arm_types.h"
+#include "frontend/arm/types.h"
 #include "frontend/decoder/arm.h"
 #include "frontend/decoder/vfp2.h"
 #include "frontend/ir/basic_block.h"
diff --git a/src/frontend/translate/translate_thumb.cpp b/src/frontend/translate/translate_thumb.cpp
index c5683d07..ebe9cd73 100644
--- a/src/frontend/translate/translate_thumb.cpp
+++ b/src/frontend/translate/translate_thumb.cpp
@@ -8,7 +8,7 @@
 
 #include "common/assert.h"
 #include "common/bit_util.h"
-#include "frontend/arm_types.h"
+#include "frontend/arm/types.h"
 #include "frontend/decoder/thumb16.h"
 #include "frontend/decoder/thumb32.h"
 #include "frontend/ir/ir_emitter.h"