diff --git a/BigBaseV2/src/backend/backend.cpp b/BigBaseV2/src/backend/backend.cpp
index bd898264..1e093440 100644
--- a/BigBaseV2/src/backend/backend.cpp
+++ b/BigBaseV2/src/backend/backend.cpp
@@ -1,7 +1,9 @@
-#include "api/api.hpp"
 #include "backend.hpp"
-#include "looped/looped.hpp"
+#include "script.hpp"
 #include "thread_pool.hpp"
+#include "api/api.hpp"
+#include "looped/looped.hpp"
+#include "services/context_menu/context_menu_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/backend/backend.hpp b/BigBaseV2/src/backend/backend.hpp
index 56cf3153..c523ea42 100644
--- a/BigBaseV2/src/backend/backend.hpp
+++ b/BigBaseV2/src/backend/backend.hpp
@@ -1,8 +1,5 @@
 #pragma once
 #include "common.hpp"
-#include "looped/looped.hpp"
-#include "script.hpp"
-#include "services/context_menu_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/backend/looped/player/player_never_wanted.cpp b/BigBaseV2/src/backend/looped/player/player_never_wanted.cpp
index a9177a59..0e05e751 100644
--- a/BigBaseV2/src/backend/looped/player/player_never_wanted.cpp
+++ b/BigBaseV2/src/backend/looped/player/player_never_wanted.cpp
@@ -1,5 +1,5 @@
 #include "backend/looped/looped.hpp"
-#include "services/player_service.hpp"
+#include "services/players/player_service.hpp"
 #include "util/globals.hpp"
 
 namespace big
diff --git a/BigBaseV2/src/backend/looped/player/spectate.cpp b/BigBaseV2/src/backend/looped/player/spectate.cpp
index 37ab300d..f331d5d3 100644
--- a/BigBaseV2/src/backend/looped/player/spectate.cpp
+++ b/BigBaseV2/src/backend/looped/player/spectate.cpp
@@ -1,6 +1,6 @@
 #include "backend/looped/looped.hpp"
 #include "natives.hpp"
-#include "services/player_service.hpp"
+#include "services/players/player_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/common.hpp b/BigBaseV2/src/common.hpp
index dd81a230..de615e66 100644
--- a/BigBaseV2/src/common.hpp
+++ b/BigBaseV2/src/common.hpp
@@ -54,7 +54,7 @@
 #include "gta/natives.hpp"
 #include "CPed.hpp"
 
-#include "services/notification_service.hpp"
+#include "services/notifications/notification_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/gui.cpp b/BigBaseV2/src/gui.cpp
index b348948c..dab1c67a 100644
--- a/BigBaseV2/src/gui.cpp
+++ b/BigBaseV2/src/gui.cpp
@@ -1,22 +1,13 @@
 #include "common.hpp"
-#include "fiber_pool.hpp"
 #include "gta/player.hpp"
-#include "gta_util.hpp"
 #include "gui.hpp"
-#include "logger.hpp"
-#include "memory/module.hpp"
-#include "memory/pattern.hpp"
 #include "natives.hpp"
-#include "pointers.hpp"
-#include "renderer.hpp"
 #include "script.hpp"
 
-
 #include <imgui.h>
 #include "widgets/imgui_hotkey.hpp"
 
 #include "views/view.hpp"
-#include "services/notification_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/gui/components/nav_item.cpp b/BigBaseV2/src/gui/components/nav_item.cpp
index d8239ea1..d978b7cc 100644
--- a/BigBaseV2/src/gui/components/nav_item.cpp
+++ b/BigBaseV2/src/gui/components/nav_item.cpp
@@ -1,5 +1,5 @@
 #include "components.hpp"
-#include "services/gui_service.hpp"
+#include "services/gui/gui_service.hpp"
 
 namespace big
 {
@@ -28,4 +28,4 @@ namespace big
 
 		g_gui_service->increment_nav_size();
 	}
-}
\ No newline at end of file
+}
diff --git a/BigBaseV2/src/gui/handling/handling_current_profile.cpp b/BigBaseV2/src/gui/handling/handling_current_profile.cpp
index 8936bbf6..ca95414e 100644
--- a/BigBaseV2/src/gui/handling/handling_current_profile.cpp
+++ b/BigBaseV2/src/gui/handling/handling_current_profile.cpp
@@ -1,5 +1,5 @@
 #include "current_profile/current_profile_tabs.hpp"
