diff --git a/core/Callbacks/LibXmlRpcCallbacks.php b/core/Callbacks/LibXmlRpcCallbacks.php
index 8bf4c68c..d9bd2ee1 100644
--- a/core/Callbacks/LibXmlRpcCallbacks.php
+++ b/core/Callbacks/LibXmlRpcCallbacks.php
@@ -4,7 +4,7 @@ namespace ManiaControl\Callbacks;
 
 use ManiaControl\Callbacks\Structures\ArmorEmptyStructure;
 use ManiaControl\Callbacks\Structures\CaptureStructure;
-use ManiaControl\Callbacks\Structures\ManiaPlanet\CallbacksListStructure;
+use ManiaControl\Callbacks\Structures\XmlRpc\CallbacksListStructure;
 use ManiaControl\Callbacks\Structures\NearMissStructure;
 use ManiaControl\Callbacks\Structures\PlayerHitStructure;
 use ManiaControl\ManiaControl;
diff --git a/core/Callbacks/Structures/ManiaPlanet/StartServerStructure.php b/core/Callbacks/Structures/ManiaPlanet/StartServerStructure.php
new file mode 100644
index 00000000..7c07226f
--- /dev/null
+++ b/core/Callbacks/Structures/ManiaPlanet/StartServerStructure.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace ManiaControl\Callbacks\Structures\ManiaPlanet;
+
+
+use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\ManiaControl;
+
+class StartServerStartStructure extends BaseStructure {
+	public function __construct(ManiaControl $maniaControl, $data) {
+		parent::setManiaControl($maniaControl);
+		parent::setJson($data);
+
+	}
+}
\ No newline at end of file
diff --git a/core/Callbacks/Structures/ShootMania/DefaultEventStructure.php b/core/Callbacks/Structures/ShootMania/DefaultEventStructure.php
new file mode 100644
index 00000000..84506526
--- /dev/null
+++ b/core/Callbacks/Structures/ShootMania/DefaultEventStructure.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace ManiaControl\Callbacks\Structures\ShootMania;
+
+
+use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\ManiaControl;
+
+/**
+ * Structure Class for the Default Event Structure Callback
+ *
+ * @author    ManiaControl Team <mail@maniacontrol.com>
+ * @copyright 2014-2017 ManiaControl Team
+ * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
+ */
+class DefaultEventStructure extends BaseStructure {
+	public function __construct(ManiaControl $maniaControl, $data) {
+		parent::setManiaControl($maniaControl);
+		parent::setJson($data);
+
+	}
+}
\ No newline at end of file
diff --git a/core/Callbacks/Structures/Trackmania/DefaultEventStructure.php b/core/Callbacks/Structures/Trackmania/DefaultEventStructure.php
index 9eba374b..8e66ad20 100644
--- a/core/Callbacks/Structures/Trackmania/DefaultEventStructure.php
+++ b/core/Callbacks/Structures/Trackmania/DefaultEventStructure.php
@@ -1,16 +1,22 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: Lukas
- * Date: 22. Mär. 2017
- * Time: 18:02
- */
 
 namespace ManiaControl\Callbacks\Structures\Trackmania;
 
 
 use ManiaControl\Callbacks\Structures\BaseStructure;
+use ManiaControl\ManiaControl;
 
+/**
+ * Structure Class for the Default Event Structure Callback
+ *
+ * @author    ManiaControl Team <mail@maniacontrol.com>
+ * @copyright 2014-2017 ManiaControl Team
+ * @license   http://www.gnu.org/licenses/ GNU General Public License, Version 3
+ */
 class DefaultEventStructure extends BaseStructure {
+	public function __construct(ManiaControl $maniaControl, $data) {
+		parent::setManiaControl($maniaControl);
+		parent::setJson($data);
 
+	}
 }
\ No newline at end of file
diff --git a/core/Callbacks/Structures/ManiaPlanet/CallbacksListStructure.php b/core/Callbacks/Structures/XmlRpc/CallbacksListStructure.php
similarity index 94%
rename from core/Callbacks/Structures/ManiaPlanet/CallbacksListStructure.php
rename to core/Callbacks/Structures/XmlRpc/CallbacksListStructure.php
index 586d9f2a..018b0b91 100644
--- a/core/Callbacks/Structures/ManiaPlanet/CallbacksListStructure.php
+++ b/core/Callbacks/Structures/XmlRpc/CallbacksListStructure.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ManiaControl\Callbacks\Structures\ManiaPlanet;
+namespace ManiaControl\Callbacks\Structures\XmlRpc;
 
 use ManiaControl\Callbacks\Structures\BaseStructure;
 use ManiaControl\ManiaControl;