MHR-21: refactors.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>

15 files changed, 47 insertions, 47 deletions

diff --git a/Sources/32asm.cc b/Sources/32asm.cc
index 4c98645..f877553 100644
--- a/Sources/32asm.cc
+++ b/Sources/32asm.cc
@@ -19,10 +19,10 @@
 
 #define __ASM_NEED_32x0__ 1
 
-#include <Headers/AsmKit/CPU/32x0.hpp>
-#include <Headers/ParserKit.hpp>
-#include <Headers/StdKit/AE.hpp>
-#include <Headers/StdKit/PEF.hpp>
+#include <Common/AsmKit/CPU/32x0.hpp>
+#include <Common/ParserKit.hpp>
+#include <Common/StdKit/AE.hpp>
+#include <Common/StdKit/PEF.hpp>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
diff --git a/Sources/64asm.cc b/Sources/64asm.cc
index 96bdc90..6e8cc6d 100644
--- a/Sources/64asm.cc
+++ b/Sources/64asm.cc
@@ -19,10 +19,10 @@
 
 #define __ASM_NEED_64x0__ 1
 
-#include <Headers/AsmKit/CPU/64x0.hpp>
-#include <Headers/ParserKit.hpp>
-#include <Headers/StdKit/AE.hpp>
-#include <Headers/StdKit/PEF.hpp>
+#include <Common/AsmKit/CPU/64x0.hpp>
+#include <Common/ParserKit.hpp>
+#include <Common/StdKit/AE.hpp>
+#include <Common/StdKit/PEF.hpp>
 #include <algorithm>
 #include <filesystem>
 #include <fstream>
diff --git a/Sources/64x0-cc.cc b/Sources/64x0-cc.cc
index d7b7491..3a0e569 100644
--- a/Sources/64x0-cc.cc
+++ b/Sources/64x0-cc.cc
@@ -10,9 +10,9 @@
 /// BUGS: ?
 /// TODO:
 
-#include <Headers/AsmKit/CPU/64x0.hpp>
-#include <Headers/ParserKit.hpp>
-#include <Headers/UUID.hpp>
+#include <Common/AsmKit/CPU/64x0.hpp>
+#include <Common/ParserKit.hpp>
+#include <Common/UUID.hpp>
 #include <cstdio>
 #include <filesystem>
 #include <fstream>
diff --git a/Sources/AssemblyFactory.cc b/Sources/AssemblyFactory.cc
index d5c0da7..0000ab7 100644
--- a/Sources/AssemblyFactory.cc
+++ b/Sources/AssemblyFactory.cc
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <Headers/AsmKit/AsmKit.hpp>
-#include <Headers/StdKit/ErrorID.hpp>
+#include <Common/AsmKit/AsmKit.hpp>
+#include <Common/StdKit/ErrorID.hpp>
 
 /**
  * @file AssemblyFactory.cxx
diff --git a/Sources/Detail/asmutils.hxx b/Sources/Detail/asmutils.hxx
index 36c5901..f6fdb41 100644
--- a/Sources/Detail/asmutils.hxx
+++ b/Sources/Detail/asmutils.hxx
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Headers/AsmKit/AsmKit.hpp>
-#include <Headers/ParserKit.hpp>
+#include <Common/AsmKit/AsmKit.hpp>
+#include <Common/ParserKit.hpp>
 
 using namespace CompilerKit;
 
diff --git a/Sources/Detail/compilerutils.hxx b/Sources/Detail/compilerutils.hxx
index bebdd7f..9ddd3a2 100644
--- a/Sources/Detail/compilerutils.hxx
+++ b/Sources/Detail/compilerutils.hxx
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Headers/AsmKit/AsmKit.hpp>
-#include <Headers/ParserKit.hpp>
+#include <Common/AsmKit/AsmKit.hpp>
+#include <Common/ParserKit.hpp>
 
 #define kZero64Section ".zero64"
 #define kCode64Section ".code64"
diff --git a/Sources/String.cc b/Sources/String.cc
index 6f7603f..38bd444 100644
--- a/Sources/String.cc
+++ b/Sources/String.cc
@@ -18,7 +18,7 @@
  *
  */
 
