diff --git a/hyperdbg/hprdbgctrl/commands.h b/hyperdbg/hprdbgctrl/Header Files/commands.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/commands.h
rename to hyperdbg/hprdbgctrl/Header Files/commands.h
diff --git a/hyperdbg/hprdbgctrl/common.h b/hyperdbg/hprdbgctrl/Header Files/common.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/common.h
rename to hyperdbg/hprdbgctrl/Header Files/common.h
diff --git a/hyperdbg/hprdbgctrl/communication.h b/hyperdbg/hprdbgctrl/Header Files/communication.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/communication.h
rename to hyperdbg/hprdbgctrl/Header Files/communication.h
diff --git a/hyperdbg/hprdbgctrl/debugger.h b/hyperdbg/hprdbgctrl/Header Files/debugger.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/debugger.h
rename to hyperdbg/hprdbgctrl/Header Files/debugger.h
diff --git a/hyperdbg/hprdbgctrl/exports.h b/hyperdbg/hprdbgctrl/Header Files/exports.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/exports.h
rename to hyperdbg/hprdbgctrl/Header Files/exports.h
diff --git a/hyperdbg/hprdbgctrl/forwarding.h b/hyperdbg/hprdbgctrl/Header Files/forwarding.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/forwarding.h
rename to hyperdbg/hprdbgctrl/Header Files/forwarding.h
diff --git a/hyperdbg/hprdbgctrl/globals.h b/hyperdbg/hprdbgctrl/Header Files/globals.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/globals.h
rename to hyperdbg/hprdbgctrl/Header Files/globals.h
diff --git a/hyperdbg/hprdbgctrl/help.h b/hyperdbg/hprdbgctrl/Header Files/help.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/help.h
rename to hyperdbg/hprdbgctrl/Header Files/help.h
diff --git a/hyperdbg/hprdbgctrl/inipp.h b/hyperdbg/hprdbgctrl/Header Files/inipp.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/inipp.h
rename to hyperdbg/hprdbgctrl/Header Files/inipp.h
diff --git a/hyperdbg/hprdbgctrl/install.h b/hyperdbg/hprdbgctrl/Header Files/install.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/install.h
rename to hyperdbg/hprdbgctrl/Header Files/install.h
diff --git a/hyperdbg/hprdbgctrl/kd.h b/hyperdbg/hprdbgctrl/Header Files/kd.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/kd.h
rename to hyperdbg/hprdbgctrl/Header Files/kd.h
diff --git a/hyperdbg/hprdbgctrl/list.h b/hyperdbg/hprdbgctrl/Header Files/list.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/list.h
rename to hyperdbg/hprdbgctrl/Header Files/list.h
diff --git a/hyperdbg/hprdbgctrl/namedpipe.h b/hyperdbg/hprdbgctrl/Header Files/namedpipe.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/namedpipe.h
rename to hyperdbg/hprdbgctrl/Header Files/namedpipe.h
diff --git a/hyperdbg/hprdbgctrl/script-engine.h b/hyperdbg/hprdbgctrl/Header Files/script-engine.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/script-engine.h
rename to hyperdbg/hprdbgctrl/Header Files/script-engine.h
diff --git a/hyperdbg/hprdbgctrl/symbol.h b/hyperdbg/hprdbgctrl/Header Files/symbol.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/symbol.h
rename to hyperdbg/hprdbgctrl/Header Files/symbol.h
diff --git a/hyperdbg/hprdbgctrl/tests.h b/hyperdbg/hprdbgctrl/Header Files/tests.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/tests.h
rename to hyperdbg/hprdbgctrl/Header Files/tests.h
diff --git a/hyperdbg/hprdbgctrl/transparency.h b/hyperdbg/hprdbgctrl/Header Files/transparency.h
similarity index 100%
rename from hyperdbg/hprdbgctrl/transparency.h
rename to hyperdbg/hprdbgctrl/Header Files/transparency.h
diff --git a/hyperdbg/hprdbgctrl/dllmain.cpp b/hyperdbg/hprdbgctrl/Source Files/App/dllmain.cpp
similarity index 95%
rename from hyperdbg/hprdbgctrl/dllmain.cpp
rename to hyperdbg/hprdbgctrl/Source Files/App/dllmain.cpp
index b37cf0a3..ece4faf2 100644
--- a/hyperdbg/hprdbgctrl/dllmain.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/App/dllmain.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief Dll Main Entry
diff --git a/hyperdbg/hprdbgctrl/hprdbgctrl.cpp b/hyperdbg/hprdbgctrl/Source Files/App/hprdbgctrl.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/hprdbgctrl.cpp
rename to hyperdbg/hprdbgctrl/Source Files/App/hprdbgctrl.cpp
index f7cfa605..d3be4a34 100644
--- a/hyperdbg/hprdbgctrl/hprdbgctrl.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/App/hprdbgctrl.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 using namespace std;
 
