diff --git a/hyperdbg/hprdbghv/.clang-format b/hyperdbg/hprdbghv/.clang-format
deleted file mode 100644
index a401ac03..00000000
--- a/hyperdbg/hprdbghv/.clang-format
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/hyperdbg/hprdbghv/Common.h b/hyperdbg/hprdbghv/Header Files/Common/Common.h
similarity index 100%
rename from hyperdbg/hprdbghv/Common.h
rename to hyperdbg/hprdbghv/Header Files/Common/Common.h
diff --git a/hyperdbg/hprdbghv/Dpc.h b/hyperdbg/hprdbghv/Header Files/Common/Dpc.h
similarity index 100%
rename from hyperdbg/hprdbghv/Dpc.h
rename to hyperdbg/hprdbghv/Header Files/Common/Dpc.h
diff --git a/hyperdbg/hprdbghv/LengthDisassemblerEngine.h b/hyperdbg/hprdbghv/Header Files/Common/LengthDisassemblerEngine.h
similarity index 100%
rename from hyperdbg/hprdbghv/LengthDisassemblerEngine.h
rename to hyperdbg/hprdbghv/Header Files/Common/LengthDisassemblerEngine.h
diff --git a/hyperdbg/hprdbghv/Logging.h b/hyperdbg/hprdbghv/Header Files/Common/Logging.h
similarity index 100%
rename from hyperdbg/hprdbghv/Logging.h
rename to hyperdbg/hprdbghv/Header Files/Common/Logging.h
diff --git a/hyperdbg/hprdbghv/MemoryMapper.h b/hyperdbg/hprdbghv/Header Files/Common/MemoryMapper.h
similarity index 100%
rename from hyperdbg/hprdbghv/MemoryMapper.h
rename to hyperdbg/hprdbghv/Header Files/Common/MemoryMapper.h
diff --git a/hyperdbg/hprdbghv/Msr.h b/hyperdbg/hprdbghv/Header Files/Common/Msr.h
similarity index 100%
rename from hyperdbg/hprdbghv/Msr.h
rename to hyperdbg/hprdbghv/Header Files/Common/Msr.h
diff --git a/hyperdbg/hprdbghv/PoolManager.h b/hyperdbg/hprdbghv/Header Files/Common/PoolManager.h
similarity index 100%
rename from hyperdbg/hprdbghv/PoolManager.h
rename to hyperdbg/hprdbghv/Header Files/Common/PoolManager.h
diff --git a/hyperdbg/hprdbghv/Trace.h b/hyperdbg/hprdbghv/Header Files/Common/Trace.h
similarity index 100%
rename from hyperdbg/hprdbghv/Trace.h
rename to hyperdbg/hprdbghv/Header Files/Common/Trace.h
diff --git a/hyperdbg/hprdbghv/BreakpointCommands.h b/hyperdbg/hprdbghv/Header Files/Debugger/Commands/BreakpointCommands.h
similarity index 100%
rename from hyperdbg/hprdbghv/BreakpointCommands.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Commands/BreakpointCommands.h
diff --git a/hyperdbg/hprdbghv/DebuggerCommands.h b/hyperdbg/hprdbghv/Header Files/Debugger/Commands/DebuggerCommands.h
similarity index 100%
rename from hyperdbg/hprdbghv/DebuggerCommands.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Commands/DebuggerCommands.h
diff --git a/hyperdbg/hprdbghv/ExtensionCommands.h b/hyperdbg/hprdbghv/Header Files/Debugger/Commands/ExtensionCommands.h
similarity index 100%
rename from hyperdbg/hprdbghv/ExtensionCommands.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Commands/ExtensionCommands.h
diff --git a/hyperdbg/hprdbghv/GdbStub.h b/hyperdbg/hprdbghv/Header Files/Debugger/Communication/GdbStub.h
similarity index 100%
rename from hyperdbg/hprdbghv/GdbStub.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Communication/GdbStub.h
diff --git a/hyperdbg/hprdbghv/SerialConnection.h b/hyperdbg/hprdbghv/Header Files/Debugger/Communication/SerialConnection.h
similarity index 100%
rename from hyperdbg/hprdbghv/SerialConnection.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Communication/SerialConnection.h
diff --git a/hyperdbg/hprdbghv/Broadcast.h b/hyperdbg/hprdbghv/Header Files/Debugger/Essentials/Broadcast.h
similarity index 100%
rename from hyperdbg/hprdbghv/Broadcast.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Essentials/Broadcast.h
diff --git a/hyperdbg/hprdbghv/Debugger.h b/hyperdbg/hprdbghv/Header Files/Debugger/Essentials/Debugger.h
similarity index 100%
rename from hyperdbg/hprdbghv/Debugger.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Essentials/Debugger.h
diff --git a/hyperdbg/hprdbghv/DebuggerEvents.h b/hyperdbg/hprdbghv/Header Files/Debugger/Essentials/DebuggerEvents.h
similarity index 100%
rename from hyperdbg/hprdbghv/DebuggerEvents.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Essentials/DebuggerEvents.h
diff --git a/hyperdbg/hprdbghv/DpcRoutines.h b/hyperdbg/hprdbghv/Header Files/Debugger/Essentials/DpcRoutines.h
similarity index 100%
rename from hyperdbg/hprdbghv/DpcRoutines.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Essentials/DpcRoutines.h
diff --git a/hyperdbg/hprdbghv/Kd.h b/hyperdbg/hprdbghv/Header Files/Debugger/Essentials/Kd.h
similarity index 100%
rename from hyperdbg/hprdbghv/Kd.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Essentials/Kd.h
diff --git a/hyperdbg/hprdbghv/Steppings.h b/hyperdbg/hprdbghv/Header Files/Debugger/Essentials/Steppings.h
similarity index 100%
rename from hyperdbg/hprdbghv/Steppings.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Essentials/Steppings.h
diff --git a/hyperdbg/hprdbghv/Termination.h b/hyperdbg/hprdbghv/Header Files/Debugger/Essentials/Termination.h
similarity index 100%
rename from hyperdbg/hprdbghv/Termination.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Essentials/Termination.h
diff --git a/hyperdbg/hprdbghv/Hooks.h b/hyperdbg/hprdbghv/Header Files/Debugger/Features/Hooks.h
similarity index 100%
rename from hyperdbg/hprdbghv/Hooks.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Features/Hooks.h
diff --git a/hyperdbg/hprdbghv/KernelTests.h b/hyperdbg/hprdbghv/Header Files/Debugger/Tests/KernelTests.h
similarity index 100%
rename from hyperdbg/hprdbghv/KernelTests.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Tests/KernelTests.h
diff --git a/hyperdbg/hprdbghv/Transparency.h b/hyperdbg/hprdbghv/Header Files/Debugger/Transparency/Transparency.h
similarity index 100%
rename from hyperdbg/hprdbghv/Transparency.h
rename to hyperdbg/hprdbghv/Header Files/Debugger/Transparency/Transparency.h
diff --git a/hyperdbg/hprdbghv/Apic.h b/hyperdbg/hprdbghv/Header Files/Devices/Apic.h
similarity index 100%
rename from hyperdbg/hprdbghv/Apic.h
rename to hyperdbg/hprdbghv/Header Files/Devices/Apic.h
diff --git a/hyperdbg/hprdbghv/GlobalVariables.h b/hyperdbg/hprdbghv/Header Files/Misc/GlobalVariables.h
similarity index 100%
rename from hyperdbg/hprdbghv/GlobalVariables.h
rename to hyperdbg/hprdbghv/Header Files/Misc/GlobalVariables.h
diff --git a/hyperdbg/hprdbghv/InlineAsm.h b/hyperdbg/hprdbghv/Header Files/Misc/InlineAsm.h
similarity index 100%
rename from hyperdbg/hprdbghv/InlineAsm.h
rename to hyperdbg/hprdbghv/Header Files/Misc/InlineAsm.h
diff --git a/hyperdbg/hprdbghv/Ept.h b/hyperdbg/hprdbghv/Header Files/VMM/EPT/Ept.h
similarity index 100%
rename from hyperdbg/hprdbghv/Ept.h
rename to hyperdbg/hprdbghv/Header Files/VMM/EPT/Ept.h
diff --git a/hyperdbg/hprdbghv/Invept.h b/hyperdbg/hprdbghv/Header Files/VMM/EPT/Invept.h
similarity index 100%
rename from hyperdbg/hprdbghv/Invept.h
rename to hyperdbg/hprdbghv/Header Files/VMM/EPT/Invept.h
diff --git a/hyperdbg/hprdbghv/Vpid.h b/hyperdbg/hprdbghv/Header Files/VMM/EPT/Vpid.h
similarity index 100%
rename from hyperdbg/hprdbghv/Vpid.h
rename to hyperdbg/hprdbghv/Header Files/VMM/EPT/Vpid.h
diff --git a/hyperdbg/hprdbghv/Counters.h b/hyperdbg/hprdbghv/Header Files/VMM/VMX/Counters.h
similarity index 100%
rename from hyperdbg/hprdbghv/Counters.h
rename to hyperdbg/hprdbghv/Header Files/VMM/VMX/Counters.h
diff --git a/hyperdbg/hprdbghv/Events.h b/hyperdbg/hprdbghv/Header Files/VMM/VMX/Events.h
similarity index 100%
rename from hyperdbg/hprdbghv/Events.h
rename to hyperdbg/hprdbghv/Header Files/VMM/VMX/Events.h
diff --git a/hyperdbg/hprdbghv/HypervisorRoutines.h b/hyperdbg/hprdbghv/Header Files/VMM/VMX/HypervisorRoutines.h
similarity index 100%
rename from hyperdbg/hprdbghv/HypervisorRoutines.h
rename to hyperdbg/hprdbghv/Header Files/VMM/VMX/HypervisorRoutines.h
diff --git a/hyperdbg/hprdbghv/IdtEmulation.h b/hyperdbg/hprdbghv/Header Files/VMM/VMX/IdtEmulation.h
similarity index 100%
rename from hyperdbg/hprdbghv/IdtEmulation.h
rename to hyperdbg/hprdbghv/Header Files/VMM/VMX/IdtEmulation.h
diff --git a/hyperdbg/hprdbghv/IoHandler.h b/hyperdbg/hprdbghv/Header Files/VMM/VMX/IoHandler.h
similarity index 100%
rename from hyperdbg/hprdbghv/IoHandler.h
rename to hyperdbg/hprdbghv/Header Files/VMM/VMX/IoHandler.h
diff --git a/hyperdbg/hprdbghv/ManageRegs.h b/hyperdbg/hprdbghv/Header Files/VMM/VMX/ManageRegs.h
similarity index 100%
rename from hyperdbg/hprdbghv/ManageRegs.h
rename to hyperdbg/hprdbghv/Header Files/VMM/VMX/ManageRegs.h
diff --git a/hyperdbg/hprdbghv/Mtf.h b/hyperdbg/hprdbghv/Header Files/VMM/VMX/Mtf.h
similarity index 100%
rename from hyperdbg/hprdbghv/Mtf.h
rename to hyperdbg/hprdbghv/Header Files/VMM/VMX/Mtf.h
diff --git a/hyperdbg/hprdbghv/Vmcall.h b/hyperdbg/hprdbghv/Header Files/VMM/VMX/Vmcall.h
similarity index 100%
rename from hyperdbg/hprdbghv/Vmcall.h
rename to hyperdbg/hprdbghv/Header Files/VMM/VMX/Vmcall.h
diff --git a/hyperdbg/hprdbghv/Vmx.h b/hyperdbg/hprdbghv/Header Files/VMM/VMX/Vmx.h
similarity index 100%
rename from hyperdbg/hprdbghv/Vmx.h
rename to hyperdbg/hprdbghv/Header Files/VMM/VMX/Vmx.h
diff --git a/hyperdbg/hprdbghv/AsmCommon.asm b/hyperdbg/hprdbghv/Source Files/Assembly/AsmCommon.asm
similarity index 100%
rename from hyperdbg/hprdbghv/AsmCommon.asm
rename to hyperdbg/hprdbghv/Source Files/Assembly/AsmCommon.asm
diff --git a/hyperdbg/hprdbghv/AsmDebugger.asm b/hyperdbg/hprdbghv/Source Files/Assembly/AsmDebugger.asm
similarity index 100%
rename from hyperdbg/hprdbghv/AsmDebugger.asm
rename to hyperdbg/hprdbghv/Source Files/Assembly/AsmDebugger.asm
diff --git a/hyperdbg/hprdbghv/AsmEpt.asm b/hyperdbg/hprdbghv/Source Files/Assembly/AsmEpt.asm
similarity index 100%
rename from hyperdbg/hprdbghv/AsmEpt.asm
rename to hyperdbg/hprdbghv/Source Files/Assembly/AsmEpt.asm
diff --git a/hyperdbg/hprdbghv/AsmKernelSideTests.asm b/hyperdbg/hprdbghv/Source Files/Assembly/AsmKernelSideTests.asm
similarity index 100%
rename from hyperdbg/hprdbghv/AsmKernelSideTests.asm
rename to hyperdbg/hprdbghv/Source Files/Assembly/AsmKernelSideTests.asm
diff --git a/hyperdbg/hprdbghv/AsmSegmentRegs.asm b/hyperdbg/hprdbghv/Source Files/Assembly/AsmSegmentRegs.asm
similarity index 100%
rename from hyperdbg/hprdbghv/AsmSegmentRegs.asm
rename to hyperdbg/hprdbghv/Source Files/Assembly/AsmSegmentRegs.asm
diff --git a/hyperdbg/hprdbghv/AsmVmexitHandler.asm b/hyperdbg/hprdbghv/Source Files/Assembly/AsmVmexitHandler.asm
similarity index 100%
rename from hyperdbg/hprdbghv/AsmVmexitHandler.asm
rename to hyperdbg/hprdbghv/Source Files/Assembly/AsmVmexitHandler.asm
diff --git a/hyperdbg/hprdbghv/AsmVmxContextState.asm b/hyperdbg/hprdbghv/Source Files/Assembly/AsmVmxContextState.asm
similarity index 100%
rename from hyperdbg/hprdbghv/AsmVmxContextState.asm
rename to hyperdbg/hprdbghv/Source Files/Assembly/AsmVmxContextState.asm
diff --git a/hyperdbg/hprdbghv/AsmVmxOperation.asm b/hyperdbg/hprdbghv/Source Files/Assembly/AsmVmxOperation.asm
similarity index 100%
rename from hyperdbg/hprdbghv/AsmVmxOperation.asm
rename to hyperdbg/hprdbghv/Source Files/Assembly/AsmVmxOperation.asm
diff --git a/hyperdbg/hprdbghv/Common.c b/hyperdbg/hprdbghv/Source Files/Common/Common.c
similarity index 99%
rename from hyperdbg/hprdbghv/Common.c
rename to hyperdbg/hprdbghv/Source Files/Common/Common.c
index 4a30f339..a6deb138 100644
--- a/hyperdbg/hprdbghv/Common.c
+++ b/hyperdbg/hprdbghv/Source Files/Common/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
diff --git a/hyperdbg/hprdbghv/Logging.c b/hyperdbg/hprdbghv/Source Files/Common/Logging.c
similarity index 99%
rename from hyperdbg/hprdbghv/Logging.c
rename to hyperdbg/hprdbghv/Source Files/Common/Logging.c
index 129c7326..cea76369 100644
--- a/hyperdbg/hprdbghv/Logging.c
+++ b/hyperdbg/hprdbghv/Source Files/Common/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"
/**
diff --git a/hyperdbg/hprdbghv/MemoryMapper.c b/hyperdbg/hprdbghv/Source Files/Common/MemoryMapper.c
similarity index 99%
rename from hyperdbg/hprdbghv/MemoryMapper.c
rename to hyperdbg/hprdbghv/Source Files/Common/MemoryMapper.c
index 8a871c5c..475e6c94 100644
--- a/hyperdbg/hprdbghv/MemoryMapper.c
+++ b/hyperdbg/hprdbghv/Source Files/Common/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
diff --git a/hyperdbg/hprdbghv/PoolManager.c b/hyperdbg/hprdbghv/Source Files/Common/PoolManager.c
similarity index 99%
rename from hyperdbg/hprdbghv/PoolManager.c
rename to hyperdbg/hprdbghv/Source Files/Common/PoolManager.c
index 726462d3..7d71c17e 100644
--- a/hyperdbg/hprdbghv/PoolManager.c
+++ b/hyperdbg/hprdbghv/Source Files/Common/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
diff --git a/hyperdbg/hprdbghv/Spinlock.c b/hyperdbg/hprdbghv/Source Files/Common/Spinlock.c
similarity index 98%
rename from hyperdbg/hprdbghv/Spinlock.c
rename to hyperdbg/hprdbghv/Source Files/Common/Spinlock.c
index dd4b208e..81ebc113 100644
--- a/hyperdbg/hprdbghv/Spinlock.c
+++ b/hyperdbg/hprdbghv/Source Files/Common/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
diff --git a/hyperdbg/hprdbghv/BreakpointCommands.c b/hyperdbg/hprdbghv/Source Files/Debugger/Commands/BreakpointCommands.c
similarity index 99%
rename from hyperdbg/hprdbghv/BreakpointCommands.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Commands/BreakpointCommands.c
index c1366e70..f5a96e1f 100644
--- a/hyperdbg/hprdbghv/BreakpointCommands.c
+++ b/hyperdbg/hprdbghv/Source 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
diff --git a/hyperdbg/hprdbghv/DebuggerCommands.c b/hyperdbg/hprdbghv/Source Files/Debugger/Commands/DebuggerCommands.c
similarity index 99%
rename from hyperdbg/hprdbghv/DebuggerCommands.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Commands/DebuggerCommands.c
index 3695420b..e0a1dcce 100644
--- a/hyperdbg/hprdbghv/DebuggerCommands.c
+++ b/hyperdbg/hprdbghv/Source 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
diff --git a/hyperdbg/hprdbghv/ExtensionCommands.c b/hyperdbg/hprdbghv/Source Files/Debugger/Commands/ExtensionCommands.c
similarity index 99%
rename from hyperdbg/hprdbghv/ExtensionCommands.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Commands/ExtensionCommands.c
index 797c3439..4ecb4491 100644
--- a/hyperdbg/hprdbghv/ExtensionCommands.c
+++ b/hyperdbg/hprdbghv/Source 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
diff --git a/hyperdbg/hprdbghv/GdbStub.c b/hyperdbg/hprdbghv/Source Files/Debugger/Communication/GdbStub.c
similarity index 99%
rename from hyperdbg/hprdbghv/GdbStub.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Communication/GdbStub.c
index 42b2e5f3..5100fb9e 100644
--- a/hyperdbg/hprdbghv/GdbStub.c
+++ b/hyperdbg/hprdbghv/Source 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__
diff --git a/hyperdbg/hprdbghv/SerialConnection.c b/hyperdbg/hprdbghv/Source Files/Debugger/Communication/SerialConnection.c
similarity index 99%
rename from hyperdbg/hprdbghv/SerialConnection.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Communication/SerialConnection.c
index 6af72918..f23dfbdd 100644
--- a/hyperdbg/hprdbghv/SerialConnection.c
+++ b/hyperdbg/hprdbghv/Source 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
diff --git a/hyperdbg/hprdbghv/Broadcast.c b/hyperdbg/hprdbghv/Source Files/Debugger/Essentials/Broadcast.c
similarity index 99%
rename from hyperdbg/hprdbghv/Broadcast.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Essentials/Broadcast.c
index 5f7b73e5..9caf33ca 100644
--- a/hyperdbg/hprdbghv/Broadcast.c
+++ b/hyperdbg/hprdbghv/Source 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
diff --git a/hyperdbg/hprdbghv/Debugger.c b/hyperdbg/hprdbghv/Source Files/Debugger/Essentials/Debugger.c
similarity index 99%
rename from hyperdbg/hprdbghv/Debugger.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Essentials/Debugger.c
index 3c561b8f..73cf7e6b 100644
--- a/hyperdbg/hprdbghv/Debugger.c
+++ b/hyperdbg/hprdbghv/Source 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
diff --git a/hyperdbg/hprdbghv/DebuggerEvents.c b/hyperdbg/hprdbghv/Source Files/Debugger/Essentials/DebuggerEvents.c
similarity index 99%
rename from hyperdbg/hprdbghv/DebuggerEvents.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Essentials/DebuggerEvents.c
index c075561f..5b667e85 100644
--- a/hyperdbg/hprdbghv/DebuggerEvents.c
+++ b/hyperdbg/hprdbghv/Source 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)
diff --git a/hyperdbg/hprdbghv/DpcRoutines.c b/hyperdbg/hprdbghv/Source Files/Debugger/Essentials/DpcRoutines.c
similarity index 99%
rename from hyperdbg/hprdbghv/DpcRoutines.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Essentials/DpcRoutines.c
index 5c4033eb..c7e97831 100644
--- a/hyperdbg/hprdbghv/DpcRoutines.c
+++ b/hyperdbg/hprdbghv/Source 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
diff --git a/hyperdbg/hprdbghv/Kd.c b/hyperdbg/hprdbghv/Source Files/Debugger/Essentials/Kd.c
similarity index 99%
rename from hyperdbg/hprdbghv/Kd.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Essentials/Kd.c
index 7b3e47e3..223824e1 100644
--- a/hyperdbg/hprdbghv/Kd.c
+++ b/hyperdbg/hprdbghv/Source 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
diff --git a/hyperdbg/hprdbghv/MemoryManager.c b/hyperdbg/hprdbghv/Source Files/Debugger/Essentials/MemoryManager.c
similarity index 99%
rename from hyperdbg/hprdbghv/MemoryManager.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Essentials/MemoryManager.c
index 63443fb6..ca405f0f 100644
--- a/hyperdbg/hprdbghv/MemoryManager.c
+++ b/hyperdbg/hprdbghv/Source 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
diff --git a/hyperdbg/hprdbghv/Steppings.c b/hyperdbg/hprdbghv/Source Files/Debugger/Essentials/Steppings.c
similarity index 99%
rename from hyperdbg/hprdbghv/Steppings.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Essentials/Steppings.c
index a6fa6776..5ee0010f 100644
--- a/hyperdbg/hprdbghv/Steppings.c
+++ b/hyperdbg/hprdbghv/Source 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
diff --git a/hyperdbg/hprdbghv/Termination.c b/hyperdbg/hprdbghv/Source Files/Debugger/Essentials/Termination.c
similarity index 99%
rename from hyperdbg/hprdbghv/Termination.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Essentials/Termination.c
index f0286502..bc442a31 100644
--- a/hyperdbg/hprdbghv/Termination.c
+++ b/hyperdbg/hprdbghv/Source 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
diff --git a/hyperdbg/hprdbghv/EptHook.c b/hyperdbg/hprdbghv/Source Files/Debugger/Features/Hooks/EPT Hook/EptHook.c
similarity index 99%
rename from hyperdbg/hprdbghv/EptHook.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Features/Hooks/EPT Hook/EptHook.c
index d16472d6..7c4fc320 100644
--- a/hyperdbg/hprdbghv/EptHook.c
+++ b/hyperdbg/hprdbghv/Source Files/Debugger/Features/Hooks/EPT Hook/EptHook.c
@@ -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
diff --git a/hyperdbg/hprdbghv/EferHook.c b/hyperdbg/hprdbghv/Source Files/Debugger/Features/Hooks/Syscall Hook/EferHook.c
similarity index 99%
rename from hyperdbg/hprdbghv/EferHook.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Features/Hooks/Syscall Hook/EferHook.c
index 8b846dec..ffc8da5c 100644
--- a/hyperdbg/hprdbghv/EferHook.c
+++ b/hyperdbg/hprdbghv/Source Files/Debugger/Features/Hooks/Syscall Hook/EferHook.c
@@ -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
diff --git a/hyperdbg/hprdbghv/SsdtHook.c b/hyperdbg/hprdbghv/Source Files/Debugger/Features/Hooks/Syscall Hook/SsdtHook.c
similarity index 99%
rename from hyperdbg/hprdbghv/SsdtHook.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Features/Hooks/Syscall Hook/SsdtHook.c
index baa6e813..578ae178 100644
--- a/hyperdbg/hprdbghv/SsdtHook.c
+++ b/hyperdbg/hprdbghv/Source Files/Debugger/Features/Hooks/Syscall Hook/SsdtHook.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 the kernel base and Image size
diff --git a/hyperdbg/hprdbghv/ScriptEngine.c b/hyperdbg/hprdbghv/Source Files/Debugger/Script Engine/ScriptEngine.c
similarity index 97%
rename from hyperdbg/hprdbghv/ScriptEngine.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Script Engine/ScriptEngine.c
index 012dc76c..a5ed8408 100644
--- a/hyperdbg/hprdbghv/ScriptEngine.c
+++ b/hyperdbg/hprdbghv/Source Files/Debugger/Script Engine/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
diff --git a/hyperdbg/hprdbghv/KernelTests.c b/hyperdbg/hprdbghv/Source Files/Debugger/Tests/KernelTests.c
similarity index 99%
rename from hyperdbg/hprdbghv/KernelTests.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Tests/KernelTests.c
index fa9eab5a..a8e6cd40 100644
--- a/hyperdbg/hprdbghv/KernelTests.c
+++ b/hyperdbg/hprdbghv/Source 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
diff --git a/hyperdbg/hprdbghv/Transparency.c b/hyperdbg/hprdbghv/Source Files/Debugger/Transparency/Transparency.c
similarity index 99%
rename from hyperdbg/hprdbghv/Transparency.c
rename to hyperdbg/hprdbghv/Source Files/Debugger/Transparency/Transparency.c
index d90e2ba9..892e2d8e 100644
--- a/hyperdbg/hprdbghv/Transparency.c
+++ b/hyperdbg/hprdbghv/Source 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
*/
diff --git a/hyperdbg/hprdbghv/Apic.c b/hyperdbg/hprdbghv/Source Files/Devices/Apic.c
similarity index 98%
rename from hyperdbg/hprdbghv/Apic.c
rename to hyperdbg/hprdbghv/Source Files/Devices/Apic.c
index 26db2188..62a5c01e 100644
--- a/hyperdbg/hprdbghv/Apic.c
+++ b/hyperdbg/hprdbghv/Source Files/Devices/Apic.c
@@ -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
diff --git a/hyperdbg/hprdbghv/Driver.c b/hyperdbg/hprdbghv/Source Files/Driver/Driver.c
similarity index 99%
rename from hyperdbg/hprdbghv/Driver.c
rename to hyperdbg/hprdbghv/Source Files/Driver/Driver.c
index de497401..ca7661ab 100644
--- a/hyperdbg/hprdbghv/Driver.c
+++ b/hyperdbg/hprdbghv/Source Files/Driver/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"
/**
diff --git a/hyperdbg/hprdbghv/Ioctl.c b/hyperdbg/hprdbghv/Source Files/Driver/Ioctl.c
similarity index 99%
rename from hyperdbg/hprdbghv/Ioctl.c
rename to hyperdbg/hprdbghv/Source Files/Driver/Ioctl.c
index 74786d8c..e3ddffb8 100644
--- a/hyperdbg/hprdbghv/Ioctl.c
+++ b/hyperdbg/hprdbghv/Source Files/Driver/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
diff --git a/hyperdbg/hprdbghv/Ept.c b/hyperdbg/hprdbghv/Source Files/VMM/EPT/Ept.c
similarity index 99%
rename from hyperdbg/hprdbghv/Ept.c
rename to hyperdbg/hprdbghv/Source Files/VMM/EPT/Ept.c
index 3bf76a75..8845ed78 100644
--- a/hyperdbg/hprdbghv/Ept.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/EPT/Ept.c
@@ -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
diff --git a/hyperdbg/hprdbghv/Invept.c b/hyperdbg/hprdbghv/Source Files/VMM/EPT/Invept.c
similarity index 97%
rename from hyperdbg/hprdbghv/Invept.c
rename to hyperdbg/hprdbghv/Source Files/VMM/EPT/Invept.c
index 0a477ef5..49158b6a 100644
--- a/hyperdbg/hprdbghv/Invept.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/EPT/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
diff --git a/hyperdbg/hprdbghv/Vpid.c b/hyperdbg/hprdbghv/Source Files/VMM/EPT/Vpid.c
similarity index 98%
rename from hyperdbg/hprdbghv/Vpid.c
rename to hyperdbg/hprdbghv/Source Files/VMM/EPT/Vpid.c
index d17b9623..d2a8e674 100644
--- a/hyperdbg/hprdbghv/Vpid.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/EPT/Vpid.c
@@ -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
diff --git a/hyperdbg/hprdbghv/Counters.c b/hyperdbg/hprdbghv/Source Files/VMM/VMX/Counters.c
similarity index 98%
rename from hyperdbg/hprdbghv/Counters.c
rename to hyperdbg/hprdbghv/Source Files/VMM/VMX/Counters.c
index a75a4135..897c733d 100644
--- a/hyperdbg/hprdbghv/Counters.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/VMX/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
diff --git a/hyperdbg/hprdbghv/CrossVmexits.c b/hyperdbg/hprdbghv/Source Files/VMM/VMX/CrossVmexits.c
similarity index 93%
rename from hyperdbg/hprdbghv/CrossVmexits.c
rename to hyperdbg/hprdbghv/Source Files/VMM/VMX/CrossVmexits.c
index dffa4bd1..0139ef30 100644
--- a/hyperdbg/hprdbghv/CrossVmexits.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/VMX/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
diff --git a/hyperdbg/hprdbghv/Events.c b/hyperdbg/hprdbghv/Source Files/VMM/VMX/Events.c
similarity index 99%
rename from hyperdbg/hprdbghv/Events.c
rename to hyperdbg/hprdbghv/Source Files/VMM/VMX/Events.c
index cd8981cb..bbaae6c9 100644
--- a/hyperdbg/hprdbghv/Events.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/VMX/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
diff --git a/hyperdbg/hprdbghv/HypervisorRoutines.c b/hyperdbg/hprdbghv/Source Files/VMM/VMX/HypervisorRoutines.c
similarity index 99%
rename from hyperdbg/hprdbghv/HypervisorRoutines.c
rename to hyperdbg/hprdbghv/Source Files/VMM/VMX/HypervisorRoutines.c
index df9c8c9a..57114edc 100644
--- a/hyperdbg/hprdbghv/HypervisorRoutines.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/VMX/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
diff --git a/hyperdbg/hprdbghv/IdtEmulation.c b/hyperdbg/hprdbghv/Source Files/VMM/VMX/IdtEmulation.c
similarity index 99%
rename from hyperdbg/hprdbghv/IdtEmulation.c
rename to hyperdbg/hprdbghv/Source Files/VMM/VMX/IdtEmulation.c
index 9f161dca..026c898a 100644
--- a/hyperdbg/hprdbghv/IdtEmulation.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/VMX/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
diff --git a/hyperdbg/hprdbghv/IoHandler.c b/hyperdbg/hprdbghv/Source Files/VMM/VMX/IoHandler.c
similarity index 99%
rename from hyperdbg/hprdbghv/IoHandler.c
rename to hyperdbg/hprdbghv/Source Files/VMM/VMX/IoHandler.c
index c71a4bee..30713362 100644
--- a/hyperdbg/hprdbghv/IoHandler.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/VMX/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)
diff --git a/hyperdbg/hprdbghv/ManageRegs.c b/hyperdbg/hprdbghv/Source Files/VMM/VMX/ManageRegs.c
similarity index 99%
rename from hyperdbg/hprdbghv/ManageRegs.c
rename to hyperdbg/hprdbghv/Source Files/VMM/VMX/ManageRegs.c
index bb3cc7e0..dca7b21c 100644
--- a/hyperdbg/hprdbghv/ManageRegs.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/VMX/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
*
diff --git a/hyperdbg/hprdbghv/Mtf.c b/hyperdbg/hprdbghv/Source Files/VMM/VMX/Mtf.c
similarity index 99%
rename from hyperdbg/hprdbghv/Mtf.c
rename to hyperdbg/hprdbghv/Source Files/VMM/VMX/Mtf.c
index e72c7383..6a8d1742 100644
--- a/hyperdbg/hprdbghv/Mtf.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/VMX/Mtf.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 Monitor Trap Flag vm-exits
diff --git a/hyperdbg/hprdbghv/Vmcall.c b/hyperdbg/hprdbghv/Source Files/VMM/VMX/Vmcall.c
similarity index 99%
rename from hyperdbg/hprdbghv/Vmcall.c
rename to hyperdbg/hprdbghv/Source Files/VMM/VMX/Vmcall.c
index e4b2617b..5d3caf93 100644
--- a/hyperdbg/hprdbghv/Vmcall.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/VMX/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
diff --git a/hyperdbg/hprdbghv/Vmexit.c b/hyperdbg/hprdbghv/Source Files/VMM/VMX/Vmexit.c
similarity index 99%
rename from hyperdbg/hprdbghv/Vmexit.c
rename to hyperdbg/hprdbghv/Source Files/VMM/VMX/Vmexit.c
index 4456bc02..d060c9b8 100644
--- a/hyperdbg/hprdbghv/Vmexit.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/VMX/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
diff --git a/hyperdbg/hprdbghv/Vmx.c b/hyperdbg/hprdbghv/Source Files/VMM/VMX/Vmx.c
similarity index 99%
rename from hyperdbg/hprdbghv/Vmx.c
rename to hyperdbg/hprdbghv/Source Files/VMM/VMX/Vmx.c
index c48b248d..736b3105 100644
--- a/hyperdbg/hprdbghv/Vmx.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/VMX/Vmx.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
diff --git a/hyperdbg/hprdbghv/VmxRegions.c b/hyperdbg/hprdbghv/Source Files/VMM/VMX/VmxRegions.c
similarity index 99%
rename from hyperdbg/hprdbghv/VmxRegions.c
rename to hyperdbg/hprdbghv/Source Files/VMM/VMX/VmxRegions.c
index 0628d9d9..4bf71e05 100644
--- a/hyperdbg/hprdbghv/VmxRegions.c
+++ b/hyperdbg/hprdbghv/Source Files/VMM/VMX/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)
diff --git a/hyperdbg/hprdbghv/hprdbghv.vcxproj b/hyperdbg/hprdbghv/hprdbghv.vcxproj
index ec2981cd..2dbdff0e 100644
--- a/hyperdbg/hprdbghv/hprdbghv.vcxproj
+++ b/hyperdbg/hprdbghv/hprdbghv.vcxproj
@@ -69,7 +69,7 @@
true
HypervisorTraceLevelMessage(LEVEL,FLAGS,MSG,...)
Create
- pch.h
+ ..\hprdbghv\pch.h
$(SolutionDir)$(TargetName).pch
@@ -91,7 +91,7 @@
true
HypervisorTraceLevelMessage(LEVEL,FLAGS,MSG,...)
Create
- pch.h
+ ..\hprdbghv\pch.h
$(SolutionDir)$(TargetName).pch
Neither
Disabled
@@ -104,99 +104,99 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/hyperdbg/hprdbghv/hprdbghv.vcxproj.filters b/hyperdbg/hprdbghv/hprdbghv.vcxproj.filters
index 1259d2b6..af6dc13a 100644
--- a/hyperdbg/hprdbghv/hprdbghv.vcxproj.filters
+++ b/hyperdbg/hprdbghv/hprdbghv.vcxproj.filters
@@ -28,9 +28,6 @@
{ab882ac8-7096-4cb3-8903-320cee753abe}
-
- {8e38c4c7-4c0a-4b0d-94ec-1068c8ebbefc}
-
{78fdea85-555a-4671-bdf6-4c166e673020}
@@ -76,9 +73,6 @@
{70514b9d-1def-4c8b-b0b4-92c320d4195a}
-
- {b72275a2-495f-4316-9186-8a5585288203}
-
{8e94f3da-6ff9-47f8-a84b-44c7171c02d6}
@@ -103,6 +97,15 @@
{741ef68b-5aac-4ce8-bb82-169a07fc1383}
+
+ {b72275a2-495f-4316-9186-8a5585288203}
+
+
+ {8e38c4c7-4c0a-4b0d-94ec-1068c8ebbefc}
+
+
+ {fec47462-c7ab-4843-8ba4-a7f68e208c49}
+
@@ -110,275 +113,275 @@
-
- Source Files\VMM\VMX
-
-
+
Source Files\Common
-
- Source Files\VMM\VMX
-
-
- Source Files\VMM\EPT
-
-
- Source Files\VMM\EPT
-
-
- Source Files\VMM\VMX
-
-
- Source Files\VMM\VMX
-
-
- Source Files\VMM\EPT
-
-
+
Source Files\Common
-
+
Source Files\Common
-
+
Source Files\Common
-
- Source Files\VMM\VMX
+
+ Source Files\Common
-
- Source Files\Debugger\Features\Hooks\SyscallHook
-
-
+
Source Files\Debugger\Commands
-
+
Source Files\Debugger\Commands
-
- Source Files\Debugger\Essentials
+
+ Source Files\Debugger\Commands
-
- Source Files\Debugger\Essentials
-
-
- Source Files\Debugger\Essentials
-
-
- Source Files\Debugger\Essentials
-
-
- Source Files\Common
-
-
- Source Files\Debugger\Essentials
-
-
- Source Files\VMM\VMX
-
-
- Source Files\VMM\VMX
-
-
- Source Files\Debugger\Features\Hooks\SyscallHook
-
-
- Source Files\VMM\VMX
-
-
- Source Files\VMM\VMX
-
-
- Source Files\VMM\VMX
-
-
- Source Files\Debugger\Transparency
-
-
- Source Files\Debugger\Features\Hooks
-
-
- Source Files\Debugger\Essentials
-
-
- Source Files\Debugger\Essentials
-
-
- Source Files\Debugger\ScriptEngine
-
-
+
Source Files\Debugger\Communication
-
- Source Files\Debugger\Essentials
-
-
- Source Files\Devices
-
-
- Source Files\VMM\VMX
-
-
+
Source Files\Debugger\Communication
-
- Source Files\VMM\VMX
+
+ Source Files\Debugger\Essentials
-
- Source Files\Debugger\Commands
+
+ Source Files\Debugger\Essentials
-
+
+ Source Files\Debugger\Essentials
+
+
+ Source Files\Debugger\Essentials
+
+
+ Source Files\Debugger\Essentials
+
+
+ Source Files\Debugger\Essentials
+
+
+ Source Files\Debugger\Essentials
+
+
+ Source Files\Debugger\Essentials
+
+
+ Source Files\Debugger\Features\Hooks\EPT Hook
+
+
+ Source Files\Debugger\Features\Hooks\Syscall Hook
+
+
+ Source Files\Debugger\Features\Hooks\Syscall Hook
+
+
+ Source Files\Debugger\Script Engine
+
+
Source Files\Debugger\Tests
-
+
+ Source Files\Debugger\Transparency
+
+
+ Source Files\Devices
+
+
Source Files\Driver
-
+
Source Files\Driver
+
+ Source Files\VMM\EPT
+
+
+ Source Files\VMM\EPT
+
+
+ Source Files\VMM\EPT
+
+
+ Source Files\VMM\VMX
+
+
+ Source Files\VMM\VMX
+
+
+ Source Files\VMM\VMX
+
+
+ Source Files\VMM\VMX
+
+
+ Source Files\VMM\VMX
+
+
+ Source Files\VMM\VMX
+
+
+ Source Files\VMM\VMX
+
+
+ Source Files\VMM\VMX
+
+
+ Source Files\VMM\VMX
+
+
+ Source Files\VMM\VMX
+
+
+ Source Files\VMM\VMX
+
+
+ Source Files\VMM\VMX
+
-
- Header Files\Debugger\Commands
-
-
- Header Files\Debugger\Commands
-
-
- Header Files\Common
-
-
- Header Files\Common
-
-
- Header Files\Common
-
-
- Header Files\Common
-
-
- Header Files\Common
-
-
- Header Files\Common
-
-
- Header Files\VMM\EPT
-
-
- Header Files\VMM\EPT
-
-
- Header Files\VMM\EPT
-
-
- Header Files\VMM\VMX
-
-
- Header Files\VMM\VMX
-
-
- Header Files\VMM\VMX
-
-
- Header Files\VMM\VMX
-
-
- Header Files\Debugger\Features
-
-
- Header Files\Misc
-
-
- Header Files\Misc
-
-
- Header Files\Common
-
-
- Header Files\Debugger\Essentials
-
-
- Header Files\Debugger\Essentials
-
-
- Header Files\Debugger\Essentials
-
-
- Header Files\Common
-
-
- Header Files\Debugger\Essentials
-
-
- Header Files\VMM\VMX
-
-
- Header Files\VMM\VMX
-
-
- Header Files\VMM\VMX
-
Header Files
-
- Header Files\Debugger\Transparency
+
+ Header Files\Common
-
- Header Files\Debugger\Essentials
+
+ Header Files\Common
-
- Header Files\Debugger\Essentials
+
+ Header Files\Common
-
- Header Files\Debugger\Communication
+
+ Header Files\Common
-
- Header Files\Debugger\Essentials
+
+ Header Files\Common
-
- Header Files\Devices
+
+ Header Files\Common
-
- Header Files\Debugger\Communication
+
+ Header Files\Common
-
- Header Files\VMM\VMX
+
+ Header Files\Common
-
- Header Files\VMM\VMX
-
-
+
Header Files\Debugger\Commands
-
+
+ Header Files\Debugger\Commands
+
+
+ Header Files\Debugger\Commands
+
+
+ Header Files\Debugger\Communication
+
+
+ Header Files\Debugger\Communication
+
+
+ Header Files\Debugger\Essentials
+
+
+ Header Files\Debugger\Essentials
+
+
+ Header Files\Debugger\Essentials
+
+
+ Header Files\Debugger\Essentials
+
+
+ Header Files\Debugger\Essentials
+
+
+ Header Files\Debugger\Essentials
+
+
+ Header Files\Debugger\Essentials
+
+
+ Header Files\Debugger\Features
+
+
Header Files\Debugger\Tests
+
+ Header Files\Debugger\Transparency
+
+
+ Header Files\Devices
+
+
+ Header Files\Misc
+
+
+ Header Files\Misc
+
+
+ Header Files\VMM\EPT
+
+
+ Header Files\VMM\EPT
+
+
+ Header Files\VMM\EPT
+
+
+ Header Files\VMM\VMX
+
+
+ Header Files\VMM\VMX
+
+
+ Header Files\VMM\VMX
+
+
+ Header Files\VMM\VMX
+
+
+ Header Files\VMM\VMX
+
+
+ Header Files\VMM\VMX
+
+
+ Header Files\VMM\VMX
+
+
+ Header Files\VMM\VMX
+
+
+ Header Files\VMM\VMX
+
-
+
Source Files\Assembly
-
+
Source Files\Assembly
-
+
Source Files\Assembly
-
+
Source Files\Assembly
-
+
Source Files\Assembly
-
+
Source Files\Assembly
-
+
Source Files\Assembly
-
+
Source Files\Assembly
diff --git a/hyperdbg/hprdbghv/pch.h b/hyperdbg/hprdbghv/pch.h
index d8a183a0..747b60e0 100644
--- 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"