diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1a59fb3..d1a01bee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,13 +11,15 @@ New release of the HyperDbg Debugger.
- Added structure for the hyperperf (Hardware Performance Counter) project ([link](https://github.com/HyperDbg/HyperDbg/commit/c17ebc09c4d199a642352e66feebb3159582196c))
- The 'unload' command checks whether any module is loaded or not ([link](https://docs.hyperdbg.org/commands/debugging-commands/unload))
- Exported SDK API for checking whether any module is loaded or not ([link](https://github.com/HyperDbg/HyperDbg/commit/19e47c804f50f5dbb698f314e66b7d685a87ac1f))
+- Added user mode and kernel mode PT parameter parser ([link](https://github.com/HyperDbg/HyperDbg/pull/631))
### Changed
- Separated SDK libraries for user mode and kernel mode modules ([link](https://github.com/HyperDbg/HyperDbg/commit/c17ebc09c4d199a642352e66feebb3159582196c))
- Added hypertrace, hyperevade, and hyperperf DLL files to SDK ([link](https://github.com/HyperDbg/HyperDbg/commit/c17ebc09c4d199a642352e66feebb3159582196c))
- Fix pool manager uninitialize list corruption ([link](https://github.com/HyperDbg/HyperDbg/pull/629))
- Fix 'access denied' error on loading all modules using 'load all' ([link](https://docs.hyperdbg.org/commands/debugging-commands/load))([link](https://github.com/HyperDbg/HyperDbg/commit/2b818a5116d80d466aab7b343d4aa9d1d640f082))
-- Fix concatenation error for "hyperkd" string on the hypertrace project
+- Fix the concatenation error for the "hyperkd" string on the hypertrace project (https://github.com/HyperDbg/HyperDbg/commit/2b0cc18899ff532d9d590a71bf880fee5456c15f))
+- Organized header files for the libhyperdbg project ([link](https://github.com/HyperDbg/HyperDbg/pull/632))
## [0.20.0.0-beta] - 2026-06-21
New release of the HyperDbg Debugger.
diff --git a/hyperdbg/libhyperdbg/header/libhyperdbg.h b/hyperdbg/libhyperdbg/header/app/libhyperdbg.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/libhyperdbg.h
rename to hyperdbg/libhyperdbg/header/app/libhyperdbg.h
diff --git a/hyperdbg/libhyperdbg/header/messaging.h b/hyperdbg/libhyperdbg/header/app/messaging.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/messaging.h
rename to hyperdbg/libhyperdbg/header/app/messaging.h
diff --git a/hyperdbg/libhyperdbg/header/packets.h b/hyperdbg/libhyperdbg/header/app/packets.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/packets.h
rename to hyperdbg/libhyperdbg/header/app/packets.h
diff --git a/hyperdbg/libhyperdbg/header/common.h b/hyperdbg/libhyperdbg/header/common/common.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/common.h
rename to hyperdbg/libhyperdbg/header/common/common.h
diff --git a/hyperdbg/libhyperdbg/header/list.h b/hyperdbg/libhyperdbg/header/common/list.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/list.h
rename to hyperdbg/libhyperdbg/header/common/list.h
diff --git a/hyperdbg/libhyperdbg/header/commands.h b/hyperdbg/libhyperdbg/header/debugger/commands/commands.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/commands.h
rename to hyperdbg/libhyperdbg/header/debugger/commands/commands.h
diff --git a/hyperdbg/libhyperdbg/header/help.h b/hyperdbg/libhyperdbg/header/debugger/commands/help.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/help.h
rename to hyperdbg/libhyperdbg/header/debugger/commands/help.h
diff --git a/hyperdbg/libhyperdbg/header/communication.h b/hyperdbg/libhyperdbg/header/debugger/communication/communication.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/communication.h
rename to hyperdbg/libhyperdbg/header/debugger/communication/communication.h
diff --git a/hyperdbg/libhyperdbg/header/forwarding.h b/hyperdbg/libhyperdbg/header/debugger/communication/forwarding.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/forwarding.h
rename to hyperdbg/libhyperdbg/header/debugger/communication/forwarding.h
diff --git a/hyperdbg/libhyperdbg/header/namedpipe.h b/hyperdbg/libhyperdbg/header/debugger/communication/namedpipe.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/namedpipe.h
rename to hyperdbg/libhyperdbg/header/debugger/communication/namedpipe.h
diff --git a/hyperdbg/libhyperdbg/header/debugger.h b/hyperdbg/libhyperdbg/header/debugger/core/debugger.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/debugger.h
rename to hyperdbg/libhyperdbg/header/debugger/core/debugger.h
diff --git a/hyperdbg/libhyperdbg/header/steppings.h b/hyperdbg/libhyperdbg/header/debugger/core/steppings.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/steppings.h
rename to hyperdbg/libhyperdbg/header/debugger/core/steppings.h
diff --git a/hyperdbg/libhyperdbg/header/install.h b/hyperdbg/libhyperdbg/header/debugger/driver-loader/install.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/install.h
rename to hyperdbg/libhyperdbg/header/debugger/driver-loader/install.h
diff --git a/hyperdbg/libhyperdbg/header/kd.h b/hyperdbg/libhyperdbg/header/debugger/kernel-level/kd.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/kd.h
rename to hyperdbg/libhyperdbg/header/debugger/kernel-level/kd.h
diff --git a/hyperdbg/libhyperdbg/header/assembler.h b/hyperdbg/libhyperdbg/header/debugger/misc/assembler.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/assembler.h
rename to hyperdbg/libhyperdbg/header/debugger/misc/assembler.h
diff --git a/hyperdbg/libhyperdbg/header/inipp.h b/hyperdbg/libhyperdbg/header/debugger/misc/inipp.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/inipp.h
rename to hyperdbg/libhyperdbg/header/debugger/misc/inipp.h
diff --git a/hyperdbg/libhyperdbg/header/pci-id.h b/hyperdbg/libhyperdbg/header/debugger/misc/pci-id.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/pci-id.h
rename to hyperdbg/libhyperdbg/header/debugger/misc/pci-id.h
diff --git a/hyperdbg/libhyperdbg/header/script-engine.h b/hyperdbg/libhyperdbg/header/debugger/script-engine/script-engine.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/script-engine.h
rename to hyperdbg/libhyperdbg/header/debugger/script-engine/script-engine.h
diff --git a/hyperdbg/libhyperdbg/header/symbol.h b/hyperdbg/libhyperdbg/header/debugger/script-engine/symbol.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/symbol.h
rename to hyperdbg/libhyperdbg/header/debugger/script-engine/symbol.h
diff --git a/hyperdbg/libhyperdbg/header/tests.h b/hyperdbg/libhyperdbg/header/debugger/tests/tests.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/tests.h
rename to hyperdbg/libhyperdbg/header/debugger/tests/tests.h
diff --git a/hyperdbg/libhyperdbg/header/transparency.h b/hyperdbg/libhyperdbg/header/debugger/transparency/transparency.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/transparency.h
rename to hyperdbg/libhyperdbg/header/debugger/transparency/transparency.h
diff --git a/hyperdbg/libhyperdbg/header/pe-parser.h b/hyperdbg/libhyperdbg/header/debugger/user-level/pe-parser.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/pe-parser.h
rename to hyperdbg/libhyperdbg/header/debugger/user-level/pe-parser.h
diff --git a/hyperdbg/libhyperdbg/header/ud.h b/hyperdbg/libhyperdbg/header/debugger/user-level/ud.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/ud.h
rename to hyperdbg/libhyperdbg/header/debugger/user-level/ud.h
diff --git a/hyperdbg/libhyperdbg/header/export.h b/hyperdbg/libhyperdbg/header/export/export.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/export.h
rename to hyperdbg/libhyperdbg/header/export/export.h
diff --git a/hyperdbg/libhyperdbg/header/globals.h b/hyperdbg/libhyperdbg/header/globals/globals.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/globals.h
rename to hyperdbg/libhyperdbg/header/globals/globals.h
diff --git a/hyperdbg/libhyperdbg/header/hwdbg-interpreter.h b/hyperdbg/libhyperdbg/header/hwdbg/hwdbg-interpreter.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/hwdbg-interpreter.h
rename to hyperdbg/libhyperdbg/header/hwdbg/hwdbg-interpreter.h
diff --git a/hyperdbg/libhyperdbg/header/hwdbg-scripts.h b/hyperdbg/libhyperdbg/header/hwdbg/hwdbg-scripts.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/hwdbg-scripts.h
rename to hyperdbg/libhyperdbg/header/hwdbg/hwdbg-scripts.h
diff --git a/hyperdbg/libhyperdbg/header/objects.h b/hyperdbg/libhyperdbg/header/objects/objects.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/objects.h
rename to hyperdbg/libhyperdbg/header/objects/objects.h
diff --git a/hyperdbg/libhyperdbg/header/rev-ctrl.h b/hyperdbg/libhyperdbg/header/rev/rev-ctrl.h
similarity index 100%
rename from hyperdbg/libhyperdbg/header/rev-ctrl.h
rename to hyperdbg/libhyperdbg/header/rev/rev-ctrl.h
diff --git a/hyperdbg/libhyperdbg/libhyperdbg.vcxproj b/hyperdbg/libhyperdbg/libhyperdbg.vcxproj
index bcb12486..c943b6e8 100644
--- a/hyperdbg/libhyperdbg/libhyperdbg.vcxproj
+++ b/hyperdbg/libhyperdbg/libhyperdbg.vcxproj
@@ -140,35 +140,35 @@ msbuild "$(SolutionDir)dependencies\zydis\msvc\Zydis.sln" /m /p:Configuration="R
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hyperdbg/libhyperdbg/libhyperdbg.vcxproj.filters b/hyperdbg/libhyperdbg/libhyperdbg.vcxproj.filters
index 9b62836e..236c3074 100644
--- a/hyperdbg/libhyperdbg/libhyperdbg.vcxproj.filters
+++ b/hyperdbg/libhyperdbg/libhyperdbg.vcxproj.filters
@@ -102,95 +102,68 @@
{da7e68cc-540c-4efc-b4de-c23b4b13e2ec}
+
+ {d6010267-4888-46f5-9bdb-2339565710d2}
+
+
+ {e81c07d3-5e98-4bdb-a00b-2b99e023553c}
+
+
+ {477d3059-08d7-433b-83c3-bbf57658deaf}
+
+
+ {559b68f3-8bf0-447a-a714-0e355c22516f}
+
+
+ {88de3dbf-90ab-47ef-94fe-8c21ce73c9f1}
+
+
+ {c1f438ff-fd3b-4fb4-989b-f145290e3837}
+
+
+ {c5b26259-abcc-459f-9b7e-fd90c34ad646}
+
+
+ {99425a01-168c-4b6b-a53f-d62fbb7c8cab}
+
+
+ {c7f85132-1802-4462-990f-3fffb0365dbc}
+
+
+ {4f4eca9f-c1f6-4342-91ef-2b533292e238}
+
+
+ {bde7408e-fad9-4329-98ac-e604674f7bbf}
+
+
+ {06e9888f-57f0-4d59-8f7e-1fdd336be9cc}
+
+
+ {0d88d581-8ff4-40f2-8585-3fdb97d4d211}
+
+
+ {439dcb49-1825-4076-affe-17b505e4033a}
+
+
+ {16331b3c-c8fd-4b12-abb4-7617d21db9d0}
+
+
+ {2d2c16a6-3fdc-4b63-a282-f2762a1f340d}
+
+
+ {9dcff6b3-9ebd-46f3-a0c5-c69d06357949}
+
+
+ {3e4dda9f-6050-409f-85e2-4cf7c8a95743}
+
header
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
header\platform
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
-
- header
-
header\platform
@@ -209,18 +182,99 @@
header\platform
-
- header
-
-
- header
-
header\platform\windows-only
header\components\pe
+
+ header\app
+
+
+ header\app
+
+
+ header\app
+
+
+ header\common
+
+
+ header\common
+
+
+ header\export
+
+
+ header\globals
+
+
+ header\hwdbg
+
+
+ header\hwdbg
+
+
+ header\rev
+
+
+ header\objects
+
+
+ header\debugger\commands
+
+
+ header\debugger\commands
+
+
+ header\debugger\communication
+
+
+ header\debugger\communication
+
+
+ header\debugger\communication
+
+
+ header\debugger\core
+
+
+ header\debugger\core
+
+
+ header\debugger\driver-loader
+
+
+ header\debugger\kernel-level
+
+
+ header\debugger\misc
+
+
+ header\debugger\misc
+
+
+ header\debugger\misc
+
+
+ header\debugger\user-level
+
+
+ header\debugger\user-level
+
+
+ header\debugger\transparency
+
+
+ header\debugger\tests
+
+
+ header\debugger\script-engine
+
+
+ header\debugger\script-engine
+
diff --git a/hyperdbg/libhyperdbg/pch.cpp b/hyperdbg/libhyperdbg/pch.cpp
index 92958c22..fa15fce4 100644
--- a/hyperdbg/libhyperdbg/pch.cpp
+++ b/hyperdbg/libhyperdbg/pch.cpp
@@ -14,7 +14,7 @@
//
// Global variables
//
-#include "header/globals.h"
+#include "header/globals/globals.h"
//
// When you are using pre-compiled headers, this source file is necessary for
diff --git a/hyperdbg/libhyperdbg/pch.h b/hyperdbg/libhyperdbg/pch.h
index a193f07f..96640e8c 100644
--- a/hyperdbg/libhyperdbg/pch.h
+++ b/hyperdbg/libhyperdbg/pch.h
@@ -187,7 +187,7 @@ typedef const wchar_t *LPCWCHAR, *PCWCHAR;
//
// PCI IDs
//
-#include "header/pci-id.h"
+#include "header/debugger/misc/pci-id.h"
//
// Intel PT
@@ -197,45 +197,45 @@ typedef const wchar_t *LPCWCHAR, *PCWCHAR;
//
// General
//
-#include "header/libhyperdbg.h"
-#include "header/export.h"
-#include "header/inipp.h"
-#include "header/commands.h"
-#include "header/common.h"
-#include "header/symbol.h"
-#include "header/debugger.h"
-#include "header/script-engine.h"
-#include "header/help.h"
+#include "header/app/libhyperdbg.h"
+#include "header/export/export.h"
+#include "header/debugger/misc/inipp.h"
+#include "header/debugger/commands/commands.h"
+#include "header/common/common.h"
+#include "header/debugger/script-engine/symbol.h"
+#include "header/debugger/core/debugger.h"
+#include "header/debugger/script-engine/script-engine.h"
+#include "header/debugger/commands/help.h"
#ifdef _WIN32
-# include "header/install.h"
+# include "header/debugger/driver-loader/install.h"
#endif
-#include "header/list.h"
-#include "header/tests.h"
-#include "header/messaging.h"
-#include "header/packets.h"
-#include "header/transparency.h"
-#include "header/communication.h"
-#include "header/namedpipe.h"
-#include "header/forwarding.h"
-#include "header/kd.h"
+#include "header/common/list.h"
+#include "header/debugger/tests/tests.h"
+#include "header/app/messaging.h"
+#include "header/app/packets.h"
+#include "header/debugger/transparency/transparency.h"
+#include "header/debugger/communication/communication.h"
+#include "header/debugger/communication/namedpipe.h"
+#include "header/debugger/communication/forwarding.h"
+#include "header/debugger/kernel-level/kd.h"
//
// Components
//
#include "../include/components/pe/header/pe-image-reader.h"
-#include "header/pe-parser.h"
-#include "header/ud.h"
-#include "header/objects.h"
-#include "header/steppings.h"
-#include "header/rev-ctrl.h"
-#include "header/assembler.h"
+#include "header/debugger/user-level/pe-parser.h"
+#include "header/debugger/user-level/ud.h"
+#include "header/objects/objects.h"
+#include "header/debugger/core/steppings.h"
+#include "header/rev/rev-ctrl.h"
+#include "header/debugger/misc/assembler.h"
//
// hwdbg
//
-#include "header/hwdbg-interpreter.h"
-#include "header/hwdbg-scripts.h"
+#include "header/hwdbg/hwdbg-interpreter.h"
+#include "header/hwdbg/hwdbg-scripts.h"
//
// Zydis headers