diff --git a/Internal/Config/Config.cpp b/Internal/Config/Config.cpp
index fe10776..339e63e 100644
--- a/Internal/Config/Config.cpp
+++ b/Internal/Config/Config.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include <fstream>
-#include "../Utils/Logging/Logging.h"
+#include "../Utils/Logging/Logging.hpp"
 
 Config::Config()
 {
diff --git a/Internal/Config/Config.h b/Internal/Config/Config.hpp
similarity index 100%
rename from Internal/Config/Config.h
rename to Internal/Config/Config.hpp
diff --git a/Internal/Features/ExampleFeature/ExampleFeature.cpp b/Internal/Features/ExampleFeature/ExampleFeature.cpp
index 1d1b5ce..4dee004 100644
--- a/Internal/Features/ExampleFeature/ExampleFeature.cpp
+++ b/Internal/Features/ExampleFeature/ExampleFeature.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "ExampleFeature.h"
+#include "ExampleFeature.hpp"
 
 bool ExampleFeature::SetupMenu()
 {
diff --git a/Internal/Features/ExampleFeature/ExampleFeature.h b/Internal/Features/ExampleFeature/ExampleFeature.hpp
similarity index 99%
rename from Internal/Features/ExampleFeature/ExampleFeature.h
rename to Internal/Features/ExampleFeature/ExampleFeature.hpp
index d26dcdd..6731225 100644
--- a/Internal/Features/ExampleFeature/ExampleFeature.h
+++ b/Internal/Features/ExampleFeature/ExampleFeature.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 
 class ExampleBodyGroup : public ElementBase
 {
diff --git a/Internal/Features/Feature.h b/Internal/Features/Feature.hpp
similarity index 100%
rename from Internal/Features/Feature.h
rename to Internal/Features/Feature.hpp
diff --git a/Internal/FrameworkConfig.h b/Internal/FrameworkConfig.hpp
similarity index 92%
rename from Internal/FrameworkConfig.h
rename to Internal/FrameworkConfig.hpp
index 3d0acc2..cbd1422 100644
--- a/Internal/FrameworkConfig.h
+++ b/Internal/FrameworkConfig.hpp
@@ -77,12 +77,12 @@ static_assert((FRAMEWORK_RENDER_DYNAMIC + FRAMEWORK_RENDER_D3D11 + FRAMEWORK_REN
 #define SPOOF_THREAD_ADDRESS 0
 #define SPOOF_RETURN_ADDRESSES 0
 
-#include "Utils/Utils.h"
+#include "Utils/Utils.hpp"
 
-#include "Config/Config.h"
-#include "Localization/Localization.h"
+#include "Config/Config.hpp"
+#include "Localization/Localization.hpp"
 
-#include "Memory/Memory.h"
+#include "Memory/Memory.hpp"
 
 // Unreal
 #if ENGINE_UNREAL
@@ -111,9 +111,9 @@ static_assert((FRAMEWORK_RENDER_DYNAMIC + FRAMEWORK_RENDER_D3D11 + FRAMEWORK_REN
 #include "Libs/ImGui/backends/imgui_impl_dx12.h"
 #endif
 
-#include "GUI/Styles.h" // Custom ImGUI colors and font
-#include "GUI/Custom.h" // Contains the custom ImGui widgets for the framework
-#include "GUI/GUI.h"	// Contains the GUI class that is used to create the all of the framework's menu elements
+#include "GUI/Styles.hpp" // Custom ImGUI colors and font
+#include "GUI/Custom.hpp" // Contains the custom ImGui widgets for the framework
+#include "GUI/GUI.hpp"	// Contains the GUI class that is used to create the all of the framework's menu elements
 
-#include "Hooks/WndProc/WndProcHooks.h"
-#include "Hooks/Renderer/RendererHooks.h"
\ No newline at end of file
+#include "Hooks/WndProc/WndProcHooks.hpp"
+#include "Hooks/Renderer/RendererHooks.hpp"
\ No newline at end of file
diff --git a/Internal/GUI/Addons/imgui_addons.h b/Internal/GUI/Addons/imgui_addons.hpp
similarity index 100%
rename from Internal/GUI/Addons/imgui_addons.h
rename to Internal/GUI/Addons/imgui_addons.hpp
diff --git a/Internal/GUI/Custom.h b/Internal/GUI/Custom.hpp
similarity index 100%
rename from Internal/GUI/Custom.h
rename to Internal/GUI/Custom.hpp
diff --git a/Internal/GUI/Fonts/IconsFontAwesome6.h b/Internal/GUI/Fonts/IconsFontAwesome6.hpp
similarity index 99%
rename from Internal/GUI/Fonts/IconsFontAwesome6.h
rename to Internal/GUI/Fonts/IconsFontAwesome6.hpp
index ef8c3e8..98d8e37 100644
--- a/Internal/GUI/Fonts/IconsFontAwesome6.h
+++ b/Internal/GUI/Fonts/IconsFontAwesome6.hpp
@@ -3,7 +3,7 @@
 // for use with https://github.com/FortAwesome/Font-Awesome/blob/6.x/webfonts/fa-regular-400.ttf, https://github.com/FortAwesome/Font-Awesome/blob/6.x/webfonts/fa-solid-900.ttf
 #pragma once
 
-#include "IconsFontAwesome6_Bytes.h"
+#include "IconsFontAwesome6_Bytes.hpp"
 
 #define ICON_MIN_FA 0xe005
 #define ICON_MAX_16_FA 0xf8ff
diff --git a/Internal/GUI/Fonts/IconsFontAwesome6Brands.h b/Internal/GUI/Fonts/IconsFontAwesome6Brands.hpp
similarity index 99%
rename from Internal/GUI/Fonts/IconsFontAwesome6Brands.h
rename to Internal/GUI/Fonts/IconsFontAwesome6Brands.hpp
index e440b59..999beea 100644
--- a/Internal/GUI/Fonts/IconsFontAwesome6Brands.h
+++ b/Internal/GUI/Fonts/IconsFontAwesome6Brands.hpp
@@ -3,7 +3,7 @@
 // for use with https://github.com/FortAwesome/Font-Awesome/blob/6.x/webfonts/fa-brands-400.ttf
 #pragma once
 
-#include "IconsFontAwesome6Brands_Bytes.h"
+#include "IconsFontAwesome6Brands_Bytes.hpp"
 
 #define ICON_MIN_FAB 0xe007
 #define ICON_MAX_16_FAB 0xf8e8
diff --git a/Internal/GUI/Fonts/IconsFontAwesome6Brands_Bytes.h b/Internal/GUI/Fonts/IconsFontAwesome6Brands_Bytes.hpp
similarity index 100%
rename from Internal/GUI/Fonts/IconsFontAwesome6Brands_Bytes.h
rename to Internal/GUI/Fonts/IconsFontAwesome6Brands_Bytes.hpp
diff --git a/Internal/GUI/Fonts/IconsFontAwesome6_Bytes.h b/Internal/GUI/Fonts/IconsFontAwesome6_Bytes.hpp
similarity index 100%
rename from Internal/GUI/Fonts/IconsFontAwesome6_Bytes.h
rename to Internal/GUI/Fonts/IconsFontAwesome6_Bytes.hpp
diff --git a/Internal/GUI/Fonts/MuseoSans.h b/Internal/GUI/Fonts/MuseoSans.hpp
similarity index 100%
rename from Internal/GUI/Fonts/MuseoSans.h
rename to Internal/GUI/Fonts/MuseoSans.hpp
diff --git a/Internal/GUI/Fonts/Poppins_Medium.h b/Internal/GUI/Fonts/Poppins_Medium.hpp
similarity index 100%
rename from Internal/GUI/Fonts/Poppins_Medium.h
rename to Internal/GUI/Fonts/Poppins_Medium.hpp
diff --git a/Internal/GUI/GUI.cpp b/Internal/GUI/GUI.cpp
index f98beac..4b94a63 100644
--- a/Internal/GUI/GUI.cpp
+++ b/Internal/GUI/GUI.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
-#include "Includes.h"
-#include "Watermark.h"
+#include "Includes.hpp"
+#include "Watermark.hpp"
 
 void GUI::Render()
 {
diff --git a/Internal/GUI/GUI.h b/Internal/GUI/GUI.hpp
similarity index 99%
rename from Internal/GUI/GUI.h
rename to Internal/GUI/GUI.hpp
index 7a5b287..89827e4 100644
--- a/Internal/GUI/GUI.h
+++ b/Internal/GUI/GUI.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "pch.h"
-#include "Menu/Menu.h"
+#include "Menu/Menu.hpp"
 
 // Colors for ImGui
 inline ImU32 Black = ImGui::ColorConvertFloat4ToU32({ 0.f, 0.f, 0.f, 1.f });
diff --git a/Internal/GUI/Menu/Menu.h b/Internal/GUI/Menu/Menu.hpp
similarity index 100%
rename from Internal/GUI/Menu/Menu.h
rename to Internal/GUI/Menu/Menu.hpp
diff --git a/Internal/GUI/Styles.h b/Internal/GUI/Styles.hpp
similarity index 99%
rename from Internal/GUI/Styles.h
rename to Internal/GUI/Styles.hpp
index c568b2d..1fbf936 100644
--- a/Internal/GUI/Styles.h
+++ b/Internal/GUI/Styles.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 
 inline ImFont* CurrentFont;
 inline ImFont* CurrentFontESP;
diff --git a/Internal/GUI/Watermark.h b/Internal/GUI/Watermark.hpp
similarity index 100%
rename from Internal/GUI/Watermark.h
rename to Internal/GUI/Watermark.hpp
diff --git a/Internal/Hooks/Renderer/D3D11Hooks.cpp b/Internal/Hooks/Renderer/D3D11Hooks.cpp
index 316c47e..42c46c1 100644
--- a/Internal/Hooks/Renderer/D3D11Hooks.cpp
+++ b/Internal/Hooks/Renderer/D3D11Hooks.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 
 #if FRAMEWORK_RENDER_D3D11 || FRAMEWORK_RENDER_DYNAMIC
 
diff --git a/Internal/Hooks/Renderer/D3D12Hooks.cpp b/Internal/Hooks/Renderer/D3D12Hooks.cpp
index c82fb65..5426ef7 100644
--- a/Internal/Hooks/Renderer/D3D12Hooks.cpp
+++ b/Internal/Hooks/Renderer/D3D12Hooks.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 
 #if FRAMEWORK_RENDER_D3D12 || FRAMEWORK_RENDER_DYNAMIC
 
diff --git a/Internal/Hooks/Renderer/RendererHooks.cpp b/Internal/Hooks/Renderer/RendererHooks.cpp
index 4164c2f..cb64263 100644
--- a/Internal/Hooks/Renderer/RendererHooks.cpp
+++ b/Internal/Hooks/Renderer/RendererHooks.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 
 bool RendererHooks::Setup()
 {
diff --git a/Internal/Hooks/Renderer/RendererHooks.h b/Internal/Hooks/Renderer/RendererHooks.hpp
similarity index 100%
rename from Internal/Hooks/Renderer/RendererHooks.h
rename to Internal/Hooks/Renderer/RendererHooks.hpp
diff --git a/Internal/Hooks/WndProc/WndProcHooks.cpp b/Internal/Hooks/WndProc/WndProcHooks.cpp
index 1956e69..155dee9 100644
--- a/Internal/Hooks/WndProc/WndProcHooks.cpp
+++ b/Internal/Hooks/WndProc/WndProcHooks.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 
 static std::once_flag g_InputInit;
 
diff --git a/Internal/Hooks/WndProc/WndProcHooks.h b/Internal/Hooks/WndProc/WndProcHooks.hpp
similarity index 100%
rename from Internal/Hooks/WndProc/WndProcHooks.h
rename to Internal/Hooks/WndProc/WndProcHooks.hpp
diff --git a/Internal/Includes.h b/Internal/Includes.hpp
similarity index 95%
rename from Internal/Includes.h
rename to Internal/Includes.hpp
index d3627a1..0e568d8 100644
--- a/Internal/Includes.h
+++ b/Internal/Includes.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "pch.h"
-#include "FrameworkConfig.h"
+#include "FrameworkConfig.hpp"
 
 class BaseFeature; //Forward declaration
 
@@ -43,4 +43,4 @@ namespace Framework {
 }
 
 // Framework Features
-#include "../Features/Feature.h"
\ No newline at end of file
+#include "../Features/Feature.hpp"
\ No newline at end of file
diff --git a/Internal/Interfaces/Unity/Mono.h b/Internal/Interfaces/Unity/Mono.hpp
similarity index 99%
rename from Internal/Interfaces/Unity/Mono.h
rename to Internal/Interfaces/Unity/Mono.hpp
index d5529b3..5a338f8 100644
--- a/Internal/Interfaces/Unity/Mono.h
+++ b/Internal/Interfaces/Unity/Mono.hpp
@@ -3,7 +3,7 @@
 #pragma warning(disable : 4302)
 #pragma warning(disable : 4312)
 #include "pch.h"
-#include "UnityConfig.h"
+#include "UnityConfig.hpp"
 
 // This is where the magic happens, for unity games running mono anyway.
 #if ENGINE_UNITY
diff --git a/Internal/Interfaces/Unity/UnityConfig.h b/Internal/Interfaces/Unity/UnityConfig.hpp
similarity index 89%
rename from Internal/Interfaces/Unity/UnityConfig.h
rename to Internal/Interfaces/Unity/UnityConfig.hpp
index 26ccfeb..fb2f7af 100644
--- a/Internal/Interfaces/Unity/UnityConfig.h
+++ b/Internal/Interfaces/Unity/UnityConfig.hpp
@@ -2,4 +2,4 @@
 #define MONO_DLL "mono-2.0-bdwgc.dll" // Is also often called mono.dll
 #define DEFAULT_ASSEMBLY_NAME ".\\GAME_NAME_Data\\Managed\\Assembly-CSharp.dll"
 
-#include "Mono.h"
\ No newline at end of file
+#include "Mono.hpp"
\ No newline at end of file
diff --git a/Internal/Interfaces/Unreal/Unreal.h b/Internal/Interfaces/Unreal/Unreal.hpp
similarity index 99%
rename from Internal/Interfaces/Unreal/Unreal.h
rename to Internal/Interfaces/Unreal/Unreal.hpp
index 8d7c3cb..415bad5 100644
--- a/Internal/Interfaces/Unreal/Unreal.h
+++ b/Internal/Interfaces/Unreal/Unreal.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 
 #if ENGINE_UNREAL // Not sure if this is needed but it's here anyway
 
diff --git a/Internal/Interfaces/Unreal/UnrealConfig.h b/Internal/Interfaces/Unreal/UnrealConfig.hpp
similarity index 94%
rename from Internal/Interfaces/Unreal/UnrealConfig.h
rename to Internal/Interfaces/Unreal/UnrealConfig.hpp
index 17b5b7e..2db7ae5 100644
--- a/Internal/Interfaces/Unreal/UnrealConfig.h
+++ b/Internal/Interfaces/Unreal/UnrealConfig.hpp
@@ -18,6 +18,6 @@ static_assert(SDK_IMPORTED, "Did you remember to copy in the SDK?");
 
 #include "SDK.h"
 
-#include "Unreal.h"
+#include "Unreal.hpp"
 
 #endif
\ No newline at end of file
diff --git a/Internal/Libs/CRC64/CRC64.h b/Internal/Libs/CRC64/CRC64.h
deleted file mode 100644
index 573c582..0000000
--- a/Internal/Libs/CRC64/CRC64.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma once
-#pragma warning( disable : 4455)
-
-#include <string>
-
-namespace CRC64
-{
-    constexpr const size_t table[] = {
-        0x0000000000000000, 0x7ad870c830358979, 0xf5b0e190606b12f2, 0x8f689158505e9b8b,
-        0xc038e5739841b68f, 0xbae095bba8743ff6, 0x358804e3f82aa47d, 0x4f50742bc81f2d04,
-        0xab28ecb46814fe75, 0xd1f09c7c5821770c, 0x5e980d24087fec87, 0x24407dec384a65fe,
-        0x6b1009c7f05548fa, 0x11c8790fc060c183, 0x9ea0e857903e5a08, 0xe478989fa00bd371,
-        0x7d08ff3b88be6f81, 0x07d08ff3b88be6f8, 0x88b81eabe8d57d73, 0xf2606e63d8e0f40a,
-        0xbd301a4810ffd90e, 0xc7e86a8020ca5077, 0x4880fbd87094cbfc, 0x32588b1040a14285,
-        0xd620138fe0aa91f4, 0xacf86347d09f188d, 0x2390f21f80c18306, 0x594882d7b0f40a7f,
-        0x1618f6fc78eb277b, 0x6cc0863448deae02, 0xe3a8176c18803589, 0x997067a428b5bcf0,
-        0xfa11fe77117cdf02, 0x80c98ebf2149567b, 0x0fa11fe77117cdf0, 0x75796f2f41224489,
-        0x3a291b04893d698d, 0x40f16bccb908e0f4, 0xcf99fa94e9567b7f, 0xb5418a5cd963f206,
-        0x513912c379682177, 0x2be1620b495da80e, 0xa489f35319033385, 0xde51839b2936bafc,
-        0x9101f7b0e12997f8, 0xebd98778d11c1e81, 0x64b116208142850a, 0x1e6966e8b1770c73,
-        0x8719014c99c2b083, 0xfdc17184a9f739fa, 0x72a9e0dcf9a9a271, 0x08719014c99c2b08,
-        0x4721e43f0183060c, 0x3df994f731b68f75, 0xb29105af61e814fe, 0xc849756751dd9d87,
-        0x2c31edf8f1d64ef6, 0x56e99d30c1e3c78f, 0xd9810c6891bd5c04, 0xa3597ca0a188d57d,
-        0xec09088b6997f879, 0x96d1784359a27100, 0x19b9e91b09fcea8b, 0x636199d339c963f2,
-        0xdf7adabd7a6e2d6f, 0xa5a2aa754a5ba416, 0x2aca3b2d1a053f9d, 0x50124be52a30b6e4,
-        0x1f423fcee22f9be0, 0x659a4f06d21a1299, 0xeaf2de5e82448912, 0x902aae96b271006b,
-        0x74523609127ad31a, 0x0e8a46c1224f5a63, 0x81e2d7997211c1e8, 0xfb3aa75142244891,
-        0xb46ad37a8a3b6595, 0xceb2a3b2ba0eecec, 0x41da32eaea507767, 0x3b024222da65fe1e,
-        0xa2722586f2d042ee, 0xd8aa554ec2e5cb97, 0x57c2c41692bb501c, 0x2d1ab4dea28ed965,
-        0x624ac0f56a91f461, 0x1892b03d5aa47d18, 0x97fa21650afae693, 0xed2251ad3acf6fea,
-        0x095ac9329ac4bc9b, 0x7382b9faaaf135e2, 0xfcea28a2faafae69, 0x8632586aca9a2710,
-        0xc9622c4102850a14, 0xb3ba5c8932b0836d, 0x3cd2cdd162ee18e6, 0x460abd1952db919f,
-        0x256b24ca6b12f26d, 0x5fb354025b277b14, 0xd0dbc55a0b79e09f, 0xaa03b5923b4c69e6,
-        0xe553c1b9f35344e2, 0x9f8bb171c366cd9b, 0x10e3202993385610, 0x6a3b50e1a30ddf69,
-        0x8e43c87e03060c18, 0xf49bb8b633338561, 0x7bf329ee636d1eea, 0x012b592653589793,
-        0x4e7b2d0d9b47ba97, 0x34a35dc5ab7233ee, 0xbbcbcc9dfb2ca865, 0xc113bc55cb19211c,
-        0x5863dbf1e3ac9dec, 0x22bbab39d3991495, 0xadd33a6183c78f1e, 0xd70b4aa9b3f20667,
-        0x985b3e827bed2b63, 0xe2834e4a4bd8a21a, 0x6debdf121b863991, 0x1733afda2bb3b0e8,
-        0xf34b37458bb86399, 0x8993478dbb8deae0, 0x06fbd6d5ebd3716b, 0x7c23a61ddbe6f812,
-        0x3373d23613f9d516, 0x49aba2fe23cc5c6f, 0xc6c333a67392c7e4, 0xbc1b436e43a74e9d,
-        0x95ac9329ac4bc9b5, 0xef74e3e19c7e40cc, 0x601c72b9cc20db47, 0x1ac40271fc15523e,
-        0x5594765a340a7f3a, 0x2f4c0692043ff643, 0xa02497ca54616dc8, 0xdafce7026454e4b1,
-        0x3e847f9dc45f37c0, 0x445c0f55f46abeb9, 0xcb349e0da4342532, 0xb1eceec59401ac4b,
-        0xfebc9aee5c1e814f, 0x8464ea266c2b0836, 0x0b0c7b7e3c7593bd, 0x71d40bb60c401ac4,
-        0xe8a46c1224f5a634, 0x927c1cda14c02f4d, 0x1d148d82449eb4c6, 0x67ccfd4a74ab3dbf,
-        0x289c8961bcb410bb, 0x5244f9a98c8199c2, 0xdd2c68f1dcdf0249, 0xa7f41839ecea8b30,
-        0x438c80a64ce15841, 0x3954f06e7cd4d138, 0xb63c61362c8a4ab3, 0xcce411fe1cbfc3ca,
-        0x83b465d5d4a0eece, 0xf96c151de49567b7, 0x76048445b4cbfc3c, 0x0cdcf48d84fe7545,
-        0x6fbd6d5ebd3716b7, 0x15651d968d029fce, 0x9a0d8ccedd5c0445, 0xe0d5fc06ed698d3c,
-        0xaf85882d2576a038, 0xd55df8e515432941, 0x5a3569bd451db2ca, 0x20ed197575283bb3,
-        0xc49581ead523e8c2, 0xbe4df122e51661bb, 0x3125607ab548fa30, 0x4bfd10b2857d7349,
-        0x04ad64994d625e4d, 0x7e7514517d57d734, 0xf11d85092d094cbf, 0x8bc5f5c11d3cc5c6,
-        0x12b5926535897936, 0x686de2ad05bcf04f, 0xe70573f555e26bc4, 0x9ddd033d65d7e2bd,
-        0xd28d7716adc8cfb9, 0xa85507de9dfd46c0, 0x273d9686cda3dd4b, 0x5de5e64efd965432,
-        0xb99d7ed15d9d8743, 0xc3450e196da80e3a, 0x4c2d9f413df695b1, 0x36f5ef890dc31cc8,
-        0x79a59ba2c5dc31cc, 0x037deb6af5e9b8b5, 0x8c157a32a5b7233e, 0xf6cd0afa9582aa47,
-        0x4ad64994d625e4da, 0x300e395ce6106da3, 0xbf66a804b64ef628, 0xc5bed8cc867b7f51,
-        0x8aeeace74e645255, 0xf036dc2f7e51db2c, 0x7f5e4d772e0f40a7, 0x05863dbf1e3ac9de,
-        0xe1fea520be311aaf, 0x9b26d5e88e0493d6, 0x144e44b0de5a085d, 0x6e963478ee6f8124,
-        0x21c640532670ac20, 0x5b1e309b16452559, 0xd476a1c3461bbed2, 0xaeaed10b762e37ab,
-        0x37deb6af5e9b8b5b, 0x4d06c6676eae0222, 0xc26e573f3ef099a9, 0xb8b627f70ec510d0,
-        0xf7e653dcc6da3dd4, 0x8d3e2314f6efb4ad, 0x0256b24ca6b12f26, 0x788ec2849684a65f,
-        0x9cf65a1b368f752e, 0xe62e2ad306bafc57, 0x6946bb8b56e467dc, 0x139ecb4366d1eea5,
-        0x5ccebf68aecec3a1, 0x2616cfa09efb4ad8, 0xa97e5ef8cea5d153, 0xd3a62e30fe90582a,
-        0xb0c7b7e3c7593bd8, 0xca1fc72bf76cb2a1, 0x45775673a732292a, 0x3faf26bb9707a053,
-        0x70ff52905f188d57, 0x0a2722586f2d042e, 0x854fb3003f739fa5, 0xff97c3c80f4616dc,
-        0x1bef5b57af4dc5ad, 0x61372b9f9f784cd4, 0xee5fbac7cf26d75f, 0x9487ca0fff135e26,
-        0xdbd7be24370c7322, 0xa10fceec0739fa5b, 0x2e675fb4576761d0, 0x54bf2f7c6752e8a9,
-        0xcdcf48d84fe75459, 0xb71738107fd2dd20, 0x387fa9482f8c46ab, 0x42a7d9801fb9cfd2,
-        0x0df7adabd7a6e2d6, 0x772fdd63e7936baf, 0xf8474c3bb7cdf024, 0x829f3cf387f8795d,
-        0x66e7a46c27f3aa2c, 0x1c3fd4a417c62355, 0x935745fc4798b8de, 0xe98f353477ad31a7,
-        0xa6df411fbfb21ca3, 0xdc0731d78f8795da, 0x536fa08fdfd90e51, 0x29b7d047efec8728,
-    };
-
-    constexpr size_t hash(const char* sz, const size_t size)
-    {
-        size_t crc = 0xffffffffffffffff;
-        for (size_t i = 0; i < size; i++)
-            crc = (crc >> 8) ^ table[(crc & sz[i]) & 0xff];
-
-        return crc ^ 0xffffffffffffffff;
-    };
-
-    constexpr size_t hash(const std::string& s)
-    {
-        size_t crc = 0xffffffffffffffff;
-        for (char c : s)
-            crc = (crc >> 8) ^ table[(crc & c) & 0xff];
-
-        return crc ^ 0xffffffffffffffff;
-    };
-};
-
-constexpr size_t operator "" Hashed(const char* sz, size_t size)
-{
-    return CRC64::hash(sz, size);
-};
\ No newline at end of file
diff --git a/Internal/Libs/StringToBytes/stb.h b/Internal/Libs/StringToBytes/stb.h
deleted file mode 100644
index 7f12388..0000000
--- a/Internal/Libs/StringToBytes/stb.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * @file stb.hh
- * @author Cristei Gabriel-Marian (cristei.g772@gmail.com)
- * @brief Compile-time String To Bytes (STB)
- * @version 1.0
- * @date 2023-03-23
- *
- * Last update: 03/23/2023 (mm/dd/yyyy): [Breaking update]
- * Modernize, undo some cancer, change some naming, file structure,
- * implement tests directly in file.
- *
- */
-
-#ifndef STB_DEFINED
-#define STB_DEFINED
-
-#include <cstdint>
-#include <array>
-
-namespace stb {
-    namespace detail {
-        // detail methods assume null terminator.
-
-        template<std::size_t N>
-        constexpr auto find_first_of_start(std::array<char, N> const& data, std::size_t start, char ch) noexcept {
-            std::size_t idx = start;
-            while (data[idx] != ch && idx < N)
-                ++idx;
-
-            return idx;
-        }
-
-        template<std::size_t N>
-        constexpr auto find_first_not_of_start(std::array<char, N> const& data, std::size_t start, char ch) noexcept {
-            if (start < N && data[start] != ch)
-                return start;
-
-            std::size_t idx = start;
-            while (data[idx] == ch && idx < N)
-                ++idx;
-
-            return idx;
-        }
-
-        template<std::size_t N>
-        constexpr auto find_last_of(std::array<char, N> const& data, char ch) noexcept {
-            std::size_t idx = data.size() - 2;
-            while (data[idx] != ch && idx >= 0)
-                --idx;
-
-            return idx;
-        }
-
-        template<std::size_t N>
-        constexpr auto find_last_not_of(std::array<char, N> const& data, char ch) noexcept {
-            std::size_t idx = data.size() - 2;
-            while (data[idx] == ch && idx >= 0)
-                --idx;
-
-            return idx;
-        }
-
-        constexpr auto char_to_hex(char ch) noexcept {
-            if (ch >= '0' && ch <= '9')
-                return ch - '0';
-
-            if (ch >= 'A' && ch <= 'F')
-                return ch - 'A' + 10;
-
-            return ch - 'a' + 10;
-        }
-
-        template<typename T, T F = 16>
-        constexpr T concat_hex(T lhs, T rhs) noexcept {
-            return F * lhs + rhs;
-        }
-    }  // namespace detail
-
-    template<auto V>
-    struct consteval_value {
-        constexpr static decltype(V) value = V;
-    };
-
-    template<std::size_t N>
-    struct fixed_string : public std::array<char, N + 1> {
-        using std::array<char, N + 1>::array;
-
-        constexpr fixed_string(const char* str) noexcept
-            : std::array<char, N + 1>() {
-            for (auto i = 0; i != N; ++i)
-                (*this)[i] = str[i];
-        }
-    };
-
-    template<std::size_t N>
-    fixed_string(const char(&)[N]) noexcept -> fixed_string<N - 1>;
-
-    template<char delimiter, char mask, typename element_type, element_type masked>
-    struct basic_hex_string_array_conversion {
-        template<fixed_string str>
-        struct build {
-        private:
-            struct parse {
-                struct result {
-                    std::size_t delimiter_count;
-                    std::size_t start;
-                    std::size_t next;
-                    std::size_t end;
-                };
-
-                constexpr static auto get() noexcept {
-                    std::size_t count = 1;
-
-                    constexpr std::size_t start = detail::find_first_not_of_start(str, 0, delimiter);
-                    constexpr std::size_t next = detail::find_first_of_start(str, start, delimiter);
-                    constexpr std::size_t end = detail::find_last_not_of(str, delimiter);
-
-                    bool previous_delimiter = false;
-                    for (auto i = next; i < end; ++i) {
-                        if (str[i] == delimiter) {
-                            if (!previous_delimiter)
-                                ++count;
-
-                            previous_delimiter = true;
-                        }
-                        else
-                            previous_delimiter = false;
-                    }
-
-                    return result{
-                        count,
-                        start,
-                        next,
-                        end };
-                }
-            };
-
-            constexpr static auto make() noexcept {
-                constexpr auto data = parse::get();
-                constexpr auto count = data.delimiter_count;
-                constexpr auto start = data.start;
-                constexpr auto next = data.next;
-                constexpr auto end = data.end;
-
-                std::array<element_type, count> result = {};
-                std::array<std::size_t, count> skips = {};
-                std::size_t skipped = 0;
-                std::size_t traversed = start;
-
-                bool previous_skip = false;
-                for (auto i = start; i < end; ++i) {
-                    if (str[i] == delimiter) {
-                        if (!previous_skip)
-                            skips[skipped++] = traversed;
-
-                        previous_skip = true;
-                    }
-                    else
-                        previous_skip = false;
-
-                    ++traversed;
-                }
-
-                bool one_char = str[start + 1] == delimiter;
-                result[0] = static_cast<element_type>(str[start] == mask ? masked : (one_char ? detail::char_to_hex(str[start]) : detail::concat_hex(detail::char_to_hex(str[start]), detail::char_to_hex(str[start + 1]))));
-
-                std::size_t conversions = 1;
-                for (auto i = next; i < end; ++i) {
-                    for (auto entry : skips) {
-                        if (entry == i && entry < end) {
-                            std::size_t idx = detail::find_first_not_of_start(str, i + 1, delimiter);
-                            one_char = str[idx + 1] == delimiter;
-                            result[conversions++] = static_cast<element_type>(str[idx] == mask ? masked : (one_char ? detail::char_to_hex(str[idx]) : detail::concat_hex(detail::char_to_hex(str[idx]), detail::char_to_hex(str[idx + 1]))));
-                        }
-                    }
-                }
-
-                return result;
-            }
-
-        public:
-            constexpr static auto value = consteval_value<make()>::value;
-        };
-    };
-
-    using hex_string_array_conversion = basic_hex_string_array_conversion<' ', '?', int, -1>;
-    using simple_conversion = hex_string_array_conversion;
-}  // namespace stb
-
-#ifndef STB_OMIT_TESTS
-struct _ignore_me_stb_compliance_tests {
-    using conv_type = stb::simple_conversion;
-
-    constexpr static auto value_1 = conv_type::build<"AA BB CC DD EE FF">::value;
-    static_assert(value_1[0] == 0xAA);
-    static_assert(value_1[1] == 0xBB);
-    static_assert(value_1[2] == 0xCC);
-    static_assert(value_1[3] == 0xDD);
-    static_assert(value_1[4] == 0xEE);
-    static_assert(value_1[5] == 0xFF);
-    static_assert(value_1.size() == 6);
-
-    constexpr static auto value_2 = conv_type::build<"        C 0f C    a B ef         ">::value;
-    static_assert(value_2[0] == 0x0C);
-    static_assert(value_2[1] == 0x0F);
-    static_assert(value_2[2] == 0x0C);
-    static_assert(value_2[3] == 0x0A);
-    static_assert(value_2[4] == 0x0B);
-    static_assert(value_2[5] == 0xEF);
-    static_assert(value_2.size() == 6);
-
-    constexpr static auto value_3 = conv_type::build<"AA bb CC dd         ">::value;
-    static_assert(value_3[0] == 0xAA);
-    static_assert(value_3[1] == 0xBB);
-    static_assert(value_3[2] == 0xCC);
-    static_assert(value_3[3] == 0xDD);
-    static_assert(value_3.size() == 4);
-
-    constexpr static auto value_4 = conv_type::build<"    aa bb ee       ff">::value;
-    static_assert(value_4[0] == 0xAA);
-    static_assert(value_4[1] == 0xBB);
-    static_assert(value_4[2] == 0xEE);
-    static_assert(value_4[3] == 0xFF);
-    static_assert(value_4.size() == 4);
-};
-#endif
-
-#endif
diff --git a/Internal/Localization/LocaleStructs.h b/Internal/Localization/LocaleStructs.hpp
similarity index 100%
rename from Internal/Localization/LocaleStructs.h
rename to Internal/Localization/LocaleStructs.hpp
diff --git a/Internal/Localization/Locales/English.h b/Internal/Localization/Locales/English.hpp
similarity index 96%
rename from Internal/Localization/Locales/English.h
rename to Internal/Localization/Locales/English.hpp
index 5bd83e6..7998741 100644
--- a/Internal/Localization/Locales/English.h
+++ b/Internal/Localization/Locales/English.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Localization.h"
+#include "../Localization.hpp"
 
 Locale_t localeEnglish{
 	.sKey = "English",
diff --git a/Internal/Localization/Locales/German.h b/Internal/Localization/Locales/German.hpp
similarity index 95%
rename from Internal/Localization/Locales/German.h
rename to Internal/Localization/Locales/German.hpp
index 462e0d9..8ff8dd7 100644
--- a/Internal/Localization/Locales/German.h
+++ b/Internal/Localization/Locales/German.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Localization.h"
+#include "../Localization.hpp"
 
 Locale_t localeGerman{
 	.sKey = "Deutsch",
diff --git a/Internal/Localization/Locales/Polish.h b/Internal/Localization/Locales/Polish.hpp
similarity index 95%
rename from Internal/Localization/Locales/Polish.h
rename to Internal/Localization/Locales/Polish.hpp
index 6091ee5..b51e6e8 100644
--- a/Internal/Localization/Locales/Polish.h
+++ b/Internal/Localization/Locales/Polish.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Localization.h"
+#include "../Localization.hpp"
 
 Locale_t localePolish{
 	.sKey = "Polski",
diff --git a/Internal/Localization/Localization.cpp b/Internal/Localization/Localization.cpp
index f70ce98..4935f17 100644
--- a/Internal/Localization/Localization.cpp
+++ b/Internal/Localization/Localization.cpp
@@ -1,8 +1,8 @@
 #include "pch.h"
-#include "Includes.h"
-#include "Locales/English.h"
-#include "Locales/German.h"
-#include "Locales/Polish.h"
+#include "Includes.hpp"
+#include "Locales/English.hpp"
+#include "Locales/German.hpp"
+#include "Locales/Polish.hpp"
 
 // Private functions
 
diff --git a/Internal/Localization/Localization.h b/Internal/Localization/Localization.hpp
similarity index 98%
rename from Internal/Localization/Localization.h
rename to Internal/Localization/Localization.hpp
index e56ad02..0f43894 100644
--- a/Internal/Localization/Localization.h
+++ b/Internal/Localization/Localization.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 
 // http://zuga.net/articles/unicode-all-characters-supported-by-the-font-tahoma/
 const ImWchar DefaultRanges[] = { 0x0020, 0x00FF, 0x0 };
diff --git a/Internal/Memory/Memory.cpp b/Internal/Memory/Memory.cpp
index 9eb6459..f832b49 100644
--- a/Internal/Memory/Memory.cpp
+++ b/Internal/Memory/Memory.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 
 // https://stackoverflow.com/questions/48708440/check-if-i-can-write-to-memory
 // https://stackoverflow.com/questions/18394647/can-i-check-if-memory-block-is-readable-without-raising-exception-with-c
diff --git a/Internal/Memory/Memory.h b/Internal/Memory/Memory.hpp
similarity index 99%
rename from Internal/Memory/Memory.h
rename to Internal/Memory/Memory.hpp
index 76745f1..dfa8b72 100644
--- a/Internal/Memory/Memory.h
+++ b/Internal/Memory/Memory.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "pch.h"
 
-#include "Windows/WindowsMemory.h"
+#include "Windows/WindowsMemory.hpp"
 
 #define IsValidObjectPtr(lpAddress) (Memory::IsReadable(lpAddress, sizeof(*lpAddress)))
 #define IsValidPtr(lpAddress) (Memory::IsReadable(lpAddress, sizeof(void*)))
diff --git a/Internal/Memory/Windows/WindowsMemory.cpp b/Internal/Memory/Windows/WindowsMemory.cpp
index 8f6b1af..d7fe928 100644
--- a/Internal/Memory/Windows/WindowsMemory.cpp
+++ b/Internal/Memory/Windows/WindowsMemory.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
-#include "Includes.h"
-#include "WindowsMemory.h"
+#include "Includes.hpp"
+#include "WindowsMemory.hpp"
 
 #include <random>
 
diff --git a/Internal/Memory/Windows/WindowsMemory.h b/Internal/Memory/Windows/WindowsMemory.hpp
similarity index 98%
rename from Internal/Memory/Windows/WindowsMemory.h
rename to Internal/Memory/Windows/WindowsMemory.hpp
index 921802c..e15b32b 100644
--- a/Internal/Memory/Windows/WindowsMemory.h
+++ b/Internal/Memory/Windows/WindowsMemory.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "pch.h"
-#include "WindowsTypes.h"
+#include "WindowsTypes.hpp"
 
 namespace Memory
 {
diff --git a/Internal/Memory/Windows/WindowsTypes.h b/Internal/Memory/Windows/WindowsTypes.hpp
similarity index 100%
rename from Internal/Memory/Windows/WindowsTypes.h
rename to Internal/Memory/Windows/WindowsTypes.hpp
diff --git a/Internal/PCH/pch.h b/Internal/PCH/pch.h
index 5b9983f..466a30d 100644
--- a/Internal/PCH/pch.h
+++ b/Internal/PCH/pch.h
@@ -68,17 +68,17 @@
 #include "../Libs/ImGUI/imgui.h"
 #include "../Libs/ImGUI/misc/cpp/imgui_stdlib.h"
 #include "../Libs/ImGUI/misc/freetype/imgui_freetype.h"
-#include "../GUI/Addons/imgui_addons.h"
+#include "../GUI/Addons/imgui_addons.hpp"
 #include "../Libs/ImGui/backends/imgui_impl_win32.h"
 
-#include "../GUI/Fonts/IconsFontAwesome6.h"
-#include "../GUI/Fonts/IconsFontAwesome6Brands.h"
-#include "../GUI/Fonts/MuseoSans.h"
-#include "../GUI/Fonts/Poppins_Medium.h"
+#include "../GUI/Fonts/IconsFontAwesome6.hpp"
+#include "../GUI/Fonts/IconsFontAwesome6Brands.hpp"
+#include "../GUI/Fonts/MuseoSans.hpp"
+#include "../GUI/Fonts/Poppins_Medium.hpp"
 
 #include "../Libs/Nlohmann.json/single_include/nlohmann/json.hpp"
 
-#include "../Libs/CRC64/CRC64.h"
+#include "../Libs/CRC64/CRC64.hpp"
 
 #define STB_OMIT_TESTS
-#include "../Libs/StringToBytes/stb.h"
\ No newline at end of file
+#include "../Libs/StringToBytes/stb.hpp"
\ No newline at end of file
diff --git a/Internal/Utils/Console/Console.cpp b/Internal/Utils/Console/Console.cpp
index 5284ed0..3275926 100644
--- a/Internal/Utils/Console/Console.cpp
+++ b/Internal/Utils/Console/Console.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 
 Console::Console(bool bVisibility, std::string sConsoleTitle, DWORD dwMode) noexcept
 {
diff --git a/Internal/Utils/Console/Console.h b/Internal/Utils/Console/Console.hpp
similarity index 100%
rename from Internal/Utils/Console/Console.h
rename to Internal/Utils/Console/Console.hpp
diff --git a/Internal/Utils/Logging/Logging.cpp b/Internal/Utils/Logging/Logging.cpp
index 33702a5..d22ba36 100644
--- a/Internal/Utils/Logging/Logging.cpp
+++ b/Internal/Utils/Logging/Logging.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 #include "Colors.hpp" // Include the colors header file which contains the color class used to set the color of the console text to make it look pretty
 
 // I hate this.
diff --git a/Internal/Utils/Logging/Logging.h b/Internal/Utils/Logging/Logging.hpp
similarity index 97%
rename from Internal/Utils/Logging/Logging.h
rename to Internal/Utils/Logging/Logging.hpp
index 14ce3e1..bb23825 100644
--- a/Internal/Utils/Logging/Logging.h
+++ b/Internal/Utils/Logging/Logging.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "Includes.h"
+#include "Includes.hpp"
 
 namespace Utils
 {
diff --git a/Internal/Utils/Utils.cpp b/Internal/Utils/Utils.cpp
index 4d73a10..3732bcb 100644
--- a/Internal/Utils/Utils.cpp
+++ b/Internal/Utils/Utils.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 
 static std::optional<std::filesystem::path> GetFrameworkFolder()
 {
diff --git a/Internal/Utils/Utils.h b/Internal/Utils/Utils.hpp
similarity index 98%
rename from Internal/Utils/Utils.h
rename to Internal/Utils/Utils.hpp
index 6e9c96d..bb49103 100644
--- a/Internal/Utils/Utils.h
+++ b/Internal/Utils/Utils.hpp
@@ -3,8 +3,8 @@
 #include <filesystem>
 #include <optional>
 
-#include "Console/Console.h"
-#include "Logging/Logging.h"
+#include "Console/Console.hpp"
+#include "Logging/Logging.hpp"
 
 namespace Utils
 {
diff --git a/Internal/dllmain.cpp b/Internal/dllmain.cpp
index 255ec5b..22ae789 100644
--- a/Internal/dllmain.cpp
+++ b/Internal/dllmain.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "Includes.h"
+#include "Includes.hpp"
 
 static bool FrameworkInit()
 {