diff --git a/server.js b/server.js
new file mode 100755
index 0000000..9111ebc
--- /dev/null
+++ b/server.js
@@ -0,0 +1,36 @@
+var ejs = require('express')
+var path = require('path')
+var http = require('http')
+
+var app = ejs();
+
+app.get('/', (request, response) => {
+    response.sendFile(path.join(__dirname + '/ui/index.html'));
+});
+
+app.get('/:filename', (request, response) => {
+    response.sendFile(path.join(__dirname + "/ui/" + request.params.filename));
+});
+
+app.get('/css/:file', (request, response) => {
+    response.sendFile(path.join(__dirname + "/ui/css/" + request.params.file));
+});
+
+app.get('/js/:file', (request, response) => {
+    response.sendFile(path.join(__dirname + "/ui/js/" + request.params.file));
+});
+
+app.get('/projects/:file', (request, response) => {
+    response.sendFile(path.join(__dirname + "/ui/projects/" + request.params.file));
+});
+
+app.get('/projects/css/:file', (request, response) => {
+    response.sendFile(path.join(__dirname + "/ui/css/" + request.params.file));
+});
+
+app.get('/assets/:file', (request, response) => {
+    response.sendFile(path.join(__dirname + "/ui/assets/" + request.params.file));
+});
+
+
+http.createServer( app ).listen( 8080 );
\ No newline at end of file
diff --git a/testingserver.js b/testingserver.js
deleted file mode 100755
index b1f34c7..0000000
--- a/testingserver.js
+++ /dev/null
@@ -1,36 +0,0 @@
-var ejs = require('express')
-var path = require('path')
-var http = require('http')
-
-var app = ejs();
-
-app.get('/', (request, response) => {
-    response.sendFile(path.join(__dirname + '/index.html'))
-})
-
-app.get('/:filename', (request, response) => {
-    response.sendFile(path.join(__dirname + "/" + request.params.filename))
-})
-
-app.get('/css/:file', (request, response) => {
-    response.sendFile(path.join(__dirname + "/css/" + request.params.file))
-})
-
-app.get('/js/:file', (request, response) => {
-    response.sendFile(path.join(__dirname + "/js/" + request.params.file))
-})
-
-app.get('/projects/:file', (request, response) => {
-    response.sendFile(path.join(__dirname + "/projects/" + request.params.file))
-})
-
-app.get('/projects/css/:file', (request, response) => {
-    response.sendFile(path.join(__dirname + "/css/" + request.params.file))
-})
-
-app.get('/assets/:file', (request, response) => {
-    response.sendFile(path.join(__dirname + "/assets/" + request.params.file))
-})
-
-
-http.createServer(app).listen(8080);
\ No newline at end of file
diff --git a/404.html b/ui/404.html
similarity index 100%
rename from 404.html
rename to ui/404.html
diff --git a/about.html b/ui/about.html
similarity index 100%
rename from about.html
rename to ui/about.html
diff --git a/assets/Logo.png b/ui/assets/Logo.png
similarity index 100%
rename from assets/Logo.png
rename to ui/assets/Logo.png
diff --git a/assets/logo.xcf b/ui/assets/logo.xcf
similarity index 100%
rename from assets/logo.xcf
rename to ui/assets/logo.xcf
diff --git a/css/altstyle.css b/ui/css/altstyle.css
similarity index 100%
rename from css/altstyle.css
rename to ui/css/altstyle.css
diff --git a/css/footerstyle.css b/ui/css/footerstyle.css
similarity index 100%
rename from css/footerstyle.css
rename to ui/css/footerstyle.css
diff --git a/css/mainstyle.css b/ui/css/mainstyle.css
similarity index 100%
rename from css/mainstyle.css
rename to ui/css/mainstyle.css
diff --git a/css/menustyle.css b/ui/css/menustyle.css
similarity index 100%
rename from css/menustyle.css
rename to ui/css/menustyle.css
diff --git a/footer.html b/ui/footer.html
similarity index 100%
rename from footer.html
rename to ui/footer.html
diff --git a/getos.html b/ui/getos.html
similarity index 100%
rename from getos.html
rename to ui/getos.html
diff --git a/index.html b/ui/index.html
similarity index 100%
rename from index.html
rename to ui/index.html
diff --git a/js/basicanimations.js b/ui/js/basicanimations.js
similarity index 100%
rename from js/basicanimations.js
rename to ui/js/basicanimations.js
diff --git a/js/jquery.js b/ui/js/jquery.js
similarity index 100%
rename from js/jquery.js
rename to ui/js/jquery.js
diff --git a/js/specialanimations.js b/ui/js/specialanimations.js
similarity index 100%
rename from js/specialanimations.js
rename to ui/js/specialanimations.js
diff --git a/menu.html b/ui/menu.html
similarity index 100%
rename from menu.html
rename to ui/menu.html
diff --git a/privacypolicy.html b/ui/privacypolicy.html
similarity index 100%
rename from privacypolicy.html
rename to ui/privacypolicy.html
diff --git a/projects.html b/ui/projects.html
similarity index 100%
rename from projects.html
rename to ui/projects.html
diff --git a/projects/bgac.html b/ui/projects/bgac.html
similarity index 100%
rename from projects/bgac.html
rename to ui/projects/bgac.html
diff --git a/projects/imagescaler.html b/ui/projects/imagescaler.html
similarity index 100%
rename from projects/imagescaler.html
rename to ui/projects/imagescaler.html
diff --git a/projects/musiplayer.html b/ui/projects/musiplayer.html
similarity index 100%
rename from projects/musiplayer.html
rename to ui/projects/musiplayer.html
diff --git a/projects/qrinsight.html b/ui/projects/qrinsight.html
similarity index 100%
rename from projects/qrinsight.html
rename to ui/projects/qrinsight.html
diff --git a/projects/storagemanager.html b/ui/projects/storagemanager.html
similarity index 100%
rename from projects/storagemanager.html
rename to ui/projects/storagemanager.html
diff --git a/support.html b/ui/support.html
similarity index 100%
rename from support.html
rename to ui/support.html