-#include <Headers/StdKit/String.hpp>
+#include <Common/StdKit/String.hpp>
 #include <utility>
 
 namespace CompilerKit {
diff --git a/Sources/bpp.cc b/Sources/bpp.cc
index a988693..accbef5 100644
--- a/Sources/bpp.cc
+++ b/Sources/bpp.cc
@@ -9,8 +9,8 @@
 
 /// BUGS: 0
 
-#include <Headers/ParserKit.hpp>
-#include <Headers/StdKit/ErrorID.hpp>
+#include <Common/ParserKit.hpp>
+#include <Common/StdKit/ErrorID.hpp>
 #include <algorithm>
 #include <filesystem>
 #include <fstream>
diff --git a/Sources/coff2ae.cc b/Sources/coff2ae.cc
index 59a99d4..349d543 100644
--- a/Sources/coff2ae.cc
+++ b/Sources/coff2ae.cc
@@ -4,9 +4,9 @@
 
 ------------------------------------------- */
 
-#include <Headers/ParserKit.hpp>
-#include <Headers/StdKit/AE.hpp>
-#include <Headers/StdKit/PEF.hpp>
+#include <Common/ParserKit.hpp>
+#include <Common/StdKit/AE.hpp>
+#include <Common/StdKit/PEF.hpp>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
diff --git a/Sources/cplusplus.cc b/Sources/cplusplus.cc
index 3622606..db33688 100644
--- a/Sources/cplusplus.cc
+++ b/Sources/cplusplus.cc
@@ -16,8 +16,8 @@
 #define kSplashCxx() \
 	kPrintF(kWhite "%s\n", "LightSpeed C++ Compiler, Copyright SoftwareLabs.")
 
-#include <Headers/AsmKit/CPU/amd64.hpp>
-#include <Headers/ParserKit.hpp>
+#include <Common/AsmKit/CPU/amd64.hpp>
+#include <Common/ParserKit.hpp>
 #include <cstdio>
 #include <filesystem>
 #include <fstream>
diff --git a/Sources/elf2ae.cc b/Sources/elf2ae.cc
index 5f838be..a451a0a 100644
--- a/Sources/elf2ae.cc
+++ b/Sources/elf2ae.cc
@@ -4,9 +4,9 @@
 
 ------------------------------------------- */
 
-#include <Headers/ParserKit.hpp>
-#include <Headers/StdKit/AE.hpp>
-#include <Headers/StdKit/PEF.hpp>
+#include <Common/ParserKit.hpp>
+#include <Common/StdKit/AE.hpp>
+#include <Common/StdKit/PEF.hpp>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
diff --git a/Sources/i64asm.cc b/Sources/i64asm.cc
index 5f0812c..5510252 100644
--- a/Sources/i64asm.cc
+++ b/Sources/i64asm.cc
@@ -27,10 +27,10 @@
 #define kAssemblerPragmaSymStr "#"
 #define kAssemblerPragmaSym	   '#'
 
-#include <Headers/AsmKit/CPU/amd64.hpp>
-#include <Headers/ParserKit.hpp>
-#include <Headers/StdKit/AE.hpp>
-#include <Headers/StdKit/PEF.hpp>
+#include <Common/AsmKit/CPU/amd64.hpp>
+#include <Common/ParserKit.hpp>
+#include <Common/StdKit/AE.hpp>
+#include <Common/StdKit/PEF.hpp>
 #include <algorithm>
 #include <cstdlib>
 #include <filesystem>
diff --git a/Sources/link.cc b/Sources/link.cc
index d0d330e..47406c4 100644
--- a/Sources/link.cc
+++ b/Sources/link.cc
@@ -13,23 +13,23 @@
 /// note: Do not look up for anything with .code64/.data64/.zero64!
 /// It will be loaded when program will start up!
 
-#include <Headers/StdKit/ErrorID.hpp>
+#include <Common/StdKit/ErrorID.hpp>
 
 //! Assembler Kit
-#include <Headers/AsmKit/AsmKit.hpp>
+#include <Common/AsmKit/AsmKit.hpp>
 
 //! Preferred Executable Format
-#include <Headers/StdKit/PEF.hpp>
-#include <Headers/UUID.hpp>
+#include <Common/StdKit/PEF.hpp>
+#include <Common/UUID.hpp>
 #include <filesystem>
 #include <random>
 #include <vector>
 
 //! Dist version
-#include <Headers/Version.hxx>
+#include <Common/Version.hxx>
 
 //! Advanced Executable Object Format
-#include <Headers/StdKit/AE.hpp>
+#include <Common/StdKit/AE.hpp>
 
 //! C++ I/O headers.
 #include <fstream>
diff --git a/Sources/ppc-cc.cc b/Sources/power-cc.cc
index 31dc359..b26dbf2 100644
--- a/Sources/ppc-cc.cc
+++ b/Sources/power-cc.cc
@@ -7,9 +7,9 @@
  * 	========================================================
  */
 
-#include <Headers/AsmKit/CPU/ppc.hpp>
-#include <Headers/ParserKit.hpp>
-#include <Headers/UUID.hpp>
+#include <Common/AsmKit/CPU/ppc.hpp>
+#include <Common/ParserKit.hpp>
+#include <Common/UUID.hpp>
 #include <cstdio>
 #include <filesystem>
 #include <fstream>
diff --git a/Sources/ppcasm.cc b/Sources/ppcasm.cc
index 5c444dd..0236491 100644
--- a/Sources/ppcasm.cc
+++ b/Sources/ppcasm.cc
@@ -17,12 +17,12 @@
 
 #define __ASM_NEED_PPC__ 1
 
-#include <Headers/StdKit/ErrorID.hpp>
-#include <Headers/AsmKit/CPU/ppc.hpp>
-#include <Headers/ParserKit.hpp>
-#include <Headers/StdKit/AE.hpp>
-#include <Headers/StdKit/PEF.hpp>
-#include <Headers/Version.hxx>
+#include <Common/StdKit/ErrorID.hpp>
+#include <Common/AsmKit/CPU/ppc.hpp>
+#include <Common/ParserKit.hpp>
+#include <Common/StdKit/AE.hpp>
+#include <Common/StdKit/PEF.hpp>
+#include <Common/Version.hxx>
 #include <algorithm>
 #include <filesystem>
 #include <fstream>