From 07df2b9fdadfe8f2baa0254299506a12243d2753 Mon Sep 17 00:00:00 2001
From: JJ <fidojj@hotmail.com>
Date: Fri, 5 Mar 2021 13:22:34 +1100
Subject: [PATCH] Lemond: Now loads and starts services from
 /system/lemon/lemond. Capitalise headers for readability

---
 Applications/DeviceManager/main.cpp           |   6 +-
 Applications/FileManager/main.cpp             |  12 +-
 Applications/GUITest/main.cpp                 |   6 +-
 Applications/ImgView/main.cpp                 |   8 +-
 Applications/JSONDump/main.cpp                |   2 +-
 Applications/LSh/main.cpp                     |   4 +-
 Applications/LemonMonitor/main.cpp            |   8 +-
 Applications/Minesweeper/main.cpp             |   4 +-
 Applications/Run/main.cpp                     |   6 +-
 Applications/Shell/main.cpp                   |  24 ++--
 Applications/Shell/menu.cpp                   |  11 +-
 Applications/Shell/shell.cpp                  |   4 +-
 Applications/Shell/shell.h                    |   6 +-
 Applications/Snake/main.cpp                   |   8 +-
 Applications/Steal/main.cpp                   |   2 +-
 Applications/SysInfo/main.cpp                 |  10 +-
 Applications/Terminal/main.cpp                |  14 +-
 Applications/TextEdit/exttextbox.h            |   2 +-
 Applications/TextEdit/main.cpp                |  12 +-
 Base/lemon/lemond/lemonwm.lemond.json         |   4 +
 Base/lemon/lemond/networkgovernor.lemond.json |   5 +
 Base/lemon/lemond/shell.lemond.json           |   5 +
 Kernel/include/ABI                            |   1 +
 .../{arch/x86_64/abi.h => Arch/x86_64/ABI.h}  |   0
 .../x86_64/acpi.h => Arch/x86_64/ACPI.h}      |   2 +-
 .../x86_64/apic.h => Arch/x86_64/APIC.h}      |   0
 .../{arch/x86_64/cpu.h => Arch/x86_64/CPU.h}  |   6 +-
 .../x86_64/debug.h => Arch/x86_64/Debug.h}    |   0
 .../{arch/x86_64/elf.h => Arch/x86_64/ELF.h}  |   0
 .../{arch/x86_64/hal.h => Arch/x86_64/HAL.h}  |   2 +-
 .../{arch/x86_64/idt.h => Arch/x86_64/IDT.h}  |   2 +-
 .../keyboard.h => Arch/x86_64/Keyboard.h}     |   0
 .../x86_64/memory.h => Arch/x86_64/Memory.h}  |   6 +-
 .../x86_64/mouse.h => Arch/x86_64/Mouse.h}    |   0
 .../{arch/x86_64/pci.h => Arch/x86_64/PCI.h}  |   6 +-
 .../x86_64/paging.h => Arch/x86_64/Paging.h}  |   2 +-
 .../x86_64/PhysicalAllocator.h}               |   8 +-
 .../{arch/x86_64/smp.h => Arch/x86_64/SMP.h}  |   2 +-
 .../scheduler.h => Arch/x86_64/Scheduler.h}   |  28 ++--
 .../x86_64/serial.h => Arch/x86_64/Serial.h}  |   0
 .../strace.h => Arch/x86_64/StackTrace.h}     |   6 +-
 .../syscalls.h => Arch/x86_64/Syscalls.h}     |   0
 .../x86_64/system.h => Arch/x86_64/System.h}  |   0
 .../{arch/x86_64/tss.h => Arch/x86_64/TSS.h}  |   0
 .../x86_64/thread.h => Arch/x86_64/Thread.h}  |   8 +-
 .../x86_64/timer.h => Arch/x86_64/Timer.h}    |   0
 .../x86_64/types.h => Arch/x86_64/Types.h}    |   0
 Kernel/include/{assert.h => Assert.h}         |   0
 .../{audio/hdaudio.h => Audio/HDAudio.h}      |   2 +-
 .../{characterbuffer.h => CharacterBuffer.h}  |   2 +-
 Kernel/include/{device.h => Device.h}         |   8 +-
 Kernel/include/{endian.h => Endian.h}         |   0
 Kernel/include/{errno.h => Errno.h}           |   0
 Kernel/include/Framebuffer.h                  |   3 +
 Kernel/include/{fs/ext2.h => Fs/Ext2.h}       |  12 +-
 Kernel/include/{fs/fat32.h => Fs/Fat32.h}     |   6 +-
 .../{fs/filesystem.h => Fs/Filesystem.h}      |   6 +-
 .../include/{fs/fsvolume.h => Fs/FsVolume.h}  |   4 +-
 Kernel/include/{fs/initrd.h => Fs/Initrd.h}   |   4 +-
 Kernel/include/{fs/tar.h => Fs/TAR.h}         |   4 +-
 Kernel/include/{fs/tmp.h => Fs/Tmp.h}         |   8 +-
 Kernel/include/{hash.h => Hash.h}             |   2 +-
 Kernel/include/{lemon.h => Lemon.h}           |   0
 Kernel/include/{liballoc.h => Liballoc.h}     |   0
 Kernel/include/{list.h => List.h}             |   6 +-
 Kernel/include/{lock.h => Lock.h}             |   8 +-
 Kernel/include/{logging.h => Logging.h}       |   4 +-
 Kernel/include/{math.h => Math.h}             |   0
 Kernel/include/{mischdr.h => MiscHdr.h}       |   0
 Kernel/include/{net => Net}/8254x.h           |   4 +-
 .../{net/networkadapter.h => Net/Adapter.h}   |   6 +-
 Kernel/include/{net/if.h => Net/If.h}         |   0
 Kernel/include/{net/net.h => Net/Net.h}       |   8 +-
 Kernel/include/{net/socket.h => Net/Socket.h} |  12 +-
 .../{objects/handle.h => Objects/Handle.h}    |   4 +-
 .../interface.h => Objects/Interface.h}       |   6 +-
 .../{objects/kobject.h => Objects/KObject.h}  |  10 +-
 .../{objects/message.h => Objects/Message.h}  |  12 +-
 .../{objects/service.h => Objects/Service.h}  |   8 +-
 Kernel/include/{pty.h => PTY.h}               |   8 +-
 Kernel/include/{pair.h => Pair.h}             |   0
 Kernel/include/{panic.h => Panic.h}           |   0
 Kernel/include/{refptr.h => RefPtr.h}         |   6 +-
 Kernel/include/{ringbuffer.h => RingBuffer.h} |   4 +-
 .../include/{sharedmem.h => SharedMemory.h}   |   2 +-
 Kernel/include/{spin.h => Spinlock.h}         |   2 +-
 Kernel/include/{ahci.h => Storage/AHCI.h}     |   4 +-
 Kernel/include/{ata.h => Storage/ATA.h}       |   0
 .../{atadrive.h => Storage/ATADrive.h}        |   4 +-
 Kernel/include/{gpt.h => Storage/GPT.h}       |   2 +-
 Kernel/include/{nvme.h => Storage/NVMe.h}     |   6 +-
 Kernel/include/{stream.h => Stream.h}         |   6 +-
 Kernel/include/{string.h => String.h}         |   2 +-
 Kernel/include/{systeminfo.h => SystemInfo.h} |   0
 Kernel/include/{ttraits.h => TTraits.h}       |   0
 Kernel/include/{timerevent.h => TimerEvent.h} |   4 +-
 Kernel/include/{xhci.h => USB/XHCI.h}         |   2 +-
 Kernel/include/{vector.h => Vector.h}         |   4 +-
 Kernel/include/{video.h => Video/Video.h}     |   2 +-
 .../{videoconsole.h => Video/VideoConsole.h}  |   0
 Kernel/include/abi                            |   1 -
 Kernel/include/fb.h                           |   3 -
 Kernel/include/gui.h                          |  80 ------------
 Kernel/meson.build                            |   2 +-
 Kernel/src/arch/x86_64/acpi.cpp               |  24 ++--
 Kernel/src/arch/x86_64/apic.cpp               |  16 +--
 Kernel/src/arch/x86_64/cpuid.cpp              |   2 +-
 Kernel/src/arch/x86_64/elf.cpp                |  16 +--
 Kernel/src/arch/x86_64/hal.cpp                |  40 +++---
 Kernel/src/arch/x86_64/idt.cpp                |  20 +--
 Kernel/src/arch/x86_64/keyboard.cpp           |  15 +--
 Kernel/src/arch/x86_64/mouse.cpp              |  16 +--
 Kernel/src/arch/x86_64/paging.cpp             |  26 ++--
 Kernel/src/arch/x86_64/pci.cpp                |  18 +--
 Kernel/src/arch/x86_64/physicalallocator.cpp  |  16 +--
 Kernel/src/arch/x86_64/scheduler.cpp          |  40 +++---
 Kernel/src/arch/x86_64/serial.cpp             |  10 +-
 Kernel/src/arch/x86_64/smp.cpp                |  24 ++--
 Kernel/src/arch/x86_64/ssp.cpp                |   2 +-
 Kernel/src/arch/x86_64/stringsafe.cpp         |   4 +-
 Kernel/src/arch/x86_64/syscalls.cpp           |  59 +++++----
 Kernel/src/arch/x86_64/system.cpp             |   2 +-
 Kernel/src/arch/x86_64/thread.cpp             |  12 +-
 Kernel/src/arch/x86_64/timer.cpp              |  23 ++--
 Kernel/src/arch/x86_64/tss.cpp                |   8 +-
 Kernel/src/assert.cpp                         |  16 +--
 Kernel/src/audio/hdaudio.cpp                  |   7 +-
 Kernel/src/characterbuffer.cpp                |  10 +-
 Kernel/src/debug.cpp                          |   2 +-
 Kernel/src/device.cpp                         |  22 ++--
 Kernel/src/fs/ext2.cpp                        |  14 +-
 Kernel/src/fs/fat32.cpp                       |  12 +-
 Kernel/src/fs/filesystem.cpp                  |  12 +-
 Kernel/src/fs/fsnodestubs.cpp                 |   6 +-
 Kernel/src/fs/fsvolume.cpp                    |   2 +-
 Kernel/src/fs/initrd.cpp                      |  18 +--
 Kernel/src/fs/tar.cpp                         |   6 +-
 Kernel/src/fs/tmp.cpp                         |   6 +-
 Kernel/src/gpt.cpp                            |  10 +-
 Kernel/src/kernel.cpp                         |  57 ++++-----
 Kernel/src/liballoc/_liballoc.cpp             |  16 +--
 Kernel/src/liballoc/liballoc.c                |   4 +-
 Kernel/src/lock.cpp                           |  10 +-
 Kernel/src/logging.cpp                        |  18 +--
 Kernel/src/net/8254x.cpp                      |  26 ++--
 Kernel/src/net/interface.cpp                  |  18 +--
 Kernel/src/net/ipsocket.cpp                   |  10 +-
 Kernel/src/net/net.cpp                        |  16 +--
 Kernel/src/net/networkadapter.cpp             |  12 +-
 Kernel/src/net/socket.cpp                     |  10 +-
 Kernel/src/net/tcp.cpp                        |  12 +-
 Kernel/src/net/udp.cpp                        |  12 +-
 Kernel/src/objects/interface.cpp              |   6 +-
 Kernel/src/objects/kobject.cpp                |   2 +-
 Kernel/src/objects/message.cpp                |   6 +-
 Kernel/src/objects/service.cpp                |   4 +-
 Kernel/src/panic.cpp                          |  10 +-
 Kernel/src/runtime.cpp                        |   4 +-
 Kernel/src/sharedmem.cpp                      |  10 +-
 Kernel/src/storage/ahci.cpp                   |  16 +--
 Kernel/src/storage/ahciport.cpp               |  18 +--
 Kernel/src/storage/ata.cpp                    |  24 ++--
 Kernel/src/storage/atadrive.cpp               |  16 +--
 Kernel/src/storage/diskdevice.cpp             |  10 +-
 Kernel/src/storage/nvme.cpp                   |  12 +-
 Kernel/src/storage/nvmenamespace.cpp          |   8 +-
 Kernel/src/storage/partitiondevice.cpp        |   4 +-
 Kernel/src/streams.cpp                        |   8 +-
 Kernel/src/string.cpp                         |   6 +-
 Kernel/src/tty/pty.cpp                        |  20 +--
 Kernel/src/usb/xhci.cpp                       |  18 +--
 Kernel/src/video.cpp                          |   4 +-
 Kernel/src/videoconsole.cpp                   |  10 +-
 .../cfgparser.h => Lemon/Core/CFGParser.h}    |   0
 .../core/event.h => Lemon/Core/Event.h}       |   2 +-
 .../core/fb.h => Lemon/Core/Framebuffer.h}    |   4 +-
 .../core/input.h => Lemon/Core/Input.h}       |   0
 .../{lemon/core/json.h => Lemon/Core/JSON.h}  |   2 +-
 .../core/keyboard.h => Lemon/Core/Keyboard.h} |   0
 .../core/lexer.h => Lemon/Core/Lexer.h}       |   0
 .../core/rotate.h => Lemon/Core/Rotate.h}     |   0
 .../{lemon/core/sha.h => Lemon/Core/SHA.h}    |   0
 .../sharedmem.h => Lemon/Core/SharedMemory.h} |   0
 .../core/shell.h => Lemon/Core/Shell.h}       |   2 +-
 .../{lemon/core/url.h => Lemon/Core/URL.h}    |   0
 .../Lemon/Filesystem/ExecutableTarget.h       |  21 +++
 .../gui/colours.h => Lemon/GUI/Colours.h}     |   2 +-
 .../gui/ctxentry.h => Lemon/GUI/CtxEntry.h}   |   0
 .../filedialog.h => Lemon/GUI/FileDialog.h}   |   0
 .../messagebox.h => Lemon/GUI/Messagebox.h}   |   0
 .../{lemon/gui/model.h => Lemon/GUI/Model.h}  |   2 +-
 .../gui/variant.h => Lemon/GUI/Variant.h}     |   0
 .../gui/wmclient.h => Lemon/GUI/WMClient.h}   |   4 +-
 .../gui/widgets.h => Lemon/GUI/Widgets.h}     |   8 +-
 .../gui/window.h => Lemon/GUI/Window.h}       |  12 +-
 .../gfx/font.h => Lemon/Graphics/Font.h}      |   0
 .../graphics.h => Lemon/Graphics/Graphics.h}  |  10 +-
 .../surface.h => Lemon/Graphics/Surface.h}    |   0
 .../gfx/text.h => Lemon/Graphics/Text.h}      |   6 +-
 .../gfx/types.h => Lemon/Graphics/Types.h}    |   0
 .../ipc/endpoint.h => Lemon/IPC/Endpoint.h}   |  10 +-
 .../ipc/interface.h => Lemon/IPC/Interface.h} |   8 +-
 .../ipc/message.h => Lemon/IPC/Message.h}     |   0
 .../fb.h => Lemon/System/ABI/Framebuffer.h}   |   0
 .../process.h => Lemon/System/ABI/Process.h}  |   0
 .../syscall.h => Lemon/System/ABI/Syscall.h}  |   0
 .../system/device.h => Lemon/System/Device.h} |   0
 .../System/Filesystem.h}                      |   0
 .../fb.h => Lemon/System/Framebuffer.h}       |   2 +-
 .../system/ipc.h => Lemon/System/IPC.h}       |   2 +-
 .../system/info.h => Lemon/System/Info.h}     |   0
 .../kobject.h => Lemon/System/KernelObject.h} |   2 +-
 .../system/spawn.h => Lemon/System/Spawn.h}   |   0
 .../system/util.h => Lemon/System/Util.h}     |   4 +-
 .../waitable.h => Lemon/System/Waitable.h}    |   2 +-
 .../include/{lemon/types.h => Lemon/Types.h}  |   0
 LibLemon/include/lemon/core/itoa.h            |   3 -
 LibLemon/src/cfgparser.cpp                    |   2 +-
 LibLemon/src/gfx/font.cpp                     |   2 +-
 LibLemon/src/gfx/graphics.cpp                 |   2 +-
 LibLemon/src/gfx/image.cpp                    |   2 +-
 LibLemon/src/gfx/text.cpp                     |   6 +-
 LibLemon/src/gui/colours.cpp                  |   2 +-
 LibLemon/src/gui/filedialog.cpp               |   6 +-
 LibLemon/src/gui/fileview.cpp                 |  10 +-
 LibLemon/src/gui/messagebox.cpp               |   8 +-
 LibLemon/src/gui/widgets.cpp                  |  11 +-
 LibLemon/src/gui/window.cpp                   |   6 +-
 LibLemon/src/ipc/interface.cpp                |   6 +-
 LibLemon/src/ipc/message.cpp                  |   2 +-
 LibLemon/src/json.cpp                         |   2 +-
 LibLemon/src/lemon/device.cpp                 |   2 +-
 LibLemon/src/lemon/fb.cpp                     |   2 +-
 LibLemon/src/lemon/filesystem.cpp             |   2 +-
 LibLemon/src/lemon/info.cpp                   |   2 +-
 LibLemon/src/lemon/input.cpp                  |   2 +-
 LibLemon/src/lemon/itoa.cpp                   |  48 -------
 LibLemon/src/lemon/meson.build                |   1 -
 LibLemon/src/lemon/sharedmem.cpp              |   2 +-
 LibLemon/src/lemon/util.cpp                   |  12 +-
 LibLemon/src/lemon/waitable.cpp               |   4 +-
 LibLemon/src/lexer.cpp                        |   2 +-
 LibLemon/src/sha.cpp                          |   8 +-
 LibLemon/src/shell/shell.cpp                  |   4 +-
 LibLemon/src/url.cpp                          |   4 +-
 System/FTerm/fterm.h                          |   4 +-
 System/FTerm/input.cpp                        |   4 +-
 System/FTerm/main.cpp                         |   6 +-
 System/LemonWM/compositor.cpp                 |   2 +-
 System/LemonWM/input.cpp                      |   4 +-
 System/LemonWM/lemonwm.h                      |  12 +-
 System/LemonWM/main.cpp                       |   8 +-
 System/LemonWM/window.cpp                     |   6 +-
 System/LemonWM/winrect.h                      |   2 +-
 System/LemonWM/wm.cpp                         |   9 +-
 System/Lemond/main.cpp                        | 121 +++++++++++++++---
 System/Login/main.cpp                         |  12 +-
 257 files changed, 986 insertions(+), 982 deletions(-)
 create mode 100644 Base/lemon/lemond/lemonwm.lemond.json
 create mode 100644 Base/lemon/lemond/networkgovernor.lemond.json
 create mode 100644 Base/lemon/lemond/shell.lemond.json
 create mode 120000 Kernel/include/ABI
 rename Kernel/include/{arch/x86_64/abi.h => Arch/x86_64/ABI.h} (100%)
 rename Kernel/include/{arch/x86_64/acpi.h => Arch/x86_64/ACPI.h} (99%)
 rename Kernel/include/{arch/x86_64/apic.h => Arch/x86_64/APIC.h} (100%)
 rename Kernel/include/{arch/x86_64/cpu.h => Arch/x86_64/CPU.h} (98%)
 rename Kernel/include/{arch/x86_64/debug.h => Arch/x86_64/Debug.h} (100%)
 rename Kernel/include/{arch/x86_64/elf.h => Arch/x86_64/ELF.h} (100%)
 rename Kernel/include/{arch/x86_64/hal.h => Arch/x86_64/HAL.h} (96%)
 rename Kernel/include/{arch/x86_64/idt.h => Arch/x86_64/IDT.h} (97%)
 rename Kernel/include/{arch/x86_64/keyboard.h => Arch/x86_64/Keyboard.h} (100%)
 rename Kernel/include/{arch/x86_64/memory.h => Arch/x86_64/Memory.h} (55%)
 rename Kernel/include/{arch/x86_64/mouse.h => Arch/x86_64/Mouse.h} (100%)
 rename Kernel/include/{arch/x86_64/pci.h => Arch/x86_64/PCI.h} (99%)
 rename Kernel/include/{arch/x86_64/paging.h => Arch/x86_64/Paging.h} (99%)
 rename Kernel/include/{arch/x86_64/physicalallocator.h => Arch/x86_64/PhysicalAllocator.h} (93%)
 rename Kernel/include/{arch/x86_64/smp.h => Arch/x86_64/SMP.h} (90%)
 rename Kernel/include/{arch/x86_64/scheduler.h => Arch/x86_64/Scheduler.h} (93%)
 rename Kernel/include/{arch/x86_64/serial.h => Arch/x86_64/Serial.h} (100%)
 rename Kernel/include/{arch/x86_64/strace.h => Arch/x86_64/StackTrace.h} (89%)
 rename Kernel/include/{arch/x86_64/syscalls.h => Arch/x86_64/Syscalls.h} (100%)
 rename Kernel/include/{arch/x86_64/system.h => Arch/x86_64/System.h} (100%)
 rename Kernel/include/{arch/x86_64/tss.h => Arch/x86_64/TSS.h} (100%)
 rename Kernel/include/{arch/x86_64/thread.h => Arch/x86_64/Thread.h} (97%)
 rename Kernel/include/{arch/x86_64/timer.h => Arch/x86_64/Timer.h} (100%)
 rename Kernel/include/{arch/x86_64/types.h => Arch/x86_64/Types.h} (100%)
 rename Kernel/include/{assert.h => Assert.h} (100%)
 rename Kernel/include/{audio/hdaudio.h => Audio/HDAudio.h} (99%)
 rename Kernel/include/{characterbuffer.h => CharacterBuffer.h} (96%)
 rename Kernel/include/{device.h => Device.h} (98%)
 rename Kernel/include/{endian.h => Endian.h} (100%)
 rename Kernel/include/{errno.h => Errno.h} (100%)
 create mode 100755 Kernel/include/Framebuffer.h
 rename Kernel/include/{fs/ext2.h => Fs/Ext2.h} (99%)
 rename Kernel/include/{fs/fat32.h => Fs/Fat32.h} (98%)
 rename Kernel/include/{fs/filesystem.h => Fs/Filesystem.h} (99%)
 rename Kernel/include/{fs/fsvolume.h => Fs/FsVolume.h} (94%)
 rename Kernel/include/{fs/initrd.h => Fs/Initrd.h} (96%)
 rename Kernel/include/{fs/tar.h => Fs/TAR.h} (98%)
 rename Kernel/include/{fs/tmp.h => Fs/Tmp.h} (95%)
 rename Kernel/include/{hash.h => Hash.h} (99%)
 rename Kernel/include/{lemon.h => Lemon.h} (100%)
 rename Kernel/include/{liballoc.h => Liballoc.h} (100%)
 rename Kernel/include/{list.h => List.h} (99%)
 rename Kernel/include/{lock.h => Lock.h} (97%)
 rename Kernel/include/{logging.h => Logging.h} (96%)
 rename Kernel/include/{math.h => Math.h} (100%)
 rename Kernel/include/{mischdr.h => MiscHdr.h} (100%)
 rename Kernel/include/{net => Net}/8254x.h (98%)
 rename Kernel/include/{net/networkadapter.h => Net/Adapter.h} (97%)
 rename Kernel/include/{net/if.h => Net/If.h} (100%)
 rename Kernel/include/{net/net.h => Net/Net.h} (99%)
 rename Kernel/include/{net/socket.h => Net/Socket.h} (98%)
 rename Kernel/include/{objects/handle.h => Objects/Handle.h} (71%)
 rename Kernel/include/{objects/interface.h => Objects/Interface.h} (95%)
 rename Kernel/include/{objects/kobject.h => Objects/KObject.h} (92%)
 rename Kernel/include/{objects/message.h => Objects/Message.h} (97%)
 rename Kernel/include/{objects/service.h => Objects/Service.h} (91%)
 rename Kernel/include/{pty.h => PTY.h} (96%)
 rename Kernel/include/{pair.h => Pair.h} (100%)
 rename Kernel/include/{panic.h => Panic.h} (100%)
 rename Kernel/include/{refptr.h => RefPtr.h} (97%)
 rename Kernel/include/{ringbuffer.h => RingBuffer.h} (99%)
 rename Kernel/include/{sharedmem.h => SharedMemory.h} (96%)
 rename Kernel/include/{spin.h => Spinlock.h} (96%)
 rename Kernel/include/{ahci.h => Storage/AHCI.h} (99%)
 rename Kernel/include/{ata.h => Storage/ATA.h} (100%)
 rename Kernel/include/{atadrive.h => Storage/ATADrive.h} (93%)
 rename Kernel/include/{gpt.h => Storage/GPT.h} (97%)
 rename Kernel/include/{nvme.h => Storage/NVMe.h} (99%)
 rename Kernel/include/{stream.h => Stream.h} (95%)
 rename Kernel/include/{string.h => String.h} (98%)
 rename Kernel/include/{systeminfo.h => SystemInfo.h} (100%)
 rename Kernel/include/{ttraits.h => TTraits.h} (100%)
 rename Kernel/include/{timerevent.h => TimerEvent.h} (95%)
 rename Kernel/include/{xhci.h => USB/XHCI.h} (99%)
 rename Kernel/include/{vector.h => Vector.h} (98%)
 rename Kernel/include/{video.h => Video/Video.h} (96%)
 rename Kernel/include/{videoconsole.h => Video/VideoConsole.h} (100%)
 delete mode 120000 Kernel/include/abi
 delete mode 100755 Kernel/include/fb.h
 delete mode 100755 Kernel/include/gui.h
 rename LibLemon/include/{lemon/core/cfgparser.h => Lemon/Core/CFGParser.h} (100%)
 rename LibLemon/include/{lemon/core/event.h => Lemon/Core/Event.h} (95%)
 rename LibLemon/include/{lemon/core/fb.h => Lemon/Core/Framebuffer.h} (65%)
 rename LibLemon/include/{lemon/core/input.h => Lemon/Core/Input.h} (100%)
 rename LibLemon/include/{lemon/core/json.h => Lemon/Core/JSON.h} (99%)
 rename LibLemon/include/{lemon/core/keyboard.h => Lemon/Core/Keyboard.h} (100%)
 rename LibLemon/include/{lemon/core/lexer.h => Lemon/Core/Lexer.h} (100%)
 rename LibLemon/include/{lemon/core/rotate.h => Lemon/Core/Rotate.h} (100%)
 rename LibLemon/include/{lemon/core/sha.h => Lemon/Core/SHA.h} (100%)
 rename LibLemon/include/{lemon/core/sharedmem.h => Lemon/Core/SharedMemory.h} (100%)
 rename LibLemon/include/{lemon/core/shell.h => Lemon/Core/Shell.h} (96%)
 rename LibLemon/include/{lemon/core/url.h => Lemon/Core/URL.h} (100%)
 create mode 100644 LibLemon/include/Lemon/Filesystem/ExecutableTarget.h
 rename LibLemon/include/{lemon/gui/colours.h => Lemon/GUI/Colours.h} (90%)
 rename LibLemon/include/{lemon/gui/ctxentry.h => Lemon/GUI/CtxEntry.h} (100%)
 rename LibLemon/include/{lemon/gui/filedialog.h => Lemon/GUI/FileDialog.h} (100%)
 rename LibLemon/include/{lemon/gui/messagebox.h => Lemon/GUI/Messagebox.h} (100%)
 rename LibLemon/include/{lemon/gui/model.h => Lemon/GUI/Model.h} (98%)
 rename LibLemon/include/{lemon/gui/variant.h => Lemon/GUI/Variant.h} (100%)
 rename LibLemon/include/{lemon/gui/wmclient.h => Lemon/GUI/WMClient.h} (95%)
 rename LibLemon/include/{lemon/gui/widgets.h => Lemon/GUI/Widgets.h} (98%)
 rename LibLemon/include/{lemon/gui/window.h => Lemon/GUI/Window.h} (98%)
 rename LibLemon/include/{lemon/gfx/font.h => Lemon/Graphics/Font.h} (100%)
 rename LibLemon/include/{lemon/gfx/graphics.h => Lemon/Graphics/Graphics.h} (98%)
 rename LibLemon/include/{lemon/gfx/surface.h => Lemon/Graphics/Surface.h} (100%)
 rename LibLemon/include/{lemon/gfx/text.h => Lemon/Graphics/Text.h} (97%)
 rename LibLemon/include/{lemon/gfx/types.h => Lemon/Graphics/Types.h} (100%)
 rename LibLemon/include/{lemon/ipc/endpoint.h => Lemon/IPC/Endpoint.h} (97%)
 rename LibLemon/include/{lemon/ipc/interface.h => Lemon/IPC/Interface.h} (95%)
 rename LibLemon/include/{lemon/ipc/message.h => Lemon/IPC/Message.h} (100%)
 rename LibLemon/include/{lemon/system/abi/fb.h => Lemon/System/ABI/Framebuffer.h} (100%)
 rename LibLemon/include/{lemon/system/abi/process.h => Lemon/System/ABI/Process.h} (100%)
 rename LibLemon/include/{lemon/system/abi/syscall.h => Lemon/System/ABI/Syscall.h} (100%)
 rename LibLemon/include/{lemon/system/device.h => Lemon/System/Device.h} (100%)
 rename LibLemon/include/{lemon/system/filesystem.h => Lemon/System/Filesystem.h} (100%)
 rename LibLemon/include/{lemon/system/fb.h => Lemon/System/Framebuffer.h} (77%)
 rename LibLemon/include/{lemon/system/ipc.h => Lemon/System/IPC.h} (99%)
 rename LibLemon/include/{lemon/system/info.h => Lemon/System/Info.h} (100%)
 rename LibLemon/include/{lemon/system/kobject.h => Lemon/System/KernelObject.h} (98%)
 rename LibLemon/include/{lemon/system/spawn.h => Lemon/System/Spawn.h} (100%)
 rename LibLemon/include/{lemon/system/util.h => Lemon/System/Util.h} (96%)
 rename LibLemon/include/{lemon/system/waitable.h => Lemon/System/Waitable.h} (98%)
 rename LibLemon/include/{lemon/types.h => Lemon/Types.h} (100%)
 delete mode 100755 LibLemon/include/lemon/core/itoa.h
 delete mode 100755 LibLemon/src/lemon/itoa.cpp

