diff --git a/server/composer.json b/server/composer.json
index a46b95e..7eae4ce 100644
--- a/server/composer.json
+++ b/server/composer.json
@@ -1,4 +1,9 @@
 {
+    "autoload": {
+        "psr-0": {
+            "": "src/"
+        }
+    },
     "require": {
         "cboden/ratchet": "^0.4"
     }
diff --git a/server/run_server.php b/server/server
similarity index 95%
rename from server/run_server.php
rename to server/server
index 3265163..401c831 100755
--- a/server/run_server.php
+++ b/server/server
@@ -2,14 +2,13 @@
 <?php
 
 require __DIR__.'/vendor/autoload.php';
-require __DIR__.'/Server.php';
 
 use Ratchet\Server\IoServer;
 use Ratchet\Http\HttpServer;
 use Ratchet\WebSocket\WsServer;
 use Ratchet\ConnectionInterface;
 
-$server = new \Server();
+$server = new Server();
 
 $server->addMessageHandler('pointer', function (ConnectionInterface $from, array $data) {
     $x = $data['x'] ?? null;
@@ -26,8 +25,6 @@ $server->addMessageHandler('pointer', function (ConnectionInterface $from, array
     } elseif ($click !== null) {
         if ($click === 'left') {
             return shell_exec('xdotool click 1');
-        } elseif ($click === 'dleft') {
-            // return shell_exec("xdotool click 1; xdotool click 1");
         } elseif ($click === 'middle') {
             return shell_exec('xdotool click 2');
         } elseif ($click === 'right') {
diff --git a/server/Server.php b/server/src/Server.php
similarity index 100%
rename from server/Server.php
rename to server/src/Server.php