Merge branch 'restructuring' of github.com:logsol/chuck.js into restructuring

app/Bootstrap/Client.js

@@ -0,0 +1,11 @@
+requirejs.config({
+	baseUrl: 'app'
+});
+
+var inspector = {};
+
+requirejs(["Bootstrap/Client"], function(Client) {
+	
+	var client = new Client(location.href);
+	inspector.client = client;
+});

app/Bootstrap/HttpServer.js

@@ -36,7 +36,7 @@ function(http, nodeStatic) {
 							fileServer.serveFile('./node_modules/requirejs/require.js', 200, {}, req, res);
 							break;
 
-						case new RegExp(/^\/lib/).test(req.url):
+						case new RegExp(/^\/app/).test(req.url):
 							fileServer.serve(req, res, function(){
 								self.handleFileError(res)
 							});

app/Bootstrap/Server.js

@@ -1,7 +1,7 @@
 define([
-	"Server/HttpServer", 
+	"Bootstrap/HttpServer", 
-	"Server/Socket",
+	"Bootstrap/Socket",
-	"Server/Coordinator"
+	"Lobby/Coordinator"
 ],
 
 function(HttpServer, Socket, Coordinator) {

app/Bootstrap/client.js

@@ -1,12 +0,0 @@
-requirejs.config({
-	baseUrl: 'lib'
-});
-
-var inspector = {};
-
-requirejs(["Client/Networker", "Vendor/SocketIO"], function(Networker, SocketIO) {
-	var socket = SocketIO.connect(location.href);
-	var networker = new Networker(socket);
-
-	inspector.networker = networker;
-});

client.js

@@ -0,0 +1,15 @@
+define([
+	"Game/Client/Networker", 
+	"Lib/Vendor/SocketIO"
+],
+
+function(Networker, SocketIO) {
+
+	function Client(location) {
+		this.socket = SocketIO.connect(location);
+		this.networker = new Networker(socket);
+	}
+
+	return Client;
+	
+});

package.json

@@ -25,6 +25,5 @@
     "node": "*"
   },
   "config": { "port": "1234" },
-  "private": true,
+  "private": true
-  "scripts": {"start": "node app.js"}
 }

server.js

@@ -4,7 +4,7 @@ var inspector = {};
 
 requirejs.config({
 	nodeRequire: require,
-	baseUrl: 'lib'
+	baseUrl: 'app'
 });
 
 var port = process.argv[2]