diff --git a/core/Callbacks/Structures/Common/CommonCommandStructure.php b/core/Callbacks/Structures/Common/CommonCommandStructure.php
index 919266aa..a7c0fec9 100644
--- a/core/Callbacks/Structures/Common/CommonCommandStructure.php
+++ b/core/Callbacks/Structures/Common/CommonCommandStructure.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ManiaControl\Callbacks\Structures\ShootMania;
+namespace ManiaControl\Callbacks\Structures\Common;
 
 
 use ManiaControl\Callbacks\Structures\Common\BaseStructure;
diff --git a/core/Callbacks/Structures/ShootMania/OnCommandStructure.php b/core/Callbacks/Structures/ShootMania/OnCommandStructure.php
index b1b2c1d0..597504e0 100644
--- a/core/Callbacks/Structures/ShootMania/OnCommandStructure.php
+++ b/core/Callbacks/Structures/ShootMania/OnCommandStructure.php
@@ -2,6 +2,8 @@
 
 namespace ManiaControl\Callbacks\Structures\ShootMania;
 
+use ManiaControl\Callbacks\Structures\Common\CommonCommandStructure;
+
 
 /**
  * Structure Class for the OnCommand Structure Callback
diff --git a/core/Callbacks/Structures/TrackMania/OnCommandStructure.php b/core/Callbacks/Structures/TrackMania/OnCommandStructure.php
index a9325d39..9b99e63f 100644
--- a/core/Callbacks/Structures/TrackMania/OnCommandStructure.php
+++ b/core/Callbacks/Structures/TrackMania/OnCommandStructure.php
@@ -3,10 +3,8 @@
 namespace ManiaControl\Callbacks\Structures\TrackMania;
 
 
-use ManiaControl\Callbacks\Structures\Common\BaseStructure;
-use ManiaControl\Callbacks\Structures\Common\BaseTimeStructure;
-use ManiaControl\Callbacks\Structures\ShootMania\CommonCommandStructure;
-use ManiaControl\ManiaControl;
+use ManiaControl\Callbacks\Structures\Common\CommonCommandStructure;
+
 /**
  * Structure Class for the OnCommand Structure Callback
  *
diff --git a/core/ManiaControl.php b/core/ManiaControl.php
index b5940c4e..c2626e93 100644
--- a/core/ManiaControl.php
+++ b/core/ManiaControl.php
@@ -52,7 +52,7 @@ class ManiaControl implements CallbackListener, CommandListener, TimerListener,
 	/*
 	 * Constants
 	 */
-	const VERSION                     = '0.203';
+	const VERSION                     = '0.204';
 	const API_VERSION                 = '2013-04-16';
 	const MIN_DEDIVERSION             = '2017-04-13_23_00';
 	const SCRIPT_TIMEOUT              = 10;