diff --git a/src/jit/CMakeLists.txt b/src/jit/CMakeLists.txt
index f194ab5..d2832e1 100644
--- a/src/jit/CMakeLists.txt
+++ b/src/jit/CMakeLists.txt
@@ -1,9 +1,9 @@
 find_package(Python3 REQUIRED)
 
 # Define the generated files
-set(GEN_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/decoder/arm32_table_generated.c)
-set(GEN_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/decoder/arm32_table_generated.h)
-set(INC_FILE   ${CMAKE_CURRENT_SOURCE_DIR}/decoder/arm32.inc)
+set(GEN_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/frontend/decoder/arm32_table_generated.c)
+set(GEN_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/frontend/decoder/arm32_table_generated.h)
+set(INC_FILE   ${CMAKE_CURRENT_SOURCE_DIR}/frontend/decoder/arm32.inc)
 set(SCRIPT     ${CMAKE_SOURCE_DIR}/scripts/generate_jit_decoder_a32_table.py)
 
 add_custom_command(
@@ -16,8 +16,8 @@ add_custom_command(
 add_library(jit STATIC)
 
 target_sources(jit PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/decoder/arm32.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/decoder/arm32_table_generated.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/frontend/decoder/arm32.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/frontend/decoder/arm32_table_generated.c
     #${CMAKE_CURRENT_SOURCE_DIR}/ir/type.cpp
     #${CMAKE_CURRENT_SOURCE_DIR}/ir/value.cpp
     #${CMAKE_CURRENT_SOURCE_DIR}/ir/opcode.cpp
@@ -28,6 +28,6 @@ target_link_libraries(jit PRIVATE common)
 
 target_include_directories(jit PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/decoder
+    ${CMAKE_CURRENT_SOURCE_DIR}/frontend/dynarmic
     ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
diff --git a/src/jit/decoder/arm32.c b/src/jit/frontend/decoder/arm32.c
similarity index 100%
rename from src/jit/decoder/arm32.c
rename to src/jit/frontend/decoder/arm32.c
diff --git a/src/jit/decoder/arm32.h b/src/jit/frontend/decoder/arm32.h
similarity index 100%
rename from src/jit/decoder/arm32.h
rename to src/jit/frontend/decoder/arm32.h
diff --git a/src/jit/decoder/arm32.inc b/src/jit/frontend/decoder/arm32.inc
similarity index 100%
rename from src/jit/decoder/arm32.inc
rename to src/jit/frontend/decoder/arm32.inc
diff --git a/src/jit/decoder/arm32_table_generated.c b/src/jit/frontend/decoder/arm32_table_generated.c
similarity index 100%
rename from src/jit/decoder/arm32_table_generated.c
rename to src/jit/frontend/decoder/arm32_table_generated.c
diff --git a/src/jit/decoder/arm32_table_generated.h b/src/jit/frontend/decoder/arm32_table_generated.h
similarity index 100%
rename from src/jit/decoder/arm32_table_generated.h
rename to src/jit/frontend/decoder/arm32_table_generated.h
diff --git a/src/main.c b/src/main.c
index 9e4088a..a1c4e9c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 #define LOG_MODULE "main"
 #include "common/logging.h"
 #include "common/passert.h"
-#include "jit/decoder/arm32.h"
+#include "jit/frontend/decoder/arm32.h"
 
 int main()
 {