diff --git a/Makefile b/Makefile
index 8207c32..4d268be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+#TODO: add a rule to setup the cross compiler
+# or maybe add it to a bash script instead? im not sure
+
 CC = i686-elf-gcc
 CFLAGS = -m32 -ffreestanding -Wall -Wextra -Werror -Wpedantic --sysroot=$(PWD)/sysroot -isystem=/usr/include -Iinclude -MD
 
@@ -40,6 +43,7 @@ os.iso: kernel.elf
 run: os.iso
 	bochs -f util/bochsrc.txt -q
 
+libc.a: CFLAGS:=$(CFLAGS) -D__is_libc # Target rule to define __is_libc
 libc.a: $(libc_objs)
 	$(AR) rcs $@ $(libc_objs)
 
diff --git a/kernel/arch/io.h b/kernel/arch/io/io.h
similarity index 100%
rename from kernel/arch/io.h
rename to kernel/arch/io/io.h
diff --git a/kernel/arch/io.s b/kernel/arch/io/io.s
similarity index 100%
rename from kernel/arch/io.s
rename to kernel/arch/io/io.s
diff --git a/kernel/arch/serial.c b/kernel/arch/io/serial.c
similarity index 100%
rename from kernel/arch/serial.c
rename to kernel/arch/io/serial.c
diff --git a/kernel/arch/tty.c b/kernel/arch/io/tty.c
similarity index 100%
rename from kernel/arch/tty.c
rename to kernel/arch/io/tty.c
diff --git a/kernel/arch/vga.h b/kernel/arch/io/vga.h
similarity index 100%
rename from kernel/arch/vga.h
rename to kernel/arch/io/vga.h