diff --git a/core/Callbacks/Structures/BaseStructure.php b/core/Callbacks/Structures/Common/BaseStructure.php
similarity index 94%
rename from core/Callbacks/Structures/BaseStructure.php
rename to core/Callbacks/Structures/Common/BaseStructure.php
index 4596c962..109c2c6f 100644
--- a/core/Callbacks/Structures/BaseStructure.php
+++ b/core/Callbacks/Structures/Common/BaseStructure.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ManiaControl\Callbacks\Structures;
+namespace ManiaControl\Callbacks\Structures\Common;
 
 
 use ManiaControl\General\UsageInformationAble;
diff --git a/core/Callbacks/Structures/Common/CommonScoresStructure.php b/core/Callbacks/Structures/Common/CommonScoresStructure.php
index 60cec626..752a2c5a 100644
--- a/core/Callbacks/Structures/Common/CommonScoresStructure.php
+++ b/core/Callbacks/Structures/Common/CommonScoresStructure.php
@@ -3,7 +3,6 @@
 namespace ManiaControl\Callbacks\Structures\Common;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
 use ManiaControl\Callbacks\Structures\Common\Models\CommonPlayerScore;
 use ManiaControl\Callbacks\Structures\ShootMania\Models\TeamScore;
 use ManiaControl\ManiaControl;
diff --git a/core/Callbacks/Structures/ManiaPlanet/StartEndStructure.php b/core/Callbacks/Structures/ManiaPlanet/StartEndStructure.php
index 3f4f8d0f..96f3f709 100644
--- a/core/Callbacks/Structures/ManiaPlanet/StartEndStructure.php
+++ b/core/Callbacks/Structures/ManiaPlanet/StartEndStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ManiaPlanet;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**
diff --git a/core/Callbacks/Structures/ManiaPlanet/StartServerStructure.php b/core/Callbacks/Structures/ManiaPlanet/StartServerStructure.php
index c3d2d6b8..6721a5a4 100644
--- a/core/Callbacks/Structures/ManiaPlanet/StartServerStructure.php
+++ b/core/Callbacks/Structures/ManiaPlanet/StartServerStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ManiaPlanet;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**
diff --git a/core/Callbacks/Structures/ShootMania/OnActionCustomEventStructure.php b/core/Callbacks/Structures/ShootMania/OnActionCustomEventStructure.php
index 25a28022..a2f155f2 100644
--- a/core/Callbacks/Structures/ShootMania/OnActionCustomEventStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnActionCustomEventStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**
diff --git a/core/Callbacks/Structures/ShootMania/OnActionEvent.php b/core/Callbacks/Structures/ShootMania/OnActionEvent.php
index badad2f0..bc2ba11d 100644
--- a/core/Callbacks/Structures/ShootMania/OnActionEvent.php
+++ b/core/Callbacks/Structures/ShootMania/OnActionEvent.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**
diff --git a/core/Callbacks/Structures/ShootMania/OnCaptureStructure.php b/core/Callbacks/Structures/ShootMania/OnCaptureStructure.php
index 65a8e622..ce67790b 100644
--- a/core/Callbacks/Structures/ShootMania/OnCaptureStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnCaptureStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\Callbacks\Structures\ShootMania\Models\Landmark;
 use ManiaControl\Callbacks\Structures\ShootMania\Models\Position;
 use ManiaControl\ManiaControl;
diff --git a/core/Callbacks/Structures/ShootMania/OnCommandStructure.php b/core/Callbacks/Structures/ShootMania/OnCommandStructure.php
index 5a0a49a4..a68d69ed 100644
--- a/core/Callbacks/Structures/ShootMania/OnCommandStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnCommandStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**
diff --git a/core/Callbacks/Structures/ShootMania/OnDefaultEventStructure.php b/core/Callbacks/Structures/ShootMania/OnDefaultEventStructure.php
index d3ac0d51..631890e2 100644
--- a/core/Callbacks/Structures/ShootMania/OnDefaultEventStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnDefaultEventStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**
diff --git a/core/Callbacks/Structures/ShootMania/OnFallDamageStructure.php b/core/Callbacks/Structures/ShootMania/OnFallDamageStructure.php
index ee52c20f..e6770cb9 100644
--- a/core/Callbacks/Structures/ShootMania/OnFallDamageStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnFallDamageStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
 
