Renamed main.asm in boot.asm and moved it into the bootloader directory, created an empty kernel.asm file, edited Makefile and edited the bootloader (boot.asm).