diff --git a/config.js b/config.js
index d197ad8..ead7e32 100644
--- a/config.js
+++ b/config.js
@@ -1,12 +1,12 @@
 var config = {
     vr_pong: {
-        url: "http://3doo.gamewheel.com"
+        url: "http://3d-pong.gamewheel.local"
     },
     vr_racer: {
-        url: "http://3d-racing.gamewheel.com"
+        url: "http://3d-racing.gamewheel.local"
     },
     editor: {
-        url: "http://3d-editor.gamewheel.com",
+        url: "http://3d-editor.gamewheel.local",
         default: {
             platform: 'gamewheel',
             account: 'root',
@@ -14,54 +14,11 @@ var config = {
         },
         uploadPath: '/uploads'
     },
-    pong_editor: {
-        url: "http://3d-pong-editor.gamewheel.com",
-        default: {
-            platform: 'gamewheel',
-            account: 'root',
-            subAccount: 'root',
-            nameOfTheGame: 'test'
-        },
-        uploadPath: '/uploads'
-    },
     api16: {
-        url: "http://api16.gamewheel.com"
-    },
-    api16pong: {
-        url: "http://api16pong.gamewheel.com"
-    },
-    tools: {
-        url: "http://tools.gamewheel.com",
-        default: {
-            platform: 'gamewheel',
-            account: 'root',
-            subAccount: 'root'
-        }
-    },
-    app: {
-        url: 'http://app.gamewheel.com'
-    },
-    api: {
-        url: 'http://api.gamewheel.com'
-    },
-    api_runtime: {
-        url: 'http://api-runtime.gamewheel.com',
-        version: "1.0.0"
-    },
-    masker: {
-        url: 'http://masker.gamewheel.com'
-    },
-    statistics: {
-        url: 'http://api-runtime.gamewheel.com'
-    },
-    port: {
-        url: 'http://port.gamewheel.com'
-    },
-    gate: {
-        url: 'http://gate.gamewheel.com'
+        url: "http://api-v1.6.gamewheel.local"
     },
     editor_v2: {
-        url: 'http://3d-editor-v2.gamewheel.com',
+        url: 'http://3d-editor-v2.gamewheel.local',
         default: {
             platform: 'gamewheel',
             account: 'root',
@@ -73,6 +30,36 @@ var config = {
     api_v2: {
         url: 'http://api-v2.gamewheel.com'
     },
+    tools: {
+        url: "http://tools.gamewheel.local",
+        default: {
+            platform: 'gamewheel',
+            account: 'root',
+            subAccount: 'root'
+        }
+    },
+    app: {
+        url: 'http://app.gamewheel.local'
+    },
+    api: {
+        url: 'http://api.gamewheel.local'
+    },
+    api_runtime: {
+        url: 'http://api-runtime.gamewheel.local',
+        version: "1.0.0"
+    },
+    masker: {
+        url: 'http://masker.gamewheel.local'
+    },
+    statistics: {
+        url: 'http://api-runtime.gamewheel.local'
+    },
+    port: {
+        url: 'http://port.gamewheel.local'
+    },
+    gate: {
+        url: 'http://gate.gamewheel.local'
+    },
     environment: {
         mode: 'production'
     }
diff --git a/hosts b/hosts
new file mode 100644
index 0000000..0ebfed1
--- /dev/null
+++ b/hosts
@@ -0,0 +1,27 @@
+127.0.0.1	localhost
+127.0.1.1	cybafelo
+127.0.1.1	cybafelo.gamewheel.local
+
+# Gamewheel dev endpoints
+127.0.1.1   3d-editor.gamewheel.local
+127.0.1.1   3d-editor-debug.gamewheel.local
+127.0.1.1   3d-editor-v2.gamewheel.local
+127.0.1.1   3d-editor-v2-debug.gamewheel.local
+127.0.1.1   3d-pong.gamewheel.local
+127.0.1.1   3d-pong-debug.gamewheel.local
+127.0.1.1   3d-racing.gamewheel.local
+127.0.1.1   3d-racing-debug.gamewheel.local
+127.0.1.1   api-v1.6.gamewheel.local
+127.0.1.1   api-v1.6-debug.gamewheel.local
+127.0.1.1   api-v2.gamewheel.local
+127.0.1.1   api-v2-debug.gamewheel.local
+127.0.1.1   tools.gamewheel.local
+127.0.1.1   tools-debug.gamewheel.local
+
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
diff --git a/nginx/3d-editor-v2.conf b/nginx/3d-editor-v2.conf
index c0d6af5..abfc659 100644
--- a/nginx/3d-editor-v2.conf
+++ b/nginx/3d-editor-v2.conf
@@ -1,14 +1,11 @@
 server {
 	listen 80;
 
-	server_name 3d-editor-v2.gamewheel.com 3d-editor-v2-debug.gamewheel.com;
+	server_name 3d-editor-v2.gamewheel.local 3d-editor-v2-debug.gamewheel.local;
 
-	root /srv/gamewheel.com/3d_editor_v2;
+	root /srv/gamewheel.com/3d-editor-v2;
 	index index.html;
 
-	access_log /var/log/nginx/3d-editor-v2.gamewheel.com.access.log;
-	error_log /var/log/nginx/3d-editor-v2.gamewheel.com.error.log;
-
 	add_header 'Access-Control-Allow-Origin' '$http_origin';
 
 	location / {
@@ -21,7 +18,7 @@ server {
 	        proxy_set_header X-Real-IP $remote_addr;
 	        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 	        proxy_set_header X-NginX-Proxy true;
-	        proxy_pass http://127.0.0.1:3114;
+	        proxy_pass http://127.0.0.1:3105;
 	        proxy_ssl_session_reuse off;
 	        proxy_set_header Host $http_host;
 	        proxy_redirect off;
diff --git a/nginx/3d-editor.conf b/nginx/3d-editor.conf
index e913ec0..f2b609d 100644
--- a/nginx/3d-editor.conf
+++ b/nginx/3d-editor.conf
@@ -4,7 +4,7 @@ server {
 
 	server_name 3d-editor.gamewheel.local 3d-editor-debug.gamewheel.local;
 
-	root /usr/share/gamewheel/gw_3d_editor;
+	root /usr/share/gamewheel/3d-editor;
 
 	location ~ \.php$ {
 		fastcgi_pass    127.0.0.1:9001;
diff --git a/nginx/3d-pong-editor.conf b/nginx/3d-pong-editor.conf
deleted file mode 100644
index 0baaa03..0000000
--- a/nginx/3d-pong-editor.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-server {
-	listen 80;
-	#listen 443 ssl;
-
-	server_name 3d-pong-editor.gamewheel.com; 
-
-	root /srv/gamewheel.com/3d_pong_editor;
-	index index.html;
-
-	# Log Config 
-	access_log /var/log/nginx/3d-editor.gamewheel.com.access.log;
-	error_log /var/log/nginx/3d-editor.gamewheel.com.error.log;
-
-	# SSL Config
-	#ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
-	#ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
-	#ssl_session_timeout 5m;
-	#ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
-	#ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES";
-	#ssl_prefer_server_ciphers on;
-
-	add_header 'Access-Control-Allow-Origin' '$http_origin';
-
-	location / {
-		autoindex on;
-		try_files $uri $uri/ @node;
-	}
-
-	location @node {
-	        proxy_pass_request_headers on;
-	        proxy_set_header X-Real-IP $remote_addr;
-	        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-	        proxy_set_header X-NginX-Proxy true;
-	        proxy_pass http://127.0.0.1:3112;
-	        proxy_ssl_session_reuse off;
-	        proxy_set_header Host $http_host;
-	        proxy_redirect off;
-	}
-}
diff --git a/nginx/pong.conf b/nginx/3d-pong.conf
similarity index 60%
rename from nginx/pong.conf
rename to nginx/3d-pong.conf
index 3a42b85..9e2074a 100644
--- a/nginx/pong.conf
+++ b/nginx/3d-pong.conf
@@ -1,22 +1,11 @@
 server {
 	listen 80;
-	listen 443 ssl;
 	
-	server_name pong.gamewheel.local pong-debug.gamewheel.local;
+	server_name 3d-pong.gamewheel.local 3d-pong-debug.gamewheel.local;
 
-	root /usr/share/gamewheel/vr_pong/;
+	root /usr/share/gamewheel/3d-pong;
 	index index.html;
 
-	access_log /var/log/nginx/pong.gamewheel.local.access.log;
-	error_log /var/log/nginx/pong.gamewheel.local.error.log;
-    
-	ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
-	ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
-	ssl_session_timeout 5m;
-	ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
-	ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES";
-	ssl_prefer_server_ciphers on;
-
 	add_header Access-Control-Allow-Origin '*';
 
     location / {
diff --git a/nginx/3d-racing.conf b/nginx/3d-racing.conf
index 234eac6..ea3a3d9 100644
--- a/nginx/3d-racing.conf
+++ b/nginx/3d-racing.conf
@@ -2,7 +2,7 @@
 server {
 	listen 80;
 
-	server_name 3d-racing.gamewheel.com 3d-racing-debug.gamewheel.com;
+	server_name 3d-racing.gamewheel.local 3d-racing-debug.gamewheel.local;
 
 	root /srv/gamewheel.com/racing/3d-racing;
 
diff --git a/nginx/api16.conf b/nginx/api-v1.6.conf
similarity index 83%
rename from nginx/api16.conf
rename to nginx/api-v1.6.conf
index ed97c13..d7ea313 100644
--- a/nginx/api16.conf
+++ b/nginx/api-v1.6.conf
@@ -2,9 +2,9 @@
 server {
     listen 80;
 
-    server_name api16.gamewheel.local;
+    server_name api-v1.6.gamewheel.local api-v1.6-debug.gamewheel.local;
 
-    root /usr/share/gamewheel/GW_Config;
+    root /usr/share/gamewheel/api-v1.6;
 
 	location / {
 		add_header Access-Control-Allow-Origin $http_origin;
diff --git a/nginx/api-v2.conf b/nginx/api-v2.conf
index 07f64f8..be5d608 100644
--- a/nginx/api-v2.conf
+++ b/nginx/api-v2.conf
@@ -1,12 +1,9 @@
 server {
 	listen 80;
 	
-	server_name api-v2.gamewheel.com api-v2-debug.gamewheel.com;
+	server_name api-v2.gamewheel.local api-v2-debug.gamewheel.local;
 
-	root /srv/gamewheel.com/api_v2;
-
-	access_log /var/log/nginx/api_v2.gamewheel.com.access.log;
-	error_log /var/log/nginx/api_v2.gamewheel.com.error.log;
+	root /srv/gamewheel.com/api-v2;
 
 	add_header Access-Control-Allow-Methods 'HEAD, GET, POST, PUT, DELETE, OPTIONS';
 	add_header Access-Control-Allow-Headers 'origin, x-requested-with, content-type, accept, authorization, Access-Control-Request-Headers, Access-Control-Request-Method, x-gw-api-rt-key, x-gw-api-rt-token';
@@ -16,7 +13,7 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-NginX-Proxy true;
-        proxy_pass http://127.0.0.1:3115;
+        proxy_pass http://127.0.0.1:3106;
         proxy_ssl_session_reuse off;
         proxy_set_header Host $http_host;
         proxy_redirect off;
diff --git a/nginx/api16pong.conf b/nginx/api16pong.conf
deleted file mode 100644
index bffcae6..0000000
--- a/nginx/api16pong.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-server {
-	listen 80;
-	#listen 443 ssl;
-	
-	server_name api16pong.gamewheel.com;
-
-	root /srv/gamewheel.com/GW_Config;
-
-	# Replace here with proper logs paths
-	access_log /var/log/nginx/api16.gamewheel.com.access.log;
-	error_log /var/log/nginx/api16.gamewheel.com.error.log;
-
-	# Replace here with proper certificates paths
-	#ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
-	#ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
-
-	#ssl_session_timeout 5m;
-	#ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
-	#ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES";
-	#ssl_prefer_server_ciphers on;
-
-	# Replace here with proper allowed origins
-	# add_header Access-Control-Allow-Origin "http://app.gamewheel.local";
-	# add_header Access-Control-Allow-Credentials true;
-	add_header Access-Control-Allow-Methods 'HEAD, GET, POST, PUT, DELETE, OPTIONS';
-	add_header Access-Control-Allow-Headers 'origin, x-requested-with, content-type, accept, authorization, Access-Control-Request-Headers, Access-Control-Request-Method, x-gw-api-rt-key, x-gw-api-rt-token';
-
-	location / {
-	        proxy_pass_request_headers on;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-NginX-Proxy true;
-		proxy_pass http://127.0.0.1:3113;
-		proxy_ssl_session_reuse off;
-		proxy_set_header Host $http_host;
-		proxy_redirect off;
-	}
-}
diff --git a/nginx/api-runtime.conf b/nginx/backup/api-runtime.conf
similarity index 100%
rename from nginx/api-runtime.conf
rename to nginx/backup/api-runtime.conf
diff --git a/nginx/api.conf b/nginx/backup/api.conf
similarity index 100%
rename from nginx/api.conf
rename to nginx/backup/api.conf
diff --git a/nginx/app.conf b/nginx/backup/app.conf
similarity index 100%
rename from nginx/app.conf
rename to nginx/backup/app.conf
diff --git a/nginx/dev-core.conf b/nginx/backup/dev-core.conf
similarity index 100%
rename from nginx/dev-core.conf
rename to nginx/backup/dev-core.conf
diff --git a/nginx/games.conf b/nginx/backup/games.conf
similarity index 100%
rename from nginx/games.conf
rename to nginx/backup/games.conf
diff --git a/nginx/gate.conf b/nginx/backup/gate.conf
similarity index 100%
rename from nginx/gate.conf
rename to nginx/backup/gate.conf
diff --git a/nginx/masker.conf b/nginx/backup/masker.conf
similarity index 100%
rename from nginx/masker.conf
rename to nginx/backup/masker.conf
diff --git a/nginx/port.conf b/nginx/backup/port.conf
similarity index 100%
rename from nginx/port.conf
rename to nginx/backup/port.conf
diff --git a/nginx/redirect.conf b/nginx/backup/redirect.conf
similarity index 100%
rename from nginx/redirect.conf
rename to nginx/backup/redirect.conf
diff --git a/nginx/salesshuttle.de b/nginx/backup/salesshuttle.de
similarity index 100%
rename from nginx/salesshuttle.de
rename to nginx/backup/salesshuttle.de
diff --git a/nginx/www.conf b/nginx/backup/www.conf
similarity index 100%
rename from nginx/www.conf
rename to nginx/backup/www.conf
diff --git a/nginx/racer.conf b/nginx/racer.conf
deleted file mode 100644
index 613fb9f..0000000
--- a/nginx/racer.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-server {
-	listen 80;
-	listen 443 ssl;
-	
-	server_name racer.gamewheel.local racer-debug.gamewheel.local;
-
-	root /srv/gamewheel.local/racer;
-	index index.html;
-
-	access_log /var/log/nginx/racer.gamewheel.local.access.log;
-	error_log /var/log/nginx/racer.gamewheel.local.error.log;
-    
-	ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem;
-	ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key;
-	ssl_session_timeout 5m;
-	ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
-	ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES";
-	ssl_prefer_server_ciphers on;
-
-	add_header Access-Control-Allow-Origin '*';
-	
-	location / {
-		autoindex on;
-		try_files $uri $uri/ /index.html?$args;
-	}
-	
-	location ~ \.*.php$ {
-		include fastcgi_params;
-		fastcgi_split_path_info ^(.+\.php)(.*)$;
-		fastcgi_pass 127.0.0.1:9001;
-		fastcgi_intercept_errors on;
-		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-	}
-}
diff --git a/nginx/tools.conf b/nginx/tools.conf
index e857551..87e0a8b 100644
--- a/nginx/tools.conf
+++ b/nginx/tools.conf
@@ -26,7 +26,7 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-NginX-Proxy true;
-        proxy_pass http://127.0.0.1:3105;
+        proxy_pass http://127.0.0.1:3107;
         proxy_ssl_session_reuse off;
         proxy_set_header Host $http_host;
         proxy_redirect off;
diff --git a/secure.js b/secure.js
index 4276abe..dba613a 100644
--- a/secure.js
+++ b/secure.js
@@ -12,11 +12,6 @@ var secure = {
         debugPort: 3203,
         cluster: false
     },
-    pong_editor: {
-        port: 3112,
-        debugPort: 3212,
-        cluster: false
-    },
     api16: {
         port: 3104,
         debugPort: 3204,
@@ -49,21 +44,18 @@ var secure = {
         },
         sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23'
     },
-    api16pong: {
-        port: 3113,
-        debugPort: 3213,
-        cluster: false,
-        cors: false,
-        mailer: {
-            host: 'localhost',
-            port: 9025,
-            secure: false,
-            debug: true,
-            ignoreTLS: true
-        },
+    editor_v2: {
+        port: 3105,
+        debugPort: 3205,
+        cluster: false
+    },
+    api_v2: {
+        port: 3106,
+        debugPort: 3206,
+        liveReloadPort: 3406,
         mongodb: {
             host: 'mongodb://127.0.0.1',
-            db: 'gw_pong',
+            db: 'api_v2',
             port: 27017,
             shardPort: 27018,
             options: {
@@ -79,12 +71,20 @@ var secure = {
                 autoIndex: false
             }
         },
+        uploadPath : 'uploads',
+        mailer: {
+            host: 'localhost',
+            port: 9025,
+            secure: false,
+            debug: true,
+            ignoreTLS: true
+        },
         sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23'
     },
     tools: {
-        port: 3105,
-        debugPort: 3205,
-        liveReloadPort: 3405,
+        port: 3107,
+        debugPort: 3207,
+        liveReloadPort: 3407,
         mysqlUserExport: {
             host: "127.0.0.1",
             port: 3306,
@@ -102,14 +102,14 @@ var secure = {
         }
     },
     app: {
-        port: 3106,
-        debugPort: 3206,
-        liveReloadPort: 3406
+        port: 3108,
+        debugPort: 3208,
+        liveReloadPort: 3408
     },
     api: {
-        port: 3107,
-        debugPort: 3207,
-        liveReloadPort: 3407,
+        port: 3109,
+        debugPort: 3209,
+        liveReloadPort: 3409,
         mongodb: {
             host: 'mongodb://127.0.0.1',
             db: 'apidev',
@@ -156,9 +156,9 @@ var secure = {
         sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23'
     },
     api_runtime: {
-        port: 3108,
-        debugPort: 3208,
-        liveReloadPort: 3408,
+        port: 3110,
+        debugPort: 3210,
+        liveReloadPort: 3410,
         cors: true,
         cluster: false,
         auth: {
@@ -185,58 +185,21 @@ var secure = {
         auth_key: "gw_masker_rocks"
     },
     statistics: {
-        port: 3109,
-        debugPort: 3209,
-        liveReloadPort: 3409,
+        port: 3111,
+        debugPort: 3211,
+        liveReloadPort: 3411,
         mongodb: {
             host: 'mongodb://127.0.0.1',
             db: 'statistic'
         }
     },
     port: {
-        port: 3110,
-        debugPort: 3210
+        port: 3112,
+        debugPort: 3212
     },
     gate: {
-        port: 3111,
-        debugPort: 3211
-    },
-    editor_v2: {
-        port: 3114,
-        debugPort: 3214,
-        cluster: false
-    },
-    api_v2: {
-        port: 3115,
-        debugPort: 3215,
-        liveReloadPort: 3415,
-        mongodb: {
-            host: 'mongodb://127.0.0.1',
-            db: 'api_v2',
-            port: 27017,
-            shardPort: 27018,
-            options: {
-                db: {
-                    native_parser: true
-                },
-                server: {
-                    poolSize: 5,
-                    keepAlive: 120
-                },
-                user: '',
-                pass: '',
-                autoIndex: false
-            }
-        },
-        uploadPath : 'uploads',
-        mailer: {
-            host: 'localhost',
-            port: 9025,
-            secure: false,
-            debug: true,
-            ignoreTLS: true
-        },
-        sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23'
+        port: 3113,
+        debugPort: 3213
     }
 };