diff --git a/Applications/DeviceManager/main.cpp b/Applications/DeviceManager/main.cpp
index 7ff12576..9c9f30c0 100644
--- a/Applications/DeviceManager/main.cpp
+++ b/Applications/DeviceManager/main.cpp
@@ -1,7 +1,7 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/model.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Model.h>
 
-#include <lemon/system/device.h>
+#include <Lemon/System/Device.h>
 
 Lemon::GUI::Window* window;
 
diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp
index a6951a2f..bed58b23 100755
--- a/Applications/FileManager/main.cpp
+++ b/Applications/FileManager/main.cpp
@@ -1,9 +1,9 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/widgets.h>
-#include <lemon/gui/messagebox.h>
-#include <lemon/system/filesystem.h>
-#include <lemon/system/spawn.h>
-#include <lemon/system/util.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Widgets.h>
+#include <Lemon/GUI/Messagebox.h>
+#include <Lemon/System/Filesystem.h>
+#include <Lemon/System/Spawn.h>
+#include <Lemon/System/Util.h>
 
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/Applications/GUITest/main.cpp b/Applications/GUITest/main.cpp
index 1e913655..6efdd18c 100755
--- a/Applications/GUITest/main.cpp
+++ b/Applications/GUITest/main.cpp
@@ -1,6 +1,6 @@
-#include <lemon/gfx/graphics.h>
-#include <lemon/gfx/surface.h>
-#include <lemon/gui/window.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/Graphics/Surface.h>
+#include <Lemon/GUI/Window.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/Applications/ImgView/main.cpp b/Applications/ImgView/main.cpp
index 94add99c..cbea7d96 100755
--- a/Applications/ImgView/main.cpp
+++ b/Applications/ImgView/main.cpp
@@ -1,7 +1,7 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/widgets.h>
-#include <lemon/gui/messagebox.h>
-#include <lemon/gui/filedialog.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Widgets.h>
+#include <Lemon/GUI/Messagebox.h>
+#include <Lemon/GUI/FileDialog.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Applications/JSONDump/main.cpp b/Applications/JSONDump/main.cpp
index 8ca1cfa4..3d82c57b 100644
--- a/Applications/JSONDump/main.cpp
+++ b/Applications/JSONDump/main.cpp
@@ -1,4 +1,4 @@
-#include <lemon/core/json.h>
+#include <Lemon/Core/JSON.h>
 
 #include <iostream>
 #include <sstream>
diff --git a/Applications/LSh/main.cpp b/Applications/LSh/main.cpp
index cf6f855d..c4aabf65 100755
--- a/Applications/LSh/main.cpp
+++ b/Applications/LSh/main.cpp
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <list>
-#include <lemon/system/spawn.h>
-#include <lemon/system/filesystem.h>
+#include <Lemon/System/Spawn.h>
+#include <Lemon/System/Filesystem.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <limits.h>
diff --git a/Applications/LemonMonitor/main.cpp b/Applications/LemonMonitor/main.cpp
index 60d8799b..0aa262b6 100644
--- a/Applications/LemonMonitor/main.cpp
+++ b/Applications/LemonMonitor/main.cpp
@@ -1,8 +1,8 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/model.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Model.h>
 
-#include <lemon/system/util.h>
-#include <lemon/system/info.h>
+#include <Lemon/System/Util.h>
+#include <Lemon/System/Info.h>
 
 #include <vector>
 #include <map>
diff --git a/Applications/Minesweeper/main.cpp b/Applications/Minesweeper/main.cpp
index 4b631f26..e07d380e 100644
--- a/Applications/Minesweeper/main.cpp
+++ b/Applications/Minesweeper/main.cpp
@@ -1,5 +1,5 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/messagebox.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Messagebox.h>
 
 #include <map>
 #include <functional>
diff --git a/Applications/Run/main.cpp b/Applications/Run/main.cpp
index d9078e3e..4b756a31 100644
--- a/Applications/Run/main.cpp
+++ b/Applications/Run/main.cpp
@@ -1,7 +1,7 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/messagebox.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Messagebox.h>
 
-#include <lemon/system/spawn.h>
+#include <Lemon/System/Spawn.h>
 
 #include <vector>
 #include <cstring>
diff --git a/Applications/Shell/main.cpp b/Applications/Shell/main.cpp
index c28e3811..cab4bb63 100755
--- a/Applications/Shell/main.cpp
+++ b/Applications/Shell/main.cpp
@@ -1,18 +1,18 @@
 #include <stdint.h>
 
 #include <lemon/syscall.h>
-#include <lemon/system/filesystem.h>
-#include <lemon/system/spawn.h>
-#include <lemon/system/info.h>
-#include <lemon/system/util.h>
-#include <lemon/system/fb.h>
-#include <lemon/system/ipc.h>
-#include <lemon/system/waitable.h>
-#include <lemon/gui/window.h>
-#include <lemon/core/sharedmem.h>
-#include <lemon/core/shell.h>
-#include <lemon/core/keyboard.h>
-#include <lemon/gfx/graphics.h>
+#include <Lemon/System/Filesystem.h>
+#include <Lemon/System/Spawn.h>
+#include <Lemon/System/Info.h>
+#include <Lemon/System/Util.h>
+#include <Lemon/System/Framebuffer.h>
+#include <Lemon/System/IPC.h>
+#include <Lemon/System/Waitable.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/Core/SharedMemory.h>
+#include <Lemon/Core/Shell.h>
+#include <Lemon/Core/Keyboard.h>
+#include <Lemon/Graphics/Graphics.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/Applications/Shell/menu.cpp b/Applications/Shell/menu.cpp
index 70c6d1ce..36abeaa6 100644
--- a/Applications/Shell/menu.cpp
+++ b/Applications/Shell/menu.cpp
@@ -1,10 +1,11 @@
-#include <lemon/system/fb.h>
+#include <Lemon/System/Framebuffer.h>
+#include <Lemon/System/Spawn.h>
+
 #include <lemon/syscall.h>
-#include <lemon/system/spawn.h>
 
-#include <lemon/gfx/graphics.h>
-#include <lemon/gui/window.h>
-#include <lemon/core/cfgparser.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/Core/CFGParser.h>
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/Applications/Shell/shell.cpp b/Applications/Shell/shell.cpp
index f0fd288e..cdc0fd7e 100755
--- a/Applications/Shell/shell.cpp
+++ b/Applications/Shell/shell.cpp
@@ -1,5 +1,5 @@
-#include <lemon/core/shell.h>
-#include <lemon/ipc/interface.h>
+#include <Lemon/Core/Shell.h>
+#include <Lemon/IPC/Interface.h>
 #include <string.h>
 #include <stdexcept>
 
diff --git a/Applications/Shell/shell.h b/Applications/Shell/shell.h
index 4c51713a..4aa2a898 100755
--- a/Applications/Shell/shell.h
+++ b/Applications/Shell/shell.h
@@ -1,6 +1,6 @@
-#include <lemon/core/shell.h>
-#include <lemon/gui/window.h>
-#include <lemon/ipc/interface.h>
+#include <Lemon/Core/Shell.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/IPC/Interface.h>
 
 #include <map>
 
diff --git a/Applications/Snake/main.cpp b/Applications/Snake/main.cpp
index a63cb056..295ec398 100755
--- a/Applications/Snake/main.cpp
+++ b/Applications/Snake/main.cpp
@@ -1,8 +1,8 @@
 #include <lemon/syscall.h>
-#include <lemon/gfx/surface.h>
-#include <lemon/gfx/graphics.h>
-#include <lemon/gui/window.h>
-#include <lemon/core/keyboard.h>
+#include <Lemon/Graphics/Surface.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/Core/Keyboard.h>
 #include <stdlib.h>
 #include <list>
 #include <unistd.h>
diff --git a/Applications/Steal/main.cpp b/Applications/Steal/main.cpp
index 0916d046..b6a0dfda 100644
--- a/Applications/Steal/main.cpp
+++ b/Applications/Steal/main.cpp
@@ -3,7 +3,7 @@
 #include <fstream>
 #include <map>
 
-#include <lemon/core/url.h>
+#include <Lemon/Core/URL.h>
 
 #include <sys/socket.h>
 #include <arpa/inet.h>
diff --git a/Applications/SysInfo/main.cpp b/Applications/SysInfo/main.cpp
index 3379ee45..4ce4b4a3 100755
--- a/Applications/SysInfo/main.cpp
+++ b/Applications/SysInfo/main.cpp
@@ -1,8 +1,8 @@
-#include <lemon/gui/window.h>
-#include <lemon/gui/widgets.h>
-#include <lemon/gui/messagebox.h>
-#include <lemon/gui/filedialog.h>
-#include <lemon/system/info.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Widgets.h>
+#include <Lemon/GUI/Messagebox.h>
+#include <Lemon/GUI/FileDialog.h>
+#include <Lemon/System/Info.h>
 #include <lemon/syscall.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
index 89e18b54..b4c6ca1e 100755
--- a/Applications/Terminal/main.cpp
+++ b/Applications/Terminal/main.cpp
@@ -1,12 +1,12 @@
-#include <lemon/gfx/surface.h>
-#include <lemon/gfx/graphics.h>
-#include <lemon/gui/window.h>
-#include <lemon/core/keyboard.h>
+#include <Lemon/Graphics/Surface.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/Core/Keyboard.h>
 
 #include <lemon/syscall.h>
