diff --git a/app/Game/Client/Collision/Detector.js b/app/Game/Client/Collision/Detector.js
index 568bae2..4aea3ad 100755
--- a/app/Game/Client/Collision/Detector.js
+++ b/app/Game/Client/Collision/Detector.js
@@ -1,9 +1,8 @@
 define([
-    "Game/Core/Collision/Detector",
-    "Lib/Vendor/Box2D"
+    "Game/Core/Collision/Detector"
 ], 
 
-function (Parent, Box2D) {
+function (Parent) {
 
     function Detector (player) {
         Parent.call(this, player);
@@ -11,5 +10,8 @@ function (Parent, Box2D) {
 
     Detector.prototype = Object.create(Parent.prototype);
 
+    Detector.IDENTIFIER = Parent.IDENTIFIER; // Needed because otherwise it will not be
+    										 // inherited because it is not in prototype
+
     return Detector;
 });
\ No newline at end of file
diff --git a/app/Game/Client/Loader/Level.js b/app/Game/Client/Loader/Level.js
new file mode 100644
index 0000000..dbf60f5
--- /dev/null
+++ b/app/Game/Client/Loader/Level.js
@@ -0,0 +1,9 @@
+define([
+	"Game/Core/Loader/Level"
+],
+ 
+function(Parent) {
+ 
+    return Parent;
+ 
+});
\ No newline at end of file
diff --git a/app/Game/Client/Physics/Doll.js b/app/Game/Client/Physics/Doll.js
new file mode 100644
index 0000000..56624e6
--- /dev/null
+++ b/app/Game/Client/Physics/Doll.js
@@ -0,0 +1,9 @@
+define([
+	"Game/Core/Physics/Doll"
+],
+ 
+function(Parent) {
+ 
+    return Parent;
+ 
+});
\ No newline at end of file
diff --git a/app/Game/Client/Player.js b/app/Game/Client/Player.js
new file mode 100644
index 0000000..378ad84
--- /dev/null
+++ b/app/Game/Client/Player.js
@@ -0,0 +1,9 @@
+define([
+	"Game/Core/Player"
+],
+ 
+function(Parent) {
+ 
+    return Parent;
+ 
+});
\ No newline at end of file
diff --git a/app/Game/Core/GameController.js b/app/Game/Core/GameController.js
index bce0d71..b729822 100755
--- a/app/Game/Core/GameController.js
+++ b/app/Game/Core/GameController.js
@@ -1,7 +1,7 @@
 define([
-    "Game/Core/Physics/Engine",
-    "Game/Core/Loader/Level",
-    "Game/Core/Player"
+    "Game/" + GLOBALS.context + "/Physics/Engine",
+    "Game/" + GLOBALS.context + "/Loader/Level",
+    "Game/" + GLOBALS.context + "/Player"
 ],
 
 function (Engine, Level, Player) {
diff --git a/app/Game/Core/Loader/Level.js b/app/Game/Core/Loader/Level.js
index 799332b..a970a58 100755
--- a/app/Game/Core/Loader/Level.js
+++ b/app/Game/Core/Loader/Level.js
@@ -1,7 +1,8 @@
 define([
     "Game/Config/Settings", 
     "Lib/Vendor/Box2D", 
-    "Game/Core/Collision/Detector"
+    "Game/" + GLOBALS.context + "/Collision/Detector"
+
 ], function (Settings, Box2D, CollisionDetector) {
     
     // Public
diff --git a/app/Game/Core/Physics/Doll.js b/app/Game/Core/Physics/Doll.js
index acb04ac..d9b0114 100755
--- a/app/Game/Core/Physics/Doll.js
+++ b/app/Game/Core/Physics/Doll.js
@@ -1,7 +1,7 @@
 define([
     "Lib/Vendor/Box2D", 
     "Game/Config/Settings", 
-    "Game/Core/Collision/Detector"
+    "Game/" + GLOBALS.context + "/Collision/Detector"
 ], 
 
 function (Box2D, Settings, CollisionDetector) {
diff --git a/app/Game/Core/Physics/Engine.js b/app/Game/Core/Physics/Engine.js
index 6b5c22c..3cf5344 100755
--- a/app/Game/Core/Physics/Engine.js
+++ b/app/Game/Core/Physics/Engine.js
@@ -1,7 +1,7 @@
 define([
     "Game/Config/Settings",
     "Lib/Vendor/Box2D",
-    "Game/Core/Collision/Detector"
+    "Game/" + GLOBALS.context + "/Collision/Detector"
 ],
 
 function (Settings, Box2D, CollisionDetector) {
diff --git a/app/Game/Core/Player.js b/app/Game/Core/Player.js
index 02280cd..43da7b1 100755
--- a/app/Game/Core/Player.js
+++ b/app/Game/Core/Player.js
@@ -1,5 +1,5 @@
 define([
-    "Game/Core/Physics/Doll",
+    "Game/" + GLOBALS.context + "/Physics/Doll",
     "Game/Config/Settings"
 ],
 
diff --git a/app/Game/Server/Collision/Detector.js b/app/Game/Server/Collision/Detector.js
index 820190e..4aea3ad 100755
--- a/app/Game/Server/Collision/Detector.js
+++ b/app/Game/Server/Collision/Detector.js
@@ -1,9 +1,8 @@
 define([
-	"Game/Core/Collision/Detector",
-    "Lib/Vendor/Box2D"
+    "Game/Core/Collision/Detector"
 ], 
 
-function (Parent, Box2D) {
+function (Parent) {
 
     function Detector (player) {
         Parent.call(this, player);
@@ -11,5 +10,8 @@ function (Parent, Box2D) {
 
     Detector.prototype = Object.create(Parent.prototype);
 
+    Detector.IDENTIFIER = Parent.IDENTIFIER; // Needed because otherwise it will not be
+    										 // inherited because it is not in prototype
+
     return Detector;
 });
\ No newline at end of file
diff --git a/app/Game/Server/Loader/Level.js b/app/Game/Server/Loader/Level.js
index e18f5fa..dbf60f5 100644
--- a/app/Game/Server/Loader/Level.js
+++ b/app/Game/Server/Loader/Level.js
@@ -1,5 +1,5 @@
 define([
-	"Game/Core/Level"
+	"Game/Core/Loader/Level"
 ],
  
 function(Parent) {
diff --git a/channel.js b/channel.js
index 305aeba..86336d5 100755
--- a/channel.js
+++ b/channel.js
@@ -1,3 +1,4 @@
+GLOBALS = { context: "Server" };
 var requirejs = require('requirejs');
 
 requirejs.config({
diff --git a/client.js b/client.js
index 741f3b6..6cdd3a1 100755
--- a/client.js
+++ b/client.js
@@ -1,3 +1,5 @@
+GLOBALS = { context: "Client" };
+
 requirejs.config({
     baseUrl: 'app',
     deps: ['Lib/Utilities/Extensions']
diff --git a/server.js b/server.js
index 51b33d3..f8a664b 100755
--- a/server.js
+++ b/server.js
@@ -1,3 +1,4 @@
+GLOBALS = { context: "Server" };
 var requirejs = require('requirejs');
 
 var inspector;