diff --git a/SHAL/Include/Core/SHAL_CORE.h b/SHAL/Include/Core/SHAL_CORE.h
new file mode 100644
index 0000000..3a58a4e
--- /dev/null
+++ b/SHAL/Include/Core/SHAL_CORE.h
@@ -0,0 +1,16 @@
+//
+// Created by Luca on 8/29/2025.
+//
+
+#ifndef SHMINGO_HAL_SHAL_CORE_H
+#define SHMINGO_HAL_SHAL_CORE_H
+
+#include <cstdint>
+
+
+struct RCC_Peripheral {
+    volatile uint32_t* reg;
+    uint32_t bitmask;
+};
+
+#endif //SHMINGO_HAL_SHAL_CORE_H
diff --git a/Core/Include/GPIO/SHAL_GPIO.h b/SHAL/Include/Peripheral/GPIO/SHAL_GPIO.h
similarity index 100%
rename from Core/Include/GPIO/SHAL_GPIO.h
rename to SHAL/Include/Peripheral/GPIO/SHAL_GPIO.h
diff --git a/Core/Include/GPIO/SHAL_GPIO_REG.h b/SHAL/Include/Peripheral/GPIO/SHAL_GPIO_REG.h
similarity index 100%
rename from Core/Include/GPIO/SHAL_GPIO_REG.h
rename to SHAL/Include/Peripheral/GPIO/SHAL_GPIO_REG.h
diff --git a/Core/Include/Timer/Reg/SHAL_TIM_CALLBACK.h b/SHAL/Include/Peripheral/Timer/Reg/SHAL_TIM_CALLBACK.h
similarity index 100%
rename from Core/Include/Timer/Reg/SHAL_TIM_CALLBACK.h
rename to SHAL/Include/Peripheral/Timer/Reg/SHAL_TIM_CALLBACK.h
diff --git a/Core/Include/Timer/Reg/SHAL_TIM_REG.h b/SHAL/Include/Peripheral/Timer/Reg/SHAL_TIM_REG.h
similarity index 95%
rename from Core/Include/Timer/Reg/SHAL_TIM_REG.h
rename to SHAL/Include/Peripheral/Timer/Reg/SHAL_TIM_REG.h
index dd36c9d..28d1c79 100644
--- a/Core/Include/Timer/Reg/SHAL_TIM_REG.h
+++ b/SHAL/Include/Peripheral/Timer/Reg/SHAL_TIM_REG.h
@@ -1,15 +1,9 @@
 #ifndef SHAL_TIM_REG_H
 #define SHAL_TIM_REG_H
 
-#include <cstdint>
 #include <cassert>
 #include <stm32f072xb.h>
 
-struct RCC_Peripheral {
-    volatile uint32_t* reg;
-    uint32_t bitmask;
-};
-
 enum class Timer_Key { //For STM32F072
     S_TIM1,
     S_TIM2,
diff --git a/Core/Include/Timer/SHAL_TIM.h b/SHAL/Include/Peripheral/Timer/SHAL_TIM.h
similarity index 100%
rename from Core/Include/Timer/SHAL_TIM.h
rename to SHAL/Include/Peripheral/Timer/SHAL_TIM.h
diff --git a/Core/Include/SHAL.h b/SHAL/Include/SHAL.h
similarity index 100%
rename from Core/Include/SHAL.h
rename to SHAL/Include/SHAL.h
diff --git a/Core/Src/Reg/SHAL_TIM.cpp b/SHAL/Src/Reg/SHAL_TIM.cpp
similarity index 100%
rename from Core/Src/Reg/SHAL_TIM.cpp
rename to SHAL/Src/Reg/SHAL_TIM.cpp
diff --git a/Core/Src/Reg/SHAL_TIM_CALLBACK.cpp b/SHAL/Src/Reg/SHAL_TIM_CALLBACK.cpp
similarity index 100%
rename from Core/Src/Reg/SHAL_TIM_CALLBACK.cpp
rename to SHAL/Src/Reg/SHAL_TIM_CALLBACK.cpp
diff --git a/Core/Src/System/syscalls.c b/SHAL/Src/System/syscalls.c
similarity index 100%
rename from Core/Src/System/syscalls.c
rename to SHAL/Src/System/syscalls.c
diff --git a/Core/Src/System/sysmem.c b/SHAL/Src/System/sysmem.c
similarity index 100%
rename from Core/Src/System/sysmem.c
rename to SHAL/Src/System/sysmem.c
diff --git a/Core/Src/System/system_stm32f0xx.c b/SHAL/Src/System/system_stm32f0xx.c
similarity index 100%
rename from Core/Src/System/system_stm32f0xx.c
rename to SHAL/Src/System/system_stm32f0xx.c
diff --git a/Core/Src/main.cpp b/SHAL/Src/main.cpp
similarity index 100%
rename from Core/Src/main.cpp
rename to SHAL/Src/main.cpp