diff --git a/src/kernel/include/acpi.h b/src/include/acpi.h
similarity index 100%
rename from src/kernel/include/acpi.h
rename to src/include/acpi.h
diff --git a/src/kernel/include/libc.h b/src/include/libc.h
similarity index 100%
rename from src/kernel/include/libc.h
rename to src/include/libc.h
diff --git a/src/kernel/include/paging.h b/src/include/paging.h
similarity index 100%
rename from src/kernel/include/paging.h
rename to src/include/paging.h
diff --git a/src/kernel/include/printf.h b/src/include/printf.h
similarity index 100%
rename from src/kernel/include/printf.h
rename to src/include/printf.h
diff --git a/src/kernel/include/serial.h b/src/include/serial.h
similarity index 100%
rename from src/kernel/include/serial.h
rename to src/include/serial.h
diff --git a/src/kernel/include/video.h b/src/include/video.h
similarity index 100%
rename from src/kernel/include/video.h
rename to src/include/video.h
diff --git a/src/indigo_os b/src/indigo_os
new file mode 100755
index 0000000..9c24910
Binary files /dev/null and b/src/indigo_os differ
diff --git a/src/kernel/libs/acpi.c b/src/kernel/acpi.c
similarity index 100%
rename from src/kernel/libs/acpi.c
rename to src/kernel/acpi.c
diff --git a/src/kernel/libs/drivers/serial.c b/src/kernel/drivers/serial.c
similarity index 100%
rename from src/kernel/libs/drivers/serial.c
rename to src/kernel/drivers/serial.c
diff --git a/src/kernel/libs/drivers/video.c b/src/kernel/drivers/video.c
similarity index 100%
rename from src/kernel/libs/drivers/video.c
rename to src/kernel/drivers/video.c
diff --git a/src/kernel/libs/libc.c b/src/kernel/libc.c
similarity index 100%
rename from src/kernel/libs/libc.c
rename to src/kernel/libc.c
diff --git a/src/kernel/libs/page.c b/src/kernel/page.c
similarity index 100%
rename from src/kernel/libs/page.c
rename to src/kernel/page.c
diff --git a/src/kernel/libs/printf.c b/src/kernel/printf.c
similarity index 100%
rename from src/kernel/libs/printf.c
rename to src/kernel/printf.c
diff --git a/src/kernel/libs/printf.h b/src/kernel/printf.h
similarity index 100%
rename from src/kernel/libs/printf.h
rename to src/kernel/printf.h
diff --git a/src/makefile b/src/makefile
index 5e8acb7..4e51ff4 100644
--- a/src/makefile
+++ b/src/makefile
@@ -1,7 +1,7 @@
 LD=../compiler/indigo_gcc/bin/x86_64-elf-ld
 CC=../compiler/indigo_gcc/bin/x86_64-elf-gcc
 OBJCPY=../compiler/indigo_gcc/bin/x86_64-elf-objcopy
-INC=-Ikernel/include
+INC=-I./include
 
 EMU_CORES=4
 EMU_RAM=4G
@@ -12,12 +12,12 @@ YRES=768
 make: 
 	nasm -g -felf64 bootloader/bootloader.asm -o objects/bootloader.o
 	$(CC) $(INC) -g -ffreestanding -c kernel/kernel.c -o objects/kernel.o
-	$(CC) $(INC) -g -ffreestanding -c kernel/libs/acpi.c -o objects/acpi.o
-	$(CC) $(INC) -g -ffreestanding -c kernel/libs/drivers/serial.c -o objects/serial.o
-	$(CC) $(INC) -g -ffreestanding -c kernel/libs/drivers/video.c -o objects/video.o
-	$(CC) $(INC) -g -ffreestanding -c kernel/libs/printf.c -o objects/printf.o
-	$(CC) $(INC) -g -ffreestanding -c kernel/libs/page.c -o objects/page.o
-	$(CC) $(INC) -g -ffreestanding -c kernel/libs/libc.c -o objects/libc.o
+	$(CC) $(INC) -g -ffreestanding -c kernel/acpi.c -o objects/acpi.o
+	$(CC) $(INC) -g -ffreestanding -c kernel/drivers/serial.c -o objects/serial.o
+	$(CC) $(INC) -g -ffreestanding -c kernel/drivers/video.c -o objects/video.o
+	$(CC) $(INC) -g -ffreestanding -c kernel/printf.c -o objects/printf.o
+	$(CC) $(INC) -g -ffreestanding -c kernel/page.c -o objects/page.o
+	$(CC) $(INC) -g -ffreestanding -c kernel/libc.c -o objects/libc.o
 	$(LD) -o indigo_os.elf --oformat=elf64-x86-64 -T link.ld
 	$(OBJCPY) --only-keep-debug indigo_os.elf debug/debug_syms.o
 	$(OBJCPY) -O binary --strip-all indigo_os.elf indigo_os