-#include "services/vehicle_service.hpp"
+#include "services/vehicle/vehicle_service.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/BigBaseV2/src/gui/handling/handling_my_profiles.cpp b/BigBaseV2/src/gui/handling/handling_my_profiles.cpp
index db5e71a9..3d921c7e 100644
--- a/BigBaseV2/src/gui/handling/handling_my_profiles.cpp
+++ b/BigBaseV2/src/gui/handling/handling_my_profiles.cpp
@@ -1,4 +1,4 @@
-#include "services/vehicle_service.hpp"
+#include "services/vehicle/vehicle_service.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/BigBaseV2/src/gui/handling/handling_saved_profiles.cpp b/BigBaseV2/src/gui/handling/handling_saved_profiles.cpp
index 281c9bf0..831672da 100644
--- a/BigBaseV2/src/gui/handling/handling_saved_profiles.cpp
+++ b/BigBaseV2/src/gui/handling/handling_saved_profiles.cpp
@@ -1,4 +1,4 @@
-#include "services/vehicle_service.hpp"
+#include "services/vehicle/vehicle_service.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/BigBaseV2/src/gui/handling/handling_search.cpp b/BigBaseV2/src/gui/handling/handling_search.cpp
index fb28c56b..5119fc93 100644
--- a/BigBaseV2/src/gui/handling/handling_search.cpp
+++ b/BigBaseV2/src/gui/handling/handling_search.cpp
@@ -3,7 +3,7 @@
 #include "natives.hpp"
 #include "script.hpp"
 #include "thread_pool.hpp"