-#include <lemon/system/filesystem.h>
-#include <lemon/system/spawn.h>
-#include <lemon/system/util.h>
+#include <Lemon/System/Filesystem.h>
+#include <Lemon/System/Spawn.h>
+#include <Lemon/System/Util.h>
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/Applications/TextEdit/exttextbox.h b/Applications/TextEdit/exttextbox.h
index c94ae15a..3f876b7d 100755
--- a/Applications/TextEdit/exttextbox.h
+++ b/Applications/TextEdit/exttextbox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <lemon/gui/widgets.h>
+#include <Lemon/GUI/Widgets.h>
 
 class ExtendedTextBox : public Lemon::GUI::TextBox {
     rect_t textBoxBounds;
diff --git a/Applications/TextEdit/main.cpp b/Applications/TextEdit/main.cpp
index 999e97fe..48e4990b 100755
--- a/Applications/TextEdit/main.cpp
+++ b/Applications/TextEdit/main.cpp
@@ -1,9 +1,9 @@
-#include <lemon/gfx/surface.h>
-#include <lemon/gfx/graphics.h>
-#include <lemon/gui/window.h>
-#include <lemon/gui/widgets.h>
-#include <lemon/gui/filedialog.h>
-#include <lemon/gui/messagebox.h>
+#include <Lemon/Graphics/Surface.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Widgets.h>
+#include <Lemon/GUI/FileDialog.h>
+#include <Lemon/GUI/Messagebox.h>
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/Base/lemon/lemond/lemonwm.lemond.json b/Base/lemon/lemond/lemonwm.lemond.json
new file mode 100644
index 00000000..e2724b2e
--- /dev/null
+++ b/Base/lemon/lemond/lemonwm.lemond.json
@@ -0,0 +1,4 @@
+{
+	"name" : "lemonwm",
+	"target" : "/system/lemon/lemonwm.lef"
+}
diff --git a/Base/lemon/lemond/networkgovernor.lemond.json b/Base/lemon/lemond/networkgovernor.lemond.json
new file mode 100644
index 00000000..b8b70f6b
--- /dev/null
+++ b/Base/lemon/lemond/networkgovernor.lemond.json
@@ -0,0 +1,5 @@
+{
+	"name" : "networkgovernor",
+	"target" : "/system/lemon/netgov.lef"
+}
+ 
\ No newline at end of file
diff --git a/Base/lemon/lemond/shell.lemond.json b/Base/lemon/lemond/shell.lemond.json
new file mode 100644
index 00000000..f4ec46f9
--- /dev/null
+++ b/Base/lemon/lemond/shell.lemond.json
@@ -0,0 +1,5 @@
+{
+	"name" : "shell",
+	"target" : "/system/bin/shell.lef",
+	"after" : "lemonwm"
+} 
diff --git a/Kernel/include/ABI b/Kernel/include/ABI
new file mode 120000
index 00000000..c29c2c7f
--- /dev/null
+++ b/Kernel/include/ABI
@@ -0,0 +1 @@
+../../LibLemon/include/Lemon/System/ABI
\ No newline at end of file
diff --git a/Kernel/include/arch/x86_64/abi.h b/Kernel/include/Arch/x86_64/ABI.h
similarity index 100%
rename from Kernel/include/arch/x86_64/abi.h
rename to Kernel/include/Arch/x86_64/ABI.h
diff --git a/Kernel/include/arch/x86_64/acpi.h b/Kernel/include/Arch/x86_64/ACPI.h
similarity index 99%
rename from Kernel/include/arch/x86_64/acpi.h
rename to Kernel/include/Arch/x86_64/ACPI.h
index 77bb0fc1..eb72219d 100755
--- a/Kernel/include/arch/x86_64/acpi.h
+++ b/Kernel/include/Arch/x86_64/ACPI.h
@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <acpispec/tables.h>
 #include <lai/helpers/pci.h>
-#include <list.h>
+#include <List.h>
 
 typedef struct MADT{
   acpi_header_t header;
diff --git a/Kernel/include/arch/x86_64/apic.h b/Kernel/include/Arch/x86_64/APIC.h
similarity index 100%
rename from Kernel/include/arch/x86_64/apic.h
rename to Kernel/include/Arch/x86_64/APIC.h
diff --git a/Kernel/include/arch/x86_64/cpu.h b/Kernel/include/Arch/x86_64/CPU.h
similarity index 98%
rename from Kernel/include/arch/x86_64/cpu.h
rename to Kernel/include/Arch/x86_64/CPU.h
index ccf5f8ae..0b8efeb5 100755
--- a/Kernel/include/arch/x86_64/cpu.h
+++ b/Kernel/include/Arch/x86_64/CPU.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <stdint.h>
-#include <tss.h>
-#include <thread.h>
-#include <system.h>
+#include <TSS.h>
+#include <Thread.h>
+#include <System.h>
 
 struct process;
 template<typename T>
diff --git a/Kernel/include/arch/x86_64/debug.h b/Kernel/include/Arch/x86_64/Debug.h
similarity index 100%
rename from Kernel/include/arch/x86_64/debug.h
rename to Kernel/include/Arch/x86_64/Debug.h
diff --git a/Kernel/include/arch/x86_64/elf.h b/Kernel/include/Arch/x86_64/ELF.h
similarity index 100%
rename from Kernel/include/arch/x86_64/elf.h
rename to Kernel/include/Arch/x86_64/ELF.h
diff --git a/Kernel/include/arch/x86_64/hal.h b/Kernel/include/Arch/x86_64/HAL.h
similarity index 96%
rename from Kernel/include/arch/x86_64/hal.h
rename to Kernel/include/Arch/x86_64/HAL.h
index befd2b3b..a91b9c9b 100755
--- a/Kernel/include/arch/x86_64/hal.h
+++ b/Kernel/include/Arch/x86_64/HAL.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <mischdr.h>
+#include <MiscHdr.h>
 
 namespace HAL{
     extern memory_info_t mem_info;
diff --git a/Kernel/include/arch/x86_64/idt.h b/Kernel/include/Arch/x86_64/IDT.h
similarity index 97%
rename from Kernel/include/arch/x86_64/idt.h
rename to Kernel/include/Arch/x86_64/IDT.h
index 64e8abd7..0023b1da 100755
--- a/Kernel/include/arch/x86_64/idt.h
+++ b/Kernel/include/Arch/x86_64/IDT.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <system.h>
+#include <System.h>
 
 #define IRQ0 32
 
diff --git a/Kernel/include/arch/x86_64/keyboard.h b/Kernel/include/Arch/x86_64/Keyboard.h
similarity index 100%
rename from Kernel/include/arch/x86_64/keyboard.h
rename to Kernel/include/Arch/x86_64/Keyboard.h
diff --git a/Kernel/include/arch/x86_64/memory.h b/Kernel/include/Arch/x86_64/Memory.h
similarity index 55%
rename from Kernel/include/arch/x86_64/memory.h
rename to Kernel/include/Arch/x86_64/Memory.h
index 04ec931e..1ce6e407 100755
--- a/Kernel/include/arch/x86_64/memory.h
+++ b/Kernel/include/Arch/x86_64/Memory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <physicalallocator.h>
-#include <paging.h>
-#include <liballoc.h>
+#include <PhysicalAllocator.h>
+#include <Paging.h>
+#include <Liballoc.h>
 
 typedef struct {
     uint64_t base;
diff --git a/Kernel/include/arch/x86_64/mouse.h b/Kernel/include/Arch/x86_64/Mouse.h
similarity index 100%
rename from Kernel/include/arch/x86_64/mouse.h
rename to Kernel/include/Arch/x86_64/Mouse.h
diff --git a/Kernel/include/arch/x86_64/pci.h b/Kernel/include/Arch/x86_64/PCI.h
similarity index 99%
rename from Kernel/include/arch/x86_64/pci.h
rename to Kernel/include/Arch/x86_64/PCI.h
index 82146b45..cdb41f02 100755
--- a/Kernel/include/arch/x86_64/pci.h
+++ b/Kernel/include/Arch/x86_64/PCI.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <stdint.h>
-#include <assert.h>
-#include <vector.h>
-#include <list.h>
+#include <Assert.h>
+#include <Vector.h>
+#include <List.h>
 
 #define PCI_BIST_CAPABLE (1 << 7)
 #define PCI_BIST_START (1 << 6)
diff --git a/Kernel/include/arch/x86_64/paging.h b/Kernel/include/Arch/x86_64/Paging.h
similarity index 99%
rename from Kernel/include/arch/x86_64/paging.h
rename to Kernel/include/Arch/x86_64/Paging.h
index f301b936..7fca7204 100755
--- a/Kernel/include/arch/x86_64/paging.h
+++ b/Kernel/include/Arch/x86_64/Paging.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <system.h>
+#include <System.h>
 
 #define KERNEL_VIRTUAL_BASE 0xFFFFFFFF80000000ULL
 #define IO_VIRTUAL_BASE (KERNEL_VIRTUAL_BASE - 0x100000000ULL) // KERNEL_VIRTUAL_BASE - 4GB
diff --git a/Kernel/include/arch/x86_64/physicalallocator.h b/Kernel/include/Arch/x86_64/PhysicalAllocator.h
similarity index 93%
rename from Kernel/include/arch/x86_64/physicalallocator.h
rename to Kernel/include/Arch/x86_64/PhysicalAllocator.h
index eeb5627e..8acccd36 100755
--- a/Kernel/include/arch/x86_64/physicalallocator.h
+++ b/Kernel/include/Arch/x86_64/PhysicalAllocator.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <paging.h>
-#include <serial.h>
-#include <string.h>
-#include <mischdr.h>
+#include <Paging.h>
+#include <Serial.h>
+#include <String.h>
+#include <MiscHdr.h>
 
 // The size of a block in phyiscal memory
 #define PHYSALLOC_BLOCK_SIZE 4096
diff --git a/Kernel/include/arch/x86_64/smp.h b/Kernel/include/Arch/x86_64/SMP.h
similarity index 90%
rename from Kernel/include/arch/x86_64/smp.h
rename to Kernel/include/Arch/x86_64/SMP.h
index 4f388b35..5fa73190 100755
--- a/Kernel/include/arch/x86_64/smp.h
+++ b/Kernel/include/Arch/x86_64/SMP.h
@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-#include <cpu.h>
+#include <CPU.h>
 
 namespace SMP{
     extern CPU* cpus[];
diff --git a/Kernel/include/arch/x86_64/scheduler.h b/Kernel/include/Arch/x86_64/Scheduler.h
similarity index 93%
rename from Kernel/include/arch/x86_64/scheduler.h
rename to Kernel/include/Arch/x86_64/Scheduler.h
index 207046fb..01a2d306 100755
--- a/Kernel/include/arch/x86_64/scheduler.h
+++ b/Kernel/include/Arch/x86_64/Scheduler.h
@@ -1,20 +1,20 @@
 #pragma once
 
 #include <stdint.h>
-#include <paging.h>
-#include <system.h>
-#include <memory.h>
-#include <list.h>
-#include <vector.h>
-#include <fs/filesystem.h>
-#include <lock.h>
-#include <timer.h>
-#include <hash.h>
-#include <cpu.h>
-
-#include <objects/handle.h>
-
-#include <thread.h>
+#include <Paging.h>
+#include <System.h>
+#include <Memory.h>
+#include <List.h>
+#include <Vector.h>
+#include <Fs/Filesystem.h>
+#include <Lock.h>
+#include <Timer.h>
+#include <Hash.h>
+#include <CPU.h>
+
+#include <Objects/Handle.h>
+
+#include <Thread.h>
 
 #define KERNEL_CS 0x08
 #define KERNEL_SS 0x10
diff --git a/Kernel/include/arch/x86_64/serial.h b/Kernel/include/Arch/x86_64/Serial.h
similarity index 100%
rename from Kernel/include/arch/x86_64/serial.h
rename to Kernel/include/Arch/x86_64/Serial.h
diff --git a/Kernel/include/arch/x86_64/strace.h b/Kernel/include/Arch/x86_64/StackTrace.h
similarity index 89%
rename from Kernel/include/arch/x86_64/strace.h
rename to Kernel/include/Arch/x86_64/StackTrace.h
index aa3e0b74..efbd6356 100644
--- a/Kernel/include/arch/x86_64/strace.h
+++ b/Kernel/include/Arch/x86_64/StackTrace.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <logging.h>
-#include <paging.h>
-#include <scheduler.h>
+#include <Logging.h>
+#include <Paging.h>
+#include <Scheduler.h>
 
 inline static void PrintStackTrace(uint64_t _rbp){
 	uint64_t* rbp = (uint64_t*)_rbp;
diff --git a/Kernel/include/arch/x86_64/syscalls.h b/Kernel/include/Arch/x86_64/Syscalls.h
similarity index 100%
rename from Kernel/include/arch/x86_64/syscalls.h
rename to Kernel/include/Arch/x86_64/Syscalls.h
diff --git a/Kernel/include/arch/x86_64/system.h b/Kernel/include/Arch/x86_64/System.h
similarity index 100%
rename from Kernel/include/arch/x86_64/system.h
rename to Kernel/include/Arch/x86_64/System.h
diff --git a/Kernel/include/arch/x86_64/tss.h b/Kernel/include/Arch/x86_64/TSS.h
similarity index 100%
rename from Kernel/include/arch/x86_64/tss.h
rename to Kernel/include/Arch/x86_64/TSS.h
diff --git a/Kernel/include/arch/x86_64/thread.h b/Kernel/include/Arch/x86_64/Thread.h
similarity index 97%
rename from Kernel/include/arch/x86_64/thread.h
rename to Kernel/include/Arch/x86_64/Thread.h
index 39d8204d..64ab61fa 100644
--- a/Kernel/include/arch/x86_64/thread.h
+++ b/Kernel/include/Arch/x86_64/Thread.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <spin.h>
-#include <list.h>
-#include <timerevent.h>
-#include <system.h>
+#include <Spinlock.h>
+#include <List.h>
+#include <MiscHdr.h>
+#include <System.h>
 
 #include <abi-bits/pid_t.h>
 
diff --git a/Kernel/include/arch/x86_64/timer.h b/Kernel/include/Arch/x86_64/Timer.h
similarity index 100%
rename from Kernel/include/arch/x86_64/timer.h
rename to Kernel/include/Arch/x86_64/Timer.h
diff --git a/Kernel/include/arch/x86_64/types.h b/Kernel/include/Arch/x86_64/Types.h
similarity index 100%
rename from Kernel/include/arch/x86_64/types.h
rename to Kernel/include/Arch/x86_64/Types.h
diff --git a/Kernel/include/assert.h b/Kernel/include/Assert.h
similarity index 100%
rename from Kernel/include/assert.h
rename to Kernel/include/Assert.h
diff --git a/Kernel/include/audio/hdaudio.h b/Kernel/include/Audio/HDAudio.h
similarity index 99%
rename from Kernel/include/audio/hdaudio.h
rename to Kernel/include/Audio/HDAudio.h
index 24e51031..6ace6899 100644
--- a/Kernel/include/audio/hdaudio.h
+++ b/Kernel/include/Audio/HDAudio.h
@@ -2,7 +2,7 @@
 
 // Intel HD Audio Driver for Lemon OS
 
-#include <device.h>
+#include <Device.h>
 
 namespace Audio {
 	class IntelHDAudioController : public Device {
diff --git a/Kernel/include/characterbuffer.h b/Kernel/include/CharacterBuffer.h
similarity index 96%
rename from Kernel/include/characterbuffer.h
rename to Kernel/include/CharacterBuffer.h
index 4e4b5231..351b82d7 100755
--- a/Kernel/include/characterbuffer.h
+++ b/Kernel/include/CharacterBuffer.h
@@ -3,7 +3,7 @@
 #define CHARBUFFER_START_SIZE 1024
 
 #include <stddef.h>
-#include <types.h>
+#include <Types.h>
 
 class CharacterBuffer{
 public:
diff --git a/Kernel/include/device.h b/Kernel/include/Device.h
similarity index 98%
rename from Kernel/include/device.h
rename to Kernel/include/Device.h
index ece2ac1d..6a7d283e 100755
--- a/Kernel/include/device.h
+++ b/Kernel/include/Device.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <stdint.h>
-#include <list.h>
-#include <fs/filesystem.h>
-#include <logging.h>
-#include <string.h>
+#include <List.h>
+#include <Fs/Filesystem.h>
+#include <Logging.h>
+#include <String.h>
 
 struct DevicePCIInformation {
     uint16_t vendorID; // PCI Vendor ID
diff --git a/Kernel/include/endian.h b/Kernel/include/Endian.h
similarity index 100%
rename from Kernel/include/endian.h
rename to Kernel/include/Endian.h
diff --git a/Kernel/include/errno.h b/Kernel/include/Errno.h
similarity index 100%
rename from Kernel/include/errno.h
rename to Kernel/include/Errno.h
diff --git a/Kernel/include/Framebuffer.h b/Kernel/include/Framebuffer.h
new file mode 100755
index 00000000..8516c6ba
--- /dev/null
+++ b/Kernel/include/Framebuffer.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <ABI/Framebuffer.h>
\ No newline at end of file
diff --git a/Kernel/include/fs/ext2.h b/Kernel/include/Fs/Ext2.h
similarity index 99%
rename from Kernel/include/fs/ext2.h
rename to Kernel/include/Fs/Ext2.h
index 51b1cb3c..77376415 100755
--- a/Kernel/include/fs/ext2.h
+++ b/Kernel/include/Fs/Ext2.h
@@ -1,9 +1,9 @@
-#include <fs/filesystem.h>
-#include <fs/fsvolume.h>
-#include <device.h>
-#include <hash.h>
-#include <lock.h>
-#include <vector.h>
+#include <Fs/Filesystem.h>
+#include <Fs/FsVolume.h>
+#include <Device.h>
+#include <Hash.h>
+#include <Lock.h>
+#include <Vector.h>
 
 #include <stdint.h>
 
diff --git a/Kernel/include/fs/fat32.h b/Kernel/include/Fs/Fat32.h
similarity index 98%
rename from Kernel/include/fs/fat32.h
rename to Kernel/include/Fs/Fat32.h
index 35ab0a3c..9fe56935 100755
--- a/Kernel/include/fs/fat32.h
+++ b/Kernel/include/Fs/Fat32.h
@@ -2,9 +2,9 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <device.h>
-#include <fs/filesystem.h>
-#include <fs/fsvolume.h>
+#include <Device.h>
+#include <Fs/Filesystem.h>
+#include <Fs/FsVolume.h>
 
 #define FAT_ATTR_READ_ONLY 0x1
 #define FAT_ATTR_HIDDEN 0x2
diff --git a/Kernel/include/fs/filesystem.h b/Kernel/include/Fs/Filesystem.h
similarity index 99%
rename from Kernel/include/fs/filesystem.h
rename to Kernel/include/Fs/Filesystem.h
index d6f36795..490264d8 100755
--- a/Kernel/include/fs/filesystem.h
+++ b/Kernel/include/Fs/Filesystem.h
@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <list.h>
-#include <lock.h>
+#include <List.h>
+#include <Lock.h>
 
-#include <types.h>
+#include <Types.h>
 
 #include <abi-bits/abi.h>
 
diff --git a/Kernel/include/fs/fsvolume.h b/Kernel/include/Fs/FsVolume.h
similarity index 94%
rename from Kernel/include/fs/fsvolume.h
rename to Kernel/include/Fs/FsVolume.h
index 078ae3b0..c73bdf2c 100755
--- a/Kernel/include/fs/fsvolume.h
+++ b/Kernel/include/Fs/FsVolume.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <fs/filesystem.h>
+#include <Fs/Filesystem.h>
 
-#include <string.h>
+#include <String.h>
 
 namespace fs{
 
diff --git a/Kernel/include/fs/initrd.h b/Kernel/include/Fs/Initrd.h
similarity index 96%
rename from Kernel/include/fs/initrd.h
rename to Kernel/include/Fs/Initrd.h
index bfba67e1..f802b22e 100755
--- a/Kernel/include/fs/initrd.h
+++ b/Kernel/include/Fs/Initrd.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <stdint.h>
-#include <fs/filesystem.h>
-#include <fs/fsvolume.h>
+#include <Fs/Filesystem.h>
+#include <Fs/FsVolume.h>
 
 #define LEMONINITFS_FILE        0x01
 #define LEMONINITFS_DIRECTORY   0x02
diff --git a/Kernel/include/fs/tar.h b/Kernel/include/Fs/TAR.h
similarity index 98%
rename from Kernel/include/fs/tar.h
rename to Kernel/include/Fs/TAR.h
index 77489552..b3e0dc52 100755
--- a/Kernel/include/fs/tar.h
+++ b/Kernel/include/Fs/TAR.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <stdint.h>
-#include <fs/filesystem.h>
-#include <fs/fsvolume.h>
+#include <Fs/Filesystem.h>
+#include <Fs/FsVolume.h>
 
 #define TAR_TYPE_FILE '0'
 #define TAR_TYPE_LINK_HARD '1'
diff --git a/Kernel/include/fs/tmp.h b/Kernel/include/Fs/Tmp.h
similarity index 95%
rename from Kernel/include/fs/tmp.h
rename to Kernel/include/Fs/Tmp.h
index c6c04909..e2fc642c 100644
--- a/Kernel/include/fs/tmp.h
+++ b/Kernel/include/Fs/Tmp.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <fs/filesystem.h>
-#include <fs/fsvolume.h>
+#include <Fs/Filesystem.h>
+#include <Fs/FsVolume.h>
 
-#include <hash.h>
-#include <spin.h>
+#include <Hash.h>
+#include <Spinlock.h>
 
 #define TEMP_BUFFER_CHUNK_SIZE 1024UL // Must be power of two
 static_assert((TEMP_BUFFER_CHUNK_SIZE & (TEMP_BUFFER_CHUNK_SIZE - 1)) == 0);
diff --git a/Kernel/include/hash.h b/Kernel/include/Hash.h
similarity index 99%
rename from Kernel/include/hash.h
rename to Kernel/include/Hash.h
index 43c09447..374c0d02 100755
--- a/Kernel/include/hash.h
+++ b/Kernel/include/Hash.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <list.h>
+#include <List.h>
 
 inline static unsigned hash(unsigned value){
 	unsigned hash = value;
diff --git a/Kernel/include/lemon.h b/Kernel/include/Lemon.h
similarity index 100%
rename from Kernel/include/lemon.h
rename to Kernel/include/Lemon.h
diff --git a/Kernel/include/liballoc.h b/Kernel/include/Liballoc.h
similarity index 100%
rename from Kernel/include/liballoc.h
rename to Kernel/include/Liballoc.h
diff --git a/Kernel/include/list.h b/Kernel/include/List.h
similarity index 99%
rename from Kernel/include/list.h
rename to Kernel/include/List.h
index 9b386ec1..04939fc1 100755
--- a/Kernel/include/list.h
+++ b/Kernel/include/List.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <liballoc.h>
-#include <spin.h>
-#include <assert.h>
+#include <Liballoc.h>
+#include <Spinlock.h>
+#include <Assert.h>
 
 template<typename T>
 struct ListNode
diff --git a/Kernel/include/lock.h b/Kernel/include/Lock.h
similarity index 97%
rename from Kernel/include/lock.h
rename to Kernel/include/Lock.h
index d2b48b6b..09a211ce 100755
--- a/Kernel/include/lock.h
+++ b/Kernel/include/Lock.h
@@ -2,11 +2,11 @@
 
 struct thread;
 
-#include <list.h>
+#include <List.h>
 
-#include <spin.h>
-#include <thread.h>
-#include <logging.h>
+#include <Spinlock.h>
+#include <Thread.h>
+#include <Logging.h>
 
 class Semaphore {
 protected:
diff --git a/Kernel/include/logging.h b/Kernel/include/Logging.h
similarity index 96%
rename from Kernel/include/logging.h
rename to Kernel/include/Logging.h
index e0d3f05f..d1d7215f 100755
--- a/Kernel/include/logging.h
+++ b/Kernel/include/Logging.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <videoconsole.h>
+#include <Video/VideoConsole.h>
 #include <stdarg.h>
 
-#include <debug.h>
+#include <Debug.h>
 
 namespace Log{
     extern VideoConsole* console;
diff --git a/Kernel/include/math.h b/Kernel/include/Math.h
similarity index 100%
rename from Kernel/include/math.h
rename to Kernel/include/Math.h
diff --git a/Kernel/include/mischdr.h b/Kernel/include/MiscHdr.h
similarity index 100%
rename from Kernel/include/mischdr.h
rename to Kernel/include/MiscHdr.h
diff --git a/Kernel/include/net/8254x.h b/Kernel/include/Net/8254x.h
similarity index 98%
rename from Kernel/include/net/8254x.h
rename to Kernel/include/Net/8254x.h
index 0cad1054..16419dd5 100755
--- a/Kernel/include/net/8254x.h
+++ b/Kernel/include/Net/8254x.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <net/networkadapter.h>
-#include <pci.h>
+#include <Net/Adapter.h>
+#include <PCI.h>
 
 #define INTEL_VENDOR_ID 0x8086
 
diff --git a/Kernel/include/net/networkadapter.h b/Kernel/include/Net/Adapter.h
similarity index 97%
rename from Kernel/include/net/networkadapter.h
rename to Kernel/include/Net/Adapter.h
index e4f419ed..b94d1f8e 100755
--- a/Kernel/include/net/networkadapter.h
+++ b/Kernel/include/Net/Adapter.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <device.h>
-#include <net/net.h>
-#include <scheduler.h>
+#include <Device.h>
+#include <Net/Net.h>
+#include <Scheduler.h>
 
 enum {
     LinkDown,
diff --git a/Kernel/include/net/if.h b/Kernel/include/Net/If.h
similarity index 100%
rename from Kernel/include/net/if.h
rename to Kernel/include/Net/If.h
diff --git a/Kernel/include/net/net.h b/Kernel/include/Net/Net.h
similarity index 99%
rename from Kernel/include/net/net.h
rename to Kernel/include/Net/Net.h
index b0c6fbe3..bbd78926 100755
--- a/Kernel/include/net/net.h
+++ b/Kernel/include/Net/Net.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <net/if.h>
+#include <Net/If.h>
 
 #include <stdint.h>
 #include <stddef.h>
-#include <endian.h>
-#include <string.h>
-#include <device.h>
+#include <Endian.h>
+#include <String.h>
+#include <Device.h>
 
 class Socket;
 
diff --git a/Kernel/include/net/socket.h b/Kernel/include/Net/Socket.h
similarity index 98%
rename from Kernel/include/net/socket.h
rename to Kernel/include/Net/Socket.h
index 3c531e2a..8fdd3540 100755
--- a/Kernel/include/net/socket.h
+++ b/Kernel/include/Net/Socket.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <fs/filesystem.h>
+#include <Fs/Filesystem.h>
 
-#include <net/net.h>
-#include <net/if.h>
+#include <Net/Net.h>
+#include <Net/If.h>
 
 #include <stdint.h>
 #include <stddef.h>
-#include <lock.h>
-#include <stream.h>
-#include <list.h>
+#include <Lock.h>
+#include <Stream.h>
+#include <List.h>
 
 #include <abi-bits/in.h>
 #include <abi-bits/socket.h>
diff --git a/Kernel/include/objects/handle.h b/Kernel/include/Objects/Handle.h
similarity index 71%
rename from Kernel/include/objects/handle.h
rename to Kernel/include/Objects/Handle.h
index 474dddde..60f93693 100644
--- a/Kernel/include/objects/handle.h
+++ b/Kernel/include/Objects/Handle.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <objects/kobject.h>
-#include <refptr.h>
+#include <Objects/KObject.h>
+#include <RefPtr.h>
 
 typedef long long handle_id_t;
 
diff --git a/Kernel/include/objects/interface.h b/Kernel/include/Objects/Interface.h
similarity index 95%
rename from Kernel/include/objects/interface.h
rename to Kernel/include/Objects/Interface.h
index cd47340b..72f3f1e3 100644
--- a/Kernel/include/objects/interface.h
+++ b/Kernel/include/Objects/Interface.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <objects/kobject.h>
-#include <objects/message.h>
+#include <Objects/KObject.h>
+#include <Objects/Message.h>
 
-#include <list.h>
+#include <List.h>
 
 class MessageInterface final : public KernelObject{
 protected:
diff --git a/Kernel/include/objects/kobject.h b/Kernel/include/Objects/KObject.h
similarity index 92%
rename from Kernel/include/objects/kobject.h
rename to Kernel/include/Objects/KObject.h
index f248b0e7..92c3416f 100644
--- a/Kernel/include/objects/kobject.h
+++ b/Kernel/include/Objects/KObject.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <debug.h>
+#include <Debug.h>
 #ifdef DEBUG_KOBJECTS
-    #include <logging.h>
+    #include <Logging.h>
 #endif
 
 #include <stdint.h>
-#include <string.h>
-#include <lock.h>
-#include <refptr.h>
+#include <String.h>
+#include <Lock.h>
+#include <RefPtr.h>
 
 typedef long kobject_id_t;
 
diff --git a/Kernel/include/objects/message.h b/Kernel/include/Objects/Message.h
similarity index 97%
rename from Kernel/include/objects/message.h
rename to Kernel/include/Objects/Message.h
index 7e4c9d16..a27ea986 100644
--- a/Kernel/include/objects/message.h
+++ b/Kernel/include/Objects/Message.h
@@ -2,13 +2,13 @@
 
 #include <stdint.h>
 
-#include <list.h>
-#include <refptr.h>
-#include <pair.h>
-#include <lock.h>
-#include <ringbuffer.h>
+#include <List.h>
+#include <RefPtr.h>
+#include <Pair.h>
+#include <Lock.h>
+#include <RingBuffer.h>
 
-#include <objects/kobject.h>
+#include <Objects/KObject.h>
 
 struct MessageEndpointInfo{
     uint16_t msgSize;
diff --git a/Kernel/include/objects/service.h b/Kernel/include/Objects/Service.h
similarity index 91%
rename from Kernel/include/objects/service.h
rename to Kernel/include/Objects/Service.h
index 4d42f70f..9066d06b 100644
--- a/Kernel/include/objects/service.h
+++ b/Kernel/include/Objects/Service.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <fs/fsvolume.h>
+#include <Fs/FsVolume.h>
 
-#include <objects/kobject.h>
-#include <objects/interface.h>
+#include <Objects/KObject.h>
+#include <Objects/Interface.h>
 
-#include <vector.h>
+#include <Vector.h>
 
 class Service;
 
diff --git a/Kernel/include/pty.h b/Kernel/include/PTY.h
similarity index 96%
rename from Kernel/include/pty.h
rename to Kernel/include/PTY.h
index 0d51381d..285c36e7 100755
--- a/Kernel/include/pty.h
+++ b/Kernel/include/PTY.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <characterbuffer.h>
-#include <types.h>
-#include <scheduler.h>
-#include <device.h>
+#include <CharacterBuffer.h>
+#include <Types.h>
+#include <Scheduler.h>
+#include <Device.h>
 
 typedef unsigned int cc_t;
 typedef unsigned int speed_t;
diff --git a/Kernel/include/pair.h b/Kernel/include/Pair.h
similarity index 100%
rename from Kernel/include/pair.h
rename to Kernel/include/Pair.h
diff --git a/Kernel/include/panic.h b/Kernel/include/Panic.h
similarity index 100%
rename from Kernel/include/panic.h
rename to Kernel/include/Panic.h
diff --git a/Kernel/include/refptr.h b/Kernel/include/RefPtr.h
similarity index 97%
rename from Kernel/include/refptr.h
rename to Kernel/include/RefPtr.h
index fc5f5fc5..a1de553d 100644
--- a/Kernel/include/refptr.h
+++ b/Kernel/include/RefPtr.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <debug.h>
-#include <ttraits.h>
+#include <Debug.h>
+#include <TTraits.h>
 
 #ifdef REFPTR_DEBUG
-    #include <logging.h>
+    #include <Logging.h>
 #endif
 
 template<typename T>
diff --git a/Kernel/include/ringbuffer.h b/Kernel/include/RingBuffer.h
similarity index 99%
rename from Kernel/include/ringbuffer.h
rename to Kernel/include/RingBuffer.h
index dd0e390b..76ebfbd1 100644
--- a/Kernel/include/ringbuffer.h
+++ b/Kernel/include/RingBuffer.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <stddef.h>
-#include <memory.h>
-#include <spin.h>
+#include <Memory.h>
+#include <Spinlock.h>
 
 template<typename T = uint8_t>
 class RingBuffer{
diff --git a/Kernel/include/sharedmem.h b/Kernel/include/SharedMemory.h
similarity index 96%
rename from Kernel/include/sharedmem.h
rename to Kernel/include/SharedMemory.h
index 8113035e..eaf4c8b4 100755
--- a/Kernel/include/sharedmem.h
+++ b/Kernel/include/SharedMemory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <scheduler.h>
+#include <Scheduler.h>
 
 #define SMEM_FLAGS_PRIVATE 1
 
diff --git a/Kernel/include/spin.h b/Kernel/include/Spinlock.h
similarity index 96%
rename from Kernel/include/spin.h
rename to Kernel/include/Spinlock.h
index 89c8d1b1..0977b66a 100755
--- a/Kernel/include/spin.h
+++ b/Kernel/include/Spinlock.h
@@ -4,7 +4,7 @@ typedef volatile int lock_t;
 
 #define CHECK_DEADLOCK
 #ifdef CHECK_DEADLOCK
-#include <assert.h>
+#include <Assert.h>
 
 #define acquireLock(lock) ({ \
     volatile unsigned i = 0; \
diff --git a/Kernel/include/ahci.h b/Kernel/include/Storage/AHCI.h
similarity index 99%
rename from Kernel/include/ahci.h
rename to Kernel/include/Storage/AHCI.h
index b9e5b91f..6720653d 100755
--- a/Kernel/include/ahci.h
+++ b/Kernel/include/Storage/AHCI.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <stdint.h>
-#include <lock.h>
-#include <device.h>
+#include <Lock.h>
+#include <Device.h>
 
 enum
 {
diff --git a/Kernel/include/ata.h b/Kernel/include/Storage/ATA.h
similarity index 100%
rename from Kernel/include/ata.h
rename to Kernel/include/Storage/ATA.h
diff --git a/Kernel/include/atadrive.h b/Kernel/include/Storage/ATADrive.h
similarity index 93%
rename from Kernel/include/atadrive.h
rename to Kernel/include/Storage/ATADrive.h
index fe83c52a..8ca5321a 100755
--- a/Kernel/include/atadrive.h
+++ b/Kernel/include/Storage/ATADrive.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <stdint.h>
-#include <ata.h>
-#include <device.h>
+#include <Storage/ATA.h>
+#include <Device.h>
 
 namespace ATA{
     class ATADiskDevice : public DiskDevice{
diff --git a/Kernel/include/gpt.h b/Kernel/include/Storage/GPT.h
similarity index 97%
rename from Kernel/include/gpt.h
rename to Kernel/include/Storage/GPT.h
index 4bfd65b0..bd6699a0 100755
--- a/Kernel/include/gpt.h
+++ b/Kernel/include/Storage/GPT.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <device.h>
+#include <Device.h>
 
 #define GPT_HEADER_SIGNATURE 0x5452415020494645ULL
 
diff --git a/Kernel/include/nvme.h b/Kernel/include/Storage/NVMe.h
similarity index 99%
rename from Kernel/include/nvme.h
rename to Kernel/include/Storage/NVMe.h
index cae5a0f8..f44d5006 100755
--- a/Kernel/include/nvme.h
+++ b/Kernel/include/Storage/NVMe.h
@@ -2,9 +2,9 @@
 
 #include <stdint.h>
 
-#include <pci.h>
-#include <device.h>
-#include <assert.h>
+#include <PCI.h>
+#include <Device.h>
+#include <Assert.h>
 
 #define NVME_CAP_CMBS (1 << 57) // Controller memory buffer supported
 #define NVME_CAP_PMRS (1 << 56) // Persistent memory region supported
diff --git a/Kernel/include/stream.h b/Kernel/include/Stream.h
similarity index 95%
rename from Kernel/include/stream.h
rename to Kernel/include/Stream.h
index f4e2c744..6e2f9b96 100755
--- a/Kernel/include/stream.h
+++ b/Kernel/include/Stream.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <list.h>
+#include <List.h>
 
 #include <stdint.h>
 #include <stddef.h>
-#include <lock.h>
-#include <scheduler.h>
+#include <Lock.h>
+#include <Scheduler.h>
 
 #define DATASTREAM_BUFSIZE_DEFAULT 1024
 
diff --git a/Kernel/include/string.h b/Kernel/include/String.h
similarity index 98%
rename from Kernel/include/string.h
rename to Kernel/include/String.h
index 4c1f9de6..870cdd99 100755
--- a/Kernel/include/string.h
+++ b/Kernel/include/String.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stddef.h>
-#include <paging.h>
+#include <Paging.h>
 
 
 /////////////////////////////
diff --git a/Kernel/include/systeminfo.h b/Kernel/include/SystemInfo.h
similarity index 100%
rename from Kernel/include/systeminfo.h
rename to Kernel/include/SystemInfo.h
diff --git a/Kernel/include/ttraits.h b/Kernel/include/TTraits.h
similarity index 100%
rename from Kernel/include/ttraits.h
rename to Kernel/include/TTraits.h
diff --git a/Kernel/include/timerevent.h b/Kernel/include/TimerEvent.h
similarity index 95%
rename from Kernel/include/timerevent.h
rename to Kernel/include/TimerEvent.h
index bbe171d2..137b3243 100644
--- a/Kernel/include/timerevent.h
+++ b/Kernel/include/TimerEvent.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <spin.h>
-#include <list.h>
+#include <Spinlock.h>
+#include <List.h>
 
 struct RegisterContext;
 
diff --git a/Kernel/include/xhci.h b/Kernel/include/USB/XHCI.h
similarity index 99%
rename from Kernel/include/xhci.h
rename to Kernel/include/USB/XHCI.h
index 85b5703d..a5288aa8 100755
--- a/Kernel/include/xhci.h
+++ b/Kernel/include/USB/XHCI.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <pci.h>
+#include <PCI.h>
 
 #define XHCI_PORT_OFFSET 0x400
 
diff --git a/Kernel/include/vector.h b/Kernel/include/Vector.h
similarity index 98%
rename from Kernel/include/vector.h
rename to Kernel/include/Vector.h
index ca88bf2e..30df4147 100644
--- a/Kernel/include/vector.h
+++ b/Kernel/include/Vector.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <memory.h>
-#include <spin.h>
+#include <Memory.h>
+#include <Spinlock.h>
 
 template<typename T>
 class Vector{
diff --git a/Kernel/include/video.h b/Kernel/include/Video/Video.h
similarity index 96%
rename from Kernel/include/video.h
rename to Kernel/include/Video/Video.h
index 7ebb1ca5..16271f42 100755
--- a/Kernel/include/video.h
+++ b/Kernel/include/Video/Video.h
@@ -1,4 +1,4 @@
-#include <mischdr.h>
+#include <MiscHdr.h>
 #include <stdint.h>
 
 namespace Video{
diff --git a/Kernel/include/videoconsole.h b/Kernel/include/Video/VideoConsole.h
similarity index 100%
rename from Kernel/include/videoconsole.h
rename to Kernel/include/Video/VideoConsole.h
diff --git a/Kernel/include/abi b/Kernel/include/abi
deleted file mode 120000
index 045daaf2..00000000
--- a/Kernel/include/abi
+++ /dev/null
@@ -1 +0,0 @@
-../../LibLemon/include/lemon/system/abi
\ No newline at end of file
diff --git a/Kernel/include/fb.h b/Kernel/include/fb.h
deleted file mode 100755
index 4bb973d3..00000000
--- a/Kernel/include/fb.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include <abi/fb.h>
\ No newline at end of file
diff --git a/Kernel/include/gui.h b/Kernel/include/gui.h
deleted file mode 100755
index c796f251..00000000
--- a/Kernel/include/gui.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <list.h>
-#include <scheduler.h>
-
-#define WINDOW_COUNT_MAX 65535
-
-struct process;
-
-typedef struct Vector2i{
-    int x, y;
-} vector2i_t; // Two dimensional integer vector
-
-typedef struct Rect{
-    vector2i_t pos;
-    vector2i_t size;
-} rect_t; // Rectangle
-
-typedef struct Surface{
-	int x, y, width, height, pitch; // Self-explanatory
-	uint8_t depth; // Pixel depth
-	uint8_t* buffer; // Start of the buffer
-	uint8_t linePadding;
-} surface_t;
-
-typedef struct GUIContext{
-	surface_t* surface;
-	process* owner;
-	uint32_t ownerPID;
-} gui_context_t;
-
-bool operator==(const Vector2i& l, const Vector2i& r);
-
-typedef struct {
-	uint16_t x = 0;
-	uint16_t y = 0;
-
-	uint16_t width = 0; // Width
-	uint16_t height = 0; // Height
-
-	uint32_t flags; // Window Flags
-
-	char title[96]; // Title of window
-
-	uint64_t primaryBufferKey;
-	uint64_t secondaryBufferKey;
-	uint8_t currentBuffer;
-
-	uint64_t ownerPID;
-
-	handle_t handle;
-} __attribute__((packed)) win_info_t;
-
-struct Desktop;
-
-typedef struct Window{
-	win_info_t info;
-
-	Desktop* desktop;
-} window_t;
-
-typedef struct {
-	uint16_t windowCount;
-	uint16_t maxWindowCount = WINDOW_COUNT_MAX;
-	uint8_t dirty;
-	uint8_t reserved[3];
-	handle_t windows[];
-} __attribute__((packed)) window_list_t;
-
-typedef struct Desktop{
-	window_list_t* windows;
-
-	uint64_t pid;
-
-	volatile int lock = 0;
-} __attribute__((packed)) desktop_t;
-
-void SetDesktop(desktop_t* desktop);
-desktop_t* GetDesktop();
\ No newline at end of file
diff --git a/Kernel/meson.build b/Kernel/meson.build
index 506e16b8..c7a454e0 100755
--- a/Kernel/meson.build
+++ b/Kernel/meson.build
@@ -40,7 +40,7 @@ lai = subproject('lai')
 kernel_include_dirs = [
     include_directories('include'),
     include_directories('subprojects/lai/include'),
-    include_directories('include/arch/x86_64'),
+    include_directories('include/Arch/x86_64'),
 ]
 
 cpp_files = [
diff --git a/Kernel/src/arch/x86_64/acpi.cpp b/Kernel/src/arch/x86_64/acpi.cpp
index b3f38146..d3c25f24 100755
--- a/Kernel/src/arch/x86_64/acpi.cpp
+++ b/Kernel/src/arch/x86_64/acpi.cpp
@@ -1,21 +1,21 @@
-#include <acpi.h>
-
-#include <string.h>
-#include <logging.h>
-#include <panic.h>
-#include <paging.h>
-#include <pci.h>
-#include <liballoc.h>
-#include <timer.h>
-#include <apic.h>
-#include <list.h>
+#include <ACPI.h>
+
+#include <String.h>
+#include <Logging.h>
+#include <Panic.h>
+#include <Paging.h>
+#include <PCI.h>
+#include <Liballoc.h>
+#include <Timer.h>
+#include <APIC.h>
+#include <List.h>
 
 #include <lai/core.h>
 #include <lai/helpers/pm.h>
 #include <lai/helpers/sci.h>
 #include <lai/helpers/pci.h>
 
-#include <debug.h>
+#include <Debug.h>
 
 namespace ACPI{
 	uint8_t processors[256];
diff --git a/Kernel/src/arch/x86_64/apic.cpp b/Kernel/src/arch/x86_64/apic.cpp
index d526bf76..6caa7708 100755
--- a/Kernel/src/arch/x86_64/apic.cpp
+++ b/Kernel/src/arch/x86_64/apic.cpp
@@ -1,13 +1,13 @@
-#include <apic.h>
+#include <APIC.h>
 
-#include <cpu.h>
-#include <logging.h>
-#include <paging.h>
-#include <smp.h>
-#include <idt.h>
-#include <acpi.h>
+#include <CPU.h>
+#include <Logging.h>
+#include <Paging.h>
+#include <SMP.h>
+#include <IDT.h>
+#include <ACPI.h>
 
-#include <debug.h>
+#include <Debug.h>
 
 namespace APIC{
     namespace Local {
diff --git a/Kernel/src/arch/x86_64/cpuid.cpp b/Kernel/src/arch/x86_64/cpuid.cpp
index f4145990..54699765 100755
--- a/Kernel/src/arch/x86_64/cpuid.cpp
+++ b/Kernel/src/arch/x86_64/cpuid.cpp
@@ -1,4 +1,4 @@
-#include <cpu.h>
+#include <CPU.h>
 
 cpuid_info_t CPUID() {
 	cpuid_info_t info;
diff --git a/Kernel/src/arch/x86_64/elf.cpp b/Kernel/src/arch/x86_64/elf.cpp
index 8a04ec7e..24e78d1a 100755
--- a/Kernel/src/arch/x86_64/elf.cpp
+++ b/Kernel/src/arch/x86_64/elf.cpp
@@ -1,12 +1,12 @@
-#include <elf.h>
+#include <ELF.h>
 
-#include <logging.h>
-#include <string.h>
-#include <scheduler.h>
-#include <paging.h>
-#include <physicalallocator.h>
-#include <scheduler.h>
-#include <math.h>
+#include <Logging.h>
+#include <String.h>
+#include <Scheduler.h>
+#include <Paging.h>
+#include <PhysicalAllocator.h>
+#include <Scheduler.h>
+#include <Math.h>
 
 int VerifyELF(void* elf){
     elf64_header_t elfHdr = *(elf64_header_t*)elf;
diff --git a/Kernel/src/arch/x86_64/hal.cpp b/Kernel/src/arch/x86_64/hal.cpp
index 6c36b99d..5eabbd9d 100755
--- a/Kernel/src/arch/x86_64/hal.cpp
+++ b/Kernel/src/arch/x86_64/hal.cpp
@@ -1,23 +1,23 @@
-#include <hal.h>
-
-#include <string.h>
-#include <serial.h>
-#include <logging.h>
-#include <video.h>
-#include <idt.h>
-#include <paging.h>
-#include <physicalallocator.h>
-#include <pci.h>
-#include <acpi.h>
-#include <timer.h>
-#include <tss.h>
-#include <apic.h>
-#include <liballoc.h>
-#include <smp.h>
-#include <videoconsole.h>
-#include <device.h>
-
-#include <debug.h>
+#include <HAL.h>
+
+#include <String.h>
+#include <Serial.h>
+#include <Logging.h>
+#include <Video/Video.h>
+#include <IDT.h>
+#include <Paging.h>
+#include <PhysicalAllocator.h>
+#include <PCI.h>
+#include <ACPI.h>
+#include <Timer.h>
+#include <TSS.h>
+#include <APIC.h>
+#include <Liballoc.h>
+#include <SMP.h>
+#include <Video/VideoConsole.h>
+#include <Device.h>
+
+#include <Debug.h>
 
 extern void* _end;
 
diff --git a/Kernel/src/arch/x86_64/idt.cpp b/Kernel/src/arch/x86_64/idt.cpp
index 6ad146cd..ef34f052 100755
--- a/Kernel/src/arch/x86_64/idt.cpp
+++ b/Kernel/src/arch/x86_64/idt.cpp
@@ -1,13 +1,13 @@
-#include <idt.h>
-#include <system.h>
-#include <string.h>
-#include <logging.h>
-#include <hal.h>
-#include <panic.h>
-#include <scheduler.h>
-#include <apic.h>
-#include <strace.h>
-#include <syscalls.h>
+#include <IDT.h>
+#include <System.h>
+#include <String.h>
+#include <Logging.h>
+#include <HAL.h>
+#include <Panic.h>
+#include <Scheduler.h>
+#include <APIC.h>
+#include <StackTrace.h>
+#include <Syscalls.h>
 
 idt_entry_t idt[256];
 
diff --git a/Kernel/src/arch/x86_64/keyboard.cpp b/Kernel/src/arch/x86_64/keyboard.cpp
index 39298d32..43284a7f 100755
--- a/Kernel/src/arch/x86_64/keyboard.cpp
+++ b/Kernel/src/arch/x86_64/keyboard.cpp
@@ -1,11 +1,10 @@
-#include <scheduler.h>
-#include <system.h>
-#include <idt.h>
-#include <logging.h>
-#include <gui.h>
-#include <apic.h>
-#include <fs/filesystem.h>
-#include <device.h>
+#include <Scheduler.h>
+#include <System.h>
+#include <IDT.h>
+#include <Logging.h>
+#include <APIC.h>
+#include <Fs/Filesystem.h>
+#include <Device.h>
 
 #define KEY_QUEUE_SIZE 256
 
diff --git a/Kernel/src/arch/x86_64/mouse.cpp b/Kernel/src/arch/x86_64/mouse.cpp
index d2db007d..f8955e35 100755
--- a/Kernel/src/arch/x86_64/mouse.cpp
+++ b/Kernel/src/arch/x86_64/mouse.cpp
@@ -1,13 +1,13 @@
-#include <mouse.h>
+#include <Mouse.h>
 
-#include <idt.h>
+#include <IDT.h>
 #include <stddef.h>
-#include <fs/filesystem.h>
-#include <string.h>
-#include <system.h>
-#include <logging.h>
-#include <apic.h>
-#include <device.h>
+#include <Fs/Filesystem.h>
+#include <String.h>
+#include <System.h>
+#include <Logging.h>
+#include <APIC.h>
+#include <Device.h>
 
 #define PACKET_QUEUE_SIZE 64
 
diff --git a/Kernel/src/arch/x86_64/paging.cpp b/Kernel/src/arch/x86_64/paging.cpp
index 49948614..635fc5f9 100755
--- a/Kernel/src/arch/x86_64/paging.cpp
+++ b/Kernel/src/arch/x86_64/paging.cpp
@@ -1,16 +1,16 @@
-#include <paging.h>
-#include <idt.h>
-#include <memory.h>
-#include <panic.h>
-#include <string.h>
-#include <logging.h>
-#include <system.h>
-#include <scheduler.h>
-#include <physicalallocator.h>
-#include <panic.h>
-#include <apic.h>
-#include <strace.h>
-#include <syscalls.h>
+#include <Paging.h>
+#include <IDT.h>
+#include <Memory.h>
+#include <Panic.h>
+#include <String.h>
+#include <Logging.h>
+#include <System.h>
+#include <Scheduler.h>
+#include <PhysicalAllocator.h>
+#include <Panic.h>
+#include <APIC.h>
+#include <StackTrace.h>
+#include <Syscalls.h>
 
 //extern uint32_t kernel_end;
 
diff --git a/Kernel/src/arch/x86_64/pci.cpp b/Kernel/src/arch/x86_64/pci.cpp
index c7f411a3..6e6957b8 100755
--- a/Kernel/src/arch/x86_64/pci.cpp
+++ b/Kernel/src/arch/x86_64/pci.cpp
@@ -1,12 +1,12 @@
-#include <pci.h>
-
-#include <system.h>
-#include <logging.h>
-#include <vector.h>
-#include <acpi.h>
-#include <apic.h>
-#include <idt.h>
-#include <cpu.h>
+#include <PCI.h>
+
+#include <System.h>
+#include <Logging.h>
+#include <Vector.h>
+#include <ACPI.h>
+#include <APIC.h>
+#include <IDT.h>
+#include <CPU.h>
 
 namespace PCI{
 	Vector<PCIDevice>* devices;
diff --git a/Kernel/src/arch/x86_64/physicalallocator.cpp b/Kernel/src/arch/x86_64/physicalallocator.cpp
index 1088c7e2..221d0e5f 100755
--- a/Kernel/src/arch/x86_64/physicalallocator.cpp
+++ b/Kernel/src/arch/x86_64/physicalallocator.cpp
@@ -1,11 +1,11 @@
-#include <physicalallocator.h>
-
-#include <paging.h>
-#include <serial.h>
-#include <string.h>
-#include <logging.h>
-#include <panic.h>
-#include <lock.h>
+#include <PhysicalAllocator.h>
+
+#include <Paging.h>
+#include <Serial.h>
+#include <String.h>
+#include <Logging.h>
+#include <Panic.h>
+#include <Lock.h>
 
 namespace Memory{
     uint32_t physicalMemoryBitmap[PHYSALLOC_BITMAP_SIZE_DWORDS];
diff --git a/Kernel/src/arch/x86_64/scheduler.cpp b/Kernel/src/arch/x86_64/scheduler.cpp
index fe5111bf..98cf40bf 100755
--- a/Kernel/src/arch/x86_64/scheduler.cpp
+++ b/Kernel/src/arch/x86_64/scheduler.cpp
@@ -1,23 +1,23 @@
-#include <scheduler.h>
-
-#include <paging.h>
-#include <liballoc.h>
-#include <physicalallocator.h>
-#include <list.h>
-#include <serial.h>
-#include <idt.h>
-#include <string.h>
-#include <system.h>
-#include <logging.h>
-#include <elf.h>
-#include <tss.h>
-#include <fs/initrd.h>
-#include <abi.h>
-#include <lock.h>
-#include <smp.h>
-#include <apic.h>
-#include <timer.h>
-#include <debug.h>
+#include <Scheduler.h>
+
+#include <Paging.h>
+#include <Liballoc.h>
+#include <PhysicalAllocator.h>
+#include <List.h>
+#include <Serial.h>
+#include <IDT.h>
+#include <String.h>
+#include <System.h>
+#include <Logging.h>
+#include <ELF.h>
+#include <TSS.h>
+#include <Fs/Initrd.h>
+#include <ABI.h>
+#include <Lock.h>
+#include <SMP.h>
+#include <APIC.h>
+#include <Timer.h>
+#include <Debug.h>
 
 extern "C" [[noreturn]] void TaskSwitch(RegisterContext* r, uint64_t pml4);
 
diff --git a/Kernel/src/arch/x86_64/serial.cpp b/Kernel/src/arch/x86_64/serial.cpp
index a68b5969..24948617 100755
--- a/Kernel/src/arch/x86_64/serial.cpp
+++ b/Kernel/src/arch/x86_64/serial.cpp
@@ -1,8 +1,8 @@
-#include <system.h>
-#include <serial.h>
-#include <string.h>
-#include <lock.h>
-#include <cpu.h>
+#include <System.h>
+#include <Serial.h>
+#include <String.h>
+#include <Lock.h>
+#include <CPU.h>
 
 #define PORT 0x3F8 // COM 1
 
diff --git a/Kernel/src/arch/x86_64/smp.cpp b/Kernel/src/arch/x86_64/smp.cpp
index 263b079c..e454c733 100755
--- a/Kernel/src/arch/x86_64/smp.cpp
+++ b/Kernel/src/arch/x86_64/smp.cpp
@@ -1,15 +1,15 @@
-#include <smp.h>
-
-#include <cpu.h>
-#include <device.h>
-#include <apic.h>
-#include <logging.h>
-#include <timer.h>
-#include <acpi.h>
-#include <tss.h>
-#include <idt.h>
-#include <hal.h>
-#include <memory.h>
+#include <SMP.h>
+
+#include <CPU.h>
+#include <Device.h>
+#include <APIC.h>
+#include <Logging.h>
+#include <Timer.h>
+#include <ACPI.h>
+#include <TSS.h>
+#include <IDT.h>
+#include <HAL.h>
+#include <Memory.h>
 
 #include "smpdefines.inc"
 
diff --git a/Kernel/src/arch/x86_64/ssp.cpp b/Kernel/src/arch/x86_64/ssp.cpp
index 8953e0c5..819c79cd 100755
--- a/Kernel/src/arch/x86_64/ssp.cpp
+++ b/Kernel/src/arch/x86_64/ssp.cpp
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include <panic.h>
+#include <Panic.h>
 
 #define DEFAULT_STACK_GUARD 0xdead69be69efa4db
 
diff --git a/Kernel/src/arch/x86_64/stringsafe.cpp b/Kernel/src/arch/x86_64/stringsafe.cpp
index df08e9b3..6b0d5cf0 100644
--- a/Kernel/src/arch/x86_64/stringsafe.cpp
+++ b/Kernel/src/arch/x86_64/stringsafe.cpp
@@ -1,6 +1,6 @@
-#include <string.h>
+#include <String.h>
 
-#include <paging.h>
+#include <Paging.h>
 
 long strlenSafe(const char* str, size_t& size, address_space_t* aSpace)
 {
diff --git a/Kernel/src/arch/x86_64/syscalls.cpp b/Kernel/src/arch/x86_64/syscalls.cpp
index 78c5ff1e..ed2ba491 100755
--- a/Kernel/src/arch/x86_64/syscalls.cpp
+++ b/Kernel/src/arch/x86_64/syscalls.cpp
@@ -1,33 +1,32 @@
-#include <syscalls.h>
-
-#include <errno.h>
-#include <idt.h>
-#include <scheduler.h>
-#include <logging.h>
-#include <video.h>
-#include <hal.h>
-#include <fb.h>
-#include <physicalallocator.h>
-#include <gui.h>
-#include <timer.h>
-#include <pty.h>
-#include <lock.h>
-#include <lemon.h>
-#include <sharedmem.h>
-#include <cpu.h>
-#include <net/socket.h>
-#include <timer.h>
-#include <lock.h>
-#include <smp.h>
-#include <pair.h>
-#include <objects/service.h>
-#include <debug.h>
-#include <strace.h>
-#include <math.h>
-#include <device.h>
-
-#include <abi/process.h>
-#include <abi/syscall.h>
+#include <Syscalls.h>
+
+#include <Errno.h>
+#include <IDT.h>
+#include <Scheduler.h>
+#include <Logging.h>
+#include <Video/Video.h>
+#include <HAL.h>
+#include <Framebuffer.h>
+#include <PhysicalAllocator.h>
+#include <Timer.h>
+#include <PTY.h>
+#include <Lock.h>
+#include <Lemon.h>
+#include <SharedMemory.h>
+#include <CPU.h>
+#include <Net/Socket.h>
+#include <Timer.h>
+#include <Lock.h>
+#include <SMP.h>
+#include <Pair.h>
+#include <Objects/Service.h>
+#include <Debug.h>
+#include <StackTrace.h>
+#include <Math.h>
+#include <Device.h>
+
+#include <ABI/Process.h>
+#include <ABI/Syscall.h>
 
 #define SC_ARG0(r) (r)->rdi
 #define SC_ARG1(r) (r)->rsi
diff --git a/Kernel/src/arch/x86_64/system.cpp b/Kernel/src/arch/x86_64/system.cpp
index 03c8878b..708b8e08 100755
--- a/Kernel/src/arch/x86_64/system.cpp
+++ b/Kernel/src/arch/x86_64/system.cpp
@@ -1,4 +1,4 @@
-#include <system.h>
+#include <System.h>
 extern "C"{
 void outportb(uint16_t port, uint8_t value){
     asm volatile ("outb %1, %0" : : "dN" (port), "a" (value));
diff --git a/Kernel/src/arch/x86_64/thread.cpp b/Kernel/src/arch/x86_64/thread.cpp
index 55a1724d..0311954b 100644
--- a/Kernel/src/arch/x86_64/thread.cpp
+++ b/Kernel/src/arch/x86_64/thread.cpp
@@ -1,11 +1,13 @@
-#include <thread.h>
+#include <Thread.h>
 
-#include <scheduler.h>
-#include <cpu.h>
-#include <debug.h>
+#include <Scheduler.h>
+#include <CPU.h>
+#include <Debug.h>
+#include <Timer.h>
+#include <TimerEvent.h>
 
 #ifdef KERNEL_DEBUG
-	#include <strace.h>
+	#include <StackTrace.h>
 #endif
 
 void ThreadBlocker::Interrupt(){
diff --git a/Kernel/src/arch/x86_64/timer.cpp b/Kernel/src/arch/x86_64/timer.cpp
index d5e9e115..65f264dd 100755
--- a/Kernel/src/arch/x86_64/timer.cpp
+++ b/Kernel/src/arch/x86_64/timer.cpp
@@ -1,14 +1,15 @@
-#include <timer.h>
-
-#include <timerevent.h>
-
-#include <idt.h>
-#include <scheduler.h>
-#include <system.h>
-#include <apic.h>
-#include <list.h>
-#include <cpu.h>
-#include <logging.h>
+#include <Timer.h>
+#include <TimerEvent.h>
+
+#include <MiscHdr.h>
+
+#include <IDT.h>
+#include <Scheduler.h>
+#include <System.h>
+#include <APIC.h>
+#include <List.h>
+#include <CPU.h>
+#include <Logging.h>
 
 namespace Timer{
     int frequency; // Timer frequency
diff --git a/Kernel/src/arch/x86_64/tss.cpp b/Kernel/src/arch/x86_64/tss.cpp
index 016884c8..06fe1f1c 100755
--- a/Kernel/src/arch/x86_64/tss.cpp
+++ b/Kernel/src/arch/x86_64/tss.cpp
@@ -1,8 +1,8 @@
-#include <tss.h>
+#include <TSS.h>
 
-#include <string.h>
-#include <paging.h>
-#include <physicalallocator.h>
+#include <String.h>
+#include <Paging.h>
+#include <PhysicalAllocator.h>
 
 extern "C"
 void LoadTSS(uint64_t address, uint64_t gdt, uint8_t selector);
diff --git a/Kernel/src/assert.cpp b/Kernel/src/assert.cpp
index 32514302..7368ceff 100755
--- a/Kernel/src/assert.cpp
+++ b/Kernel/src/assert.cpp
@@ -1,11 +1,11 @@
-#include <logging.h>
-
-#include <panic.h>
-#include <apic.h>
-#include <serial.h>
-#include <string.h>
-#include <idt.h>
-#include <strace.h>
+#include <Logging.h>
+
+#include <Panic.h>
+#include <APIC.h>
+#include <Serial.h>
+#include <String.h>
+#include <IDT.h>
+#include <StackTrace.h>
 
 extern "C"{
 
diff --git a/Kernel/src/audio/hdaudio.cpp b/Kernel/src/audio/hdaudio.cpp
index 28ba414b..7e1f15af 100644
--- a/Kernel/src/audio/hdaudio.cpp
+++ b/Kernel/src/audio/hdaudio.cpp
@@ -1,6 +1,6 @@
-#include <audio/hdaudio.h>
+#include <Audio/HDAudio.h>
 
-#include <pair.h>
+#include <Pair.h>
 
 namespace Audio {
 	static const Pair<uint16_t, uint16_t> controllerPCIIDs[] = {
@@ -8,6 +8,7 @@ namespace Audio {
 	};
 
 	void IntelHDAudioController::Initialize(){
-
+		(void)(cRegs);
+		(void)controllerPCIIDs;
 	}
 }
\ No newline at end of file
diff --git a/Kernel/src/characterbuffer.cpp b/Kernel/src/characterbuffer.cpp
index 8f41fa0a..91df5575 100755
--- a/Kernel/src/characterbuffer.cpp
+++ b/Kernel/src/characterbuffer.cpp
@@ -1,9 +1,9 @@
-#include <characterbuffer.h>
+#include <CharacterBuffer.h>
 
-#include <string.h>
-#include <liballoc.h>
-#include <logging.h>
-#include <lock.h>
+#include <String.h>
+#include <Liballoc.h>
+#include <Logging.h>
+#include <Lock.h>
 
 CharacterBuffer::CharacterBuffer(){
     buffer = (char*)kmalloc(bufferSize);
diff --git a/Kernel/src/debug.cpp b/Kernel/src/debug.cpp
index fb487c2f..bfe5771f 100644
--- a/Kernel/src/debug.cpp
+++ b/Kernel/src/debug.cpp
@@ -1,4 +1,4 @@
-#include <debug.h>
+#include <Debug.h>
 
 const int debugLevelHAL = 0;
 const int debugLevelMisc = 0;
diff --git a/Kernel/src/device.cpp b/Kernel/src/device.cpp
index 9aca47c8..fe7032ce 100644
--- a/Kernel/src/device.cpp
+++ b/Kernel/src/device.cpp
@@ -1,14 +1,14 @@
-#include <device.h>
-
-#include <list.h>
-#include <errno.h>
-#include <fs/filesystem.h>
-#include <fs/fsvolume.h>
-#include <math.h>
-#include <timer.h>
-#include <string.h>
-#include <vector.h>
-#include <assert.h>
+#include <Device.h>
+
+#include <List.h>
+#include <Errno.h>
+#include <Fs/Filesystem.h>
+#include <Fs/FsVolume.h>
+#include <Math.h>
+#include <Timer.h>
+#include <String.h>
+#include <Vector.h>
+#include <Assert.h>
 	
 class URandom : public Device {
 public:
diff --git a/Kernel/src/fs/ext2.cpp b/Kernel/src/fs/ext2.cpp
index cc6309b8..087c523f 100755
--- a/Kernel/src/fs/ext2.cpp
+++ b/Kernel/src/fs/ext2.cpp
@@ -1,14 +1,14 @@
-#include <fs/ext2.h>
+#include <Fs/Ext2.h>
 
-#include <logging.h>
-#include <errno.h>
-#include <assert.h>
-#include <math.h>
+#include <Logging.h>
+#include <Errno.h>
+#include <Assert.h>
+#include <Math.h>
 
-#include <debug.h>
+#include <Debug.h>
  
 #ifdef EXT2_ENABLE_TIMER
-    #include <timer.h>
+    #include <Timer.h>
 #endif
 
 namespace fs::Ext2{
diff --git a/Kernel/src/fs/fat32.cpp b/Kernel/src/fs/fat32.cpp
index 9fff0c8d..535eb5b7 100755
--- a/Kernel/src/fs/fat32.cpp
+++ b/Kernel/src/fs/fat32.cpp
@@ -1,10 +1,10 @@
-#include <fs/fat32.h>
+#include <Fs/Fat32.h>
 
-#include <device.h>
-#include <logging.h>
-#include <memory.h>
-#include <string.h>
-#include <errno.h>
+#include <Device.h>
+#include <Logging.h>
+#include <Memory.h>
+#include <String.h>
+#include <Errno.h>
 
 namespace fs::FAT32{
 
diff --git a/Kernel/src/fs/filesystem.cpp b/Kernel/src/fs/filesystem.cpp
index 04ab8663..10752c39 100755
--- a/Kernel/src/fs/filesystem.cpp
+++ b/Kernel/src/fs/filesystem.cpp
@@ -1,11 +1,11 @@
-#include <fs/filesystem.h>
+#include <Fs/Filesystem.h>
 
-#include <fs/fsvolume.h>
-#include <logging.h>
-#include <errno.h>
-#include <scheduler.h>
+#include <Fs/FsVolume.h>
+#include <Logging.h>
+#include <Errno.h>
+#include <Scheduler.h>
 
-#include <debug.h>
+#include <Debug.h>
 
 void FilesystemBlocker::Interrupt() {
 	shouldBlock = false;
diff --git a/Kernel/src/fs/fsnodestubs.cpp b/Kernel/src/fs/fsnodestubs.cpp
index 13c4915c..63c0f824 100755
--- a/Kernel/src/fs/fsnodestubs.cpp
+++ b/Kernel/src/fs/fsnodestubs.cpp
@@ -1,7 +1,7 @@
-#include <fs/filesystem.h>
+#include <Fs/Filesystem.h>
 
-#include <errno.h>
-#include <logging.h>
+#include <Errno.h>
+#include <Logging.h>
 
 FsNode::~FsNode(){
     
diff --git a/Kernel/src/fs/fsvolume.cpp b/Kernel/src/fs/fsvolume.cpp
index 4d3c632e..505b04cd 100755
--- a/Kernel/src/fs/fsvolume.cpp
+++ b/Kernel/src/fs/fsvolume.cpp
@@ -1,4 +1,4 @@
-#include <fs/fsvolume.h>
+#include <Fs/FsVolume.h>
 
 namespace fs{
     void FsVolume::SetVolumeID(volume_id_t id){
diff --git a/Kernel/src/fs/initrd.cpp b/Kernel/src/fs/initrd.cpp
index bf804193..44317f12 100755
--- a/Kernel/src/fs/initrd.cpp
+++ b/Kernel/src/fs/initrd.cpp
@@ -4,15 +4,15 @@
  * 
  */
 
-#include <fs/initrd.h>
-
-#include <filesystem.h>
-#include <string.h>
-#include <memory.h>
-#include <logging.h>
-#include <panic.h>
-#include <list.h>
-#include <fs/fsvolume.h>
+#include <Fs/Initrd.h>
+
+#include <Filesystem.h>
+#include <String.h>
+#include <Memory.h>
+#include <Logging.h>
+#include <Panic.h>
+#include <List.h>
+#include <Fs/FsVolume.h>
 
 namespace Initrd{
 	int ReadDir(fs_node_t* node, fs_dirent_t* dirent, uint32_t index);
diff --git a/Kernel/src/fs/tar.cpp b/Kernel/src/fs/tar.cpp
index c75d0060..a9bcde22 100755
--- a/Kernel/src/fs/tar.cpp
+++ b/Kernel/src/fs/tar.cpp
@@ -1,7 +1,7 @@
-#include <fs/tar.h>
+#include <Fs/TAR.h>
 
-#include <logging.h>
-#include <errno.h>
+#include <Logging.h>
+#include <Errno.h>
 
 inline static long OctToDec(char* str, int size) {
     long n = 0;
diff --git a/Kernel/src/fs/tmp.cpp b/Kernel/src/fs/tmp.cpp
index 7b0b772a..77549197 100644
--- a/Kernel/src/fs/tmp.cpp
+++ b/Kernel/src/fs/tmp.cpp
@@ -1,7 +1,7 @@
-#include <fs/tmp.h>
+#include <Fs/Tmp.h>
 
-#include <errno.h>
-#include <debug.h>
+#include <Errno.h>
+#include <Debug.h>
 
 namespace fs::Temp{
     TempVolume::TempVolume(const char* name){
diff --git a/Kernel/src/gpt.cpp b/Kernel/src/gpt.cpp
index 6ce8ea6e..80f8b7a3 100755
--- a/Kernel/src/gpt.cpp
+++ b/Kernel/src/gpt.cpp
@@ -1,10 +1,10 @@
-#include <gpt.h>
+#include <Storage/GPT.h>
 
-#include <memory.h>
-#include <logging.h>
-#include <device.h>
+#include <Memory.h>
+#include <Logging.h>
+#include <Device.h>
 
-#include <debug.h>
+#include <Debug.h>
 
 namespace GPT{
     int Parse(DiskDevice* disk){
diff --git a/Kernel/src/kernel.cpp b/Kernel/src/kernel.cpp
index b8e96014..30215457 100755
--- a/Kernel/src/kernel.cpp
+++ b/Kernel/src/kernel.cpp
@@ -1,32 +1,31 @@
-#include <types.h>
-#include <logging.h>
-#include <string.h>
-#include <hal.h>
-#include <video.h>
-#include <liballoc.h>
-#include <timer.h>
-#include <math.h>
-#include <mouse.h>
-#include <keyboard.h>
-#include <pci.h>
-#include <panic.h>
-#include <scheduler.h>
-#include <syscalls.h>
-#include <net/8254x.h>
-#include <nvme.h>
-#include <ahci.h>
-#include <ata.h>
-#include <xhci.h>
-#include <gui.h>
-#include <fs/tar.h>
-#include <fs/tmp.h>
-#include <sharedmem.h>
-#include <net/net.h>
-#include <cpu.h>
-#include <lemon.h>
-#include <objects/service.h>
-
-#include <debug.h>
+#include <Types.h>
+#include <Logging.h>
+#include <String.h>
+#include <HAL.h>
+#include <Video/Video.h>
+#include <Liballoc.h>
+#include <Timer.h>
+#include <Math.h>
+#include <Mouse.h>
+#include <Keyboard.h>
+#include <PCI.h>
+#include <Panic.h>
+#include <Scheduler.h>
+#include <Syscalls.h>
+#include <Net/8254x.h>
+#include <Storage/NVMe.h>
+#include <Storage/AHCI.h>
+#include <Storage/ATA.h>
+#include <USB/XHCI.h>
+#include <Fs/TAR.h>
+#include <Fs/Tmp.h>
+#include <SharedMemory.h>
+#include <Net/Net.h>
+#include <CPU.h>
+#include <Lemon.h>
+#include <Objects/Service.h>
+
+#include <Debug.h>
 
 uint8_t* progressBuffer = nullptr;
 video_mode_t videoMode;
diff --git a/Kernel/src/liballoc/_liballoc.cpp b/Kernel/src/liballoc/_liballoc.cpp
index 687ef972..09467f6b 100755
--- a/Kernel/src/liballoc/_liballoc.cpp
+++ b/Kernel/src/liballoc/_liballoc.cpp
@@ -1,13 +1,13 @@
 
-#include <paging.h>
-#include <physicalallocator.h>
-#include <serial.h>
-#include <string.h>
+#include <Paging.h>
+#include <PhysicalAllocator.h>
+#include <Serial.h>
+#include <String.h>
 #include <stddef.h>
-#include <lock.h>
-#include <logging.h>
-#include <scheduler.h>
-#include <cpu.h>
+#include <Lock.h>
+#include <Logging.h>
+#include <Scheduler.h>
+#include <CPU.h>
 	
 volatile int liballocLock = 0;
 
diff --git a/Kernel/src/liballoc/liballoc.c b/Kernel/src/liballoc/liballoc.c
index 11a96231..ac3a9bdd 100755
--- a/Kernel/src/liballoc/liballoc.c
+++ b/Kernel/src/liballoc/liballoc.c
@@ -1,6 +1,6 @@
-#include <liballoc.h>
+#include <Liballoc.h>
 
-#include <assert.h>
+#include <Assert.h>
 
 /**  Durand's Amazing Super Duper Memory functions.  */
 
diff --git a/Kernel/src/lock.cpp b/Kernel/src/lock.cpp
index 3dad834a..adf0ece3 100755
--- a/Kernel/src/lock.cpp
+++ b/Kernel/src/lock.cpp
@@ -1,9 +1,9 @@
-#include <lock.h>
+#include <Lock.h>
 
-#include <scheduler.h>
-#include <timer.h>
-#include <cpu.h>
-#include <logging.h>
+#include <Scheduler.h>
+#include <Timer.h>
+#include <CPU.h>
+#include <Logging.h>
 
 bool Semaphore::Wait(){
     acquireLock(&lock);
diff --git a/Kernel/src/logging.cpp b/Kernel/src/logging.cpp
index eab62117..abf3ae5f 100755
--- a/Kernel/src/logging.cpp
+++ b/Kernel/src/logging.cpp
@@ -1,14 +1,14 @@
-#include <logging.h>
+#include <Logging.h>
 
-#include <serial.h>
-#include <string.h>
-#include <videoconsole.h>
-#include <liballoc.h>
+#include <Serial.h>
+#include <String.h>
+#include <Video/VideoConsole.h>
+#include <Liballoc.h>
 #include <stdarg.h>
-#include <string.h>
-#include <fs/filesystem.h>
-#include <pty.h>
-#include <device.h>
+#include <String.h>
+#include <Fs/Filesystem.h>
+#include <PTY.h>
+#include <Device.h>
 
 namespace Log{
 
diff --git a/Kernel/src/net/8254x.cpp b/Kernel/src/net/8254x.cpp
index c9663ed7..975e5844 100755
--- a/Kernel/src/net/8254x.cpp
+++ b/Kernel/src/net/8254x.cpp
@@ -1,16 +1,16 @@
-#include <net/8254x.h>
-
-#include <pci.h>
-#include <logging.h>
-#include <paging.h>
-#include <physicalallocator.h>
-#include <system.h>
-#include <idt.h>
-#include <timer.h>
-#include <acpi.h>
-#include <apic.h>
-#include <net/net.h>
-#include <vector.h>
+#include <Net/8254x.h>
+
+#include <PCI.h>
+#include <Logging.h>
+#include <Paging.h>
+#include <PhysicalAllocator.h>
+#include <System.h>
+#include <IDT.h>
+#include <Timer.h>
+#include <ACPI.h>
+#include <APIC.h>
+#include <Net/Net.h>
+#include <Vector.h>
 
 namespace Network{
     uint16_t supportedDevices[]{
diff --git a/Kernel/src/net/interface.cpp b/Kernel/src/net/interface.cpp
index f0b57964..abc490ad 100644
--- a/Kernel/src/net/interface.cpp
+++ b/Kernel/src/net/interface.cpp
@@ -1,14 +1,14 @@
-#include <net/net.h>
-#include <net/networkadapter.h>
+#include <Net/Net.h>
+#include <Net/Adapter.h>
 
-#include <scheduler.h>
-#include <logging.h>
-#include <math.h>
-#include <timer.h>
-#include <errno.h>
+#include <Scheduler.h>
+#include <Logging.h>
+#include <Math.h>
+#include <Timer.h>
+#include <Errno.h>
 
-#include <objects/service.h>
-#include <objects/interface.h>
+#include <Objects/Service.h>
+#include <Objects/Interface.h>
 
 #define NET_INTERFACE_STACKSIZE 32768
 
diff --git a/Kernel/src/net/ipsocket.cpp b/Kernel/src/net/ipsocket.cpp
index 993dc78f..a8e8e0bb 100644
--- a/Kernel/src/net/ipsocket.cpp
+++ b/Kernel/src/net/ipsocket.cpp
@@ -1,9 +1,9 @@
-#include <net/net.h>
-#include <net/socket.h>
-#include <net/networkadapter.h>
+#include <Net/Net.h>
+#include <Net/Socket.h>
+#include <Net/Adapter.h>
 
-#include <errno.h>
-#include <logging.h>
+#include <Errno.h>
+#include <Logging.h>
 
 IPSocket::IPSocket(int type, int protocol) : Socket(type, protocol) {
 	domain = InternetProtocol;
diff --git a/Kernel/src/net/net.cpp b/Kernel/src/net/net.cpp
index eadd1fe4..88cd4663 100755
--- a/Kernel/src/net/net.cpp
+++ b/Kernel/src/net/net.cpp
@@ -1,13 +1,13 @@
-#include <net/net.h>
+#include <Net/Net.h>
 
-#include <net/networkadapter.h>
-#include <net/8254x.h>
-#include <net/socket.h>
+#include <Net/Adapter.h>
+#include <Net/8254x.h>
+#include <Net/Socket.h>
 
-#include <endian.h>
-#include <logging.h>
-#include <errno.h>
-#include <hash.h>
+#include <Endian.h>
+#include <Logging.h>
+#include <Errno.h>
+#include <Hash.h>
 
 namespace Network {
     NetFS netFS;
diff --git a/Kernel/src/net/networkadapter.cpp b/Kernel/src/net/networkadapter.cpp
index 31059e19..4a834d87 100755
--- a/Kernel/src/net/networkadapter.cpp
+++ b/Kernel/src/net/networkadapter.cpp
@@ -1,10 +1,10 @@
-#include <net/networkadapter.h>
+#include <Net/Adapter.h>
 
-#include <list.h>
-#include <logging.h>
-#include <assert.h>
-#include <errno.h>
-#include <net/socket.h>
+#include <List.h>
+#include <Logging.h>
+#include <Assert.h>
+#include <Errno.h>
+#include <Net/Socket.h>
 
 namespace Network {
     NetworkAdapter* mainAdapter;
diff --git a/Kernel/src/net/socket.cpp b/Kernel/src/net/socket.cpp
index 4b148928..9daf713c 100755
--- a/Kernel/src/net/socket.cpp
+++ b/Kernel/src/net/socket.cpp
@@ -1,9 +1,9 @@
-#include <net/socket.h>
+#include <Net/Socket.h>
 
-#include <logging.h>
-#include <assert.h>
-#include <errno.h>
-#include <scheduler.h>
+#include <Logging.h>
+#include <Assert.h>
+#include <Errno.h>
+#include <Scheduler.h>
 
 int Socket::CreateSocket(int domain, int type, int protocol, Socket** sock){
     if(type & SOCK_NONBLOCK) type &= ~SOCK_NONBLOCK;
diff --git a/Kernel/src/net/tcp.cpp b/Kernel/src/net/tcp.cpp
index 05102636..9352e1ca 100644
--- a/Kernel/src/net/tcp.cpp
+++ b/Kernel/src/net/tcp.cpp
@@ -1,11 +1,11 @@
-#include <net/net.h>
-#include <net/socket.h>
-#include <net/networkadapter.h>
+#include <Net/Net.h>
+#include <Net/Socket.h>
+#include <Net/Adapter.h>
 
-#include <timer.h>
-#include <math.h>
+#include <Timer.h>
+#include <Math.h>
 
-#include <errno.h>
+#include <Errno.h>
 
 // Create an identifier for a connection with the source IP, dest IP, source port and destination port.
 // This allows for one connection per port per remote address per local adddress
diff --git a/Kernel/src/net/udp.cpp b/Kernel/src/net/udp.cpp
index 80670cab..3cfac81e 100644
--- a/Kernel/src/net/udp.cpp
+++ b/Kernel/src/net/udp.cpp
@@ -1,10 +1,10 @@
-#include <net/socket.h>
-#include <net/net.h>
+#include <Net/Socket.h>
+#include <Net/Net.h>
 
-#include <hash.h>
-#include <errno.h>
-#include <math.h>
-#include <debug.h>
+#include <Hash.h>
+#include <Errno.h>
+#include <Math.h>
+#include <Debug.h>
 
 namespace Network::UDP{
     HashMap<uint16_t, UDPSocket*> sockets = HashMap<uint16_t, UDPSocket*>(256); // 256 buuckets is enough
diff --git a/Kernel/src/objects/interface.cpp b/Kernel/src/objects/interface.cpp
index a1db0c12..1c6126fb 100644
--- a/Kernel/src/objects/interface.cpp
+++ b/Kernel/src/objects/interface.cpp
@@ -1,7 +1,7 @@
-#include <objects/interface.h>
+#include <Objects/Interface.h>
 
-#include <string.h>
-#include <scheduler.h>
+#include <String.h>
+#include <Scheduler.h>
 
 MessageInterface::MessageInterface(const char* _name, uint16_t msgSize){
     name = strdup(_name);
diff --git a/Kernel/src/objects/kobject.cpp b/Kernel/src/objects/kobject.cpp
index b2e7be11..789abf84 100644
--- a/Kernel/src/objects/kobject.cpp
+++ b/Kernel/src/objects/kobject.cpp
@@ -1,4 +1,4 @@
-#include <objects/kobject.h> 
+#include <Objects/KObject.h> 
 
 int64_t KernelObject::nextOID = 2; 
 
diff --git a/Kernel/src/objects/message.cpp b/Kernel/src/objects/message.cpp
index 8f93f141..7f5612df 100644
--- a/Kernel/src/objects/message.cpp
+++ b/Kernel/src/objects/message.cpp
@@ -1,7 +1,7 @@
-#include <objects/message.h>
+#include <Objects/Message.h>
 
-#include <errno.h>
-#include <logging.h>
+#include <Errno.h>
+#include <Logging.h>
 
 MessageEndpoint::MessageEndpoint(uint16_t maxSize){
     maxMessageSize = maxSize;
diff --git a/Kernel/src/objects/service.cpp b/Kernel/src/objects/service.cpp
index 2eb2c973..a2c5fa46 100644
--- a/Kernel/src/objects/service.cpp
+++ b/Kernel/src/objects/service.cpp
@@ -1,6 +1,6 @@
-#include <objects/service.h>
+#include <Objects/Service.h>
 
-#include <errno.h>
+#include <Errno.h>
 
 ServiceFS* ServiceFS::instance = nullptr;
 
diff --git a/Kernel/src/panic.cpp b/Kernel/src/panic.cpp
index 7fd1f174..18c40d07 100755
--- a/Kernel/src/panic.cpp
+++ b/Kernel/src/panic.cpp
@@ -1,9 +1,9 @@
-#include <video.h>
+#include <Video/Video.h>
 
-#include <apic.h>
-#include <idt.h>
-#include <string.h>
-#include <logging.h>
+#include <APIC.h>
+#include <IDT.h>
+#include <String.h>
+#include <Logging.h>
 
 void KernelPanic(const char** reasons, int reasonCount){
 	asm("cli");
diff --git a/Kernel/src/runtime.cpp b/Kernel/src/runtime.cpp
index 3ba5b3d6..c12c2f0d 100755
--- a/Kernel/src/runtime.cpp
+++ b/Kernel/src/runtime.cpp
@@ -1,6 +1,6 @@
-#include <memory.h>
+#include <Memory.h>
 #include <stddef.h>
-#include <panic.h>
+#include <Panic.h>
 
 void *operator new(size_t size)
 {
diff --git a/Kernel/src/sharedmem.cpp b/Kernel/src/sharedmem.cpp
index cabc7f3e..d0bcf81b 100755
--- a/Kernel/src/sharedmem.cpp
+++ b/Kernel/src/sharedmem.cpp
@@ -1,9 +1,9 @@
-#include <memory.h>
+#include <Memory.h>
 
-#include <lock.h>
-#include <sharedmem.h>
-#include <scheduler.h>
-#include <logging.h>
+#include <Lock.h>
+#include <SharedMemory.h>
+#include <Scheduler.h>
+#include <Logging.h>
 
 #define DEFAULT_TABLE_SIZE 65535
 
diff --git a/Kernel/src/storage/ahci.cpp b/Kernel/src/storage/ahci.cpp
index 8ae92eb8..34581a8e 100755
--- a/Kernel/src/storage/ahci.cpp
+++ b/Kernel/src/storage/ahci.cpp
@@ -1,13 +1,13 @@
-#include <ahci.h>
+#include <Storage/AHCI.h>
 
-#include <pci.h>
-#include <paging.h>
-#include <logging.h>
-#include <memory.h>
-#include <timer.h>
-#include <idt.h>
+#include <PCI.h>
+#include <Paging.h>
+#include <Logging.h>
+#include <Memory.h>
+#include <Timer.h>
+#include <IDT.h>
 
-#include <debug.h>
+#include <Debug.h>
 
 namespace AHCI{
 	uintptr_t ahciBaseAddress;
diff --git a/Kernel/src/storage/ahciport.cpp b/Kernel/src/storage/ahciport.cpp
index e66d5ea9..09f27703 100755
--- a/Kernel/src/storage/ahciport.cpp
+++ b/Kernel/src/storage/ahciport.cpp
@@ -1,14 +1,14 @@
-#include <ahci.h>
+#include <Storage/AHCI.h>
 
-#include <physicalallocator.h>
-#include <paging.h>
-#include <logging.h>
-#include <gpt.h>
-#include <ata.h>
-#include <timer.h>
-#include <errno.h>
+#include <PhysicalAllocator.h>
+#include <Paging.h>
+#include <Logging.h>
+#include <Storage/GPT.h>
+#include <Storage/ATA.h>
+#include <Timer.h>
+#include <Errno.h>
 
-#include <debug.h>
+#include <Debug.h>
 
 #define HBA_PxIS_TFES   (1 << 30)
 
diff --git a/Kernel/src/storage/ata.cpp b/Kernel/src/storage/ata.cpp
index 6771420a..6b9f616d 100755
--- a/Kernel/src/storage/ata.cpp
+++ b/Kernel/src/storage/ata.cpp
@@ -1,17 +1,17 @@
-#include <ata.h>
-#include <atadrive.h>
+#include <Storage/ATA.h>
+#include <Storage/ATADrive.h>
 
 #include <stdint.h>
-#include <pci.h>
-#include <logging.h>
-#include <physicalallocator.h>
-#include <memory.h>
-#include <idt.h>
-#include <device.h>
-#include <apic.h>
-#include <timer.h>
-
-#include <debug.h>
+#include <PCI.h>
+#include <Logging.h>
+#include <PhysicalAllocator.h>
+#include <Memory.h>
+#include <IDT.h>
+#include <Device.h>
+#include <APIC.h>
+#include <Timer.h>
+
+#include <Debug.h>
 
 namespace ATA{
 
diff --git a/Kernel/src/storage/atadrive.cpp b/Kernel/src/storage/atadrive.cpp
index fa5ac280..ede68460 100755
--- a/Kernel/src/storage/atadrive.cpp
+++ b/Kernel/src/storage/atadrive.cpp
@@ -1,11 +1,11 @@
-#include <atadrive.h>
-
-#include <physicalallocator.h>
-#include <paging.h>
-#include <logging.h>
-#include <memory.h>
-#include <gpt.h>
-#include <errno.h>
+#include <Storage/ATADrive.h>
+
+#include <PhysicalAllocator.h>
+#include <Paging.h>
+#include <Logging.h>
+#include <Memory.h>
+#include <Storage/GPT.h>
+#include <Errno.h>
 
 namespace ATA{
     ATADiskDevice::ATADiskDevice(int port, int drive) {
diff --git a/Kernel/src/storage/diskdevice.cpp b/Kernel/src/storage/diskdevice.cpp
index 232e49e0..6739ac40 100755
--- a/Kernel/src/storage/diskdevice.cpp
+++ b/Kernel/src/storage/diskdevice.cpp
@@ -1,9 +1,9 @@
-#include <device.h>
+#include <Device.h>
 
-#include <fs/fat32.h>
-#include <fs/ext2.h>
-#include <logging.h>
-#include <errno.h>
+#include <Fs/Fat32.h>
+#include <Fs/Ext2.h>
+#include <Logging.h>
+#include <Errno.h>
 
 static int nextDeviceNumber = 0;
 
diff --git a/Kernel/src/storage/nvme.cpp b/Kernel/src/storage/nvme.cpp
index a34a0c2e..12e71fda 100755
--- a/Kernel/src/storage/nvme.cpp
+++ b/Kernel/src/storage/nvme.cpp
@@ -1,10 +1,10 @@
-#include <nvme.h>
+#include <Storage/NVMe.h>
 
-#include <pci.h>
-#include <logging.h>
-#include <debug.h>
-#include <scheduler.h>
-#include <math.h>
+#include <PCI.h>
+#include <Logging.h>
+#include <Debug.h>
+#include <Scheduler.h>
+#include <Math.h>
 
 namespace NVMe{
     char* deviceName = "Generic NVMe Controller";
diff --git a/Kernel/src/storage/nvmenamespace.cpp b/Kernel/src/storage/nvmenamespace.cpp
index 2abcf961..2ae38560 100644
--- a/Kernel/src/storage/nvmenamespace.cpp
+++ b/Kernel/src/storage/nvmenamespace.cpp
@@ -1,8 +1,8 @@
-#include <nvme.h>
+#include <Storage/NVMe.h>
 
-#include <gpt.h>
-#include <debug.h>
-#include <errno.h>
+#include <Storage/GPT.h>
+#include <Debug.h>
+#include <Errno.h>
 
 namespace NVMe{
 	Namespace::Namespace(Controller* controller, uint32_t nsID, const NamespaceIdentity& id){
diff --git a/Kernel/src/storage/partitiondevice.cpp b/Kernel/src/storage/partitiondevice.cpp
index 60614c4e..65a48c3c 100755
--- a/Kernel/src/storage/partitiondevice.cpp
+++ b/Kernel/src/storage/partitiondevice.cpp
@@ -1,6 +1,6 @@
-#include <device.h>
+#include <Device.h>
 
-#include <string.h>
+#include <String.h>
 
 PartitionDevice::PartitionDevice(uint64_t startLBA, uint64_t endLBA, DiskDevice* disk) : Device(DeviceTypeStoragePartition){
     this->startLBA = startLBA;
diff --git a/Kernel/src/streams.cpp b/Kernel/src/streams.cpp
index 9833acc1..b2186675 100755
--- a/Kernel/src/streams.cpp
+++ b/Kernel/src/streams.cpp
@@ -1,8 +1,8 @@
-#include <stream.h>
+#include <Stream.h>
 
-#include <assert.h>
-#include <logging.h>
-#include <timer.h>
+#include <Assert.h>
+#include <Logging.h>
+#include <Timer.h>
 
 int64_t Stream::Read(void* buffer, size_t len){
     assert(!"Stream::Read called from base class");
diff --git a/Kernel/src/string.cpp b/Kernel/src/string.cpp
index ee75961a..dbfa7a35 100755
--- a/Kernel/src/string.cpp
+++ b/Kernel/src/string.cpp
@@ -1,8 +1,8 @@
-#include <string.h>
+#include <String.h>
 
 #include <stdint.h>
-#include <liballoc.h>
-#include <paging.h>
+#include <Liballoc.h>
+#include <Paging.h>
 
 void reverse(char *str, int length)
 {
diff --git a/Kernel/src/tty/pty.cpp b/Kernel/src/tty/pty.cpp
index 50704f9a..f3e73143 100755
--- a/Kernel/src/tty/pty.cpp
+++ b/Kernel/src/tty/pty.cpp
@@ -1,13 +1,13 @@
-#include <fs/filesystem.h>
-#include <string.h>
-#include <pty.h>
-#include <list.h>
-#include <types.h>
-#include <logging.h>
-#include <scheduler.h>
-#include <assert.h>
-#include <cpu.h>
-#include <errno.h>
+#include <Fs/Filesystem.h>
+#include <String.h>
+#include <PTY.h>
+#include <List.h>
+#include <Types.h>
+#include <Logging.h>
+#include <Scheduler.h>
+#include <Assert.h>
+#include <CPU.h>
+#include <Errno.h>
 
 cc_t c_cc_default[NCCS]{
 	4,			// VEOF
diff --git a/Kernel/src/usb/xhci.cpp b/Kernel/src/usb/xhci.cpp
index 9a64a321..61e99232 100755
--- a/Kernel/src/usb/xhci.cpp
+++ b/Kernel/src/usb/xhci.cpp
@@ -1,14 +1,14 @@
-#include <xhci.h>
+#include <USB/XHCI.h>
 
-#include <pci.h>
-#include <logging.h>
-#include <paging.h>
-#include <idt.h>
-#include <memory.h>
-#include <assert.h>
-#include <timer.h>
+#include <PCI.h>
+#include <Logging.h>
+#include <Paging.h>
+#include <IDT.h>
+#include <Memory.h>
+#include <Assert.h>
+#include <Timer.h>
 
-#include <debug.h>
+#include <Debug.h>
 
 namespace USB{
     Vector<XHCIController*> xhciControllers;
diff --git a/Kernel/src/video.cpp b/Kernel/src/video.cpp
index 75a3d406..b05989b5 100755
--- a/Kernel/src/video.cpp
+++ b/Kernel/src/video.cpp
@@ -1,6 +1,6 @@
-#include <video.h>
+#include <Video/Video.h>
 
-#include <math.h>
+#include <Math.h>
 
 uint8_t defaultFont[128][8] = {
 	{ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },   // U+0000 (nul)
diff --git a/Kernel/src/videoconsole.cpp b/Kernel/src/videoconsole.cpp
index 96711104..0bc21119 100755
--- a/Kernel/src/videoconsole.cpp
+++ b/Kernel/src/videoconsole.cpp
@@ -1,10 +1,10 @@
 
-#include <videoconsole.h>
+#include <Video/VideoConsole.h>
 
-#include <liballoc.h>
-#include <math.h>
-#include <string.h>
-#include <video.h>
+#include <Liballoc.h>
+#include <Math.h>
+#include <String.h>
+#include <Video/Video.h>
 
 VideoConsole::VideoConsole(int x, int y, int width, int height){
     this->x = x;
diff --git a/LibLemon/include/lemon/core/cfgparser.h b/LibLemon/include/Lemon/Core/CFGParser.h
similarity index 100%
rename from LibLemon/include/lemon/core/cfgparser.h
rename to LibLemon/include/Lemon/Core/CFGParser.h
diff --git a/LibLemon/include/lemon/core/event.h b/LibLemon/include/Lemon/Core/Event.h
similarity index 95%
rename from LibLemon/include/lemon/core/event.h
rename to LibLemon/include/Lemon/Core/Event.h
index 5be4973b..4decc622 100755
--- a/LibLemon/include/lemon/core/event.h
+++ b/LibLemon/include/Lemon/Core/Event.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <lemon/gfx/graphics.h>
+#include <Lemon/Graphics/Graphics.h>
 
 namespace Lemon {
     enum Event{
diff --git a/LibLemon/include/lemon/core/fb.h b/LibLemon/include/Lemon/Core/Framebuffer.h
similarity index 65%
rename from LibLemon/include/lemon/core/fb.h
rename to LibLemon/include/Lemon/Core/Framebuffer.h
index 3ba91548..9ae01019 100755
--- a/LibLemon/include/lemon/core/fb.h
+++ b/LibLemon/include/Lemon/Core/Framebuffer.h
@@ -1,10 +1,10 @@
 #ifndef FB_H
 #define FB_H
 
-#include <lemon/gfx/surface.h>
+#include <Lemon/Graphics/Surface.h>
 
 #ifdef __lemon__
-    #include <lemon/system/fb.h>
+    #include <Lemon/System/Framebuffer.h>
 #endif 
 
 surface_t* CreateFramebufferSurface();
diff --git a/LibLemon/include/lemon/core/input.h b/LibLemon/include/Lemon/Core/Input.h
similarity index 100%
rename from LibLemon/include/lemon/core/input.h
rename to LibLemon/include/Lemon/Core/Input.h
diff --git a/LibLemon/include/lemon/core/json.h b/LibLemon/include/Lemon/Core/JSON.h
similarity index 99%
rename from LibLemon/include/lemon/core/json.h
rename to LibLemon/include/Lemon/Core/JSON.h
index 096b9f53..73e8d4cb 100644
--- a/LibLemon/include/lemon/core/json.h
+++ b/LibLemon/include/Lemon/Core/JSON.h
@@ -6,7 +6,7 @@
 #include <map>
 #include <cassert>
 
-#include <lemon/core/lexer.h>
+#include <Lemon/Core/Lexer.h>
 
 namespace Lemon{
     using JSONKey = std::string;
diff --git a/LibLemon/include/lemon/core/keyboard.h b/LibLemon/include/Lemon/Core/Keyboard.h
similarity index 100%
rename from LibLemon/include/lemon/core/keyboard.h
rename to LibLemon/include/Lemon/Core/Keyboard.h
diff --git a/LibLemon/include/lemon/core/lexer.h b/LibLemon/include/Lemon/Core/Lexer.h
similarity index 100%
rename from LibLemon/include/lemon/core/lexer.h
rename to LibLemon/include/Lemon/Core/Lexer.h
diff --git a/LibLemon/include/lemon/core/rotate.h b/LibLemon/include/Lemon/Core/Rotate.h
similarity index 100%
rename from LibLemon/include/lemon/core/rotate.h
rename to LibLemon/include/Lemon/Core/Rotate.h
diff --git a/LibLemon/include/lemon/core/sha.h b/LibLemon/include/Lemon/Core/SHA.h
similarity index 100%
rename from LibLemon/include/lemon/core/sha.h
rename to LibLemon/include/Lemon/Core/SHA.h
diff --git a/LibLemon/include/lemon/core/sharedmem.h b/LibLemon/include/Lemon/Core/SharedMemory.h
similarity index 100%
rename from LibLemon/include/lemon/core/sharedmem.h
rename to LibLemon/include/Lemon/Core/SharedMemory.h
diff --git a/LibLemon/include/lemon/core/shell.h b/LibLemon/include/Lemon/Core/Shell.h
similarity index 96%
rename from LibLemon/include/lemon/core/shell.h
rename to LibLemon/include/Lemon/Core/Shell.h
index 853d2496..61bffe4f 100755
--- a/LibLemon/include/lemon/core/shell.h
+++ b/LibLemon/include/Lemon/Core/Shell.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <lemon/ipc/endpoint.h>
+#include <Lemon/IPC/Endpoint.h>
 
 namespace Lemon::Shell {
     static const char* shellSocketAddress = "lemonshell";
diff --git a/LibLemon/include/lemon/core/url.h b/LibLemon/include/Lemon/Core/URL.h
similarity index 100%
rename from LibLemon/include/lemon/core/url.h
rename to LibLemon/include/Lemon/Core/URL.h
diff --git a/LibLemon/include/Lemon/Filesystem/ExecutableTarget.h b/LibLemon/include/Lemon/Filesystem/ExecutableTarget.h
new file mode 100644
index 00000000..a6ace373
--- /dev/null
+++ b/LibLemon/include/Lemon/Filesystem/ExecutableTarget.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <vector>
+#include <string_view>
+
+namespace Lemon{
+	namespace Filesystem{
+		class ExecutableTarget{
+		public:
+			ExecutableTarget(const char* path);
+			ExecutableTarget(const std::string& path);
+
+			const std::string_view& Executable();
+			const std::vector<std::string_view>& Arguments();
+
+		private:
+			std::string_view executable;
+			std::vector<std::string_view> arguments;
+		};
+	}
+}
\ No newline at end of file
diff --git a/LibLemon/include/lemon/gui/colours.h b/LibLemon/include/Lemon/GUI/Colours.h
similarity index 90%
rename from LibLemon/include/lemon/gui/colours.h
rename to LibLemon/include/Lemon/GUI/Colours.h
index 2191ae77..096bf936 100755
--- a/LibLemon/include/lemon/gui/colours.h
+++ b/LibLemon/include/Lemon/GUI/Colours.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <lemon/gfx/graphics.h>
+#include <Lemon/Graphics/Graphics.h>
 
 namespace Lemon{
     enum Colour{
diff --git a/LibLemon/include/lemon/gui/ctxentry.h b/LibLemon/include/Lemon/GUI/CtxEntry.h
similarity index 100%
rename from LibLemon/include/lemon/gui/ctxentry.h
rename to LibLemon/include/Lemon/GUI/CtxEntry.h
diff --git a/LibLemon/include/lemon/gui/filedialog.h b/LibLemon/include/Lemon/GUI/FileDialog.h
similarity index 100%
rename from LibLemon/include/lemon/gui/filedialog.h
rename to LibLemon/include/Lemon/GUI/FileDialog.h
diff --git a/LibLemon/include/lemon/gui/messagebox.h b/LibLemon/include/Lemon/GUI/Messagebox.h
similarity index 100%
rename from LibLemon/include/lemon/gui/messagebox.h
rename to LibLemon/include/Lemon/GUI/Messagebox.h
diff --git a/LibLemon/include/lemon/gui/model.h b/LibLemon/include/Lemon/GUI/Model.h
similarity index 98%
rename from LibLemon/include/lemon/gui/model.h
rename to LibLemon/include/Lemon/GUI/Model.h
index ecf19feb..a25bc6b4 100644
--- a/LibLemon/include/lemon/gui/model.h
+++ b/LibLemon/include/Lemon/GUI/Model.h
@@ -3,7 +3,7 @@
 #include <string>
 #include <cassert>
 
-#include <lemon/gui/variant.h>
+#include <Lemon/GUI/Variant.h>
 
 namespace Lemon::GUI{
 	class DataModel{
diff --git a/LibLemon/include/lemon/gui/variant.h b/LibLemon/include/Lemon/GUI/Variant.h
similarity index 100%
rename from LibLemon/include/lemon/gui/variant.h
rename to LibLemon/include/Lemon/GUI/Variant.h
diff --git a/LibLemon/include/lemon/gui/wmclient.h b/LibLemon/include/Lemon/GUI/WMClient.h
similarity index 95%
rename from LibLemon/include/lemon/gui/wmclient.h
rename to LibLemon/include/Lemon/GUI/WMClient.h
index baea7816..601ffb15 100644
--- a/LibLemon/include/lemon/gui/wmclient.h
+++ b/LibLemon/include/Lemon/GUI/WMClient.h
@@ -1,5 +1,5 @@
-#include <lemon/ipc/message.h>
-#include <lemon/ipc/endpoint.h>
+#include <Lemon/IPC/Message.h>
+#include <Lemon/IPC/Endpoint.h>
 
 #include <string>
 
diff --git a/LibLemon/include/lemon/gui/widgets.h b/LibLemon/include/Lemon/GUI/Widgets.h
similarity index 98%
rename from LibLemon/include/lemon/gui/widgets.h
rename to LibLemon/include/Lemon/GUI/Widgets.h
index dfe93e60..b6be7c24 100755
--- a/LibLemon/include/lemon/gui/widgets.h
+++ b/LibLemon/include/Lemon/GUI/Widgets.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <lemon/gfx/surface.h>
-#include <lemon/gfx/graphics.h>
-#include <lemon/gui/ctxentry.h>
-#include <lemon/gui/colours.h>
+#include <Lemon/Graphics/Surface.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/GUI/CtxEntry.h>
+#include <Lemon/GUI/Colours.h>
 
 #include <vector>
 #include <string>
diff --git a/LibLemon/include/lemon/gui/window.h b/LibLemon/include/Lemon/GUI/Window.h
similarity index 98%
rename from LibLemon/include/lemon/gui/window.h
rename to LibLemon/include/Lemon/GUI/Window.h
index 95fb72d6..b06e5687 100755
--- a/LibLemon/include/lemon/gui/window.h
+++ b/LibLemon/include/Lemon/GUI/Window.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <lemon/core/event.h>
-#include <lemon/gfx/surface.h>
-#include <lemon/gfx/graphics.h>
-#include <lemon/gui/widgets.h>
-#include <lemon/gui/ctxentry.h>
-#include <lemon/gui/wmclient.h>
+#include <Lemon/Core/Event.h>
+#include <Lemon/Graphics/Surface.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/GUI/Widgets.h>
+#include <Lemon/GUI/CtxEntry.h>
+#include <Lemon/GUI/WMClient.h>
 #include <utility>
 
 #define WINDOW_FLAGS_NODECORATION 0x1
diff --git a/LibLemon/include/lemon/gfx/font.h b/LibLemon/include/Lemon/Graphics/Font.h
similarity index 100%
rename from LibLemon/include/lemon/gfx/font.h
rename to LibLemon/include/Lemon/Graphics/Font.h
diff --git a/LibLemon/include/lemon/gfx/graphics.h b/LibLemon/include/Lemon/Graphics/Graphics.h
similarity index 98%
rename from LibLemon/include/lemon/gfx/graphics.h
rename to LibLemon/include/Lemon/Graphics/Graphics.h
index 022cfa72..715cb77c 100755
--- a/LibLemon/include/lemon/gfx/graphics.h
+++ b/LibLemon/include/Lemon/Graphics/Graphics.h
@@ -1,12 +1,14 @@
 #pragma once
 
+#include <Lemon/Graphics/Surface.h>
+#include <Lemon/Graphics/Types.h>
+#include <Lemon/Graphics/Font.h>
+#include <Lemon/Graphics/Text.h>
+
 #include <stdint.h>
-#include <lemon/gfx/surface.h>
-#include <lemon/gfx/types.h>
 #include <png.h>
 #include <string.h>
-#include <lemon/gfx/font.h>
-#include <lemon/gfx/text.h>
+
 #include <list>
 
 typedef struct {
diff --git a/LibLemon/include/lemon/gfx/surface.h b/LibLemon/include/Lemon/Graphics/Surface.h
similarity index 100%
rename from LibLemon/include/lemon/gfx/surface.h
rename to LibLemon/include/Lemon/Graphics/Surface.h
diff --git a/LibLemon/include/lemon/gfx/text.h b/LibLemon/include/Lemon/Graphics/Text.h
similarity index 97%
rename from LibLemon/include/lemon/gfx/text.h
rename to LibLemon/include/Lemon/Graphics/Text.h
index 334eb409..925738bb 100644
--- a/LibLemon/include/lemon/gfx/text.h
+++ b/LibLemon/include/Lemon/Graphics/Text.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <lemon/gfx/font.h>
-#include <lemon/gfx/types.h>
-#include <lemon/gfx/surface.h>
+#include <Lemon/Graphics/Font.h>
+#include <Lemon/Graphics/Types.h>
+#include <Lemon/Graphics/Surface.h>
 
 #include <string>
 
diff --git a/LibLemon/include/lemon/gfx/types.h b/LibLemon/include/Lemon/Graphics/Types.h
similarity index 100%
rename from LibLemon/include/lemon/gfx/types.h
rename to LibLemon/include/Lemon/Graphics/Types.h
diff --git a/LibLemon/include/lemon/ipc/endpoint.h b/LibLemon/include/Lemon/IPC/Endpoint.h
similarity index 97%
rename from LibLemon/include/lemon/ipc/endpoint.h
rename to LibLemon/include/Lemon/IPC/Endpoint.h
index 796b76e3..de002b18 100644
--- a/LibLemon/include/lemon/ipc/endpoint.h
+++ b/LibLemon/include/Lemon/IPC/Endpoint.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <lemon/types.h>
-#include <lemon/system/ipc.h>
-#include <lemon/system/kobject.h>
-#include <lemon/system/waitable.h>
+#include <Lemon/Types.h>
+#include <Lemon/System/IPC.h>
+#include <Lemon/System/KernelObject.h>
+#include <Lemon/System/Waitable.h>
 
-#include <lemon/ipc/message.h>
+#include <Lemon/IPC/Message.h>
 
 #include <stdint.h>
 
diff --git a/LibLemon/include/lemon/ipc/interface.h b/LibLemon/include/Lemon/IPC/Interface.h
similarity index 95%
rename from LibLemon/include/lemon/ipc/interface.h
rename to LibLemon/include/Lemon/IPC/Interface.h
index fef8773f..d537ab9e 100755
--- a/LibLemon/include/lemon/ipc/interface.h
+++ b/LibLemon/include/Lemon/IPC/Interface.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <lemon/ipc/message.h>
+#include <Lemon/IPC/Message.h>
 #include <string.h>
 
 #include <list>
 #include <vector>
 #include <map>
 
-#include <lemon/types.h>
-#include <lemon/system/ipc.h>
-#include <lemon/system/waitable.h>
+#include <Lemon/Types.h>
+#include <Lemon/System/IPC.h>
+#include <Lemon/System/Waitable.h>
 
 #include <exception>
 
diff --git a/LibLemon/include/lemon/ipc/message.h b/LibLemon/include/Lemon/IPC/Message.h
similarity index 100%
rename from LibLemon/include/lemon/ipc/message.h
rename to LibLemon/include/Lemon/IPC/Message.h
diff --git a/LibLemon/include/lemon/system/abi/fb.h b/LibLemon/include/Lemon/System/ABI/Framebuffer.h
similarity index 100%
rename from LibLemon/include/lemon/system/abi/fb.h
rename to LibLemon/include/Lemon/System/ABI/Framebuffer.h
diff --git a/LibLemon/include/lemon/system/abi/process.h b/LibLemon/include/Lemon/System/ABI/Process.h
similarity index 100%
rename from LibLemon/include/lemon/system/abi/process.h
rename to LibLemon/include/Lemon/System/ABI/Process.h
diff --git a/LibLemon/include/lemon/system/abi/syscall.h b/LibLemon/include/Lemon/System/ABI/Syscall.h
similarity index 100%
rename from LibLemon/include/lemon/system/abi/syscall.h
rename to LibLemon/include/Lemon/System/ABI/Syscall.h
diff --git a/LibLemon/include/lemon/system/device.h b/LibLemon/include/Lemon/System/Device.h
similarity index 100%
rename from LibLemon/include/lemon/system/device.h
rename to LibLemon/include/Lemon/System/Device.h
diff --git a/LibLemon/include/lemon/system/filesystem.h b/LibLemon/include/Lemon/System/Filesystem.h
similarity index 100%
rename from LibLemon/include/lemon/system/filesystem.h
rename to LibLemon/include/Lemon/System/Filesystem.h
diff --git a/LibLemon/include/lemon/system/fb.h b/LibLemon/include/Lemon/System/Framebuffer.h
similarity index 77%
rename from LibLemon/include/lemon/system/fb.h
rename to LibLemon/include/Lemon/System/Framebuffer.h
index b029872a..4e5f62dc 100755
--- a/LibLemon/include/lemon/system/fb.h
+++ b/LibLemon/include/Lemon/System/Framebuffer.h
@@ -1,7 +1,7 @@
 #pragma once 
 
 #include <stdint.h>
-#include <lemon/system/abi/fb.h>
+#include <Lemon/System/ABI/Framebuffer.h>
 
 #ifndef __lemon__
     #error "Lemon OS Only"
diff --git a/LibLemon/include/lemon/system/ipc.h b/LibLemon/include/Lemon/System/IPC.h
similarity index 99%
rename from LibLemon/include/lemon/system/ipc.h
rename to LibLemon/include/Lemon/System/IPC.h
index a4b65ad6..b00bf0b4 100644
--- a/LibLemon/include/lemon/system/ipc.h
+++ b/LibLemon/include/Lemon/System/IPC.h
@@ -1,6 +1,6 @@
 #pragma once 
 
-#include <lemon/types.h>
+#include <Lemon/Types.h>
 #include <lemon/syscall.h>
 
 namespace Lemon{
diff --git a/LibLemon/include/lemon/system/info.h b/LibLemon/include/Lemon/System/Info.h
similarity index 100%
rename from LibLemon/include/lemon/system/info.h
rename to LibLemon/include/Lemon/System/Info.h
diff --git a/LibLemon/include/lemon/system/kobject.h b/LibLemon/include/Lemon/System/KernelObject.h
similarity index 98%
rename from LibLemon/include/lemon/system/kobject.h
rename to LibLemon/include/Lemon/System/KernelObject.h
index bbee320b..c5e8d09c 100644
--- a/LibLemon/include/lemon/system/kobject.h
+++ b/LibLemon/include/Lemon/System/KernelObject.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <lemon/syscall.h>
-#include <lemon/types.h>
+#include <Lemon/Types.h>
 
 #include <stddef.h>
 
diff --git a/LibLemon/include/lemon/system/spawn.h b/LibLemon/include/Lemon/System/Spawn.h
similarity index 100%
rename from LibLemon/include/lemon/system/spawn.h
rename to LibLemon/include/Lemon/System/Spawn.h
diff --git a/LibLemon/include/lemon/system/util.h b/LibLemon/include/Lemon/System/Util.h
similarity index 96%
rename from LibLemon/include/lemon/system/util.h
rename to LibLemon/include/Lemon/System/Util.h
index e706d154..4be475ac 100755
--- a/LibLemon/include/lemon/system/util.h
+++ b/LibLemon/include/Lemon/System/Util.h
@@ -4,8 +4,8 @@
     #error "Lemon OS Only"
 #endif
 
-#include <lemon/system/info.h>
-#include <lemon/system/abi/process.h>
+#include <Lemon/System/Info.h>
+#include <Lemon/System/ABI/Process.h>
 
 #include <sys/types.h>
 #include <stdint.h>
diff --git a/LibLemon/include/lemon/system/waitable.h b/LibLemon/include/Lemon/System/Waitable.h
similarity index 98%
rename from LibLemon/include/lemon/system/waitable.h
rename to LibLemon/include/Lemon/System/Waitable.h
index e382a206..bb44d25e 100644
--- a/LibLemon/include/lemon/system/waitable.h
+++ b/LibLemon/include/Lemon/System/Waitable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <lemon/types.h>
+#include <Lemon/Types.h>
 
 #include <vector>
 #include <list>
diff --git a/LibLemon/include/lemon/types.h b/LibLemon/include/Lemon/Types.h
similarity index 100%
rename from LibLemon/include/lemon/types.h
rename to LibLemon/include/Lemon/Types.h
diff --git a/LibLemon/include/lemon/core/itoa.h b/LibLemon/include/lemon/core/itoa.h
deleted file mode 100755
index bb01b1e9..00000000
--- a/LibLemon/include/lemon/core/itoa.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-char* itoa(long num, char* str, int base);
\ No newline at end of file
diff --git a/LibLemon/src/cfgparser.cpp b/LibLemon/src/cfgparser.cpp
index 13ae9a4d..28ae8f43 100644
--- a/LibLemon/src/cfgparser.cpp
+++ b/LibLemon/src/cfgparser.cpp
@@ -1,4 +1,4 @@
-#include <lemon/core/cfgparser.h>
+#include <Lemon/Core/CFGParser.h>
 
 enum ParserState {
 	ParserStateHeading,
diff --git a/LibLemon/src/gfx/font.cpp b/LibLemon/src/gfx/font.cpp
index a21994c5..c9f55673 100755
--- a/LibLemon/src/gfx/font.cpp
+++ b/LibLemon/src/gfx/font.cpp
@@ -1,4 +1,4 @@
-#include <lemon/gfx/font.h>
+#include <Lemon/Graphics/Font.h>
 
 #include <cstdint>
 #include <cstdio>
diff --git a/LibLemon/src/gfx/graphics.cpp b/LibLemon/src/gfx/graphics.cpp
index bbeffa73..c001b19a 100755
--- a/LibLemon/src/gfx/graphics.cpp
+++ b/LibLemon/src/gfx/graphics.cpp
@@ -1,4 +1,4 @@
-#include <lemon/gfx/graphics.h>
+#include <Lemon/Graphics/Graphics.h>
 
 #include <math.h>
 #include <string.h>
diff --git a/LibLemon/src/gfx/image.cpp b/LibLemon/src/gfx/image.cpp
index 856444aa..ccca5ece 100755
--- a/LibLemon/src/gfx/image.cpp
+++ b/LibLemon/src/gfx/image.cpp
@@ -1,4 +1,4 @@
-#include <lemon/gfx/graphics.h>
+#include <Lemon/Graphics/Graphics.h>
 
 #include <math.h>
 #include <stdio.h>
diff --git a/LibLemon/src/gfx/text.cpp b/LibLemon/src/gfx/text.cpp
index f418dff2..c7030397 100755
--- a/LibLemon/src/gfx/text.cpp
+++ b/LibLemon/src/gfx/text.cpp
@@ -1,6 +1,6 @@
-#include <lemon/gfx/graphics.h>
-#include <lemon/gfx/font.h>
-#include <lemon/gfx/text.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/Graphics/Font.h>
+#include <Lemon/Graphics/Text.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
diff --git a/LibLemon/src/gui/colours.cpp b/LibLemon/src/gui/colours.cpp
index 10452acf..4c46cd7a 100755
--- a/LibLemon/src/gui/colours.cpp
+++ b/LibLemon/src/gui/colours.cpp
@@ -1,4 +1,4 @@
-#include <lemon/gui/colours.h>
+#include <Lemon/GUI/Colours.h>
 
 namespace Lemon{
     /*RGBAColour colours[] = {
diff --git a/LibLemon/src/gui/filedialog.cpp b/LibLemon/src/gui/filedialog.cpp
index f5a2ff45..d685e062 100755
--- a/LibLemon/src/gui/filedialog.cpp
+++ b/LibLemon/src/gui/filedialog.cpp
@@ -1,8 +1,8 @@
-#include <lemon/gui/window.h>
+#include <Lemon/GUI/Window.h>
 
 #include <sys/stat.h>
-#include <lemon/gui/filedialog.h>
-#include <lemon/gui/messagebox.h>
+#include <Lemon/GUI/FileDialog.h>
+#include <Lemon/GUI/Messagebox.h>
 #include <unistd.h>
 #include <errno.h>
 
diff --git a/LibLemon/src/gui/fileview.cpp b/LibLemon/src/gui/fileview.cpp
index 2b798236..1dee379f 100755
--- a/LibLemon/src/gui/fileview.cpp
+++ b/LibLemon/src/gui/fileview.cpp
@@ -1,10 +1,10 @@
-#include <lemon/gui/widgets.h>
+#include <Lemon/GUI/Widgets.h>
 
-#include <lemon/core/keyboard.h>
+#include <Lemon/Core/Keyboard.h>
 #include <string>
 #include <math.h>
-#include <lemon/gui/colours.h>
-#include <lemon/gui/messagebox.h>
+#include <Lemon/GUI/Colours.h>
+#include <Lemon/GUI/Messagebox.h>
 #include <assert.h>
 
 #include <unistd.h>
@@ -15,7 +15,7 @@
 #include <dirent.h>
 
 #ifdef __lemon__
-    #include <lemon/system/filesystem.h>
+    #include <Lemon/System/Filesystem.h>
 #endif
 
 namespace Lemon::GUI {
diff --git a/LibLemon/src/gui/messagebox.cpp b/LibLemon/src/gui/messagebox.cpp
index 93a8d281..896974ac 100644
--- a/LibLemon/src/gui/messagebox.cpp
+++ b/LibLemon/src/gui/messagebox.cpp
@@ -1,8 +1,8 @@
-#include <lemon/gui/messagebox.h>
+#include <Lemon/GUI/Messagebox.h>
 
-#include <lemon/gui/window.h>
-#include <lemon/gui/widgets.h>
-#include <lemon/gfx/font.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Widgets.h>
+#include <Lemon/Graphics/Font.h>
 
 namespace Lemon::GUI
 {
diff --git a/LibLemon/src/gui/widgets.cpp b/LibLemon/src/gui/widgets.cpp
index 9e1de808..e6773444 100755
--- a/LibLemon/src/gui/widgets.cpp
+++ b/LibLemon/src/gui/widgets.cpp
@@ -1,12 +1,13 @@
-#include <lemon/gui/widgets.h>
+#include <Lemon/GUI/Widgets.h>
+#include <Lemon/GUI/Colours.h>
+#include <Lemon/GUI/Model.h>
+#include <Lemon/GUI/Window.h>
+
+#include <Lemon/Core/Keyboard.h>
 
-#include <lemon/core/keyboard.h>
 #include <ctype.h>
 #include <string>
 #include <math.h>
-#include <lemon/gui/colours.h>
-#include <lemon/gui/model.h>
-#include <lemon/gui/window.h>
 #include <assert.h>
 #include <algorithm>
 
diff --git a/LibLemon/src/gui/window.cpp b/LibLemon/src/gui/window.cpp
index f2204897..aaebcba8 100755
--- a/LibLemon/src/gui/window.cpp
+++ b/LibLemon/src/gui/window.cpp
@@ -1,6 +1,6 @@
-#include <lemon/gui/window.h>
-#include <lemon/core/sharedmem.h>
-#include <lemon/core/json.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/Core/SharedMemory.h>
+#include <Lemon/Core/JSON.h>
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/LibLemon/src/ipc/interface.cpp b/LibLemon/src/ipc/interface.cpp
index 49f7574e..5d1084f6 100644
--- a/LibLemon/src/ipc/interface.cpp
+++ b/LibLemon/src/ipc/interface.cpp
@@ -1,7 +1,7 @@
-#include <lemon/ipc/interface.h>
-#include <lemon/ipc/endpoint.h>
+#include <Lemon/IPC/Interface.h>
+#include <Lemon/IPC/Endpoint.h>
 
-#include <lemon/system/ipc.h>
+#include <Lemon/System/IPC.h>
 #include <errno.h>
 
 namespace Lemon{
diff --git a/LibLemon/src/ipc/message.cpp b/LibLemon/src/ipc/message.cpp
index 114eb2e2..dd840f27 100644
--- a/LibLemon/src/ipc/message.cpp
+++ b/LibLemon/src/ipc/message.cpp
@@ -1,4 +1,4 @@
-#include <lemon/ipc/message.h>
+#include <Lemon/IPC/Message.h>
 
 #include <string.h>
 
diff --git a/LibLemon/src/json.cpp b/LibLemon/src/json.cpp
index ec8c66b0..1c8798d8 100644
--- a/LibLemon/src/json.cpp
+++ b/LibLemon/src/json.cpp
@@ -1,4 +1,4 @@
-#include <lemon/core/json.h>
+#include <Lemon/Core/JSON.h>
 
 //#define LIBLEMON_DEBUG_JSON 1
 
diff --git a/LibLemon/src/lemon/device.cpp b/LibLemon/src/lemon/device.cpp
index 66d5ac17..b95aeb8b 100644
--- a/LibLemon/src/lemon/device.cpp
+++ b/LibLemon/src/lemon/device.cpp
@@ -1,4 +1,4 @@
-#include <lemon/system/device.h>
+#include <Lemon/System/Device.h>
 
 #include <cerrno>
 
diff --git a/LibLemon/src/lemon/fb.cpp b/LibLemon/src/lemon/fb.cpp
index 5dcfc193..a8d63246 100755
--- a/LibLemon/src/lemon/fb.cpp
+++ b/LibLemon/src/lemon/fb.cpp
@@ -1,6 +1,6 @@
 #include <lemon/syscall.h>
 
-#include <lemon/core/fb.h>
+#include <Lemon/Core/Framebuffer.h>
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/LibLemon/src/lemon/filesystem.cpp b/LibLemon/src/lemon/filesystem.cpp
index e39c9279..cc6fcf48 100755
--- a/LibLemon/src/lemon/filesystem.cpp
+++ b/LibLemon/src/lemon/filesystem.cpp
@@ -1,6 +1,6 @@
 #include <lemon/syscall.h>
+#include <Lemon/System/Filesystem.h>
 #include <stddef.h>
-#include <lemon/system/filesystem.h>
 
 int lemon_open(const char* filename, int flags){
     return syscall(SYS_OPEN, (uintptr_t)filename, flags);
diff --git a/LibLemon/src/lemon/info.cpp b/LibLemon/src/lemon/info.cpp
index fef6a54b..e845e9f2 100755
--- a/LibLemon/src/lemon/info.cpp
+++ b/LibLemon/src/lemon/info.cpp
@@ -1,4 +1,4 @@
-#include <lemon/system/info.h>
+#include <Lemon/System/Info.h>
 #include <lemon/syscall.h>
 
 namespace Lemon{
diff --git a/LibLemon/src/lemon/input.cpp b/LibLemon/src/lemon/input.cpp
index aaf9abab..9d6de062 100755
--- a/LibLemon/src/lemon/input.cpp
+++ b/LibLemon/src/lemon/input.cpp
@@ -1,4 +1,4 @@
-#include <lemon/core/input.h>
+#include <Lemon/Core/Input.h>
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/LibLemon/src/lemon/itoa.cpp b/LibLemon/src/lemon/itoa.cpp
deleted file mode 100755
index 2ae27103..00000000
--- a/LibLemon/src/lemon/itoa.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <stdint.h>
-
-void reverse(char *str, int length)
-{
-   int c;
-   char *begin, *end, temp;
-
-   begin  = str;
-   end    = str;
-
-   for (c = 0; c < length - 1; c++)
-      end++;
-
-   for (c = 0; c < length/2; c++)
-   {
-      temp   = *end;
-      *end   = *begin;
-      *begin = temp;
-
-      begin++;
-      end--;
-   }
-}
-
-char* itoa(long num, char* str, int base)
-{
-	int i = 0;
-
-	if (num == 0)
-	{
-		str[i++] = '0';
-		str[i] = '\0';
-		return str;
-	}
-
-	while (num != 0)
-	{
-		int rem = num % base;
-		str[i++] = (rem > 9) ? (rem - 10) + 'a' : rem + '0';
-		num = num / base;
-	}
-
-	str[i] = '\0';
-
-	reverse(str, i);
-
-	return str;
-}
\ No newline at end of file
diff --git a/LibLemon/src/lemon/meson.build b/LibLemon/src/lemon/meson.build
index f3e7c745..8b68155a 100755
--- a/LibLemon/src/lemon/meson.build
+++ b/LibLemon/src/lemon/meson.build
@@ -3,7 +3,6 @@ cpp_files += files(
     'fb.cpp',
     'filesystem.cpp',
     'info.cpp',
-    'itoa.cpp',
     'sharedmem.cpp',
     'util.cpp',
     'input.cpp',
diff --git a/LibLemon/src/lemon/sharedmem.cpp b/LibLemon/src/lemon/sharedmem.cpp
index 6f4b602a..5db114ef 100755
--- a/LibLemon/src/lemon/sharedmem.cpp
+++ b/LibLemon/src/lemon/sharedmem.cpp
@@ -1,4 +1,4 @@
-#include <lemon/core/sharedmem.h>
+#include <Lemon/Core/SharedMemory.h>
 
 #include <lemon/syscall.h>
 #include <sys/types.h>
diff --git a/LibLemon/src/lemon/util.cpp b/LibLemon/src/lemon/util.cpp
index 23396a61..680e9ea3 100755
--- a/LibLemon/src/lemon/util.cpp
+++ b/LibLemon/src/lemon/util.cpp
@@ -1,4 +1,4 @@
-#include <lemon/system/util.h>
+#include <Lemon/System/Util.h>
 #include <lemon/syscall.h>
 
 #include <sys/types.h>
@@ -17,8 +17,14 @@ pid_t lemon_spawn(const char* path, int argc, char* const argv[], int flags){
     return ret;
 } 
 
-pid_t lemon_spawn(const char* path, int argc, char* const argv[], int flags, char** envp){
-	return syscall(SYS_EXEC, (uintptr_t)path, argc, (uintptr_t)argv, flags, envp);
+pid_t lemon_spawn(const char* path, int argc, const char* const argv[], int flags, char** envp){
+	pid_t ret = syscall(SYS_EXEC, (uintptr_t)path, argc, (uintptr_t)argv, flags, envp);
+    if(ret < 0){
+        errno = -ret;
+        return -1;
+    }
+
+    return ret;
 } 
 
 namespace Lemon{
diff --git a/LibLemon/src/lemon/waitable.cpp b/LibLemon/src/lemon/waitable.cpp
index df650c90..7da0048a 100644
--- a/LibLemon/src/lemon/waitable.cpp
+++ b/LibLemon/src/lemon/waitable.cpp
@@ -1,6 +1,6 @@
-#include <lemon/system/waitable.h>
+#include <Lemon/System/Waitable.h>
 
-#include <lemon/system/kobject.h>
+#include <Lemon/System/KernelObject.h>
 
 namespace Lemon{
     void Waitable::Wait(long timeout){
diff --git a/LibLemon/src/lexer.cpp b/LibLemon/src/lexer.cpp
index c37903ad..10d14dcc 100644
--- a/LibLemon/src/lexer.cpp
+++ b/LibLemon/src/lexer.cpp
@@ -1,4 +1,4 @@
-#include <lemon/core/lexer.h>
+#include <Lemon/Core/Lexer.h>
 
 #include <cassert>
 #include <cstring>
diff --git a/LibLemon/src/sha.cpp b/LibLemon/src/sha.cpp
index bf370ee7..c1661ef8 100644
--- a/LibLemon/src/sha.cpp
+++ b/LibLemon/src/sha.cpp
@@ -1,10 +1,12 @@
-#include <lemon/core/sha.h> 
+#include <Lemon/Core/SHA.h> 
+#include <Lemon/Core/Rotate.h>
+
 #include <string.h>
-#include <lemon/core/rotate.h>
-#include <sstream>
 #include <stdint.h>
 #include <string.h>
 
+#include <sstream>
+
 SHA256::SHA256(){
 	memcpy(hash, initialHash, SHA256_HASH_SIZE);
 }
diff --git a/LibLemon/src/shell/shell.cpp b/LibLemon/src/shell/shell.cpp
index ff64fcb0..a84cd864 100755
--- a/LibLemon/src/shell/shell.cpp
+++ b/LibLemon/src/shell/shell.cpp
@@ -1,6 +1,6 @@
-#include <lemon/core/shell.h>
+#include <Lemon/Core/Shell.h>
 
-#include <lemon/ipc/interface.h>
+#include <Lemon/IPC/Interface.h>
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/LibLemon/src/url.cpp b/LibLemon/src/url.cpp
index 1e1652f0..173f070b 100644
--- a/LibLemon/src/url.cpp
+++ b/LibLemon/src/url.cpp
@@ -1,6 +1,6 @@
-#include <lemon/core/url.h>
+#include <Lemon/Core/URL.h>
 
-#include <lemon/core/lexer.h>
+#include <Lemon/Core/Lexer.h>
 
 namespace Lemon{
 	URL::URL(const char* url){
diff --git a/System/FTerm/fterm.h b/System/FTerm/fterm.h
index 2ae5bbc0..11920e3c 100644
--- a/System/FTerm/fterm.h
+++ b/System/FTerm/fterm.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <lemon/core/keyboard.h>
-#include <lemon/gfx/graphics.h>
+#include <Lemon/Core/Keyboard.h>
+#include <Lemon/Graphics/Graphics.h>
 
 struct KeyboardState{
 	bool caps, control, shift, alt;
diff --git a/System/FTerm/input.cpp b/System/FTerm/input.cpp
index fcca5e46..19616c3d 100644
--- a/System/FTerm/input.cpp
+++ b/System/FTerm/input.cpp
@@ -1,5 +1,5 @@
-#include <lemon/core/input.h>
-#include <lemon/core/keyboard.h>
+#include <Lemon/Core/Input.h>
+#include <Lemon/Core/Keyboard.h>
 
 #include "fterm.h"
 
diff --git a/System/FTerm/main.cpp b/System/FTerm/main.cpp
index 44d6c3eb..2e0f2806 100644
--- a/System/FTerm/main.cpp
+++ b/System/FTerm/main.cpp
@@ -7,9 +7,9 @@
 #include <sys/ioctl.h>
 
 #include <lemon/syscall.h>
-#include <lemon/system/spawn.h>
-#include <lemon/core/fb.h>
-#include <lemon/gfx/graphics.h>
+#include <Lemon/System/Spawn.h>
+#include <Lemon/Core/Framebuffer.h>
+#include <Lemon/Graphics/Graphics.h>
 
 #include "fterm.h"
 
diff --git a/System/LemonWM/compositor.cpp b/System/LemonWM/compositor.cpp
index c8b58257..9e209ea5 100644
--- a/System/LemonWM/compositor.cpp
+++ b/System/LemonWM/compositor.cpp
@@ -1,6 +1,6 @@
 #include "lemonwm.h"
 
-#include <lemon/gui/colours.h>
+#include <Lemon/GUI/Colours.h>
 
 static unsigned int fCount = 0;
 static unsigned int avgFrametime = 0;
diff --git a/System/LemonWM/input.cpp b/System/LemonWM/input.cpp
index fcc4b9ae..26f282aa 100644
--- a/System/LemonWM/input.cpp
+++ b/System/LemonWM/input.cpp
@@ -1,7 +1,7 @@
 #include "lemonwm.h"
 
-#include <lemon/core/keyboard.h>
-#include <lemon/core/input.h>
+#include <Lemon/Core/Keyboard.h>
+#include <Lemon/Core/Input.h>
 
 int keymap_us[128] =
 {
diff --git a/System/LemonWM/lemonwm.h b/System/LemonWM/lemonwm.h
index f0d885cf..2b216f25 100644
--- a/System/LemonWM/lemonwm.h
+++ b/System/LemonWM/lemonwm.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <lemon/gfx/graphics.h>
-#include <lemon/gfx/surface.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/Graphics/Surface.h>
 
-#include <lemon/ipc/endpoint.h>
-#include <lemon/ipc/interface.h>
-#include <lemon/core/event.h>
-#include <lemon/gui/window.h>
+#include <Lemon/IPC/Endpoint.h>
+#include <Lemon/IPC/Interface.h>
+#include <Lemon/Core/Event.h>
+#include <Lemon/GUI/Window.h>
 
 #include <list>
 
diff --git a/System/LemonWM/main.cpp b/System/LemonWM/main.cpp
index f21fede7..0c208cdb 100644
--- a/System/LemonWM/main.cpp
+++ b/System/LemonWM/main.cpp
@@ -4,10 +4,10 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include <lemon/gui/window.h>
-#include <lemon/core/fb.h>
-#include <lemon/core/input.h>
-#include <lemon/core/json.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/Core/Framebuffer.h>
+#include <Lemon/Core/Input.h>
+#include <Lemon/Core/JSON.h>
 
 #include <pthread.h>
 #include <time.h>
diff --git a/System/LemonWM/window.cpp b/System/LemonWM/window.cpp
index 758464a9..a3ace848 100644
--- a/System/LemonWM/window.cpp
+++ b/System/LemonWM/window.cpp
@@ -1,8 +1,8 @@
 #include "lemonwm.h"
 
-#include <lemon/gfx/graphics.h>
-#include <lemon/gui/window.h>
-#include <lemon/core/sharedmem.h>
+#include <Lemon/Graphics/Graphics.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/Core/SharedMemory.h>
 #include <stdlib.h>
 
 WMWindow::WMWindow(WMInstance* wm, handle_t endp, handle_t id, int64_t key, WindowBuffer* bufferInfo, vector2i_t pos, vector2i_t size, unsigned int flags, const std::string& title) : Endpoint(endp){
diff --git a/System/LemonWM/winrect.h b/System/LemonWM/winrect.h
index 58e4aacb..6715dd59 100644
--- a/System/LemonWM/winrect.h
+++ b/System/LemonWM/winrect.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <lemon/gfx/types.h>
+#include <Lemon/Graphics/Types.h>
 
 class WMWindow;
 struct WMWindowRect {
diff --git a/System/LemonWM/wm.cpp b/System/LemonWM/wm.cpp
index 43b6772b..9feebe29 100644
--- a/System/LemonWM/wm.cpp
+++ b/System/LemonWM/wm.cpp
@@ -1,11 +1,12 @@
 #include "lemonwm.h"
 
-#include <lemon/gui/window.h>
-#include <lemon/core/shell.h>
-#include <lemon/core/keyboard.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/Core/Shell.h>
+#include <Lemon/Core/Keyboard.h>
+#include <Lemon/Core/SharedMemory.h>
+
 #include <algorithm>
 #include <pthread.h>
-#include <lemon/core/sharedmem.h>
 #include <unistd.h>
 
 WMInstance::WMInstance(surface_t& surface, handle_t svc, const char* ifName) : server(svc, ifName, LEMONWM_MSG_SIZE){
diff --git a/System/Lemond/main.cpp b/System/Lemond/main.cpp
index 23c61164..49308b29 100644
--- a/System/Lemond/main.cpp
+++ b/System/Lemond/main.cpp
@@ -1,12 +1,40 @@
-#include <lemon/system/spawn.h>
-#include <lemon/system/util.h>
-#include <lemon/core/json.h>
-#include <lemon/core/sha.h>
+#include <Lemon/System/Spawn.h>
+#include <Lemon/System/Util.h>
+#include <Lemon/Core/JSON.h>
+#include <Lemon/Core/SHA.h>
+
 #include <string.h>
 #include <vector>
 #include <unistd.h>
+#include <dirent.h>
+
 #include <string>
 
+struct Service {
+	std::string name;
+	std::string target;
+
+	enum {
+		StateStarting,
+		StateRunning,
+		StateError,
+		StateStopped,
+	} state = StateStarting;
+};
+
+std::multimap<std::string, Service> waitingServices;
+std::vector<Service> services;
+
+void StartService(const Service& srv){
+	char* const argv[] = { (char*) srv.target.c_str() };
+	lemon_spawn(srv.target.c_str(), 1, argv, 0);
+
+	auto range = waitingServices.equal_range(srv.name);
+	for(auto it = range.first; it != range.second; it++){
+		StartService(it->second);
+	}
+}
+
 int main(int argc, char** argv){
 	setenv("HOME", "/system", 1); // Default home
 	setenv("PATH", "/initrd:/system/bin", 1); // Default path
@@ -31,24 +59,81 @@ int main(int argc, char** argv){
         printf("[Lemond] Warning: Error parsing JSON configuration file!\n");
     }
 
-	__attribute__((unused)) char* lemonwm = "/system/lemon/lemonwm.lef";
-	__attribute__((unused)) char* netgov = "/system/lemon/netgov.lef";
-	__attribute__((unused)) char* login = "/system/lemon/login.lef";
-	__attribute__((unused)) char* shell = "/system/bin/shell.lef";
+	DIR* dir = opendir("/system/lemon/lemond");
+	if(!dir){
+		perror("[Lemond] Error: Failed to open '/system/lemon/lemond'");
 
-	if(long ret = lemon_spawn(lemonwm, 1, &lemonwm); ret <= 0){
-		printf("Error %ld attempting to load %s. Attempting to load again\n", ret, lemonwm);
-		lemon_spawn(lemonwm, 1, &lemonwm); // Attempt twice
+		return 1;
 	}
-		
-	if(long ret = lemon_spawn(shell, 1, &shell); ret <= 0){
-		printf("Error %ld attempting to load %s. Attempting to load again\n", ret, shell);
-		lemon_spawn(shell, 1, &shell); // Attempt twice
+
+	chdir("/system/lemon/lemond");
+
+	errno = 0;
+	while(dirent* ent = readdir(dir)){
+		if(ent->d_type != DT_REG){
+			continue;
+		}
+
+		FILE* f = fopen(ent->d_name, "r"); // Attempt to open service file
+		if(!f){
+			printf("[Lemond] Warning: Error opening '%s'\n", ent->d_name);
+			continue;
+		}
+
+		fseek(f, 0, SEEK_END);
+		if(ftell(f) > 4096){
+			printf("[Lemond] Warning: Abnormally large service file '%s', should not be >4K\n", ent->d_name);
+			fclose(f);
+			continue;
+		}
+		fseek(f, 0, SEEK_SET);
+
+		char buffer[4097];
+
+		unsigned len = fread(buffer, 1, 4096, f); // there is no reason why a target file should be more than 4K
+		buffer[len] = 0;
+
+		fclose(f);
+
+		std::string_view sv = { buffer };
+
+		Lemon::JSONParser json(sv);
+
+		auto root = json.Parse();
+		if(root.IsObject()){
+			auto& values = *root.object;
+
+			std::string name;
+			std::string target;
+			if(auto it = values.find("target"); it == values.end() || !it->second.IsString()){ // Check for valid name field
+				printf("[Lemond] Warning: Empty or invalid target for '%s'\n", ent->d_name);
+				continue;
+			} else if(auto it = values.find("name"); it == values.end() || !it->second.IsString()){ // Check for valid target field
+				printf("[Lemond] Warning: Empty or invalid name for '%s'\n", ent->d_name);
+				continue;
+			}
+
+			Service srv;
+
+			srv.name = values.at("name").AsString();
+			srv.target = values.at("target").AsString();
+			if(auto it = values.find("after"); it != values.end() && it->second.IsString()){ // The service is waiting for another
+				std::string after = it->second.AsString();
+				waitingServices.insert({ std::move(after), std::move(srv) });
+			} else {
+				services.push_back(std::move(srv));
+			}
+		}
 	}
+
+	if(errno){
+		perror("[Lemond] Error reading '/system/lemon/lemond'");
 		
-	if(long ret = lemon_spawn(netgov, 1, &netgov); ret <= 0){
-		printf("Error %ld attempting to load %s. Attempting to load again\n", ret, netgov);
-		lemon_spawn(netgov, 1, &netgov); // Attempt twice
+		return 2;
+	}
+
+	for(auto& srv : services){
+		StartService(srv);
 	}
 	
 	return 0;
diff --git a/System/Login/main.cpp b/System/Login/main.cpp
index 2d42d186..1dd9c525 100644
--- a/System/Login/main.cpp
+++ b/System/Login/main.cpp
@@ -1,8 +1,10 @@
-#include <lemon/gui/window.h>
-#include <lemon/core/json.h>
-#include <lemon/gui/messagebox.h>
-#include <lemon/core/sha.h>
-#include <lemon/system/spawn.h>
+#include <Lemon/GUI/Window.h>
+#include <Lemon/GUI/Messagebox.h>
+
+#include <Lemon/Core/JSON.h>
+#include <Lemon/Core/SHA.h>
+
+#include <Lemon/System/Spawn.h>
 
 #include <stdexcept>
 #include <unistd.h>