diff --git a/BigBaseV2/src/common.hpp b/BigBaseV2/src/common.hpp
index ad9d0f54..0aa78547 100644
--- a/BigBaseV2/src/common.hpp
+++ b/BigBaseV2/src/common.hpp
@@ -53,7 +53,7 @@
 
 #include "core/globals.hpp"
 #include "gta/natives.hpp"
-#include "CPed.hpp"
+#include "ped/CPed.hpp"
 
 #include "services/notifications/notification_service.hpp"
 
diff --git a/BigBaseV2/src/core/data/bullet_impact_types.hpp b/BigBaseV2/src/core/data/bullet_impact_types.hpp
index 8076e07f..d94c7e33 100644
--- a/BigBaseV2/src/core/data/bullet_impact_types.hpp
+++ b/BigBaseV2/src/core/data/bullet_impact_types.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "CAmmoInfo.hpp"
 
 std::map<eImpactType, const char*> BULLET_IMPACTS = {
 	{ eImpactType::DEFAULT_BULLETS, "DEFAULT_BULLETS" },
diff --git a/BigBaseV2/src/core/data/special_ammo_types.hpp b/BigBaseV2/src/core/data/special_ammo_types.hpp
index bd6b144f..55804e96 100644
--- a/BigBaseV2/src/core/data/special_ammo_types.hpp
+++ b/BigBaseV2/src/core/data/special_ammo_types.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "CAmmoInfo.hpp"
+#include "weapon/CAmmoInfo.hpp"
 
 struct SpecialAmmo
 {
diff --git a/BigBaseV2/src/core/globals.hpp b/BigBaseV2/src/core/globals.hpp
index c2f1c7cb..90dd639a 100644
--- a/BigBaseV2/src/core/globals.hpp
+++ b/BigBaseV2/src/core/globals.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "CAmmoInfo.hpp"
-#include "CWeaponInfo.hpp"
+#include "weapon/CAmmoInfo.hpp"
+#include "weapon/CWeaponInfo.hpp"
 #include "enums.hpp"
 #include "file_manager.hpp"
 #include "imgui.h"
diff --git a/BigBaseV2/src/gta_util.hpp b/BigBaseV2/src/gta_util.hpp
index 221316dd..4af9b997 100644
--- a/BigBaseV2/src/gta_util.hpp
+++ b/BigBaseV2/src/gta_util.hpp
@@ -1,9 +1,8 @@
 #pragma once
 #include "gta/array.hpp"
-#include "CPedFactory.hpp"
-#include "CNetworkPlayerMgr.hpp"
 #include "gta/script_thread.hpp"
 #include "gta/tls_context.hpp"
+#include "ped/CPedFactory.hpp"
 #include "pointers.hpp"
 
 namespace big::gta_util
diff --git a/BigBaseV2/src/pointers.hpp b/BigBaseV2/src/pointers.hpp
index bed18435..9e139c71 100644
--- a/BigBaseV2/src/pointers.hpp
+++ b/BigBaseV2/src/pointers.hpp
@@ -1,13 +1,11 @@
 #pragma once
 #include "common.hpp"
-#include "CNetworkPlayerMgr.hpp"
-#include "FriendRegistry.hpp"
-#include "HashTable.hpp"
-#include "gta/fwddec.hpp"
-#include "gta/enums.hpp"
-#include "gta/replay.hpp"
-#include "gta/script_program.hpp"
+#include "base/HashTable.hpp"
 #include "function_types.hpp"
+#include "gta/fwddec.hpp"
+#include "gta/replay.hpp"
+#include "network/CNetworkPlayerMgr.hpp"
+#include "socialclub/FriendRegistry.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/services/players/player.cpp b/BigBaseV2/src/services/players/player.cpp
index 94c69b32..74bec8b6 100644
--- a/BigBaseV2/src/services/players/player.cpp
+++ b/BigBaseV2/src/services/players/player.cpp
@@ -1,5 +1,5 @@
 #include "player.hpp"
-#include "CNetGamePlayer.hpp"
+#include "network/CNetGamePlayer.hpp"
 #include "services/friends/friends_service.hpp"
 
 namespace big
diff --git a/BigBaseV2/src/util/notify.hpp b/BigBaseV2/src/util/notify.hpp
index c8246ae4..6213c87f 100644
--- a/BigBaseV2/src/util/notify.hpp
+++ b/BigBaseV2/src/util/notify.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "CNetGamePlayer.hpp"
+#include "network/CNetGamePlayer.hpp"
 #include "natives.hpp"
 #include "script.hpp"
 
diff --git a/vendor/GTAV-Classes b/vendor/GTAV-Classes
index d3cb0c38..5b14b6b9 160000
--- a/vendor/GTAV-Classes
+++ b/vendor/GTAV-Classes
@@ -1 +1 @@
-Subproject commit d3cb0c38a4763ee585afb8e65745e4049ec6ca16
+Subproject commit 5b14b6b991f5b1397040e95f30bcfbdbea7c2d40