diff --git a/hyperdbg/hprdbgctrl/AsmVmxChecks.asm b/hyperdbg/hprdbgctrl/Source Files/Assembly Files/AsmVmxChecks.asm
similarity index 100%
rename from hyperdbg/hprdbgctrl/AsmVmxChecks.asm
rename to hyperdbg/hprdbgctrl/Source Files/Assembly Files/AsmVmxChecks.asm
diff --git a/hyperdbg/hprdbgctrl/common.cpp b/hyperdbg/hprdbgctrl/Source Files/Common/common.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/common.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Common/common.cpp
index bdfbeec8..9d888d84 100644
--- a/hyperdbg/hprdbgctrl/common.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Common/common.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief add ` between 64 bit values and convert them to string
diff --git a/hyperdbg/hprdbgctrl/list.cpp b/hyperdbg/hprdbgctrl/Source Files/Common/list.cpp
similarity index 97%
rename from hyperdbg/hprdbgctrl/list.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Common/list.cpp
index d26d2246..23c8d654 100644
--- a/hyperdbg/hprdbgctrl/list.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Common/list.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief List initializer
diff --git a/hyperdbg/hprdbgctrl/bc.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/bc.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/bc.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/bc.cpp
index cb34a5f6..1db7e2e7 100644
--- a/hyperdbg/hprdbgctrl/bc.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/bc.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/bd.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/bd.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/bd.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/bd.cpp
index 06c0eeb8..c409b9e7 100644
--- a/hyperdbg/hprdbgctrl/bd.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/bd.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/be.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/be.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/be.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/be.cpp
index 4469ec02..c7f0b7bd 100644
--- a/hyperdbg/hprdbgctrl/be.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/be.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/bl.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/bl.cpp
similarity index 97%
rename from hyperdbg/hprdbgctrl/bl.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/bl.cpp
index 2e4ea1ff..a9a47186 100644
--- a/hyperdbg/hprdbgctrl/bl.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/bl.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/bp.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/bp.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/bp.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/bp.cpp
index ef19ede4..f9834eee 100644
--- a/hyperdbg/hprdbgctrl/bp.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/bp.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/cpu.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/cpu.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/cpu.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/cpu.cpp
index bfdc3f02..a896c1a2 100644
--- a/hyperdbg/hprdbgctrl/cpu.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/cpu.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of cpu command
diff --git a/hyperdbg/hprdbgctrl/d-u.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/d-u.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/d-u.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/d-u.cpp
index 984b4e26..2788de4d 100644
--- a/hyperdbg/hprdbgctrl/d-u.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/d-u.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/e.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/e.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/e.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/e.cpp
index 06e83e57..4aa6d90e 100644
--- a/hyperdbg/hprdbgctrl/e.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/e.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/eval.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/eval.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/eval.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/eval.cpp
index 43c0d884..d798b582 100644
--- a/hyperdbg/hprdbgctrl/eval.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/eval.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 using namespace std;
 
diff --git a/hyperdbg/hprdbgctrl/events.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/events.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/events.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/events.cpp
index 965a8b76..15e80dd3 100644
--- a/hyperdbg/hprdbgctrl/events.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/events.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/exit.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/exit.cpp
similarity index 96%
rename from hyperdbg/hprdbgctrl/exit.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/exit.cpp
index 0fc9bf35..7452af58 100644
--- a/hyperdbg/hprdbgctrl/exit.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/exit.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/flush.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/flush.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/flush.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/flush.cpp
index 6d113ea7..52029a34 100644
--- a/hyperdbg/hprdbgctrl/flush.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/flush.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/g.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/g.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/g.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/g.cpp
index 42ac29d1..0acf4bc5 100644
--- a/hyperdbg/hprdbgctrl/g.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/g.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/i.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/i.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/i.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/i.cpp
index 2e3f39ee..324b6be4 100644
--- a/hyperdbg/hprdbgctrl/i.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/i.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/lm.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/lm.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/lm.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/lm.cpp
index 20a7f333..a79e670f 100644
--- a/hyperdbg/hprdbgctrl/lm.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/lm.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 using namespace std;
 
diff --git a/hyperdbg/hprdbgctrl/load.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/load.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/load.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/load.cpp
index 31309f46..201f6b42 100644
--- a/hyperdbg/hprdbgctrl/load.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/load.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/output.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/output.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/output.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/output.cpp
index 99fdc7a6..2d420d7d 100644
--- a/hyperdbg/hprdbgctrl/output.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/output.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/p.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/p.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/p.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/p.cpp
index cf8e920f..236c701e 100644
--- a/hyperdbg/hprdbgctrl/p.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/p.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/pause.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/pause.cpp
similarity index 97%
rename from hyperdbg/hprdbgctrl/pause.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/pause.cpp
index 6b605327..2add3dc3 100644
--- a/hyperdbg/hprdbgctrl/pause.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/pause.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/print.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/print.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/print.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/print.cpp
index 1adce8f1..e4f39301 100644
--- a/hyperdbg/hprdbgctrl/print.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/print.cpp	
@@ -10,7 +10,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 using namespace std;
 
diff --git a/hyperdbg/hprdbgctrl/r.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/r.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/r.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/r.cpp
index ff2cc235..82bbcd88 100644
--- a/hyperdbg/hprdbgctrl/r.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/r.cpp	
@@ -10,7 +10,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 using namespace std;
 
diff --git a/hyperdbg/hprdbgctrl/rdmsr.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/rdmsr.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/rdmsr.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/rdmsr.cpp
index f3edfa9a..92bceb01 100644
--- a/hyperdbg/hprdbgctrl/rdmsr.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/rdmsr.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of rdmsr command
diff --git a/hyperdbg/hprdbgctrl/s.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/s.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/s.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/s.cpp
index 37f1f07c..14517666 100644
--- a/hyperdbg/hprdbgctrl/s.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/s.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/settings.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/settings.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/settings.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/settings.cpp
index d5514677..1b97709c 100644
--- a/hyperdbg/hprdbgctrl/settings.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/settings.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/sleep.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/sleep.cpp
similarity index 97%
rename from hyperdbg/hprdbgctrl/sleep.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/sleep.cpp
index 2850d235..4566b4da 100644
--- a/hyperdbg/hprdbgctrl/sleep.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/sleep.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of sleep command
diff --git a/hyperdbg/hprdbgctrl/t.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/t.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/t.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/t.cpp
index f136ba52..6eafa1e0 100644
--- a/hyperdbg/hprdbgctrl/t.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/t.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/test.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/test.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/test.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/test.cpp
index 525183b4..499b65ea 100644
--- a/hyperdbg/hprdbgctrl/test.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/test.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of test command
diff --git a/hyperdbg/hprdbgctrl/unload.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/unload.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/unload.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/unload.cpp
index 87cbcad6..be97c042 100644
--- a/hyperdbg/hprdbgctrl/unload.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/unload.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/wrmsr.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/wrmsr.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/wrmsr.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/wrmsr.cpp
index 37e8e075..76b65a37 100644
--- a/hyperdbg/hprdbgctrl/wrmsr.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/wrmsr.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of wrmsr command
diff --git a/hyperdbg/hprdbgctrl/x.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/x.cpp
similarity index 97%
rename from hyperdbg/hprdbgctrl/x.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/x.cpp
index 95406c06..0251d5b4 100644
--- a/hyperdbg/hprdbgctrl/x.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/x.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of x command
diff --git a/hyperdbg/hprdbgctrl/~.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/~.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/~.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/~.cpp
index c7802bf8..5e921119 100644
--- a/hyperdbg/hprdbgctrl/~.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Debugging Commands/~.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/cpuid.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/cpuid.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/cpuid.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/cpuid.cpp
index 9d8b2ee3..e3724978 100644
--- a/hyperdbg/hprdbgctrl/cpuid.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/cpuid.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !cpuid command
diff --git a/hyperdbg/hprdbgctrl/dr.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/dr.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/dr.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/dr.cpp
index dcf05cbd..b08b9a35 100644
--- a/hyperdbg/hprdbgctrl/dr.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/dr.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !dr command
diff --git a/hyperdbg/hprdbgctrl/epthook.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/epthook.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/epthook.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/epthook.cpp
index 4aa3d798..d4a645e6 100644
--- a/hyperdbg/hprdbgctrl/epthook.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/epthook.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !epthook command
diff --git a/hyperdbg/hprdbgctrl/epthook2.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/epthook2.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/epthook2.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/epthook2.cpp
index 951c7361..285f50bd 100644
--- a/hyperdbg/hprdbgctrl/epthook2.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/epthook2.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !epthook2 command
diff --git a/hyperdbg/hprdbgctrl/exception.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/exception.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/exception.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/exception.cpp
index ee6cde60..dae6ab92 100644
--- a/hyperdbg/hprdbgctrl/exception.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/exception.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !exception command
diff --git a/hyperdbg/hprdbgctrl/hide.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/hide.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/hide.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/hide.cpp
index 144b40d3..92b5c0de 100644
--- a/hyperdbg/hprdbgctrl/hide.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/hide.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/interrupt.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/interrupt.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/interrupt.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/interrupt.cpp
index 77575c88..6e176ee3 100644
--- a/hyperdbg/hprdbgctrl/interrupt.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/interrupt.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !interrupt command
diff --git a/hyperdbg/hprdbgctrl/ioin.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/ioin.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/ioin.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/ioin.cpp
index 4c65b123..3015b034 100644
--- a/hyperdbg/hprdbgctrl/ioin.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/ioin.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !ioin command
diff --git a/hyperdbg/hprdbgctrl/ioout.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/ioout.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/ioout.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/ioout.cpp
index a5b8380b..47c67442 100644
--- a/hyperdbg/hprdbgctrl/ioout.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/ioout.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !ioout command
diff --git a/hyperdbg/hprdbgctrl/measure.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/measure.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/measure.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/measure.cpp
index 0878db72..77d260e9 100644
--- a/hyperdbg/hprdbgctrl/measure.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/measure.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/monitor.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/monitor.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/monitor.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/monitor.cpp
index e7d6cac9..9ae422d3 100644
--- a/hyperdbg/hprdbgctrl/monitor.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/monitor.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !monitor command
diff --git a/hyperdbg/hprdbgctrl/msrread.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/msrread.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/msrread.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/msrread.cpp
index 8d12fd7e..78cd3916 100644
--- a/hyperdbg/hprdbgctrl/msrread.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/msrread.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !msrread command
diff --git a/hyperdbg/hprdbgctrl/msrwrite.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/msrwrite.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/msrwrite.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/msrwrite.cpp
index 0b181f70..4e578f73 100644
--- a/hyperdbg/hprdbgctrl/msrwrite.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/msrwrite.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !msrwrite command
diff --git a/hyperdbg/hprdbgctrl/pa2va.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/pa2va.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/pa2va.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/pa2va.cpp
index bd7591cd..ea714a0d 100644
--- a/hyperdbg/hprdbgctrl/pa2va.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/pa2va.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/pmc.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/pmc.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/pmc.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/pmc.cpp
index fdae9256..753596e7 100644
--- a/hyperdbg/hprdbgctrl/pmc.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/pmc.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !pmc command
diff --git a/hyperdbg/hprdbgctrl/pte.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/pte.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/pte.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/pte.cpp
index ec76c368..7854fc83 100644
--- a/hyperdbg/hprdbgctrl/pte.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/pte.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !pte command
diff --git a/hyperdbg/hprdbgctrl/syscall-sysret.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/syscall-sysret.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/syscall-sysret.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/syscall-sysret.cpp
index 23dcf799..ab9b750b 100644
--- a/hyperdbg/hprdbgctrl/syscall-sysret.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/syscall-sysret.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !syscall command
diff --git a/hyperdbg/hprdbgctrl/tsc.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/tsc.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/tsc.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/tsc.cpp
index 5ffeab76..ea123ba2 100644
--- a/hyperdbg/hprdbgctrl/tsc.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/tsc.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !tsc command
diff --git a/hyperdbg/hprdbgctrl/unhide.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/unhide.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/unhide.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/unhide.cpp
index 6719436c..bd26b71d 100644
--- a/hyperdbg/hprdbgctrl/unhide.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/unhide.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !unhide command
diff --git a/hyperdbg/hprdbgctrl/va2pa.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/va2pa.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/va2pa.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/va2pa.cpp
index 167de389..f6d974ab 100644
--- a/hyperdbg/hprdbgctrl/va2pa.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/va2pa.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/vmcall.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/vmcall.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/vmcall.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/vmcall.cpp
index e0bdf9f3..2db5263d 100644
--- a/hyperdbg/hprdbgctrl/vmcall.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Extension Commands/vmcall.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of !vmcall command
diff --git a/hyperdbg/hprdbgctrl/attach.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/attach.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/attach.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/attach.cpp
index 47ce6758..df72fbd8 100644
--- a/hyperdbg/hprdbgctrl/attach.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/attach.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/cls.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/cls.cpp
similarity index 95%
rename from hyperdbg/hprdbgctrl/cls.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/cls.cpp
index 7b8d6519..26bd7e2f 100644
--- a/hyperdbg/hprdbgctrl/cls.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/cls.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of .cls command
diff --git a/hyperdbg/hprdbgctrl/connect.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/connect.cpp
similarity index 97%
rename from hyperdbg/hprdbgctrl/connect.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/connect.cpp
index 3057deda..17fdcd06 100644
--- a/hyperdbg/hprdbgctrl/connect.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/connect.cpp	
@@ -9,12 +9,12 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables Header
 //
-#include "globals.h"
+#include "..\hprdbgctrl\Header Files\globals.h"
 
 //
 // Extern global Variables
diff --git a/hyperdbg/hprdbgctrl/debug.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/debug.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/debug.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/debug.cpp
index 21aeeabd..04035a06 100644
--- a/hyperdbg/hprdbgctrl/debug.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/debug.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/detach.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/detach.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/detach.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/detach.cpp
index ba4e9a07..d673adce 100644
--- a/hyperdbg/hprdbgctrl/detach.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/detach.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/disconnect.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/disconnect.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/disconnect.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/disconnect.cpp
index 140283a7..d55883e6 100644
--- a/hyperdbg/hprdbgctrl/disconnect.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/disconnect.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/formats.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/formats.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/formats.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/formats.cpp
index f4a0d86c..11e2135c 100644
--- a/hyperdbg/hprdbgctrl/formats.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/formats.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of help command :)
diff --git a/hyperdbg/hprdbgctrl/help.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/help.cpp
similarity index 95%
rename from hyperdbg/hprdbgctrl/help.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/help.cpp
index 9ba41800..dcba8ece 100644
--- a/hyperdbg/hprdbgctrl/help.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/help.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of help command :)
diff --git a/hyperdbg/hprdbgctrl/listen.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/listen.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/listen.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/listen.cpp
index 21e56242..902a0cb8 100644
--- a/hyperdbg/hprdbgctrl/listen.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/listen.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/logclose.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/logclose.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/logclose.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/logclose.cpp
index 06cd9979..b825aa48 100644
--- a/hyperdbg/hprdbgctrl/logclose.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/logclose.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/logopen.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/logopen.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/logopen.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/logopen.cpp
index 5769158f..1aed7a7c 100644
--- a/hyperdbg/hprdbgctrl/logopen.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/logopen.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 using namespace std;
 
diff --git a/hyperdbg/hprdbgctrl/process.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/process.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/process.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/process.cpp
index c86856b5..74b92036 100644
--- a/hyperdbg/hprdbgctrl/process.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/process.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/script.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/script.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/script.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/script.cpp
index 4c717e8b..6f2b7468 100644
--- a/hyperdbg/hprdbgctrl/script.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/script.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 using namespace std;
 
diff --git a/hyperdbg/hprdbgctrl/status.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/status.cpp
similarity index 98%
rename from hyperdbg/hprdbgctrl/status.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/status.cpp
index a67175fb..5a918199 100644
--- a/hyperdbg/hprdbgctrl/status.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/status.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/sym.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/sym.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/sym.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/sym.cpp
index d901bb06..01fccc4e 100644
--- a/hyperdbg/hprdbgctrl/sym.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/sym.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief help of .sym command
diff --git a/hyperdbg/hprdbgctrl/sympath.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/sympath.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/sympath.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/sympath.cpp
index 25e06989..4c3dbf09 100644
--- a/hyperdbg/hprdbgctrl/sympath.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Commands/Meta Commands/sympath.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/forwarding.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/forwarding.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/forwarding.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/forwarding.cpp
index ce2f9fbf..b9cff952 100644
--- a/hyperdbg/hprdbgctrl/forwarding.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/forwarding.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/namedpipe.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/namedpipe.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/namedpipe.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/namedpipe.cpp
index 376fc9c1..3bb1b710 100644
--- a/hyperdbg/hprdbgctrl/namedpipe.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/namedpipe.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/remote-connection.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/remote-connection.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/remote-connection.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/remote-connection.cpp
index 6ce01c4b..baeb6e40 100644
--- a/hyperdbg/hprdbgctrl/remote-connection.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/remote-connection.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/tcpclient.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/tcpclient.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/tcpclient.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/tcpclient.cpp
index 1ce25328..e74e4000 100644
--- a/hyperdbg/hprdbgctrl/tcpclient.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/tcpclient.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief communication for client, connecting to the server
diff --git a/hyperdbg/hprdbgctrl/tcpserver.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/tcpserver.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/tcpserver.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/tcpserver.cpp
index edc58ced..ea146ea4 100644
--- a/hyperdbg/hprdbgctrl/tcpserver.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Communication/tcpserver.cpp	
@@ -11,7 +11,7 @@
  */
 #undef UNICODE
 #define WIN32_LEAN_AND_MEAN
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Disable it because we want to use inet_ntoa
diff --git a/hyperdbg/hprdbgctrl/install.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Driver Loader/install.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/install.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Driver Loader/install.cpp
index 320b0f86..8573af72 100644
--- a/hyperdbg/hprdbgctrl/install.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Driver Loader/install.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 BOOLEAN
 InstallDriver(SC_HANDLE SchSCManager, LPCTSTR DriverName, LPCTSTR ServiceExe);
diff --git a/hyperdbg/hprdbgctrl/break-control.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/break-control.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/break-control.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/break-control.cpp
index 5aa26fb2..17f8c2a8 100644
--- a/hyperdbg/hprdbgctrl/break-control.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/break-control.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/debugger.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/debugger.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/debugger.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/debugger.cpp
index c2d7d0b6..0fa481bd 100644
--- a/hyperdbg/hprdbgctrl/debugger.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/debugger.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/interpreter.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/interpreter.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/interpreter.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/interpreter.cpp
index 10419bab..ea15fd1b 100644
--- a/hyperdbg/hprdbgctrl/interpreter.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/interpreter.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 using namespace std;
 
diff --git a/hyperdbg/hprdbgctrl/kd.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/kd.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/kd.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/kd.cpp
index 5f7881f4..97b6a494 100644
--- a/hyperdbg/hprdbgctrl/kd.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/kd.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/listening.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/listening.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/listening.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/listening.cpp
index 3c7ee1cf..af675feb 100644
--- a/hyperdbg/hprdbgctrl/listening.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/listening.cpp	
@@ -10,7 +10,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/symbol.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/symbol.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/symbol.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/symbol.cpp
index 7dfa39a6..05513cf9 100644
--- a/hyperdbg/hprdbgctrl/symbol.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Essentials/symbol.cpp	
@@ -10,7 +10,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/disassembler.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Implementations/disassembler.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/disassembler.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Implementations/disassembler.cpp
index d08704e9..af76570d 100644
--- a/hyperdbg/hprdbgctrl/disassembler.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Implementations/disassembler.cpp	
@@ -29,7 +29,7 @@ all
 
 #define NDEBUG
 
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 #include "Zycore/Format.h"
 #include "Zycore/LibC.h"
diff --git a/hyperdbg/hprdbgctrl/readmem.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Implementations/readmem.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/readmem.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Implementations/readmem.cpp
index e953d02a..48a56fb4 100644
--- a/hyperdbg/hprdbgctrl/readmem.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Implementations/readmem.cpp	
@@ -10,7 +10,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 extern BOOLEAN g_IsSerialConnectedToRemoteDebuggee;
 
diff --git a/hyperdbg/hprdbgctrl/script-engine-wrapper.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Script Engine Wrapper/script-engine-wrapper.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/script-engine-wrapper.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Script Engine Wrapper/script-engine-wrapper.cpp
index 94060d2f..984795b0 100644
--- a/hyperdbg/hprdbgctrl/script-engine-wrapper.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Script Engine Wrapper/script-engine-wrapper.cpp	
@@ -10,7 +10,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Include parser
diff --git a/hyperdbg/hprdbgctrl/script-engine.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Script Engine Wrapper/script-engine.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/script-engine.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Script Engine Wrapper/script-engine.cpp
index 0470f988..012a8788 100644
--- a/hyperdbg/hprdbgctrl/script-engine.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Script Engine Wrapper/script-engine.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/tests.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Tests/tests.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/tests.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Tests/tests.cpp
index cbb8623d..059526d7 100644
--- a/hyperdbg/hprdbgctrl/tests.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Tests/tests.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // Global Variables
diff --git a/hyperdbg/hprdbgctrl/gaussian-rng.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Transparency/gaussian-rng.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/gaussian-rng.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Transparency/gaussian-rng.cpp
index 3e349f4b..9761006d 100644
--- a/hyperdbg/hprdbgctrl/gaussian-rng.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Transparency/gaussian-rng.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 /**
  * @brief get the median of a vector
diff --git a/hyperdbg/hprdbgctrl/transparency.cpp b/hyperdbg/hprdbgctrl/Source Files/Debugger/Transparency/transparency.cpp
similarity index 99%
rename from hyperdbg/hprdbgctrl/transparency.cpp
rename to hyperdbg/hprdbgctrl/Source Files/Debugger/Transparency/transparency.cpp
index e33c34cd..19562edd 100644
--- a/hyperdbg/hprdbgctrl/transparency.cpp
+++ b/hyperdbg/hprdbgctrl/Source Files/Debugger/Transparency/transparency.cpp	
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 using namespace std;
 
diff --git a/hyperdbg/hprdbgctrl/hprdbgctrl.vcxproj b/hyperdbg/hprdbgctrl/hprdbgctrl.vcxproj
index a5b5cf4b..ca847820 100644
--- a/hyperdbg/hprdbgctrl/hprdbgctrl.vcxproj
+++ b/hyperdbg/hprdbgctrl/hprdbgctrl.vcxproj
@@ -64,7 +64,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>ZYCORE_STATIC_DEFINE;ZYDIS_STATIC_DEFINE;WINVER=0x0502;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020000;WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;HPRDBGCTRL_EXPORTS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>..\hprdbgctrl\pch.h</PrecompiledHeaderFile>
       <AdditionalIncludeDirectories>$(SolutionDir)\dependencies\zydis\dependencies\zycore\include;$(SolutionDir)\include;$(SolutionDir)\dependencies\zydis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -87,7 +87,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>ZYCORE_STATIC_DEFINE;ZYDIS_STATIC_DEFINE;WINVER=0x0502;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020000;WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;HPRDBGCTRL_EXPORTS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>..\hprdbgctrl\pch.h</PrecompiledHeaderFile>
       <AdditionalIncludeDirectories>$(SolutionDir)\dependencies\zydis\dependencies\zycore\include;$(SolutionDir)\include;$(SolutionDir)\dependencies\zydis\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -106,127 +106,122 @@
     <None Include="cpp.hint" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="commands.h" />
-    <ClInclude Include="common.h" />
-    <ClInclude Include="debugger.h" />
-    <ClInclude Include="exports.h" />
-    <ClInclude Include="forwarding.h" />
-    <ClInclude Include="globals.h" />
-    <ClInclude Include="help.h" />
-    <ClInclude Include="inipp.h" />
-    <ClInclude Include="install.h" />
-    <ClInclude Include="kd.h" />
-    <ClInclude Include="list.h" />
-    <ClInclude Include="namedpipe.h" />
+    <ClInclude Include="Header Files\commands.h" />
+    <ClInclude Include="Header Files\common.h" />
+    <ClInclude Include="Header Files\communication.h" />
+    <ClInclude Include="Header Files\debugger.h" />
+    <ClInclude Include="Header Files\exports.h" />
+    <ClInclude Include="Header Files\forwarding.h" />
+    <ClInclude Include="Header Files\globals.h" />
+    <ClInclude Include="Header Files\help.h" />
+    <ClInclude Include="Header Files\inipp.h" />
+    <ClInclude Include="Header Files\install.h" />
+    <ClInclude Include="Header Files\kd.h" />
+    <ClInclude Include="Header Files\list.h" />
+    <ClInclude Include="Header Files\namedpipe.h" />
+    <ClInclude Include="Header Files\script-engine.h" />
+    <ClInclude Include="Header Files\symbol.h" />
+    <ClInclude Include="Header Files\tests.h" />
+    <ClInclude Include="Header Files\transparency.h" />
     <ClInclude Include="pch.h" />
-    <ClInclude Include="communication.h" />
-    <ClInclude Include="script-engine.h" />
-    <ClInclude Include="symbol.h" />
-    <ClInclude Include="tests.h" />
-    <ClInclude Include="transparency.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="attach.cpp" />
-    <ClCompile Include="bc.cpp" />
-    <ClCompile Include="bd.cpp" />
-    <ClCompile Include="be.cpp" />
-    <ClCompile Include="bl.cpp" />
-    <ClCompile Include="bp.cpp" />
-    <ClCompile Include="break-control.cpp" />
-    <ClCompile Include="cls.cpp" />
-    <ClCompile Include="connect.cpp" />
-    <ClCompile Include="cpuid.cpp" />
-    <ClCompile Include="d-u.cpp" />
-    <ClCompile Include="debug.cpp" />
-    <ClCompile Include="debugger.cpp" />
-    <ClCompile Include="detach.cpp" />
-    <ClCompile Include="disconnect.cpp" />
-    <ClCompile Include="dr.cpp" />
-    <ClCompile Include="e.cpp" />
-    <ClCompile Include="epthook.cpp" />
-    <ClCompile Include="eval.cpp" />
-    <ClCompile Include="events.cpp" />
-    <ClCompile Include="exception.cpp" />
-    <ClCompile Include="exit.cpp" />
-    <ClCompile Include="flush.cpp" />
-    <ClCompile Include="formats.cpp" />
-    <ClCompile Include="epthook2.cpp" />
-    <ClCompile Include="forwarding.cpp" />
-    <ClCompile Include="g.cpp" />
-    <ClCompile Include="gaussian-rng.cpp" />
-    <ClCompile Include="help.cpp" />
-    <ClCompile Include="hide.cpp" />
-    <ClCompile Include="i.cpp" />
-    <ClCompile Include="interrupt.cpp" />
-    <ClCompile Include="ioin.cpp" />
-    <ClCompile Include="ioout.cpp" />
-    <ClCompile Include="kd.cpp" />
-    <ClCompile Include="listen.cpp" />
-    <ClCompile Include="listening.cpp" />
-    <ClCompile Include="load.cpp" />
-    <ClCompile Include="logclose.cpp" />
-    <ClCompile Include="logopen.cpp" />
-    <ClCompile Include="measure.cpp" />
-    <ClCompile Include="monitor.cpp" />
-    <ClCompile Include="msrread.cpp" />
-    <ClCompile Include="msrwrite.cpp" />
-    <ClCompile Include="namedpipe.cpp" />
-    <ClCompile Include="output.cpp" />
-    <ClCompile Include="p.cpp" />
-    <ClCompile Include="pa2va.cpp" />
-    <ClCompile Include="pause.cpp" />
-    <ClCompile Include="pmc.cpp" />
-    <ClCompile Include="print.cpp" />
-    <ClCompile Include="process.cpp" />
-    <ClCompile Include="pte.cpp" />
-    <ClCompile Include="r.cpp" />
-    <ClCompile Include="rdmsr.cpp" />
-    <ClCompile Include="readmem.cpp" />
-    <ClCompile Include="remote-connection.cpp" />
-    <ClCompile Include="s.cpp" />
-    <ClCompile Include="script-engine.cpp" />
-    <ClCompile Include="script.cpp" />
-    <ClCompile Include="settings.cpp" />
-    <ClCompile Include="script-engine-wrapper.cpp" />
-    <ClCompile Include="sleep.cpp" />
-    <ClCompile Include="status.cpp" />
-    <ClCompile Include="sym.cpp" />
-    <ClCompile Include="symbol.cpp" />
-    <ClCompile Include="sympath.cpp" />
-    <ClCompile Include="syscall-sysret.cpp" />
-    <ClCompile Include="t.cpp" />
-    <ClCompile Include="tcpclient.cpp" />
-    <ClCompile Include="tcpserver.cpp" />
-    <ClCompile Include="test.cpp" />
-    <ClCompile Include="tests.cpp" />
-    <ClCompile Include="transparency.cpp" />
-    <ClCompile Include="tsc.cpp" />
-    <ClCompile Include="unhide.cpp" />
-    <ClCompile Include="unload.cpp" />
-    <ClCompile Include="va2pa.cpp" />
-    <ClCompile Include="vmcall.cpp" />
-    <ClCompile Include="wrmsr.cpp" />
-    <ClCompile Include="x.cpp" />
-    <ClCompile Include="~.cpp" />
-    <MASM Include="AsmVmxChecks.asm">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </MASM>
-    <ClCompile Include="cpu.cpp" />
-    <ClCompile Include="disassembler.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="common.cpp" />
-    <ClCompile Include="hprdbgctrl.cpp" />
-    <ClCompile Include="install.cpp" />
-    <ClCompile Include="interpreter.cpp" />
-    <ClCompile Include="list.cpp" />
-    <ClCompile Include="lm.cpp" />
+    <ClCompile Include="Source Files\App\dllmain.cpp" />
+    <ClCompile Include="Source Files\App\hprdbgctrl.cpp" />
+    <ClCompile Include="Source Files\Common\common.cpp" />
+    <ClCompile Include="Source Files\Common\list.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\bc.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\bd.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\be.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\bl.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\bp.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\cpu.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\d-u.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\e.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\eval.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\events.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\exit.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\flush.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\g.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\i.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\lm.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\load.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\output.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\p.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\pause.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\print.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\r.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\rdmsr.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\s.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\settings.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\sleep.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\t.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\test.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\unload.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\wrmsr.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\x.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\~.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\cpuid.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\dr.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\epthook.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\epthook2.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\exception.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\hide.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\interrupt.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\ioin.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\ioout.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\measure.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\monitor.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\msrread.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\msrwrite.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\pa2va.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\pmc.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\pte.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\syscall-sysret.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\tsc.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\unhide.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\va2pa.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\vmcall.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\attach.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\cls.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\connect.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\debug.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\detach.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\disconnect.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\formats.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\help.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\listen.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\logclose.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\logopen.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\process.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\script.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\status.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\sym.cpp" />
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\sympath.cpp" />
+    <ClCompile Include="Source Files\Debugger\Communication\forwarding.cpp" />
+    <ClCompile Include="Source Files\Debugger\Communication\namedpipe.cpp" />
+    <ClCompile Include="Source Files\Debugger\Communication\remote-connection.cpp" />
+    <ClCompile Include="Source Files\Debugger\Communication\tcpclient.cpp" />
+    <ClCompile Include="Source Files\Debugger\Communication\tcpserver.cpp" />
+    <ClCompile Include="Source Files\Debugger\Driver Loader\install.cpp" />
+    <ClCompile Include="Source Files\Debugger\Essentials\break-control.cpp" />
+    <ClCompile Include="Source Files\Debugger\Essentials\debugger.cpp" />
+    <ClCompile Include="Source Files\Debugger\Essentials\interpreter.cpp" />
+    <ClCompile Include="Source Files\Debugger\Essentials\kd.cpp" />
+    <ClCompile Include="Source Files\Debugger\Essentials\listening.cpp" />
+    <ClCompile Include="Source Files\Debugger\Essentials\symbol.cpp" />
+    <ClCompile Include="Source Files\Debugger\Implementations\disassembler.cpp" />
+    <ClCompile Include="Source Files\Debugger\Implementations\readmem.cpp" />
+    <ClCompile Include="Source Files\Debugger\Script Engine Wrapper\script-engine-wrapper.cpp" />
+    <ClCompile Include="Source Files\Debugger\Script Engine Wrapper\script-engine.cpp" />
+    <ClCompile Include="Source Files\Debugger\Tests\tests.cpp" />
+    <ClCompile Include="Source Files\Debugger\Transparency\gaussian-rng.cpp" />
+    <ClCompile Include="Source Files\Debugger\Transparency\transparency.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
+    <MASM Include="Source Files\Assembly Files\AsmVmxChecks.asm" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/hyperdbg/hprdbgctrl/hprdbgctrl.vcxproj.filters b/hyperdbg/hprdbgctrl/hprdbgctrl.vcxproj.filters
index 8640aae1..8e81a856 100644
--- a/hyperdbg/hprdbgctrl/hprdbgctrl.vcxproj.filters
+++ b/hyperdbg/hprdbgctrl/hprdbgctrl.vcxproj.filters
@@ -52,12 +52,12 @@
     <Filter Include="Resource Files\Source Files\App">
       <UniqueIdentifier>{c34ee59d-d780-4ffd-bfc0-2e6017257f88}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Resource Files\Source Files\Debugger\Communication\Essentials">
-      <UniqueIdentifier>{a2e82957-85a0-4336-8b27-5804e9503d58}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Resource Files\Source Files\Debugger\Script Engine Wrapper">
       <UniqueIdentifier>{59d00535-ea51-41cc-8ffd-e28b1ec11371}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Resource Files\Source Files\Debugger\Essentials">
+      <UniqueIdentifier>{a2e82957-85a0-4336-8b27-5804e9503d58}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="cpp.hint" />
@@ -66,338 +66,338 @@
     <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="list.h">
+    <ClInclude Include="Header Files\commands.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="common.h">
+    <ClInclude Include="Header Files\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="debugger.h">
+    <ClInclude Include="Header Files\communication.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="help.h">
+    <ClInclude Include="Header Files\debugger.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="globals.h">
+    <ClInclude Include="Header Files\exports.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="exports.h">
+    <ClInclude Include="Header Files\forwarding.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="install.h">
+    <ClInclude Include="Header Files\globals.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="tests.h">
+    <ClInclude Include="Header Files\help.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="namedpipe.h">
+    <ClInclude Include="Header Files\inipp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="transparency.h">
+    <ClInclude Include="Header Files\install.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="communication.h">
+    <ClInclude Include="Header Files\kd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="forwarding.h">
+    <ClInclude Include="Header Files\list.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="kd.h">
+    <ClInclude Include="Header Files\namedpipe.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="commands.h">
+    <ClInclude Include="Header Files\script-engine.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="inipp.h">
+    <ClInclude Include="Header Files\symbol.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="symbol.h">
+    <ClInclude Include="Header Files\tests.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="script-engine.h">
+    <ClInclude Include="Header Files\transparency.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="readmem.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Implementations</Filter>
-    </ClCompile>
-    <ClCompile Include="debugger.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Communication\Essentials</Filter>
-    </ClCompile>
-    <ClCompile Include="interpreter.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Communication\Essentials</Filter>
-    </ClCompile>
-    <ClCompile Include="list.cpp">
-      <Filter>Resource Files\Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="common.cpp">
-      <Filter>Resource Files\Source Files\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="install.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Driver Loader</Filter>
-    </ClCompile>
-    <ClCompile Include="disassembler.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Implementations</Filter>
-    </ClCompile>
-    <ClCompile Include="cls.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="connect.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="cpu.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="disconnect.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="d-u.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="exit.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="formats.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="lm.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="load.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="monitor.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="pte.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="rdmsr.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="wrmsr.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="unload.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="syscall-sysret.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="cpuid.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="msrread.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="msrwrite.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="tsc.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="pmc.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="exception.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="dr.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="interrupt.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ioin.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="ioout.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="epthook2.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="vmcall.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="script.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="hide.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="unhide.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="epthook.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="test.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="namedpipe.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Communication</Filter>
-    </ClCompile>
-    <ClCompile Include="logopen.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="logclose.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="va2pa.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="pa2va.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="events.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="g.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="pause.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="sleep.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="e.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="s.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="transparency.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Transparency</Filter>
-    </ClCompile>
-    <ClCompile Include="gaussian-rng.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Transparency</Filter>
-    </ClCompile>
-    <ClCompile Include="measure.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="help.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="settings.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="flush.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="tcpserver.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Communication</Filter>
-    </ClCompile>
-    <ClCompile Include="tcpclient.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Communication</Filter>
-    </ClCompile>
-    <ClCompile Include="listen.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="status.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="attach.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="detach.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="t.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="tests.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Tests</Filter>
-    </ClCompile>
-    <ClCompile Include="print.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="forwarding.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Communication</Filter>
-    </ClCompile>
-    <ClCompile Include="output.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="debug.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="listening.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Communication\Essentials</Filter>
-    </ClCompile>
-    <ClCompile Include="kd.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Communication\Essentials</Filter>
-    </ClCompile>
-    <ClCompile Include="p.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="~.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="process.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="eval.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="r.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="bp.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="bd.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="be.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="bc.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="bl.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="i.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="dllmain.cpp">
-      <Filter>Resource Files\Source Files\App</Filter>
-    </ClCompile>
-    <ClCompile Include="hprdbgctrl.cpp">
-      <Filter>Resource Files\Source Files\App</Filter>
-    </ClCompile>
     <ClCompile Include="pch.cpp">
       <Filter>Resource Files\Source Files\App</Filter>
     </ClCompile>
-    <ClCompile Include="symbol.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Communication\Essentials</Filter>
-    </ClCompile>
-    <ClCompile Include="sympath.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="sym.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
-    </ClCompile>
-    <ClCompile Include="x.cpp">
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\~.cpp">
       <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
     </ClCompile>
-    <ClCompile Include="break-control.cpp">
-      <Filter>Resource Files\Source Files\Debugger\Communication\Essentials</Filter>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\bc.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
     </ClCompile>
-    <ClCompile Include="remote-connection.cpp">
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\bd.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\be.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\bl.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\bp.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\cpu.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\d-u.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\e.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\eval.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\events.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\exit.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\flush.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\g.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\i.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\lm.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\load.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\output.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\p.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\pause.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\print.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\r.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\rdmsr.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\s.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\settings.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\sleep.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\t.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\test.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\unload.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\wrmsr.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Debugging Commands\x.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Debugging Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\cpuid.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\dr.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\epthook.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\epthook2.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\exception.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\hide.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\interrupt.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\ioin.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\ioout.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\measure.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\monitor.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\msrread.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\msrwrite.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\pa2va.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\pmc.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\pte.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\syscall-sysret.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\tsc.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\unhide.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\va2pa.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Extension Commands\vmcall.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Extension Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\attach.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\cls.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\connect.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\debug.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\detach.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\disconnect.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\formats.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\help.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\listen.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\logclose.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\logopen.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\process.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\script.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\status.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\sym.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Commands\Meta Commands\sympath.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Commands\Meta Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Communication\forwarding.cpp">
       <Filter>Resource Files\Source Files\Debugger\Communication</Filter>
     </ClCompile>
-    <ClCompile Include="script-engine-wrapper.cpp">
+    <ClCompile Include="Source Files\Debugger\Communication\namedpipe.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Communication</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Communication\remote-connection.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Communication</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Communication\tcpclient.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Communication</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Communication\tcpserver.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Communication</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Driver Loader\install.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Driver Loader</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Essentials\break-control.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Essentials</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Essentials\debugger.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Essentials</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Essentials\interpreter.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Essentials</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Essentials\kd.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Essentials</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Essentials\listening.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Essentials</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Essentials\symbol.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Essentials</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Script Engine Wrapper\script-engine.cpp">
       <Filter>Resource Files\Source Files\Debugger\Script Engine Wrapper</Filter>
     </ClCompile>
-    <ClCompile Include="script-engine.cpp">
+    <ClCompile Include="Source Files\Debugger\Script Engine Wrapper\script-engine-wrapper.cpp">
       <Filter>Resource Files\Source Files\Debugger\Script Engine Wrapper</Filter>
     </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Implementations\disassembler.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Implementations</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Implementations\readmem.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Implementations</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Tests\tests.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Tests</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Transparency\gaussian-rng.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Transparency</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Debugger\Transparency\transparency.cpp">
+      <Filter>Resource Files\Source Files\Debugger\Transparency</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Common\common.cpp">
+      <Filter>Resource Files\Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\Common\list.cpp">
+      <Filter>Resource Files\Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\App\dllmain.cpp">
+      <Filter>Resource Files\Source Files\App</Filter>
+    </ClCompile>
+    <ClCompile Include="Source Files\App\hprdbgctrl.cpp">
+      <Filter>Resource Files\Source Files\App</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <MASM Include="AsmVmxChecks.asm">
+    <MASM Include="Source Files\Assembly Files\AsmVmxChecks.asm">
       <Filter>Resource Files\Source Files\Assembly Files</Filter>
     </MASM>
   </ItemGroup>
diff --git a/hyperdbg/hprdbgctrl/pch.cpp b/hyperdbg/hprdbgctrl/pch.cpp
index c7f54f30..444d708c 100644
--- a/hyperdbg/hprdbgctrl/pch.cpp
+++ b/hyperdbg/hprdbgctrl/pch.cpp
@@ -9,7 +9,7 @@
  * @copyright This project is released under the GNU Public License v3.
  *
  */
-#include "pch.h"
+#include "..\hprdbgctrl\pch.h"
 
 //
 // When you are using pre-compiled headers, this source file is necessary for
diff --git a/hyperdbg/hprdbgctrl/pch.h b/hyperdbg/hprdbgctrl/pch.h
index 3570534d..2468d755 100644
--- a/hyperdbg/hprdbgctrl/pch.h
+++ b/hyperdbg/hprdbgctrl/pch.h
@@ -69,24 +69,24 @@
 // HyperDbg defined headers
 //
 #    include "ScriptEngineCommonDefinitions.h"
-#    include "inipp.h"
 #    include "Configuration.h"
 #    include "Definition.h"
-#    include "commands.h"
-#    include "common.h"
-#    include "symbol.h"
-#    include "debugger.h"
-#    include "script-engine.h"
-#    include "exports.h"
-#    include "help.h"
-#    include "install.h"
-#    include "list.h"
-#    include "tests.h"
-#    include "transparency.h"
-#    include "communication.h"
-#    include "namedpipe.h"
-#    include "forwarding.h"
-#    include "kd.h"
+#    include "Header Files/inipp.h"
+#    include "Header Files/commands.h"
+#    include "Header Files/common.h"
+#    include "Header Files/symbol.h"
+#    include "Header Files/debugger.h"
+#    include "Header Files/script-engine.h"
+#    include "Header Files/exports.h"
+#    include "Header Files/help.h"
+#    include "Header Files/install.h"
+#    include "Header Files/list.h"
+#    include "Header Files/tests.h"
+#    include "Header Files/transparency.h"
+#    include "Header Files/communication.h"
+#    include "Header Files/namedpipe.h"
+#    include "Header Files/forwarding.h"
+#    include "Header Files/kd.h"
 
 #endif // PCH_H