fixed merge conflicts from re-struct branch regarding fie renames and moves

makefile

@@ -33,7 +33,7 @@ os.iso: kernel.elf
 	$(ASM) $(AFLAGS) $< -o $@
 
 # Building C objecets
-%.o: %.c
+core/%.o: %.c
 	$(CC) $(CFLAGS) $< -o $@
 
 # Running (no recipes called)