400 files changed, 203 insertions, 452 deletions

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index c8499694..753bd2c0 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -15,5 +15,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install Packages
       run: sudo apt update && sudo apt install mingw-w64 qemu-utils nasm
-    - name: Build NeKernel
-      run: ./setup_amd64.sh && cd dev/Kernel && export AHCI_SUPPORT=1 && make -f amd64-ci.make all
+    - name: Build NeKernel (ATA)
+      run: ./setup_amd64.sh && cd dev/kernel && export ATA_SUPPORT=1 && make -f amd64-ci.make all
+    - name: Build NeKernel (AHCI)
+      run: ./setup_amd64.sh && cd dev/kernel & export ATA_SUPPORT= && export AHCI_SUPPORT=1 && make -f amd64-ci.make all
diff --git a/CODEOWNERS b/CODEOWNERS
index ecbdba9c..44cff53e 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,4 +1,5 @@
-# Boot, LibSCI, and Kernel are owned by Amlal.

-/dev/Kernel/ @amlel-el-mahrouss

-/dev/Boot/ @amlel-el-mahrouss

-/dev/LibSCI/ @amlel-el-mahrouss

+# boot, libsci, and kernel are owned by Amlal.

+/dev/kernel/ @amlel-el-mahrouss

+/dev/boot/ @amlel-el-mahrouss

+/dev/SCIKit/ @amlel-el-mahrouss

+# some other parts (tooling, frameworks) need ownership too.
\ No newline at end of file
diff --git a/Doxyfile b/Doxyfile
index 8b9dbafd..e97060eb 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -68,7 +68,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       =
+OUTPUT_DIRECTORY       = docs/html
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
 # sub-directories (in 2 levels) under the output directory of each output format
@@ -945,7 +945,7 @@ WARN_LOGFILE           =
 
 INPUT                  = ./ \
                          ./NewKernel/ \
-                         ./Usr/ \
+                         ./User/ \
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/compile_flags.txt b/compile_flags.txt
index f99ee4ef..92deb23d 100644
--- a/compile_flags.txt
+++ b/compile_flags.txt
@@ -1,13 +1,13 @@
--Idev/Kernel
+-Idev/kernel
 -Idev/
--Idev/LibSCI
--Idev/Boot/
+-Idev/SCIKit
+-Idev/boot/
 -Ipublic/tools
 -Ipublic/tools/make_app
 -Ipublic/tools/make_fs
 -Ipublic/tools/open
 -Ipublic/frameworks/
--Idev/Boot/BootKit
+-Idev/boot/BootKit
 -std=c++20
 -D__NE_AMD64__
 -D__NEOSKRNL__
@@ -18,5 +18,4 @@
 -D__x86_64__
 -D__aarch64__
 -DNE_USE_MBCI_FLASH
--Iusr/
 -D__ATA_DMA__
\ No newline at end of file
diff --git a/debug_ahci.sh b/debug_ahci.sh
index 67b62a90..8c750a15 100755
--- a/debug_ahci.sh
+++ b/debug_ahci.sh
@@ -5,8 +5,8 @@ export ATA_PIO_SUPPORT=
 export ATA_DMA_SUPPORT=
 export DEBUG_SUPPORT=1
 
-cd dev/Kernel
+cd dev/kernel
 make -f amd64-desktop.make all
-cd ../Boot
+cd ../boot
 make -f amd64-desktop.make all
 make -f amd64-desktop.make run-efi-amd64-ahci
\ No newline at end of file
diff --git a/debug_ata.sh b/debug_ata.sh
index f0cf6abd..b91f7d47 100755
--- a/debug_ata.sh
+++ b/debug_ata.sh
@@ -5,7 +5,7 @@ export ATA_PIO_SUPPORT=1
 export ATA_DMA_SUPPORT=
 export DEBUG_SUPPORT=1
 
-cd kernel
+cd dev/kernel
 make -f amd64-desktop.make all
 cd ../boot
 make -f amd64-desktop.make all
diff --git a/dev/Hints/CompilerHint.h b/dev/HintsKit/CompilerHint.h
index 9a1be9f6..9a1be9f6 100644
--- a/dev/Hints/CompilerHint.h
+++ b/dev/HintsKit/CompilerHint.h
diff --git a/dev/Kernel/doc/EPM.pdf b/dev/Kernel/doc/EPM.pdf
deleted file mode 100644
index a73834cd..00000000
--- a/dev/Kernel/doc/EPM.pdf
+++ /dev/null
diff --git a/dev/Kernel/doc/TodoList.md b/dev/Kernel/doc/TodoList.md
deleted file mode 100644
index 0b17dc39..00000000
--- a/dev/Kernel/doc/TodoList.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# TODO list
-
-- We need preemptive multi-threading. [ X ]
-- We then need sync primitives. [ X ]
-- We also need a system library for the OS. [ X ]
-- We need a bootloader for AMD64 [ X ]
-  - Implement Boot Services [ X ]
-  - Design Handover [ X ]
-  - Load Kernel into memory [ X ]
-  - Fix bug in Kernel loader, which causes a 06 #UD. [ X ]
-  - Load Kernel [ X ]
-  - Add IDT [ X ]
-  - AHCI driver [ WiP ]
-- Context switch x87/SSE/AVX registers [ X ]
-- Framebuffer [ X ]
-- ATA support [ X ]
-- Make installer [ X ]
-
-Status:
-
-BootZ: Need to boot from EPM partition. [ X ]
-<br>
-neoskrnl: New Filesystem is done. [ X ]
-
-**Refer to Jira please!**
diff --git a/dev/LibSCI/FileMgr.h b/dev/LibSCI/FileMgr.h
deleted file mode 100644
index 2e256bfb..00000000
--- a/dev/LibSCI/FileMgr.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* -------------------------------------------
-
-Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved.
-
-File: Finder.h
-Purpose: FileMgr Interface.
-
-------------------------------------------- */
-
-#pragma once
\ No newline at end of file
diff --git a/dev/LibSCI/GPU.h b/dev/LibSCI/GPU.h
deleted file mode 100644
index a29eae00..00000000
--- a/dev/LibSCI/GPU.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -------------------------------------------
-
-Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved.
-
-File: GPU.h
-Purpose: GPU/FB System Calls.
-
-------------------------------------------- */
-
-#ifndef SCI_GPU_H
-#define SCI_GPU_H
-
-#include <LibSCI/SCI.h>
-
-/// ------------------------------------------------------------------------------------------ //
-/// @brief Graphics Processor API.
-/// ------------------------------------------------------------------------------------------ //
-
-struct GPUCmdEntry;
-struct GPUCmdEntryTraits;
-
-typedef VoidPtr GPUObject;
-
-/// ------------------------------------------------------------------------------------------ //
-/// @brief Command structure type.
-/// ------------------------------------------------------------------------------------------ //
-
-struct GPUCmdEntry
-{
-	VoidPtr Data{nullptr};
-	SizeT	DataSz{0};
-	SizeT	Layer{0};
-	BOOL	IsGPGPUData{NO};
-};
-
-struct GPUCmdEntryTraits final
-{
-	GPUCmdEntry* Cmd{nullptr};
-
-	BOOL isGPGPUData()
-	{
-		return this->isValid() && this->Cmd->IsGPGPUData;
-	}
-
-	BOOL isBackBuffer()
-	{
-		return this->Cmd->Layer > 0;
-	}
-
-	BOOL isValid()
-	{
-		return this->Cmd->Data && (this->Cmd->DataSz > 0) && (MmGetHeapFlags(this->Cmd->Data) != ~0);
-	}
-};
-
-IMPORT_C BOOL GPUListDevices(const Char** list, SizeT cnt);
-
-IMPORT_C GPUObject GPUFindByDeviceName(_Input const Char* device_name);
-
-IMPORT_C GPUObject GPUQueryInfo(_Input const GPUObject* gpu_handle, VoidPtr* out, SizeT out_sz);
-
-IMPORT_C SInt32 GPUDisposeDevice(GPUObject gpu_handle, Bool cancel_all, Bool flush_all);
-
-IMPORT_C SInt32 GPUSendCmdBufferListWithCnt(GPUObject gpu_handle, GPUCmdEntry** cmd_list, SizeT cmd_list_cnt);
-
-// ------------------------------------------------------------------------------------------ //
-// @brief Framebuffer API.
-// ------------------------------------------------------------------------------------------ //
-
-IMPORT_C SInt32 FBAcquireBuffer(GPUObject* out, SInt32 width, SInt32 height);
-
-IMPORT_C SInt32 FBDisposeBuffer(GPUObject* in);
-
-IMPORT_C SInt32 FBGetColorProfile(GPUObject in);
-
-IMPORT_C SInt32 FBQueryInfo(GPUObject handle, VoidPtr* info_ptr, SizeT* info_sz);
-
-#endif // ifndef SCI_GPU_H
diff --git a/dev/LibSCI/src/GPU.cc b/dev/LibSCI/src/GPU.cc
deleted file mode 100644
index b3442db8..00000000
--- a/dev/LibSCI/src/GPU.cc
+++ /dev/null
@@ -1,10 +0,0 @@
-/* -------------------------------------------
-
-Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved.
-
-File: GPU.cc
-Purpose: GPU Interface.
-
-------------------------------------------- */
-
-#include <GPU.h>
diff --git a/dev/LibSCI/CompilerHint.h b/dev/SCIKit/CompilerHint.h
index 01ecb35f..a78e59bf 100644
--- a/dev/LibSCI/CompilerHint.h
+++ b/dev/SCIKit/CompilerHint.h
@@ -7,19 +7,6 @@
 #ifndef SCI_HINT_H
 #define SCI_HINT_H
 
-#ifdef __TK__
-#pragma compiler(hint_manifest)
-#endif
-
-#define _Input
-#define _Output
-
-#define _Optional
-
-#define _StrictCheckInput
-#define _StrictCheckOutput
-
-#define _InOut
-#define _StrictInOut
+#include <HintsKit/CompilerHint.h>
 
 #endif // ifndef SCI_HINT_H
diff --git a/dev/LibSCI/LPC.h b/dev/SCIKit/LPC.h
index 8631f3de..044d272e 100644
--- a/dev/LibSCI/LPC.h
+++ b/dev/SCIKit/LPC.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Macros.h>
+#include <SCIKit/Macros.h>
 
 /// @file LPC.h
 /// @brief Local Process Code type and values.
diff --git a/dev/LibSCI/Macros.h b/dev/SCIKit/Macros.h
index 4e4bff9a..c7bd61e8 100644
--- a/dev/LibSCI/Macros.h
+++ b/dev/SCIKit/Macros.h
@@ -3,18 +3,18 @@
 Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved.
 
 File: Macros.h
-Purpose: LibSCI Macros header.
+Purpose: libsci Macros header.
 
 ------------------------------------------- */
 
 #pragma once
 
 /***********************************************************************************/
-/// @file LibSCI/Macros.h
+/// @file SCIKit/Macros.h
 /// @brief Macros and core types.
 /***********************************************************************************/
 
-#include <LibSCI/CompilerHint.h>
+#include <SCIKit/CompilerHint.h>
 
 #define ATTRIBUTE(X) __attribute__((X))
 
diff --git a/dev/LibSCI/SCI.h b/dev/SCIKit/SCI.h
index 97af9ffc..3e769262 100644
--- a/dev/LibSCI/SCI.h
+++ b/dev/SCIKit/SCI.h
@@ -10,7 +10,7 @@ Purpose: System Call Interface.
 #ifndef SCI_SCI_H

 #define SCI_SCI_H

 

-#include <LibSCI/Macros.h>

+#include <SCIKit/Macros.h>

 

 // ------------------------------------------------------------------------------------------ //

 /// @brief Types API.

@@ -289,18 +289,18 @@ IMPORT_C SInt32 CdOpenTray(Void);
 IMPORT_C SInt32 CdCloseTray(Void);

 

 // ------------------------------------------------------------------------------------------ //

-// Console API.

+// Printer API.

 // ------------------------------------------------------------------------------------------ //

 

-IMPORT_C SInt32 ConOut(IOObject file /* nullptr to direct to stdout */, const Char* fmt, ...);

+IMPORT_C SInt32 PrintOut(IOObject file /* nullptr to direct to stdout */, const Char* fmt, ...);

 

-IMPORT_C SInt32 ConIn(IOObject file /* nullptr to direct to stdout */, const Char* fmt, ...);

+IMPORT_C SInt32 PrintIn(IOObject file /* nullptr to direct to stdout */, const Char* fmt, ...);

 

-IMPORT_C IOObject ConCreate(Void);

+IMPORT_C IOObject PrintCreate(Void);

 

-IMPORT_C SInt32 ConRelease(IOObject);

+IMPORT_C SInt32 PrintRelease(IOObject);

 

-IMPORT_C IOObject ConGet(const Char* path);

+IMPORT_C IOObject PrintGet(const Char* path);

 

 // ------------------------------------------------------------------------------------------ //

 // @brief Scheduler/Debug API.

@@ -336,17 +336,4 @@ IMPORT_C BOOL FsCreateAlias(const char* path, const char* from);
 

 IMPORT_C Char* StrFmt(const Char* fmt, ...);

 

-// ------------------------------------------------------------------------------------------ //

-// @brief Message API.

-// ------------------------------------------------------------------------------------------ //

-

-IMPORT_C SInt32 MsgFree(VoidPtr handle);

-IMPORT_C SInt32 MsgShow(VoidPtr handle);

-

-/// @note fmt could be any POSIX argument, or the extended ones (%$, %{})

-IMPORT_C SInt32 MsgSend(VoidPtr handle, const Char* fmt, ...);

-IMPORT_C SInt32 MsgAlloc(VoidPtr handle);

-

-IMPORT_C VoidPtr kWarnMsg, kInfoMsg, kErrorMsg;

-

 #endif // ifndef SCI_SCI_H

diff --git a/dev/LibSCI/doc/LibSCI.drawio b/dev/SCIKit/doc/LibSCI.drawio
index 132eacc1..4f566c57 100644
--- a/dev/LibSCI/doc/LibSCI.drawio
+++ b/dev/SCIKit/doc/LibSCI.drawio
@@ -7,13 +7,13 @@
                 <mxCell id="eRehIIeIVOPW1y23kRkx-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="eRehIIeIVOPW1y23kRkx-2" target="eRehIIeIVOPW1y23kRkx-8" edge="1">
                     <mxGeometry relative="1" as="geometry"/>
                 </mxCell>
-                <mxCell id="eRehIIeIVOPW1y23kRkx-2" value="LibSCI Header (Foundation.h)" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                <mxCell id="eRehIIeIVOPW1y23kRkx-2" value="libsci Header (Foundation.h)" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
                     <mxGeometry x="200" y="450" width="226" height="60" as="geometry"/>
                 </mxCell>
                 <mxCell id="eRehIIeIVOPW1y23kRkx-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="eRehIIeIVOPW1y23kRkx-3" target="eRehIIeIVOPW1y23kRkx-2" edge="1">
                     <mxGeometry relative="1" as="geometry"/>
                 </mxCell>
-                <mxCell id="eRehIIeIVOPW1y23kRkx-3" value="LibSCI" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
+                <mxCell id="eRehIIeIVOPW1y23kRkx-3" value="libsci" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
                     <mxGeometry x="283" y="290" width="60" height="80" as="geometry"/>
                 </mxCell>
                 <mxCell id="eRehIIeIVOPW1y23kRkx-8" value="WindowMgr" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
diff --git a/dev/LibSCI/libsci.json b/dev/SCIKit/libsci.json
index 8b54828d..8b54828d 100644
--- a/dev/LibSCI/libsci.json
+++ b/dev/SCIKit/libsci.json
diff --git a/dev/LibSCI/src/LPC.cc b/dev/SCIKit/src/LPC.cc
index e0d2897d..f4433161 100644
--- a/dev/LibSCI/src/LPC.cc
+++ b/dev/SCIKit/src/LPC.cc
@@ -7,4 +7,4 @@ Purpose: Local Procedure Codes.
 
 ------------------------------------------- */
 
-#include <LPC.h>
+#include <SCIKit/LPC.h>
diff --git a/dev/LibSCI/src/LibSCI+IO.asm b/dev/SCIKit/src/LibSCI+IO.asm
index 1d6ee83c..769ae513 100644
--- a/dev/LibSCI/src/LibSCI+IO.asm
+++ b/dev/SCIKit/src/LibSCI+IO.asm
@@ -1,7 +1,7 @@
 ;; /*
 ;; *	========================================================
 ;; *
-;; *	LibSCI
+;; *	libsci
 ;; * 	Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved.
 ;; *
 ;; * 	========================================================
diff --git a/dev/LibSCI/src/Makefile b/dev/SCIKit/src/Makefile
index eb655ed5..f8f9fbe4 100644
--- a/dev/LibSCI/src/Makefile
+++ b/dev/SCIKit/src/Makefile
@@ -13,4 +13,4 @@ error:
 
 .PHONY: sci_asm_io_x64
 sci_asm_io_x64:
-	$(ASM) $(FLAGS) LibSCI+IO.asm -o LibSCI+IO.o
+	$(ASM) $(FLAGS) libsci+IO.asm -o libsci+IO.o
diff --git a/dev/LibSCI/src/SCI.cc b/dev/SCIKit/src/SCI.cc
index 3fe7b0f8..3427ae4e 100644
--- a/dev/LibSCI/src/SCI.cc
+++ b/dev/SCIKit/src/SCI.cc
@@ -4,10 +4,10 @@
 

 ------------------------------------------- */

 

-#include <SCI.h>

+#include <SCIKit/SCI.h>

 

-/// @file LibSCI.cc

-/// @brief Source file for the memory functions of the LibSCI.

+/// @file libsci.cc

+/// @brief Source file for the memory functions of the libsci.

 

 /// @brief Copy memory region.

 IMPORT_C VoidPtr MmCopyMemory(_Input VoidPtr dest, _Input VoidPtr src, _Input SizeT len)

diff --git a/dev/Tools/.keepme b/dev/Tools/.keepme
deleted file mode 100644
index e69de29b..00000000
--- a/dev/Tools/.keepme
+++ /dev/null
diff --git a/dev/Usr/.keepme b/dev/Usr/.keepme
deleted file mode 100644
index e69de29b..00000000
--- a/dev/Usr/.keepme
+++ /dev/null
diff --git a/dev/Usr/LibFont/.keep b/dev/Usr/LibFont/.keep
deleted file mode 100644
index e69de29b..00000000
--- a/dev/Usr/LibFont/.keep
+++ /dev/null
diff --git a/dev/Usr/LibFont/Font.h b/dev/Usr/LibFont/Font.h
deleted file mode 100644
index 73b3a285..00000000
--- a/dev/Usr/LibFont/Font.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- *
- * Copyright (c) 2024 Amlal El Mahrouss
- *
- */
-
-#pragma once
-
-#include <LibCF/Foundation.h>
-
-#define kCFFontExt ".ttf"
-
-/// @file Font.h
-/// @brief Font parsing using a NeOS True Font.
-
-namespace LibCF
-{
-	class CFFont;
-
-	class CFFont
-	{
-	public:
-		explicit CFFont() = default;
-		virtual ~CFFont() = default;
-
-	protected:
-		CFRect		m_size{};
-		CFRect*		m_glyphs{nullptr};
-		CFInteger32 m_glyphs_cnt{0};
-		BOOL		m_bold{NO};
-		BOOL		m_italic{NO};
-
-		CFFont(const CFFont& fnt) = delete;
-		CFFont& operator=(const CFFont& fnt) = delete;
-
-		virtual BOOL render_(CFPoint pos, CFChar16 character, CFColor color) = 0;
-
-		virtual void dispose_()
-		{
-			m_bold	 = NO;
-			m_italic = NO;
-
-			m_size.height = 0;
-			m_size.width  = 0;
-
-			m_glyphs_cnt = 0;
-
-			delete[] m_glyphs;
-			m_glyphs = nullptr;
-
-			m_size.x = 0;
-			m_size.y = 0;
-		}
-	};
-} // namespace LibCF
\ No newline at end of file
diff --git a/dev/Usr/LibGUI/.keep b/dev/Usr/LibGUI/.keep
deleted file mode 100644
index e69de29b..00000000
--- a/dev/Usr/LibGUI/.keep
+++ /dev/null
diff --git a/dev/Usr/LibLocale/.keep b/dev/Usr/LibLocale/.keep
deleted file mode 100644
index e69de29b..00000000
--- a/dev/Usr/LibLocale/.keep
+++ /dev/null
diff --git a/dev/Usr/LibWM/WindowConnection.h b/dev/Usr/LibWM/WindowConnection.h
deleted file mode 100644
index 22938130..00000000
--- a/dev/Usr/LibWM/WindowConnection.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-/* -------------------------------------------
-
-	Copyright (C) 2025, Amlal EL Mahrouss, all rights reserved.
-
-------------------------------------------- */
-
-#pragma once
-
-#include <LibCF/Object.h>
-#include <LibCF/Array.h>
-
-namespace LibCF
-{
-	class CFWindowConnection_;
-
-	class CFWindowConnection_ CF_OBJECT
-	{
-	public:
-		explicit CFWindowConnection_() = default;
-		virtual ~CFWindowConnection_() = default;
-
-		SCI_COPY_DEFAULT(CFWindowConnection_);
-
-		constexpr static SInt16 kMaxPeers = 16;
-
-		Char						mConnName[256] = {0};
-		SInt32						mConnPeersCnt{0};
-		CFArray<VoidPtr, kMaxPeers> mConnPeers;
-	};
-} // namespace LibCF
\ No newline at end of file
diff --git a/dev/Boot/BootKit/BitManip.h b/dev/boot/BootKit/BitManip.h
index 475d44ed..475d44ed 100644
--- a/dev/Boot/BootKit/BitManip.h
+++ b/dev/boot/BootKit/BitManip.h
diff --git a/dev/Boot/BootKit/BootKit.h b/dev/boot/BootKit/BootKit.h
index 847a7e83..425c6ed4 100644
--- a/dev/Boot/BootKit/BootKit.h
+++ b/dev/boot/BootKit/BootKit.h
@@ -14,7 +14,7 @@
 #include <BootKit/HW/ATA.h>
 #include <FirmwareKit/EPM.h>
 #include <CompilerKit/Version.h>