diff --git a/core/Callbacks/Structures/ShootMania/OnHitNearMissArmorEmptyBaseStructure.php b/core/Callbacks/Structures/ShootMania/OnHitNearMissArmorEmptyBaseStructure.php
index d100f84e..3b7e24b9 100644
--- a/core/Callbacks/Structures/ShootMania/OnHitNearMissArmorEmptyBaseStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnHitNearMissArmorEmptyBaseStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\Callbacks\Structures\ShootMania\Models\Position;
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
diff --git a/core/Callbacks/Structures/ShootMania/OnPlayerObjectStructure.php b/core/Callbacks/Structures/ShootMania/OnPlayerObjectStructure.php
index 3e4f38ef..45d5900b 100644
--- a/core/Callbacks/Structures/ShootMania/OnPlayerObjectStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnPlayerObjectStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**
diff --git a/core/Callbacks/Structures/ShootMania/OnPlayerRequestActionChange.php b/core/Callbacks/Structures/ShootMania/OnPlayerRequestActionChange.php
index cd43dcfb..7586698b 100644
--- a/core/Callbacks/Structures/ShootMania/OnPlayerRequestActionChange.php
+++ b/core/Callbacks/Structures/ShootMania/OnPlayerRequestActionChange.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**
diff --git a/core/Callbacks/Structures/ShootMania/OnPlayerRequestRespawnStructure.php b/core/Callbacks/Structures/ShootMania/OnPlayerRequestRespawnStructure.php
index a9ea16a3..1bd7c0bc 100644
--- a/core/Callbacks/Structures/ShootMania/OnPlayerRequestRespawnStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnPlayerRequestRespawnStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
 
diff --git a/core/Callbacks/Structures/ShootMania/OnPlayerTriggersSectorStructure.php b/core/Callbacks/Structures/ShootMania/OnPlayerTriggersSectorStructure.php
index 8f9b9824..6750d454 100644
--- a/core/Callbacks/Structures/ShootMania/OnPlayerTriggersSectorStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnPlayerTriggersSectorStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**
diff --git a/core/Callbacks/Structures/ShootMania/OnShootStructure.php b/core/Callbacks/Structures/ShootMania/OnShootStructure.php
index 5735c268..a326155d 100644
--- a/core/Callbacks/Structures/ShootMania/OnShootStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnShootStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 use ManiaControl\Players\Player;
 
diff --git a/core/Callbacks/Structures/ShootMania/OnShotDenyStructure.php b/core/Callbacks/Structures/ShootMania/OnShotDenyStructure.php
index 9b652f9c..001659d0 100644
--- a/core/Callbacks/Structures/ShootMania/OnShotDenyStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnShotDenyStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 
diff --git a/core/Callbacks/Structures/TrackMania/OnCommandStructure.php b/core/Callbacks/Structures/TrackMania/OnCommandStructure.php
index de56dd67..965c8a7d 100644
--- a/core/Callbacks/Structures/TrackMania/OnCommandStructure.php
+++ b/core/Callbacks/Structures/TrackMania/OnCommandStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\TrackMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**
diff --git a/core/Callbacks/Structures/TrackMania/OnDefaultEventStructure.php b/core/Callbacks/Structures/TrackMania/OnDefaultEventStructure.php
index 98a01331..d593e2ae 100644
--- a/core/Callbacks/Structures/TrackMania/OnDefaultEventStructure.php
+++ b/core/Callbacks/Structures/TrackMania/OnDefaultEventStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\TrackMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**
diff --git a/core/Callbacks/Structures/TrackMania/OnEventStartLineStructure.php b/core/Callbacks/Structures/TrackMania/OnEventStartLineStructure.php
index 0532b73f..5c7c4dd8 100644
--- a/core/Callbacks/Structures/TrackMania/OnEventStartLineStructure.php
+++ b/core/Callbacks/Structures/TrackMania/OnEventStartLineStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\TrackMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**
diff --git a/core/Callbacks/Structures/TrackMania/OnEventWayPointStructure.php b/core/Callbacks/Structures/TrackMania/OnEventWayPointStructure.php
index 0aac25eb..dae44e2a 100644
--- a/core/Callbacks/Structures/TrackMania/OnEventWayPointStructure.php
+++ b/core/Callbacks/Structures/TrackMania/OnEventWayPointStructure.php
@@ -3,7 +3,7 @@
 namespace ManiaControl\Callbacks\Structures\TrackMania;
 
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\Callbacks\Models\RecordCallback;
 use ManiaControl\ManiaControl;
 use ManiaControl\Utils\Formatter;
diff --git a/core/Callbacks/Structures/XmlRpc/CallbacksListStructure.php b/core/Callbacks/Structures/XmlRpc/CallbacksListStructure.php
index 0ca3788a..f4c5cb0c 100644
--- a/core/Callbacks/Structures/XmlRpc/CallbacksListStructure.php
+++ b/core/Callbacks/Structures/XmlRpc/CallbacksListStructure.php
@@ -2,7 +2,7 @@
 
 namespace ManiaControl\Callbacks\Structures\XmlRpc;
 
-use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\Callbacks\Structures\Common\BaseStructure;
 use ManiaControl\ManiaControl;
 
 /**