move hprdbghv files and folders

2026-08-14 19:14:45 +00:00 · 2021-09-25 16:58:00 +03:30 · 2021-09-25 16:58:00 +03:30 · 83bf64317b
commit 83bf64317b
parent 912b62e412
92 changed files with 390 additions and 516 deletions
--- a/hyperdbg/hprdbghv/.clang-format
+++ b/hyperdbg/hprdbghv/.clang-format
@ -1,128 +0,0 @@
-Language: Cpp
-BasedOnStyle: webkit
-AccessModifierOffset: -4
-
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: true 
-AlignConsecutiveDeclarations: true
-
-AlignConsecutiveMacros: true
-
-AlignEscapedNewlines: Left
-AlignOperands: true
-
-AlignTrailingComments: true
-
-AllowAllArgumentsOnNextLine: false
-AllowAllParametersOfDeclarationOnNextLine: false
-
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterReturnType: TopLevel
-AlwaysBreakBeforeMultilineStrings: false
-
-AlwaysBreakTemplateDeclarations: true #false
-
-BinPackArguments: false
-BinPackParameters: false
-
-BreakBeforeBraces: Custom
-BraceWrapping:
-    AfterCaseLabel: true
-    AfterClass: true
-    AfterControlStatement: true
-    AfterEnum: true
-    AfterFunction: true
-    AfterNamespace: false
-    AfterStruct: true
-    AfterUnion: true
-    AfterExternBlock: false
-    BeforeCatch: true
-    BeforeElse: true
-
-BreakBeforeBinaryOperators: None
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializers: AfterColon
-BreakStringLiterals: false
-
-ColumnLimit: 0
-CommentPragmas: '^begin_wpp|^end_wpp|^FUNC |^USESUFFIX |^USESUFFIX '
-
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-
-DerivePointerAlignment: false
-ExperimentalAutoDetectBinPacking: false
-
-IndentCaseLabels: false
-IndentPPDirectives: AfterHash
-IndentWidth: 4
-
-KeepEmptyLinesAtTheStartOfBlocks: false
-Language: Cpp
-
-MacroBlockBegin: '^BEGIN_MODULE$|^BEGIN_TEST_CLASS$|^BEGIN_TEST_METHOD$'
-MacroBlockEnd: '^END_MODULE$|^END_TEST_CLASS$|^END_TEST_METHOD$'
-
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None #All
-PointerAlignment: Middle
-ReflowComments: true
-SortIncludes: false
-
-SpaceAfterCStyleCast: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyParentheses: false
-SpacesInAngles: false
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-
-Standard: Cpp11
-StatementMacros: [
-    'EXTERN_C',
-    'PAGED',
-    'PAGEDX',
-    'NONPAGED',
-    'PNPCODE',
-    'INITCODE',
-    '_At_',
-    '_When_',
-    '_Success_',
-    '_Check_return_',
-    '_Must_inspect_result_',
-	'_IRQL_requires_same_',
-    '_IRQL_requires_',
-    '_IRQL_requires_max_',
-    '_IRQL_requires_min_',
-    '_IRQL_saves_',
-    '_IRQL_restores_',
-    '_IRQL_saves_global_',
-    '_IRQL_restores_global_',
-    '_IRQL_raises_',
-    '_IRQL_lowers_',
-    '_Acquires_lock_',
-    '_Releases_lock_',
-    '_Acquires_exclusive_lock_',
-    '_Releases_exclusive_lock_',
-    '_Acquires_shared_lock_',
-    '_Releases_shared_lock_',
-    '_Requires_lock_held_',
-    '_Use_decl_annotations_',
-    '_Guarded_by_',
-    '__drv_preferredFunction',
-    '__drv_allocatesMem',
-    '__drv_freesMem',
-    ]
-    
-TabWidth: '4'
-UseTab: Never
--- a/hyperdbg/hprdbghv/Common.h
+++ b/hyperdbg/hprdbghv/Common.h
--- a/hyperdbg/hprdbghv/Header
+++ b/hyperdbg/hprdbghv/Header
--- a/hyperdbg/hprdbghv/LengthDisassemblerEngine.h
+++ b/hyperdbg/hprdbghv/LengthDisassemblerEngine.h
--- a/hyperdbg/hprdbghv/Logging.h
+++ b/hyperdbg/hprdbghv/Logging.h
--- a/hyperdbg/hprdbghv/MemoryMapper.h
+++ b/hyperdbg/hprdbghv/MemoryMapper.h
--- a/hyperdbg/hprdbghv/Header
+++ b/hyperdbg/hprdbghv/Header
--- a/hyperdbg/hprdbghv/PoolManager.h
+++ b/hyperdbg/hprdbghv/PoolManager.h
--- a/hyperdbg/hprdbghv/Trace.h
+++ b/hyperdbg/hprdbghv/Trace.h
--- a/Files/Debugger/Commands/BreakpointCommands.h
+++ b/Files/Debugger/Commands/BreakpointCommands.h
--- a/Files/Debugger/Commands/DebuggerCommands.h
+++ b/Files/Debugger/Commands/DebuggerCommands.h
--- a/Files/Debugger/Commands/ExtensionCommands.h
+++ b/Files/Debugger/Commands/ExtensionCommands.h
--- a/Files/Debugger/Communication/GdbStub.h
+++ b/Files/Debugger/Communication/GdbStub.h
--- a/Files/Debugger/Communication/SerialConnection.h
+++ b/Files/Debugger/Communication/SerialConnection.h
--- a/Files/Debugger/Essentials/Broadcast.h
+++ b/Files/Debugger/Essentials/Broadcast.h
--- a/Files/Debugger/Essentials/Debugger.h
+++ b/Files/Debugger/Essentials/Debugger.h
--- a/Files/Debugger/Essentials/DebuggerEvents.h
+++ b/Files/Debugger/Essentials/DebuggerEvents.h
--- a/Files/Debugger/Essentials/DpcRoutines.h
+++ b/Files/Debugger/Essentials/DpcRoutines.h
--- a/Files/Debugger/Essentials/Kd.h
+++ b/Files/Debugger/Essentials/Kd.h
--- a/Files/Debugger/Essentials/Steppings.h
+++ b/Files/Debugger/Essentials/Steppings.h
--- a/Files/Debugger/Essentials/Termination.h
+++ b/Files/Debugger/Essentials/Termination.h
--- a/Files/Debugger/Features/Hooks.h
+++ b/Files/Debugger/Features/Hooks.h
--- a/Files/Debugger/Tests/KernelTests.h
+++ b/Files/Debugger/Tests/KernelTests.h
--- a/Files/Debugger/Transparency/Transparency.h
+++ b/Files/Debugger/Transparency/Transparency.h
--- a/hyperdbg/hprdbghv/Header
+++ b/hyperdbg/hprdbghv/Header
--- a/hyperdbg/hprdbghv/GlobalVariables.h
+++ b/hyperdbg/hprdbghv/GlobalVariables.h
--- a/hyperdbg/hprdbghv/InlineAsm.h
+++ b/hyperdbg/hprdbghv/InlineAsm.h
--- a/hyperdbg/hprdbghv/Header
+++ b/hyperdbg/hprdbghv/Header
--- a/hyperdbg/hprdbghv/Invept.h
+++ b/hyperdbg/hprdbghv/Invept.h
--- a/hyperdbg/hprdbghv/Header
+++ b/hyperdbg/hprdbghv/Header
--- a/hyperdbg/hprdbghv/Counters.h
+++ b/hyperdbg/hprdbghv/Counters.h
--- a/hyperdbg/hprdbghv/Events.h
+++ b/hyperdbg/hprdbghv/Events.h
--- a/hyperdbg/hprdbghv/HypervisorRoutines.h
+++ b/hyperdbg/hprdbghv/HypervisorRoutines.h
--- a/hyperdbg/hprdbghv/IdtEmulation.h
+++ b/hyperdbg/hprdbghv/IdtEmulation.h
--- a/hyperdbg/hprdbghv/IoHandler.h
+++ b/hyperdbg/hprdbghv/IoHandler.h
--- a/hyperdbg/hprdbghv/ManageRegs.h
+++ b/hyperdbg/hprdbghv/ManageRegs.h
--- a/hyperdbg/hprdbghv/Header
+++ b/hyperdbg/hprdbghv/Header
--- a/hyperdbg/hprdbghv/Vmcall.h
+++ b/hyperdbg/hprdbghv/Vmcall.h
--- a/hyperdbg/hprdbghv/Header
+++ b/hyperdbg/hprdbghv/Header
--- a/hyperdbg/hprdbghv/AsmCommon.asm
+++ b/hyperdbg/hprdbghv/AsmCommon.asm
--- a/hyperdbg/hprdbghv/AsmDebugger.asm
+++ b/hyperdbg/hprdbghv/AsmDebugger.asm
--- a/hyperdbg/hprdbghv/AsmEpt.asm
+++ b/hyperdbg/hprdbghv/AsmEpt.asm
--- a/hyperdbg/hprdbghv/AsmKernelSideTests.asm
+++ b/hyperdbg/hprdbghv/AsmKernelSideTests.asm
--- a/hyperdbg/hprdbghv/AsmSegmentRegs.asm
+++ b/hyperdbg/hprdbghv/AsmSegmentRegs.asm
--- a/hyperdbg/hprdbghv/AsmVmexitHandler.asm
+++ b/hyperdbg/hprdbghv/AsmVmexitHandler.asm
--- a/hyperdbg/hprdbghv/AsmVmxContextState.asm
+++ b/hyperdbg/hprdbghv/AsmVmxContextState.asm
--- a/hyperdbg/hprdbghv/AsmVmxOperation.asm
+++ b/hyperdbg/hprdbghv/AsmVmxOperation.asm
--- a/hyperdbg/hprdbghv/Common.c
+++ b/hyperdbg/hprdbghv/Common.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Power function in order to computer address for MSR bitmaps
--- a/hyperdbg/hprdbghv/Logging.c
+++ b/hyperdbg/hprdbghv/Logging.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"
 #include "Logging.tmh"

 /**
--- a/hyperdbg/hprdbghv/MemoryMapper.c
+++ b/hyperdbg/hprdbghv/MemoryMapper.c
@ -12,7 +12,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Get Index of VA on PMLx
--- a/hyperdbg/hprdbghv/PoolManager.c
+++ b/hyperdbg/hprdbghv/PoolManager.c
@ -11,7 +11,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Initializes the pool manager
--- a/hyperdbg/hprdbghv/Spinlock.c
+++ b/hyperdbg/hprdbghv/Spinlock.c
@ -23,7 +23,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief The maximum wait before PAUSE
--- a/Files/Debugger/Commands/BreakpointCommands.c
+++ b/Files/Debugger/Commands/BreakpointCommands.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Check if the breakpoint vm-exit relates to !epthook command or not
--- a/Files/Debugger/Commands/DebuggerCommands.c
+++ b/Files/Debugger/Commands/DebuggerCommands.c
@ -10,7 +10,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Read memory for different commands
--- a/Files/Debugger/Commands/ExtensionCommands.c
+++ b/Files/Debugger/Commands/ExtensionCommands.c
@ -10,7 +10,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief routines for !va2pa and !pa2va commands
--- a/Files/Debugger/Communication/GdbStub.c
+++ b/Files/Debugger/Communication/GdbStub.c
@ -9,9 +9,9 @@
 * @copyright This project is released under the GNU Public License v3.
 *
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

-#include "GdbStub.h"
+#include "..\hprdbghv\Header Files\Debugger\Communication\GdbStub.h"

 #ifdef __STRICT_ANSI__
 #    define asm __asm__
--- a/Files/Debugger/Communication/SerialConnection.c
+++ b/Files/Debugger/Communication/SerialConnection.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 *
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief A simple connection test
--- a/Files/Debugger/Essentials/Broadcast.c
+++ b/Files/Debugger/Essentials/Broadcast.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Broadcast to enable mov-to-cr3 exitings
--- a/Files/Debugger/Essentials/Debugger.c
+++ b/Files/Debugger/Essentials/Debugger.c
@ -10,7 +10,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 //
 // Include parser
--- a/Files/Debugger/Essentials/DebuggerEvents.c
+++ b/Files/Debugger/Essentials/DebuggerEvents.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief routines for !syscall command (enable syscall hook)
--- a/Files/Debugger/Essentials/DpcRoutines.c
+++ b/Files/Debugger/Essentials/DpcRoutines.c
@ -10,7 +10,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief lock for one core execution
--- a/Files/Debugger/Essentials/Kd.c
+++ b/Files/Debugger/Essentials/Kd.c
@ -10,7 +10,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief initialize kernel debugger
--- a/Files/Debugger/Essentials/MemoryManager.c
+++ b/Files/Debugger/Essentials/MemoryManager.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Read process memory
--- a/Files/Debugger/Essentials/Steppings.c
+++ b/Files/Debugger/Essentials/Steppings.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 *
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Initialize the stepping (step in/step out) mechanism
--- a/Files/Debugger/Essentials/Termination.c
+++ b/Files/Debugger/Essentials/Termination.c
@ -10,7 +10,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Termination function for external-interrupts
--- a/Files/Debugger/Features/Hooks/EPT
+++ b/Files/Debugger/Features/Hooks/EPT
@ -11,7 +11,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Hook function that HooksExAllocatePoolWithTag
--- a/Files/Debugger/Features/Hooks/Syscall
+++ b/Files/Debugger/Features/Hooks/Syscall
@ -14,7 +14,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief This function enables or disables EFER syscall hoo
--- a/Files/Debugger/Features/Hooks/Syscall
+++ b/Files/Debugger/Features/Hooks/Syscall
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Get the kernel base and Image size
--- a/hyperdbg/hprdbghv/ScriptEngine.c
+++ b/hyperdbg/hprdbghv/ScriptEngine.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 *
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Get current ip from the debugger frame
--- a/Files/Debugger/Tests/KernelTests.c
+++ b/Files/Debugger/Tests/KernelTests.c
@ -10,7 +10,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Configures tags and calls target functions
--- a/Files/Debugger/Transparency/Transparency.c
+++ b/Files/Debugger/Transparency/Transparency.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 *
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"
 /**
 * @brief maximum random value
 */
