diff --git a/README.md b/README.md
index f5cf262..bccf406 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,9 @@ Contributions welcome!
 	
 	# Run a temporary server (Neko) (or shorter: `ufront s`)
 	ufront server
+	**or**
+	cd www
+	nekotools server
 	
 	# Run a temporary server (PHP)
 	php -S localhost:2987
diff --git a/server.hxml b/server.hxml
index 8bbb1b9..c07a9f4 100644
--- a/server.hxml
+++ b/server.hxml
@@ -1,4 +1,4 @@
--cp src
+-cp src/server
 -lib ufront:1.0.0-rc.13
 -lib ufront-mail:1.0.0-rc.4
 -lib erazor:1.0.0-rc.1
diff --git a/src/Config.hx b/src/server/Config.hx
similarity index 100%
rename from src/Config.hx
rename to src/server/Config.hx
diff --git a/src/Server.hx b/src/server/Server.hx
similarity index 100%
rename from src/Server.hx
rename to src/server/Server.hx
diff --git a/src/Tasks.hx b/src/server/Tasks.hx
similarity index 100%
rename from src/Tasks.hx
rename to src/server/Tasks.hx
diff --git a/src/app/Permissions.hx b/src/server/app/Permissions.hx
similarity index 100%
rename from src/app/Permissions.hx
rename to src/server/app/Permissions.hx
diff --git a/src/app/api/SignupApi.hx b/src/server/app/api/SignupApi.hx
similarity index 100%
rename from src/app/api/SignupApi.hx
rename to src/server/app/api/SignupApi.hx
diff --git a/src/app/controller/HomeController.hx b/src/server/app/controller/HomeController.hx
similarity index 100%
rename from src/app/controller/HomeController.hx
rename to src/server/app/controller/HomeController.hx
diff --git a/src/app/model/Registration.hx b/src/server/app/model/Registration.hx
similarity index 100%
rename from src/app/model/Registration.hx
rename to src/server/app/model/Registration.hx
diff --git a/src/conf/app.json b/src/server/conf/app.json
similarity index 100%
rename from src/conf/app.json
rename to src/server/conf/app.json
diff --git a/src/conf/mysql.json b/src/server/conf/mysql.json
similarity index 100%
rename from src/conf/mysql.json
rename to src/server/conf/mysql.json
diff --git a/src/conf/smtp.json b/src/server/conf/smtp.json
similarity index 100%
rename from src/conf/smtp.json
rename to src/server/conf/smtp.json
diff --git a/tasks.hxml b/tasks.hxml
index 8ccc729..02d3a9e 100644
--- a/tasks.hxml
+++ b/tasks.hxml
@@ -1,4 +1,4 @@
--cp src
+-cp src/server
 -lib ufront:1.0.0-rc.13
 -lib ufront-mail:1.0.0-rc.4
 -lib erazor:1.0.0-rc.1
diff --git a/test.hxml b/test.hxml
index e5cb270..6b63eb3 100644
--- a/test.hxml
+++ b/test.hxml
@@ -1,4 +1,4 @@
--cp src
+-cp src/server
 -cp test/src
 -lib ufront:1.0.0-rc.13
 -lib ufront-mail:1.0.0-rc.4
diff --git a/www/public/images/public_images_here b/www/public/images/public_images_here
new file mode 100644
index 0000000..e69de29
diff --git a/www/public/scripts/public_js_scripts_here b/www/public/scripts/public_js_scripts_here
new file mode 100644
index 0000000..e69de29
diff --git a/www/public/stylesheets/public_css_files_here b/www/public/stylesheets/public_css_files_here
new file mode 100644
index 0000000..e69de29