diff --git a/Makefile b/Makefile index 3fa16d8..94533c5 100644 --- a/Makefile +++ b/Makefile @@ -17,20 +17,41 @@ ISO_DIR = iso_root KERNEL_ELF = $(BUILD_DIR)/boredos.elf ISO_IMAGE = boredos.iso -C_SOURCES = $(wildcard $(SRC_DIR)/*.c) \ - $(wildcard $(SRC_DIR)/lwip/core/*.c) \ - $(wildcard $(SRC_DIR)/lwip/core/ipv4/*.c) \ - $(SRC_DIR)/lwip/netif/ethernet.c \ - $(SRC_DIR)/lwip/netif/bridgeif.c +C_SOURCES = $(wildcard $(SRC_DIR)/core/*.c) \ + $(wildcard $(SRC_DIR)/sys/*.c) \ + $(wildcard $(SRC_DIR)/mem/*.c) \ + $(wildcard $(SRC_DIR)/dev/*.c) \ + $(wildcard $(SRC_DIR)/net/*.c) \ + $(wildcard $(SRC_DIR)/net/nic/*.c) \ + $(wildcard $(SRC_DIR)/fs/*.c) \ + $(wildcard $(SRC_DIR)/wm/*.c) \ + $(SRC_DIR)/cmd.c \ + $(SRC_DIR)/stb_image.c \ + $(SRC_DIR)/lwip_port.c \ + $(wildcard $(SRC_DIR)/net/lwip/core/*.c) \ + $(wildcard $(SRC_DIR)/net/lwip/core/ipv4/*.c) \ + $(SRC_DIR)/net/lwip/netif/ethernet.c \ + $(SRC_DIR)/net/lwip/netif/bridgeif.c -ASM_SOURCES = $(wildcard $(SRC_DIR)/*.asm) -OBJ_FILES = $(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/%.o, $(C_SOURCES)) \ - $(patsubst $(SRC_DIR)/%.asm, $(BUILD_DIR)/%.o, $(ASM_SOURCES)) +ASM_SOURCES = $(wildcard $(SRC_DIR)/arch/*.asm) +OBJ_FILES = $(patsubst $(SRC_DIR)/core/%.c, $(BUILD_DIR)/%.o, $(wildcard $(SRC_DIR)/core/*.c)) \ + $(patsubst $(SRC_DIR)/sys/%.c, $(BUILD_DIR)/%.o, $(wildcard $(SRC_DIR)/sys/*.c)) \ + $(patsubst $(SRC_DIR)/mem/%.c, $(BUILD_DIR)/%.o, $(wildcard $(SRC_DIR)/mem/*.c)) \ + $(patsubst $(SRC_DIR)/dev/%.c, $(BUILD_DIR)/%.o, $(wildcard $(SRC_DIR)/dev/*.c)) \ + $(patsubst $(SRC_DIR)/net/%.c, $(BUILD_DIR)/%.o, $(wildcard $(SRC_DIR)/net/*.c)) \ + $(patsubst $(SRC_DIR)/net/nic/%.c, $(BUILD_DIR)/%.o, $(wildcard $(SRC_DIR)/net/nic/*.c)) \ + $(patsubst $(SRC_DIR)/fs/%.c, $(BUILD_DIR)/%.o, $(wildcard $(SRC_DIR)/fs/*.c)) \ + $(patsubst $(SRC_DIR)/wm/%.c, $(BUILD_DIR)/%.o, $(wildcard $(SRC_DIR)/wm/*.c)) \ + $(BUILD_DIR)/cmd.o \ + $(BUILD_DIR)/stb_image.o \ + $(BUILD_DIR)/lwip_port.o \ + $(patsubst $(SRC_DIR)/net/lwip/%.c, $(BUILD_DIR)/lwip/%.o, $(filter $(SRC_DIR)/net/lwip/%.c, $(C_SOURCES))) \ + $(patsubst $(SRC_DIR)/arch/%.asm, $(BUILD_DIR)/%.o, $(ASM_SOURCES)) CFLAGS = -g -O2 -pipe -Wall -Wextra -std=gnu11 -ffreestanding \ -fno-stack-protector -fno-stack-check -fno-lto -fPIE \ -m64 -march=x86-64 -msse -msse2 -mstackrealign -mno-red-zone \ - -I$(SRC_DIR) -I$(SRC_DIR)/lwip + -I$(SRC_DIR) -I$(SRC_DIR)/net/lwip -I$(SRC_DIR)/core -I$(SRC_DIR)/sys -I$(SRC_DIR)/mem -I$(SRC_DIR)/dev -I$(SRC_DIR)/net -I$(SRC_DIR)/net/nic -I$(SRC_DIR)/fs -I$(SRC_DIR)/wm LDFLAGS = -m elf_x86_64 -nostdlib -static -pie --no-dynamic-linker \ -z text -z max-page-size=0x1000 -T linker.ld @@ -65,18 +86,52 @@ $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c | $(BUILD_DIR) limine-setup mkdir -p $(dir $@) $(CC) $(CFLAGS) -c $< -o $@ +$(BUILD_DIR)/%.o: $(SRC_DIR)/core/%.c | $(BUILD_DIR) limine-setup + mkdir -p $(dir $@) + $(CC) $(CFLAGS) -c $< -o $@ +$(BUILD_DIR)/%.o: $(SRC_DIR)/sys/%.c | $(BUILD_DIR) limine-setup + mkdir -p $(dir $@) + $(CC) $(CFLAGS) -c $< -o $@ -$(BUILD_DIR)/%.o: $(SRC_DIR)/%.asm | $(BUILD_DIR) +$(BUILD_DIR)/%.o: $(SRC_DIR)/mem/%.c | $(BUILD_DIR) limine-setup + mkdir -p $(dir $@) + $(CC) $(CFLAGS) -c $< -o $@ + +$(BUILD_DIR)/%.o: $(SRC_DIR)/dev/%.c | $(BUILD_DIR) limine-setup + mkdir -p $(dir $@) + $(CC) $(CFLAGS) -c $< -o $@ + +$(BUILD_DIR)/%.o: $(SRC_DIR)/net/%.c | $(BUILD_DIR) limine-setup + mkdir -p $(dir $@) + $(CC) $(CFLAGS) -c $< -o $@ + +$(BUILD_DIR)/%.o: $(SRC_DIR)/net/nic/%.c | $(BUILD_DIR) limine-setup + mkdir -p $(dir $@) + $(CC) $(CFLAGS) -c $< -o $@ + +$(BUILD_DIR)/%.o: $(SRC_DIR)/fs/%.c | $(BUILD_DIR) limine-setup + mkdir -p $(dir $@) + $(CC) $(CFLAGS) -c $< -o $@ + +$(BUILD_DIR)/%.o: $(SRC_DIR)/wm/%.c | $(BUILD_DIR) limine-setup + mkdir -p $(dir $@) + $(CC) $(CFLAGS) -c $< -o $@ + +$(BUILD_DIR)/lwip/%.o: $(SRC_DIR)/net/lwip/%.c | $(BUILD_DIR) limine-setup + mkdir -p $(dir $@) + $(CC) $(CFLAGS) -c $< -o $@ + +$(BUILD_DIR)/%.o: $(SRC_DIR)/arch/%.asm | $(BUILD_DIR) $(NASM) $(NASMFLAGS) $< -o $@ -$(BUILD_DIR)/test_syscall.o: $(SRC_DIR)/test_syscall.asm | $(BUILD_DIR) +$(BUILD_DIR)/test_syscall.o: $(SRC_DIR)/arch/test_syscall.asm | $(BUILD_DIR) $(NASM) $(NASMFLAGS) $< -o $@ -$(BUILD_DIR)/user_test.o: $(SRC_DIR)/user_test.asm | $(BUILD_DIR) +$(BUILD_DIR)/user_test.o: $(SRC_DIR)/arch/user_test.asm | $(BUILD_DIR) $(NASM) $(NASMFLAGS) $< -o $@ -$(BUILD_DIR)/process_asm.o: $(SRC_DIR)/process_asm.asm | $(BUILD_DIR) +$(BUILD_DIR)/process_asm.o: $(SRC_DIR)/arch/process_asm.asm | $(BUILD_DIR) $(NASM) $(NASMFLAGS) $< -o $@ $(KERNEL_ELF): $(OBJ_FILES) diff --git a/boredos.iso b/boredos.iso index 1e7d7d9..3f0796e 100644 Binary files a/boredos.iso and b/boredos.iso differ diff --git a/build/cmd.o b/build/cmd.o index 919cc7f..dfd4c7d 100644 Binary files a/build/cmd.o and b/build/cmd.o differ diff --git a/build/disk_manager.o b/build/disk_manager.o index e021f5c..b81b17b 100644 Binary files a/build/disk_manager.o and b/build/disk_manager.o differ diff --git a/build/e1000.o b/build/e1000.o index 971f21a..cccd119 100644 Binary files a/build/e1000.o and b/build/e1000.o differ diff --git a/build/explorer.o b/build/explorer.o index 57aac8c..ec99072 100644 Binary files a/build/explorer.o and b/build/explorer.o differ diff --git a/build/fat32.o b/build/fat32.o index 11f045e..39066ba 100644 Binary files a/build/fat32.o and b/build/fat32.o differ diff --git a/build/graphics.o b/build/graphics.o index b5f4d26..b221c33 100644 Binary files a/build/graphics.o and b/build/graphics.o differ diff --git a/build/idt.o b/build/idt.o index 251961c..bf5d9c2 100644 Binary files a/build/idt.o and b/build/idt.o differ diff --git a/build/licensewr.o b/build/licensewr.o deleted file mode 100644 index d1543a7..0000000 Binary files a/build/licensewr.o and /dev/null differ diff --git a/build/main.o b/build/main.o index cc7d430..3eb2732 100644 Binary files a/build/main.o and b/build/main.o differ diff --git a/build/memory_manager.o b/build/memory_manager.o index ab8b61b..506844b 100644 Binary files a/build/memory_manager.o and b/build/memory_manager.o differ diff --git a/build/pci.o b/build/pci.o index 5d0a3f3..e787bd2 100644 Binary files a/build/pci.o and b/build/pci.o differ diff --git a/build/platform.o b/build/platform.o index 9b393b9..ffe7029 100644 Binary files a/build/platform.o and b/build/platform.o differ diff --git a/build/ps2.o b/build/ps2.o index 8e2a132..742bf10 100644 Binary files a/build/ps2.o and b/build/ps2.o differ diff --git a/build/rtc.o b/build/rtc.o index a122e37..84011fe 100644 Binary files a/build/rtc.o and b/build/rtc.o differ diff --git a/src/kernel/boot.asm b/src/kernel/arch/boot.asm similarity index 100% rename from src/kernel/boot.asm rename to src/kernel/arch/boot.asm diff --git a/src/kernel/gdt_asm.asm b/src/kernel/arch/gdt_asm.asm similarity index 100% rename from src/kernel/gdt_asm.asm rename to src/kernel/arch/gdt_asm.asm diff --git a/src/kernel/interrupts.asm b/src/kernel/arch/interrupts.asm similarity index 100% rename from src/kernel/interrupts.asm rename to src/kernel/arch/interrupts.asm diff --git a/src/kernel/process_asm.asm b/src/kernel/arch/process_asm.asm similarity index 100% rename from src/kernel/process_asm.asm rename to src/kernel/arch/process_asm.asm diff --git a/src/kernel/syscalls.asm b/src/kernel/arch/syscalls.asm similarity index 100% rename from src/kernel/syscalls.asm rename to src/kernel/arch/syscalls.asm diff --git a/src/kernel/test_syscall.asm b/src/kernel/arch/test_syscall.asm similarity index 100% rename from src/kernel/test_syscall.asm rename to src/kernel/arch/test_syscall.asm diff --git a/src/kernel/user_test.asm b/src/kernel/arch/user_test.asm similarity index 100% rename from src/kernel/user_test.asm rename to src/kernel/arch/user_test.asm diff --git a/src/kernel/kutils.c b/src/kernel/core/kutils.c similarity index 100% rename from src/kernel/kutils.c rename to src/kernel/core/kutils.c diff --git a/src/kernel/kutils.h b/src/kernel/core/kutils.h similarity index 100% rename from src/kernel/kutils.h rename to src/kernel/core/kutils.h diff --git a/src/kernel/main.c b/src/kernel/core/main.c similarity index 100% rename from src/kernel/main.c rename to src/kernel/core/main.c diff --git a/src/kernel/panic.c b/src/kernel/core/panic.c similarity index 100% rename from src/kernel/panic.c rename to src/kernel/core/panic.c diff --git a/src/kernel/platform.c b/src/kernel/core/platform.c similarity index 100% rename from src/kernel/platform.c rename to src/kernel/core/platform.c diff --git a/src/kernel/platform.h b/src/kernel/core/platform.h similarity index 100% rename from src/kernel/platform.h rename to src/kernel/core/platform.h diff --git a/src/kernel/disk.h b/src/kernel/dev/disk.h similarity index 100% rename from src/kernel/disk.h rename to src/kernel/dev/disk.h diff --git a/src/kernel/disk_manager.c b/src/kernel/dev/disk_manager.c similarity index 100% rename from src/kernel/disk_manager.c rename to src/kernel/dev/disk_manager.c diff --git a/src/kernel/pci.c b/src/kernel/dev/pci.c similarity index 100% rename from src/kernel/pci.c rename to src/kernel/dev/pci.c diff --git a/src/kernel/pci.h b/src/kernel/dev/pci.h similarity index 100% rename from src/kernel/pci.h rename to src/kernel/dev/pci.h diff --git a/src/kernel/ps2.c b/src/kernel/dev/ps2.c similarity index 100% rename from src/kernel/ps2.c rename to src/kernel/dev/ps2.c diff --git a/src/kernel/ps2.h b/src/kernel/dev/ps2.h similarity index 100% rename from src/kernel/ps2.h rename to src/kernel/dev/ps2.h diff --git a/src/kernel/rtc.c b/src/kernel/dev/rtc.c similarity index 100% rename from src/kernel/rtc.c rename to src/kernel/dev/rtc.c diff --git a/src/kernel/rtc.h b/src/kernel/dev/rtc.h similarity index 100% rename from src/kernel/rtc.h rename to src/kernel/dev/rtc.h diff --git a/src/kernel/fat32.c b/src/kernel/fs/fat32.c similarity index 100% rename from src/kernel/fat32.c rename to src/kernel/fs/fat32.c diff --git a/src/kernel/fat32.h b/src/kernel/fs/fat32.h similarity index 100% rename from src/kernel/fat32.h rename to src/kernel/fs/fat32.h diff --git a/src/kernel/images/gif/giphy-3.gif b/src/kernel/images/gif/BAAA.gif similarity index 100% rename from src/kernel/images/gif/giphy-3.gif rename to src/kernel/images/gif/BAAA.gif diff --git a/src/kernel/images/gif/giphy-2.gif b/src/kernel/images/gif/sussycat.gif similarity index 100% rename from src/kernel/images/gif/giphy-2.gif rename to src/kernel/images/gif/sussycat.gif diff --git a/src/kernel/images/gif/giphy.gif b/src/kernel/images/gif/yumyum.gif similarity index 100% rename from src/kernel/images/gif/giphy.gif rename to src/kernel/images/gif/yumyum.gif diff --git a/src/kernel/memory_manager.c b/src/kernel/mem/memory_manager.c similarity index 100% rename from src/kernel/memory_manager.c rename to src/kernel/mem/memory_manager.c diff --git a/src/kernel/memory_manager.h b/src/kernel/mem/memory_manager.h similarity index 100% rename from src/kernel/memory_manager.h rename to src/kernel/mem/memory_manager.h diff --git a/src/kernel/paging.c b/src/kernel/mem/paging.c similarity index 100% rename from src/kernel/paging.c rename to src/kernel/mem/paging.c diff --git a/src/kernel/paging.h b/src/kernel/mem/paging.h similarity index 100% rename from src/kernel/paging.h rename to src/kernel/mem/paging.h diff --git a/src/kernel/vm.c b/src/kernel/mem/vm.c similarity index 100% rename from src/kernel/vm.c rename to src/kernel/mem/vm.c diff --git a/src/kernel/vm.h b/src/kernel/mem/vm.h similarity index 100% rename from src/kernel/vm.h rename to src/kernel/mem/vm.h diff --git a/src/kernel/lwip/LwIP.h b/src/kernel/net/lwip/LwIP.h similarity index 100% rename from src/kernel/lwip/LwIP.h rename to src/kernel/net/lwip/LwIP.h diff --git a/src/kernel/lwip/api/api_lib.c b/src/kernel/net/lwip/api/api_lib.c similarity index 100% rename from src/kernel/lwip/api/api_lib.c rename to src/kernel/net/lwip/api/api_lib.c diff --git a/src/kernel/lwip/api/api_msg.c b/src/kernel/net/lwip/api/api_msg.c similarity index 100% rename from src/kernel/lwip/api/api_msg.c rename to src/kernel/net/lwip/api/api_msg.c diff --git a/src/kernel/lwip/api/err.c b/src/kernel/net/lwip/api/err.c similarity index 100% rename from src/kernel/lwip/api/err.c rename to src/kernel/net/lwip/api/err.c diff --git a/src/kernel/lwip/api/if_api.c b/src/kernel/net/lwip/api/if_api.c similarity index 100% rename from src/kernel/lwip/api/if_api.c rename to src/kernel/net/lwip/api/if_api.c diff --git a/src/kernel/lwip/api/netbuf.c b/src/kernel/net/lwip/api/netbuf.c similarity index 100% rename from src/kernel/lwip/api/netbuf.c rename to src/kernel/net/lwip/api/netbuf.c diff --git a/src/kernel/lwip/api/netdb.c b/src/kernel/net/lwip/api/netdb.c similarity index 100% rename from src/kernel/lwip/api/netdb.c rename to src/kernel/net/lwip/api/netdb.c diff --git a/src/kernel/lwip/api/netifapi.c b/src/kernel/net/lwip/api/netifapi.c similarity index 100% rename from src/kernel/lwip/api/netifapi.c rename to src/kernel/net/lwip/api/netifapi.c diff --git a/src/kernel/lwip/api/sockets.c b/src/kernel/net/lwip/api/sockets.c similarity index 100% rename from src/kernel/lwip/api/sockets.c rename to src/kernel/net/lwip/api/sockets.c diff --git a/src/kernel/lwip/api/tcpip.c b/src/kernel/net/lwip/api/tcpip.c similarity index 100% rename from src/kernel/lwip/api/tcpip.c rename to src/kernel/net/lwip/api/tcpip.c diff --git a/src/kernel/lwip/arch/bpstruct.h b/src/kernel/net/lwip/arch/bpstruct.h similarity index 100% rename from src/kernel/lwip/arch/bpstruct.h rename to src/kernel/net/lwip/arch/bpstruct.h diff --git a/src/kernel/lwip/arch/cc.h b/src/kernel/net/lwip/arch/cc.h similarity index 100% rename from src/kernel/lwip/arch/cc.h rename to src/kernel/net/lwip/arch/cc.h diff --git a/src/kernel/lwip/arch/cpu.h b/src/kernel/net/lwip/arch/cpu.h similarity index 100% rename from src/kernel/lwip/arch/cpu.h rename to src/kernel/net/lwip/arch/cpu.h diff --git a/src/kernel/lwip/arch/epstruct.h b/src/kernel/net/lwip/arch/epstruct.h similarity index 100% rename from src/kernel/lwip/arch/epstruct.h rename to src/kernel/net/lwip/arch/epstruct.h diff --git a/src/kernel/lwip/arch/init.h b/src/kernel/net/lwip/arch/init.h similarity index 100% rename from src/kernel/lwip/arch/init.h rename to src/kernel/net/lwip/arch/init.h diff --git a/src/kernel/lwip/arch/lib.h b/src/kernel/net/lwip/arch/lib.h similarity index 100% rename from src/kernel/lwip/arch/lib.h rename to src/kernel/net/lwip/arch/lib.h diff --git a/src/kernel/lwip/arch/perf.h b/src/kernel/net/lwip/arch/perf.h similarity index 100% rename from src/kernel/lwip/arch/perf.h rename to src/kernel/net/lwip/arch/perf.h diff --git a/src/kernel/lwip/arch/sys_arch.h b/src/kernel/net/lwip/arch/sys_arch.h similarity index 100% rename from src/kernel/lwip/arch/sys_arch.h rename to src/kernel/net/lwip/arch/sys_arch.h diff --git a/src/kernel/lwip/compat/posix/arpa/inet.h b/src/kernel/net/lwip/compat/posix/arpa/inet.h similarity index 100% rename from src/kernel/lwip/compat/posix/arpa/inet.h rename to src/kernel/net/lwip/compat/posix/arpa/inet.h diff --git a/src/kernel/lwip/compat/posix/net/if.h b/src/kernel/net/lwip/compat/posix/net/if.h similarity index 100% rename from src/kernel/lwip/compat/posix/net/if.h rename to src/kernel/net/lwip/compat/posix/net/if.h diff --git a/src/kernel/lwip/compat/posix/netdb.h b/src/kernel/net/lwip/compat/posix/netdb.h similarity index 100% rename from src/kernel/lwip/compat/posix/netdb.h rename to src/kernel/net/lwip/compat/posix/netdb.h diff --git a/src/kernel/lwip/compat/posix/sys/socket.h b/src/kernel/net/lwip/compat/posix/sys/socket.h similarity index 100% rename from src/kernel/lwip/compat/posix/sys/socket.h rename to src/kernel/net/lwip/compat/posix/sys/socket.h diff --git a/src/kernel/lwip/compat/stdc/errno.h b/src/kernel/net/lwip/compat/stdc/errno.h similarity index 100% rename from src/kernel/lwip/compat/stdc/errno.h rename to src/kernel/net/lwip/compat/stdc/errno.h diff --git a/src/kernel/lwip/core/altcp.c b/src/kernel/net/lwip/core/altcp.c similarity index 100% rename from src/kernel/lwip/core/altcp.c rename to src/kernel/net/lwip/core/altcp.c diff --git a/src/kernel/lwip/core/altcp_alloc.c b/src/kernel/net/lwip/core/altcp_alloc.c similarity index 100% rename from src/kernel/lwip/core/altcp_alloc.c rename to src/kernel/net/lwip/core/altcp_alloc.c diff --git a/src/kernel/lwip/core/altcp_tcp.c b/src/kernel/net/lwip/core/altcp_tcp.c similarity index 100% rename from src/kernel/lwip/core/altcp_tcp.c rename to src/kernel/net/lwip/core/altcp_tcp.c diff --git a/src/kernel/lwip/core/def.c b/src/kernel/net/lwip/core/def.c similarity index 100% rename from src/kernel/lwip/core/def.c rename to src/kernel/net/lwip/core/def.c diff --git a/src/kernel/lwip/core/dns.c b/src/kernel/net/lwip/core/dns.c similarity index 100% rename from src/kernel/lwip/core/dns.c rename to src/kernel/net/lwip/core/dns.c diff --git a/src/kernel/lwip/core/inet_chksum.c b/src/kernel/net/lwip/core/inet_chksum.c similarity index 100% rename from src/kernel/lwip/core/inet_chksum.c rename to src/kernel/net/lwip/core/inet_chksum.c diff --git a/src/kernel/lwip/core/init.c b/src/kernel/net/lwip/core/init.c similarity index 100% rename from src/kernel/lwip/core/init.c rename to src/kernel/net/lwip/core/init.c diff --git a/src/kernel/lwip/core/ip.c b/src/kernel/net/lwip/core/ip.c similarity index 100% rename from src/kernel/lwip/core/ip.c rename to src/kernel/net/lwip/core/ip.c diff --git a/src/kernel/lwip/core/ipv4/autoip.c b/src/kernel/net/lwip/core/ipv4/autoip.c similarity index 100% rename from src/kernel/lwip/core/ipv4/autoip.c rename to src/kernel/net/lwip/core/ipv4/autoip.c diff --git a/src/kernel/lwip/core/ipv4/dhcp.c b/src/kernel/net/lwip/core/ipv4/dhcp.c similarity index 100% rename from src/kernel/lwip/core/ipv4/dhcp.c rename to src/kernel/net/lwip/core/ipv4/dhcp.c diff --git a/src/kernel/lwip/core/ipv4/etharp.c b/src/kernel/net/lwip/core/ipv4/etharp.c similarity index 100% rename from src/kernel/lwip/core/ipv4/etharp.c rename to src/kernel/net/lwip/core/ipv4/etharp.c diff --git a/src/kernel/lwip/core/ipv4/icmp.c b/src/kernel/net/lwip/core/ipv4/icmp.c similarity index 100% rename from src/kernel/lwip/core/ipv4/icmp.c rename to src/kernel/net/lwip/core/ipv4/icmp.c diff --git a/src/kernel/lwip/core/ipv4/igmp.c b/src/kernel/net/lwip/core/ipv4/igmp.c similarity index 100% rename from src/kernel/lwip/core/ipv4/igmp.c rename to src/kernel/net/lwip/core/ipv4/igmp.c diff --git a/src/kernel/lwip/core/ipv4/ip4.c b/src/kernel/net/lwip/core/ipv4/ip4.c similarity index 100% rename from src/kernel/lwip/core/ipv4/ip4.c rename to src/kernel/net/lwip/core/ipv4/ip4.c diff --git a/src/kernel/lwip/core/ipv4/ip4_addr.c b/src/kernel/net/lwip/core/ipv4/ip4_addr.c similarity index 100% rename from src/kernel/lwip/core/ipv4/ip4_addr.c rename to src/kernel/net/lwip/core/ipv4/ip4_addr.c diff --git a/src/kernel/lwip/core/ipv4/ip4_frag.c b/src/kernel/net/lwip/core/ipv4/ip4_frag.c similarity index 100% rename from src/kernel/lwip/core/ipv4/ip4_frag.c rename to src/kernel/net/lwip/core/ipv4/ip4_frag.c diff --git a/src/kernel/lwip/core/ipv6/dhcp6.c b/src/kernel/net/lwip/core/ipv6/dhcp6.c similarity index 100% rename from src/kernel/lwip/core/ipv6/dhcp6.c rename to src/kernel/net/lwip/core/ipv6/dhcp6.c diff --git a/src/kernel/lwip/core/ipv6/ethip6.c b/src/kernel/net/lwip/core/ipv6/ethip6.c similarity index 100% rename from src/kernel/lwip/core/ipv6/ethip6.c rename to src/kernel/net/lwip/core/ipv6/ethip6.c diff --git a/src/kernel/lwip/core/ipv6/icmp6.c b/src/kernel/net/lwip/core/ipv6/icmp6.c similarity index 100% rename from src/kernel/lwip/core/ipv6/icmp6.c rename to src/kernel/net/lwip/core/ipv6/icmp6.c diff --git a/src/kernel/lwip/core/ipv6/inet6.c b/src/kernel/net/lwip/core/ipv6/inet6.c similarity index 100% rename from src/kernel/lwip/core/ipv6/inet6.c rename to src/kernel/net/lwip/core/ipv6/inet6.c diff --git a/src/kernel/lwip/core/ipv6/ip6.c b/src/kernel/net/lwip/core/ipv6/ip6.c similarity index 100% rename from src/kernel/lwip/core/ipv6/ip6.c rename to src/kernel/net/lwip/core/ipv6/ip6.c diff --git a/src/kernel/lwip/core/ipv6/ip6_addr.c b/src/kernel/net/lwip/core/ipv6/ip6_addr.c similarity index 100% rename from src/kernel/lwip/core/ipv6/ip6_addr.c rename to src/kernel/net/lwip/core/ipv6/ip6_addr.c diff --git a/src/kernel/lwip/core/ipv6/ip6_frag.c b/src/kernel/net/lwip/core/ipv6/ip6_frag.c similarity index 100% rename from src/kernel/lwip/core/ipv6/ip6_frag.c rename to src/kernel/net/lwip/core/ipv6/ip6_frag.c diff --git a/src/kernel/lwip/core/ipv6/mld6.c b/src/kernel/net/lwip/core/ipv6/mld6.c similarity index 100% rename from src/kernel/lwip/core/ipv6/mld6.c rename to src/kernel/net/lwip/core/ipv6/mld6.c diff --git a/src/kernel/lwip/core/ipv6/nd6.c b/src/kernel/net/lwip/core/ipv6/nd6.c similarity index 100% rename from src/kernel/lwip/core/ipv6/nd6.c rename to src/kernel/net/lwip/core/ipv6/nd6.c diff --git a/src/kernel/lwip/core/mem.c b/src/kernel/net/lwip/core/mem.c similarity index 100% rename from src/kernel/lwip/core/mem.c rename to src/kernel/net/lwip/core/mem.c diff --git a/src/kernel/lwip/core/memp.c b/src/kernel/net/lwip/core/memp.c similarity index 100% rename from src/kernel/lwip/core/memp.c rename to src/kernel/net/lwip/core/memp.c diff --git a/src/kernel/lwip/core/netif.c b/src/kernel/net/lwip/core/netif.c similarity index 100% rename from src/kernel/lwip/core/netif.c rename to src/kernel/net/lwip/core/netif.c diff --git a/src/kernel/lwip/core/pbuf.c b/src/kernel/net/lwip/core/pbuf.c similarity index 100% rename from src/kernel/lwip/core/pbuf.c rename to src/kernel/net/lwip/core/pbuf.c diff --git a/src/kernel/lwip/core/raw.c b/src/kernel/net/lwip/core/raw.c similarity index 100% rename from src/kernel/lwip/core/raw.c rename to src/kernel/net/lwip/core/raw.c diff --git a/src/kernel/lwip/core/stats.c b/src/kernel/net/lwip/core/stats.c similarity index 100% rename from src/kernel/lwip/core/stats.c rename to src/kernel/net/lwip/core/stats.c diff --git a/src/kernel/lwip/core/sys.c b/src/kernel/net/lwip/core/sys.c similarity index 100% rename from src/kernel/lwip/core/sys.c rename to src/kernel/net/lwip/core/sys.c diff --git a/src/kernel/lwip/core/tcp.c b/src/kernel/net/lwip/core/tcp.c similarity index 100% rename from src/kernel/lwip/core/tcp.c rename to src/kernel/net/lwip/core/tcp.c diff --git a/src/kernel/lwip/core/tcp_in.c b/src/kernel/net/lwip/core/tcp_in.c similarity index 100% rename from src/kernel/lwip/core/tcp_in.c rename to src/kernel/net/lwip/core/tcp_in.c diff --git a/src/kernel/lwip/core/tcp_out.c b/src/kernel/net/lwip/core/tcp_out.c similarity index 100% rename from src/kernel/lwip/core/tcp_out.c rename to src/kernel/net/lwip/core/tcp_out.c diff --git a/src/kernel/lwip/core/timeouts.c b/src/kernel/net/lwip/core/timeouts.c similarity index 100% rename from src/kernel/lwip/core/timeouts.c rename to src/kernel/net/lwip/core/timeouts.c diff --git a/src/kernel/lwip/core/udp.c b/src/kernel/net/lwip/core/udp.c similarity index 100% rename from src/kernel/lwip/core/udp.c rename to src/kernel/net/lwip/core/udp.c diff --git a/src/kernel/lwip/lwip/altcp.h b/src/kernel/net/lwip/lwip/altcp.h similarity index 100% rename from src/kernel/lwip/lwip/altcp.h rename to src/kernel/net/lwip/lwip/altcp.h diff --git a/src/kernel/lwip/lwip/altcp_tcp.h b/src/kernel/net/lwip/lwip/altcp_tcp.h similarity index 100% rename from src/kernel/lwip/lwip/altcp_tcp.h rename to src/kernel/net/lwip/lwip/altcp_tcp.h diff --git a/src/kernel/lwip/lwip/altcp_tls.h b/src/kernel/net/lwip/lwip/altcp_tls.h similarity index 100% rename from src/kernel/lwip/lwip/altcp_tls.h rename to src/kernel/net/lwip/lwip/altcp_tls.h diff --git a/src/kernel/lwip/lwip/api.h b/src/kernel/net/lwip/lwip/api.h similarity index 100% rename from src/kernel/lwip/lwip/api.h rename to src/kernel/net/lwip/lwip/api.h diff --git a/src/kernel/lwip/lwip/apps/FILES b/src/kernel/net/lwip/lwip/apps/FILES similarity index 100% rename from src/kernel/lwip/lwip/apps/FILES rename to src/kernel/net/lwip/lwip/apps/FILES diff --git a/src/kernel/lwip/lwip/apps/altcp_proxyconnect.h b/src/kernel/net/lwip/lwip/apps/altcp_proxyconnect.h similarity index 100% rename from src/kernel/lwip/lwip/apps/altcp_proxyconnect.h rename to src/kernel/net/lwip/lwip/apps/altcp_proxyconnect.h diff --git a/src/kernel/lwip/lwip/apps/altcp_tls_mbedtls_opts.h b/src/kernel/net/lwip/lwip/apps/altcp_tls_mbedtls_opts.h similarity index 100% rename from src/kernel/lwip/lwip/apps/altcp_tls_mbedtls_opts.h rename to src/kernel/net/lwip/lwip/apps/altcp_tls_mbedtls_opts.h diff --git a/src/kernel/lwip/lwip/apps/fs.h b/src/kernel/net/lwip/lwip/apps/fs.h similarity index 100% rename from src/kernel/lwip/lwip/apps/fs.h rename to src/kernel/net/lwip/lwip/apps/fs.h diff --git a/src/kernel/lwip/lwip/apps/http_client.h b/src/kernel/net/lwip/lwip/apps/http_client.h similarity index 100% rename from src/kernel/lwip/lwip/apps/http_client.h rename to src/kernel/net/lwip/lwip/apps/http_client.h diff --git a/src/kernel/lwip/lwip/apps/httpd.h b/src/kernel/net/lwip/lwip/apps/httpd.h similarity index 100% rename from src/kernel/lwip/lwip/apps/httpd.h rename to src/kernel/net/lwip/lwip/apps/httpd.h diff --git a/src/kernel/lwip/lwip/apps/httpd_opts.h b/src/kernel/net/lwip/lwip/apps/httpd_opts.h similarity index 100% rename from src/kernel/lwip/lwip/apps/httpd_opts.h rename to src/kernel/net/lwip/lwip/apps/httpd_opts.h diff --git a/src/kernel/lwip/lwip/apps/lwiperf.h b/src/kernel/net/lwip/lwip/apps/lwiperf.h similarity index 100% rename from src/kernel/lwip/lwip/apps/lwiperf.h rename to src/kernel/net/lwip/lwip/apps/lwiperf.h diff --git a/src/kernel/lwip/lwip/apps/mdns.h b/src/kernel/net/lwip/lwip/apps/mdns.h similarity index 100% rename from src/kernel/lwip/lwip/apps/mdns.h rename to src/kernel/net/lwip/lwip/apps/mdns.h diff --git a/src/kernel/lwip/lwip/apps/mdns_opts.h b/src/kernel/net/lwip/lwip/apps/mdns_opts.h similarity index 100% rename from src/kernel/lwip/lwip/apps/mdns_opts.h rename to src/kernel/net/lwip/lwip/apps/mdns_opts.h diff --git a/src/kernel/lwip/lwip/apps/mdns_priv.h b/src/kernel/net/lwip/lwip/apps/mdns_priv.h similarity index 100% rename from src/kernel/lwip/lwip/apps/mdns_priv.h rename to src/kernel/net/lwip/lwip/apps/mdns_priv.h diff --git a/src/kernel/lwip/lwip/apps/mqtt.h b/src/kernel/net/lwip/lwip/apps/mqtt.h similarity index 100% rename from src/kernel/lwip/lwip/apps/mqtt.h rename to src/kernel/net/lwip/lwip/apps/mqtt.h diff --git a/src/kernel/lwip/lwip/apps/mqtt_opts.h b/src/kernel/net/lwip/lwip/apps/mqtt_opts.h similarity index 100% rename from src/kernel/lwip/lwip/apps/mqtt_opts.h rename to src/kernel/net/lwip/lwip/apps/mqtt_opts.h diff --git a/src/kernel/lwip/lwip/apps/mqtt_priv.h b/src/kernel/net/lwip/lwip/apps/mqtt_priv.h similarity index 100% rename from src/kernel/lwip/lwip/apps/mqtt_priv.h rename to src/kernel/net/lwip/lwip/apps/mqtt_priv.h diff --git a/src/kernel/lwip/lwip/apps/netbiosns.h b/src/kernel/net/lwip/lwip/apps/netbiosns.h similarity index 100% rename from src/kernel/lwip/lwip/apps/netbiosns.h rename to src/kernel/net/lwip/lwip/apps/netbiosns.h diff --git a/src/kernel/lwip/lwip/apps/netbiosns_opts.h b/src/kernel/net/lwip/lwip/apps/netbiosns_opts.h similarity index 100% rename from src/kernel/lwip/lwip/apps/netbiosns_opts.h rename to src/kernel/net/lwip/lwip/apps/netbiosns_opts.h diff --git a/src/kernel/lwip/lwip/apps/smtp.h b/src/kernel/net/lwip/lwip/apps/smtp.h similarity index 100% rename from src/kernel/lwip/lwip/apps/smtp.h rename to src/kernel/net/lwip/lwip/apps/smtp.h diff --git a/src/kernel/lwip/lwip/apps/smtp_opts.h b/src/kernel/net/lwip/lwip/apps/smtp_opts.h similarity index 100% rename from src/kernel/lwip/lwip/apps/smtp_opts.h rename to src/kernel/net/lwip/lwip/apps/smtp_opts.h diff --git a/src/kernel/lwip/lwip/apps/snmp.h b/src/kernel/net/lwip/lwip/apps/snmp.h similarity index 100% rename from src/kernel/lwip/lwip/apps/snmp.h rename to src/kernel/net/lwip/lwip/apps/snmp.h diff --git a/src/kernel/lwip/lwip/apps/snmp_core.h b/src/kernel/net/lwip/lwip/apps/snmp_core.h similarity index 100% rename from src/kernel/lwip/lwip/apps/snmp_core.h rename to src/kernel/net/lwip/lwip/apps/snmp_core.h diff --git a/src/kernel/lwip/lwip/apps/snmp_mib2.h b/src/kernel/net/lwip/lwip/apps/snmp_mib2.h similarity index 100% rename from src/kernel/lwip/lwip/apps/snmp_mib2.h rename to src/kernel/net/lwip/lwip/apps/snmp_mib2.h diff --git a/src/kernel/lwip/lwip/apps/snmp_opts.h b/src/kernel/net/lwip/lwip/apps/snmp_opts.h similarity index 100% rename from src/kernel/lwip/lwip/apps/snmp_opts.h rename to src/kernel/net/lwip/lwip/apps/snmp_opts.h diff --git a/src/kernel/lwip/lwip/apps/snmp_scalar.h b/src/kernel/net/lwip/lwip/apps/snmp_scalar.h similarity index 100% rename from src/kernel/lwip/lwip/apps/snmp_scalar.h rename to src/kernel/net/lwip/lwip/apps/snmp_scalar.h diff --git a/src/kernel/lwip/lwip/apps/snmp_snmpv2_framework.h b/src/kernel/net/lwip/lwip/apps/snmp_snmpv2_framework.h similarity index 100% rename from src/kernel/lwip/lwip/apps/snmp_snmpv2_framework.h rename to src/kernel/net/lwip/lwip/apps/snmp_snmpv2_framework.h diff --git a/src/kernel/lwip/lwip/apps/snmp_snmpv2_usm.h b/src/kernel/net/lwip/lwip/apps/snmp_snmpv2_usm.h similarity index 100% rename from src/kernel/lwip/lwip/apps/snmp_snmpv2_usm.h rename to src/kernel/net/lwip/lwip/apps/snmp_snmpv2_usm.h diff --git a/src/kernel/lwip/lwip/apps/snmp_table.h b/src/kernel/net/lwip/lwip/apps/snmp_table.h similarity index 100% rename from src/kernel/lwip/lwip/apps/snmp_table.h rename to src/kernel/net/lwip/lwip/apps/snmp_table.h diff --git a/src/kernel/lwip/lwip/apps/snmp_threadsync.h b/src/kernel/net/lwip/lwip/apps/snmp_threadsync.h similarity index 100% rename from src/kernel/lwip/lwip/apps/snmp_threadsync.h rename to src/kernel/net/lwip/lwip/apps/snmp_threadsync.h diff --git a/src/kernel/lwip/lwip/apps/snmpv3.h b/src/kernel/net/lwip/lwip/apps/snmpv3.h similarity index 100% rename from src/kernel/lwip/lwip/apps/snmpv3.h rename to src/kernel/net/lwip/lwip/apps/snmpv3.h diff --git a/src/kernel/lwip/lwip/apps/sntp.h b/src/kernel/net/lwip/lwip/apps/sntp.h similarity index 100% rename from src/kernel/lwip/lwip/apps/sntp.h rename to src/kernel/net/lwip/lwip/apps/sntp.h diff --git a/src/kernel/lwip/lwip/apps/sntp_opts.h b/src/kernel/net/lwip/lwip/apps/sntp_opts.h similarity index 100% rename from src/kernel/lwip/lwip/apps/sntp_opts.h rename to src/kernel/net/lwip/lwip/apps/sntp_opts.h diff --git a/src/kernel/lwip/lwip/apps/tftp_opts.h b/src/kernel/net/lwip/lwip/apps/tftp_opts.h similarity index 100% rename from src/kernel/lwip/lwip/apps/tftp_opts.h rename to src/kernel/net/lwip/lwip/apps/tftp_opts.h diff --git a/src/kernel/lwip/lwip/apps/tftp_server.h b/src/kernel/net/lwip/lwip/apps/tftp_server.h similarity index 100% rename from src/kernel/lwip/lwip/apps/tftp_server.h rename to src/kernel/net/lwip/lwip/apps/tftp_server.h diff --git a/src/kernel/lwip/lwip/arch.h b/src/kernel/net/lwip/lwip/arch.h similarity index 100% rename from src/kernel/lwip/lwip/arch.h rename to src/kernel/net/lwip/lwip/arch.h diff --git a/src/kernel/lwip/lwip/autoip.h b/src/kernel/net/lwip/lwip/autoip.h similarity index 100% rename from src/kernel/lwip/lwip/autoip.h rename to src/kernel/net/lwip/lwip/autoip.h diff --git a/src/kernel/lwip/lwip/debug.h b/src/kernel/net/lwip/lwip/debug.h similarity index 100% rename from src/kernel/lwip/lwip/debug.h rename to src/kernel/net/lwip/lwip/debug.h diff --git a/src/kernel/lwip/lwip/def.h b/src/kernel/net/lwip/lwip/def.h similarity index 100% rename from src/kernel/lwip/lwip/def.h rename to src/kernel/net/lwip/lwip/def.h diff --git a/src/kernel/lwip/lwip/dhcp.h b/src/kernel/net/lwip/lwip/dhcp.h similarity index 100% rename from src/kernel/lwip/lwip/dhcp.h rename to src/kernel/net/lwip/lwip/dhcp.h diff --git a/src/kernel/lwip/lwip/dhcp6.h b/src/kernel/net/lwip/lwip/dhcp6.h similarity index 100% rename from src/kernel/lwip/lwip/dhcp6.h rename to src/kernel/net/lwip/lwip/dhcp6.h diff --git a/src/kernel/lwip/lwip/dns.h b/src/kernel/net/lwip/lwip/dns.h similarity index 100% rename from src/kernel/lwip/lwip/dns.h rename to src/kernel/net/lwip/lwip/dns.h diff --git a/src/kernel/lwip/lwip/err.h b/src/kernel/net/lwip/lwip/err.h similarity index 100% rename from src/kernel/lwip/lwip/err.h rename to src/kernel/net/lwip/lwip/err.h diff --git a/src/kernel/lwip/lwip/errno.h b/src/kernel/net/lwip/lwip/errno.h similarity index 100% rename from src/kernel/lwip/lwip/errno.h rename to src/kernel/net/lwip/lwip/errno.h diff --git a/src/kernel/lwip/lwip/etharp.h b/src/kernel/net/lwip/lwip/etharp.h similarity index 100% rename from src/kernel/lwip/lwip/etharp.h rename to src/kernel/net/lwip/lwip/etharp.h diff --git a/src/kernel/lwip/lwip/ethip6.h b/src/kernel/net/lwip/lwip/ethip6.h similarity index 100% rename from src/kernel/lwip/lwip/ethip6.h rename to src/kernel/net/lwip/lwip/ethip6.h diff --git a/src/kernel/lwip/lwip/icmp.h b/src/kernel/net/lwip/lwip/icmp.h similarity index 100% rename from src/kernel/lwip/lwip/icmp.h rename to src/kernel/net/lwip/lwip/icmp.h diff --git a/src/kernel/lwip/lwip/icmp6.h b/src/kernel/net/lwip/lwip/icmp6.h similarity index 100% rename from src/kernel/lwip/lwip/icmp6.h rename to src/kernel/net/lwip/lwip/icmp6.h diff --git a/src/kernel/lwip/lwip/if_api.h b/src/kernel/net/lwip/lwip/if_api.h similarity index 100% rename from src/kernel/lwip/lwip/if_api.h rename to src/kernel/net/lwip/lwip/if_api.h diff --git a/src/kernel/lwip/lwip/igmp.h b/src/kernel/net/lwip/lwip/igmp.h similarity index 100% rename from src/kernel/lwip/lwip/igmp.h rename to src/kernel/net/lwip/lwip/igmp.h diff --git a/src/kernel/lwip/lwip/inet.h b/src/kernel/net/lwip/lwip/inet.h similarity index 100% rename from src/kernel/lwip/lwip/inet.h rename to src/kernel/net/lwip/lwip/inet.h diff --git a/src/kernel/lwip/lwip/inet_chksum.h b/src/kernel/net/lwip/lwip/inet_chksum.h similarity index 100% rename from src/kernel/lwip/lwip/inet_chksum.h rename to src/kernel/net/lwip/lwip/inet_chksum.h diff --git a/src/kernel/lwip/lwip/init.h b/src/kernel/net/lwip/lwip/init.h similarity index 100% rename from src/kernel/lwip/lwip/init.h rename to src/kernel/net/lwip/lwip/init.h diff --git a/src/kernel/lwip/lwip/init.h.cmake.in b/src/kernel/net/lwip/lwip/init.h.cmake.in similarity index 100% rename from src/kernel/lwip/lwip/init.h.cmake.in rename to src/kernel/net/lwip/lwip/init.h.cmake.in diff --git a/src/kernel/lwip/lwip/ip.h b/src/kernel/net/lwip/lwip/ip.h similarity index 100% rename from src/kernel/lwip/lwip/ip.h rename to src/kernel/net/lwip/lwip/ip.h diff --git a/src/kernel/lwip/lwip/ip4.h b/src/kernel/net/lwip/lwip/ip4.h similarity index 100% rename from src/kernel/lwip/lwip/ip4.h rename to src/kernel/net/lwip/lwip/ip4.h diff --git a/src/kernel/lwip/lwip/ip4_addr.h b/src/kernel/net/lwip/lwip/ip4_addr.h similarity index 100% rename from src/kernel/lwip/lwip/ip4_addr.h rename to src/kernel/net/lwip/lwip/ip4_addr.h diff --git a/src/kernel/lwip/lwip/ip4_frag.h b/src/kernel/net/lwip/lwip/ip4_frag.h similarity index 100% rename from src/kernel/lwip/lwip/ip4_frag.h rename to src/kernel/net/lwip/lwip/ip4_frag.h diff --git a/src/kernel/lwip/lwip/ip6.h b/src/kernel/net/lwip/lwip/ip6.h similarity index 100% rename from src/kernel/lwip/lwip/ip6.h rename to src/kernel/net/lwip/lwip/ip6.h diff --git a/src/kernel/lwip/lwip/ip6_addr.h b/src/kernel/net/lwip/lwip/ip6_addr.h similarity index 100% rename from src/kernel/lwip/lwip/ip6_addr.h rename to src/kernel/net/lwip/lwip/ip6_addr.h diff --git a/src/kernel/lwip/lwip/ip6_frag.h b/src/kernel/net/lwip/lwip/ip6_frag.h similarity index 100% rename from src/kernel/lwip/lwip/ip6_frag.h rename to src/kernel/net/lwip/lwip/ip6_frag.h diff --git a/src/kernel/lwip/lwip/ip6_zone.h b/src/kernel/net/lwip/lwip/ip6_zone.h similarity index 100% rename from src/kernel/lwip/lwip/ip6_zone.h rename to src/kernel/net/lwip/lwip/ip6_zone.h diff --git a/src/kernel/lwip/lwip/ip_addr.h b/src/kernel/net/lwip/lwip/ip_addr.h similarity index 100% rename from src/kernel/lwip/lwip/ip_addr.h rename to src/kernel/net/lwip/lwip/ip_addr.h diff --git a/src/kernel/lwip/lwip/mem.h b/src/kernel/net/lwip/lwip/mem.h similarity index 100% rename from src/kernel/lwip/lwip/mem.h rename to src/kernel/net/lwip/lwip/mem.h diff --git a/src/kernel/lwip/lwip/memp.h b/src/kernel/net/lwip/lwip/memp.h similarity index 100% rename from src/kernel/lwip/lwip/memp.h rename to src/kernel/net/lwip/lwip/memp.h diff --git a/src/kernel/lwip/lwip/mld6.h b/src/kernel/net/lwip/lwip/mld6.h similarity index 100% rename from src/kernel/lwip/lwip/mld6.h rename to src/kernel/net/lwip/lwip/mld6.h diff --git a/src/kernel/lwip/lwip/nd6.h b/src/kernel/net/lwip/lwip/nd6.h similarity index 100% rename from src/kernel/lwip/lwip/nd6.h rename to src/kernel/net/lwip/lwip/nd6.h diff --git a/src/kernel/lwip/lwip/netbuf.h b/src/kernel/net/lwip/lwip/netbuf.h similarity index 100% rename from src/kernel/lwip/lwip/netbuf.h rename to src/kernel/net/lwip/lwip/netbuf.h diff --git a/src/kernel/lwip/lwip/netdb.h b/src/kernel/net/lwip/lwip/netdb.h similarity index 100% rename from src/kernel/lwip/lwip/netdb.h rename to src/kernel/net/lwip/lwip/netdb.h diff --git a/src/kernel/lwip/lwip/netif.h b/src/kernel/net/lwip/lwip/netif.h similarity index 100% rename from src/kernel/lwip/lwip/netif.h rename to src/kernel/net/lwip/lwip/netif.h diff --git a/src/kernel/lwip/lwip/netifapi.h b/src/kernel/net/lwip/lwip/netifapi.h similarity index 100% rename from src/kernel/lwip/lwip/netifapi.h rename to src/kernel/net/lwip/lwip/netifapi.h diff --git a/src/kernel/lwip/lwip/opt.h b/src/kernel/net/lwip/lwip/opt.h similarity index 100% rename from src/kernel/lwip/lwip/opt.h rename to src/kernel/net/lwip/lwip/opt.h diff --git a/src/kernel/lwip/lwip/pbuf.h b/src/kernel/net/lwip/lwip/pbuf.h similarity index 100% rename from src/kernel/lwip/lwip/pbuf.h rename to src/kernel/net/lwip/lwip/pbuf.h diff --git a/src/kernel/lwip/lwip/priv/altcp_priv.h b/src/kernel/net/lwip/lwip/priv/altcp_priv.h similarity index 100% rename from src/kernel/lwip/lwip/priv/altcp_priv.h rename to src/kernel/net/lwip/lwip/priv/altcp_priv.h diff --git a/src/kernel/lwip/lwip/priv/api_msg.h b/src/kernel/net/lwip/lwip/priv/api_msg.h similarity index 100% rename from src/kernel/lwip/lwip/priv/api_msg.h rename to src/kernel/net/lwip/lwip/priv/api_msg.h diff --git a/src/kernel/lwip/lwip/priv/mem_priv.h b/src/kernel/net/lwip/lwip/priv/mem_priv.h similarity index 100% rename from src/kernel/lwip/lwip/priv/mem_priv.h rename to src/kernel/net/lwip/lwip/priv/mem_priv.h diff --git a/src/kernel/lwip/lwip/priv/memp_priv.h b/src/kernel/net/lwip/lwip/priv/memp_priv.h similarity index 100% rename from src/kernel/lwip/lwip/priv/memp_priv.h rename to src/kernel/net/lwip/lwip/priv/memp_priv.h diff --git a/src/kernel/lwip/lwip/priv/memp_std.h b/src/kernel/net/lwip/lwip/priv/memp_std.h similarity index 100% rename from src/kernel/lwip/lwip/priv/memp_std.h rename to src/kernel/net/lwip/lwip/priv/memp_std.h diff --git a/src/kernel/lwip/lwip/priv/nd6_priv.h b/src/kernel/net/lwip/lwip/priv/nd6_priv.h similarity index 100% rename from src/kernel/lwip/lwip/priv/nd6_priv.h rename to src/kernel/net/lwip/lwip/priv/nd6_priv.h diff --git a/src/kernel/lwip/lwip/priv/raw_priv.h b/src/kernel/net/lwip/lwip/priv/raw_priv.h similarity index 100% rename from src/kernel/lwip/lwip/priv/raw_priv.h rename to src/kernel/net/lwip/lwip/priv/raw_priv.h diff --git a/src/kernel/lwip/lwip/priv/sockets_priv.h b/src/kernel/net/lwip/lwip/priv/sockets_priv.h similarity index 100% rename from src/kernel/lwip/lwip/priv/sockets_priv.h rename to src/kernel/net/lwip/lwip/priv/sockets_priv.h diff --git a/src/kernel/lwip/lwip/priv/tcp_priv.h b/src/kernel/net/lwip/lwip/priv/tcp_priv.h similarity index 100% rename from src/kernel/lwip/lwip/priv/tcp_priv.h rename to src/kernel/net/lwip/lwip/priv/tcp_priv.h diff --git a/src/kernel/lwip/lwip/priv/tcpip_priv.h b/src/kernel/net/lwip/lwip/priv/tcpip_priv.h similarity index 100% rename from src/kernel/lwip/lwip/priv/tcpip_priv.h rename to src/kernel/net/lwip/lwip/priv/tcpip_priv.h diff --git a/src/kernel/lwip/lwip/prot/autoip.h b/src/kernel/net/lwip/lwip/prot/autoip.h similarity index 100% rename from src/kernel/lwip/lwip/prot/autoip.h rename to src/kernel/net/lwip/lwip/prot/autoip.h diff --git a/src/kernel/lwip/lwip/prot/dhcp.h b/src/kernel/net/lwip/lwip/prot/dhcp.h similarity index 100% rename from src/kernel/lwip/lwip/prot/dhcp.h rename to src/kernel/net/lwip/lwip/prot/dhcp.h diff --git a/src/kernel/lwip/lwip/prot/dhcp6.h b/src/kernel/net/lwip/lwip/prot/dhcp6.h similarity index 100% rename from src/kernel/lwip/lwip/prot/dhcp6.h rename to src/kernel/net/lwip/lwip/prot/dhcp6.h diff --git a/src/kernel/lwip/lwip/prot/dns.h b/src/kernel/net/lwip/lwip/prot/dns.h similarity index 100% rename from src/kernel/lwip/lwip/prot/dns.h rename to src/kernel/net/lwip/lwip/prot/dns.h diff --git a/src/kernel/lwip/lwip/prot/etharp.h b/src/kernel/net/lwip/lwip/prot/etharp.h similarity index 100% rename from src/kernel/lwip/lwip/prot/etharp.h rename to src/kernel/net/lwip/lwip/prot/etharp.h diff --git a/src/kernel/lwip/lwip/prot/ethernet.h b/src/kernel/net/lwip/lwip/prot/ethernet.h similarity index 100% rename from src/kernel/lwip/lwip/prot/ethernet.h rename to src/kernel/net/lwip/lwip/prot/ethernet.h diff --git a/src/kernel/lwip/lwip/prot/iana.h b/src/kernel/net/lwip/lwip/prot/iana.h similarity index 100% rename from src/kernel/lwip/lwip/prot/iana.h rename to src/kernel/net/lwip/lwip/prot/iana.h diff --git a/src/kernel/lwip/lwip/prot/icmp.h b/src/kernel/net/lwip/lwip/prot/icmp.h similarity index 100% rename from src/kernel/lwip/lwip/prot/icmp.h rename to src/kernel/net/lwip/lwip/prot/icmp.h diff --git a/src/kernel/lwip/lwip/prot/icmp6.h b/src/kernel/net/lwip/lwip/prot/icmp6.h similarity index 100% rename from src/kernel/lwip/lwip/prot/icmp6.h rename to src/kernel/net/lwip/lwip/prot/icmp6.h diff --git a/src/kernel/lwip/lwip/prot/ieee.h b/src/kernel/net/lwip/lwip/prot/ieee.h similarity index 100% rename from src/kernel/lwip/lwip/prot/ieee.h rename to src/kernel/net/lwip/lwip/prot/ieee.h diff --git a/src/kernel/lwip/lwip/prot/igmp.h b/src/kernel/net/lwip/lwip/prot/igmp.h similarity index 100% rename from src/kernel/lwip/lwip/prot/igmp.h rename to src/kernel/net/lwip/lwip/prot/igmp.h diff --git a/src/kernel/lwip/lwip/prot/ip.h b/src/kernel/net/lwip/lwip/prot/ip.h similarity index 100% rename from src/kernel/lwip/lwip/prot/ip.h rename to src/kernel/net/lwip/lwip/prot/ip.h diff --git a/src/kernel/lwip/lwip/prot/ip4.h b/src/kernel/net/lwip/lwip/prot/ip4.h similarity index 100% rename from src/kernel/lwip/lwip/prot/ip4.h rename to src/kernel/net/lwip/lwip/prot/ip4.h diff --git a/src/kernel/lwip/lwip/prot/ip6.h b/src/kernel/net/lwip/lwip/prot/ip6.h similarity index 100% rename from src/kernel/lwip/lwip/prot/ip6.h rename to src/kernel/net/lwip/lwip/prot/ip6.h diff --git a/src/kernel/lwip/lwip/prot/mld6.h b/src/kernel/net/lwip/lwip/prot/mld6.h similarity index 100% rename from src/kernel/lwip/lwip/prot/mld6.h rename to src/kernel/net/lwip/lwip/prot/mld6.h diff --git a/src/kernel/lwip/lwip/prot/nd6.h b/src/kernel/net/lwip/lwip/prot/nd6.h similarity index 100% rename from src/kernel/lwip/lwip/prot/nd6.h rename to src/kernel/net/lwip/lwip/prot/nd6.h diff --git a/src/kernel/lwip/lwip/prot/tcp.h b/src/kernel/net/lwip/lwip/prot/tcp.h similarity index 100% rename from src/kernel/lwip/lwip/prot/tcp.h rename to src/kernel/net/lwip/lwip/prot/tcp.h diff --git a/src/kernel/lwip/lwip/prot/udp.h b/src/kernel/net/lwip/lwip/prot/udp.h similarity index 100% rename from src/kernel/lwip/lwip/prot/udp.h rename to src/kernel/net/lwip/lwip/prot/udp.h diff --git a/src/kernel/lwip/lwip/raw.h b/src/kernel/net/lwip/lwip/raw.h similarity index 100% rename from src/kernel/lwip/lwip/raw.h rename to src/kernel/net/lwip/lwip/raw.h diff --git a/src/kernel/lwip/lwip/sio.h b/src/kernel/net/lwip/lwip/sio.h similarity index 100% rename from src/kernel/lwip/lwip/sio.h rename to src/kernel/net/lwip/lwip/sio.h diff --git a/src/kernel/lwip/lwip/snmp.h b/src/kernel/net/lwip/lwip/snmp.h similarity index 100% rename from src/kernel/lwip/lwip/snmp.h rename to src/kernel/net/lwip/lwip/snmp.h diff --git a/src/kernel/lwip/lwip/sockets.h b/src/kernel/net/lwip/lwip/sockets.h similarity index 100% rename from src/kernel/lwip/lwip/sockets.h rename to src/kernel/net/lwip/lwip/sockets.h diff --git a/src/kernel/lwip/lwip/stats.h b/src/kernel/net/lwip/lwip/stats.h similarity index 100% rename from src/kernel/lwip/lwip/stats.h rename to src/kernel/net/lwip/lwip/stats.h diff --git a/src/kernel/lwip/lwip/sys.h b/src/kernel/net/lwip/lwip/sys.h similarity index 100% rename from src/kernel/lwip/lwip/sys.h rename to src/kernel/net/lwip/lwip/sys.h diff --git a/src/kernel/lwip/lwip/tcp.h b/src/kernel/net/lwip/lwip/tcp.h similarity index 100% rename from src/kernel/lwip/lwip/tcp.h rename to src/kernel/net/lwip/lwip/tcp.h diff --git a/src/kernel/lwip/lwip/tcpbase.h b/src/kernel/net/lwip/lwip/tcpbase.h similarity index 100% rename from src/kernel/lwip/lwip/tcpbase.h rename to src/kernel/net/lwip/lwip/tcpbase.h diff --git a/src/kernel/lwip/lwip/tcpip.h b/src/kernel/net/lwip/lwip/tcpip.h similarity index 100% rename from src/kernel/lwip/lwip/tcpip.h rename to src/kernel/net/lwip/lwip/tcpip.h diff --git a/src/kernel/lwip/lwip/timeouts.h b/src/kernel/net/lwip/lwip/timeouts.h similarity index 100% rename from src/kernel/lwip/lwip/timeouts.h rename to src/kernel/net/lwip/lwip/timeouts.h diff --git a/src/kernel/lwip/lwip/udp.h b/src/kernel/net/lwip/lwip/udp.h similarity index 100% rename from src/kernel/lwip/lwip/udp.h rename to src/kernel/net/lwip/lwip/udp.h diff --git a/src/kernel/lwip/netif/FILES b/src/kernel/net/lwip/netif/FILES similarity index 100% rename from src/kernel/lwip/netif/FILES rename to src/kernel/net/lwip/netif/FILES diff --git a/src/kernel/lwip/netif/bridgeif.c b/src/kernel/net/lwip/netif/bridgeif.c similarity index 100% rename from src/kernel/lwip/netif/bridgeif.c rename to src/kernel/net/lwip/netif/bridgeif.c diff --git a/src/kernel/lwip/netif/bridgeif.h b/src/kernel/net/lwip/netif/bridgeif.h similarity index 100% rename from src/kernel/lwip/netif/bridgeif.h rename to src/kernel/net/lwip/netif/bridgeif.h diff --git a/src/kernel/lwip/netif/bridgeif_fdb.c b/src/kernel/net/lwip/netif/bridgeif_fdb.c similarity index 100% rename from src/kernel/lwip/netif/bridgeif_fdb.c rename to src/kernel/net/lwip/netif/bridgeif_fdb.c diff --git a/src/kernel/lwip/netif/bridgeif_opts.h b/src/kernel/net/lwip/netif/bridgeif_opts.h similarity index 100% rename from src/kernel/lwip/netif/bridgeif_opts.h rename to src/kernel/net/lwip/netif/bridgeif_opts.h diff --git a/src/kernel/lwip/netif/etharp.h b/src/kernel/net/lwip/netif/etharp.h similarity index 100% rename from src/kernel/lwip/netif/etharp.h rename to src/kernel/net/lwip/netif/etharp.h diff --git a/src/kernel/lwip/netif/ethernet.c b/src/kernel/net/lwip/netif/ethernet.c similarity index 100% rename from src/kernel/lwip/netif/ethernet.c rename to src/kernel/net/lwip/netif/ethernet.c diff --git a/src/kernel/lwip/netif/ethernet.h b/src/kernel/net/lwip/netif/ethernet.h similarity index 100% rename from src/kernel/lwip/netif/ethernet.h rename to src/kernel/net/lwip/netif/ethernet.h diff --git a/src/kernel/lwip/netif/ieee802154.h b/src/kernel/net/lwip/netif/ieee802154.h similarity index 100% rename from src/kernel/lwip/netif/ieee802154.h rename to src/kernel/net/lwip/netif/ieee802154.h diff --git a/src/kernel/lwip/netif/lowpan6.c b/src/kernel/net/lwip/netif/lowpan6.c similarity index 100% rename from src/kernel/lwip/netif/lowpan6.c rename to src/kernel/net/lwip/netif/lowpan6.c diff --git a/src/kernel/lwip/netif/lowpan6.h b/src/kernel/net/lwip/netif/lowpan6.h similarity index 100% rename from src/kernel/lwip/netif/lowpan6.h rename to src/kernel/net/lwip/netif/lowpan6.h diff --git a/src/kernel/lwip/netif/lowpan6_ble.c b/src/kernel/net/lwip/netif/lowpan6_ble.c similarity index 100% rename from src/kernel/lwip/netif/lowpan6_ble.c rename to src/kernel/net/lwip/netif/lowpan6_ble.c diff --git a/src/kernel/lwip/netif/lowpan6_ble.h b/src/kernel/net/lwip/netif/lowpan6_ble.h similarity index 100% rename from src/kernel/lwip/netif/lowpan6_ble.h rename to src/kernel/net/lwip/netif/lowpan6_ble.h diff --git a/src/kernel/lwip/netif/lowpan6_common.c b/src/kernel/net/lwip/netif/lowpan6_common.c similarity index 100% rename from src/kernel/lwip/netif/lowpan6_common.c rename to src/kernel/net/lwip/netif/lowpan6_common.c diff --git a/src/kernel/lwip/netif/lowpan6_common.h b/src/kernel/net/lwip/netif/lowpan6_common.h similarity index 100% rename from src/kernel/lwip/netif/lowpan6_common.h rename to src/kernel/net/lwip/netif/lowpan6_common.h diff --git a/src/kernel/lwip/netif/lowpan6_opts.h b/src/kernel/net/lwip/netif/lowpan6_opts.h similarity index 100% rename from src/kernel/lwip/netif/lowpan6_opts.h rename to src/kernel/net/lwip/netif/lowpan6_opts.h diff --git a/src/kernel/lwip/netif/ppp/PPPD_FOLLOWUP b/src/kernel/net/lwip/netif/ppp/PPPD_FOLLOWUP similarity index 100% rename from src/kernel/lwip/netif/ppp/PPPD_FOLLOWUP rename to src/kernel/net/lwip/netif/ppp/PPPD_FOLLOWUP diff --git a/src/kernel/lwip/netif/ppp/auth.c b/src/kernel/net/lwip/netif/ppp/auth.c similarity index 100% rename from src/kernel/lwip/netif/ppp/auth.c rename to src/kernel/net/lwip/netif/ppp/auth.c diff --git a/src/kernel/lwip/netif/ppp/ccp.c b/src/kernel/net/lwip/netif/ppp/ccp.c similarity index 100% rename from src/kernel/lwip/netif/ppp/ccp.c rename to src/kernel/net/lwip/netif/ppp/ccp.c diff --git a/src/kernel/lwip/netif/ppp/ccp.h b/src/kernel/net/lwip/netif/ppp/ccp.h similarity index 100% rename from src/kernel/lwip/netif/ppp/ccp.h rename to src/kernel/net/lwip/netif/ppp/ccp.h diff --git a/src/kernel/lwip/netif/ppp/chap-md5.c b/src/kernel/net/lwip/netif/ppp/chap-md5.c similarity index 100% rename from src/kernel/lwip/netif/ppp/chap-md5.c rename to src/kernel/net/lwip/netif/ppp/chap-md5.c diff --git a/src/kernel/lwip/netif/ppp/chap-md5.h b/src/kernel/net/lwip/netif/ppp/chap-md5.h similarity index 100% rename from src/kernel/lwip/netif/ppp/chap-md5.h rename to src/kernel/net/lwip/netif/ppp/chap-md5.h diff --git a/src/kernel/lwip/netif/ppp/chap-new.c b/src/kernel/net/lwip/netif/ppp/chap-new.c similarity index 100% rename from src/kernel/lwip/netif/ppp/chap-new.c rename to src/kernel/net/lwip/netif/ppp/chap-new.c diff --git a/src/kernel/lwip/netif/ppp/chap-new.h b/src/kernel/net/lwip/netif/ppp/chap-new.h similarity index 100% rename from src/kernel/lwip/netif/ppp/chap-new.h rename to src/kernel/net/lwip/netif/ppp/chap-new.h diff --git a/src/kernel/lwip/netif/ppp/chap_ms.c b/src/kernel/net/lwip/netif/ppp/chap_ms.c similarity index 100% rename from src/kernel/lwip/netif/ppp/chap_ms.c rename to src/kernel/net/lwip/netif/ppp/chap_ms.c diff --git a/src/kernel/lwip/netif/ppp/chap_ms.h b/src/kernel/net/lwip/netif/ppp/chap_ms.h similarity index 100% rename from src/kernel/lwip/netif/ppp/chap_ms.h rename to src/kernel/net/lwip/netif/ppp/chap_ms.h diff --git a/src/kernel/lwip/netif/ppp/demand.c b/src/kernel/net/lwip/netif/ppp/demand.c similarity index 100% rename from src/kernel/lwip/netif/ppp/demand.c rename to src/kernel/net/lwip/netif/ppp/demand.c diff --git a/src/kernel/lwip/netif/ppp/eap.c b/src/kernel/net/lwip/netif/ppp/eap.c similarity index 100% rename from src/kernel/lwip/netif/ppp/eap.c rename to src/kernel/net/lwip/netif/ppp/eap.c diff --git a/src/kernel/lwip/netif/ppp/eap.h b/src/kernel/net/lwip/netif/ppp/eap.h similarity index 100% rename from src/kernel/lwip/netif/ppp/eap.h rename to src/kernel/net/lwip/netif/ppp/eap.h diff --git a/src/kernel/lwip/netif/ppp/ecp.c b/src/kernel/net/lwip/netif/ppp/ecp.c similarity index 100% rename from src/kernel/lwip/netif/ppp/ecp.c rename to src/kernel/net/lwip/netif/ppp/ecp.c diff --git a/src/kernel/lwip/netif/ppp/ecp.h b/src/kernel/net/lwip/netif/ppp/ecp.h similarity index 100% rename from src/kernel/lwip/netif/ppp/ecp.h rename to src/kernel/net/lwip/netif/ppp/ecp.h diff --git a/src/kernel/lwip/netif/ppp/eui64.c b/src/kernel/net/lwip/netif/ppp/eui64.c similarity index 100% rename from src/kernel/lwip/netif/ppp/eui64.c rename to src/kernel/net/lwip/netif/ppp/eui64.c diff --git a/src/kernel/lwip/netif/ppp/eui64.h b/src/kernel/net/lwip/netif/ppp/eui64.h similarity index 100% rename from src/kernel/lwip/netif/ppp/eui64.h rename to src/kernel/net/lwip/netif/ppp/eui64.h diff --git a/src/kernel/lwip/netif/ppp/fsm.c b/src/kernel/net/lwip/netif/ppp/fsm.c similarity index 100% rename from src/kernel/lwip/netif/ppp/fsm.c rename to src/kernel/net/lwip/netif/ppp/fsm.c diff --git a/src/kernel/lwip/netif/ppp/fsm.h b/src/kernel/net/lwip/netif/ppp/fsm.h similarity index 100% rename from src/kernel/lwip/netif/ppp/fsm.h rename to src/kernel/net/lwip/netif/ppp/fsm.h diff --git a/src/kernel/lwip/netif/ppp/ipcp.c b/src/kernel/net/lwip/netif/ppp/ipcp.c similarity index 100% rename from src/kernel/lwip/netif/ppp/ipcp.c rename to src/kernel/net/lwip/netif/ppp/ipcp.c diff --git a/src/kernel/lwip/netif/ppp/ipcp.h b/src/kernel/net/lwip/netif/ppp/ipcp.h similarity index 100% rename from src/kernel/lwip/netif/ppp/ipcp.h rename to src/kernel/net/lwip/netif/ppp/ipcp.h diff --git a/src/kernel/lwip/netif/ppp/ipv6cp.c b/src/kernel/net/lwip/netif/ppp/ipv6cp.c similarity index 100% rename from src/kernel/lwip/netif/ppp/ipv6cp.c rename to src/kernel/net/lwip/netif/ppp/ipv6cp.c diff --git a/src/kernel/lwip/netif/ppp/ipv6cp.h b/src/kernel/net/lwip/netif/ppp/ipv6cp.h similarity index 100% rename from src/kernel/lwip/netif/ppp/ipv6cp.h rename to src/kernel/net/lwip/netif/ppp/ipv6cp.h diff --git a/src/kernel/lwip/netif/ppp/lcp.c b/src/kernel/net/lwip/netif/ppp/lcp.c similarity index 100% rename from src/kernel/lwip/netif/ppp/lcp.c rename to src/kernel/net/lwip/netif/ppp/lcp.c diff --git a/src/kernel/lwip/netif/ppp/lcp.h b/src/kernel/net/lwip/netif/ppp/lcp.h similarity index 100% rename from src/kernel/lwip/netif/ppp/lcp.h rename to src/kernel/net/lwip/netif/ppp/lcp.h diff --git a/src/kernel/lwip/netif/ppp/magic.c b/src/kernel/net/lwip/netif/ppp/magic.c similarity index 100% rename from src/kernel/lwip/netif/ppp/magic.c rename to src/kernel/net/lwip/netif/ppp/magic.c diff --git a/src/kernel/lwip/netif/ppp/magic.h b/src/kernel/net/lwip/netif/ppp/magic.h similarity index 100% rename from src/kernel/lwip/netif/ppp/magic.h rename to src/kernel/net/lwip/netif/ppp/magic.h diff --git a/src/kernel/lwip/netif/ppp/mppe.c b/src/kernel/net/lwip/netif/ppp/mppe.c similarity index 100% rename from src/kernel/lwip/netif/ppp/mppe.c rename to src/kernel/net/lwip/netif/ppp/mppe.c diff --git a/src/kernel/lwip/netif/ppp/mppe.h b/src/kernel/net/lwip/netif/ppp/mppe.h similarity index 100% rename from src/kernel/lwip/netif/ppp/mppe.h rename to src/kernel/net/lwip/netif/ppp/mppe.h diff --git a/src/kernel/lwip/netif/ppp/multilink.c b/src/kernel/net/lwip/netif/ppp/multilink.c similarity index 100% rename from src/kernel/lwip/netif/ppp/multilink.c rename to src/kernel/net/lwip/netif/ppp/multilink.c diff --git a/src/kernel/lwip/netif/ppp/polarssl/README b/src/kernel/net/lwip/netif/ppp/polarssl/README similarity index 100% rename from src/kernel/lwip/netif/ppp/polarssl/README rename to src/kernel/net/lwip/netif/ppp/polarssl/README diff --git a/src/kernel/lwip/netif/ppp/polarssl/arc4.c b/src/kernel/net/lwip/netif/ppp/polarssl/arc4.c similarity index 100% rename from src/kernel/lwip/netif/ppp/polarssl/arc4.c rename to src/kernel/net/lwip/netif/ppp/polarssl/arc4.c diff --git a/src/kernel/lwip/netif/ppp/polarssl/arc4.h b/src/kernel/net/lwip/netif/ppp/polarssl/arc4.h similarity index 100% rename from src/kernel/lwip/netif/ppp/polarssl/arc4.h rename to src/kernel/net/lwip/netif/ppp/polarssl/arc4.h diff --git a/src/kernel/lwip/netif/ppp/polarssl/des.c b/src/kernel/net/lwip/netif/ppp/polarssl/des.c similarity index 100% rename from src/kernel/lwip/netif/ppp/polarssl/des.c rename to src/kernel/net/lwip/netif/ppp/polarssl/des.c diff --git a/src/kernel/lwip/netif/ppp/polarssl/des.h b/src/kernel/net/lwip/netif/ppp/polarssl/des.h similarity index 100% rename from src/kernel/lwip/netif/ppp/polarssl/des.h rename to src/kernel/net/lwip/netif/ppp/polarssl/des.h diff --git a/src/kernel/lwip/netif/ppp/polarssl/md4.c b/src/kernel/net/lwip/netif/ppp/polarssl/md4.c similarity index 100% rename from src/kernel/lwip/netif/ppp/polarssl/md4.c rename to src/kernel/net/lwip/netif/ppp/polarssl/md4.c diff --git a/src/kernel/lwip/netif/ppp/polarssl/md4.h b/src/kernel/net/lwip/netif/ppp/polarssl/md4.h similarity index 100% rename from src/kernel/lwip/netif/ppp/polarssl/md4.h rename to src/kernel/net/lwip/netif/ppp/polarssl/md4.h diff --git a/src/kernel/lwip/netif/ppp/polarssl/md5.c b/src/kernel/net/lwip/netif/ppp/polarssl/md5.c similarity index 100% rename from src/kernel/lwip/netif/ppp/polarssl/md5.c rename to src/kernel/net/lwip/netif/ppp/polarssl/md5.c diff --git a/src/kernel/lwip/netif/ppp/polarssl/md5.h b/src/kernel/net/lwip/netif/ppp/polarssl/md5.h similarity index 100% rename from src/kernel/lwip/netif/ppp/polarssl/md5.h rename to src/kernel/net/lwip/netif/ppp/polarssl/md5.h diff --git a/src/kernel/lwip/netif/ppp/polarssl/sha1.c b/src/kernel/net/lwip/netif/ppp/polarssl/sha1.c similarity index 100% rename from src/kernel/lwip/netif/ppp/polarssl/sha1.c rename to src/kernel/net/lwip/netif/ppp/polarssl/sha1.c diff --git a/src/kernel/lwip/netif/ppp/polarssl/sha1.h b/src/kernel/net/lwip/netif/ppp/polarssl/sha1.h similarity index 100% rename from src/kernel/lwip/netif/ppp/polarssl/sha1.h rename to src/kernel/net/lwip/netif/ppp/polarssl/sha1.h diff --git a/src/kernel/lwip/netif/ppp/ppp.c b/src/kernel/net/lwip/netif/ppp/ppp.c similarity index 100% rename from src/kernel/lwip/netif/ppp/ppp.c rename to src/kernel/net/lwip/netif/ppp/ppp.c diff --git a/src/kernel/lwip/netif/ppp/ppp.h b/src/kernel/net/lwip/netif/ppp/ppp.h similarity index 100% rename from src/kernel/lwip/netif/ppp/ppp.h rename to src/kernel/net/lwip/netif/ppp/ppp.h diff --git a/src/kernel/lwip/netif/ppp/ppp_impl.h b/src/kernel/net/lwip/netif/ppp/ppp_impl.h similarity index 100% rename from src/kernel/lwip/netif/ppp/ppp_impl.h rename to src/kernel/net/lwip/netif/ppp/ppp_impl.h diff --git a/src/kernel/lwip/netif/ppp/ppp_opts.h b/src/kernel/net/lwip/netif/ppp/ppp_opts.h similarity index 100% rename from src/kernel/lwip/netif/ppp/ppp_opts.h rename to src/kernel/net/lwip/netif/ppp/ppp_opts.h diff --git a/src/kernel/lwip/netif/ppp/pppapi.c b/src/kernel/net/lwip/netif/ppp/pppapi.c similarity index 100% rename from src/kernel/lwip/netif/ppp/pppapi.c rename to src/kernel/net/lwip/netif/ppp/pppapi.c diff --git a/src/kernel/lwip/netif/ppp/pppapi.h b/src/kernel/net/lwip/netif/ppp/pppapi.h similarity index 100% rename from src/kernel/lwip/netif/ppp/pppapi.h rename to src/kernel/net/lwip/netif/ppp/pppapi.h diff --git a/src/kernel/lwip/netif/ppp/pppcrypt.c b/src/kernel/net/lwip/netif/ppp/pppcrypt.c similarity index 100% rename from src/kernel/lwip/netif/ppp/pppcrypt.c rename to src/kernel/net/lwip/netif/ppp/pppcrypt.c diff --git a/src/kernel/lwip/netif/ppp/pppcrypt.h b/src/kernel/net/lwip/netif/ppp/pppcrypt.h similarity index 100% rename from src/kernel/lwip/netif/ppp/pppcrypt.h rename to src/kernel/net/lwip/netif/ppp/pppcrypt.h diff --git a/src/kernel/lwip/netif/ppp/pppdebug.h b/src/kernel/net/lwip/netif/ppp/pppdebug.h similarity index 100% rename from src/kernel/lwip/netif/ppp/pppdebug.h rename to src/kernel/net/lwip/netif/ppp/pppdebug.h diff --git a/src/kernel/lwip/netif/ppp/pppoe.c b/src/kernel/net/lwip/netif/ppp/pppoe.c similarity index 100% rename from src/kernel/lwip/netif/ppp/pppoe.c rename to src/kernel/net/lwip/netif/ppp/pppoe.c diff --git a/src/kernel/lwip/netif/ppp/pppoe.h b/src/kernel/net/lwip/netif/ppp/pppoe.h similarity index 100% rename from src/kernel/lwip/netif/ppp/pppoe.h rename to src/kernel/net/lwip/netif/ppp/pppoe.h diff --git a/src/kernel/lwip/netif/ppp/pppol2tp.c b/src/kernel/net/lwip/netif/ppp/pppol2tp.c similarity index 100% rename from src/kernel/lwip/netif/ppp/pppol2tp.c rename to src/kernel/net/lwip/netif/ppp/pppol2tp.c diff --git a/src/kernel/lwip/netif/ppp/pppol2tp.h b/src/kernel/net/lwip/netif/ppp/pppol2tp.h similarity index 100% rename from src/kernel/lwip/netif/ppp/pppol2tp.h rename to src/kernel/net/lwip/netif/ppp/pppol2tp.h diff --git a/src/kernel/lwip/netif/ppp/pppos.c b/src/kernel/net/lwip/netif/ppp/pppos.c similarity index 100% rename from src/kernel/lwip/netif/ppp/pppos.c rename to src/kernel/net/lwip/netif/ppp/pppos.c diff --git a/src/kernel/lwip/netif/ppp/pppos.h b/src/kernel/net/lwip/netif/ppp/pppos.h similarity index 100% rename from src/kernel/lwip/netif/ppp/pppos.h rename to src/kernel/net/lwip/netif/ppp/pppos.h diff --git a/src/kernel/lwip/netif/ppp/upap.c b/src/kernel/net/lwip/netif/ppp/upap.c similarity index 100% rename from src/kernel/lwip/netif/ppp/upap.c rename to src/kernel/net/lwip/netif/ppp/upap.c diff --git a/src/kernel/lwip/netif/ppp/upap.h b/src/kernel/net/lwip/netif/ppp/upap.h similarity index 100% rename from src/kernel/lwip/netif/ppp/upap.h rename to src/kernel/net/lwip/netif/ppp/upap.h diff --git a/src/kernel/lwip/netif/ppp/utils.c b/src/kernel/net/lwip/netif/ppp/utils.c similarity index 100% rename from src/kernel/lwip/netif/ppp/utils.c rename to src/kernel/net/lwip/netif/ppp/utils.c diff --git a/src/kernel/lwip/netif/ppp/vj.c b/src/kernel/net/lwip/netif/ppp/vj.c similarity index 100% rename from src/kernel/lwip/netif/ppp/vj.c rename to src/kernel/net/lwip/netif/ppp/vj.c diff --git a/src/kernel/lwip/netif/ppp/vj.h b/src/kernel/net/lwip/netif/ppp/vj.h similarity index 100% rename from src/kernel/lwip/netif/ppp/vj.h rename to src/kernel/net/lwip/netif/ppp/vj.h diff --git a/src/kernel/lwip/netif/slipif.c b/src/kernel/net/lwip/netif/slipif.c similarity index 100% rename from src/kernel/lwip/netif/slipif.c rename to src/kernel/net/lwip/netif/slipif.c diff --git a/src/kernel/lwip/netif/slipif.h b/src/kernel/net/lwip/netif/slipif.h similarity index 100% rename from src/kernel/lwip/netif/slipif.h rename to src/kernel/net/lwip/netif/slipif.h diff --git a/src/kernel/lwip/netif/zepif.c b/src/kernel/net/lwip/netif/zepif.c similarity index 100% rename from src/kernel/lwip/netif/zepif.c rename to src/kernel/net/lwip/netif/zepif.c diff --git a/src/kernel/lwip/netif/zepif.h b/src/kernel/net/lwip/netif/zepif.h similarity index 100% rename from src/kernel/lwip/netif/zepif.h rename to src/kernel/net/lwip/netif/zepif.h diff --git a/src/kernel/lwip/stdlib.h b/src/kernel/net/lwip/stdlib.h similarity index 100% rename from src/kernel/lwip/stdlib.h rename to src/kernel/net/lwip/stdlib.h diff --git a/src/kernel/lwip/string.h b/src/kernel/net/lwip/string.h similarity index 100% rename from src/kernel/lwip/string.h rename to src/kernel/net/lwip/string.h diff --git a/src/kernel/lwip/system/OS/sys_arch.c b/src/kernel/net/lwip/system/OS/sys_arch.c similarity index 100% rename from src/kernel/lwip/system/OS/sys_arch.c rename to src/kernel/net/lwip/system/OS/sys_arch.c diff --git a/src/kernel/net_defs.h b/src/kernel/net/net_defs.h similarity index 100% rename from src/kernel/net_defs.h rename to src/kernel/net/net_defs.h diff --git a/src/kernel/network.c b/src/kernel/net/network.c similarity index 100% rename from src/kernel/network.c rename to src/kernel/net/network.c diff --git a/src/kernel/network.h b/src/kernel/net/network.h similarity index 100% rename from src/kernel/network.h rename to src/kernel/net/network.h diff --git a/src/kernel/e1000.c b/src/kernel/net/nic/e1000.c similarity index 100% rename from src/kernel/e1000.c rename to src/kernel/net/nic/e1000.c diff --git a/src/kernel/e1000.h b/src/kernel/net/nic/e1000.h similarity index 100% rename from src/kernel/e1000.h rename to src/kernel/net/nic/e1000.h diff --git a/src/kernel/nic.c b/src/kernel/net/nic/nic.c similarity index 100% rename from src/kernel/nic.c rename to src/kernel/net/nic/nic.c diff --git a/src/kernel/nic.h b/src/kernel/net/nic/nic.h similarity index 100% rename from src/kernel/nic.h rename to src/kernel/net/nic/nic.h diff --git a/src/kernel/nic_netif.c b/src/kernel/net/nic/nic_netif.c similarity index 100% rename from src/kernel/nic_netif.c rename to src/kernel/net/nic/nic_netif.c diff --git a/src/kernel/nic_netif.h b/src/kernel/net/nic/nic_netif.h similarity index 100% rename from src/kernel/nic_netif.h rename to src/kernel/net/nic/nic_netif.h diff --git a/src/kernel/rtl8111.c b/src/kernel/net/nic/rtl8111.c similarity index 100% rename from src/kernel/rtl8111.c rename to src/kernel/net/nic/rtl8111.c diff --git a/src/kernel/rtl8111.h b/src/kernel/net/nic/rtl8111.h similarity index 100% rename from src/kernel/rtl8111.h rename to src/kernel/net/nic/rtl8111.h diff --git a/src/kernel/rtl8139.c b/src/kernel/net/nic/rtl8139.c similarity index 100% rename from src/kernel/rtl8139.c rename to src/kernel/net/nic/rtl8139.c diff --git a/src/kernel/rtl8139.h b/src/kernel/net/nic/rtl8139.h similarity index 100% rename from src/kernel/rtl8139.h rename to src/kernel/net/nic/rtl8139.h diff --git a/src/kernel/virtio_net.c b/src/kernel/net/nic/virtio_net.c similarity index 100% rename from src/kernel/virtio_net.c rename to src/kernel/net/nic/virtio_net.c diff --git a/src/kernel/virtio_net.h b/src/kernel/net/nic/virtio_net.h similarity index 100% rename from src/kernel/virtio_net.h rename to src/kernel/net/nic/virtio_net.h diff --git a/src/kernel/elf.c b/src/kernel/sys/elf.c similarity index 100% rename from src/kernel/elf.c rename to src/kernel/sys/elf.c diff --git a/src/kernel/elf.h b/src/kernel/sys/elf.h similarity index 100% rename from src/kernel/elf.h rename to src/kernel/sys/elf.h diff --git a/src/kernel/gdt.c b/src/kernel/sys/gdt.c similarity index 100% rename from src/kernel/gdt.c rename to src/kernel/sys/gdt.c diff --git a/src/kernel/gdt.h b/src/kernel/sys/gdt.h similarity index 100% rename from src/kernel/gdt.h rename to src/kernel/sys/gdt.h diff --git a/src/kernel/idt.c b/src/kernel/sys/idt.c similarity index 100% rename from src/kernel/idt.c rename to src/kernel/sys/idt.c diff --git a/src/kernel/idt.h b/src/kernel/sys/idt.h similarity index 100% rename from src/kernel/idt.h rename to src/kernel/sys/idt.h diff --git a/src/kernel/process.c b/src/kernel/sys/process.c similarity index 100% rename from src/kernel/process.c rename to src/kernel/sys/process.c diff --git a/src/kernel/process.h b/src/kernel/sys/process.h similarity index 100% rename from src/kernel/process.h rename to src/kernel/sys/process.h diff --git a/src/kernel/syscall.c b/src/kernel/sys/syscall.c similarity index 100% rename from src/kernel/syscall.c rename to src/kernel/sys/syscall.c diff --git a/src/kernel/syscall.h b/src/kernel/sys/syscall.h similarity index 100% rename from src/kernel/syscall.h rename to src/kernel/sys/syscall.h diff --git a/src/kernel/userland/Makefile b/src/kernel/userland/Makefile index d43ade6..59c4d29 100644 --- a/src/kernel/userland/Makefile +++ b/src/kernel/userland/Makefile @@ -5,7 +5,7 @@ CC = x86_64-elf-gcc AS = nasm LD = x86_64-elf-ld -CFLAGS = -Wall -Wextra -std=gnu11 -ffreestanding -O2 -fno-stack-protector -fno-stack-check -fno-lto -fno-pie -m64 -march=x86-64 -mno-red-zone -Ilibc +CFLAGS = -Wall -Wextra -std=gnu11 -ffreestanding -O2 -fno-stack-protector -fno-stack-check -fno-lto -fno-pie -m64 -march=x86-64 -mno-red-zone -I. -Ilibc LDFLAGS = -m elf_x86_64 -nostdlib -static -no-pie -Ttext=0x40000000 --no-dynamic-linker -z text -z max-page-size=0x1000 -e _start BIN_DIR = bin @@ -13,11 +13,15 @@ BIN_DIR = bin LIBC_SOURCES = $(wildcard libc/*.c) LIBC_OBJS = $(patsubst libc/%.c, $(BIN_DIR)/%.o, $(LIBC_SOURCES)) $(BIN_DIR)/crt0.o -APP_SOURCES = $(filter-out stb_image.c, $(wildcard *.c)) -APP_ELFS = $(patsubst %.c, $(BIN_DIR)/%.elf, $(APP_SOURCES)) +VPATH = cli gui sys games libc +vpath %.c cli gui sys games libc -DOOM_SOURCES = $(wildcard doom/*.c) -DOOM_OBJS = $(patsubst doom/%.c, $(BIN_DIR)/%.o, $(DOOM_SOURCES)) +APP_SOURCES_FULL = $(wildcard cli/*.c gui/*.c sys/*.c games/*.c *.c) +APP_SOURCES = $(filter-out stb_image.c, $(APP_SOURCES_FULL)) +APP_ELFS = $(patsubst %.c, $(BIN_DIR)/%.elf, $(notdir $(APP_SOURCES))) + +DOOM_SOURCES = $(wildcard games/doom/*.c) +DOOM_OBJS = $(patsubst games/doom/%.c, $(BIN_DIR)/%.o, $(DOOM_SOURCES)) all: $(BIN_DIR) $(APP_ELFS) $(BIN_DIR)/doom.elf @@ -48,8 +52,8 @@ $(BIN_DIR)/browser.elf: $(LIBC_OBJS) $(BIN_DIR)/browser.o $(BIN_DIR)/stb_image.o $(BIN_DIR)/screenshot.elf: $(LIBC_OBJS) $(BIN_DIR)/screenshot.o $(BIN_DIR)/stb_image.o $(LD) $(LDFLAGS) $^ -o $@ -$(BIN_DIR)/%.o: doom/%.c - $(CC) $(CFLAGS) -Wno-error -Idoom -c $< -o $@ +$(BIN_DIR)/%.o: games/doom/%.c + $(CC) $(CFLAGS) -Wno-error -Igames/doom -c $< -o $@ $(BIN_DIR)/doom.elf: $(LIBC_OBJS) $(DOOM_OBJS) $(BIN_DIR)/stb_image.o $(LD) $(LDFLAGS) $^ -o $@ diff --git a/src/kernel/userland/cat.c b/src/kernel/userland/cli/cat.c similarity index 100% rename from src/kernel/userland/cat.c rename to src/kernel/userland/cli/cat.c diff --git a/src/kernel/userland/cc.c b/src/kernel/userland/cli/cc.c similarity index 99% rename from src/kernel/userland/cc.c rename to src/kernel/userland/cli/cc.c index 7083d49..74be9dd 100644 --- a/src/kernel/userland/cc.c +++ b/src/kernel/userland/cli/cc.c @@ -3,7 +3,7 @@ // This header needs to maintain in any file it is present in, as per the GPL license terms. #include #include -#include "../vm.h" +#include "../../mem/vm.h" // --- Compiler Limits --- #define MAX_SOURCE 65536 diff --git a/src/kernel/userland/clear.c b/src/kernel/userland/cli/clear.c similarity index 100% rename from src/kernel/userland/clear.c rename to src/kernel/userland/cli/clear.c diff --git a/src/kernel/userland/cowsay.c b/src/kernel/userland/cli/cowsay.c similarity index 100% rename from src/kernel/userland/cowsay.c rename to src/kernel/userland/cli/cowsay.c diff --git a/src/kernel/userland/cp.c b/src/kernel/userland/cli/cp.c similarity index 100% rename from src/kernel/userland/cp.c rename to src/kernel/userland/cli/cp.c diff --git a/src/kernel/userland/date.c b/src/kernel/userland/cli/date.c similarity index 100% rename from src/kernel/userland/date.c rename to src/kernel/userland/cli/date.c diff --git a/src/kernel/userland/echo.c b/src/kernel/userland/cli/echo.c similarity index 100% rename from src/kernel/userland/echo.c rename to src/kernel/userland/cli/echo.c diff --git a/src/kernel/userland/hello.c b/src/kernel/userland/cli/hello.c similarity index 100% rename from src/kernel/userland/hello.c rename to src/kernel/userland/cli/hello.c diff --git a/src/kernel/userland/help.c b/src/kernel/userland/cli/help.c similarity index 100% rename from src/kernel/userland/help.c rename to src/kernel/userland/cli/help.c diff --git a/src/kernel/userland/ls.c b/src/kernel/userland/cli/ls.c similarity index 100% rename from src/kernel/userland/ls.c rename to src/kernel/userland/cli/ls.c diff --git a/src/kernel/userland/man.c b/src/kernel/userland/cli/man.c similarity index 100% rename from src/kernel/userland/man.c rename to src/kernel/userland/cli/man.c diff --git a/src/kernel/userland/mkdir.c b/src/kernel/userland/cli/mkdir.c similarity index 100% rename from src/kernel/userland/mkdir.c rename to src/kernel/userland/cli/mkdir.c diff --git a/src/kernel/userland/mv.c b/src/kernel/userland/cli/mv.c similarity index 100% rename from src/kernel/userland/mv.c rename to src/kernel/userland/cli/mv.c diff --git a/src/kernel/userland/pwd.c b/src/kernel/userland/cli/pwd.c similarity index 100% rename from src/kernel/userland/pwd.c rename to src/kernel/userland/cli/pwd.c diff --git a/src/kernel/userland/rm.c b/src/kernel/userland/cli/rm.c similarity index 100% rename from src/kernel/userland/rm.c rename to src/kernel/userland/cli/rm.c diff --git a/src/kernel/userland/sort.c b/src/kernel/userland/cli/sort.c similarity index 100% rename from src/kernel/userland/sort.c rename to src/kernel/userland/cli/sort.c diff --git a/src/kernel/userland/touch.c b/src/kernel/userland/cli/touch.c similarity index 100% rename from src/kernel/userland/touch.c rename to src/kernel/userland/cli/touch.c diff --git a/src/kernel/userland/doom/Makefile b/src/kernel/userland/games/doom/Makefile similarity index 100% rename from src/kernel/userland/doom/Makefile rename to src/kernel/userland/games/doom/Makefile diff --git a/src/kernel/userland/doom/Makefile.djgpp b/src/kernel/userland/games/doom/Makefile.djgpp similarity index 100% rename from src/kernel/userland/doom/Makefile.djgpp rename to src/kernel/userland/games/doom/Makefile.djgpp diff --git a/src/kernel/userland/doom/Makefile.emscripten b/src/kernel/userland/games/doom/Makefile.emscripten similarity index 100% rename from src/kernel/userland/doom/Makefile.emscripten rename to src/kernel/userland/games/doom/Makefile.emscripten diff --git a/src/kernel/userland/doom/Makefile.freebsd b/src/kernel/userland/games/doom/Makefile.freebsd similarity index 100% rename from src/kernel/userland/doom/Makefile.freebsd rename to src/kernel/userland/games/doom/Makefile.freebsd diff --git a/src/kernel/userland/doom/Makefile.linuxvt b/src/kernel/userland/games/doom/Makefile.linuxvt similarity index 100% rename from src/kernel/userland/doom/Makefile.linuxvt rename to src/kernel/userland/games/doom/Makefile.linuxvt diff --git a/src/kernel/userland/doom/Makefile.sdl b/src/kernel/userland/games/doom/Makefile.sdl similarity index 100% rename from src/kernel/userland/doom/Makefile.sdl rename to src/kernel/userland/games/doom/Makefile.sdl diff --git a/src/kernel/userland/doom/Makefile.soso b/src/kernel/userland/games/doom/Makefile.soso similarity index 100% rename from src/kernel/userland/doom/Makefile.soso rename to src/kernel/userland/games/doom/Makefile.soso diff --git a/src/kernel/userland/doom/Makefile.sosox b/src/kernel/userland/games/doom/Makefile.sosox similarity index 100% rename from src/kernel/userland/doom/Makefile.sosox rename to src/kernel/userland/games/doom/Makefile.sosox diff --git a/src/kernel/userland/doom/am_map.c b/src/kernel/userland/games/doom/am_map.c similarity index 100% rename from src/kernel/userland/doom/am_map.c rename to src/kernel/userland/games/doom/am_map.c diff --git a/src/kernel/userland/doom/am_map.h b/src/kernel/userland/games/doom/am_map.h similarity index 100% rename from src/kernel/userland/doom/am_map.h rename to src/kernel/userland/games/doom/am_map.h diff --git a/src/kernel/userland/doom/assert.h b/src/kernel/userland/games/doom/assert.h similarity index 100% rename from src/kernel/userland/doom/assert.h rename to src/kernel/userland/games/doom/assert.h diff --git a/src/kernel/userland/doom/boredos_libc.c b/src/kernel/userland/games/doom/boredos_libc.c similarity index 100% rename from src/kernel/userland/doom/boredos_libc.c rename to src/kernel/userland/games/doom/boredos_libc.c diff --git a/src/kernel/userland/doom/boredos_libc.h b/src/kernel/userland/games/doom/boredos_libc.h similarity index 100% rename from src/kernel/userland/doom/boredos_libc.h rename to src/kernel/userland/games/doom/boredos_libc.h diff --git a/src/kernel/userland/doom/config.h b/src/kernel/userland/games/doom/config.h similarity index 100% rename from src/kernel/userland/doom/config.h rename to src/kernel/userland/games/doom/config.h diff --git a/src/kernel/userland/doom/ctype.h b/src/kernel/userland/games/doom/ctype.h similarity index 100% rename from src/kernel/userland/doom/ctype.h rename to src/kernel/userland/games/doom/ctype.h diff --git a/src/kernel/userland/doom/d_englsh.h b/src/kernel/userland/games/doom/d_englsh.h similarity index 100% rename from src/kernel/userland/doom/d_englsh.h rename to src/kernel/userland/games/doom/d_englsh.h diff --git a/src/kernel/userland/doom/d_event.c b/src/kernel/userland/games/doom/d_event.c similarity index 100% rename from src/kernel/userland/doom/d_event.c rename to src/kernel/userland/games/doom/d_event.c diff --git a/src/kernel/userland/doom/d_event.h b/src/kernel/userland/games/doom/d_event.h similarity index 100% rename from src/kernel/userland/doom/d_event.h rename to src/kernel/userland/games/doom/d_event.h diff --git a/src/kernel/userland/doom/d_items.c b/src/kernel/userland/games/doom/d_items.c similarity index 100% rename from src/kernel/userland/doom/d_items.c rename to src/kernel/userland/games/doom/d_items.c diff --git a/src/kernel/userland/doom/d_items.h b/src/kernel/userland/games/doom/d_items.h similarity index 100% rename from src/kernel/userland/doom/d_items.h rename to src/kernel/userland/games/doom/d_items.h diff --git a/src/kernel/userland/doom/d_iwad.c b/src/kernel/userland/games/doom/d_iwad.c similarity index 100% rename from src/kernel/userland/doom/d_iwad.c rename to src/kernel/userland/games/doom/d_iwad.c diff --git a/src/kernel/userland/doom/d_iwad.h b/src/kernel/userland/games/doom/d_iwad.h similarity index 100% rename from src/kernel/userland/doom/d_iwad.h rename to src/kernel/userland/games/doom/d_iwad.h diff --git a/src/kernel/userland/doom/d_loop.c b/src/kernel/userland/games/doom/d_loop.c similarity index 100% rename from src/kernel/userland/doom/d_loop.c rename to src/kernel/userland/games/doom/d_loop.c diff --git a/src/kernel/userland/doom/d_loop.h b/src/kernel/userland/games/doom/d_loop.h similarity index 100% rename from src/kernel/userland/doom/d_loop.h rename to src/kernel/userland/games/doom/d_loop.h diff --git a/src/kernel/userland/doom/d_main.c b/src/kernel/userland/games/doom/d_main.c similarity index 100% rename from src/kernel/userland/doom/d_main.c rename to src/kernel/userland/games/doom/d_main.c diff --git a/src/kernel/userland/doom/d_main.h b/src/kernel/userland/games/doom/d_main.h similarity index 100% rename from src/kernel/userland/doom/d_main.h rename to src/kernel/userland/games/doom/d_main.h diff --git a/src/kernel/userland/doom/d_mode.c b/src/kernel/userland/games/doom/d_mode.c similarity index 100% rename from src/kernel/userland/doom/d_mode.c rename to src/kernel/userland/games/doom/d_mode.c diff --git a/src/kernel/userland/doom/d_mode.h b/src/kernel/userland/games/doom/d_mode.h similarity index 100% rename from src/kernel/userland/doom/d_mode.h rename to src/kernel/userland/games/doom/d_mode.h diff --git a/src/kernel/userland/doom/d_net.c b/src/kernel/userland/games/doom/d_net.c similarity index 100% rename from src/kernel/userland/doom/d_net.c rename to src/kernel/userland/games/doom/d_net.c diff --git a/src/kernel/userland/doom/d_player.h b/src/kernel/userland/games/doom/d_player.h similarity index 100% rename from src/kernel/userland/doom/d_player.h rename to src/kernel/userland/games/doom/d_player.h diff --git a/src/kernel/userland/doom/d_textur.h b/src/kernel/userland/games/doom/d_textur.h similarity index 100% rename from src/kernel/userland/doom/d_textur.h rename to src/kernel/userland/games/doom/d_textur.h diff --git a/src/kernel/userland/doom/d_think.h b/src/kernel/userland/games/doom/d_think.h similarity index 100% rename from src/kernel/userland/doom/d_think.h rename to src/kernel/userland/games/doom/d_think.h diff --git a/src/kernel/userland/doom/d_ticcmd.h b/src/kernel/userland/games/doom/d_ticcmd.h similarity index 100% rename from src/kernel/userland/doom/d_ticcmd.h rename to src/kernel/userland/games/doom/d_ticcmd.h diff --git a/src/kernel/userland/doom/deh_main.h b/src/kernel/userland/games/doom/deh_main.h similarity index 100% rename from src/kernel/userland/doom/deh_main.h rename to src/kernel/userland/games/doom/deh_main.h diff --git a/src/kernel/userland/doom/deh_misc.h b/src/kernel/userland/games/doom/deh_misc.h similarity index 100% rename from src/kernel/userland/doom/deh_misc.h rename to src/kernel/userland/games/doom/deh_misc.h diff --git a/src/kernel/userland/doom/deh_str.h b/src/kernel/userland/games/doom/deh_str.h similarity index 100% rename from src/kernel/userland/doom/deh_str.h rename to src/kernel/userland/games/doom/deh_str.h diff --git a/src/kernel/userland/doom/doom.h b/src/kernel/userland/games/doom/doom.h similarity index 100% rename from src/kernel/userland/doom/doom.h rename to src/kernel/userland/games/doom/doom.h diff --git a/src/kernel/userland/doom/doom1.wad b/src/kernel/userland/games/doom/doom1.wad similarity index 100% rename from src/kernel/userland/doom/doom1.wad rename to src/kernel/userland/games/doom/doom1.wad diff --git a/src/kernel/userland/doom/doomdata.h b/src/kernel/userland/games/doom/doomdata.h similarity index 100% rename from src/kernel/userland/doom/doomdata.h rename to src/kernel/userland/games/doom/doomdata.h diff --git a/src/kernel/userland/doom/doomdef.c b/src/kernel/userland/games/doom/doomdef.c similarity index 100% rename from src/kernel/userland/doom/doomdef.c rename to src/kernel/userland/games/doom/doomdef.c diff --git a/src/kernel/userland/doom/doomdef.h b/src/kernel/userland/games/doom/doomdef.h similarity index 100% rename from src/kernel/userland/doom/doomdef.h rename to src/kernel/userland/games/doom/doomdef.h diff --git a/src/kernel/userland/doom/doomfeatures.h b/src/kernel/userland/games/doom/doomfeatures.h similarity index 100% rename from src/kernel/userland/doom/doomfeatures.h rename to src/kernel/userland/games/doom/doomfeatures.h diff --git a/src/kernel/userland/doom/doomgeneric.c b/src/kernel/userland/games/doom/doomgeneric.c similarity index 100% rename from src/kernel/userland/doom/doomgeneric.c rename to src/kernel/userland/games/doom/doomgeneric.c diff --git a/src/kernel/userland/doom/doomgeneric.h b/src/kernel/userland/games/doom/doomgeneric.h similarity index 100% rename from src/kernel/userland/doom/doomgeneric.h rename to src/kernel/userland/games/doom/doomgeneric.h diff --git a/src/kernel/userland/doom/doomgeneric.vcxproj b/src/kernel/userland/games/doom/doomgeneric.vcxproj similarity index 100% rename from src/kernel/userland/doom/doomgeneric.vcxproj rename to src/kernel/userland/games/doom/doomgeneric.vcxproj diff --git a/src/kernel/userland/doom/doomgeneric.vcxproj.filters b/src/kernel/userland/games/doom/doomgeneric.vcxproj.filters similarity index 100% rename from src/kernel/userland/doom/doomgeneric.vcxproj.filters rename to src/kernel/userland/games/doom/doomgeneric.vcxproj.filters diff --git a/src/kernel/userland/doom/doomgeneric_boredos.c b/src/kernel/userland/games/doom/doomgeneric_boredos.c similarity index 100% rename from src/kernel/userland/doom/doomgeneric_boredos.c rename to src/kernel/userland/games/doom/doomgeneric_boredos.c diff --git a/src/kernel/userland/doom/doomkeys.h b/src/kernel/userland/games/doom/doomkeys.h similarity index 100% rename from src/kernel/userland/doom/doomkeys.h rename to src/kernel/userland/games/doom/doomkeys.h diff --git a/src/kernel/userland/doom/doomstat.c b/src/kernel/userland/games/doom/doomstat.c similarity index 100% rename from src/kernel/userland/doom/doomstat.c rename to src/kernel/userland/games/doom/doomstat.c diff --git a/src/kernel/userland/doom/doomstat.h b/src/kernel/userland/games/doom/doomstat.h similarity index 100% rename from src/kernel/userland/doom/doomstat.h rename to src/kernel/userland/games/doom/doomstat.h diff --git a/src/kernel/userland/doom/doomtype.h b/src/kernel/userland/games/doom/doomtype.h similarity index 100% rename from src/kernel/userland/doom/doomtype.h rename to src/kernel/userland/games/doom/doomtype.h diff --git a/src/kernel/userland/doom/dstrings.c b/src/kernel/userland/games/doom/dstrings.c similarity index 100% rename from src/kernel/userland/doom/dstrings.c rename to src/kernel/userland/games/doom/dstrings.c diff --git a/src/kernel/userland/doom/dstrings.h b/src/kernel/userland/games/doom/dstrings.h similarity index 100% rename from src/kernel/userland/doom/dstrings.h rename to src/kernel/userland/games/doom/dstrings.h diff --git a/src/kernel/userland/doom/dummy.c b/src/kernel/userland/games/doom/dummy.c similarity index 100% rename from src/kernel/userland/doom/dummy.c rename to src/kernel/userland/games/doom/dummy.c diff --git a/src/kernel/userland/doom/errno.h b/src/kernel/userland/games/doom/errno.h similarity index 100% rename from src/kernel/userland/doom/errno.h rename to src/kernel/userland/games/doom/errno.h diff --git a/src/kernel/userland/doom/f_finale.c b/src/kernel/userland/games/doom/f_finale.c similarity index 100% rename from src/kernel/userland/doom/f_finale.c rename to src/kernel/userland/games/doom/f_finale.c diff --git a/src/kernel/userland/doom/f_finale.h b/src/kernel/userland/games/doom/f_finale.h similarity index 100% rename from src/kernel/userland/doom/f_finale.h rename to src/kernel/userland/games/doom/f_finale.h diff --git a/src/kernel/userland/doom/f_wipe.c b/src/kernel/userland/games/doom/f_wipe.c similarity index 100% rename from src/kernel/userland/doom/f_wipe.c rename to src/kernel/userland/games/doom/f_wipe.c diff --git a/src/kernel/userland/doom/f_wipe.h b/src/kernel/userland/games/doom/f_wipe.h similarity index 100% rename from src/kernel/userland/doom/f_wipe.h rename to src/kernel/userland/games/doom/f_wipe.h diff --git a/src/kernel/userland/doom/fcntl.h b/src/kernel/userland/games/doom/fcntl.h similarity index 100% rename from src/kernel/userland/doom/fcntl.h rename to src/kernel/userland/games/doom/fcntl.h diff --git a/src/kernel/userland/doom/g_game.c b/src/kernel/userland/games/doom/g_game.c similarity index 100% rename from src/kernel/userland/doom/g_game.c rename to src/kernel/userland/games/doom/g_game.c diff --git a/src/kernel/userland/doom/g_game.h b/src/kernel/userland/games/doom/g_game.h similarity index 100% rename from src/kernel/userland/doom/g_game.h rename to src/kernel/userland/games/doom/g_game.h diff --git a/src/kernel/userland/doom/gusconf.c b/src/kernel/userland/games/doom/gusconf.c similarity index 100% rename from src/kernel/userland/doom/gusconf.c rename to src/kernel/userland/games/doom/gusconf.c diff --git a/src/kernel/userland/doom/gusconf.h b/src/kernel/userland/games/doom/gusconf.h similarity index 100% rename from src/kernel/userland/doom/gusconf.h rename to src/kernel/userland/games/doom/gusconf.h diff --git a/src/kernel/userland/doom/hu_lib.c b/src/kernel/userland/games/doom/hu_lib.c similarity index 100% rename from src/kernel/userland/doom/hu_lib.c rename to src/kernel/userland/games/doom/hu_lib.c diff --git a/src/kernel/userland/doom/hu_lib.h b/src/kernel/userland/games/doom/hu_lib.h similarity index 100% rename from src/kernel/userland/doom/hu_lib.h rename to src/kernel/userland/games/doom/hu_lib.h diff --git a/src/kernel/userland/doom/hu_stuff.c b/src/kernel/userland/games/doom/hu_stuff.c similarity index 100% rename from src/kernel/userland/doom/hu_stuff.c rename to src/kernel/userland/games/doom/hu_stuff.c diff --git a/src/kernel/userland/doom/hu_stuff.h b/src/kernel/userland/games/doom/hu_stuff.h similarity index 100% rename from src/kernel/userland/doom/hu_stuff.h rename to src/kernel/userland/games/doom/hu_stuff.h diff --git a/src/kernel/userland/doom/i_cdmus.h b/src/kernel/userland/games/doom/i_cdmus.h similarity index 100% rename from src/kernel/userland/doom/i_cdmus.h rename to src/kernel/userland/games/doom/i_cdmus.h diff --git a/src/kernel/userland/doom/i_endoom.c b/src/kernel/userland/games/doom/i_endoom.c similarity index 100% rename from src/kernel/userland/doom/i_endoom.c rename to src/kernel/userland/games/doom/i_endoom.c diff --git a/src/kernel/userland/doom/i_endoom.h b/src/kernel/userland/games/doom/i_endoom.h similarity index 100% rename from src/kernel/userland/doom/i_endoom.h rename to src/kernel/userland/games/doom/i_endoom.h diff --git a/src/kernel/userland/doom/i_input.c b/src/kernel/userland/games/doom/i_input.c similarity index 100% rename from src/kernel/userland/doom/i_input.c rename to src/kernel/userland/games/doom/i_input.c diff --git a/src/kernel/userland/doom/i_joystick.c b/src/kernel/userland/games/doom/i_joystick.c similarity index 100% rename from src/kernel/userland/doom/i_joystick.c rename to src/kernel/userland/games/doom/i_joystick.c diff --git a/src/kernel/userland/doom/i_joystick.h b/src/kernel/userland/games/doom/i_joystick.h similarity index 100% rename from src/kernel/userland/doom/i_joystick.h rename to src/kernel/userland/games/doom/i_joystick.h diff --git a/src/kernel/userland/doom/i_scale.c b/src/kernel/userland/games/doom/i_scale.c similarity index 100% rename from src/kernel/userland/doom/i_scale.c rename to src/kernel/userland/games/doom/i_scale.c diff --git a/src/kernel/userland/doom/i_scale.h b/src/kernel/userland/games/doom/i_scale.h similarity index 100% rename from src/kernel/userland/doom/i_scale.h rename to src/kernel/userland/games/doom/i_scale.h diff --git a/src/kernel/userland/doom/i_sound.c b/src/kernel/userland/games/doom/i_sound.c similarity index 100% rename from src/kernel/userland/doom/i_sound.c rename to src/kernel/userland/games/doom/i_sound.c diff --git a/src/kernel/userland/doom/i_sound.h b/src/kernel/userland/games/doom/i_sound.h similarity index 100% rename from src/kernel/userland/doom/i_sound.h rename to src/kernel/userland/games/doom/i_sound.h diff --git a/src/kernel/userland/doom/i_swap.h b/src/kernel/userland/games/doom/i_swap.h similarity index 100% rename from src/kernel/userland/doom/i_swap.h rename to src/kernel/userland/games/doom/i_swap.h diff --git a/src/kernel/userland/doom/i_system.c b/src/kernel/userland/games/doom/i_system.c similarity index 100% rename from src/kernel/userland/doom/i_system.c rename to src/kernel/userland/games/doom/i_system.c diff --git a/src/kernel/userland/doom/i_system.h b/src/kernel/userland/games/doom/i_system.h similarity index 100% rename from src/kernel/userland/doom/i_system.h rename to src/kernel/userland/games/doom/i_system.h diff --git a/src/kernel/userland/doom/i_timer.c b/src/kernel/userland/games/doom/i_timer.c similarity index 100% rename from src/kernel/userland/doom/i_timer.c rename to src/kernel/userland/games/doom/i_timer.c diff --git a/src/kernel/userland/doom/i_timer.h b/src/kernel/userland/games/doom/i_timer.h similarity index 100% rename from src/kernel/userland/doom/i_timer.h rename to src/kernel/userland/games/doom/i_timer.h diff --git a/src/kernel/userland/doom/i_video.c b/src/kernel/userland/games/doom/i_video.c similarity index 100% rename from src/kernel/userland/doom/i_video.c rename to src/kernel/userland/games/doom/i_video.c diff --git a/src/kernel/userland/doom/i_video.h b/src/kernel/userland/games/doom/i_video.h similarity index 100% rename from src/kernel/userland/doom/i_video.h rename to src/kernel/userland/games/doom/i_video.h diff --git a/src/kernel/userland/doom/icon.c b/src/kernel/userland/games/doom/icon.c similarity index 100% rename from src/kernel/userland/doom/icon.c rename to src/kernel/userland/games/doom/icon.c diff --git a/src/kernel/userland/doom/info.c b/src/kernel/userland/games/doom/info.c similarity index 100% rename from src/kernel/userland/doom/info.c rename to src/kernel/userland/games/doom/info.c diff --git a/src/kernel/userland/doom/info.h b/src/kernel/userland/games/doom/info.h similarity index 100% rename from src/kernel/userland/doom/info.h rename to src/kernel/userland/games/doom/info.h diff --git a/src/kernel/userland/doom/inttypes.h b/src/kernel/userland/games/doom/inttypes.h similarity index 100% rename from src/kernel/userland/doom/inttypes.h rename to src/kernel/userland/games/doom/inttypes.h diff --git a/src/kernel/userland/doom/m_argv.c b/src/kernel/userland/games/doom/m_argv.c similarity index 100% rename from src/kernel/userland/doom/m_argv.c rename to src/kernel/userland/games/doom/m_argv.c diff --git a/src/kernel/userland/doom/m_argv.h b/src/kernel/userland/games/doom/m_argv.h similarity index 100% rename from src/kernel/userland/doom/m_argv.h rename to src/kernel/userland/games/doom/m_argv.h diff --git a/src/kernel/userland/doom/m_bbox.c b/src/kernel/userland/games/doom/m_bbox.c similarity index 100% rename from src/kernel/userland/doom/m_bbox.c rename to src/kernel/userland/games/doom/m_bbox.c diff --git a/src/kernel/userland/doom/m_bbox.h b/src/kernel/userland/games/doom/m_bbox.h similarity index 100% rename from src/kernel/userland/doom/m_bbox.h rename to src/kernel/userland/games/doom/m_bbox.h diff --git a/src/kernel/userland/doom/m_cheat.c b/src/kernel/userland/games/doom/m_cheat.c similarity index 100% rename from src/kernel/userland/doom/m_cheat.c rename to src/kernel/userland/games/doom/m_cheat.c diff --git a/src/kernel/userland/doom/m_cheat.h b/src/kernel/userland/games/doom/m_cheat.h similarity index 100% rename from src/kernel/userland/doom/m_cheat.h rename to src/kernel/userland/games/doom/m_cheat.h diff --git a/src/kernel/userland/doom/m_config.c b/src/kernel/userland/games/doom/m_config.c similarity index 100% rename from src/kernel/userland/doom/m_config.c rename to src/kernel/userland/games/doom/m_config.c diff --git a/src/kernel/userland/doom/m_config.h b/src/kernel/userland/games/doom/m_config.h similarity index 100% rename from src/kernel/userland/doom/m_config.h rename to src/kernel/userland/games/doom/m_config.h diff --git a/src/kernel/userland/doom/m_controls.c b/src/kernel/userland/games/doom/m_controls.c similarity index 100% rename from src/kernel/userland/doom/m_controls.c rename to src/kernel/userland/games/doom/m_controls.c diff --git a/src/kernel/userland/doom/m_controls.h b/src/kernel/userland/games/doom/m_controls.h similarity index 100% rename from src/kernel/userland/doom/m_controls.h rename to src/kernel/userland/games/doom/m_controls.h diff --git a/src/kernel/userland/doom/m_fixed.c b/src/kernel/userland/games/doom/m_fixed.c similarity index 100% rename from src/kernel/userland/doom/m_fixed.c rename to src/kernel/userland/games/doom/m_fixed.c diff --git a/src/kernel/userland/doom/m_fixed.h b/src/kernel/userland/games/doom/m_fixed.h similarity index 100% rename from src/kernel/userland/doom/m_fixed.h rename to src/kernel/userland/games/doom/m_fixed.h diff --git a/src/kernel/userland/doom/m_menu.c b/src/kernel/userland/games/doom/m_menu.c similarity index 100% rename from src/kernel/userland/doom/m_menu.c rename to src/kernel/userland/games/doom/m_menu.c diff --git a/src/kernel/userland/doom/m_menu.h b/src/kernel/userland/games/doom/m_menu.h similarity index 100% rename from src/kernel/userland/doom/m_menu.h rename to src/kernel/userland/games/doom/m_menu.h diff --git a/src/kernel/userland/doom/m_misc.c b/src/kernel/userland/games/doom/m_misc.c similarity index 100% rename from src/kernel/userland/doom/m_misc.c rename to src/kernel/userland/games/doom/m_misc.c diff --git a/src/kernel/userland/doom/m_misc.h b/src/kernel/userland/games/doom/m_misc.h similarity index 100% rename from src/kernel/userland/doom/m_misc.h rename to src/kernel/userland/games/doom/m_misc.h diff --git a/src/kernel/userland/doom/m_random.c b/src/kernel/userland/games/doom/m_random.c similarity index 100% rename from src/kernel/userland/doom/m_random.c rename to src/kernel/userland/games/doom/m_random.c diff --git a/src/kernel/userland/doom/m_random.h b/src/kernel/userland/games/doom/m_random.h similarity index 100% rename from src/kernel/userland/doom/m_random.h rename to src/kernel/userland/games/doom/m_random.h diff --git a/src/kernel/userland/doom/math.h b/src/kernel/userland/games/doom/math.h similarity index 100% rename from src/kernel/userland/doom/math.h rename to src/kernel/userland/games/doom/math.h diff --git a/src/kernel/userland/doom/memio.c b/src/kernel/userland/games/doom/memio.c similarity index 100% rename from src/kernel/userland/doom/memio.c rename to src/kernel/userland/games/doom/memio.c diff --git a/src/kernel/userland/doom/memio.h b/src/kernel/userland/games/doom/memio.h similarity index 100% rename from src/kernel/userland/doom/memio.h rename to src/kernel/userland/games/doom/memio.h diff --git a/src/kernel/userland/doom/mus2mid.c b/src/kernel/userland/games/doom/mus2mid.c similarity index 100% rename from src/kernel/userland/doom/mus2mid.c rename to src/kernel/userland/games/doom/mus2mid.c diff --git a/src/kernel/userland/doom/mus2mid.h b/src/kernel/userland/games/doom/mus2mid.h similarity index 100% rename from src/kernel/userland/doom/mus2mid.h rename to src/kernel/userland/games/doom/mus2mid.h diff --git a/src/kernel/userland/doom/net_client.h b/src/kernel/userland/games/doom/net_client.h similarity index 100% rename from src/kernel/userland/doom/net_client.h rename to src/kernel/userland/games/doom/net_client.h diff --git a/src/kernel/userland/doom/net_dedicated.h b/src/kernel/userland/games/doom/net_dedicated.h similarity index 100% rename from src/kernel/userland/doom/net_dedicated.h rename to src/kernel/userland/games/doom/net_dedicated.h diff --git a/src/kernel/userland/doom/net_defs.h b/src/kernel/userland/games/doom/net_defs.h similarity index 100% rename from src/kernel/userland/doom/net_defs.h rename to src/kernel/userland/games/doom/net_defs.h diff --git a/src/kernel/userland/doom/net_gui.h b/src/kernel/userland/games/doom/net_gui.h similarity index 100% rename from src/kernel/userland/doom/net_gui.h rename to src/kernel/userland/games/doom/net_gui.h diff --git a/src/kernel/userland/doom/net_io.h b/src/kernel/userland/games/doom/net_io.h similarity index 100% rename from src/kernel/userland/doom/net_io.h rename to src/kernel/userland/games/doom/net_io.h diff --git a/src/kernel/userland/doom/net_loop.h b/src/kernel/userland/games/doom/net_loop.h similarity index 100% rename from src/kernel/userland/doom/net_loop.h rename to src/kernel/userland/games/doom/net_loop.h diff --git a/src/kernel/userland/doom/net_packet.h b/src/kernel/userland/games/doom/net_packet.h similarity index 100% rename from src/kernel/userland/doom/net_packet.h rename to src/kernel/userland/games/doom/net_packet.h diff --git a/src/kernel/userland/doom/net_query.h b/src/kernel/userland/games/doom/net_query.h similarity index 100% rename from src/kernel/userland/doom/net_query.h rename to src/kernel/userland/games/doom/net_query.h diff --git a/src/kernel/userland/doom/net_sdl.h b/src/kernel/userland/games/doom/net_sdl.h similarity index 100% rename from src/kernel/userland/doom/net_sdl.h rename to src/kernel/userland/games/doom/net_sdl.h diff --git a/src/kernel/userland/doom/net_server.h b/src/kernel/userland/games/doom/net_server.h similarity index 100% rename from src/kernel/userland/doom/net_server.h rename to src/kernel/userland/games/doom/net_server.h diff --git a/src/kernel/userland/doom/p_ceilng.c b/src/kernel/userland/games/doom/p_ceilng.c similarity index 100% rename from src/kernel/userland/doom/p_ceilng.c rename to src/kernel/userland/games/doom/p_ceilng.c diff --git a/src/kernel/userland/doom/p_doors.c b/src/kernel/userland/games/doom/p_doors.c similarity index 100% rename from src/kernel/userland/doom/p_doors.c rename to src/kernel/userland/games/doom/p_doors.c diff --git a/src/kernel/userland/doom/p_enemy.c b/src/kernel/userland/games/doom/p_enemy.c similarity index 100% rename from src/kernel/userland/doom/p_enemy.c rename to src/kernel/userland/games/doom/p_enemy.c diff --git a/src/kernel/userland/doom/p_floor.c b/src/kernel/userland/games/doom/p_floor.c similarity index 100% rename from src/kernel/userland/doom/p_floor.c rename to src/kernel/userland/games/doom/p_floor.c diff --git a/src/kernel/userland/doom/p_inter.c b/src/kernel/userland/games/doom/p_inter.c similarity index 100% rename from src/kernel/userland/doom/p_inter.c rename to src/kernel/userland/games/doom/p_inter.c diff --git a/src/kernel/userland/doom/p_inter.h b/src/kernel/userland/games/doom/p_inter.h similarity index 100% rename from src/kernel/userland/doom/p_inter.h rename to src/kernel/userland/games/doom/p_inter.h diff --git a/src/kernel/userland/doom/p_lights.c b/src/kernel/userland/games/doom/p_lights.c similarity index 100% rename from src/kernel/userland/doom/p_lights.c rename to src/kernel/userland/games/doom/p_lights.c diff --git a/src/kernel/userland/doom/p_local.h b/src/kernel/userland/games/doom/p_local.h similarity index 100% rename from src/kernel/userland/doom/p_local.h rename to src/kernel/userland/games/doom/p_local.h diff --git a/src/kernel/userland/doom/p_map.c b/src/kernel/userland/games/doom/p_map.c similarity index 100% rename from src/kernel/userland/doom/p_map.c rename to src/kernel/userland/games/doom/p_map.c diff --git a/src/kernel/userland/doom/p_maputl.c b/src/kernel/userland/games/doom/p_maputl.c similarity index 100% rename from src/kernel/userland/doom/p_maputl.c rename to src/kernel/userland/games/doom/p_maputl.c diff --git a/src/kernel/userland/doom/p_mobj.c b/src/kernel/userland/games/doom/p_mobj.c similarity index 100% rename from src/kernel/userland/doom/p_mobj.c rename to src/kernel/userland/games/doom/p_mobj.c diff --git a/src/kernel/userland/doom/p_mobj.h b/src/kernel/userland/games/doom/p_mobj.h similarity index 100% rename from src/kernel/userland/doom/p_mobj.h rename to src/kernel/userland/games/doom/p_mobj.h diff --git a/src/kernel/userland/doom/p_plats.c b/src/kernel/userland/games/doom/p_plats.c similarity index 100% rename from src/kernel/userland/doom/p_plats.c rename to src/kernel/userland/games/doom/p_plats.c diff --git a/src/kernel/userland/doom/p_pspr.c b/src/kernel/userland/games/doom/p_pspr.c similarity index 100% rename from src/kernel/userland/doom/p_pspr.c rename to src/kernel/userland/games/doom/p_pspr.c diff --git a/src/kernel/userland/doom/p_pspr.h b/src/kernel/userland/games/doom/p_pspr.h similarity index 100% rename from src/kernel/userland/doom/p_pspr.h rename to src/kernel/userland/games/doom/p_pspr.h diff --git a/src/kernel/userland/doom/p_saveg.c b/src/kernel/userland/games/doom/p_saveg.c similarity index 100% rename from src/kernel/userland/doom/p_saveg.c rename to src/kernel/userland/games/doom/p_saveg.c diff --git a/src/kernel/userland/doom/p_saveg.h b/src/kernel/userland/games/doom/p_saveg.h similarity index 100% rename from src/kernel/userland/doom/p_saveg.h rename to src/kernel/userland/games/doom/p_saveg.h diff --git a/src/kernel/userland/doom/p_setup.c b/src/kernel/userland/games/doom/p_setup.c similarity index 100% rename from src/kernel/userland/doom/p_setup.c rename to src/kernel/userland/games/doom/p_setup.c diff --git a/src/kernel/userland/doom/p_setup.h b/src/kernel/userland/games/doom/p_setup.h similarity index 100% rename from src/kernel/userland/doom/p_setup.h rename to src/kernel/userland/games/doom/p_setup.h diff --git a/src/kernel/userland/doom/p_sight.c b/src/kernel/userland/games/doom/p_sight.c similarity index 100% rename from src/kernel/userland/doom/p_sight.c rename to src/kernel/userland/games/doom/p_sight.c diff --git a/src/kernel/userland/doom/p_spec.c b/src/kernel/userland/games/doom/p_spec.c similarity index 100% rename from src/kernel/userland/doom/p_spec.c rename to src/kernel/userland/games/doom/p_spec.c diff --git a/src/kernel/userland/doom/p_spec.h b/src/kernel/userland/games/doom/p_spec.h similarity index 100% rename from src/kernel/userland/doom/p_spec.h rename to src/kernel/userland/games/doom/p_spec.h diff --git a/src/kernel/userland/doom/p_switch.c b/src/kernel/userland/games/doom/p_switch.c similarity index 100% rename from src/kernel/userland/doom/p_switch.c rename to src/kernel/userland/games/doom/p_switch.c diff --git a/src/kernel/userland/doom/p_telept.c b/src/kernel/userland/games/doom/p_telept.c similarity index 100% rename from src/kernel/userland/doom/p_telept.c rename to src/kernel/userland/games/doom/p_telept.c diff --git a/src/kernel/userland/doom/p_tick.c b/src/kernel/userland/games/doom/p_tick.c similarity index 100% rename from src/kernel/userland/doom/p_tick.c rename to src/kernel/userland/games/doom/p_tick.c diff --git a/src/kernel/userland/doom/p_tick.h b/src/kernel/userland/games/doom/p_tick.h similarity index 100% rename from src/kernel/userland/doom/p_tick.h rename to src/kernel/userland/games/doom/p_tick.h diff --git a/src/kernel/userland/doom/p_user.c b/src/kernel/userland/games/doom/p_user.c similarity index 100% rename from src/kernel/userland/doom/p_user.c rename to src/kernel/userland/games/doom/p_user.c diff --git a/src/kernel/userland/doom/r_bsp.c b/src/kernel/userland/games/doom/r_bsp.c similarity index 100% rename from src/kernel/userland/doom/r_bsp.c rename to src/kernel/userland/games/doom/r_bsp.c diff --git a/src/kernel/userland/doom/r_bsp.h b/src/kernel/userland/games/doom/r_bsp.h similarity index 100% rename from src/kernel/userland/doom/r_bsp.h rename to src/kernel/userland/games/doom/r_bsp.h diff --git a/src/kernel/userland/doom/r_data.c b/src/kernel/userland/games/doom/r_data.c similarity index 100% rename from src/kernel/userland/doom/r_data.c rename to src/kernel/userland/games/doom/r_data.c diff --git a/src/kernel/userland/doom/r_data.h b/src/kernel/userland/games/doom/r_data.h similarity index 100% rename from src/kernel/userland/doom/r_data.h rename to src/kernel/userland/games/doom/r_data.h diff --git a/src/kernel/userland/doom/r_defs.h b/src/kernel/userland/games/doom/r_defs.h similarity index 100% rename from src/kernel/userland/doom/r_defs.h rename to src/kernel/userland/games/doom/r_defs.h diff --git a/src/kernel/userland/doom/r_draw.c b/src/kernel/userland/games/doom/r_draw.c similarity index 100% rename from src/kernel/userland/doom/r_draw.c rename to src/kernel/userland/games/doom/r_draw.c diff --git a/src/kernel/userland/doom/r_draw.h b/src/kernel/userland/games/doom/r_draw.h similarity index 100% rename from src/kernel/userland/doom/r_draw.h rename to src/kernel/userland/games/doom/r_draw.h diff --git a/src/kernel/userland/doom/r_local.h b/src/kernel/userland/games/doom/r_local.h similarity index 100% rename from src/kernel/userland/doom/r_local.h rename to src/kernel/userland/games/doom/r_local.h diff --git a/src/kernel/userland/doom/r_main.c b/src/kernel/userland/games/doom/r_main.c similarity index 100% rename from src/kernel/userland/doom/r_main.c rename to src/kernel/userland/games/doom/r_main.c diff --git a/src/kernel/userland/doom/r_main.h b/src/kernel/userland/games/doom/r_main.h similarity index 100% rename from src/kernel/userland/doom/r_main.h rename to src/kernel/userland/games/doom/r_main.h diff --git a/src/kernel/userland/doom/r_plane.c b/src/kernel/userland/games/doom/r_plane.c similarity index 100% rename from src/kernel/userland/doom/r_plane.c rename to src/kernel/userland/games/doom/r_plane.c diff --git a/src/kernel/userland/doom/r_plane.h b/src/kernel/userland/games/doom/r_plane.h similarity index 100% rename from src/kernel/userland/doom/r_plane.h rename to src/kernel/userland/games/doom/r_plane.h diff --git a/src/kernel/userland/doom/r_segs.c b/src/kernel/userland/games/doom/r_segs.c similarity index 100% rename from src/kernel/userland/doom/r_segs.c rename to src/kernel/userland/games/doom/r_segs.c diff --git a/src/kernel/userland/doom/r_segs.h b/src/kernel/userland/games/doom/r_segs.h similarity index 100% rename from src/kernel/userland/doom/r_segs.h rename to src/kernel/userland/games/doom/r_segs.h diff --git a/src/kernel/userland/doom/r_sky.c b/src/kernel/userland/games/doom/r_sky.c similarity index 100% rename from src/kernel/userland/doom/r_sky.c rename to src/kernel/userland/games/doom/r_sky.c diff --git a/src/kernel/userland/doom/r_sky.h b/src/kernel/userland/games/doom/r_sky.h similarity index 100% rename from src/kernel/userland/doom/r_sky.h rename to src/kernel/userland/games/doom/r_sky.h diff --git a/src/kernel/userland/doom/r_state.h b/src/kernel/userland/games/doom/r_state.h similarity index 100% rename from src/kernel/userland/doom/r_state.h rename to src/kernel/userland/games/doom/r_state.h diff --git a/src/kernel/userland/doom/r_things.c b/src/kernel/userland/games/doom/r_things.c similarity index 100% rename from src/kernel/userland/doom/r_things.c rename to src/kernel/userland/games/doom/r_things.c diff --git a/src/kernel/userland/doom/r_things.h b/src/kernel/userland/games/doom/r_things.h similarity index 100% rename from src/kernel/userland/doom/r_things.h rename to src/kernel/userland/games/doom/r_things.h diff --git a/src/kernel/userland/doom/s_sound.c b/src/kernel/userland/games/doom/s_sound.c similarity index 100% rename from src/kernel/userland/doom/s_sound.c rename to src/kernel/userland/games/doom/s_sound.c diff --git a/src/kernel/userland/doom/s_sound.h b/src/kernel/userland/games/doom/s_sound.h similarity index 100% rename from src/kernel/userland/doom/s_sound.h rename to src/kernel/userland/games/doom/s_sound.h diff --git a/src/kernel/userland/doom/sha1.c b/src/kernel/userland/games/doom/sha1.c similarity index 100% rename from src/kernel/userland/doom/sha1.c rename to src/kernel/userland/games/doom/sha1.c diff --git a/src/kernel/userland/doom/sha1.h b/src/kernel/userland/games/doom/sha1.h similarity index 100% rename from src/kernel/userland/doom/sha1.h rename to src/kernel/userland/games/doom/sha1.h diff --git a/src/kernel/userland/doom/sounds.c b/src/kernel/userland/games/doom/sounds.c similarity index 100% rename from src/kernel/userland/doom/sounds.c rename to src/kernel/userland/games/doom/sounds.c diff --git a/src/kernel/userland/doom/sounds.h b/src/kernel/userland/games/doom/sounds.h similarity index 100% rename from src/kernel/userland/doom/sounds.h rename to src/kernel/userland/games/doom/sounds.h diff --git a/src/kernel/userland/doom/st_lib.c b/src/kernel/userland/games/doom/st_lib.c similarity index 100% rename from src/kernel/userland/doom/st_lib.c rename to src/kernel/userland/games/doom/st_lib.c diff --git a/src/kernel/userland/doom/st_lib.h b/src/kernel/userland/games/doom/st_lib.h similarity index 100% rename from src/kernel/userland/doom/st_lib.h rename to src/kernel/userland/games/doom/st_lib.h diff --git a/src/kernel/userland/doom/st_stuff.c b/src/kernel/userland/games/doom/st_stuff.c similarity index 100% rename from src/kernel/userland/doom/st_stuff.c rename to src/kernel/userland/games/doom/st_stuff.c diff --git a/src/kernel/userland/doom/st_stuff.h b/src/kernel/userland/games/doom/st_stuff.h similarity index 100% rename from src/kernel/userland/doom/st_stuff.h rename to src/kernel/userland/games/doom/st_stuff.h diff --git a/src/kernel/userland/doom/statdump.c b/src/kernel/userland/games/doom/statdump.c similarity index 100% rename from src/kernel/userland/doom/statdump.c rename to src/kernel/userland/games/doom/statdump.c diff --git a/src/kernel/userland/doom/statdump.h b/src/kernel/userland/games/doom/statdump.h similarity index 100% rename from src/kernel/userland/doom/statdump.h rename to src/kernel/userland/games/doom/statdump.h diff --git a/src/kernel/userland/doom/stb_sprintf.h b/src/kernel/userland/games/doom/stb_sprintf.h similarity index 100% rename from src/kernel/userland/doom/stb_sprintf.h rename to src/kernel/userland/games/doom/stb_sprintf.h diff --git a/src/kernel/userland/doom/stdio.h b/src/kernel/userland/games/doom/stdio.h similarity index 100% rename from src/kernel/userland/doom/stdio.h rename to src/kernel/userland/games/doom/stdio.h diff --git a/src/kernel/userland/doom/string.h b/src/kernel/userland/games/doom/string.h similarity index 100% rename from src/kernel/userland/doom/string.h rename to src/kernel/userland/games/doom/string.h diff --git a/src/kernel/userland/doom/strings.h b/src/kernel/userland/games/doom/strings.h similarity index 100% rename from src/kernel/userland/doom/strings.h rename to src/kernel/userland/games/doom/strings.h diff --git a/src/kernel/userland/doom/sys/stat.h b/src/kernel/userland/games/doom/sys/stat.h similarity index 100% rename from src/kernel/userland/doom/sys/stat.h rename to src/kernel/userland/games/doom/sys/stat.h diff --git a/src/kernel/userland/doom/sys/types.h b/src/kernel/userland/games/doom/sys/types.h similarity index 100% rename from src/kernel/userland/doom/sys/types.h rename to src/kernel/userland/games/doom/sys/types.h diff --git a/src/kernel/userland/doom/tables.c b/src/kernel/userland/games/doom/tables.c similarity index 100% rename from src/kernel/userland/doom/tables.c rename to src/kernel/userland/games/doom/tables.c diff --git a/src/kernel/userland/doom/tables.h b/src/kernel/userland/games/doom/tables.h similarity index 100% rename from src/kernel/userland/doom/tables.h rename to src/kernel/userland/games/doom/tables.h diff --git a/src/kernel/userland/doom/unistd.h b/src/kernel/userland/games/doom/unistd.h similarity index 100% rename from src/kernel/userland/doom/unistd.h rename to src/kernel/userland/games/doom/unistd.h diff --git a/src/kernel/userland/doom/v_patch.h b/src/kernel/userland/games/doom/v_patch.h similarity index 100% rename from src/kernel/userland/doom/v_patch.h rename to src/kernel/userland/games/doom/v_patch.h diff --git a/src/kernel/userland/doom/v_video.c b/src/kernel/userland/games/doom/v_video.c similarity index 100% rename from src/kernel/userland/doom/v_video.c rename to src/kernel/userland/games/doom/v_video.c diff --git a/src/kernel/userland/doom/v_video.h b/src/kernel/userland/games/doom/v_video.h similarity index 100% rename from src/kernel/userland/doom/v_video.h rename to src/kernel/userland/games/doom/v_video.h diff --git a/src/kernel/userland/doom/w_checksum.c b/src/kernel/userland/games/doom/w_checksum.c similarity index 100% rename from src/kernel/userland/doom/w_checksum.c rename to src/kernel/userland/games/doom/w_checksum.c diff --git a/src/kernel/userland/doom/w_checksum.h b/src/kernel/userland/games/doom/w_checksum.h similarity index 100% rename from src/kernel/userland/doom/w_checksum.h rename to src/kernel/userland/games/doom/w_checksum.h diff --git a/src/kernel/userland/doom/w_file.c b/src/kernel/userland/games/doom/w_file.c similarity index 100% rename from src/kernel/userland/doom/w_file.c rename to src/kernel/userland/games/doom/w_file.c diff --git a/src/kernel/userland/doom/w_file.h b/src/kernel/userland/games/doom/w_file.h similarity index 100% rename from src/kernel/userland/doom/w_file.h rename to src/kernel/userland/games/doom/w_file.h diff --git a/src/kernel/userland/doom/w_file_stdc.c b/src/kernel/userland/games/doom/w_file_stdc.c similarity index 100% rename from src/kernel/userland/doom/w_file_stdc.c rename to src/kernel/userland/games/doom/w_file_stdc.c diff --git a/src/kernel/userland/doom/w_main.c b/src/kernel/userland/games/doom/w_main.c similarity index 100% rename from src/kernel/userland/doom/w_main.c rename to src/kernel/userland/games/doom/w_main.c diff --git a/src/kernel/userland/doom/w_main.h b/src/kernel/userland/games/doom/w_main.h similarity index 100% rename from src/kernel/userland/doom/w_main.h rename to src/kernel/userland/games/doom/w_main.h diff --git a/src/kernel/userland/doom/w_merge.h b/src/kernel/userland/games/doom/w_merge.h similarity index 100% rename from src/kernel/userland/doom/w_merge.h rename to src/kernel/userland/games/doom/w_merge.h diff --git a/src/kernel/userland/doom/w_wad.c b/src/kernel/userland/games/doom/w_wad.c similarity index 100% rename from src/kernel/userland/doom/w_wad.c rename to src/kernel/userland/games/doom/w_wad.c diff --git a/src/kernel/userland/doom/w_wad.h b/src/kernel/userland/games/doom/w_wad.h similarity index 100% rename from src/kernel/userland/doom/w_wad.h rename to src/kernel/userland/games/doom/w_wad.h diff --git a/src/kernel/userland/doom/wi_stuff.c b/src/kernel/userland/games/doom/wi_stuff.c similarity index 100% rename from src/kernel/userland/doom/wi_stuff.c rename to src/kernel/userland/games/doom/wi_stuff.c diff --git a/src/kernel/userland/doom/wi_stuff.h b/src/kernel/userland/games/doom/wi_stuff.h similarity index 100% rename from src/kernel/userland/doom/wi_stuff.h rename to src/kernel/userland/games/doom/wi_stuff.h diff --git a/src/kernel/userland/doom/z_zone.c b/src/kernel/userland/games/doom/z_zone.c similarity index 100% rename from src/kernel/userland/doom/z_zone.c rename to src/kernel/userland/games/doom/z_zone.c diff --git a/src/kernel/userland/doom/z_zone.h b/src/kernel/userland/games/doom/z_zone.h similarity index 100% rename from src/kernel/userland/doom/z_zone.h rename to src/kernel/userland/games/doom/z_zone.h diff --git a/src/kernel/userland/minesweeper.c b/src/kernel/userland/games/minesweeper.c similarity index 100% rename from src/kernel/userland/minesweeper.c rename to src/kernel/userland/games/minesweeper.c diff --git a/src/kernel/userland/browser.c b/src/kernel/userland/gui/browser.c similarity index 100% rename from src/kernel/userland/browser.c rename to src/kernel/userland/gui/browser.c diff --git a/src/kernel/userland/calculator.c b/src/kernel/userland/gui/calculator.c similarity index 100% rename from src/kernel/userland/calculator.c rename to src/kernel/userland/gui/calculator.c diff --git a/src/kernel/userland/cube.c b/src/kernel/userland/gui/cube.c similarity index 100% rename from src/kernel/userland/cube.c rename to src/kernel/userland/gui/cube.c diff --git a/src/kernel/userland/markdown.c b/src/kernel/userland/gui/markdown.c similarity index 100% rename from src/kernel/userland/markdown.c rename to src/kernel/userland/gui/markdown.c diff --git a/src/kernel/userland/notepad.c b/src/kernel/userland/gui/notepad.c similarity index 100% rename from src/kernel/userland/notepad.c rename to src/kernel/userland/gui/notepad.c diff --git a/src/kernel/userland/paint.c b/src/kernel/userland/gui/paint.c similarity index 100% rename from src/kernel/userland/paint.c rename to src/kernel/userland/gui/paint.c diff --git a/src/kernel/userland/screenshot.c b/src/kernel/userland/gui/screenshot.c similarity index 100% rename from src/kernel/userland/screenshot.c rename to src/kernel/userland/gui/screenshot.c diff --git a/src/kernel/userland/settings.c b/src/kernel/userland/gui/settings.c similarity index 100% rename from src/kernel/userland/settings.c rename to src/kernel/userland/gui/settings.c diff --git a/src/kernel/userland/taskman.c b/src/kernel/userland/gui/taskman.c similarity index 100% rename from src/kernel/userland/taskman.c rename to src/kernel/userland/gui/taskman.c diff --git a/src/kernel/userland/txtedit.c b/src/kernel/userland/gui/txtedit.c similarity index 100% rename from src/kernel/userland/txtedit.c rename to src/kernel/userland/gui/txtedit.c diff --git a/src/kernel/userland/viewer.c b/src/kernel/userland/gui/viewer.c similarity index 100% rename from src/kernel/userland/viewer.c rename to src/kernel/userland/gui/viewer.c diff --git a/src/kernel/userland/about.c b/src/kernel/userland/sys/about.c similarity index 100% rename from src/kernel/userland/about.c rename to src/kernel/userland/sys/about.c diff --git a/src/kernel/userland/beep.c b/src/kernel/userland/sys/beep.c similarity index 100% rename from src/kernel/userland/beep.c rename to src/kernel/userland/sys/beep.c diff --git a/src/kernel/userland/clock.c b/src/kernel/userland/sys/clock.c similarity index 100% rename from src/kernel/userland/clock.c rename to src/kernel/userland/sys/clock.c diff --git a/src/kernel/userland/crash.c b/src/kernel/userland/sys/crash.c similarity index 100% rename from src/kernel/userland/crash.c rename to src/kernel/userland/sys/crash.c diff --git a/src/kernel/userland/meminfo.c b/src/kernel/userland/sys/meminfo.c similarity index 100% rename from src/kernel/userland/meminfo.c rename to src/kernel/userland/sys/meminfo.c diff --git a/src/kernel/userland/net.c b/src/kernel/userland/sys/net.c similarity index 100% rename from src/kernel/userland/net.c rename to src/kernel/userland/sys/net.c diff --git a/src/kernel/userland/pci_list.c b/src/kernel/userland/sys/pci_list.c similarity index 100% rename from src/kernel/userland/pci_list.c rename to src/kernel/userland/sys/pci_list.c diff --git a/src/kernel/userland/ping.c b/src/kernel/userland/sys/ping.c similarity index 100% rename from src/kernel/userland/ping.c rename to src/kernel/userland/sys/ping.c diff --git a/src/kernel/userland/reboot.c b/src/kernel/userland/sys/reboot.c similarity index 100% rename from src/kernel/userland/reboot.c rename to src/kernel/userland/sys/reboot.c diff --git a/src/kernel/userland/shutdown.c b/src/kernel/userland/sys/shutdown.c similarity index 100% rename from src/kernel/userland/shutdown.c rename to src/kernel/userland/sys/shutdown.c diff --git a/src/kernel/userland/sweden.c b/src/kernel/userland/sys/sweden.c similarity index 100% rename from src/kernel/userland/sweden.c rename to src/kernel/userland/sys/sweden.c diff --git a/src/kernel/userland/sysfetch.c b/src/kernel/userland/sys/sysfetch.c similarity index 100% rename from src/kernel/userland/sysfetch.c rename to src/kernel/userland/sys/sysfetch.c diff --git a/src/kernel/userland/telnet.c b/src/kernel/userland/sys/telnet.c similarity index 100% rename from src/kernel/userland/telnet.c rename to src/kernel/userland/sys/telnet.c diff --git a/src/kernel/userland/uptime.c b/src/kernel/userland/sys/uptime.c similarity index 100% rename from src/kernel/userland/uptime.c rename to src/kernel/userland/sys/uptime.c diff --git a/src/kernel/explorer.c b/src/kernel/wm/explorer.c similarity index 100% rename from src/kernel/explorer.c rename to src/kernel/wm/explorer.c diff --git a/src/kernel/explorer.h b/src/kernel/wm/explorer.h similarity index 100% rename from src/kernel/explorer.h rename to src/kernel/wm/explorer.h diff --git a/src/kernel/font_manager.c b/src/kernel/wm/font_manager.c similarity index 100% rename from src/kernel/font_manager.c rename to src/kernel/wm/font_manager.c diff --git a/src/kernel/font_manager.h b/src/kernel/wm/font_manager.h similarity index 100% rename from src/kernel/font_manager.h rename to src/kernel/wm/font_manager.h diff --git a/src/kernel/graphics.c b/src/kernel/wm/graphics.c similarity index 100% rename from src/kernel/graphics.c rename to src/kernel/wm/graphics.c diff --git a/src/kernel/graphics.h b/src/kernel/wm/graphics.h similarity index 100% rename from src/kernel/graphics.h rename to src/kernel/wm/graphics.h diff --git a/src/kernel/gui_ipc.h b/src/kernel/wm/gui_ipc.h similarity index 100% rename from src/kernel/gui_ipc.h rename to src/kernel/wm/gui_ipc.h diff --git a/src/kernel/vga.c b/src/kernel/wm/vga.c similarity index 100% rename from src/kernel/vga.c rename to src/kernel/wm/vga.c diff --git a/src/kernel/vga.h b/src/kernel/wm/vga.h similarity index 100% rename from src/kernel/vga.h rename to src/kernel/wm/vga.h diff --git a/src/kernel/wallpaper.c b/src/kernel/wm/wallpaper.c similarity index 100% rename from src/kernel/wallpaper.c rename to src/kernel/wm/wallpaper.c diff --git a/src/kernel/wallpaper.h b/src/kernel/wm/wallpaper.h similarity index 100% rename from src/kernel/wallpaper.h rename to src/kernel/wm/wallpaper.h diff --git a/src/kernel/wm.c b/src/kernel/wm/wm.c similarity index 100% rename from src/kernel/wm.c rename to src/kernel/wm/wm.c diff --git a/src/kernel/wm.h b/src/kernel/wm/wm.h similarity index 100% rename from src/kernel/wm.h rename to src/kernel/wm/wm.h