diff --git a/BigBaseV2/src/gui/window/dbg/debug_tabs.hpp b/BigBaseV2/src/gui/window/dbg/debug_tabs.hpp
index 787594d1..efabf290 100644
--- a/BigBaseV2/src/gui/window/dbg/debug_tabs.hpp
+++ b/BigBaseV2/src/gui/window/dbg/debug_tabs.hpp
@@ -4,15 +4,15 @@
 
 namespace big
 {
-	struct modal_debug
+	namespace modal_debug
 	{
-		static void modal_new_global();
-	};
+		void modal_new_global();
+	}
 
-	struct tab_debug
+	namespace tab_debug
 	{
-		static void tab_globals();
-		static void tab_script_events();
-		static void _tab_debug();
-	};
+		void tab_globals();
+		void tab_script_events();
+		void _tab_debug();
+	}
 }
\ No newline at end of file
diff --git a/BigBaseV2/src/gui/window/handling/current_profile/current_profile_tabs.hpp b/BigBaseV2/src/gui/window/handling/current_profile/current_profile_tabs.hpp
index 6385f6f5..f8b6e0c5 100644
--- a/BigBaseV2/src/gui/window/handling/current_profile/current_profile_tabs.hpp
+++ b/BigBaseV2/src/gui/window/handling/current_profile/current_profile_tabs.hpp
@@ -4,25 +4,23 @@
 
 namespace big
 {
-	class tab_current_profile
+	namespace tab_current_profile
 	{
-	public:
-		static void tab_brakes();
-		static void tab_gearing();
-		static void tab_general();
-		static void tab_other();
-		static void tab_rollbars();
-		static void tab_roll_centre_height();
-		static void tab_suspension();
-		static void tab_steering();
-		static void tab_traction();
-		static void tab_transmission();
-	};
+		void tab_brakes();
+		void tab_gearing();
+		void tab_general();
+		void tab_other();
+		void tab_rollbars();
+		void tab_roll_centre_height();
+		void tab_suspension();
+		void tab_steering();
+		void tab_traction();
+		void tab_transmission();
+	}
 
-	class modal_handling
+	namespace modal_handling
 	{
-	public:
-		static void modal_save_handling();
-		static void modal_update_handling();
-	};
+		void modal_save_handling();
+		void modal_update_handling();
+	}
 }
\ No newline at end of file
diff --git a/BigBaseV2/src/gui/window/handling/handling_tabs.hpp b/BigBaseV2/src/gui/window/handling/handling_tabs.hpp
index b4cf9636..d7ce9f76 100644
--- a/BigBaseV2/src/gui/window/handling/handling_tabs.hpp
+++ b/BigBaseV2/src/gui/window/handling/handling_tabs.hpp
@@ -1,14 +1,10 @@
 #pragma once
 #include "current_profile/current_profile_tabs.hpp"
 
-namespace big
+namespace big::tab_handling
 {
-	class tab_handling
-	{
-	public:
-		static void tab_current_profile();
-		static void tab_my_profiles();
-		static void tab_saved_profiles();
-		static void tab_search();
-	};
+	void tab_current_profile();
+	void tab_my_profiles();
+	void tab_saved_profiles();
+	void tab_search();
 }
\ No newline at end of file
diff --git a/BigBaseV2/src/gui/window/main/main_tabs.hpp b/BigBaseV2/src/gui/window/main/main_tabs.hpp
index e8a938f7..76da0777 100644
--- a/BigBaseV2/src/gui/window/main/main_tabs.hpp
+++ b/BigBaseV2/src/gui/window/main/main_tabs.hpp
@@ -2,18 +2,15 @@
 #include "common.hpp"
 #include "imgui.h"
 
-namespace big
+namespace big::tab_main
 {
-	class tab_main {
-	public:
-		static void tab_tunables();
-		static void tab_self();
-		static void tab_recovery();
-		static void tab_settings();
-		static void tab_spawn();
-		static void tab_spoofing();
-		static void tab_vehicle();
-		static void tab_weapons();
-		static void tab_teleport();
-	};
+	void tab_tunables();
+	void tab_self();
+	void tab_recovery();
+	void tab_settings();
+	void tab_spawn();
+	void tab_spoofing();
+	void tab_vehicle();
+	void tab_weapons();
+	void tab_teleport();
 }
\ No newline at end of file
diff --git a/BigBaseV2/src/gui/window/player/player_tabs.hpp b/BigBaseV2/src/gui/window/player/player_tabs.hpp
index 6e5dbfca..5b300659 100644
--- a/BigBaseV2/src/gui/window/player/player_tabs.hpp
+++ b/BigBaseV2/src/gui/window/player/player_tabs.hpp
@@ -2,13 +2,9 @@
 #include "common.hpp"
 #include "imgui.h"
 
-namespace big
+namespace big::tab_player
 {
-	class tab_player
-	{
-	public:
-		static void tab_info();
-		static void tab_teleport();
-		static void tab_toxic();
-	};
+	void tab_info();
+	void tab_teleport();
+	void tab_toxic();
 }
\ No newline at end of file