Moved some files around in preparation for completely changing the way that booting works

Makefile

@@ -1,7 +1,7 @@
 CFLAGS = -m32 -mgeneral-regs-only -nostdlib -fno-builtin -fno-exceptions -fno-leading-underscore -fno-pie -fno-stack-protector -Wno-pointer-to-int-cast
 LDFLAGS = 
 
-DISK_IMG_FILES = kernel.bin hello.bin print.bin boot32.bin kernel32.bin
+DISK_IMG_FILES = kernel.bin boot32.bin kernel32.bin
 KERNEL32_OBJS = screenstuff.o io.o idt.o keyboard.o strings.o atapio.o kernel32_strap.o kernel32.o
 
 run: disk.img
@@ -28,8 +28,8 @@ boot.sector: boot.asm
 kernel32.bin: kernel32.ld $(KERNEL32_OBJS)
 	ld $(LDFLAGS) -T $< $(KERNEL32_OBJS)
 
-%.o: %.asm
+%.o: src/kernel/%.asm
 	nasm -felf32 $< -o $@
 
-%.o: %.c
+%.o: src/kernel/%.c
 	gcc $(CFLAGS) -o $@ -c $<