-#include "services/vehicle_service.hpp"
+#include "services/vehicle/vehicle_service.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/BigBaseV2/src/gui/handling/handling_tabs.hpp b/BigBaseV2/src/gui/handling/handling_tabs.hpp
index 4c5769e4..0dede516 100644
--- a/BigBaseV2/src/gui/handling/handling_tabs.hpp
+++ b/BigBaseV2/src/gui/handling/handling_tabs.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "current_profile/current_profile_tabs.hpp"
-#include "services/vehicle_service.hpp"
+#include "services/vehicle/vehicle_service.hpp"
 
 namespace big::tab_handling
 {
diff --git a/BigBaseV2/src/gui/handling/modals/save_handling.cpp b/BigBaseV2/src/gui/handling/modals/save_handling.cpp
index 20e69df2..e621ba5f 100644
--- a/BigBaseV2/src/gui/handling/modals/save_handling.cpp
+++ b/BigBaseV2/src/gui/handling/modals/save_handling.cpp
@@ -3,7 +3,7 @@
 #include "thread_pool.hpp"
 #include "natives.hpp"
 #include "script.hpp"
-#include "services/vehicle_service.hpp"
+#include "services/vehicle/vehicle_service.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/BigBaseV2/src/gui/handling/modals/update_handling.cpp b/BigBaseV2/src/gui/handling/modals/update_handling.cpp
index 62fb3925..433a9dfb 100644
--- a/BigBaseV2/src/gui/handling/modals/update_handling.cpp
+++ b/BigBaseV2/src/gui/handling/modals/update_handling.cpp
@@ -3,7 +3,7 @@
 #include "thread_pool.hpp"
 #include "natives.hpp"
 #include "script.hpp"
-#include "services/vehicle_service.hpp"
+#include "services/vehicle/vehicle_service.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/BigBaseV2/src/hooks/network_player_mgr.cpp b/BigBaseV2/src/hooks/network_player_mgr.cpp
index 07e85015..8edbf92f 100644
--- a/BigBaseV2/src/hooks/network_player_mgr.cpp
+++ b/BigBaseV2/src/hooks/network_player_mgr.cpp
@@ -1,5 +1,5 @@
 #include "hooking.hpp"
-#include "services/player_service.hpp"
+#include "services/players/player_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/hooks/player_join.cpp b/BigBaseV2/src/hooks/player_join.cpp
index 36e4cb9a..e202f7f7 100644
--- a/BigBaseV2/src/hooks/player_join.cpp
+++ b/BigBaseV2/src/hooks/player_join.cpp
@@ -1,5 +1,5 @@
 #include "hooking.hpp"
-#include "services/player_service.hpp"
+#include "services/players/player_service.hpp"
 #include "util/notify.hpp"
 
 namespace big
diff --git a/BigBaseV2/src/hooks/player_left.cpp b/BigBaseV2/src/hooks/player_left.cpp
index 8b84077f..0ca2dfb3 100644
--- a/BigBaseV2/src/hooks/player_left.cpp
+++ b/BigBaseV2/src/hooks/player_left.cpp
@@ -1,5 +1,5 @@
 #include "hooking.hpp"
-#include "services/player_service.hpp"
+#include "services/players/player_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/hooks/receive_net_message.cpp b/BigBaseV2/src/hooks/receive_net_message.cpp
index 70a0cf2e..dc5eed4b 100644
--- a/BigBaseV2/src/hooks/receive_net_message.cpp
+++ b/BigBaseV2/src/hooks/receive_net_message.cpp
@@ -1,5 +1,5 @@
 #include "hooking.hpp"
-#include "services/player_service.hpp"
+#include "services/players/player_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/main.cpp b/BigBaseV2/src/main.cpp
index c9718042..99710a24 100644
--- a/BigBaseV2/src/main.cpp
+++ b/BigBaseV2/src/main.cpp
@@ -11,14 +11,14 @@
 #include "thread_pool.hpp"
 
 #include "native_hooks/native_hooks.hpp"
-#include "services/context_menu_service.hpp"
-#include "services/globals_service.hpp"
-#include "services/gui_service.hpp"
-#include "services/player_service.hpp"
-#include "services/mobile_service.hpp"
-#include "services/notification_service.hpp"
-#include "services/vehicle_preview_service.hpp"
-#include "services/vehicle_service.hpp"
+#include "services/context_menu/context_menu_service.hpp"
+#include "services/globals/globals_service.hpp"
+#include "services/gui/gui_service.hpp"
+#include "services/mobile/mobile_service.hpp"
+#include "services/players/player_service.hpp"
+#include "services/notifications/notification_service.hpp"
+#include "services/vehicle_preview/vehicle_preview_service.hpp"
+#include "services/vehicle/vehicle_service.hpp"
 
 #include "backend/backend.hpp"
 
diff --git a/BigBaseV2/src/services/context_menu_service.cpp b/BigBaseV2/src/services/context_menu/context_menu_service.cpp
similarity index 100%
rename from BigBaseV2/src/services/context_menu_service.cpp
rename to BigBaseV2/src/services/context_menu/context_menu_service.cpp
diff --git a/BigBaseV2/src/services/context_menu_service.hpp b/BigBaseV2/src/services/context_menu/context_menu_service.hpp
similarity index 100%
rename from BigBaseV2/src/services/context_menu_service.hpp
rename to BigBaseV2/src/services/context_menu/context_menu_service.hpp
diff --git a/BigBaseV2/src/services/friends_service.cpp b/BigBaseV2/src/services/friends/friends_service.cpp
similarity index 100%
rename from BigBaseV2/src/services/friends_service.cpp
rename to BigBaseV2/src/services/friends/friends_service.cpp
diff --git a/BigBaseV2/src/services/friends_service.hpp b/BigBaseV2/src/services/friends/friends_service.hpp
similarity index 100%
rename from BigBaseV2/src/services/friends_service.hpp
rename to BigBaseV2/src/services/friends/friends_service.hpp
diff --git a/BigBaseV2/src/services/globals_service.cpp b/BigBaseV2/src/services/globals/globals_service.cpp
similarity index 100%
rename from BigBaseV2/src/services/globals_service.cpp
rename to BigBaseV2/src/services/globals/globals_service.cpp
diff --git a/BigBaseV2/src/services/globals_service.hpp b/BigBaseV2/src/services/globals/globals_service.hpp
similarity index 100%
rename from BigBaseV2/src/services/globals_service.hpp
rename to BigBaseV2/src/services/globals/globals_service.hpp
diff --git a/BigBaseV2/src/services/gui_service.cpp b/BigBaseV2/src/services/gui/gui_service.cpp
similarity index 100%
rename from BigBaseV2/src/services/gui_service.cpp
rename to BigBaseV2/src/services/gui/gui_service.cpp
diff --git a/BigBaseV2/src/services/gui_service.hpp b/BigBaseV2/src/services/gui/gui_service.hpp
similarity index 100%
rename from BigBaseV2/src/services/gui_service.hpp
rename to BigBaseV2/src/services/gui/gui_service.hpp
diff --git a/BigBaseV2/src/services/mobile_service.cpp b/BigBaseV2/src/services/mobile/mobile_service.cpp
similarity index 100%
rename from BigBaseV2/src/services/mobile_service.cpp
rename to BigBaseV2/src/services/mobile/mobile_service.cpp
diff --git a/BigBaseV2/src/services/mobile_service.hpp b/BigBaseV2/src/services/mobile/mobile_service.hpp
similarity index 100%
rename from BigBaseV2/src/services/mobile_service.hpp
rename to BigBaseV2/src/services/mobile/mobile_service.hpp
diff --git a/BigBaseV2/src/services/notification_service.cpp b/BigBaseV2/src/services/notifications/notification_service.cpp
similarity index 100%
rename from BigBaseV2/src/services/notification_service.cpp
rename to BigBaseV2/src/services/notifications/notification_service.cpp
diff --git a/BigBaseV2/src/services/notification_service.hpp b/BigBaseV2/src/services/notifications/notification_service.hpp
similarity index 100%
rename from BigBaseV2/src/services/notification_service.hpp
rename to BigBaseV2/src/services/notifications/notification_service.hpp
diff --git a/BigBaseV2/src/services/player_service.cpp b/BigBaseV2/src/services/players/player_service.cpp
similarity index 98%
rename from BigBaseV2/src/services/player_service.cpp
rename to BigBaseV2/src/services/players/player_service.cpp
index 180aaf18..cfaa0de1 100644
--- a/BigBaseV2/src/services/player_service.cpp
+++ b/BigBaseV2/src/services/players/player_service.cpp
@@ -1,6 +1,6 @@
-#include "friends_service.hpp"
 #include "gta_util.hpp"
 #include "player_service.hpp"
+#include "services/friends/friends_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/services/player_service.hpp b/BigBaseV2/src/services/players/player_service.hpp
similarity index 100%
rename from BigBaseV2/src/services/player_service.hpp
rename to BigBaseV2/src/services/players/player_service.hpp
diff --git a/BigBaseV2/src/services/vehicle_service.cpp b/BigBaseV2/src/services/vehicle/vehicle_service.cpp
similarity index 100%
rename from BigBaseV2/src/services/vehicle_service.cpp
rename to BigBaseV2/src/services/vehicle/vehicle_service.cpp
diff --git a/BigBaseV2/src/services/vehicle_service.hpp b/BigBaseV2/src/services/vehicle/vehicle_service.hpp
similarity index 100%
rename from BigBaseV2/src/services/vehicle_service.hpp
rename to BigBaseV2/src/services/vehicle/vehicle_service.hpp
diff --git a/BigBaseV2/src/services/vehicle_helper.cpp b/BigBaseV2/src/services/vehicle_helper/vehicle_helper.cpp
similarity index 99%
rename from BigBaseV2/src/services/vehicle_helper.cpp
rename to BigBaseV2/src/services/vehicle_helper/vehicle_helper.cpp
index 6150c17e..186299b4 100644
--- a/BigBaseV2/src/services/vehicle_helper.cpp
+++ b/BigBaseV2/src/services/vehicle_helper/vehicle_helper.cpp
@@ -1,7 +1,7 @@
 #include "natives.hpp"
 #include "pointers.hpp"
 #include "script.hpp"
-#include "vehicle_helper.h"
+#include "vehicle_helper.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/services/vehicle_helper.h b/BigBaseV2/src/services/vehicle_helper/vehicle_helper.hpp
similarity index 100%
rename from BigBaseV2/src/services/vehicle_helper.h
rename to BigBaseV2/src/services/vehicle_helper/vehicle_helper.hpp
diff --git a/BigBaseV2/src/services/vehicle_preview_service.cpp b/BigBaseV2/src/services/vehicle_preview/vehicle_preview_service.cpp
similarity index 100%
rename from BigBaseV2/src/services/vehicle_preview_service.cpp
rename to BigBaseV2/src/services/vehicle_preview/vehicle_preview_service.cpp
diff --git a/BigBaseV2/src/services/vehicle_preview_service.hpp b/BigBaseV2/src/services/vehicle_preview/vehicle_preview_service.hpp
similarity index 100%
rename from BigBaseV2/src/services/vehicle_preview_service.hpp
rename to BigBaseV2/src/services/vehicle_preview/vehicle_preview_service.hpp
diff --git a/BigBaseV2/src/views/core/view_active_view.cpp b/BigBaseV2/src/views/core/view_active_view.cpp
index 819608d4..0907bb44 100644
--- a/BigBaseV2/src/views/core/view_active_view.cpp
+++ b/BigBaseV2/src/views/core/view_active_view.cpp
@@ -1,5 +1,6 @@
 #include "views/view.hpp"
-#include "services/gui_service.hpp"
+#include "pointers.hpp"
+#include "services/gui/gui_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/views/core/view_navigation.cpp b/BigBaseV2/src/views/core/view_navigation.cpp
index 5f93c465..95d9e6bc 100644
--- a/BigBaseV2/src/views/core/view_navigation.cpp
+++ b/BigBaseV2/src/views/core/view_navigation.cpp
@@ -1,6 +1,5 @@
-#include "services/gui_service.hpp"
+#include "services/gui/gui_service.hpp"
 #include "views/view.hpp"
-#include "services/player_service.hpp"
 
 namespace big
 {
@@ -19,4 +18,4 @@ namespace big
 			ImGui::End();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/BigBaseV2/src/views/core/view_notifications.cpp b/BigBaseV2/src/views/core/view_notifications.cpp
index d5d9a37d..db02ef99 100644
--- a/BigBaseV2/src/views/core/view_notifications.cpp
+++ b/BigBaseV2/src/views/core/view_notifications.cpp
@@ -1,5 +1,5 @@
+#include "pointers.hpp"
 #include "views/view.hpp"
-#include "services/notification_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/views/esp/view_esp.cpp b/BigBaseV2/src/views/esp/view_esp.cpp
index c5e1be48..8013388d 100644
--- a/BigBaseV2/src/views/esp/view_esp.cpp
+++ b/BigBaseV2/src/views/esp/view_esp.cpp
@@ -1,7 +1,7 @@
 #include "view_esp.hpp"
 #include "gta_util.hpp"
 #include "pointers.hpp"
-#include "services/player_service.hpp"
+#include "services/players/player_service.hpp"
 #include "util/math.hpp"
 #include "util/misc.hpp"
 
diff --git a/BigBaseV2/src/views/players/view_player.cpp b/BigBaseV2/src/views/players/view_player.cpp
index e0bdb9b6..5f0f1ef9 100644
--- a/BigBaseV2/src/views/players/view_player.cpp
+++ b/BigBaseV2/src/views/players/view_player.cpp
@@ -1,10 +1,10 @@
-#include "views/view.hpp"
-#include "services/player_service.hpp"
 #include "gta_util.hpp"
-#include "util/misc.hpp"
+#include "services/players/player_service.hpp"
 #include "util/globals.hpp"
+#include "util/misc.hpp"
 #include "util/ped.hpp"
 #include "util/teleport.hpp"
+#include "views/view.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/views/players/view_players.cpp b/BigBaseV2/src/views/players/view_players.cpp
index b9213aa9..53349209 100644
--- a/BigBaseV2/src/views/players/view_players.cpp
+++ b/BigBaseV2/src/views/players/view_players.cpp
@@ -1,5 +1,7 @@
+#include "pointers.hpp"
+#include "services/gui/gui_service.hpp"
+#include "services/players/player_service.hpp"
 #include "views/view.hpp"
-#include "services/gui_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/views/self/view_mobile.cpp b/BigBaseV2/src/views/self/view_mobile.cpp
index ec1e9649..2d5d52c9 100644
--- a/BigBaseV2/src/views/self/view_mobile.cpp
+++ b/BigBaseV2/src/views/self/view_mobile.cpp
@@ -1,7 +1,7 @@
-#include "views/view.hpp"
 #include "fiber_pool.hpp"
+#include "services/mobile/mobile_service.hpp"
 #include "util/mobile.hpp"
-#include "services/mobile_service.hpp"
+#include "views/view.hpp"
 
 namespace big
 {
@@ -80,4 +80,4 @@ namespace big
 		ImGui::EndGroup();
 			
 	}
-}
\ No newline at end of file
+}
diff --git a/BigBaseV2/src/views/self/view_weapons.cpp b/BigBaseV2/src/views/self/view_weapons.cpp
index 60754d79..f56adc42 100644
--- a/BigBaseV2/src/views/self/view_weapons.cpp
+++ b/BigBaseV2/src/views/self/view_weapons.cpp
@@ -1,7 +1,7 @@
 #include "core/data/custom_weapons.hpp"
 #include "fiber_pool.hpp"
