move cpu folder into kernel folder

Makefile

@@ -1,10 +1,10 @@
 PLAT=i386
-C_SOURCES = $(wildcard kernel/*.c drivers/$(PLAT)/*.c drivers/$(PLAT)/*/*.c cpu/$(PLAT)/*.c fs/*.c)
-ASM = $(wildcard cpu/$(PLAT)/*.asm)
-S_ASM = $(wildcard cpu/$(PLAT)/*.s)
+C_SOURCES = $(wildcard kernel/*.c drivers/$(PLAT)/*.c drivers/$(PLAT)/*/*.c kernel/cpu/$(PLAT)/*.c fs/*.c)
+ASM = $(wildcard kernel/cpu/$(PLAT)/*.asm)
+S_ASM = $(wildcard kernel/cpu/$(PLAT)/*.s)
 LIBC_SOURCES = $(wildcard libc/*.c libc/*/*.c)
 LIBC_HEADERS = $(wildcard libc/*.h libc/*/*.h)
-OBJ = $(C_SOURCES:.c=.o cpu/$(PLAT)/boot.o)
+OBJ = $(C_SOURCES:.c=.o kernel/cpu/$(PLAT)/boot.o)
 ASM_OBJ = $(S_ASM:.s=.o)
 S_ASM_OBJ = $(ASM:.asm=.o)
 LIBC_OBJ = $(LIBC_SOURCES:.c=.o)
@@ -39,7 +39,7 @@ initrd/init: init/* kernel/start.o
 	@cp init/init initrd/init
 
 kernel/kernel.elf: $(OBJ) $(ASM_OBJ) $(S_ASM_OBJ) libc/libc.a
-	@$(CC) -z max-page-size=4096 -Xlinker -n -T cpu/$(PLAT)/linker.ld -o $@ $(CFLAGS) -nostdlib $^ -lgcc
+	@$(CC) -z max-page-size=4096 -Xlinker -n -T kernel/cpu/$(PLAT)/linker.ld -o $@ $(CFLAGS) -nostdlib $^ -lgcc
 
 sysroot: $(LIBC_HEADERS)
 	@mkdir -p sysroot/usr/include

kernel/cpu/i386/isr.c

@@ -4,7 +4,7 @@
 #include "ports.h"
 #include "paging.h"
 #include "../halt.h"
-#include "../../kernel/vga_err.h"
+#include "../..//vga_err.h"
 #include "../tasking.h"
 #include "interrupt.h"
 #include "address_spaces.h"

kernel/cpu/i386/paging.c

@@ -3,7 +3,7 @@
 #include "paging_helpers.h"
 #include "paging.h"
 #include "pmem.h"
-#include "../../kernel/vga_err.h"
+#include "../..//vga_err.h"
 #include <klog.h>
 
 static uint32_t page_directory[1024] __attribute__((aligned(4096)));

kernel/cpu/i386/pmem.c

@@ -1,6 +1,6 @@
 #include <grub/multiboot2.h>
 #include "../halt.h"
-#include "../../kernel/vga_err.h"
+#include "../..//vga_err.h"
 #include <stdint.h>
 #include <stdlib.h>
 #include <klog.h>

kernel/kernel.c

@@ -5,7 +5,7 @@
 #include <memory.h>
 #include <grub/multiboot2.h>
 #include <stdint.h>
-#include "../cpu/cpu_init.h"
+#include "cpu/cpu_init.h"
 #include "vga_err.h"
 #include "elf.h"
 

kernel/vga_err.c

@@ -1,4 +1,4 @@
-#include "../cpu/i386/ports.h"
+#include "cpu/i386/ports.h"
 #include <string.h>
 #define VGA_BLACK 0
 #define VGA_WHITE 15