-#include <Mod/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
 #include <BootKit/Rsrc/zka_disk.rsrc>
 #include <BootKit/Rsrc/zka_no_disk.rsrc>
 #include <BootKit/Rsrc/zka_has_disk.rsrc>
@@ -29,7 +29,7 @@
 /***********************************************************************************/
 
 #include <NewKit/Defines.h>
-#include <Mod/ATA/ATA.h>
+#include <modules/ATA/ATA.h>
 
 #include <FirmwareKit/EFI.h>
 
diff --git a/dev/Boot/BootKit/BootThread.h b/dev/boot/BootKit/BootThread.h
index 6e48d190..6e48d190 100644
--- a/dev/Boot/BootKit/BootThread.h
+++ b/dev/boot/BootKit/BootThread.h
diff --git a/dev/Boot/BootKit/Device.h b/dev/boot/BootKit/Device.h
index 78e9aa3f..acdaa478 100644
--- a/dev/Boot/BootKit/Device.h
+++ b/dev/boot/BootKit/Device.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Mod/ATA/ATA.h>
-#include <Mod/AHCI/AHCI.h>
+#include <modules/ATA/ATA.h>
+#include <modules/AHCI/AHCI.h>
 
 using namespace NeOS;
 
diff --git a/dev/Boot/BootKit/EPM.h b/dev/boot/BootKit/EPM.h
index cbadd597..cbadd597 100644
--- a/dev/Boot/BootKit/EPM.h
+++ b/dev/boot/BootKit/EPM.h
diff --git a/dev/Boot/BootKit/HW/ATA.h b/dev/boot/BootKit/HW/ATA.h
index d8cd00eb..39b66db4 100644
--- a/dev/Boot/BootKit/HW/ATA.h
+++ b/dev/boot/BootKit/HW/ATA.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Mod/ATA/ATA.h>
+#include <modules/ATA/ATA.h>
 #include <BootKit/Device.h>
 
 using namespace NeOS;