--- a/hyperdbg/hprdbghv/Source
+++ b/hyperdbg/hprdbghv/Source
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 *
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Trigger NMI on XAPIC
--- a/hyperdbg/hprdbghv/Driver.c
+++ b/hyperdbg/hprdbghv/Driver.c
@ -11,7 +11,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"
 #include "Driver.tmh"

 /**
--- a/hyperdbg/hprdbghv/Ioctl.c
+++ b/hyperdbg/hprdbghv/Ioctl.c
@ -10,7 +10,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Driver IOCTL Dispatcher
--- a/hyperdbg/hprdbghv/Source
+++ b/hyperdbg/hprdbghv/Source
@ -10,7 +10,7 @@
 * @copyright This project is released under the GNU Public License v3. The re-used codes from Gbps/gbhv are under CC 4.0 AL terms.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Check whether EPT features are present or not
--- a/hyperdbg/hprdbghv/Invept.c
+++ b/hyperdbg/hprdbghv/Invept.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Invoke the Invept instruction
--- a/hyperdbg/hprdbghv/Source
+++ b/hyperdbg/hprdbghv/Source
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief INVVPID Instruction
--- a/hyperdbg/hprdbghv/Counters.c
+++ b/hyperdbg/hprdbghv/Counters.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Emulate RDTSC
--- a/hyperdbg/hprdbghv/CrossVmexits.c
+++ b/hyperdbg/hprdbghv/CrossVmexits.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Handling XSETBV Instruction vm-exits
--- a/hyperdbg/hprdbghv/Events.c
+++ b/hyperdbg/hprdbghv/Events.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Injects interruption to a guest
--- a/hyperdbg/hprdbghv/HypervisorRoutines.c
+++ b/hyperdbg/hprdbghv/HypervisorRoutines.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Initialize Vmx operation
--- a/hyperdbg/hprdbghv/IdtEmulation.c
+++ b/hyperdbg/hprdbghv/IdtEmulation.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Handle Nmi and expection vm-exits
--- a/hyperdbg/hprdbghv/IoHandler.c
+++ b/hyperdbg/hprdbghv/IoHandler.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief VM-Exit handler for I/O Instructions (in/out)
--- a/hyperdbg/hprdbghv/ManageRegs.c
+++ b/hyperdbg/hprdbghv/ManageRegs.c
@ -10,7 +10,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Set just the Guest Cs selector
@ -581,7 +581,6 @@ SetGuestCr8(UINT64 Cr8)
    __writecr8(Cr8);
 }

-
 /**
 * @brief Set the Guest Dr0 Register
 * 
--- a/hyperdbg/hprdbghv/Source
+++ b/hyperdbg/hprdbghv/Source
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Handle Monitor Trap Flag vm-exits
--- a/hyperdbg/hprdbghv/Vmcall.c
+++ b/hyperdbg/hprdbghv/Vmcall.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Handle vm-exits of VMCALLs
--- a/hyperdbg/hprdbghv/Vmexit.c
+++ b/hyperdbg/hprdbghv/Vmexit.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief VM-Exit handler for different exit reasons
--- a/hyperdbg/hprdbghv/Source
+++ b/hyperdbg/hprdbghv/Source
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Initialize VMX Operation
--- a/hyperdbg/hprdbghv/VmxRegions.c
+++ b/hyperdbg/hprdbghv/VmxRegions.c
@ -9,7 +9,7 @@
 * @copyright This project is released under the GNU Public License v3.
 * 
 */
