diff --git a/client/game.js b/client/garageserver.js
similarity index 100%
rename from client/game.js
rename to client/garageserver.js
diff --git a/client/player.js b/client/player.js
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/core/game.js b/lib/core/game.js
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/core/player.js b/lib/core/player.js
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/server/game.js b/lib/server/game.js
deleted file mode 100644
index e69de29..0000000
diff --git a/lib/server/garageserver.js b/lib/server/garageserver.js
new file mode 100644
index 0000000..7c8d902
--- /dev/null
+++ b/lib/server/garageserver.js
@@ -0,0 +1,19 @@
+function GarageServer (io) {
+    this.io = io;
+}
+
+GarageServer.prototype.PlayerConnect = function (callback) {
+    this.io.sockets.on('connection', function (socket) {
+        callback(socket);
+    });
+};
+
+GarageServer.prototype.PlayerDisconnect = function (callback) {
+    this.io.sockets.on('connection', function (socket) {
+        callback(socket);
+    });
+};
+
+exports.createGameServer = function (io, options){
+    return new GarageServer(io); 
+};
\ No newline at end of file
diff --git a/lib/server/player.js b/lib/server/player.js
deleted file mode 100644
index e69de29..0000000