diff --git a/dev/Boot/BootKit/HW/SATA.h b/dev/boot/BootKit/HW/SATA.h
index a58107b2..10868cd9 100644
--- a/dev/Boot/BootKit/HW/SATA.h
+++ b/dev/boot/BootKit/HW/SATA.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <CompilerKit/CompilerKit.h>
-#include <Mod/AHCI/AHCI.h>
+#include <modules/AHCI/AHCI.h>
 
 class BootDeviceSATA final
 {
diff --git a/dev/Boot/BootKit/Platform.h b/dev/boot/BootKit/Platform.h
index e9bcfb2f..e9bcfb2f 100644
--- a/dev/Boot/BootKit/Platform.h
+++ b/dev/boot/BootKit/Platform.h
diff --git a/dev/Boot/BootKit/Protocol.h b/dev/boot/BootKit/Protocol.h
index 3be42e74..3be42e74 100644
--- a/dev/Boot/BootKit/Protocol.h
+++ b/dev/boot/BootKit/Protocol.h
diff --git a/dev/Boot/BootKit/Qr.h b/dev/boot/BootKit/Qr.h
index f0476bc2..d51c9c10 100644
--- a/dev/Boot/BootKit/Qr.h
+++ b/dev/boot/BootKit/Qr.h
@@ -5,7 +5,7 @@
 #include <BootKit/Shared/bit.h>
 
 #include <BootKit/QrPrelude.h>
-#include <Mod/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
 #include <BootKit/Support.h>
 #include <CompilerKit/Detail.h>
 
diff --git a/dev/Boot/BootKit/QrPrelude.h b/dev/boot/BootKit/QrPrelude.h
index e89fad7a..e89fad7a 100644
--- a/dev/Boot/BootKit/QrPrelude.h
+++ b/dev/boot/BootKit/QrPrelude.h
diff --git a/dev/Boot/BootKit/Rsrc/zka_disk.rsrc b/dev/boot/BootKit/Rsrc/zka_disk.rsrc
index 61fd48dd..61fd48dd 100644
--- a/dev/Boot/BootKit/Rsrc/zka_disk.rsrc
+++ b/dev/boot/BootKit/Rsrc/zka_disk.rsrc
diff --git a/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc b/dev/boot/BootKit/Rsrc/zka_has_disk.rsrc
index 4ede8a65..4ede8a65 100644
--- a/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc
+++ b/dev/boot/BootKit/Rsrc/zka_has_disk.rsrc
diff --git a/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc b/dev/boot/BootKit/Rsrc/zka_no_disk.rsrc
index f89abad0..f89abad0 100644
--- a/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc
+++ b/dev/boot/BootKit/Rsrc/zka_no_disk.rsrc
diff --git a/dev/Boot/BootKit/Rsrc/zka_swirl.rsrc b/dev/boot/BootKit/Rsrc/zka_swirl.rsrc
index 0cb11bde..0cb11bde 100644
--- a/dev/Boot/BootKit/Rsrc/zka_swirl.rsrc
+++ b/dev/boot/BootKit/Rsrc/zka_swirl.rsrc
diff --git a/dev/Boot/BootKit/Shared/base.h b/dev/boot/BootKit/Shared/base.h
index 88459ec3..88459ec3 100644
--- a/dev/Boot/BootKit/Shared/base.h
+++ b/dev/boot/BootKit/Shared/base.h
diff --git a/dev/Boot/BootKit/Shared/bit.h b/dev/boot/BootKit/Shared/bit.h
index fa0fab82..fa0fab82 100644
--- a/dev/Boot/BootKit/Shared/bit.h
+++ b/dev/boot/BootKit/Shared/bit.h
diff --git a/dev/Boot/BootKit/Support.h b/dev/boot/BootKit/Support.h
index 3c79262b..3c79262b 100644
--- a/dev/Boot/BootKit/Support.h
+++ b/dev/boot/BootKit/Support.h
diff --git a/dev/Boot/DownloadOVMF.ps1 b/dev/boot/DownloadOVMF.ps1
index 5a2c5f0e..5a2c5f0e 100644
--- a/dev/Boot/DownloadOVMF.ps1
+++ b/dev/boot/DownloadOVMF.ps1
diff --git a/dev/Boot/Mod/.keep b/dev/boot/Mod/.keep
index e69de29b..e69de29b 100644
--- a/dev/Boot/Mod/.keep
+++ b/dev/boot/Mod/.keep
diff --git a/dev/Boot/Mod/NetBoot/.hgkeep b/dev/boot/Mod/NetBoot/.hgkeep
index e69de29b..e69de29b 100644
--- a/dev/Boot/Mod/NetBoot/.hgkeep
+++ b/dev/boot/Mod/NetBoot/.hgkeep
diff --git a/dev/Boot/Mod/NetBoot/Boot.S b/dev/boot/Mod/NetBoot/Boot.S
index 2095b91d..2095b91d 100644
--- a/dev/Boot/Mod/NetBoot/Boot.S
+++ b/dev/boot/Mod/NetBoot/Boot.S
diff --git a/dev/Boot/Mod/NetBoot/NetBoot.cc b/dev/boot/Mod/NetBoot/NetBoot.cc
index 59610262..16a9ae1e 100644
--- a/dev/Boot/Mod/NetBoot/NetBoot.cc
+++ b/dev/boot/Mod/NetBoot/NetBoot.cc
@@ -7,7 +7,7 @@
  * 	========================================================
  */
 
-#include <Mod/NetBoot/NetBoot.h>
+#include <modules/NetBoot/NetBoot.h>
 #include <BootKit/BootKit.h>
 #include <BootKit/BootThread.h>
 
diff --git a/dev/Boot/Mod/NetBoot/NetBoot.h b/dev/boot/Mod/NetBoot/NetBoot.h
index aeeaf18b..aeeaf18b 100644
--- a/dev/Boot/Mod/NetBoot/NetBoot.h
+++ b/dev/boot/Mod/NetBoot/NetBoot.h
diff --git a/dev/Boot/Mod/NetBoot/build.json b/dev/boot/Mod/NetBoot/build.json
index 6f6d575f..2c92567d 100644
--- a/dev/Boot/Mod/NetBoot/build.json
+++ b/dev/boot/Mod/NetBoot/build.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
-  "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"],
+  "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"],
   "sources_path": [".cc", "*.S"],
   "output_name": "netboot.sys",
   "compiler_flags": [
diff --git a/dev/Boot/Mod/SysChk/.hgkeep b/dev/boot/Mod/SysChk/.hgkeep
index e69de29b..e69de29b 100644
--- a/dev/Boot/Mod/SysChk/.hgkeep
+++ b/dev/boot/Mod/SysChk/.hgkeep
diff --git a/dev/Boot/Mod/SysChk/Boot.S b/dev/boot/Mod/SysChk/Boot.S
index 8ebfb352..8ebfb352 100644
--- a/dev/Boot/Mod/SysChk/Boot.S
+++ b/dev/boot/Mod/SysChk/Boot.S
diff --git a/dev/Boot/Mod/SysChk/Module.cc b/dev/boot/Mod/SysChk/Module.cc
index a5575cac..c22e183b 100644
--- a/dev/Boot/Mod/SysChk/Module.cc
+++ b/dev/boot/Mod/SysChk/Module.cc
@@ -8,8 +8,8 @@
  */
 
 #include <BootKit/BootKit.h>
-#include <Mod/CoreGfx/FBMgr.h>
-#include <Mod/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/TextMgr.h>
 #include <FirmwareKit/EFI.h>
 #include <FirmwareKit/EFI/API.h>
 #include <FirmwareKit/Handover.h>
@@ -19,7 +19,7 @@
 #include <NewKit/Macros.h>
 #include <NewKit/Ref.h>
 #include <BootKit/BootThread.h>
-#include <Mod/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
 
 EXTERN_C Int32 ModuleMain(NeOS::HEL::BootInfoHeader* handover)
 {
diff --git a/dev/Boot/Mod/SysChk/amd64.json b/dev/boot/Mod/SysChk/amd64.json
index 6a6a4de0..97b6c418 100644
--- a/dev/Boot/Mod/SysChk/amd64.json
+++ b/dev/boot/Mod/SysChk/amd64.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
-  "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"],
+  "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"],
   "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"],
   "output_name": "syschk.sys",
   "compiler_flags": [
diff --git a/dev/Boot/Mod/SysChk/arm64.json b/dev/boot/Mod/SysChk/arm64.json
index 09d86309..6d9161ea 100644
--- a/dev/Boot/Mod/SysChk/arm64.json
+++ b/dev/boot/Mod/SysChk/arm64.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "clang++",
   "compiler_std": "c++20",
-  "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"],
+  "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"],
   "sources_path": ["*.cc", "*.S", "../../src/HEL/ARM64/*.cc", "../../src/HEL/ARM64/*.S", "../../src/*.cc"],
   "output_name": "syschk.sys",
   "compiler_flags": [
diff --git a/dev/Boot/amd64-desktop.make b/dev/boot/amd64-desktop.make
index bf61b24e..4d2b211c 100644
--- a/dev/Boot/amd64-desktop.make
+++ b/dev/boot/amd64-desktop.make
@@ -68,7 +68,7 @@ REM_FLAG=-f
 
 FLAG_ASM=-f win64
 FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEOSKRNL__ -D__BOOTZ__ \
-			-DEFI_FUNCTION_WRAPPER -I./ -I../Kernel $(DISK_DRV) -I../ -c -nostdlib -fno-rtti -fno-exceptions \
+			-DEFI_FUNCTION_WRAPPER -I./ -I../kernel $(DISK_DRV) -I../ -c -nostdlib -fno-rtti -fno-exceptions \
                         -std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_NE_APIS__ -DZBA_USE_FB -D__NE_AMD64__ -D__NE__ -DNE_AUTO_FORMAT
 
 BOOTLOADER=bootz.exe
@@ -88,9 +88,9 @@ all: compile-amd64
 	$(LD_GNU) $(OBJ) $(LD_FLAGS) -o src/$(BOOTLOADER)
 	$(COPY) src/$(BOOTLOADER) src/Root/EFI/BOOT/BOOTX64.EFI
 	$(COPY) src/$(BOOTLOADER) src/Root/EFI/BOOT/BOOTZ.EFI
-	$(COPY) ../Kernel/$(KERNEL) src/Root/$(KERNEL)
-	$(COPY) ./Mod/SysChk/$(SYSCHK) src/Root/$(SYSCHK)
-	$(COPY) ../LibSCI/$(SCIKIT) src/Root/$(SCIKIT)
+	$(COPY) ../kernel/$(KERNEL) src/Root/$(KERNEL)
+	$(COPY) ./modules/SysChk/$(SYSCHK) src/Root/$(SYSCHK)
+	$(COPY) ../SCIKit/$(SCIKIT) src/Root/$(SCIKIT)
 	$(COPY) src/$(BOOTLOADER) src/Root/$(BOOTLOADER)
 
 .PHONY: disk
diff --git a/dev/Boot/arm64-desktop.make b/dev/boot/arm64-desktop.make
index 7470a9fc..5b38d46c 100644
--- a/dev/Boot/arm64-desktop.make
+++ b/dev/boot/arm64-desktop.make
@@ -45,7 +45,7 @@ REM_FLAG=-f
 FLAG_ASM=-f win64
 FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__NE_ARM64__ -fno-rtti -fno-exceptions -I./ \
 			 -target aarch64-unknown-windows \
-				-std=c++20 -DBOOTZ_EPM_SUPPORT -DZBA_USE_FB -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__BOOTZ__ -D__HAVE_NE_APIS__ -D__NE__ -I../ -I../Kernel
+				-std=c++20 -DBOOTZ_EPM_SUPPORT -DZBA_USE_FB -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__BOOTZ__ -D__HAVE_NE_APIS__ -D__NE__ -I../ -I../kernel
 
 BOOT_LOADER=bootz.exe
 KERNEL=neoskrnl.exe
@@ -62,8 +62,8 @@ all: compile
 	$(LD_GNU) $(OBJ) $(LD_FLAGS) /out:src/$(BOOT_LOADER)
 	$(COPY) src/$(BOOT_LOADER) src/Root/EFI/BOOT/BOOTAA64.EFI
 	$(COPY) src/$(BOOT_LOADER) src/Root/EFI/BOOT/BootZ.EFI
-	$(COPY) ../Kernel/$(KERNEL) src/Root/$(KERNEL)
-	$(COPY) ./Mod/SysChk/$(SYSCHK) src/Root/$(SYSCHK)
+	$(COPY) ../kernel/$(KERNEL) src/Root/$(KERNEL)
+	$(COPY) ./modules/SysChk/$(SYSCHK) src/Root/$(SYSCHK)
 	$(COPY) src/$(BOOT_LOADER) src/Root/$(BOOT_LOADER)
 
 ifneq ($(DEBUG_SUPPORT), )
diff --git a/dev/Boot/arm64-mobile.make b/dev/boot/arm64-mobile.make
index c4522e52..485bfed0 100644
--- a/dev/Boot/arm64-mobile.make
+++ b/dev/boot/arm64-mobile.make
@@ -46,7 +46,7 @@ REM_FLAG=-f
 FLAG_ASM=-f win64
 FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__NE_ARM64__ -fno-rtti -fno-exceptions -I./ \
 			 -target aarch64-unknown-windows \
-				-std=c++20 -DBOOTZ_EPM_SUPPORT -DkExpectedWidth=320 -DkExpectedHeight=480 -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__BOOTZ__ -D__HAVE_NE_APIS__ -D__NE__ -I../ -I../Kernel
+				-std=c++20 -DBOOTZ_EPM_SUPPORT -DkExpectedWidth=320 -DkExpectedHeight=480 -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__BOOTZ__ -D__HAVE_NE_APIS__ -D__NE__ -I../ -I../kernel
 
 BOOT_LOADER=bootz.exe
 KERNEL=neoskrnl.exe
@@ -63,8 +63,8 @@ all: compile
 	$(LD_GNU) $(OBJ) $(LD_FLAGS) /out:src/$(BOOT_LOADER)
 	$(COPY) src/$(BOOT_LOADER) src/Root/EFI/BOOT/BOOTAA64.EFI
 	$(COPY) src/$(BOOT_LOADER) src/Root/EFI/BOOT/BootZ.EFI
-	$(COPY) ../Kernel/$(KERNEL) src/Root/$(KERNEL)
-	$(COPY) ./Mod/SysChk/$(SYSCHK) src/Root/$(SYSCHK)
+	$(COPY) ../kernel/$(KERNEL) src/Root/$(KERNEL)
+	$(COPY) ./modules/SysChk/$(SYSCHK) src/Root/$(SYSCHK)
 	$(COPY) src/$(BOOT_LOADER) src/Root/$(BOOT_LOADER)
 
 ifneq ($(DEBUG_SUPPORT), )
diff --git a/dev/Boot/gdbinit b/dev/boot/gdbinit
index 9522f6e8..9522f6e8 100644
--- a/dev/Boot/gdbinit
+++ b/dev/boot/gdbinit
diff --git a/dev/Boot/src/.gitkeep b/dev/boot/src/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Boot/src/.gitkeep
+++ b/dev/boot/src/.gitkeep
diff --git a/dev/Boot/src/BootFileReader.cc b/dev/boot/src/BootFileReader.cc
index 4712374e..a2afbce5 100644
--- a/dev/Boot/src/BootFileReader.cc
+++ b/dev/boot/src/BootFileReader.cc
@@ -13,7 +13,7 @@
 #include <BootKit/BootKit.h>
 #include <FirmwareKit/Handover.h>
 #include <FirmwareKit/EFI/API.h>
-#include <Mod/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/TextMgr.h>
 
 /// @file BootFileReader
 /// @brief Bootloader File reader.
diff --git a/dev/Boot/src/BootString.cc b/dev/boot/src/BootString.cc
index 194261d0..194261d0 100644
--- a/dev/Boot/src/BootString.cc
+++ b/dev/boot/src/BootString.cc
diff --git a/dev/Boot/src/BootSupport.cc b/dev/boot/src/BootSupport.cc
index 4d808ddc..4d808ddc 100644
--- a/dev/Boot/src/BootSupport.cc
+++ b/dev/boot/src/BootSupport.cc
diff --git a/dev/Boot/src/BootTextWriter.cc b/dev/boot/src/BootTextWriter.cc
index b58d3429..b58d3429 100644
--- a/dev/Boot/src/BootTextWriter.cc
+++ b/dev/boot/src/BootTextWriter.cc
diff --git a/dev/Boot/src/BootThread.cc b/dev/boot/src/BootThread.cc
index ff094f72..e087d386 100644
--- a/dev/Boot/src/BootThread.cc
+++ b/dev/boot/src/BootThread.cc
@@ -13,7 +13,7 @@
 #include <KernelKit/PE.h>
 #include <KernelKit/MSDOS.h>
 #include <CFKit/Utils.h>
-#include <Mod/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/TextMgr.h>
 
 /// @brief External boot services symbol.
 EXTERN EfiBootServices* BS;
diff --git a/dev/Boot/src/BootloaderRsrc.rsrc b/dev/boot/src/BootloaderRsrc.rsrc
index 8baa8c3d..2f8177a7 100644
--- a/dev/Boot/src/BootloaderRsrc.rsrc
+++ b/dev/boot/src/BootloaderRsrc.rsrc
@@ -1,4 +1,4 @@
-#include "../../Kernel/CompilerKit/Version.h"
+#include "../../kernel/CompilerKit/Version.h"
 
 1 VERSIONINFO
 FILEVERSION     1,0,0,0
diff --git a/dev/Boot/src/HEL/64X000/.gitkeep b/dev/boot/src/HEL/64X000/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Boot/src/HEL/64X000/.gitkeep
+++ b/dev/boot/src/HEL/64X000/.gitkeep
diff --git a/dev/Boot/src/HEL/64X000/BootCB.S b/dev/boot/src/HEL/64X000/BootCB.S
index f286f449..f286f449 100644
--- a/dev/Boot/src/HEL/64X000/BootCB.S
+++ b/dev/boot/src/HEL/64X000/BootCB.S
diff --git a/dev/Boot/src/HEL/AMD64/BootAPI.S b/dev/boot/src/HEL/AMD64/BootAPI.S
index 963ef46a..963ef46a 100644
--- a/dev/Boot/src/HEL/AMD64/BootAPI.S
+++ b/dev/boot/src/HEL/AMD64/BootAPI.S
diff --git a/dev/Boot/src/HEL/AMD64/BootATA.cc b/dev/boot/src/HEL/AMD64/BootATA.cc
index 0ec6ab18..0ec6ab18 100644
--- a/dev/Boot/src/HEL/AMD64/BootATA.cc
+++ b/dev/boot/src/HEL/AMD64/BootATA.cc
diff --git a/dev/Boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc
index 11b70b81..5e2b3855 100644
--- a/dev/Boot/src/HEL/AMD64/BootEFI.cc
+++ b/dev/boot/src/HEL/AMD64/BootEFI.cc
@@ -5,8 +5,8 @@
 ------------------------------------------- */
 
 #include <BootKit/BootKit.h>
-#include <Mod/CoreGfx/FBMgr.h>
-#include <Mod/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/TextMgr.h>
 #include <FirmwareKit/EFI.h>
 #include <FirmwareKit/EFI/API.h>
 #include <FirmwareKit/Handover.h>
@@ -16,7 +16,7 @@
 #include <NewKit/Macros.h>
 #include <NewKit/Ref.h>
 #include <BootKit/BootThread.h>
-#include <Mod/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
 
 // Makes the compiler shut up.
 #ifndef kMachineModel
diff --git a/dev/Boot/src/HEL/AMD64/BootPlatform.cc b/dev/boot/src/HEL/AMD64/BootPlatform.cc
index c7ae4085..c7ae4085 100644
--- a/dev/Boot/src/HEL/AMD64/BootPlatform.cc
+++ b/dev/boot/src/HEL/AMD64/BootPlatform.cc
diff --git a/dev/Boot/src/HEL/AMD64/BootSATA.cc b/dev/boot/src/HEL/AMD64/BootSATA.cc
index b485023d..b485023d 100644
--- a/dev/Boot/src/HEL/AMD64/BootSATA.cc
+++ b/dev/boot/src/HEL/AMD64/BootSATA.cc
diff --git a/dev/Boot/src/HEL/ARM64/.gitkeep b/dev/boot/src/HEL/ARM64/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Boot/src/HEL/ARM64/.gitkeep
+++ b/dev/boot/src/HEL/ARM64/.gitkeep
diff --git a/dev/Boot/src/HEL/ARM64/BootAPI.S b/dev/boot/src/HEL/ARM64/BootAPI.S
index a60ad218..a60ad218 100644
--- a/dev/Boot/src/HEL/ARM64/BootAPI.S
+++ b/dev/boot/src/HEL/ARM64/BootAPI.S
diff --git a/dev/Boot/src/HEL/ARM64/BootCB.S b/dev/boot/src/HEL/ARM64/BootCB.S
index 2d1ff60c..2d1ff60c 100644
--- a/dev/Boot/src/HEL/ARM64/BootCB.S
+++ b/dev/boot/src/HEL/ARM64/BootCB.S
diff --git a/dev/Boot/src/HEL/ARM64/BootEFI.cc b/dev/boot/src/HEL/ARM64/BootEFI.cc
index 9df1b2d4..d60f305b 100644
--- a/dev/Boot/src/HEL/ARM64/BootEFI.cc
+++ b/dev/boot/src/HEL/ARM64/BootEFI.cc
@@ -5,8 +5,8 @@
 ------------------------------------------- */
 
 #include <BootKit/BootKit.h>
-#include <Mod/CoreGfx/FBMgr.h>
-#include <Mod/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/TextMgr.h>
 #include <FirmwareKit/EFI.h>
 #include <FirmwareKit/EFI/API.h>
 #include <FirmwareKit/Handover.h>
@@ -16,7 +16,7 @@
 #include <NewKit/Macros.h>
 #include <NewKit/Ref.h>
 #include <BootKit/BootThread.h>
-#include <Mod/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
 
 // Makes the compiler shut up.
 #ifndef kMachineModel
diff --git a/dev/Boot/src/HEL/ARM64/BootPlatform.cc b/dev/boot/src/HEL/ARM64/BootPlatform.cc
index 9713b80d..9713b80d 100644
--- a/dev/Boot/src/HEL/ARM64/BootPlatform.cc
+++ b/dev/boot/src/HEL/ARM64/BootPlatform.cc
diff --git a/dev/Boot/src/HEL/POWER/.gitkeep b/dev/boot/src/HEL/POWER/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Boot/src/HEL/POWER/.gitkeep
+++ b/dev/boot/src/HEL/POWER/.gitkeep
diff --git a/dev/Boot/src/HEL/POWER/BootCB.S b/dev/boot/src/HEL/POWER/BootCB.S
index 2b64f8c1..2b64f8c1 100644
--- a/dev/Boot/src/HEL/POWER/BootCB.S
+++ b/dev/boot/src/HEL/POWER/BootCB.S
diff --git a/dev/Boot/src/New+Delete.cc b/dev/boot/src/New+Delete.cc
index 03a1bb68..03a1bb68 100644
--- a/dev/Boot/src/New+Delete.cc
+++ b/dev/boot/src/New+Delete.cc
diff --git a/dev/Boot/src/Root/EFI/STARTUP.NSH b/dev/boot/src/Root/EFI/STARTUP.NSH
index 2cf25f23..2cf25f23 100644
--- a/dev/Boot/src/Root/EFI/STARTUP.NSH
+++ b/dev/boot/src/Root/EFI/STARTUP.NSH
diff --git a/dev/Kernel/ArchKit/ArchKit.h b/dev/kernel/ArchKit/ArchKit.h
index 04fc5bf6..04fc5bf6 100644
--- a/dev/Kernel/ArchKit/ArchKit.h
+++ b/dev/kernel/ArchKit/ArchKit.h
diff --git a/dev/Kernel/CFKit/GUIDWizard.h b/dev/kernel/CFKit/GUIDWizard.h
index 5236688f..5236688f 100644
--- a/dev/Kernel/CFKit/GUIDWizard.h
+++ b/dev/kernel/CFKit/GUIDWizard.h
diff --git a/dev/Kernel/CFKit/GUIDWrapper.h b/dev/kernel/CFKit/GUIDWrapper.h
index 3b7ada6d..3b7ada6d 100644
--- a/dev/Kernel/CFKit/GUIDWrapper.h
+++ b/dev/kernel/CFKit/GUIDWrapper.h
diff --git a/dev/Kernel/CFKit/Property.h b/dev/kernel/CFKit/Property.h
index e4588ad6..e4588ad6 100644
--- a/dev/Kernel/CFKit/Property.h
+++ b/dev/kernel/CFKit/Property.h
diff --git a/dev/Kernel/CFKit/Utils.h b/dev/kernel/CFKit/Utils.h
index b8f16164..b8f16164 100644
--- a/dev/Kernel/CFKit/Utils.h
+++ b/dev/kernel/CFKit/Utils.h
diff --git a/dev/Kernel/CompilerKit/CompilerKit.h b/dev/kernel/CompilerKit/CompilerKit.h
index c1a5f424..c1a5f424 100644
--- a/dev/Kernel/CompilerKit/CompilerKit.h
+++ b/dev/kernel/CompilerKit/CompilerKit.h
diff --git a/dev/Kernel/CompilerKit/Detail.h b/dev/kernel/CompilerKit/Detail.h
index c098f273..c098f273 100644
--- a/dev/Kernel/CompilerKit/Detail.h
+++ b/dev/kernel/CompilerKit/Detail.h
diff --git a/dev/Kernel/CompilerKit/Version.h b/dev/kernel/CompilerKit/Version.h
index 11854cd8..11854cd8 100644
--- a/dev/Kernel/CompilerKit/Version.h
+++ b/dev/kernel/CompilerKit/Version.h
diff --git a/dev/Kernel/FSKit/Defines.h b/dev/kernel/FSKit/Defines.h
index 9431a9c0..9431a9c0 100644
--- a/dev/Kernel/FSKit/Defines.h
+++ b/dev/kernel/FSKit/Defines.h
diff --git a/dev/Kernel/FSKit/HPFS.h b/dev/kernel/FSKit/HeFS.h
index 0b15810c..6911ddef 100644
--- a/dev/Kernel/FSKit/HPFS.h
+++ b/dev/kernel/FSKit/HeFS.h
@@ -8,34 +8,34 @@
 

 #include <NewKit/Defines.h>

 

-/// @file HPFS.h

-/// @brief HPFS filesystem support.

+/// @file HeFS.h

+/// @brief HeFS filesystem support.

 

-#define kHPFSVersion  (0x0100)

-#define kHPFSMagic	  "  HPFS"

-#define kHPFSMagicLen (8)

+#define kHeFSVersion  (0x0100)

+#define kHeFSMagic	  "  HeFS"

+#define kHeFSMagicLen (8)

 

-#define kHPFSFileNameLen (256U)

-#define kHPFSPartNameLen (256U)

+#define kHeFSFileNameLen (256U)

+#define kHeFSPartNameLen (256U)

 

-#define kHPFSMinimumDiskSize (gib_cast(64))

+#define kHeFSMinimumDiskSize (gib_cast(64))

 

 enum

 {

-	kHPFSInvalidDrive,

-	kHPFSHDDDrive,

-	kHPFSSSDDrive,

-	kHPFSMassStorageDrive,

-	kHPFSSCSIDrive,

-	kHPFSDriveCount,

+	kHeFSInvalidDrive,

+	kHeFSHDDDrive,

+	kHeFSSSDDrive,

+	kHeFSMassStorageDrive,

+	kHeFSSCSIDrive,

+	kHeFSDriveCount,

 };

 

-struct HPFS_BOOT_NODE;

+struct HeFS_BOOT_NODE;

 

-struct HPFS_BOOT_NODE final

+struct HeFS_BOOT_NODE final

 {

-	NeOS::Char	 fMagic[kHPFSMagicLen];

-	NeOS::Char	 fPartName[kHPFSPartNameLen];

+	NeOS::Char	 fMagic[kHeFSMagicLen];

+	NeOS::Char	 fPartName[kHeFSPartNameLen];

 	NeOS::UInt32 fVersion;

 	NeOS::UInt64 fBadSectors;

 	NeOS::UInt64 fSectorCount;

@@ -47,9 +47,9 @@ struct HPFS_BOOT_NODE final
 	NeOS::UInt64 fRecoveryINode;

 };

 

-struct HPFS_INDEX_NODE

+struct HeFS_INDEX_NODE

 {

-	NeOS::Char	 fName[kHPFSFileNameLen];

+	NeOS::Char	 fName[kHeFSFileNameLen];

 	NeOS::UInt32 fFlags;

 	NeOS::UInt16 fKind;

 	NeOS::UInt32 fSize;

diff --git a/dev/Kernel/FSKit/IndexableProperty.h b/dev/kernel/FSKit/IndexableProperty.h
index 6a79bc1b..6a79bc1b 100644
--- a/dev/Kernel/FSKit/IndexableProperty.h
+++ b/dev/kernel/FSKit/IndexableProperty.h
diff --git a/dev/Kernel/FSKit/NeFS.h b/dev/kernel/FSKit/NeFS.h
index 981cd0d9..b2f7095d 100644
--- a/dev/Kernel/FSKit/NeFS.h
+++ b/dev/kernel/FSKit/NeFS.h
@@ -17,7 +17,7 @@ default.
 #pragma once
 
 #include <CompilerKit/CompilerKit.h>
-#include <Hints/CompilerHint.h>
+#include <HintsKit/CompilerHint.h>
 #include <KernelKit/DriveMgr.h>
 #include <NewKit/Defines.h>
 #include <NewKit/KString.h>
diff --git a/dev/Kernel/FirmwareKit/.gitkeep b/dev/kernel/FirmwareKit/.gitkeep
index 8b137891..8b137891 100644
--- a/dev/Kernel/FirmwareKit/.gitkeep
+++ b/dev/kernel/FirmwareKit/.gitkeep
diff --git a/dev/Kernel/FirmwareKit/CoreBoot/CoreBoot.h b/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h
index 5fe3f4ea..5fe3f4ea 100644
--- a/dev/Kernel/FirmwareKit/CoreBoot/CoreBoot.h
+++ b/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h
diff --git a/dev/Kernel/FirmwareKit/CoreBoot/NS.h b/dev/kernel/FirmwareKit/CoreBoot/NS.h
index 95576de8..95576de8 100644
--- a/dev/Kernel/FirmwareKit/CoreBoot/NS.h
+++ b/dev/kernel/FirmwareKit/CoreBoot/NS.h
diff --git a/dev/Kernel/FirmwareKit/CoreBoot/NetBoot.h b/dev/kernel/FirmwareKit/CoreBoot/NetBoot.h
index 21ce02ba..21ce02ba 100644
--- a/dev/Kernel/FirmwareKit/CoreBoot/NetBoot.h
+++ b/dev/kernel/FirmwareKit/CoreBoot/NetBoot.h
diff --git a/dev/Kernel/FirmwareKit/EFI.h b/dev/kernel/FirmwareKit/EFI.h
index 57f7e17a..57f7e17a 100644
--- a/dev/Kernel/FirmwareKit/EFI.h
+++ b/dev/kernel/FirmwareKit/EFI.h
diff --git a/dev/Kernel/FirmwareKit/EFI/API.h b/dev/kernel/FirmwareKit/EFI/API.h
index 34ff212e..b05fcc71 100644
--- a/dev/Kernel/FirmwareKit/EFI/API.h
+++ b/dev/kernel/FirmwareKit/EFI/API.h
@@ -22,7 +22,7 @@ class BootTextWriter;
 #define __BOOTKIT_NO_INCLUDE__ 1
 
 #include <BootKit/BootKit.h>
-#include <Mod/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
 #endif // ifdef __BOOTZ__
 
 inline EfiSystemTable*	ST = nullptr;
diff --git a/dev/Kernel/FirmwareKit/EFI/EFI.h b/dev/kernel/FirmwareKit/EFI/EFI.h
index ff97f7d6..ff97f7d6 100644
--- a/dev/Kernel/FirmwareKit/EFI/EFI.h
+++ b/dev/kernel/FirmwareKit/EFI/EFI.h
diff --git a/dev/Kernel/FirmwareKit/EFI/NS.h b/dev/kernel/FirmwareKit/EFI/NS.h
index 18da8aaa..18da8aaa 100644
--- a/dev/Kernel/FirmwareKit/EFI/NS.h
+++ b/dev/kernel/FirmwareKit/EFI/NS.h
diff --git a/dev/Kernel/FirmwareKit/EPM.h b/dev/kernel/FirmwareKit/EPM.h
index b5e49d02..4728e2f5 100644
--- a/dev/Kernel/FirmwareKit/EPM.h
+++ b/dev/kernel/FirmwareKit/EPM.h
@@ -91,7 +91,7 @@ struct PACKED EPM_PART_BLOCK
 	NeOS::Int16 Kind;
 	NeOS::Int16 Flags;
 	NeOS::Int32 FsVersion;
-	NeOS::Char	Fs[kEPMFilesystemLength]; /* NeFS, HPFS... */
+	NeOS::Char	Fs[kEPMFilesystemLength]; /* NeFS, HeFS... */
 	NeOS::Char	Reserved[kEPMReserveLen]; // to fill a full sector.
 };
 
diff --git a/dev/Kernel/FirmwareKit/GPT.h b/dev/kernel/FirmwareKit/GPT.h
index 91838bc7..91838bc7 100644
--- a/dev/Kernel/FirmwareKit/GPT.h
+++ b/dev/kernel/FirmwareKit/GPT.h
diff --git a/dev/Kernel/FirmwareKit/Handover.h b/dev/kernel/FirmwareKit/Handover.h
index 4ff681ed..4ff681ed 100644
--- a/dev/Kernel/FirmwareKit/Handover.h
+++ b/dev/kernel/FirmwareKit/Handover.h
diff --git a/dev/Kernel/HALKit/.gitkeep b/dev/kernel/HALKit/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Kernel/HALKit/.gitkeep
+++ b/dev/kernel/HALKit/.gitkeep
diff --git a/dev/Kernel/HALKit/AMD64/CPUID.h b/dev/kernel/HALKit/AMD64/CPUID.h
index 7f04ac27..7f04ac27 100644
--- a/dev/Kernel/HALKit/AMD64/CPUID.h
+++ b/dev/kernel/HALKit/AMD64/CPUID.h
diff --git a/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc b/dev/kernel/HALKit/AMD64/HalACPIFactoryInterface.cc
index 17ccf07e..f327dc3f 100644
--- a/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc
+++ b/dev/kernel/HALKit/AMD64/HalACPIFactoryInterface.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <Mod/ACPI/ACPIFactoryInterface.h>
+#include <modules/ACPI/ACPIFactoryInterface.h>
 #include <HALKit/AMD64/Processor.h>
 #include <NewKit/KString.h>
 #include <ArchKit/ArchKit.h>
diff --git a/dev/Kernel/HALKit/AMD64/HalAPICController.cc b/dev/kernel/HALKit/AMD64/HalAPICController.cc
index bd98932f..a4de5091 100644
--- a/dev/Kernel/HALKit/AMD64/HalAPICController.cc
+++ b/dev/kernel/HALKit/AMD64/HalAPICController.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <Mod/ACPI/ACPIFactoryInterface.h>
+#include <modules/ACPI/ACPIFactoryInterface.h>
 #include <HALKit/AMD64/Processor.h>
 
 #define cIOAPICRegVal (4)
diff --git a/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc b/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc
index 38d31d48..da680afa 100644
--- a/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc
+++ b/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc
@@ -4,14 +4,14 @@
 
 ------------------------------------------- */
 
-#include <Mod/ACPI/ACPIFactoryInterface.h>
+#include <modules/ACPI/ACPIFactoryInterface.h>
 #include <KernelKit/UserProcessScheduler.h>
 #include <HALKit/AMD64/Processor.h>
 #include <ArchKit/ArchKit.h>
 #include <KernelKit/BinaryMutex.h>
 #include <KernelKit/UserProcessScheduler.h>
 #include <KernelKit/Timer.h>
-#include <Mod/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/TextMgr.h>
 #include <NewKit/KernelPanic.h>
 #include <KernelKit/HardwareThreadScheduler.h>
 
diff --git a/dev/Kernel/HALKit/AMD64/HalApplicationProcessorGNU.s b/dev/kernel/HALKit/AMD64/HalApplicationProcessorGNU.s
index a8ad3b76..a8ad3b76 100644
--- a/dev/Kernel/HALKit/AMD64/HalApplicationProcessorGNU.s
+++ b/dev/kernel/HALKit/AMD64/HalApplicationProcessorGNU.s
diff --git a/dev/Kernel/HALKit/AMD64/HalApplicationProcessorStartup.asm b/dev/kernel/HALKit/AMD64/HalApplicationProcessorStartup.asm
index c64e0a09..c64e0a09 100644
--- a/dev/Kernel/HALKit/AMD64/HalApplicationProcessorStartup.asm
+++ b/dev/kernel/HALKit/AMD64/HalApplicationProcessorStartup.asm
diff --git a/dev/Kernel/HALKit/AMD64/HalBoot.asm b/dev/kernel/HALKit/AMD64/HalBoot.asm
index 3ccdd50e..3ccdd50e 100644
--- a/dev/Kernel/HALKit/AMD64/HalBoot.asm
+++ b/dev/kernel/HALKit/AMD64/HalBoot.asm
diff --git a/dev/Kernel/HALKit/AMD64/HalCommonAPI.asm b/dev/kernel/HALKit/AMD64/HalCommonAPI.asm
index 671a955b..671a955b 100644
--- a/dev/Kernel/HALKit/AMD64/HalCommonAPI.asm
+++ b/dev/kernel/HALKit/AMD64/HalCommonAPI.asm
diff --git a/dev/Kernel/HALKit/AMD64/HalControlRegister.s b/dev/kernel/HALKit/AMD64/HalControlRegister.s
index b94744f5..b94744f5 100644
--- a/dev/Kernel/HALKit/AMD64/HalControlRegister.s
+++ b/dev/kernel/HALKit/AMD64/HalControlRegister.s
diff --git a/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc b/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
index 9eaa24eb..9eaa24eb 100644
--- a/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
+++ b/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc
diff --git a/dev/Kernel/HALKit/AMD64/HalCoreSystemCalls.cc b/dev/kernel/HALKit/AMD64/HalCoreSystemCalls.cc
index 75eb1f15..75eb1f15 100644
--- a/dev/Kernel/HALKit/AMD64/HalCoreSystemCalls.cc
+++ b/dev/kernel/HALKit/AMD64/HalCoreSystemCalls.cc
diff --git a/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc
index f262eee0..2bc89a5e 100644
--- a/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc
+++ b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc
@@ -8,8 +8,8 @@
 #include <KernelKit/DebugOutput.h>
 #include <NewKit/Utils.h>
 #include <NewKit/New.h>
-#include <Mod/CoreGfx/FBMgr.h>
-#include <Mod/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/TextMgr.h>
 
 namespace NeOS
 {
diff --git a/dev/Kernel/HALKit/AMD64/HalDebugPort.cc b/dev/kernel/HALKit/AMD64/HalDebugPort.cc
index 7eada646..7eada646 100644
--- a/dev/Kernel/HALKit/AMD64/HalDebugPort.cc
+++ b/dev/kernel/HALKit/AMD64/HalDebugPort.cc
diff --git a/dev/Kernel/HALKit/AMD64/HalDescriptorLoader.cc b/dev/kernel/HALKit/AMD64/HalDescriptorLoader.cc
index 154b11af..154b11af 100644
--- a/dev/Kernel/HALKit/AMD64/HalDescriptorLoader.cc
+++ b/dev/kernel/HALKit/AMD64/HalDescriptorLoader.cc
diff --git a/dev/Kernel/HALKit/AMD64/HalInterruptAPI.asm b/dev/kernel/HALKit/AMD64/HalInterruptAPI.asm
index ffea6707..ffea6707 100644
--- a/dev/Kernel/HALKit/AMD64/HalInterruptAPI.asm
+++ b/dev/kernel/HALKit/AMD64/HalInterruptAPI.asm
diff --git a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc
index e87e6fb1..543e267b 100644
--- a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc
+++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc
@@ -9,10 +9,10 @@
 #include <KernelKit/UserProcessScheduler.h>
 #include <KernelKit/HardwareThreadScheduler.h>
 #include <KernelKit/CodeMgr.h>
-#include <Mod/ACPI/ACPIFactoryInterface.h>
+#include <modules/ACPI/ACPIFactoryInterface.h>
 #include <NetworkKit/IPC.h>
 #include <CFKit/Property.h>
-#include <Mod/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/TextMgr.h>
 
 EXTERN_C NeOS::VoidPtr kInterruptVectorTable[];
 EXTERN_C NeOS::VoidPtr mp_user_switch_proc;
diff --git a/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc b/dev/kernel/HALKit/AMD64/HalKernelPanic.cc
index 663a8f8e..f0595903 100644
--- a/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc
+++ b/dev/kernel/HALKit/AMD64/HalKernelPanic.cc
@@ -11,8 +11,8 @@
 #include <NewKit/KString.h>
 #include <FirmwareKit/Handover.h>
 #include <KernelKit/FileMgr.h>
-#include <Mod/CoreGfx/FBMgr.h>
-#include <Mod/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/TextMgr.h>
 #include <NewKit/Utils.h>
 
 /* Each error code is attributed with an ID, which will prompt a string onto the
diff --git a/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc b/dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc
index fe9f0421..fe9f0421 100644
--- a/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc
+++ b/dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc
diff --git a/dev/Kernel/HALKit/AMD64/HalProcessorAMD64.cc b/dev/kernel/HALKit/AMD64/HalProcessorAMD64.cc
index b3da8352..b3da8352 100644
--- a/dev/Kernel/HALKit/AMD64/HalProcessorAMD64.cc
+++ b/dev/kernel/HALKit/AMD64/HalProcessorAMD64.cc
diff --git a/dev/Kernel/HALKit/AMD64/HalRoutineWait.s b/dev/kernel/HALKit/AMD64/HalRoutineWait.s
index 89051ba4..89051ba4 100644
--- a/dev/Kernel/HALKit/AMD64/HalRoutineWait.s
+++ b/dev/kernel/HALKit/AMD64/HalRoutineWait.s
diff --git a/dev/Kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc b/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc
index bf4b9d91..bf4b9d91 100644
--- a/dev/Kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc
+++ b/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc
diff --git a/dev/Kernel/HALKit/AMD64/HalSystemCallInstall.cc b/dev/kernel/HALKit/AMD64/HalSystemCallInstall.cc
index e4e9daab..e4e9daab 100644
--- a/dev/Kernel/HALKit/AMD64/HalSystemCallInstall.cc
+++ b/dev/kernel/HALKit/AMD64/HalSystemCallInstall.cc
diff --git a/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc b/dev/kernel/HALKit/AMD64/HalTimerAMD64.cc
index 9b3380c3..53386d36 100644
--- a/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc
+++ b/dev/kernel/HALKit/AMD64/HalTimerAMD64.cc
@@ -11,7 +11,7 @@
 

 ------------------------------------------- */

 

-#include <Mod/ACPI/ACPIFactoryInterface.h>

+#include <modules/ACPI/ACPIFactoryInterface.h>

 #include <ArchKit/ArchKit.h>

 #include <KernelKit/Timer.h>

 

diff --git a/dev/Kernel/HALKit/AMD64/HalUtils.asm b/dev/kernel/HALKit/AMD64/HalUtils.asm
index 83453714..83453714 100644
--- a/dev/Kernel/HALKit/AMD64/HalUtils.asm
+++ b/dev/kernel/HALKit/AMD64/HalUtils.asm
diff --git a/dev/Kernel/HALKit/AMD64/Hypervisor.h b/dev/kernel/HALKit/AMD64/Hypervisor.h
index 4c226eee..4c226eee 100644
--- a/dev/Kernel/HALKit/AMD64/Hypervisor.h
+++ b/dev/kernel/HALKit/AMD64/Hypervisor.h
diff --git a/dev/Kernel/HALKit/AMD64/MBCI/HalMBCI.cc b/dev/kernel/HALKit/AMD64/MBCI/HalMBCI.cc
index 58124a18..09632bc9 100644
--- a/dev/Kernel/HALKit/AMD64/MBCI/HalMBCI.cc
+++ b/dev/kernel/HALKit/AMD64/MBCI/HalMBCI.cc
@@ -4,4 +4,4 @@
 
 ------------------------------------------- */
 
-#include <Mod/MBCI/MBCI.h>
+#include <modules/MBCI/MBCI.h>
diff --git a/dev/Kernel/HALKit/AMD64/PCI/DMA.cc b/dev/kernel/HALKit/AMD64/PCI/DMA.cc
index c756a572..c756a572 100644
--- a/dev/Kernel/HALKit/AMD64/PCI/DMA.cc
+++ b/dev/kernel/HALKit/AMD64/PCI/DMA.cc
diff --git a/dev/Kernel/HALKit/AMD64/PCI/Database.cc b/dev/kernel/HALKit/AMD64/PCI/Database.cc
index c5aa1282..c5aa1282 100644
--- a/dev/Kernel/HALKit/AMD64/PCI/Database.cc
+++ b/dev/kernel/HALKit/AMD64/PCI/Database.cc
diff --git a/dev/Kernel/HALKit/AMD64/PCI/Device.cc b/dev/kernel/HALKit/AMD64/PCI/Device.cc
index 348e058a..348e058a 100644
--- a/dev/Kernel/HALKit/AMD64/PCI/Device.cc
+++ b/dev/kernel/HALKit/AMD64/PCI/Device.cc
diff --git a/dev/Kernel/HALKit/AMD64/PCI/Express.cc b/dev/kernel/HALKit/AMD64/PCI/Express.cc
index 487cbd39..487cbd39 100644
--- a/dev/Kernel/HALKit/AMD64/PCI/Express.cc
+++ b/dev/kernel/HALKit/AMD64/PCI/Express.cc
diff --git a/dev/Kernel/HALKit/AMD64/PCI/IO.cc b/dev/kernel/HALKit/AMD64/PCI/IO.cc
index c20e1b0e..c20e1b0e 100644
--- a/dev/Kernel/HALKit/AMD64/PCI/IO.cc
+++ b/dev/kernel/HALKit/AMD64/PCI/IO.cc
diff --git a/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc b/dev/kernel/HALKit/AMD64/PCI/Iterator.cc
index bf215fe2..bf215fe2 100644
--- a/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc
+++ b/dev/kernel/HALKit/AMD64/PCI/Iterator.cc
diff --git a/dev/Kernel/HALKit/AMD64/PCI/PCI.cc b/dev/kernel/HALKit/AMD64/PCI/PCI.cc
index 01f2c23b..01f2c23b 100644
--- a/dev/Kernel/HALKit/AMD64/PCI/PCI.cc
+++ b/dev/kernel/HALKit/AMD64/PCI/PCI.cc
diff --git a/dev/Kernel/HALKit/AMD64/Paging.h b/dev/kernel/HALKit/AMD64/Paging.h
index 4e2ac1b1..4e2ac1b1 100644
--- a/dev/Kernel/HALKit/AMD64/Paging.h
+++ b/dev/kernel/HALKit/AMD64/Paging.h
diff --git a/dev/Kernel/HALKit/AMD64/Processor.h b/dev/kernel/HALKit/AMD64/Processor.h
index d223c320..d223c320 100644
--- a/dev/Kernel/HALKit/AMD64/Processor.h
+++ b/dev/kernel/HALKit/AMD64/Processor.h
diff --git a/dev/Kernel/HALKit/AMD64/ReadMe.md b/dev/kernel/HALKit/AMD64/ReadMe.md
index 02c8c86f..02c8c86f 100644
--- a/dev/Kernel/HALKit/AMD64/ReadMe.md
+++ b/dev/kernel/HALKit/AMD64/ReadMe.md
diff --git a/dev/Kernel/HALKit/AMD64/Storage/AHCI+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
index a17f3843..002266de 100644
--- a/dev/Kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
+++ b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc
@@ -22,8 +22,8 @@
 
 #include <FirmwareKit/EPM.h>
 
-#include <Mod/ATA/ATA.h>
-#include <Mod/AHCI/AHCI.h>
+#include <modules/ATA/ATA.h>
+#include <modules/AHCI/AHCI.h>
 #include <KernelKit/PCI/Iterator.h>
 #include <NewKit/Utils.h>
 #include <KernelKit/LockDelegate.h>
diff --git a/dev/Kernel/HALKit/AMD64/Storage/DMA+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc
index 109b55af..e025d24d 100644
--- a/dev/Kernel/HALKit/AMD64/Storage/DMA+Generic.cc
+++ b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc
@@ -15,7 +15,7 @@
  *
  */
 
-#include <Mod/ATA/ATA.h>
+#include <modules/ATA/ATA.h>
 #include <ArchKit/ArchKit.h>
 #include <KernelKit/PCI/Iterator.h>
 
diff --git a/dev/Kernel/HALKit/AMD64/Storage/PIO+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc
index 8e6197c9..cb629478 100644
--- a/dev/Kernel/HALKit/AMD64/Storage/PIO+Generic.cc
+++ b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc
@@ -15,7 +15,7 @@
  *
  */
 
-#include <Mod/ATA/ATA.h>
+#include <modules/ATA/ATA.h>
 #include <ArchKit/ArchKit.h>
 
 #ifdef __ATA_PIO__
diff --git a/dev/Kernel/HALKit/AMD64/make_ap_blob.sh b/dev/kernel/HALKit/AMD64/make_ap_blob.sh
index 3f079187..3f079187 100755
--- a/dev/Kernel/HALKit/AMD64/make_ap_blob.sh
+++ b/dev/kernel/HALKit/AMD64/make_ap_blob.sh
diff --git a/dev/Kernel/HALKit/ARM64/APM/APM+IO.cc b/dev/kernel/HALKit/ARM64/APM/APM+IO.cc
index a3366da4..752f29f9 100644
--- a/dev/Kernel/HALKit/ARM64/APM/APM+IO.cc
+++ b/dev/kernel/HALKit/ARM64/APM/APM+IO.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <Mod/APM/APM.h>
+#include <modules/APM/APM.h>
 #include <KernelKit/LPC.h>
 
 using namespace NeOS;
diff --git a/dev/Kernel/HALKit/ARM64/ApplicationProcessor.h b/dev/kernel/HALKit/ARM64/ApplicationProcessor.h
index d263f9b8..d263f9b8 100644
--- a/dev/Kernel/HALKit/ARM64/ApplicationProcessor.h
+++ b/dev/kernel/HALKit/ARM64/ApplicationProcessor.h
diff --git a/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc b/dev/kernel/HALKit/ARM64/HalACPIFactoryInterface.cc
index 8ca9ac06..a25112ae 100644
--- a/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc
+++ b/dev/kernel/HALKit/ARM64/HalACPIFactoryInterface.cc
@@ -4,11 +4,11 @@
 
 ------------------------------------------- */
 
-#include <Mod/ACPI/ACPIFactoryInterface.h>
+#include <modules/ACPI/ACPIFactoryInterface.h>
 #include <NewKit/KString.h>
 #include <ArchKit/ArchKit.h>
 #include <KernelKit/MemoryMgr.h>
-#include <Mod/APM/APM.h>
+#include <modules/APM/APM.h>
 
 namespace NeOS
 {
diff --git a/dev/Kernel/HALKit/ARM64/HalApplicationProcessor.cc b/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc
index 660af502..660af502 100644
--- a/dev/Kernel/HALKit/ARM64/HalApplicationProcessor.cc
+++ b/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc
diff --git a/dev/Kernel/HALKit/ARM64/HalDebugOutput.cc b/dev/kernel/HALKit/ARM64/HalDebugOutput.cc
index 8d54739f..8d54739f 100644
--- a/dev/Kernel/HALKit/ARM64/HalDebugOutput.cc
+++ b/dev/kernel/HALKit/ARM64/HalDebugOutput.cc
diff --git a/dev/Kernel/HALKit/ARM64/HalFlushTLB.S b/dev/kernel/HALKit/ARM64/HalFlushTLB.S
index 8fcf40ff..8fcf40ff 100644
--- a/dev/Kernel/HALKit/ARM64/HalFlushTLB.S
+++ b/dev/kernel/HALKit/ARM64/HalFlushTLB.S
diff --git a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc b/dev/kernel/HALKit/ARM64/HalKernelMain.cc
index 5a6d0dc2..55caca94 100644
--- a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc
+++ b/dev/kernel/HALKit/ARM64/HalKernelMain.cc
@@ -5,7 +5,7 @@
 ------------------------------------------- */
 
 #include <ArchKit/ArchKit.h>
-#include <Mod/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
 #include <FirmwareKit/Handover.h>
 #include <KernelKit/FileMgr.h>
 #include <KernelKit/MemoryMgr.h>
@@ -13,7 +13,7 @@
 #include <KernelKit/UserProcessScheduler.h>
 #include <NewKit/Json.h>
 #include <KernelKit/CodeMgr.h>
-#include <Mod/ACPI/ACPIFactoryInterface.h>
+#include <modules/ACPI/ACPIFactoryInterface.h>
 #include <NetworkKit/IPC.h>
 #include <HALKit/ARM64/Processor.h>
 #include <CFKit/Property.h>
diff --git a/dev/Kernel/HALKit/ARM64/HalKernelPanic.cc b/dev/kernel/HALKit/ARM64/HalKernelPanic.cc
index 533ae982..5037f440 100644
--- a/dev/Kernel/HALKit/ARM64/HalKernelPanic.cc
+++ b/dev/kernel/HALKit/ARM64/HalKernelPanic.cc
@@ -11,8 +11,8 @@
 #include <NewKit/KString.h>
 #include <FirmwareKit/Handover.h>
 #include <KernelKit/FileMgr.h>
-#include <Mod/CoreGfx/FBMgr.h>
-#include <Mod/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/TextMgr.h>
 #include <NewKit/Utils.h>
 
 /* Each error code is attributed with an ID, which will prompt a string onto the
diff --git a/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc b/dev/kernel/HALKit/ARM64/HalPagingMgrARM64.cc
index 4ec45b51..4ec45b51 100644
--- a/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc
+++ b/dev/kernel/HALKit/ARM64/HalPagingMgrARM64.cc
diff --git a/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc b/dev/kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc
index 55c8aab5..55c8aab5 100644
--- a/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc
+++ b/dev/kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc
diff --git a/dev/Kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc b/dev/kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc
index 3a9b7074..3a9b7074 100644
--- a/dev/Kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc
+++ b/dev/kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc
diff --git a/dev/Kernel/HALKit/ARM64/HalTimerARM64.cc b/dev/kernel/HALKit/ARM64/HalTimerARM64.cc
index 785d2d5c..785d2d5c 100644
--- a/dev/Kernel/HALKit/ARM64/HalTimerARM64.cc
+++ b/dev/kernel/HALKit/ARM64/HalTimerARM64.cc
diff --git a/dev/Kernel/HALKit/ARM64/MBCI/MBCI.cc b/dev/kernel/HALKit/ARM64/MBCI/MBCI.cc
index d9c39f4a..d2df66e6 100644
--- a/dev/Kernel/HALKit/ARM64/MBCI/MBCI.cc
+++ b/dev/kernel/HALKit/ARM64/MBCI/MBCI.cc
@@ -4,4 +4,4 @@
 
 ------------------------------------------- */
 
-#include <Mod/MBCI/MBCI.h>
\ No newline at end of file
+#include <modules/MBCI/MBCI.h>
\ No newline at end of file
diff --git a/dev/Kernel/HALKit/ARM64/Paging.h b/dev/kernel/HALKit/ARM64/Paging.h
index 3c24f757..3c24f757 100644
--- a/dev/Kernel/HALKit/ARM64/Paging.h
+++ b/dev/kernel/HALKit/ARM64/Paging.h
diff --git a/dev/Kernel/HALKit/ARM64/Processor.h b/dev/kernel/HALKit/ARM64/Processor.h
index 940cfbe9..940cfbe9 100644
--- a/dev/Kernel/HALKit/ARM64/Processor.h
+++ b/dev/kernel/HALKit/ARM64/Processor.h
diff --git a/dev/Kernel/HALKit/ARM64/ReadMe.md b/dev/kernel/HALKit/ARM64/ReadMe.md
index c51229f2..c51229f2 100644
--- a/dev/Kernel/HALKit/ARM64/ReadMe.md
+++ b/dev/kernel/HALKit/ARM64/ReadMe.md
diff --git a/dev/Kernel/HALKit/ARM64/Storage/MBCI+Flash+IO+Generic.cc b/dev/kernel/HALKit/ARM64/Storage/MBCI+Flash+IO+Generic.cc
index 3ccca867..94d20878 100644
--- a/dev/Kernel/HALKit/ARM64/Storage/MBCI+Flash+IO+Generic.cc
+++ b/dev/kernel/HALKit/ARM64/Storage/MBCI+Flash+IO+Generic.cc
@@ -8,8 +8,8 @@
 
 #include <NewKit/Defines.h>
 #include <ArchKit/ArchKit.h>
-#include <Mod/MFlash/MFlash.h>
-#include <Mod/MBCI/MBCI.h>
+#include <modules/MFlash/MFlash.h>
+#include <modules/MBCI/MBCI.h>
 
 /// @file MBCI+Flash.cc
 /// @brief MBCI Flash support.
diff --git a/dev/Kernel/HALKit/ARM64/Storage/UFS+Generic.cc b/dev/kernel/HALKit/ARM64/Storage/UFS+Generic.cc
index 20d06671..20d06671 100644
--- a/dev/Kernel/HALKit/ARM64/Storage/UFS+Generic.cc
+++ b/dev/kernel/HALKit/ARM64/Storage/UFS+Generic.cc
diff --git a/dev/Kernel/HALKit/AXP/CR.s b/dev/kernel/HALKit/AXP/CR.s
index 4d68257d..4d68257d 100644
--- a/dev/Kernel/HALKit/AXP/CR.s
+++ b/dev/kernel/HALKit/AXP/CR.s
diff --git a/dev/Kernel/HALKit/AXP/CoreInterruptHandlerDEC.cpp b/dev/kernel/HALKit/AXP/CoreInterruptHandlerDEC.cpp
index e69de29b..e69de29b 100644
--- a/dev/Kernel/HALKit/AXP/CoreInterruptHandlerDEC.cpp
+++ b/dev/kernel/HALKit/AXP/CoreInterruptHandlerDEC.cpp
diff --git a/dev/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp b/dev/kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp
index f77186fd..f77186fd 100644
--- a/dev/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp
+++ b/dev/kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp
diff --git a/dev/Kernel/HALKit/AXP/HAL.s b/dev/kernel/HALKit/AXP/HAL.s
index 0178527f..0178527f 100644
--- a/dev/Kernel/HALKit/AXP/HAL.s
+++ b/dev/kernel/HALKit/AXP/HAL.s
diff --git a/dev/Kernel/HALKit/AXP/Processor.h b/dev/kernel/HALKit/AXP/Processor.h
index bb14c9c6..bb14c9c6 100644
--- a/dev/Kernel/HALKit/AXP/Processor.h
+++ b/dev/kernel/HALKit/AXP/Processor.h
diff --git a/dev/Kernel/HALKit/AXP/SYSCALL.s b/dev/kernel/HALKit/AXP/SYSCALL.s
index 19cab808..19cab808 100644
--- a/dev/Kernel/HALKit/AXP/SYSCALL.s
+++ b/dev/kernel/HALKit/AXP/SYSCALL.s
diff --git a/dev/Kernel/HALKit/AXP/VM.s b/dev/kernel/HALKit/AXP/VM.s
index 7024086b..7024086b 100644
--- a/dev/Kernel/HALKit/AXP/VM.s
+++ b/dev/kernel/HALKit/AXP/VM.s
diff --git a/dev/Kernel/HALKit/POWER/.gitkeep b/dev/kernel/HALKit/POWER/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Kernel/HALKit/POWER/.gitkeep
+++ b/dev/kernel/HALKit/POWER/.gitkeep
diff --git a/dev/Kernel/HALKit/POWER/AP.h b/dev/kernel/HALKit/POWER/AP.h
index e0ef3ffb..e0ef3ffb 100644
--- a/dev/Kernel/HALKit/POWER/AP.h
+++ b/dev/kernel/HALKit/POWER/AP.h
diff --git a/dev/Kernel/HALKit/POWER/APM/.gitkeep b/dev/kernel/HALKit/POWER/APM/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Kernel/HALKit/POWER/APM/.gitkeep
+++ b/dev/kernel/HALKit/POWER/APM/.gitkeep
diff --git a/dev/Kernel/HALKit/POWER/HalAP.cc b/dev/kernel/HALKit/POWER/HalAP.cc
index 32f91a5f..32f91a5f 100644
--- a/dev/Kernel/HALKit/POWER/HalAP.cc
+++ b/dev/kernel/HALKit/POWER/HalAP.cc
diff --git a/dev/Kernel/HALKit/POWER/HalDebugOutput.cc b/dev/kernel/HALKit/POWER/HalDebugOutput.cc
index e9b2c85a..e9b2c85a 100644
--- a/dev/Kernel/HALKit/POWER/HalDebugOutput.cc
+++ b/dev/kernel/HALKit/POWER/HalDebugOutput.cc
diff --git a/dev/Kernel/HALKit/POWER/HalStartSequence.s b/dev/kernel/HALKit/POWER/HalStartSequence.s
index 2882be80..2882be80 100644
--- a/dev/Kernel/HALKit/POWER/HalStartSequence.s
+++ b/dev/kernel/HALKit/POWER/HalStartSequence.s
diff --git a/dev/Kernel/HALKit/POWER/HalThread.cc b/dev/kernel/HALKit/POWER/HalThread.cc
index 0d2e140b..0d2e140b 100644
--- a/dev/Kernel/HALKit/POWER/HalThread.cc
+++ b/dev/kernel/HALKit/POWER/HalThread.cc
diff --git a/dev/Kernel/HALKit/POWER/HalVirtualMemory.cc b/dev/kernel/HALKit/POWER/HalVirtualMemory.cc
index d3d4b694..d3d4b694 100644
--- a/dev/Kernel/HALKit/POWER/HalVirtualMemory.cc
+++ b/dev/kernel/HALKit/POWER/HalVirtualMemory.cc
diff --git a/dev/Kernel/HALKit/POWER/MBCI/.gitkeep b/dev/kernel/HALKit/POWER/MBCI/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Kernel/HALKit/POWER/MBCI/.gitkeep
+++ b/dev/kernel/HALKit/POWER/MBCI/.gitkeep
diff --git a/dev/Kernel/HALKit/POWER/MBCI/HalMBCIHost.cc b/dev/kernel/HALKit/POWER/MBCI/HalMBCIHost.cc
index 0d2e140b..0d2e140b 100644
--- a/dev/Kernel/HALKit/POWER/MBCI/HalMBCIHost.cc
+++ b/dev/kernel/HALKit/POWER/MBCI/HalMBCIHost.cc
diff --git a/dev/Kernel/HALKit/POWER/Processor.h b/dev/kernel/HALKit/POWER/Processor.h
index bbcfd01f..bbcfd01f 100644
--- a/dev/Kernel/HALKit/POWER/Processor.h
+++ b/dev/kernel/HALKit/POWER/Processor.h
diff --git a/dev/Kernel/HALKit/POWER/ReadMe.md b/dev/kernel/HALKit/POWER/ReadMe.md
index a9751581..a9751581 100644
--- a/dev/Kernel/HALKit/POWER/ReadMe.md
+++ b/dev/kernel/HALKit/POWER/ReadMe.md
diff --git a/dev/Drivers/.keep b/dev/kernel/HALKit/RISCV/.keep
index e69de29b..e69de29b 100644
--- a/dev/Drivers/.keep
+++ b/dev/kernel/HALKit/RISCV/.keep
diff --git a/dev/Kernel/HALKit/RISCV/AP.h b/dev/kernel/HALKit/RISCV/AP.h
index c198a404..c198a404 100644
--- a/dev/Kernel/HALKit/RISCV/AP.h
+++ b/dev/kernel/HALKit/RISCV/AP.h
diff --git a/dev/Kernel/HALKit/RISCV/APM/.gitkeep b/dev/kernel/HALKit/RISCV/APM/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Kernel/HALKit/RISCV/APM/.gitkeep
+++ b/dev/kernel/HALKit/RISCV/APM/.gitkeep
diff --git a/dev/Kernel/HALKit/RISCV/HalAP.cc b/dev/kernel/HALKit/RISCV/HalAP.cc
index 788acf0f..788acf0f 100644
--- a/dev/Kernel/HALKit/RISCV/HalAP.cc
+++ b/dev/kernel/HALKit/RISCV/HalAP.cc
diff --git a/dev/Kernel/HALKit/RISCV/ReadMe.md b/dev/kernel/HALKit/RISCV/ReadMe.md
index b099aa31..b099aa31 100644
--- a/dev/Kernel/HALKit/RISCV/ReadMe.md
+++ b/dev/kernel/HALKit/RISCV/ReadMe.md
diff --git a/dev/Kernel/HALKit/RISCV/Storage/.gitkeep b/dev/kernel/HALKit/RISCV/Storage/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Kernel/HALKit/RISCV/Storage/.gitkeep
+++ b/dev/kernel/HALKit/RISCV/Storage/.gitkeep
diff --git a/dev/Kernel/HALKit/X86S/.gitkeep b/dev/kernel/HALKit/X86S/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Kernel/HALKit/X86S/.gitkeep
+++ b/dev/kernel/HALKit/X86S/.gitkeep
diff --git a/dev/Kernel/HALKit/X86S/ACPI/.gitkeep b/dev/kernel/HALKit/X86S/ACPI/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Kernel/HALKit/X86S/ACPI/.gitkeep
+++ b/dev/kernel/HALKit/X86S/ACPI/.gitkeep
diff --git a/dev/Kernel/HALKit/X86S/Storage/.gitkeep b/dev/kernel/HALKit/X86S/Storage/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Kernel/HALKit/X86S/Storage/.gitkeep
+++ b/dev/kernel/HALKit/X86S/Storage/.gitkeep
diff --git a/dev/Kernel/KernelKit/BinaryMutex.h b/dev/kernel/KernelKit/BinaryMutex.h
index 21b2ca6d..21b2ca6d 100644
--- a/dev/Kernel/KernelKit/BinaryMutex.h
+++ b/dev/kernel/KernelKit/BinaryMutex.h
diff --git a/dev/Kernel/KernelKit/CodeMgr.h b/dev/kernel/KernelKit/CodeMgr.h
index 5f83c74b..5f83c74b 100644
--- a/dev/Kernel/KernelKit/CodeMgr.h
+++ b/dev/kernel/KernelKit/CodeMgr.h
diff --git a/dev/Kernel/KernelKit/DebugOutput.h b/dev/kernel/KernelKit/DebugOutput.h
index cfadd38d..cfadd38d 100644
--- a/dev/Kernel/KernelKit/DebugOutput.h
+++ b/dev/kernel/KernelKit/DebugOutput.h
diff --git a/dev/Kernel/KernelKit/Defines.h b/dev/kernel/KernelKit/Defines.h
index d86988a7..d86988a7 100644
--- a/dev/Kernel/KernelKit/Defines.h
+++ b/dev/kernel/KernelKit/Defines.h
diff --git a/dev/Kernel/KernelKit/DeviceMgr.h b/dev/kernel/KernelKit/DeviceMgr.h
index fa68d2e7..fa68d2e7 100644
--- a/dev/Kernel/KernelKit/DeviceMgr.h
+++ b/dev/kernel/KernelKit/DeviceMgr.h
diff --git a/dev/Kernel/KernelKit/DriveMgr.h b/dev/kernel/KernelKit/DriveMgr.h
index f5699dcb..87bd2714 100644
--- a/dev/Kernel/KernelKit/DriveMgr.h
+++ b/dev/kernel/KernelKit/DriveMgr.h
@@ -49,7 +49,7 @@ namespace NeOS
 	/// @brief Media drive trait type.
 	struct DriveTrait final
 	{
-		Char  fName[kDriveNameLen]; // /System, /Boot, //./Devices/USB...
+		Char  fName[kDriveNameLen]; // /System, /boot, //./Devices/USB...
 		Int32 fKind;				// fMassStorage, fFloppy, fOpticalDrive.
 		Int32 fFlags;				// fReadOnly, fEPMDrive...
 
diff --git a/dev/Kernel/KernelKit/FileMgr.h b/dev/kernel/KernelKit/FileMgr.h
index 543a9ae4..7374df9d 100644
--- a/dev/Kernel/KernelKit/FileMgr.h
+++ b/dev/kernel/KernelKit/FileMgr.h
@@ -25,12 +25,12 @@
 #include <FSKit/NeFS.h>
 #endif // __FSKIT_INCLUDES_NEFS__
 
-#ifdef __FSKIT_INCLUDES_HPFS__
-#include <FSKit/HPFS.h>
-#endif // __FSKIT_INCLUDES_HPFS__
+#ifdef __FSKIT_INCLUDES_HeFS__
+#include <FSKit/HeFS.h>
+#endif // __FSKIT_INCLUDES_HeFS__
 
 #include <CompilerKit/CompilerKit.h>
-#include <Hints/CompilerHint.h>
+#include <HintsKit/CompilerHint.h>
 #include <KernelKit/LPC.h>
 #include <KernelKit/DebugOutput.h>
 #include <NewKit/Stream.h>
diff --git a/dev/Kernel/KernelKit/HardwareThreadScheduler.h b/dev/kernel/KernelKit/HardwareThreadScheduler.h
index 1866686e..1866686e 100644
--- a/dev/Kernel/KernelKit/HardwareThreadScheduler.h
+++ b/dev/kernel/KernelKit/HardwareThreadScheduler.h
diff --git a/dev/Kernel/KernelKit/IDylibObject.h b/dev/kernel/KernelKit/IDylibObject.h
index c872b86f..c872b86f 100644
--- a/dev/Kernel/KernelKit/IDylibObject.h
+++ b/dev/kernel/KernelKit/IDylibObject.h
diff --git a/dev/Kernel/KernelKit/IPEFDylibObject.h b/dev/kernel/KernelKit/IPEFDylibObject.h
index 20f87410..20f87410 100644
--- a/dev/Kernel/KernelKit/IPEFDylibObject.h
+++ b/dev/kernel/KernelKit/IPEFDylibObject.h
diff --git a/dev/Kernel/KernelKit/LPC.h b/dev/kernel/KernelKit/LPC.h
index d76eeff1..d76eeff1 100644
--- a/dev/Kernel/KernelKit/LPC.h
+++ b/dev/kernel/KernelKit/LPC.h
diff --git a/dev/Kernel/KernelKit/LoaderInterface.h b/dev/kernel/KernelKit/LoaderInterface.h
index b81dfa16..04e197aa 100644
--- a/dev/Kernel/KernelKit/LoaderInterface.h
+++ b/dev/kernel/KernelKit/LoaderInterface.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <CompilerKit/CompilerKit.h>
-#include <Hints/CompilerHint.h>
+#include <HintsKit/CompilerHint.h>
 #include <NewKit/Defines.h>
 #include <NewKit/ErrorOr.h>
 
diff --git a/dev/Kernel/KernelKit/LockDelegate.h b/dev/kernel/KernelKit/LockDelegate.h
index a657caa0..a657caa0 100644
--- a/dev/Kernel/KernelKit/LockDelegate.h
+++ b/dev/kernel/KernelKit/LockDelegate.h
diff --git a/dev/Kernel/HALKit/RISCV/.keep b/dev/kernel/KernelKit/MBCI/.keep
index e69de29b..e69de29b 100644
--- a/dev/Kernel/HALKit/RISCV/.keep
+++ b/dev/kernel/KernelKit/MBCI/.keep
diff --git a/dev/Kernel/KernelKit/MSDOS.h b/dev/kernel/KernelKit/MSDOS.h
index 1a3df13b..1a3df13b 100644
--- a/dev/Kernel/KernelKit/MSDOS.h
+++ b/dev/kernel/KernelKit/MSDOS.h
diff --git a/dev/Kernel/KernelKit/MemoryMgr.h b/dev/kernel/KernelKit/MemoryMgr.h
index ac12587f..93718493 100644
--- a/dev/Kernel/KernelKit/MemoryMgr.h
+++ b/dev/kernel/KernelKit/MemoryMgr.h
@@ -13,7 +13,7 @@
 
 #include <NewKit/KernelPanic.h>
 #include <KernelKit/LPC.h>
-#include <Hints/CompilerHint.h>
+#include <HintsKit/CompilerHint.h>
 
 namespace NeOS
 {
diff --git a/dev/Kernel/KernelKit/PCI/DMA.h b/dev/kernel/KernelKit/PCI/DMA.h
index 68f3fa37..68f3fa37 100644
--- a/dev/Kernel/KernelKit/PCI/DMA.h
+++ b/dev/kernel/KernelKit/PCI/DMA.h
diff --git a/dev/Kernel/KernelKit/PCI/DMA.inl b/dev/kernel/KernelKit/PCI/DMA.inl
index d9c6e551..d9c6e551 100644
--- a/dev/Kernel/KernelKit/PCI/DMA.inl
+++ b/dev/kernel/KernelKit/PCI/DMA.inl
diff --git a/dev/Kernel/KernelKit/PCI/Database.h b/dev/kernel/KernelKit/PCI/Database.h
index cb12a731..cb12a731 100644
--- a/dev/Kernel/KernelKit/PCI/Database.h
+++ b/dev/kernel/KernelKit/PCI/Database.h
diff --git a/dev/Kernel/KernelKit/PCI/Device.h b/dev/kernel/KernelKit/PCI/Device.h
index 9870f618..9870f618 100644
--- a/dev/Kernel/KernelKit/PCI/Device.h
+++ b/dev/kernel/KernelKit/PCI/Device.h
diff --git a/dev/Kernel/KernelKit/PCI/Express.h b/dev/kernel/KernelKit/PCI/Express.h
index c437a1cb..c437a1cb 100644
--- a/dev/Kernel/KernelKit/PCI/Express.h
+++ b/dev/kernel/KernelKit/PCI/Express.h
diff --git a/dev/Kernel/KernelKit/PCI/IO.h b/dev/kernel/KernelKit/PCI/IO.h
index 1d60df8e..1d60df8e 100644
--- a/dev/Kernel/KernelKit/PCI/IO.h
+++ b/dev/kernel/KernelKit/PCI/IO.h
diff --git a/dev/Kernel/KernelKit/PCI/IOArray+AMD64.inl b/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl
index 2630fa98..2630fa98 100644
--- a/dev/Kernel/KernelKit/PCI/IOArray+AMD64.inl
+++ b/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl
diff --git a/dev/Kernel/KernelKit/PCI/Iterator.h b/dev/kernel/KernelKit/PCI/Iterator.h
index 2a788450..2a788450 100644
--- a/dev/Kernel/KernelKit/PCI/Iterator.h
+++ b/dev/kernel/KernelKit/PCI/Iterator.h
diff --git a/dev/Kernel/KernelKit/PCI/PCI.h b/dev/kernel/KernelKit/PCI/PCI.h
index 7eec9ec1..7eec9ec1 100644
--- a/dev/Kernel/KernelKit/PCI/PCI.h
+++ b/dev/kernel/KernelKit/PCI/PCI.h
diff --git a/dev/Kernel/KernelKit/PE.h b/dev/kernel/KernelKit/PE.h
index dbcf2ded..dbcf2ded 100644
--- a/dev/Kernel/KernelKit/PE.h
+++ b/dev/kernel/KernelKit/PE.h
diff --git a/dev/Kernel/KernelKit/PECodeMgr.h b/dev/kernel/KernelKit/PECodeMgr.h
index 1e445b9f..1e445b9f 100644
--- a/dev/Kernel/KernelKit/PECodeMgr.h
+++ b/dev/kernel/KernelKit/PECodeMgr.h
diff --git a/dev/Kernel/KernelKit/PEF.h b/dev/kernel/KernelKit/PEF.h
index dfdaed12..dfdaed12 100644
--- a/dev/Kernel/KernelKit/PEF.h
+++ b/dev/kernel/KernelKit/PEF.h
diff --git a/dev/Kernel/KernelKit/PEFCodeMgr.h b/dev/kernel/KernelKit/PEFCodeMgr.h
index 47aea432..47aea432 100644
--- a/dev/Kernel/KernelKit/PEFCodeMgr.h
+++ b/dev/kernel/KernelKit/PEFCodeMgr.h
diff --git a/dev/Kernel/KernelKit/Semaphore.h b/dev/kernel/KernelKit/Semaphore.h
index ac810c62..ac810c62 100644
--- a/dev/Kernel/KernelKit/Semaphore.h
+++ b/dev/kernel/KernelKit/Semaphore.h
diff --git a/dev/Kernel/KernelKit/ThreadLocalStorage.h b/dev/kernel/KernelKit/ThreadLocalStorage.h
index 573b40b8..573b40b8 100644
--- a/dev/Kernel/KernelKit/ThreadLocalStorage.h
+++ b/dev/kernel/KernelKit/ThreadLocalStorage.h
diff --git a/dev/Kernel/KernelKit/ThreadLocalStorage.inl b/dev/kernel/KernelKit/ThreadLocalStorage.inl
index d912f5aa..d912f5aa 100644
--- a/dev/Kernel/KernelKit/ThreadLocalStorage.inl
+++ b/dev/kernel/KernelKit/ThreadLocalStorage.inl
diff --git a/dev/Kernel/KernelKit/Timer.h b/dev/kernel/KernelKit/Timer.h
index abca5352..abca5352 100644
--- a/dev/Kernel/KernelKit/Timer.h
+++ b/dev/kernel/KernelKit/Timer.h
diff --git a/dev/Kernel/KernelKit/User.h b/dev/kernel/KernelKit/User.h
index 9ab2b02e..9ab2b02e 100644
--- a/dev/Kernel/KernelKit/User.h
+++ b/dev/kernel/KernelKit/User.h
diff --git a/dev/Kernel/KernelKit/UserProcessScheduler.h b/dev/kernel/KernelKit/UserProcessScheduler.h
index 10a08e0f..10a08e0f 100644
--- a/dev/Kernel/KernelKit/UserProcessScheduler.h
+++ b/dev/kernel/KernelKit/UserProcessScheduler.h
diff --git a/dev/Kernel/KernelKit/UserProcessScheduler.inl b/dev/kernel/KernelKit/UserProcessScheduler.inl
index 6b3b9300..6b3b9300 100644
--- a/dev/Kernel/KernelKit/UserProcessScheduler.inl
+++ b/dev/kernel/KernelKit/UserProcessScheduler.inl
diff --git a/dev/Kernel/KernelKit/XCOFF.h b/dev/kernel/KernelKit/XCOFF.h
index 5e59e717..5e59e717 100644
--- a/dev/Kernel/KernelKit/XCOFF.h
+++ b/dev/kernel/KernelKit/XCOFF.h
diff --git a/dev/Kernel/KernelRsrc.rsrc b/dev/kernel/KernelRsrc.rsrc
index 921645b0..d437c176 100644
--- a/dev/Kernel/KernelRsrc.rsrc
+++ b/dev/kernel/KernelRsrc.rsrc
@@ -9,7 +9,7 @@ BEGIN
     BLOCK "080904E4"
     BEGIN
       VALUE "CompanyName", "Amlal El Mahrouss."
-	  VALUE "FileDescription", "NeKernel MicroKernel."
+	  VALUE "FileDescription", "NeKernel."
       VALUE "FileVersion", KERNEL_VERSION
 	  VALUE "InternalName", "neoskrnl"
       VALUE "LegalCopyright", "(c) 2024 Amlal El Mahrouss, all rights reserved."
diff --git a/dev/Kernel/MoveAll.ARM64.sh b/dev/kernel/MoveAll.ARM64.sh
index 35e0909e..35e0909e 100755
--- a/dev/Kernel/MoveAll.ARM64.sh
+++ b/dev/kernel/MoveAll.ARM64.sh
diff --git a/dev/Kernel/MoveAll.X64.sh b/dev/kernel/MoveAll.X64.sh
index 1c135d06..1c135d06 100755
--- a/dev/Kernel/MoveAll.X64.sh
+++ b/dev/kernel/MoveAll.X64.sh
diff --git a/dev/Kernel/NetworkKit/IP.h b/dev/kernel/NetworkKit/IP.h
index 4a552d87..4a552d87 100644
--- a/dev/Kernel/NetworkKit/IP.h
+++ b/dev/kernel/NetworkKit/IP.h
diff --git a/dev/Kernel/NetworkKit/IPC.h b/dev/kernel/NetworkKit/IPC.h
index 9047a8af..e8f0898f 100644
--- a/dev/Kernel/NetworkKit/IPC.h
+++ b/dev/kernel/NetworkKit/IPC.h
@@ -12,7 +12,7 @@
 
 #include <NewKit/Defines.h>
 #include <NewKit/KString.h>
-#include <Hints/CompilerHint.h>
+#include <HintsKit/CompilerHint.h>
 
 /// @file IPC.h
 /// @brief IPC comm. protocol.
diff --git a/dev/Kernel/NetworkKit/LTE.h b/dev/kernel/NetworkKit/LTE.h
index e0a0ff64..e0a0ff64 100644
--- a/dev/Kernel/NetworkKit/LTE.h
+++ b/dev/kernel/NetworkKit/LTE.h
diff --git a/dev/Kernel/NetworkKit/MAC.h b/dev/kernel/NetworkKit/MAC.h
index f7283708..f7283708 100644
--- a/dev/Kernel/NetworkKit/MAC.h
+++ b/dev/kernel/NetworkKit/MAC.h
diff --git a/dev/Kernel/NetworkKit/NetworkDevice.h b/dev/kernel/NetworkKit/NetworkDevice.h
index c95573f3..c95573f3 100644
--- a/dev/Kernel/NetworkKit/NetworkDevice.h
+++ b/dev/kernel/NetworkKit/NetworkDevice.h
diff --git a/dev/Kernel/NetworkKit/NetworkDevice.inl b/dev/kernel/NetworkKit/NetworkDevice.inl
index dceae66e..dceae66e 100644
--- a/dev/Kernel/NetworkKit/NetworkDevice.inl
+++ b/dev/kernel/NetworkKit/NetworkDevice.inl
diff --git a/dev/Kernel/NewKit/Array.h b/dev/kernel/NewKit/Array.h
index 54c09636..54c09636 100644
--- a/dev/Kernel/NewKit/Array.h
+++ b/dev/kernel/NewKit/Array.h
diff --git a/dev/Kernel/NewKit/ArrayList.h b/dev/kernel/NewKit/ArrayList.h
index 06763b5a..06763b5a 100644
--- a/dev/Kernel/NewKit/ArrayList.h
+++ b/dev/kernel/NewKit/ArrayList.h
diff --git a/dev/Kernel/NewKit/Atom.h b/dev/kernel/NewKit/Atom.h
index 3979b0d1..3979b0d1 100644
--- a/dev/Kernel/NewKit/Atom.h
+++ b/dev/kernel/NewKit/Atom.h
diff --git a/dev/Kernel/NewKit/Crc32.h b/dev/kernel/NewKit/Crc32.h
index c3e14413..c3e14413 100644
--- a/dev/Kernel/NewKit/Crc32.h
+++ b/dev/kernel/NewKit/Crc32.h
diff --git a/dev/Kernel/NewKit/CxxAbi.h b/dev/kernel/NewKit/CxxAbi.h
index e6d83e07..e6d83e07 100644
--- a/dev/Kernel/NewKit/CxxAbi.h
+++ b/dev/kernel/NewKit/CxxAbi.h
diff --git a/dev/Kernel/NewKit/Defines.h b/dev/kernel/NewKit/Defines.h
index 0b0b97e5..0b0b97e5 100644
--- a/dev/Kernel/NewKit/Defines.h
+++ b/dev/kernel/NewKit/Defines.h
diff --git a/dev/Kernel/NewKit/ErrorOr.h b/dev/kernel/NewKit/ErrorOr.h
index 7c879cc8..7c879cc8 100644
--- a/dev/Kernel/NewKit/ErrorOr.h
+++ b/dev/kernel/NewKit/ErrorOr.h
diff --git a/dev/Kernel/NewKit/Function.h b/dev/kernel/NewKit/Function.h
index d25c06c1..d25c06c1 100644
--- a/dev/Kernel/NewKit/Function.h
+++ b/dev/kernel/NewKit/Function.h
diff --git a/dev/Kernel/NewKit/Json.h b/dev/kernel/NewKit/Json.h
index 7b53fa4a..7b53fa4a 100644
--- a/dev/Kernel/NewKit/Json.h
+++ b/dev/kernel/NewKit/Json.h
diff --git a/dev/Kernel/NewKit/KString.h b/dev/kernel/NewKit/KString.h
index e7525a9c..e7525a9c 100644
--- a/dev/Kernel/NewKit/KString.h
+++ b/dev/kernel/NewKit/KString.h
diff --git a/dev/Kernel/NewKit/KernelPanic.h b/dev/kernel/NewKit/KernelPanic.h
index 11f9a05d..11f9a05d 100644
--- a/dev/Kernel/NewKit/KernelPanic.h
+++ b/dev/kernel/NewKit/KernelPanic.h
diff --git a/dev/Kernel/NewKit/Macros.h b/dev/kernel/NewKit/Macros.h
index 637a2a30..637a2a30 100644
--- a/dev/Kernel/NewKit/Macros.h
+++ b/dev/kernel/NewKit/Macros.h
diff --git a/dev/Kernel/NewKit/MutableArray.h b/dev/kernel/NewKit/MutableArray.h
index bfb432de..bfb432de 100644
--- a/dev/Kernel/NewKit/MutableArray.h
+++ b/dev/kernel/NewKit/MutableArray.h
diff --git a/dev/Kernel/NewKit/New.h b/dev/kernel/NewKit/New.h
index 5e1545db..5e1545db 100644
--- a/dev/Kernel/NewKit/New.h
+++ b/dev/kernel/NewKit/New.h
diff --git a/dev/Kernel/NewKit/NewKit.h b/dev/kernel/NewKit/NewKit.h
index 69d39824..69d39824 100644
--- a/dev/Kernel/NewKit/NewKit.h
+++ b/dev/kernel/NewKit/NewKit.h
diff --git a/dev/Kernel/NewKit/OwnPtr.h b/dev/kernel/NewKit/OwnPtr.h
index 169f16d9..169f16d9 100644
--- a/dev/Kernel/NewKit/OwnPtr.h
+++ b/dev/kernel/NewKit/OwnPtr.h
diff --git a/dev/Kernel/NewKit/PageMgr.h b/dev/kernel/NewKit/PageMgr.h
index 3d8e1f9a..3d8e1f9a 100644
--- a/dev/Kernel/NewKit/PageMgr.h
+++ b/dev/kernel/NewKit/PageMgr.h
diff --git a/dev/Kernel/NewKit/Pair.h b/dev/kernel/NewKit/Pair.h
index 05a95ff3..05a95ff3 100644
--- a/dev/Kernel/NewKit/Pair.h
+++ b/dev/kernel/NewKit/Pair.h
diff --git a/dev/Kernel/NewKit/Pmm.h b/dev/kernel/NewKit/Pmm.h
index 97bdc0eb..97bdc0eb 100644
--- a/dev/Kernel/NewKit/Pmm.h
+++ b/dev/kernel/NewKit/Pmm.h
diff --git a/dev/Kernel/NewKit/Ref.h b/dev/kernel/NewKit/Ref.h
index e41bf3bc..e41bf3bc 100644
--- a/dev/Kernel/NewKit/Ref.h
+++ b/dev/kernel/NewKit/Ref.h
diff --git a/dev/Kernel/NewKit/Stream.h b/dev/kernel/NewKit/Stream.h
index 541d3389..541d3389 100644
--- a/dev/Kernel/NewKit/Stream.h
+++ b/dev/kernel/NewKit/Stream.h
diff --git a/dev/Kernel/NewKit/Utils.h b/dev/kernel/NewKit/Utils.h
index 3df823ef..3df823ef 100644
--- a/dev/Kernel/NewKit/Utils.h
+++ b/dev/kernel/NewKit/Utils.h
diff --git a/dev/Kernel/NewKit/Variant.h b/dev/kernel/NewKit/Variant.h
index 82be6636..82be6636 100644
--- a/dev/Kernel/NewKit/Variant.h
+++ b/dev/kernel/NewKit/Variant.h
diff --git a/dev/Kernel/SignalKit/Signals.h b/dev/kernel/SignalKit/Signals.h
index 09d392f6..09d392f6 100644
--- a/dev/Kernel/SignalKit/Signals.h
+++ b/dev/kernel/SignalKit/Signals.h
diff --git a/dev/Kernel/StorageKit/AHCI.h b/dev/kernel/StorageKit/AHCI.h
index 43e81ba0..43e81ba0 100644
--- a/dev/Kernel/StorageKit/AHCI.h
+++ b/dev/kernel/StorageKit/AHCI.h
diff --git a/dev/Kernel/StorageKit/ATA.h b/dev/kernel/StorageKit/ATA.h
index 5698fe85..5698fe85 100644
--- a/dev/Kernel/StorageKit/ATA.h
+++ b/dev/kernel/StorageKit/ATA.h
diff --git a/dev/Kernel/StorageKit/NVME.h b/dev/kernel/StorageKit/NVME.h
index 22300726..22300726 100644
--- a/dev/Kernel/StorageKit/NVME.h
+++ b/dev/kernel/StorageKit/NVME.h
diff --git a/dev/Kernel/StorageKit/PRDT.h b/dev/kernel/StorageKit/PRDT.h
index 40ba11e0..40ba11e0 100644
--- a/dev/Kernel/StorageKit/PRDT.h
+++ b/dev/kernel/StorageKit/PRDT.h
diff --git a/dev/Kernel/StorageKit/SCSI.h b/dev/kernel/StorageKit/SCSI.h
index beb8256b..fc526447 100644
--- a/dev/Kernel/StorageKit/SCSI.h
+++ b/dev/kernel/StorageKit/SCSI.h
@@ -6,6 +6,6 @@
 
 #pragma once
 
-#include <Mod/SCSI/SCSI.h>
+#include <modules/SCSI/SCSI.h>
 
 extern const scsi_packet_type<12> kCDRomPacketTemplate;
diff --git a/dev/Kernel/StorageKit/StorageKit.h b/dev/kernel/StorageKit/StorageKit.h
index a0f1a2d1..a0f1a2d1 100644
--- a/dev/Kernel/StorageKit/StorageKit.h
+++ b/dev/kernel/StorageKit/StorageKit.h
diff --git a/dev/Kernel/SystemKit/SwapDisk.h b/dev/kernel/SystemKit/SwapDisk.h
index 11cc6332..11cc6332 100644
--- a/dev/Kernel/SystemKit/SwapDisk.h
+++ b/dev/kernel/SystemKit/SwapDisk.h
diff --git a/dev/Kernel/amd64-ci.make b/dev/kernel/amd64-ci.make
index 534e896c..534e896c 100644
--- a/dev/Kernel/amd64-ci.make
+++ b/dev/kernel/amd64-ci.make
diff --git a/dev/Kernel/amd64-desktop.make b/dev/kernel/amd64-desktop.make
index 534e896c..534e896c 100644
--- a/dev/Kernel/amd64-desktop.make
+++ b/dev/kernel/amd64-desktop.make
diff --git a/dev/Kernel/arm64-desktop.make b/dev/kernel/arm64-desktop.make
index 1b3521d5..1b3521d5 100644
--- a/dev/Kernel/arm64-desktop.make
+++ b/dev/kernel/arm64-desktop.make
diff --git a/dev/Kernel/arm64-mobile.make b/dev/kernel/arm64-mobile.make
index 1b3521d5..1b3521d5 100644
--- a/dev/Kernel/arm64-mobile.make
+++ b/dev/kernel/arm64-mobile.make
diff --git a/dev/Kernel/obj/.hgkeep b/dev/kernel/obj/.hgkeep
index e69de29b..e69de29b 100644
--- a/dev/Kernel/obj/.hgkeep
+++ b/dev/kernel/obj/.hgkeep
diff --git a/dev/Kernel/power64-cb.make b/dev/kernel/power64-cb.make
index 83ab3235..83ab3235 100644
--- a/dev/Kernel/power64-cb.make
+++ b/dev/kernel/power64-cb.make
diff --git a/dev/Kernel/riscv64-cb.make b/dev/kernel/riscv64-cb.make
index e69de29b..e69de29b 100644
--- a/dev/Kernel/riscv64-cb.make
+++ b/dev/kernel/riscv64-cb.make
diff --git a/dev/Kernel/src/ACPIFactoryInterface.cc b/dev/kernel/src/ACPIFactoryInterface.cc
index eaa97052..3cc76e44 100644
--- a/dev/Kernel/src/ACPIFactoryInterface.cc
+++ b/dev/kernel/src/ACPIFactoryInterface.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <Mod/ACPI/ACPIFactoryInterface.h>
+#include <modules/ACPI/ACPIFactoryInterface.h>
 #include <NewKit/KString.h>
 #include <ArchKit/ArchKit.h>
 #include <KernelKit/MemoryMgr.h>
diff --git a/dev/Kernel/src/Array.cc b/dev/kernel/src/Array.cc
index 29baf162..29baf162 100644
--- a/dev/Kernel/src/Array.cc
+++ b/dev/kernel/src/Array.cc
diff --git a/dev/Kernel/src/ArrayList.cc b/dev/kernel/src/ArrayList.cc
index f7221b19..f7221b19 100644
--- a/dev/Kernel/src/ArrayList.cc
+++ b/dev/kernel/src/ArrayList.cc
diff --git a/dev/Kernel/src/Atom.cc b/dev/kernel/src/Atom.cc
index 92620c27..92620c27 100644
--- a/dev/Kernel/src/Atom.cc
+++ b/dev/kernel/src/Atom.cc
diff --git a/dev/Kernel/src/BinaryMutex.cc b/dev/kernel/src/BinaryMutex.cc
index 4fdaa8f4..4fdaa8f4 100644
--- a/dev/Kernel/src/BinaryMutex.cc
+++ b/dev/kernel/src/BinaryMutex.cc
diff --git a/dev/Kernel/src/BitMapMgr.cc b/dev/kernel/src/BitMapMgr.cc
index 18b1a156..18b1a156 100644
--- a/dev/Kernel/src/BitMapMgr.cc
+++ b/dev/kernel/src/BitMapMgr.cc
diff --git a/dev/Kernel/src/CodeMgr.cc b/dev/kernel/src/CodeMgr.cc
index c639155d..c639155d 100644
--- a/dev/Kernel/src/CodeMgr.cc
+++ b/dev/kernel/src/CodeMgr.cc
diff --git a/dev/Kernel/src/Crc32.cc b/dev/kernel/src/Crc32.cc
index 98821602..98821602 100644
--- a/dev/Kernel/src/Crc32.cc
+++ b/dev/kernel/src/Crc32.cc
diff --git a/dev/Kernel/src/CxxAbi-AMD64.cc b/dev/kernel/src/CxxAbi-AMD64.cc
index f0e57077..f0e57077 100644
--- a/dev/Kernel/src/CxxAbi-AMD64.cc
+++ b/dev/kernel/src/CxxAbi-AMD64.cc
diff --git a/dev/Kernel/src/CxxAbi-ARM64.cc b/dev/kernel/src/CxxAbi-ARM64.cc
index b52be160..b52be160 100644
--- a/dev/Kernel/src/CxxAbi-ARM64.cc
+++ b/dev/kernel/src/CxxAbi-ARM64.cc
diff --git a/dev/Kernel/src/Defines.cc b/dev/kernel/src/Defines.cc
index c29afcf4..c29afcf4 100644
--- a/dev/Kernel/src/Defines.cc
+++ b/dev/kernel/src/Defines.cc
diff --git a/dev/Kernel/src/DeviceMgr.cc b/dev/kernel/src/DeviceMgr.cc
index 760d17d9..760d17d9 100644
--- a/dev/Kernel/src/DeviceMgr.cc
+++ b/dev/kernel/src/DeviceMgr.cc
diff --git a/dev/Kernel/src/DriveMgr+IO.cc b/dev/kernel/src/DriveMgr+IO.cc
index 8381087f..8381087f 100644
--- a/dev/Kernel/src/DriveMgr+IO.cc
+++ b/dev/kernel/src/DriveMgr+IO.cc
diff --git a/dev/Kernel/src/DriveMgr.cc b/dev/kernel/src/DriveMgr.cc
index 27c082ed..039f7e08 100644
--- a/dev/Kernel/src/DriveMgr.cc
+++ b/dev/kernel/src/DriveMgr.cc
@@ -8,9 +8,9 @@
 #include <KernelKit/DriveMgr.h>
 #include <NewKit/Utils.h>
 #include <FirmwareKit/EPM.h>
-#include <Mod/ATA/ATA.h>
-#include <Mod/AHCI/AHCI.h>
-#include <Mod/NVME/NVME.h>
+#include <modules/ATA/ATA.h>
+#include <modules/AHCI/AHCI.h>
+#include <modules/NVME/NVME.h>
 
 /***********************************************************************************/
 /// @file DriveMgr.cc
diff --git a/dev/Kernel/src/ErrorOr.cc b/dev/kernel/src/ErrorOr.cc
index 7a55715c..7a55715c 100644
--- a/dev/Kernel/src/ErrorOr.cc
+++ b/dev/kernel/src/ErrorOr.cc
diff --git a/dev/Kernel/src/FS/HPFS.cc b/dev/kernel/src/FS/HeFS.cc
index a3b1cab5..7615ed77 100644
--- a/dev/Kernel/src/FS/HPFS.cc
+++ b/dev/kernel/src/FS/HeFS.cc
@@ -4,12 +4,12 @@
 
 ------------------------------------------- */
 
-#ifdef __FSKIT_INCLUDES_HPFS__
+#ifdef __FSKIT_INCLUDES_HeFS__
 
-#include <Mod/AHCI/AHCI.h>
-#include <Mod/ATA/ATA.h>
-#include <Mod/Flash/Flash.h>
-#include <FSKit/HPFS.h>
+#include <modules/AHCI/AHCI.h>
+#include <modules/ATA/ATA.h>
+#include <modules/Flash/Flash.h>
+#include <FSKit/HeFS.h>
 #include <KernelKit/LPC.h>
 #include <NewKit/Crc32.h>
 #include <NewKit/KernelPanic.h>
@@ -19,4 +19,4 @@
 #include <KernelKit/UserProcessScheduler.h>
 #include <KernelKit/User.h>
 
-#endif // ifdef __FSKIT_INCLUDES_HPFS__
+#endif // ifdef __FSKIT_INCLUDES_HeFS__
diff --git a/dev/Kernel/src/FS/NeFS+FileMgr.cc b/dev/kernel/src/FS/NeFS+FileMgr.cc
index 0ac6384d..0ac6384d 100644
--- a/dev/Kernel/src/FS/NeFS+FileMgr.cc
+++ b/dev/kernel/src/FS/NeFS+FileMgr.cc
diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/kernel/src/FS/NeFS.cc
index 2742b03d..30d4fb85 100644
--- a/dev/Kernel/src/FS/NeFS.cc
+++ b/dev/kernel/src/FS/NeFS.cc
@@ -9,9 +9,9 @@
 #include <FSKit/NeFS.h>
 #include <FirmwareKit/EPM.h>
 
-#include <Mod/AHCI/AHCI.h>
-#include <Mod/ATA/ATA.h>
-#include <Mod/MFlash/MFlash.h>
+#include <modules/AHCI/AHCI.h>
+#include <modules/ATA/ATA.h>
+#include <modules/MFlash/MFlash.h>
 #include <KernelKit/LPC.h>
 #include <NewKit/Crc32.h>
 #include <NewKit/KernelPanic.h>
diff --git a/dev/Kernel/src/FileMgr.cc b/dev/kernel/src/FileMgr.cc
index b803253d..b803253d 100644
--- a/dev/Kernel/src/FileMgr.cc
+++ b/dev/kernel/src/FileMgr.cc
diff --git a/dev/Kernel/src/GUIDWizard.cc b/dev/kernel/src/GUIDWizard.cc
index 96e15d85..96e15d85 100644
--- a/dev/Kernel/src/GUIDWizard.cc
+++ b/dev/kernel/src/GUIDWizard.cc
diff --git a/dev/Kernel/src/GUIDWrapper.cc b/dev/kernel/src/GUIDWrapper.cc
index cd4a6aa3..cd4a6aa3 100644
--- a/dev/Kernel/src/GUIDWrapper.cc
+++ b/dev/kernel/src/GUIDWrapper.cc
diff --git a/dev/Kernel/src/HardwareThreadScheduler.cc b/dev/kernel/src/HardwareThreadScheduler.cc
index 70502d40..70502d40 100644
--- a/dev/Kernel/src/HardwareThreadScheduler.cc
+++ b/dev/kernel/src/HardwareThreadScheduler.cc
diff --git a/dev/Kernel/src/IDylibObject.cc b/dev/kernel/src/IDylibObject.cc
index 30a76af9..30a76af9 100644
--- a/dev/Kernel/src/IDylibObject.cc
+++ b/dev/kernel/src/IDylibObject.cc
diff --git a/dev/Kernel/src/IPEFDylibObject.cc b/dev/kernel/src/IPEFDylibObject.cc
index e994ad29..e994ad29 100644
--- a/dev/Kernel/src/IPEFDylibObject.cc
+++ b/dev/kernel/src/IPEFDylibObject.cc
diff --git a/dev/Kernel/src/IndexableProperty.cc b/dev/kernel/src/IndexableProperty.cc
index 404cddc3..404cddc3 100644
--- a/dev/Kernel/src/IndexableProperty.cc
+++ b/dev/kernel/src/IndexableProperty.cc
diff --git a/dev/Kernel/src/Json.cc b/dev/kernel/src/Json.cc
index 48567b5f..48567b5f 100644
--- a/dev/Kernel/src/Json.cc
+++ b/dev/kernel/src/Json.cc
diff --git a/dev/Kernel/src/KString.cc b/dev/kernel/src/KString.cc
index d96ef38c..d96ef38c 100644
--- a/dev/Kernel/src/KString.cc
+++ b/dev/kernel/src/KString.cc
diff --git a/dev/Kernel/src/LPC.cc b/dev/kernel/src/LPC.cc
index b6b2e11b..b6b2e11b 100644
--- a/dev/Kernel/src/LPC.cc
+++ b/dev/kernel/src/LPC.cc
diff --git a/dev/Kernel/src/LockDelegate.cc b/dev/kernel/src/LockDelegate.cc
index df62c6f3..df62c6f3 100644
--- a/dev/Kernel/src/LockDelegate.cc
+++ b/dev/kernel/src/LockDelegate.cc
diff --git a/dev/Kernel/src/MemoryMgr.cc b/dev/kernel/src/MemoryMgr.cc
index 4e13ea15..4e13ea15 100644
--- a/dev/Kernel/src/MemoryMgr.cc
+++ b/dev/kernel/src/MemoryMgr.cc
diff --git a/dev/Kernel/src/MutableArray.cc b/dev/kernel/src/MutableArray.cc
index 8464a283..8464a283 100644
--- a/dev/Kernel/src/MutableArray.cc
+++ b/dev/kernel/src/MutableArray.cc
diff --git a/dev/Kernel/src/Network/IPAddr.cc b/dev/kernel/src/Network/IPAddr.cc
index 6f523086..6f523086 100644
--- a/dev/Kernel/src/Network/IPAddr.cc
+++ b/dev/kernel/src/Network/IPAddr.cc
diff --git a/dev/Kernel/src/Network/IPCAddr.cc b/dev/kernel/src/Network/IPCAddr.cc
index 75a54a36..75a54a36 100644
--- a/dev/Kernel/src/Network/IPCAddr.cc
+++ b/dev/kernel/src/Network/IPCAddr.cc
diff --git a/dev/Kernel/src/Network/IPCMsg.cc b/dev/kernel/src/Network/IPCMsg.cc
index f5bec6f7..f5bec6f7 100644
--- a/dev/Kernel/src/Network/IPCMsg.cc
+++ b/dev/kernel/src/Network/IPCMsg.cc
diff --git a/dev/Kernel/src/Network/MACAddressGetter.cc b/dev/kernel/src/Network/MACAddressGetter.cc
index 627bcd34..627bcd34 100644
--- a/dev/Kernel/src/Network/MACAddressGetter.cc
+++ b/dev/kernel/src/Network/MACAddressGetter.cc
diff --git a/dev/Kernel/src/Network/NetworkDevice.cc b/dev/kernel/src/Network/NetworkDevice.cc
index f2971265..f2971265 100644
--- a/dev/Kernel/src/Network/NetworkDevice.cc
+++ b/dev/kernel/src/Network/NetworkDevice.cc
diff --git a/dev/Kernel/src/New+Delete.cc b/dev/kernel/src/New+Delete.cc
index 1e0a3421..1e0a3421 100644
--- a/dev/Kernel/src/New+Delete.cc
+++ b/dev/kernel/src/New+Delete.cc
diff --git a/dev/Kernel/src/OwnPtr.cc b/dev/kernel/src/OwnPtr.cc
index e4d529aa..e4d529aa 100644
--- a/dev/Kernel/src/OwnPtr.cc
+++ b/dev/kernel/src/OwnPtr.cc
diff --git a/dev/Kernel/src/PEFCodeMgr.cc b/dev/kernel/src/PEFCodeMgr.cc
index 426a1e26..426a1e26 100644
--- a/dev/Kernel/src/PEFCodeMgr.cc
+++ b/dev/kernel/src/PEFCodeMgr.cc
diff --git a/dev/Kernel/src/PRDT.cc b/dev/kernel/src/PRDT.cc
index 9ea3e70b..9ea3e70b 100644
--- a/dev/Kernel/src/PRDT.cc
+++ b/dev/kernel/src/PRDT.cc
diff --git a/dev/Kernel/src/PageMgr.cc b/dev/kernel/src/PageMgr.cc
index eb7c7e03..eb7c7e03 100644
--- a/dev/Kernel/src/PageMgr.cc
+++ b/dev/kernel/src/PageMgr.cc
diff --git a/dev/Kernel/src/Pmm.cc b/dev/kernel/src/Pmm.cc
index b3d5e79e..b3d5e79e 100644
--- a/dev/Kernel/src/Pmm.cc
+++ b/dev/kernel/src/Pmm.cc
diff --git a/dev/Kernel/src/Property.cc b/dev/kernel/src/Property.cc
index 8f3b5314..8f3b5314 100644
--- a/dev/Kernel/src/Property.cc
+++ b/dev/kernel/src/Property.cc
diff --git a/dev/Kernel/src/Ref.cc b/dev/kernel/src/Ref.cc
index 6fadb033..6fadb033 100644
--- a/dev/Kernel/src/Ref.cc
+++ b/dev/kernel/src/Ref.cc
diff --git a/dev/Kernel/src/SoftwareTimer.cc b/dev/kernel/src/SoftwareTimer.cc
index 5e4214e9..5e4214e9 100644
--- a/dev/Kernel/src/SoftwareTimer.cc
+++ b/dev/kernel/src/SoftwareTimer.cc
diff --git a/dev/Kernel/src/Storage/AHCIDeviceInterface.cc b/dev/kernel/src/Storage/AHCIDeviceInterface.cc
index 8d987ab5..8d987ab5 100644
--- a/dev/Kernel/src/Storage/AHCIDeviceInterface.cc
+++ b/dev/kernel/src/Storage/AHCIDeviceInterface.cc
diff --git a/dev/Kernel/src/Storage/ATADeviceInterface.cc b/dev/kernel/src/Storage/ATADeviceInterface.cc
index 9f1a0068..9f1a0068 100644
--- a/dev/Kernel/src/Storage/ATADeviceInterface.cc
+++ b/dev/kernel/src/Storage/ATADeviceInterface.cc
diff --git a/dev/Kernel/src/Storage/NVMEDeviceInterface.cc b/dev/kernel/src/Storage/NVMEDeviceInterface.cc
index 3e2c2c53..3e2c2c53 100644
--- a/dev/Kernel/src/Storage/NVMEDeviceInterface.cc
+++ b/dev/kernel/src/Storage/NVMEDeviceInterface.cc
diff --git a/dev/Kernel/src/Storage/SCSIDeviceInterface.cc b/dev/kernel/src/Storage/SCSIDeviceInterface.cc
index cc625cdb..cc625cdb 100644
--- a/dev/Kernel/src/Storage/SCSIDeviceInterface.cc
+++ b/dev/kernel/src/Storage/SCSIDeviceInterface.cc
diff --git a/dev/Kernel/src/Stream.cc b/dev/kernel/src/Stream.cc
index 8d060556..8d060556 100644
--- a/dev/Kernel/src/Stream.cc
+++ b/dev/kernel/src/Stream.cc
diff --git a/dev/Kernel/src/System/SwapDisk.cc b/dev/kernel/src/System/SwapDisk.cc
index 921ea86d..921ea86d 100644
--- a/dev/Kernel/src/System/SwapDisk.cc
+++ b/dev/kernel/src/System/SwapDisk.cc
diff --git a/dev/Kernel/src/ThreadLocalStorage.cc b/dev/kernel/src/ThreadLocalStorage.cc
index b25b4288..b25b4288 100644
--- a/dev/Kernel/src/ThreadLocalStorage.cc
+++ b/dev/kernel/src/ThreadLocalStorage.cc
diff --git a/dev/Kernel/src/Timer.cc b/dev/kernel/src/Timer.cc
index 5df81134..5df81134 100644
--- a/dev/Kernel/src/Timer.cc
+++ b/dev/kernel/src/Timer.cc
diff --git a/dev/Kernel/src/User.cc b/dev/kernel/src/User.cc
index 3c23c59e..3c23c59e 100644
--- a/dev/Kernel/src/User.cc
+++ b/dev/kernel/src/User.cc
diff --git a/dev/Kernel/src/UserProcessScheduler.cc b/dev/kernel/src/UserProcessScheduler.cc
index 1087ac6b..1087ac6b 100644
--- a/dev/Kernel/src/UserProcessScheduler.cc
+++ b/dev/kernel/src/UserProcessScheduler.cc
diff --git a/dev/Kernel/src/UserProcessTeam.cc b/dev/kernel/src/UserProcessTeam.cc
index e0533ef1..e0533ef1 100644
--- a/dev/Kernel/src/UserProcessTeam.cc
+++ b/dev/kernel/src/UserProcessTeam.cc
diff --git a/dev/Kernel/src/Utils.cc b/dev/kernel/src/Utils.cc
index a362099a..a362099a 100644
--- a/dev/Kernel/src/Utils.cc
+++ b/dev/kernel/src/Utils.cc
diff --git a/dev/Kernel/src/Variant.cc b/dev/kernel/src/Variant.cc
index cfa29d3a..cfa29d3a 100644
--- a/dev/Kernel/src/Variant.cc
+++ b/dev/kernel/src/Variant.cc
diff --git a/dev/Mod/ACPI/ACPI.h b/dev/modules/ACPI/ACPI.h
index a4fe2b0e..a4fe2b0e 100644
--- a/dev/Mod/ACPI/ACPI.h
+++ b/dev/modules/ACPI/ACPI.h
diff --git a/dev/Mod/ACPI/ACPIFactoryInterface.h b/dev/modules/ACPI/ACPIFactoryInterface.h
index d398b2b7..06a5c6e9 100644
--- a/dev/Mod/ACPI/ACPIFactoryInterface.h
+++ b/dev/modules/ACPI/ACPIFactoryInterface.h
@@ -8,11 +8,11 @@
 #define __MOD_ACPI_H__
 
 #include <KernelKit/DebugOutput.h>
-#include <Mod/ACPI/ACPI.h>
+#include <modules/ACPI/ACPI.h>
 #include <NewKit/ErrorOr.h>
 #include <NewKit/Defines.h>
 #include <NewKit/Ref.h>
-#include <Mod/Pwr/PowerFactory.h>
+#include <modules/Pwr/PowerFactory.h>
 
 namespace NeOS
 {
diff --git a/dev/Mod/AHCI/.gitkeep b/dev/modules/AHCI/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Mod/AHCI/.gitkeep
+++ b/dev/modules/AHCI/.gitkeep
diff --git a/dev/Mod/AHCI/AHCI.h b/dev/modules/AHCI/AHCI.h
index 0b8971e2..2ff54be9 100644
--- a/dev/Mod/AHCI/AHCI.h
+++ b/dev/modules/AHCI/AHCI.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include <NewKit/Defines.h>
-#include <Mod/ACPI/ACPI.h>
+#include <modules/ACPI/ACPI.h>
 
 /// @file AHCI.h
 /// @brief AHCI support.
diff --git a/dev/Mod/APM/APM.h b/dev/modules/APM/APM.h
index 1cb55fdc..1cb55fdc 100644
--- a/dev/Mod/APM/APM.h
+++ b/dev/modules/APM/APM.h
diff --git a/dev/Mod/ATA/ATA.h b/dev/modules/ATA/ATA.h
index 374b8b5d..374b8b5d 100644
--- a/dev/Mod/ATA/ATA.h
+++ b/dev/modules/ATA/ATA.h
diff --git a/dev/Mod/CoreGfx/AccessibilityMgr.h b/dev/modules/CoreGfx/AccessibilityMgr.h
index 58054a89..a45470eb 100644
--- a/dev/Mod/CoreGfx/AccessibilityMgr.h
+++ b/dev/modules/CoreGfx/AccessibilityMgr.h
@@ -9,8 +9,8 @@
 
 #include <NewKit/NewKit.h>
 #include <KernelKit/LPC.h>
-#include <Mod/CoreGfx/FBMgr.h>
-#include <Mod/CoreGfx/MathMgr.h>
+#include <modules/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/MathMgr.h>
 #include <ArchKit/ArchKit.h>
 
 namespace FB
diff --git a/dev/Mod/CoreGfx/FBMgr.h b/dev/modules/CoreGfx/FBMgr.h
index 57a781ad..5600e4c7 100644
--- a/dev/Mod/CoreGfx/FBMgr.h
+++ b/dev/modules/CoreGfx/FBMgr.h
@@ -130,7 +130,7 @@
 #endif // __NE_AMD64__
 
 #ifndef GFX_MGR_ACCESSIBILITY_H
-#include <Mod/CoreGfx/AccessibilityMgr.h>
+#include <modules/CoreGfx/AccessibilityMgr.h>
 #endif // ifndef GFX_MGR_ACCESSIBILITY_H
 
 namespace FB
diff --git a/dev/Mod/CoreGfx/MathMgr.h b/dev/modules/CoreGfx/MathMgr.h
index 7e85c0dc..7e85c0dc 100644
--- a/dev/Mod/CoreGfx/MathMgr.h
+++ b/dev/modules/CoreGfx/MathMgr.h
diff --git a/dev/Mod/CoreGfx/TextMgr.h b/dev/modules/CoreGfx/TextMgr.h
index a3c1af24..843e8274 100644
--- a/dev/Mod/CoreGfx/TextMgr.h
+++ b/dev/modules/CoreGfx/TextMgr.h
@@ -7,7 +7,7 @@
 #pragma once

 

 #include <NewKit/Defines.h>

-#include <Mod/CoreGfx/FBMgr.h>

+#include <modules/CoreGfx/FBMgr.h>

 

 #define kFontSizeX	  8

 #define kFontSizeY	  8

diff --git a/dev/Mod/GPRS/.keepme b/dev/modules/GPRS/.keepme
index e69de29b..e69de29b 100644
--- a/dev/Mod/GPRS/.keepme
+++ b/dev/modules/GPRS/.keepme
diff --git a/dev/Mod/HPET/.gitkeep b/dev/modules/HPET/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Mod/HPET/.gitkeep
+++ b/dev/modules/HPET/.gitkeep
diff --git a/dev/Mod/HPET/Defines.h b/dev/modules/HPET/Defines.h
index c916703a..36df3ebd 100644
--- a/dev/Mod/HPET/Defines.h
+++ b/dev/modules/HPET/Defines.h
@@ -12,7 +12,7 @@
 #pragma once
 
 #include <NewKit/Defines.h>
-#include <Mod/ACPI/ACPI.h>
+#include <modules/ACPI/ACPI.h>
 
 namespace NeOS
 {
diff --git a/dev/Mod/IEEE802/.gitkeep b/dev/modules/IEEE802/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Mod/IEEE802/.gitkeep
+++ b/dev/modules/IEEE802/.gitkeep
diff --git a/dev/Mod/LTE/LTE.h b/dev/modules/LTE/LTE.h
index ef7d49f3..ef7d49f3 100644
--- a/dev/Mod/LTE/LTE.h
+++ b/dev/modules/LTE/LTE.h
diff --git a/dev/Mod/MBCI/MBCI.h b/dev/modules/MBCI/MBCI.h
index d20f7934..c774df30 100644
--- a/dev/Mod/MBCI/MBCI.h
+++ b/dev/modules/MBCI/MBCI.h
@@ -8,7 +8,7 @@
 #define _INC_MODULE_MBCI_H_
 
 #include <NewKit/Defines.h>
-#include <Mod/ACPI/ACPI.h>
+#include <modules/ACPI/ACPI.h>
 
 /**
 - VCC (IN) (OUT for MCU)
diff --git a/dev/Mod/MFlash/MFlash.h b/dev/modules/MFlash/MFlash.h
index a1846610..a1846610 100644
--- a/dev/Mod/MFlash/MFlash.h
+++ b/dev/modules/MFlash/MFlash.h
diff --git a/dev/Mod/NVME/NVME.h b/dev/modules/NVME/NVME.h
index 5f8608f7..5f8608f7 100644
--- a/dev/Mod/NVME/NVME.h
+++ b/dev/modules/NVME/NVME.h
diff --git a/dev/Mod/OHCI/.gitkeep b/dev/modules/OHCI/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Mod/OHCI/.gitkeep
+++ b/dev/modules/OHCI/.gitkeep
diff --git a/dev/Mod/Pwr/PowerFactory.h b/dev/modules/Pwr/PowerFactory.h
index 15548198..02d2e092 100644
--- a/dev/Mod/Pwr/PowerFactory.h
+++ b/dev/modules/Pwr/PowerFactory.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <KernelKit/DebugOutput.h>
-#include <Mod/ACPI/ACPI.h>
+#include <modules/ACPI/ACPI.h>
 #include <NewKit/ErrorOr.h>
 #include <NewKit/Defines.h>
 #include <NewKit/Ref.h>
diff --git a/dev/Mod/ReadMe.md b/dev/modules/ReadMe.md
index 1261e247..1261e247 100644
--- a/dev/Mod/ReadMe.md
+++ b/dev/modules/ReadMe.md
diff --git a/dev/Mod/SCSI/.gitkeep b/dev/modules/SCSI/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Mod/SCSI/.gitkeep
+++ b/dev/modules/SCSI/.gitkeep
diff --git a/dev/Mod/SCSI/SCSI.h b/dev/modules/SCSI/SCSI.h
index 156bec90..156bec90 100644
--- a/dev/Mod/SCSI/SCSI.h
+++ b/dev/modules/SCSI/SCSI.h
diff --git a/dev/Mod/WiFi/.gitkeep b/dev/modules/WiFi/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Mod/WiFi/.gitkeep
+++ b/dev/modules/WiFi/.gitkeep
diff --git a/dev/Mod/XHCI/.gitkeep b/dev/modules/XHCI/.gitkeep
index e69de29b..e69de29b 100644
--- a/dev/Mod/XHCI/.gitkeep
+++ b/dev/modules/XHCI/.gitkeep
diff --git a/dev/Mod/XHCI/Defines.h b/dev/modules/XHCI/Defines.h
index e3fcce11..e3fcce11 100644
--- a/dev/Mod/XHCI/Defines.h
+++ b/dev/modules/XHCI/Defines.h
diff --git a/docs/GUI_DESIGN.drawio b/docs/GUI_DESIGN.drawio
index 3ada69be..09bd3400 100644
--- a/docs/GUI_DESIGN.drawio
+++ b/docs/GUI_DESIGN.drawio
@@ -4,7 +4,7 @@
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
-                <mxCell id="mspNsT0Gx7HsNPX6GqQO-2" value="LibSCI" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                <mxCell id="mspNsT0Gx7HsNPX6GqQO-2" value="libsci" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
                     <mxGeometry x="50" y="500" width="450" height="140" as="geometry"/>
                 </mxCell>
                 <mxCell id="2" style="edgeStyle=none;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="mspNsT0Gx7HsNPX6GqQO-3" target="mspNsT0Gx7HsNPX6GqQO-13" edge="1">
diff --git a/docs/MBCI.drawio b/docs/MBCI_DESIGN.drawio
index 9a8f4283..9a8f4283 100644
--- a/docs/MBCI.drawio
+++ b/docs/MBCI_DESIGN.drawio
diff --git a/docs/OS_DESIGN.drawio b/docs/OS_DESIGN.drawio
index d704b481..0091f5c1 100644
--- a/docs/OS_DESIGN.drawio
+++ b/docs/OS_DESIGN.drawio
@@ -4,7 +4,7 @@
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
-                <mxCell id="ifhO3zQZNW-sXvZMTmu8-2" value="&lt;p class=&quot;p1&quot;&gt;&lt;b&gt;System API (LibSCI.dylib) – User-Space Interface (Ring 3, EL0)&lt;/b&gt;&lt;/p&gt;" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                <mxCell id="ifhO3zQZNW-sXvZMTmu8-2" value="&lt;p class=&quot;p1&quot;&gt;&lt;b&gt;System API (libsci.dylib) – User-Space Interface (Ring 3, EL0)&lt;/b&gt;&lt;/p&gt;" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
                     <mxGeometry x="235.5" y="340" width="360" height="30" as="geometry"/>
                 </mxCell>
                 <mxCell id="ifhO3zQZNW-sXvZMTmu8-3" value="&lt;p class=&quot;p1&quot;&gt;&lt;b&gt;Applications &amp;amp; Dynamically Linked Libraries (Ring 3, EL0)&lt;/b&gt;&lt;/p&gt;" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
diff --git a/docs/ROUND_ROBIN.drawio b/docs/SOFT_SCHED_DESIGN.drawio
index 46c6304b..32a7800d 100644
--- a/docs/ROUND_ROBIN.drawio
+++ b/docs/SOFT_SCHED_DESIGN.drawio
@@ -4,7 +4,7 @@
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
-                <mxCell id="ifhO3zQZNW-sXvZMTmu8-2" value="LibSCI DLL inside code (RING 3)" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+                <mxCell id="ifhO3zQZNW-sXvZMTmu8-2" value="libsci DLL inside code (RING 3)" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
                     <mxGeometry x="235.5" y="340" width="360" height="30" as="geometry"/>
                 </mxCell>
                 <mxCell id="ifhO3zQZNW-sXvZMTmu8-3" value="Running code (RING 3)" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
diff --git a/dev/Kernel/doc/Specs.md b/docs/SPECIFICATION_KERNEL.md
index 2cdee1f0..2cdee1f0 100644
--- a/dev/Kernel/doc/Specs.md
+++ b/docs/SPECIFICATION_KERNEL.md
diff --git a/docs/ZXD.drawio b/docs/ZXD_DESIGN.drawio
index 7452d3f9..7452d3f9 100644
--- a/docs/ZXD.drawio
+++ b/docs/ZXD_DESIGN.drawio
diff --git a/docs/apic.png b/docs/apic.png
deleted file mode 100644
index 33954dce..00000000
--- a/docs/apic.png
+++ /dev/null
diff --git a/docs/filesystem.png b/docs/filesystem.png
deleted file mode 100644
index 9e3599a9..00000000
--- a/docs/filesystem.png
+++ /dev/null
diff --git a/format.sh b/format.sh
new file mode 100755
index 00000000..7fd34383
--- /dev/null
+++ b/format.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+THIS_PATH="$(realpath "$0")"
+THIS_DIR="$(dirname "$THIS_PATH")"
+
+FILE_LIST="$(find "$THIS_DIR" | grep -E ".*(\.cc|\.c|\.h|\.hpp|\.cxx|\.hh|\.inl)$")"
+
+echo -e "Files found to format = \n\"\"\"\n$FILE_LIST\n\"\"\""
+
+clang-format --verbose -i --style=file $FILE_LIST
diff --git a/dev/Kernel/KernelKit/MBCI/.keep b/meta/.keep
index e69de29b..e69de29b 100644
--- a/dev/Kernel/KernelKit/MBCI/.keep
+++ b/meta/.keep
diff --git a/res/zka-disk.svg b/meta/svg/zka-disk.svg
index 6c169292..6c169292 100644
--- a/res/zka-disk.svg
+++ b/meta/svg/zka-disk.svg
diff --git a/res/zka-has-disk.svg b/meta/svg/zka-has-disk.svg
index 031dc802..031dc802 100644
--- a/res/zka-has-disk.svg
+++ b/meta/svg/zka-has-disk.svg
diff --git a/res/zka-no-disk.svg b/meta/svg/zka-no-disk.svg
index 1e8f07f2..1e8f07f2 100644
--- a/res/zka-no-disk.svg
+++ b/meta/svg/zka-no-disk.svg
diff --git a/osx_docs.sh b/osx_docs.sh
deleted file mode 100755
index 2d9a0a22..00000000
--- a/osx_docs.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# !/bin/zsh
-
-mkdir -p html
-
-XSDocgen --source ./dev/ --output ./html --undocumented --project-name "NeKernel MicroKernel" --enable-c++ --project-copyright "Amlal EL Mahrouss &copy; %Y - All rights Reserved" --project-version "930.2024.1" --company-name "Amlal EL Mahrouss"
diff --git a/public/apps/.keepme b/public/apps/.keepme
deleted file mode 100644
index e69de29b..00000000
--- a/public/apps/.keepme
+++ /dev/null
diff --git a/dev/Usr/LibCF/Array.h b/public/frameworks/CoreFoundation.fwrk/headers/Array.h
index c466b0fb..b70d8503 100644
--- a/dev/Usr/LibCF/Array.h
+++ b/public/frameworks/CoreFoundation.fwrk/headers/Array.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibSCI/SCI.h>
+#include <SCIKit/SCI.h>
 
 namespace LibCF
 {
diff --git a/dev/Usr/LibCF/Atom.h b/public/frameworks/CoreFoundation.fwrk/headers/Atom.h
index 26b4f0cd..d3152fd2 100644
--- a/dev/Usr/LibCF/Atom.h
+++ b/public/frameworks/CoreFoundation.fwrk/headers/Atom.h
@@ -5,7 +5,7 @@
 ------------------------------------------- */
 #pragma once
 
-#include <LibCF/Foundation.h>
+#include <CoreFoundation.fwrk/headers/Foundation.h>
 
 namespace LibCF
 {
diff --git a/dev/Usr/LibCF/Foundation.h b/public/frameworks/CoreFoundation.fwrk/headers/Foundation.h
index c0f8fe6c..6de3df0b 100644
--- a/dev/Usr/LibCF/Foundation.h
+++ b/public/frameworks/CoreFoundation.fwrk/headers/Foundation.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <LibSCI/SCI.h>
+#include <SCIKit/SCI.h>
 
 namespace LibCF
 {
diff --git a/dev/Usr/LibCF/Object.h b/public/frameworks/CoreFoundation.fwrk/headers/Object.h
index 1f8d185e..7b8f3777 100644
--- a/dev/Usr/LibCF/Object.h
+++ b/public/frameworks/CoreFoundation.fwrk/headers/Object.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <LibCF/Foundation.h>
+#include <CoreFoundation.fwrk/headers/Foundation.h>
 
 #define CF_OBJECT : public LibCF::CFObject
 
diff --git a/dev/Usr/LibCF/Property.h b/public/frameworks/CoreFoundation.fwrk/headers/Property.h
index 51a60be7..f1a5c24e 100644
--- a/dev/Usr/LibCF/Property.h
+++ b/public/frameworks/CoreFoundation.fwrk/headers/Property.h
@@ -7,8 +7,8 @@
 #ifndef _PROPS_H
 #define _PROPS_H
 
-#include <LibSCI/SCI.h>
-#include <LibCF/Ref.h>
+#include <SCIKit/SCI.h>
+#include <CoreFoundation.fwrk/headers/Ref.h>
 
 #define kMaxPropLen (256U)
 
diff --git a/dev/Usr/LibCF/Ref.h b/public/frameworks/CoreFoundation.fwrk/headers/Ref.h
index d170ffe8..074b5086 100644
--- a/dev/Usr/LibCF/Ref.h
+++ b/public/frameworks/CoreFoundation.fwrk/headers/Ref.h
@@ -8,8 +8,8 @@
 #ifndef _REF_H_
 #define _REF_H_
 
-#include <LibSCI/SCI.h>
-#include <LibCF/Object.h>
+#include <SCIKit/SCI.h>
+#include <CoreFoundation.fwrk/headers/Object.h>
 
 namespace LibCF
 {
diff --git a/dev/Usr/LibCF/String.h b/public/frameworks/CoreFoundation.fwrk/headers/String.h
index 9b83fec6..10ce01a9 100644
--- a/dev/Usr/LibCF/String.h
+++ b/public/frameworks/CoreFoundation.fwrk/headers/String.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <LibCF/Object.h>
+#include <CoreFoundation.fwrk/headers/Object.h>
 
 namespace LibCF
 {
diff --git a/dev/Usr/LibCF/Foundation.cc b/public/frameworks/CoreFoundation.fwrk/src/Foundation.cc
index cb11287f..219c3bfb 100644
--- a/dev/Usr/LibCF/Foundation.cc
+++ b/public/frameworks/CoreFoundation.fwrk/src/Foundation.cc
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#include <LibCF/Foundation.h>
+#include <CoreFoundation.fwrk/headers/Foundation.h>
 
 LibCF::CFRect::operator bool()
 {
diff --git a/public/frameworks/DiskImage.fwrk/DiskImage.json b/public/frameworks/DiskImage.fwrk/DiskImage.json
index 184d877e..0b97dafb 100644
--- a/public/frameworks/DiskImage.fwrk/DiskImage.json
+++ b/public/frameworks/DiskImage.fwrk/DiskImage.json
@@ -1,9 +1,9 @@
 {
     "compiler_path": "x86_64-w64-mingw32-g++",
     "compiler_std": "c++20",
-    "headers_path": ["../", "./", "../../../dev", "../../../dev/Kernel"],
+    "headers_path": ["../", "./", "../../../dev", "../../../dev/kernel"],
     "sources_path": ["src/*.cc"],
-    "output_name": "libDiskImage.dylib",
+    "output_name": "./dist/libDiskImage.dylib",
     "compiler_flags": [
       "-fPIC",
       "-ffreestanding",
diff --git a/public/frameworks/DiskImage.fwrk/headers/DiskImage.h b/public/frameworks/DiskImage.fwrk/headers/DiskImage.h
index fb05154d..a029b43a 100644
--- a/public/frameworks/DiskImage.fwrk/headers/DiskImage.h
+++ b/public/frameworks/DiskImage.fwrk/headers/DiskImage.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <LibSCI/SCI.h>
+#include <SCIKit/SCI.h>
 
 #define kDISectorSz			 (512)
 #define kDIMinDiskSz		 (1024 * 1024 * 1024)
diff --git a/public/tools/cc/src/CommandLine.cc b/public/tools/cc/src/CommandLine.cc
index 3efa5301..226554cc 100644
--- a/public/tools/cc/src/CommandLine.cc
+++ b/public/tools/cc/src/CommandLine.cc
@@ -4,12 +4,12 @@
  * Copyright (c) 2024 Amlal EL Mahrouss
  */
 
-#include <LibSCI/SCI.h>
+#include <SCIKit/SCI.h>
 
 /// @brief This program loads a program for NeOS.
 
 SInt32 main(SInt32 argc, Char* argv[])
 {
-	ConOut(nullptr, "LD: OpenCC or GCC for Ne needs to be installed.\rLD: This program is present as a placeholder.");
+	PrintOut(nullptr, "cc: A C++ compiler to be installed.\rcc: This program is present as a placeholder.");
 	return EXIT_FAILURE;
 }
diff --git a/public/tools/diutil/diutil.json b/public/tools/diutil/diutil.json
index bdbec529..fce2166e 100644
--- a/public/tools/diutil/diutil.json
+++ b/public/tools/diutil/diutil.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "g++",
   "compiler_std": "c++20",
-  "headers_path": ["./", "../../../dev/Kernel",  "../../../dev/", "./"],
+  "headers_path": ["./", "../../../dev/kernel",  "../../../dev/", "./"],
   "sources_path": ["CommandLine.cc"],
   "output_name": "./dist/diutil",
   "cpp_macros": [
diff --git a/public/tools/ld/src/CommandLine.cc b/public/tools/ld/src/CommandLine.cc
index 3efa5301..a6f98ee1 100644
--- a/public/tools/ld/src/CommandLine.cc
+++ b/public/tools/ld/src/CommandLine.cc
@@ -4,12 +4,12 @@
  * Copyright (c) 2024 Amlal EL Mahrouss
  */
 
-#include <LibSCI/SCI.h>
+#include <SCIKit/SCI.h>
 
 /// @brief This program loads a program for NeOS.
 
 SInt32 main(SInt32 argc, Char* argv[])
 {
-	ConOut(nullptr, "LD: OpenCC or GCC for Ne needs to be installed.\rLD: This program is present as a placeholder.");
+	PrintOut(nullptr, "ld: A linker to be installed.\rld: This program is present as a placeholder.");
 	return EXIT_FAILURE;
 }
diff --git a/public/tools/make_app/Common.h b/public/tools/make_app/Common.h
index a49f0cda..860cdd48 100644
--- a/public/tools/make_app/Common.h
+++ b/public/tools/make_app/Common.h
@@ -6,7 +6,7 @@
 #ifndef APPS_COMMON_H
 #define APPS_COMMON_H
 
-#include <LibSCI/SCI.h>
-#include <LibCF/Foundation.h>
+#include <SCIKit/SCI.h>
+#include <CoreFoundation.fwrk/headers/Foundation.h>
 
 #endif // APPS_COMMON_H
diff --git a/public/tools/make_app/src/CommandLine.cc b/public/tools/make_app/src/CommandLine.cc
index 49be4795..0cc40106 100644
--- a/public/tools/make_app/src/CommandLine.cc
+++ b/public/tools/make_app/src/CommandLine.cc
@@ -7,7 +7,7 @@
 #include <Framework.h>
 #include <Steps.h>
 
-#include <LibCF/Array.h>
+#include <CoreFoundation.fwrk/headers/Array.h>
 
 /// @brief This program makes a framework directory for NeKernel OS.
 
@@ -21,17 +21,12 @@ int main(int argc, char* argv[])
 	{
 		if (MmStrCmp(argv[i], "-h") == 0)
 		{
-			MsgAlloc(kWarnMsg);
+			PrintOut(nullptr, "%s", "make_app: Framework/Application Creation Tool.\n");
+			PrintOut(nullptr, "%s", "make_app: © Amlal EL Mahrouss, All rights reserved.\n");
 
-			MsgSend(kWarnMsg, "%s", "make_app: Framework/Application Creation Tool.\n");
-			MsgSend(kWarnMsg, "%s", "make_app: © Amlal EL Mahrouss, All rights reserved.\n");
-
-			MsgSend(kWarnMsg, "%s", "make_app: -a: Application format.\n");
-			MsgSend(kWarnMsg, "%s", "make_app: -s: Steps (Setup pages) format.\n");
-			MsgSend(kWarnMsg, "%s", "make_app: -f: Framework format.\n");
-
-			MsgShow(kWarnMsg);
-			MsgFree(kWarnMsg);
+			PrintOut(nullptr, "%s", "make_app: -a: Application format.\n");
+			PrintOut(nullptr, "%s", "make_app: -s: Steps (Setup pages) format.\n");
+			PrintOut(nullptr, "%s", "make_app: -f: Framework format.\n");
 
 			return EXIT_SUCCESS;
 		}
diff --git a/public/tools/open/src/CommandLine.cc b/public/tools/open/src/CommandLine.cc
index a2439e40..746622fa 100644
--- a/public/tools/open/src/CommandLine.cc
+++ b/public/tools/open/src/CommandLine.cc
@@ -4,7 +4,7 @@
  * Copyright (c) 2024 Amlal EL Mahrouss
  */
 
-#include <LibSCI/SCI.h>
+#include <SCIKit/SCI.h>
 
 /// @brief This program opens an application from **OPEN_APP_BASE_PATH**
 
@@ -21,10 +21,10 @@ int main(int argc, char* argv[])
 	{
 		if (MmStrCmp(argv[i], OPEN_APP_HELP_FLAG) == 0)
 		{
-			ConOut(nullptr, "open: Open Tool.\n");
-			ConOut(nullptr, "open: © Amlal EL Mahrouss, All rights reserved.\n");
+			PrintOut(nullptr, "open: Open Tool.\n");
+			PrintOut(nullptr, "open: © Amlal EL Mahrouss, All rights reserved.\n");
 
-			ConOut(nullptr, "open: %s: Application is taken as input (opens a PEF/PE32+/ELF program depending on architecture).\n", OPEN_APP_APP_FLAG);
+			PrintOut(nullptr, "open: %s: Application is taken as input (opens a PEF/PE32+/ELF program depending on architecture).\n", OPEN_APP_APP_FLAG);
 
 			return EXIT_SUCCESS;
 		}
diff --git a/release_ahci.sh b/release_ahci.sh
index f2e89007..c7c4f5ca 100755
--- a/release_ahci.sh
+++ b/release_ahci.sh
@@ -2,8 +2,8 @@
 
 export AHCI_SUPPORT=1
 
-cd dev/Kernel
+cd dev/kernel
 make -f amd64-desktop.make all
-cd ../Boot
+cd ../boot
 make -f amd64-desktop.make all
 make -f amd64-desktop.make run-efi-amd64-ahci
\ No newline at end of file
diff --git a/release_ata.sh b/release_ata.sh
index 6c65b211..b4194627 100755
--- a/release_ata.sh
+++ b/release_ata.sh
@@ -2,8 +2,8 @@
 
 export ATA_PIO_SUPPORT=1
 
-cd dev/Kernel
+cd dev/kernel
 make -f amd64-desktop.make all
-cd ../Boot
+cd ../boot
 make -f amd64-desktop.make all
 make -f amd64-desktop.make run-efi-amd64-ata
\ No newline at end of file
diff --git a/run_format.sh b/run_format.sh
deleted file mode 100755
index 576fa410..00000000
--- a/run_format.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-THIS_PATH="$(realpath "$0")"
-THIS_DIR="$(dirname "$THIS_PATH")"
-
-# Find all files in THIS_DIR which end in .ino, .cpp, etc., as specified
-# in the regular expression just below
-FILE_LIST="$(find "$THIS_DIR" | grep -E ".*(\.cc|\.cpp|\.c|\.h|\.hpp|\.h|\.cxx|\.hh|\.inl)$")"
-
-echo -e "Files found to format = \n\"\"\"\n$FILE_LIST\n\"\"\""
-
-# Format each file.
-# - NB: do NOT put quotes around `$FILE_LIST` below or else the `clang-format` command will
-#   mistakenly see the entire blob of newline-separated file names as a SINGLE file name instead
-#   of as a new-line separated list of *many* file names!
-clang-format --verbose -i --style=file $FILE_LIST
diff --git a/setup_amd64.sh b/setup_amd64.sh
index 92a0a109..de69c1b2 100755
--- a/setup_amd64.sh
+++ b/setup_amd64.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-cd dev/Boot/Mod/SysChk
+cd dev/boot/modules/SysChk
 btb amd64.json
 cd ../../
 make -f amd64-desktop.make efi
 make -f amd64-desktop.make epm-img
-cd ../../dev/Kernel/HALKit/AMD64
+cd ../../dev/kernel/HALKit/AMD64
 ./make_ap_blob.sh
diff --git a/setup_arm64.sh b/setup_arm64.sh
index 6725707c..ffc642d4 100755
--- a/setup_arm64.sh
+++ b/setup_arm64.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-cd dev/Boot
+cd dev/boot
 make -f arm64-desktop.make efi
 make -f arm64-desktop.make epm-img
\ No newline at end of file