-#include "pch.h"
+#include "..\hprdbghv\pch.h"

 /**
 * @brief Allocates Vmx regions for all logical cores (Vmxon region and Vmcs region)
--- a/hyperdbg/hprdbghv/hprdbghv.vcxproj
+++ b/hyperdbg/hprdbghv/hprdbghv.vcxproj
@ -69,7 +69,7 @@
      <WppEnabled>true</WppEnabled>
      <WppTraceFunction>HypervisorTraceLevelMessage(LEVEL,FLAGS,MSG,...)</WppTraceFunction>
      <PrecompiledHeader>Create</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>..\hprdbghv\pch.h</PrecompiledHeaderFile>
      <PrecompiledHeaderOutputFile>$(SolutionDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
    </ClCompile>
    <Link>
@ -91,7 +91,7 @@
      <WppEnabled>true</WppEnabled>
      <WppTraceFunction>HypervisorTraceLevelMessage(LEVEL,FLAGS,MSG,...)</WppTraceFunction>
      <PrecompiledHeader>Create</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>..\hprdbghv\pch.h</PrecompiledHeaderFile>
      <PrecompiledHeaderOutputFile>$(SolutionDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
      <Optimization>Disabled</Optimization>
@ -104,99 +104,99 @@
    <FilesToPackage Include="$(TargetPath)" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="Apic.c" />
-    <ClCompile Include="BreakpointCommands.c" />
-    <ClCompile Include="Broadcast.c" />
-    <ClCompile Include="Counters.c" />
-    <ClCompile Include="CrossVmexits.c" />
-    <ClCompile Include="Debugger.c" />
-    <ClCompile Include="DebuggerCommands.c" />
-    <ClCompile Include="DebuggerEvents.c" />
-    <ClCompile Include="DpcRoutines.c" />
-    <ClCompile Include="ExtensionCommands.c" />
-    <ClCompile Include="EferHook.c" />
-    <ClCompile Include="Ept.c" />
-    <ClCompile Include="Events.c" />
-    <ClCompile Include="GdbStub.c" />
-    <ClCompile Include="Kd.c" />
-    <ClCompile Include="KernelTests.c" />
-    <ClCompile Include="Mtf.c" />
-    <ClCompile Include="ScriptEngine.c" />
-    <ClCompile Include="SerialConnection.c" />
-    <ClCompile Include="Steppings.c" />
-    <ClCompile Include="Termination.c" />
-    <ClCompile Include="Transparency.c" />
-    <ClCompile Include="Vmexit.c" />
-    <ClCompile Include="IdtEmulation.c" />
-    <ClCompile Include="EptHook.c" />
-    <ClCompile Include="HypervisorRoutines.c" />
-    <ClCompile Include="Invept.c" />
-    <ClCompile Include="Ioctl.c" />
-    <ClCompile Include="IoHandler.c" />
-    <ClCompile Include="Logging.c" />
-    <ClCompile Include="MemoryManager.c" />
-    <ClCompile Include="MemoryMapper.c" />
-    <ClCompile Include="PoolManager.c" />
-    <ClCompile Include="ManageRegs.c" />
-    <ClCompile Include="Spinlock.c" />
-    <ClCompile Include="SsdtHook.c" />
-    <ClCompile Include="VmxRegions.c" />
-    <ClCompile Include="Driver.c" />
-    <ClCompile Include="Common.c" />
-    <ClCompile Include="Vmcall.c" />
-    <ClCompile Include="Vmx.c" />
-    <ClCompile Include="Vpid.c" />
+    <ClCompile Include="Source Files\Common\Common.c" />
+    <ClCompile Include="Source Files\Common\Logging.c" />
+    <ClCompile Include="Source Files\Common\MemoryMapper.c" />
+    <ClCompile Include="Source Files\Common\PoolManager.c" />
+    <ClCompile Include="Source Files\Common\Spinlock.c" />
+    <ClCompile Include="Source Files\Debugger\Commands\BreakpointCommands.c" />
+    <ClCompile Include="Source Files\Debugger\Commands\DebuggerCommands.c" />
+    <ClCompile Include="Source Files\Debugger\Commands\ExtensionCommands.c" />
+    <ClCompile Include="Source Files\Debugger\Communication\GdbStub.c" />
+    <ClCompile Include="Source Files\Debugger\Communication\SerialConnection.c" />
+    <ClCompile Include="Source Files\Debugger\Essentials\Broadcast.c" />
+    <ClCompile Include="Source Files\Debugger\Essentials\Debugger.c" />
+    <ClCompile Include="Source Files\Debugger\Essentials\DebuggerEvents.c" />
+    <ClCompile Include="Source Files\Debugger\Essentials\DpcRoutines.c" />
+    <ClCompile Include="Source Files\Debugger\Essentials\Kd.c" />
+    <ClCompile Include="Source Files\Debugger\Essentials\MemoryManager.c" />
+    <ClCompile Include="Source Files\Debugger\Essentials\Steppings.c" />
+    <ClCompile Include="Source Files\Debugger\Essentials\Termination.c" />
+    <ClCompile Include="Source Files\Debugger\Features\Hooks\EPT Hook\EptHook.c" />
+    <ClCompile Include="Source Files\Debugger\Features\Hooks\Syscall Hook\EferHook.c" />
+    <ClCompile Include="Source Files\Debugger\Features\Hooks\Syscall Hook\SsdtHook.c" />
+    <ClCompile Include="Source Files\Debugger\Script Engine\ScriptEngine.c" />
+    <ClCompile Include="Source Files\Debugger\Tests\KernelTests.c" />
+    <ClCompile Include="Source Files\Debugger\Transparency\Transparency.c" />
+    <ClCompile Include="Source Files\Devices\Apic.c" />
+    <ClCompile Include="Source Files\Driver\Driver.c" />
+    <ClCompile Include="Source Files\Driver\Ioctl.c" />
+    <ClCompile Include="Source Files\VMM\EPT\Ept.c" />
+    <ClCompile Include="Source Files\VMM\EPT\Invept.c" />
+    <ClCompile Include="Source Files\VMM\EPT\Vpid.c" />
+    <ClCompile Include="Source Files\VMM\VMX\Counters.c" />
+    <ClCompile Include="Source Files\VMM\VMX\CrossVmexits.c" />
+    <ClCompile Include="Source Files\VMM\VMX\Events.c" />
+    <ClCompile Include="Source Files\VMM\VMX\HypervisorRoutines.c" />
+    <ClCompile Include="Source Files\VMM\VMX\IdtEmulation.c" />
+    <ClCompile Include="Source Files\VMM\VMX\IoHandler.c" />
+    <ClCompile Include="Source Files\VMM\VMX\ManageRegs.c" />
+    <ClCompile Include="Source Files\VMM\VMX\Mtf.c" />
+    <ClCompile Include="Source Files\VMM\VMX\Vmcall.c" />
+    <ClCompile Include="Source Files\VMM\VMX\Vmexit.c" />
+    <ClCompile Include="Source Files\VMM\VMX\Vmx.c" />
+    <ClCompile Include="Source Files\VMM\VMX\VmxRegions.c" />
  </ItemGroup>
  <ItemGroup>
-    <MASM Include="AsmDebugger.asm" />
-    <MASM Include="AsmEpt.asm" />
-    <MASM Include="AsmCommon.asm" />
-    <MASM Include="AsmKernelSideTests.asm" />
-    <MASM Include="AsmSegmentRegs.asm" />
-    <MASM Include="AsmVmexitHandler.asm" />
-    <MASM Include="AsmVmxOperation.asm" />
-    <MASM Include="AsmVmxContextState.asm" />
+    <MASM Include="Source Files\Assembly\AsmCommon.asm" />
+    <MASM Include="Source Files\Assembly\AsmDebugger.asm" />
+    <MASM Include="Source Files\Assembly\AsmEpt.asm" />
+    <MASM Include="Source Files\Assembly\AsmKernelSideTests.asm" />
+    <MASM Include="Source Files\Assembly\AsmSegmentRegs.asm" />
+    <MASM Include="Source Files\Assembly\AsmVmexitHandler.asm" />
+    <MASM Include="Source Files\Assembly\AsmVmxContextState.asm" />
+    <MASM Include="Source Files\Assembly\AsmVmxOperation.asm" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="Apic.h" />
-    <ClInclude Include="BreakpointCommands.h" />
-    <ClInclude Include="Broadcast.h" />
-    <ClInclude Include="Counters.h" />
-    <ClInclude Include="Debugger.h" />
-    <ClInclude Include="DebuggerCommands.h" />
-    <ClInclude Include="DebuggerEvents.h" />
-    <ClInclude Include="Dpc.h" />
-    <ClInclude Include="DpcRoutines.h" />
-    <ClInclude Include="Events.h" />
-    <ClInclude Include="ExtensionCommands.h" />
-    <ClInclude Include="GdbStub.h" />
-    <ClInclude Include="GlobalVariables.h" />
-    <ClInclude Include="Kd.h" />
-    <ClInclude Include="KernelTests.h" />
-    <ClInclude Include="ManageRegs.h" />
-    <ClInclude Include="Mtf.h" />
+    <ClInclude Include="Header Files\Common\Common.h" />
+    <ClInclude Include="Header Files\Common\Dpc.h" />
+    <ClInclude Include="Header Files\Common\LengthDisassemblerEngine.h" />
+    <ClInclude Include="Header Files\Common\Logging.h" />
+    <ClInclude Include="Header Files\Common\MemoryMapper.h" />
+    <ClInclude Include="Header Files\Common\Msr.h" />
+    <ClInclude Include="Header Files\Common\PoolManager.h" />
+    <ClInclude Include="Header Files\Common\Trace.h" />
+    <ClInclude Include="Header Files\Debugger\Commands\BreakpointCommands.h" />
+    <ClInclude Include="Header Files\Debugger\Commands\DebuggerCommands.h" />
+    <ClInclude Include="Header Files\Debugger\Commands\ExtensionCommands.h" />
+    <ClInclude Include="Header Files\Debugger\Communication\GdbStub.h" />
+    <ClInclude Include="Header Files\Debugger\Communication\SerialConnection.h" />
+    <ClInclude Include="Header Files\Debugger\Essentials\Broadcast.h" />
+    <ClInclude Include="Header Files\Debugger\Essentials\Debugger.h" />
+    <ClInclude Include="Header Files\Debugger\Essentials\DebuggerEvents.h" />
+    <ClInclude Include="Header Files\Debugger\Essentials\DpcRoutines.h" />
+    <ClInclude Include="Header Files\Debugger\Essentials\Kd.h" />
+    <ClInclude Include="Header Files\Debugger\Essentials\Steppings.h" />
+    <ClInclude Include="Header Files\Debugger\Essentials\Termination.h" />
+    <ClInclude Include="Header Files\Debugger\Features\Hooks.h" />
+    <ClInclude Include="Header Files\Debugger\Tests\KernelTests.h" />
+    <ClInclude Include="Header Files\Debugger\Transparency\Transparency.h" />
+    <ClInclude Include="Header Files\Devices\Apic.h" />
+    <ClInclude Include="Header Files\Misc\GlobalVariables.h" />
+    <ClInclude Include="Header Files\Misc\InlineAsm.h" />
+    <ClInclude Include="Header Files\VMM\EPT\Ept.h" />
+    <ClInclude Include="Header Files\VMM\EPT\Invept.h" />
+    <ClInclude Include="Header Files\VMM\EPT\Vpid.h" />
+    <ClInclude Include="Header Files\VMM\VMX\Counters.h" />
+    <ClInclude Include="Header Files\VMM\VMX\Events.h" />
+    <ClInclude Include="Header Files\VMM\VMX\HypervisorRoutines.h" />
+    <ClInclude Include="Header Files\VMM\VMX\IdtEmulation.h" />
+    <ClInclude Include="Header Files\VMM\VMX\IoHandler.h" />
+    <ClInclude Include="Header Files\VMM\VMX\ManageRegs.h" />
+    <ClInclude Include="Header Files\VMM\VMX\Mtf.h" />
+    <ClInclude Include="Header Files\VMM\VMX\Vmcall.h" />
+    <ClInclude Include="Header Files\VMM\VMX\Vmx.h" />
    <ClInclude Include="pch.h" />
-    <ClInclude Include="Hooks.h" />
-    <ClInclude Include="HypervisorRoutines.h" />
-    <ClInclude Include="IdtEmulation.h" />
-    <ClInclude Include="InlineAsm.h" />
-    <ClInclude Include="Invept.h" />
-    <ClInclude Include="IoHandler.h" />
-    <ClInclude Include="LengthDisassemblerEngine.h" />
-    <ClInclude Include="Logging.h" />
-    <ClInclude Include="MemoryMapper.h" />
-    <ClInclude Include="PoolManager.h" />
-    <ClInclude Include="SerialConnection.h" />
-    <ClInclude Include="Steppings.h" />
-    <ClInclude Include="Termination.h" />
-    <ClInclude Include="Trace.h" />
-    <ClInclude Include="Transparency.h" />
-    <ClInclude Include="Vmcall.h" />
-    <ClInclude Include="Vmx.h" />
-    <ClInclude Include="Ept.h" />
-    <ClInclude Include="Msr.h" />
-    <ClInclude Include="Common.h" />
-    <ClInclude Include="Vpid.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/hyperdbg/hprdbghv/hprdbghv.vcxproj.filters
+++ b/hyperdbg/hprdbghv/hprdbghv.vcxproj.filters
@ -28,9 +28,6 @@
    <Filter Include="Source Files\Debugger\Features\Hooks">
      <UniqueIdentifier>{ab882ac8-7096-4cb3-8903-320cee753abe}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\Debugger\Features\Hooks\SyscallHook">
-      <UniqueIdentifier>{8e38c4c7-4c0a-4b0d-94ec-1068c8ebbefc}</UniqueIdentifier>
-    </Filter>
    <Filter Include="Source Files\Debugger\Commands">
      <UniqueIdentifier>{78fdea85-555a-4671-bdf6-4c166e673020}</UniqueIdentifier>
    </Filter>
@ -76,9 +73,6 @@
    <Filter Include="Header Files\Debugger\Transparency">
      <UniqueIdentifier>{70514b9d-1def-4c8b-b0b4-92c320d4195a}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Source Files\Debugger\ScriptEngine">
-      <UniqueIdentifier>{b72275a2-495f-4316-9186-8a5585288203}</UniqueIdentifier>
-    </Filter>
    <Filter Include="Source Files\Debugger\Communication">
      <UniqueIdentifier>{8e94f3da-6ff9-47f8-a84b-44c7171c02d6}</UniqueIdentifier>
    </Filter>
@ -103,6 +97,15 @@
    <Filter Include="Source Files\Driver">
      <UniqueIdentifier>{741ef68b-5aac-4ce8-bb82-169a07fc1383}</UniqueIdentifier>
    </Filter>
+    <Filter Include="Source Files\Debugger\Script Engine">
+      <UniqueIdentifier>{b72275a2-495f-4316-9186-8a5585288203}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Debugger\Features\Hooks\Syscall Hook">
+      <UniqueIdentifier>{8e38c4c7-4c0a-4b0d-94ec-1068c8ebbefc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Debugger\Features\Hooks\EPT Hook">
+      <UniqueIdentifier>{fec47462-c7ab-4843-8ba4-a7f68e208c49}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <Inf Include="hprdbghv.inf">
@ -110,275 +113,275 @@
    </Inf>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="Vmcall.c">
-      <Filter>Source Files\VMM\VMX</Filter>
-    </ClCompile>
-    <ClCompile Include="Common.c">
+    <ClCompile Include="Source Files\Common\Common.c">
      <Filter>Source Files\Common</Filter>
    </ClCompile>
-    <ClCompile Include="HypervisorRoutines.c">
-      <Filter>Source Files\VMM\VMX</Filter>
-    </ClCompile>
-    <ClCompile Include="Invept.c">
-      <Filter>Source Files\VMM\EPT</Filter>
-    </ClCompile>
-    <ClCompile Include="Ept.c">
-      <Filter>Source Files\VMM\EPT</Filter>
-    </ClCompile>
-    <ClCompile Include="VmxRegions.c">
-      <Filter>Source Files\VMM\VMX</Filter>
-    </ClCompile>
-    <ClCompile Include="Vmx.c">
-      <Filter>Source Files\VMM\VMX</Filter>
-    </ClCompile>
-    <ClCompile Include="Vpid.c">
-      <Filter>Source Files\VMM\EPT</Filter>
-    </ClCompile>
-    <ClCompile Include="Logging.c">
+    <ClCompile Include="Source Files\Common\Logging.c">
      <Filter>Source Files\Common</Filter>
    </ClCompile>
-    <ClCompile Include="Spinlock.c">
+    <ClCompile Include="Source Files\Common\MemoryMapper.c">
      <Filter>Source Files\Common</Filter>
    </ClCompile>
-    <ClCompile Include="PoolManager.c">
+    <ClCompile Include="Source Files\Common\PoolManager.c">
      <Filter>Source Files\Common</Filter>
    </ClCompile>
-    <ClCompile Include="Events.c">
-      <Filter>Source Files\VMM\VMX</Filter>
+    <ClCompile Include="Source Files\Common\Spinlock.c">
+      <Filter>Source Files\Common</Filter>
    </ClCompile>
-    <ClCompile Include="SsdtHook.c">
-      <Filter>Source Files\Debugger\Features\Hooks\SyscallHook</Filter>
-    </ClCompile>
-    <ClCompile Include="ExtensionCommands.c">
+    <ClCompile Include="Source Files\Debugger\Commands\BreakpointCommands.c">
      <Filter>Source Files\Debugger\Commands</Filter>
    </ClCompile>
-    <ClCompile Include="DebuggerCommands.c">
+    <ClCompile Include="Source Files\Debugger\Commands\DebuggerCommands.c">
      <Filter>Source Files\Debugger\Commands</Filter>
    </ClCompile>
-    <ClCompile Include="Broadcast.c">
-      <Filter>Source Files\Debugger\Essentials</Filter>
+    <ClCompile Include="Source Files\Debugger\Commands\ExtensionCommands.c">
+      <Filter>Source Files\Debugger\Commands</Filter>
    </ClCompile>
-    <ClCompile Include="Debugger.c">
-      <Filter>Source Files\Debugger\Essentials</Filter>
-    </ClCompile>
-    <ClCompile Include="DpcRoutines.c">
-      <Filter>Source Files\Debugger\Essentials</Filter>
-    </ClCompile>
-    <ClCompile Include="MemoryManager.c">
-      <Filter>Source Files\Debugger\Essentials</Filter>
-    </ClCompile>
-    <ClCompile Include="MemoryMapper.c">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="DebuggerEvents.c">
-      <Filter>Source Files\Debugger\Essentials</Filter>
-    </ClCompile>
-    <ClCompile Include="IoHandler.c">
-      <Filter>Source Files\VMM\VMX</Filter>
-    </ClCompile>
-    <ClCompile Include="IdtEmulation.c">
-      <Filter>Source Files\VMM\VMX</Filter>
-    </ClCompile>
-    <ClCompile Include="EferHook.c">
-      <Filter>Source Files\Debugger\Features\Hooks\SyscallHook</Filter>
-    </ClCompile>
-    <ClCompile Include="Counters.c">
-      <Filter>Source Files\VMM\VMX</Filter>
-    </ClCompile>
-    <ClCompile Include="CrossVmexits.c">
-      <Filter>Source Files\VMM\VMX</Filter>
-    </ClCompile>
-    <ClCompile Include="Vmexit.c">
-      <Filter>Source Files\VMM\VMX</Filter>
-    </ClCompile>
-    <ClCompile Include="Transparency.c">
-      <Filter>Source Files\Debugger\Transparency</Filter>
-    </ClCompile>
-    <ClCompile Include="EptHook.c">
-      <Filter>Source Files\Debugger\Features\Hooks</Filter>
-    </ClCompile>
-    <ClCompile Include="Termination.c">
-      <Filter>Source Files\Debugger\Essentials</Filter>
-    </ClCompile>
-    <ClCompile Include="Steppings.c">
-      <Filter>Source Files\Debugger\Essentials</Filter>
-    </ClCompile>
-    <ClCompile Include="ScriptEngine.c">
-      <Filter>Source Files\Debugger\ScriptEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="SerialConnection.c">
+    <ClCompile Include="Source Files\Debugger\Communication\GdbStub.c">
      <Filter>Source Files\Debugger\Communication</Filter>
    </ClCompile>
-    <ClCompile Include="Kd.c">
-      <Filter>Source Files\Debugger\Essentials</Filter>
-    </ClCompile>
-    <ClCompile Include="Apic.c">
-      <Filter>Source Files\Devices</Filter>
-    </ClCompile>
-    <ClCompile Include="Mtf.c">
-      <Filter>Source Files\VMM\VMX</Filter>
-    </ClCompile>
-    <ClCompile Include="GdbStub.c">
+    <ClCompile Include="Source Files\Debugger\Communication\SerialConnection.c">
      <Filter>Source Files\Debugger\Communication</Filter>
    </ClCompile>
-    <ClCompile Include="ManageRegs.c">
-      <Filter>Source Files\VMM\VMX</Filter>
+    <ClCompile Include="Source Files\Debugger\Essentials\Broadcast.c">
+      <Filter>Source Files\Debugger\Essentials</Filter>
    </ClCompile>
-    <ClCompile Include="BreakpointCommands.c">
-      <Filter>Source Files\Debugger\Commands</Filter>
+    <ClCompile Include="Source Files\Debugger\Essentials\Debugger.c">
+      <Filter>Source Files\Debugger\Essentials</Filter>
    </ClCompile>
-    <ClCompile Include="KernelTests.c">
+    <ClCompile Include="Source Files\Debugger\Essentials\DebuggerEvents.c">
+      <Filter>Source Files\Debugger\Essentials</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Essentials\DpcRoutines.c">
+      <Filter>Source Files\Debugger\Essentials</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Essentials\Kd.c">
+      <Filter>Source Files\Debugger\Essentials</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Essentials\MemoryManager.c">
+      <Filter>Source Files\Debugger\Essentials</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Essentials\Steppings.c">
+      <Filter>Source Files\Debugger\Essentials</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Essentials\Termination.c">
+      <Filter>Source Files\Debugger\Essentials</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Features\Hooks\EPT Hook\EptHook.c">
+      <Filter>Source Files\Debugger\Features\Hooks\EPT Hook</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Features\Hooks\Syscall Hook\EferHook.c">
+      <Filter>Source Files\Debugger\Features\Hooks\Syscall Hook</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Features\Hooks\Syscall Hook\SsdtHook.c">
+      <Filter>Source Files\Debugger\Features\Hooks\Syscall Hook</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Script Engine\ScriptEngine.c">
+      <Filter>Source Files\Debugger\Script Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Tests\KernelTests.c">
      <Filter>Source Files\Debugger\Tests</Filter>
    </ClCompile>
-    <ClCompile Include="Driver.c">
+    <ClCompile Include="Source Files\Debugger\Transparency\Transparency.c">
+      <Filter>Source Files\Debugger\Transparency</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Devices\Apic.c">
+      <Filter>Source Files\Devices</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Driver\Driver.c">
      <Filter>Source Files\Driver</Filter>
    </ClCompile>
-    <ClCompile Include="Ioctl.c">
+    <ClCompile Include="Source Files\Driver\Ioctl.c">
      <Filter>Source Files\Driver</Filter>
    </ClCompile>
+    <ClCompile Include="Source Files\VMM\EPT\Ept.c">
+      <Filter>Source Files\VMM\EPT</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\EPT\Invept.c">
+      <Filter>Source Files\VMM\EPT</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\EPT\Vpid.c">
+      <Filter>Source Files\VMM\EPT</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\VMX\Counters.c">
+      <Filter>Source Files\VMM\VMX</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\VMX\CrossVmexits.c">
+      <Filter>Source Files\VMM\VMX</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\VMX\Events.c">
+      <Filter>Source Files\VMM\VMX</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\VMX\HypervisorRoutines.c">
+      <Filter>Source Files\VMM\VMX</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\VMX\IdtEmulation.c">
+      <Filter>Source Files\VMM\VMX</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\VMX\IoHandler.c">
+      <Filter>Source Files\VMM\VMX</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\VMX\ManageRegs.c">
+      <Filter>Source Files\VMM\VMX</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\VMX\Mtf.c">
+      <Filter>Source Files\VMM\VMX</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\VMX\Vmcall.c">
+      <Filter>Source Files\VMM\VMX</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\VMX\Vmexit.c">
+      <Filter>Source Files\VMM\VMX</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\VMX\Vmx.c">
+      <Filter>Source Files\VMM\VMX</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\VMM\VMX\VmxRegions.c">
+      <Filter>Source Files\VMM\VMX</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="DebuggerCommands.h">
-      <Filter>Header Files\Debugger\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="ExtensionCommands.h">
-      <Filter>Header Files\Debugger\Commands</Filter>
-    </ClInclude>
-    <ClInclude Include="Common.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Dpc.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Logging.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="PoolManager.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Msr.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Trace.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Ept.h">
-      <Filter>Header Files\VMM\EPT</Filter>
-    </ClInclude>
-    <ClInclude Include="Invept.h">
-      <Filter>Header Files\VMM\EPT</Filter>
-    </ClInclude>
-    <ClInclude Include="Vpid.h">
-      <Filter>Header Files\VMM\EPT</Filter>
-    </ClInclude>
-    <ClInclude Include="Events.h">
-      <Filter>Header Files\VMM\VMX</Filter>
-    </ClInclude>
-    <ClInclude Include="Vmx.h">
-      <Filter>Header Files\VMM\VMX</Filter>
-    </ClInclude>
-    <ClInclude Include="Vmcall.h">
-      <Filter>Header Files\VMM\VMX</Filter>
-    </ClInclude>
-    <ClInclude Include="HypervisorRoutines.h">
-      <Filter>Header Files\VMM\VMX</Filter>
-    </ClInclude>
-    <ClInclude Include="Hooks.h">
-      <Filter>Header Files\Debugger\Features</Filter>
-    </ClInclude>
-    <ClInclude Include="GlobalVariables.h">
-      <Filter>Header Files\Misc</Filter>
-    </ClInclude>
-    <ClInclude Include="InlineAsm.h">
-      <Filter>Header Files\Misc</Filter>
-    </ClInclude>
-    <ClInclude Include="LengthDisassemblerEngine.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="Broadcast.h">
-      <Filter>Header Files\Debugger\Essentials</Filter>
-    </ClInclude>
-    <ClInclude Include="Debugger.h">
-      <Filter>Header Files\Debugger\Essentials</Filter>
-    </ClInclude>
-    <ClInclude Include="DpcRoutines.h">
-      <Filter>Header Files\Debugger\Essentials</Filter>
-    </ClInclude>
-    <ClInclude Include="MemoryMapper.h">
-      <Filter>Header Files\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="DebuggerEvents.h">
-      <Filter>Header Files\Debugger\Essentials</Filter>
-    </ClInclude>
-    <ClInclude Include="IoHandler.h">
-      <Filter>Header Files\VMM\VMX</Filter>
-    </ClInclude>
-    <ClInclude Include="IdtEmulation.h">
-      <Filter>Header Files\VMM\VMX</Filter>
-    </ClInclude>
-    <ClInclude Include="Counters.h">
-      <Filter>Header Files\VMM\VMX</Filter>
-    </ClInclude>
    <ClInclude Include="pch.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Transparency.h">
-      <Filter>Header Files\Debugger\Transparency</Filter>
+    <ClInclude Include="Header Files\Common\Common.h">
+      <Filter>Header Files\Common</Filter>
    </ClInclude>
-    <ClInclude Include="Termination.h">
-      <Filter>Header Files\Debugger\Essentials</Filter>
+    <ClInclude Include="Header Files\Common\Dpc.h">
+      <Filter>Header Files\Common</Filter>
    </ClInclude>
-    <ClInclude Include="Steppings.h">
-      <Filter>Header Files\Debugger\Essentials</Filter>
+    <ClInclude Include="Header Files\Common\LengthDisassemblerEngine.h">
+      <Filter>Header Files\Common</Filter>
    </ClInclude>
-    <ClInclude Include="SerialConnection.h">
-      <Filter>Header Files\Debugger\Communication</Filter>
+    <ClInclude Include="Header Files\Common\Logging.h">
+      <Filter>Header Files\Common</Filter>
    </ClInclude>
-    <ClInclude Include="Kd.h">
-      <Filter>Header Files\Debugger\Essentials</Filter>
+    <ClInclude Include="Header Files\Common\MemoryMapper.h">
+      <Filter>Header Files\Common</Filter>
    </ClInclude>
-    <ClInclude Include="Apic.h">
-      <Filter>Header Files\Devices</Filter>
+    <ClInclude Include="Header Files\Common\Msr.h">
+      <Filter>Header Files\Common</Filter>
    </ClInclude>
-    <ClInclude Include="GdbStub.h">
-      <Filter>Header Files\Debugger\Communication</Filter>
+    <ClInclude Include="Header Files\Common\PoolManager.h">
+      <Filter>Header Files\Common</Filter>
    </ClInclude>
-    <ClInclude Include="Mtf.h">
-      <Filter>Header Files\VMM\VMX</Filter>
+    <ClInclude Include="Header Files\Common\Trace.h">
+      <Filter>Header Files\Common</Filter>
    </ClInclude>
-    <ClInclude Include="ManageRegs.h">
-      <Filter>Header Files\VMM\VMX</Filter>
-    </ClInclude>
-    <ClInclude Include="BreakpointCommands.h">
+    <ClInclude Include="Header Files\Debugger\Commands\BreakpointCommands.h">
      <Filter>Header Files\Debugger\Commands</Filter>
    </ClInclude>
-    <ClInclude Include="KernelTests.h">
+    <ClInclude Include="Header Files\Debugger\Commands\DebuggerCommands.h">
+      <Filter>Header Files\Debugger\Commands</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Commands\ExtensionCommands.h">
+      <Filter>Header Files\Debugger\Commands</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Communication\GdbStub.h">
+      <Filter>Header Files\Debugger\Communication</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Communication\SerialConnection.h">
+      <Filter>Header Files\Debugger\Communication</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Essentials\Broadcast.h">
+      <Filter>Header Files\Debugger\Essentials</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Essentials\Debugger.h">
+      <Filter>Header Files\Debugger\Essentials</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Essentials\DebuggerEvents.h">
+      <Filter>Header Files\Debugger\Essentials</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Essentials\DpcRoutines.h">
+      <Filter>Header Files\Debugger\Essentials</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Essentials\Kd.h">
+      <Filter>Header Files\Debugger\Essentials</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Essentials\Steppings.h">
+      <Filter>Header Files\Debugger\Essentials</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Essentials\Termination.h">
+      <Filter>Header Files\Debugger\Essentials</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Features\Hooks.h">
+      <Filter>Header Files\Debugger\Features</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Tests\KernelTests.h">
      <Filter>Header Files\Debugger\Tests</Filter>
    </ClInclude>
+    <ClInclude Include="Header Files\Debugger\Transparency\Transparency.h">
+      <Filter>Header Files\Debugger\Transparency</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Devices\Apic.h">
+      <Filter>Header Files\Devices</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Misc\GlobalVariables.h">
+      <Filter>Header Files\Misc</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\Misc\InlineAsm.h">
+      <Filter>Header Files\Misc</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\VMM\EPT\Ept.h">
+      <Filter>Header Files\VMM\EPT</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\VMM\EPT\Invept.h">
+      <Filter>Header Files\VMM\EPT</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\VMM\EPT\Vpid.h">
+      <Filter>Header Files\VMM\EPT</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\VMM\VMX\Counters.h">
+      <Filter>Header Files\VMM\VMX</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\VMM\VMX\Events.h">
+      <Filter>Header Files\VMM\VMX</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\VMM\VMX\HypervisorRoutines.h">
+      <Filter>Header Files\VMM\VMX</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\VMM\VMX\IdtEmulation.h">
+      <Filter>Header Files\VMM\VMX</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\VMM\VMX\IoHandler.h">
+      <Filter>Header Files\VMM\VMX</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\VMM\VMX\ManageRegs.h">
+      <Filter>Header Files\VMM\VMX</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\VMM\VMX\Mtf.h">
+      <Filter>Header Files\VMM\VMX</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\VMM\VMX\Vmcall.h">
+      <Filter>Header Files\VMM\VMX</Filter>
+    </ClInclude>
+    <ClInclude Include="Header Files\VMM\VMX\Vmx.h">
+      <Filter>Header Files\VMM\VMX</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
-    <MASM Include="AsmEpt.asm">
+    <MASM Include="Source Files\Assembly\AsmCommon.asm">
      <Filter>Source Files\Assembly</Filter>
    </MASM>
-    <MASM Include="AsmCommon.asm">
+    <MASM Include="Source Files\Assembly\AsmDebugger.asm">
      <Filter>Source Files\Assembly</Filter>
    </MASM>
-    <MASM Include="AsmSegmentRegs.asm">
+    <MASM Include="Source Files\Assembly\AsmEpt.asm">
      <Filter>Source Files\Assembly</Filter>
    </MASM>
-    <MASM Include="AsmVmxOperation.asm">
+    <MASM Include="Source Files\Assembly\AsmKernelSideTests.asm">
      <Filter>Source Files\Assembly</Filter>
    </MASM>
-    <MASM Include="AsmVmxContextState.asm">
+    <MASM Include="Source Files\Assembly\AsmSegmentRegs.asm">
      <Filter>Source Files\Assembly</Filter>
    </MASM>
-    <MASM Include="AsmVmexitHandler.asm">
+    <MASM Include="Source Files\Assembly\AsmVmexitHandler.asm">
      <Filter>Source Files\Assembly</Filter>
    </MASM>
-    <MASM Include="AsmDebugger.asm">
+    <MASM Include="Source Files\Assembly\AsmVmxContextState.asm">
      <Filter>Source Files\Assembly</Filter>
    </MASM>
-    <MASM Include="AsmKernelSideTests.asm">
+    <MASM Include="Source Files\Assembly\AsmVmxOperation.asm">
      <Filter>Source Files\Assembly</Filter>
    </MASM>
  </ItemGroup>
--- a/hyperdbg/hprdbghv/pch.h
+++ b/hyperdbg/hprdbghv/pch.h
@ -30,46 +30,46 @@
 //
 #include "Definition.h"
 #include "Configuration.h"
-#include "Dpc.h"
-#include "LengthDisassemblerEngine.h"
-#include "Logging.h"
-#include "MemoryMapper.h"
-#include "Msr.h"
-#include "KernelTests.h"
-#include "PoolManager.h"
-#include "Trace.h"
-#include "DpcRoutines.h"
-#include "InlineAsm.h"
-#include "Vpid.h"
-#include "Ept.h"
-#include "Events.h"
-#include "Common.h"
-#include "Debugger.h"
-#include "Apic.h"
-#include "Kd.h"
-#include "Mtf.h"
-#include "GdbStub.h"
-#include "DebuggerEvents.h"
-#include "Hooks.h"
-#include "Counters.h"
-#include "Transparency.h"
-#include "IdtEmulation.h"
-#include "Invept.h"
-#include "Broadcast.h"
-#include "Vmcall.h"
-#include "ManageRegs.h"
-#include "Vmx.h"
-#include "BreakpointCommands.h"
-#include "DebuggerCommands.h"
-#include "ExtensionCommands.h"
-#include "SerialConnection.h"
-#include "HypervisorRoutines.h"
-#include "IoHandler.h"
-#include "Steppings.h"
-#include "Termination.h"
+#include "..\hprdbghv\Header Files\Common\Dpc.h"
+#include "..\hprdbghv\Header Files\Common\LengthDisassemblerEngine.h"
+#include "..\hprdbghv\Header Files\Common\Logging.h"
+#include "..\hprdbghv\Header Files\Common\MemoryMapper.h"
+#include "..\hprdbghv\Header Files\Common\Msr.h"
+#include "..\hprdbghv\Header Files\Debugger\Tests\KernelTests.h"
+#include "..\hprdbghv\Header Files\Common\PoolManager.h"
+#include "..\hprdbghv\Header Files\Common\Trace.h"
+#include "..\hprdbghv\Header Files\Debugger\Essentials\DpcRoutines.h"
+#include "..\hprdbghv\Header Files\Misc\InlineAsm.h"
+#include "..\hprdbghv\Header Files\VMM\EPT\Vpid.h"
+#include "..\hprdbghv\Header Files\VMM\EPT\Ept.h"
+#include "..\hprdbghv\Header Files\VMM\VMX\Events.h"
+#include "..\hprdbghv\Header Files\Common\Common.h"
+#include "..\hprdbghv\Header Files\Debugger\Essentials\Debugger.h"
+#include "..\hprdbghv\Header Files\Devices\Apic.h"
+#include "..\hprdbghv\Header Files\Debugger\Essentials\Kd.h"
+#include "..\hprdbghv\Header Files\VMM\VMX\Mtf.h"
+#include "..\hprdbghv\Header Files\Debugger\Communication\GdbStub.h"
+#include "..\hprdbghv\Header Files\Debugger\Essentials\DebuggerEvents.h"
+#include "..\hprdbghv\Header Files\Debugger\Features\Hooks.h"
+#include "..\hprdbghv\Header Files\VMM\VMX\Counters.h"
+#include "..\hprdbghv\Header Files\Debugger\Transparency\Transparency.h"
+#include "..\hprdbghv\Header Files\VMM\VMX\IdtEmulation.h"
+#include "..\hprdbghv\Header Files\VMM\EPT\Invept.h"
+#include "..\hprdbghv\Header Files\Debugger\Essentials\Broadcast.h"
+#include "..\hprdbghv\Header Files\VMM\VMX\Vmcall.h"
+#include "..\hprdbghv\Header Files\VMM\VMX\ManageRegs.h"
+#include "..\hprdbghv\Header Files\VMM\VMX\Vmx.h"
+#include "..\hprdbghv\Header Files\Debugger\Commands\BreakpointCommands.h"
+#include "..\hprdbghv\Header Files\Debugger\Commands\DebuggerCommands.h"
+#include "..\hprdbghv\Header Files\Debugger\Commands\ExtensionCommands.h"
+#include "..\hprdbghv\Header Files\Debugger\Communication\SerialConnection.h"
+#include "..\hprdbghv\Header Files\VMM\VMX\HypervisorRoutines.h"
+#include "..\hprdbghv\Header Files\VMM\VMX\IoHandler.h"
+#include "..\hprdbghv\Header Files\Debugger\Essentials\Steppings.h"
+#include "..\hprdbghv\Header Files\Debugger\Essentials\Termination.h"
 #include "ScriptEngineCommonDefinitions.h"

 //
 // Global Variables should be the last header to include
 //
-#include "GlobalVariables.h"
+#include "..\hprdbghv\Header Files\Misc\GlobalVariables.h"