diff --git a/Core/Interrupts/8259PIC.cpp b/Architecture/i686/Interrupts/8259PIC.cpp
similarity index 100%
rename from Core/Interrupts/8259PIC.cpp
rename to Architecture/i686/Interrupts/8259PIC.cpp
diff --git a/Core/Interrupts/pic.hpp b/Architecture/i686/Interrupts/pic.hpp
similarity index 100%
rename from Core/Interrupts/pic.hpp
rename to Architecture/i686/Interrupts/pic.hpp
diff --git a/Core/Interrupts/IntManager.cpp b/Core/Interrupts/IntManager.cpp
index 174036f..054e753 100644
--- a/Core/Interrupts/IntManager.cpp
+++ b/Core/Interrupts/IntManager.cpp
@@ -138,11 +138,11 @@ namespace Interrupts
     {
         trace("Unhandled interrupt IRQ%d", Frame->InterruptNumber - 32);
 #elif defined(__i386__)
-    void Handler::OnInterruptReceived(void *Frame);
+    void Handler::OnInterruptReceived(void *Frame)
     {
         trace("Unhandled interrupt received");
 #elif defined(__aarch64__)
-    void Handler::OnInterruptReceived(void *Frame);
+    void Handler::OnInterruptReceived(void *Frame)
     {
         trace("Unhandled interrupt received");
 #endif