+#include "natives.hpp"
 #include "gta/Weapons.h"
-#include "script.hpp"
 #include "core/data/special_ammo_types.hpp"
 #include "views/view.hpp"
 
diff --git a/BigBaseV2/src/views/settings/view_context_menu_settings.cpp b/BigBaseV2/src/views/settings/view_context_menu_settings.cpp
index 7bf84666..caf82050 100644
--- a/BigBaseV2/src/views/settings/view_context_menu_settings.cpp
+++ b/BigBaseV2/src/views/settings/view_context_menu_settings.cpp
@@ -1,5 +1,5 @@
 #include "views/view.hpp"
-#include "services/context_menu_service.hpp"
+#include "services/context_menu/context_menu_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/views/settings/view_debug.cpp b/BigBaseV2/src/views/settings/view_debug.cpp
index 91fb9a43..031f9fb1 100644
--- a/BigBaseV2/src/views/settings/view_debug.cpp
+++ b/BigBaseV2/src/views/settings/view_debug.cpp
@@ -1,11 +1,10 @@
-#include "views/view.hpp"
-#include "services/globals_service.hpp"
-#include "thread_pool.hpp"
 #include "fiber_pool.hpp"
-#include "pointers.hpp"
-#include "script.hpp"
-#include "util/system.hpp"
 #include "natives.hpp"
