diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 86f608c4..53783af4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,11 +11,11 @@ set(SRCS
     common/x64/abi.cpp
     common/x64/cpu_detect.cpp
     common/x64/emitter.cpp
-    frontend/disassembler_arm.cpp
-    frontend/disassembler_thumb.cpp
+    frontend/disassembler/disassembler_arm.cpp
+    frontend/disassembler/disassembler_thumb.cpp
     frontend/ir/ir.cpp
-    frontend/ir_emitter.cpp
-    frontend/translate.cpp
+    frontend/ir/ir_emitter.cpp
+    frontend/translate/translate.cpp
     )
 
 set(HEADERS
@@ -40,14 +40,13 @@ set(HEADERS
     frontend/decoder/arm.h
     frontend/decoder/decoder_detail.h
     frontend/decoder/thumb16.h
-    frontend/disassembler.h
-    frontend/frontend_arm.h
+    frontend/disassembler/disassembler.h
     frontend/ir/ir.h
+    frontend/ir/ir_emitter.h
     frontend/ir/opcodes.h
-    frontend/ir_emitter.h
-    frontend/translate.h
-    frontend/translate_arm.cpp
-    frontend/translate_thumb.cpp
+    frontend/translate/translate.h
+    frontend/translate/translate_arm.cpp
+    frontend/translate/translate_thumb.cpp
     interface/interface.h
     )
 
diff --git a/src/backend_x64/interface_x64.cpp b/src/backend_x64/interface_x64.cpp
index 307fb4a5..250a3f61 100644
--- a/src/backend_x64/interface_x64.cpp
+++ b/src/backend_x64/interface_x64.cpp
@@ -14,7 +14,7 @@
 #include "common/common_types.h"
 #include "common/scope_exit.h"
 #include "frontend/arm_types.h"
-#include "frontend/translate.h"
+#include "frontend/translate/translate.h"
 #include "interface/interface.h"
 
 namespace Dynarmic {
diff --git a/src/frontend/disassembler.h b/src/frontend/disassembler/disassembler.h
similarity index 100%
rename from src/frontend/disassembler.h
rename to src/frontend/disassembler/disassembler.h
diff --git a/src/frontend/disassembler_arm.cpp b/src/frontend/disassembler/disassembler_arm.cpp
similarity index 100%
rename from src/frontend/disassembler_arm.cpp
rename to src/frontend/disassembler/disassembler_arm.cpp
diff --git a/src/frontend/disassembler_thumb.cpp b/src/frontend/disassembler/disassembler_thumb.cpp
similarity index 100%
rename from src/frontend/disassembler_thumb.cpp
rename to src/frontend/disassembler/disassembler_thumb.cpp
diff --git a/src/frontend/frontend_arm.h b/src/frontend/frontend_arm.h
deleted file mode 100644
index 8d42cc7d..00000000
--- a/src/frontend/frontend_arm.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* This file is part of the dynarmic project.
- * Copyright (c) 2016 MerryMage
- * This software may be used and distributed according to the terms of the GNU
- * General Public License version 2 or any later version.
- */
-
-#pragma once
-
-namespace Dynarmic {
-namespace Arm {
-
-
-
-} // namespace Arm
-} // namespace Dynarmic
diff --git a/src/frontend/ir_emitter.cpp b/src/frontend/ir/ir_emitter.cpp
similarity index 99%
rename from src/frontend/ir_emitter.cpp
rename to src/frontend/ir/ir_emitter.cpp
index b94399e4..d57929fe 100644
--- a/src/frontend/ir_emitter.cpp
+++ b/src/frontend/ir/ir_emitter.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "common/assert.h"
-#include "frontend/ir_emitter.h"
+#include "ir_emitter.h"
 
 namespace Dynarmic {
 namespace Arm {
diff --git a/src/frontend/ir_emitter.h b/src/frontend/ir/ir_emitter.h
similarity index 100%
rename from src/frontend/ir_emitter.h
rename to src/frontend/ir/ir_emitter.h
diff --git a/src/frontend/translate.cpp b/src/frontend/translate/translate.cpp
similarity index 95%
rename from src/frontend/translate.cpp
rename to src/frontend/translate/translate.cpp
index c68cbe7b..59ee2083 100644
--- a/src/frontend/translate.cpp
+++ b/src/frontend/translate/translate.cpp
@@ -6,7 +6,7 @@
 
 #include "frontend/arm_types.h"
 #include "frontend/ir/ir.h"
-#include "frontend/translate.h"
+#include "translate.h"
 
 namespace Dynarmic {
 namespace Arm {
diff --git a/src/frontend/translate.h b/src/frontend/translate/translate.h
similarity index 100%
rename from src/frontend/translate.h
rename to src/frontend/translate/translate.h
diff --git a/src/frontend/translate_arm.cpp b/src/frontend/translate/translate_arm.cpp
similarity index 98%
rename from src/frontend/translate_arm.cpp
rename to src/frontend/translate/translate_arm.cpp
index e05ca230..80757be9 100644
--- a/src/frontend/translate_arm.cpp
+++ b/src/frontend/translate/translate_arm.cpp
@@ -8,8 +8,8 @@
 #include "frontend/arm_types.h"
 #include "frontend/decoder/arm.h"
 #include "frontend/ir/ir.h"
-#include "frontend/ir_emitter.h"
-#include "frontend/translate.h"
+#include "frontend/ir/ir_emitter.h"
+#include "translate.h"
 
 namespace Dynarmic {
 namespace Arm {
diff --git a/src/frontend/translate_thumb.cpp b/src/frontend/translate/translate_thumb.cpp
similarity index 99%
rename from src/frontend/translate_thumb.cpp
rename to src/frontend/translate/translate_thumb.cpp
index a74aedb6..e097d2da 100644
--- a/src/frontend/translate_thumb.cpp
+++ b/src/frontend/translate/translate_thumb.cpp
@@ -9,8 +9,8 @@
 #include "common/assert.h"
 #include "frontend/arm_types.h"
 #include "frontend/decoder/thumb16.h"
-#include "frontend/ir_emitter.h"
-#include "frontend/translate.h"
+#include "frontend/ir/ir_emitter.h"
+#include "translate.h"
 
 namespace Dynarmic {
 namespace Arm {
diff --git a/tests/arm/fuzz_arm.cpp b/tests/arm/fuzz_arm.cpp
index 2b040630..22c30368 100644
--- a/tests/arm/fuzz_arm.cpp
+++ b/tests/arm/fuzz_arm.cpp
@@ -12,7 +12,7 @@
 
 #include "common/bit_util.h"
 #include "common/common_types.h"
-#include "frontend/disassembler.h"
+#include "frontend/disassembler/disassembler.h"
 #include "interface/interface.h"
 #include "rand_int.h"
 #include "skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"
diff --git a/tests/arm/fuzz_thumb.cpp b/tests/arm/fuzz_thumb.cpp
index 3bdb851f..092234eb 100644
--- a/tests/arm/fuzz_thumb.cpp
+++ b/tests/arm/fuzz_thumb.cpp
@@ -12,7 +12,7 @@
 
 #include "common/bit_util.h"
 #include "common/common_types.h"
-#include "frontend/disassembler.h"
+#include "frontend/disassembler/disassembler.h"
 #include "interface/interface.h"
 #include "rand_int.h"
 #include "skyeye_interpreter/dyncom/arm_dyncom_interpreter.h"
diff --git a/tests/arm/test_arm_disassembler.cpp b/tests/arm/test_arm_disassembler.cpp
index e2a691b8..78f11748 100644
--- a/tests/arm/test_arm_disassembler.cpp
+++ b/tests/arm/test_arm_disassembler.cpp
@@ -6,7 +6,7 @@
 
 #include <catch.hpp>
 
-#include "frontend/disassembler.h"
+#include "frontend/disassembler/disassembler.h"
 
 TEST_CASE( "Disassemble branch instructions", "[arm][disassembler][!hide]" ) {
     REQUIRE(Dynarmic::Arm::DisassembleArm(0xEAFFFFFE) == "b +#0");