diff --git a/application/core/AsynchronousFileReader.php b/application/core/Files/AsynchronousFileReader.php
similarity index 98%
rename from application/core/AsynchronousFileReader.php
rename to application/core/Files/AsynchronousFileReader.php
index 661de437..b57847aa 100644
--- a/application/core/AsynchronousFileReader.php
+++ b/application/core/Files/AsynchronousFileReader.php
@@ -1,8 +1,8 @@
 <?php
+namespace ManiaControl\Files;
 
 use ManiaControl\Callbacks\TimerListener;
 use ManiaControl\ManiaControl;
-use Structures\SocketStructure;
 
 class AsynchronousFileReader implements TimerListener {
 	/**
diff --git a/application/core/FileUtil.php b/application/core/Files/FileUtil.php
similarity index 89%
rename from application/core/FileUtil.php
rename to application/core/Files/FileUtil.php
index 6eea798a..a130ac8c 100644
--- a/application/core/FileUtil.php
+++ b/application/core/Files/FileUtil.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace ManiaControl;
+namespace ManiaControl\Files;
+
+use ManiaControl\ManiaControl;
 
 /**
  * File utility class
@@ -21,11 +23,11 @@ abstract class FileUtil {
 			return null;
 		}
 		$urlData = parse_url($url);
-		$port = (isset($urlData['port']) ? $urlData['port'] : 80);
-		
+		$port    = (isset($urlData['port']) ? $urlData['port'] : 80);
+
 		$fsock = fsockopen($urlData['host'], $port);
 		stream_set_timeout($fsock, 3);
-		
+
 		$query = 'GET ' . $urlData['path'] . ' HTTP/1.0' . PHP_EOL;
 		$query .= 'Host: ' . $urlData['host'] . PHP_EOL;
 		$query .= 'Content-Type: ' . $contentType . PHP_EOL;
@@ -33,28 +35,28 @@ abstract class FileUtil {
 		$query .= PHP_EOL;
 
 		fwrite($fsock, $query);
-		
+
 		$buffer = '';
-		$info = array('timed_out' => false);
-		while (!feof($fsock) && !$info['timed_out']) {
+		$info   = array('timed_out' => false);
+		while(!feof($fsock) && !$info['timed_out']) {
 			$buffer .= fread($fsock, 1024);
 			$info = stream_get_meta_data($fsock);
 		}
 		fclose($fsock);
-		
+
 		if ($info['timed_out'] || !$buffer) {
 			return null;
 		}
 		if (substr($buffer, 9, 3) != "200") {
 			return null;
 		}
-		
+
 		$result = explode("\r\n\r\n", $buffer, 2);
-		
+
 		if (count($result) < 2) {
 			return null;
 		}
-		
+
 		return $result[1];
 	}
 
diff --git a/application/Structures/SocketStructure.php b/application/core/Files/SocketStructure.php
similarity index 91%
rename from application/Structures/SocketStructure.php
rename to application/core/Files/SocketStructure.php
index 97504a60..3a0813bf 100644
--- a/application/Structures/SocketStructure.php
+++ b/application/core/Files/SocketStructure.php
@@ -6,7 +6,7 @@
  * Time: 00:18
  */
 
-namespace Structures;
+namespace ManiaControl\Files;
 
 /**
  * Socket Structure
diff --git a/application/core/Maps/MapManager.php b/application/core/Maps/MapManager.php
index 4fae5d8d..7f648602 100644
--- a/application/core/Maps/MapManager.php
+++ b/application/core/Maps/MapManager.php
@@ -5,7 +5,7 @@ namespace ManiaControl\Maps;
 use ManiaControl\Admin\AuthenticationManager;
 use ManiaControl\Callbacks\CallbackListener;
 use ManiaControl\Callbacks\CallbackManager;
-use ManiaControl\FileUtil;
+use ManiaControl\Files\FileUtil;
 use ManiaControl\Formatter;
 use ManiaControl\ManiaControl;
 use ManiaControl\ManiaExchange\ManiaExchangeList;
@@ -115,8 +115,8 @@ class MapManager implements CallbackListener {
 	 * @return bool
 	 */
 	private function saveMap(Map &$map) {
-		$mysqli       = $this->maniaControl->database->mysqli;
-		$mapQuery     = "INSERT INTO `" . self::TABLE_MAPS . "` (
+		$mysqli   = $this->maniaControl->database->mysqli;
+		$mapQuery = "INSERT INTO `" . self::TABLE_MAPS . "` (
 				`uid`,
 				`name`,
 				`authorLogin`,