+#include "pointers.hpp"
+#include "services/globals/globals_service.hpp"
+#include "thread_pool.hpp"
+#include "util/system.hpp"
+#include "views/view.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/views/settings/view_settings.cpp b/BigBaseV2/src/views/settings/view_settings.cpp
index becaa3d9..d3ef51ec 100644
--- a/BigBaseV2/src/views/settings/view_settings.cpp
+++ b/BigBaseV2/src/views/settings/view_settings.cpp
@@ -1,7 +1,6 @@
 #include "views/view.hpp"
 #include "widgets/imgui_hotkey.hpp"
 #include "script_mgr.hpp"
-#include "services/notification_service.hpp"
 
 namespace big
 {
diff --git a/BigBaseV2/src/views/vehicle/view_lsc.cpp b/BigBaseV2/src/views/vehicle/view_lsc.cpp
index e73f2f21..6948875b 100644
--- a/BigBaseV2/src/views/vehicle/view_lsc.cpp
+++ b/BigBaseV2/src/views/vehicle/view_lsc.cpp
@@ -1,6 +1,7 @@
 #include "fiber_pool.hpp"
 #include "natives.hpp"
-#include "services/vehicle_helper.h"
+#include "script.hpp"
+#include "services/vehicle_helper/vehicle_helper.hpp"
 #include "views/view.hpp"
 
 namespace big
diff --git a/BigBaseV2/src/views/vehicle/view_spawn.cpp b/BigBaseV2/src/views/vehicle/view_spawn.cpp
index 150aa29d..48ae15cf 100644
--- a/BigBaseV2/src/views/vehicle/view_spawn.cpp
+++ b/BigBaseV2/src/views/vehicle/view_spawn.cpp
@@ -1,7 +1,7 @@
 #include "views/view.hpp"
 #include "fiber_pool.hpp"
 #include "natives.hpp"
-#include "services/vehicle_preview_service.hpp"
+#include "services/vehicle_preview/vehicle_preview_service.hpp"
 #include "util/vehicle.hpp"
 
 namespace big
diff --git a/BigBaseV2/src/views/view.hpp b/BigBaseV2/src/views/view.hpp
index 61e532e6..6f5fb83f 100644
--- a/BigBaseV2/src/views/view.hpp
+++ b/BigBaseV2/src/views/view.hpp
@@ -1,11 +1,6 @@
 #pragma once
-#include "imgui.h"
-#include "natives.hpp"
-#include "pointers.hpp"
-#include "util/animator.hpp"
 #include "gui/components/components.hpp"
-#include "script.hpp"
-#include "services/player_service.hpp"
+#include "util/animator.hpp"
 #include "views/esp/view_esp.hpp"
 
 
diff --git a/BigBaseV2/src/views/view_context_menu.cpp b/BigBaseV2/src/views/view_context_menu.cpp
index 3bcb623e..154b6abb 100644
--- a/BigBaseV2/src/views/view_context_menu.cpp
+++ b/BigBaseV2/src/views/view_context_menu.cpp
@@ -1,5 +1,5 @@
 #include "view.hpp"
-#include "services/context_menu_service.hpp"
+#include "services/context_menu/context_menu_service.hpp"
 
 namespace big
 {