diff --git a/Makefile b/Makefile
index 1b30d9ac..4ec9d487 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ default: thor.flp
 KERNEL_SRC=$(wildcard src/*.asm)
 KERNEL_UTILS_SRC=$(wildcard src/utils/*.asm)
 
-bootloader.bin: src/bootloader/bootloader.asm
-	nasm -w+all -f bin -o bootloader.bin src/bootloader/bootloader.asm
+bootloader.bin: bootloader/bootloader.asm
+	nasm -w+all -f bin -o bootloader.bin bootloader/bootloader.asm
 
 micro_kernel.bin: $(KERNEL_SRC) $(KERNEL_UTILS_SRC)
 	nasm -w+all -f bin -o micro_kernel.bin src/micro_kernel.asm
@@ -36,4 +36,5 @@ bochs: thor.flp
 clean:
 	rm -f *.bin
 	rm -f *.flp
-	rm -f *.o
\ No newline at end of file
+	rm -f *.o
+	rm -f *.g
\ No newline at end of file
diff --git a/src/bootloader/bootloader.asm b/bootloader/bootloader.asm
similarity index 98%
rename from src/bootloader/bootloader.asm
rename to bootloader/bootloader.asm
index 4cb7a8de..5f89f351 100644
--- a/src/bootloader/bootloader.asm
+++ b/bootloader/bootloader.asm
@@ -2,7 +2,7 @@
 
 jmp rm_start
 
-%include "src/bootloader/intel_16.asm"
+%include "bootloader/intel_16.asm"
 
 ; Start in real mode
 rm_start:
diff --git a/src/bootloader/intel_16.asm b/bootloader/intel_16.asm
similarity index 100%
rename from src/bootloader/intel_16.asm
rename to bootloader/intel_16.asm
diff --git a/micro_kernel.g b/micro_kernel.g
deleted file mode 100644
index f16a303b..00000000
Binary files a/micro_kernel.g and /dev/null differ
diff --git a/src/commands.asm b/micro_kernel/commands.asm
similarity index 100%
rename from src/commands.asm
rename to micro_kernel/commands.asm
diff --git a/src/interrupts.asm b/micro_kernel/interrupts.asm
similarity index 100%
rename from src/interrupts.asm
rename to micro_kernel/interrupts.asm
diff --git a/src/micro_kernel.asm b/micro_kernel/micro_kernel.asm
similarity index 100%
rename from src/micro_kernel.asm
rename to micro_kernel/micro_kernel.asm
diff --git a/src/shell.asm b/micro_kernel/shell.asm
similarity index 100%
rename from src/shell.asm
rename to micro_kernel/shell.asm
diff --git a/src/timer.asm b/micro_kernel/timer.asm
similarity index 100%
rename from src/timer.asm
rename to micro_kernel/timer.asm
diff --git a/src/utils/console.asm b/micro_kernel/utils/console.asm
similarity index 100%
rename from src/utils/console.asm
rename to micro_kernel/utils/console.asm
diff --git a/src/utils/keyboard.asm b/micro_kernel/utils/keyboard.asm
similarity index 100%
rename from src/utils/keyboard.asm
rename to micro_kernel/utils/keyboard.asm
diff --git a/src/utils/macros.asm b/micro_kernel/utils/macros.asm
similarity index 100%
rename from src/utils/macros.asm
rename to micro_kernel/utils/macros.asm
diff --git a/src/utils/utils.asm b/micro_kernel/utils/utils.asm
similarity index 100%
rename from src/utils/utils.asm
rename to micro_kernel/utils/utils.asm