diff --git a/routes/icon.js b/routes/icon.js
new file mode 100644
index 0000000..3858c60
--- /dev/null
+++ b/routes/icon.js
@@ -0,0 +1,10 @@
+const routes = require('express').Router();
+
+
+
+routes.get('/', (request, result) =>
+{
+
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/routes/index.js b/routes/index.js
new file mode 100644
index 0000000..114cc88
--- /dev/null
+++ b/routes/index.js
@@ -0,0 +1,33 @@
+const routes = require('express').Router();
+
+const icon = require('./icon');
+routes.get('/icon', icon);
+
+const video = require('./video');
+routes.get('/video', video);
+
+const videos = require('./videos');
+routes.get('/videos', videos);
+
+const watch = require('./watch');
+routes.get('/watch', watch);
+
+const users = require('./users');
+routes.get('/users', users);
+
+
+const utils = require("../utils");
+
+
+function getHomePageInformation(templateContext, request)
+{
+    templateContext.username = request.session.username;
+}
+
+
+routes.get('/', (request, result) =>
+{
+    utils.renderHTML(request, result, "home.html", getHomePageInformation)
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/routes/users/addUser.js b/routes/users/addUser.js
new file mode 100644
index 0000000..3858c60
--- /dev/null
+++ b/routes/users/addUser.js
@@ -0,0 +1,10 @@
+const routes = require('express').Router();
+
+
+
+routes.get('/', (request, result) =>
+{
+
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/routes/users/edituser.js b/routes/users/edituser.js
new file mode 100644
index 0000000..3858c60
--- /dev/null
+++ b/routes/users/edituser.js
@@ -0,0 +1,10 @@
+const routes = require('express').Router();
+
+
+
+routes.get('/', (request, result) =>
+{
+
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/routes/users/index.js b/routes/users/index.js
new file mode 100644
index 0000000..3690a91
--- /dev/null
+++ b/routes/users/index.js
@@ -0,0 +1,10 @@
+const routes = require('express').Router();
+
+const utils = require("../../utils");
+
+routes.get('/', (request, result) =>
+{
+    utils.renderHTML(request, result, "users.html", getUserInformation);
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/routes/users/login.js b/routes/users/login.js
new file mode 100644
index 0000000..3858c60
--- /dev/null
+++ b/routes/users/login.js
@@ -0,0 +1,10 @@
+const routes = require('express').Router();
+
+
+
+routes.get('/', (request, result) =>
+{
+
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/routes/users/logout.js b/routes/users/logout.js
new file mode 100644
index 0000000..3858c60
--- /dev/null
+++ b/routes/users/logout.js
@@ -0,0 +1,10 @@
+const routes = require('express').Router();
+
+
+
+routes.get('/', (request, result) =>
+{
+
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/routes/users/removeuser.js b/routes/users/removeuser.js
new file mode 100644
index 0000000..3858c60
--- /dev/null
+++ b/routes/users/removeuser.js
@@ -0,0 +1,10 @@
+const routes = require('express').Router();
+
+
+
+routes.get('/', (request, result) =>
+{
+
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/routes/users/revokeAPI.js b/routes/users/revokeAPI.js
new file mode 100644
index 0000000..3858c60
--- /dev/null
+++ b/routes/users/revokeAPI.js
@@ -0,0 +1,10 @@
+const routes = require('express').Router();
+
+
+
+routes.get('/', (request, result) =>
+{
+
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/routes/users/updateUser.js b/routes/users/updateUser.js
new file mode 100644
index 0000000..3858c60
--- /dev/null
+++ b/routes/users/updateUser.js
@@ -0,0 +1,10 @@
+const routes = require('express').Router();
+
+
+
+routes.get('/', (request, result) =>
+{
+
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/routes/video.js b/routes/video.js
new file mode 100644
index 0000000..3858c60
--- /dev/null
+++ b/routes/video.js
@@ -0,0 +1,10 @@
+const routes = require('express').Router();
+
+
+
+routes.get('/', (request, result) =>
+{
+
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/routes/videos.js b/routes/videos.js
new file mode 100644
index 0000000..e4bd70e
--- /dev/null
+++ b/routes/videos.js
@@ -0,0 +1,11 @@
+const routes = require('express').Router();
+
+const utils = require("../utils");
+
+
+routes.get('/', (request, result) =>
+{
+    utils.renderHTML(request, result, "videos.html", getVideosTemplateInformation)
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/routes/watch.js b/routes/watch.js
new file mode 100644
index 0000000..ac8bc33
--- /dev/null
+++ b/routes/watch.js
@@ -0,0 +1,10 @@
+const routes = require('express').Router();
+
+const utils = require("../utils");
+
+routes.get('/', (request, result) =>
+{
+    utils.renderHTML(req, res, "watch.html", getVideoTemplateInfo)
+});
+
+module.exports = routes;
\ No newline at end of file
diff --git a/server.js b/server.js
index d304fe2..ff6dec3 100644
--- a/server.js
+++ b/server.js
@@ -14,8 +14,15 @@ const filepreview = require('filepreview');
 
 const fs = require('fs');
 
+const routes = require('./routes');
+
+
+
 const app = express();
 
+
+app.use('/', routes);
+
 app.use(express.urlencoded());
 app.use(express.json());      // if needed
 
@@ -26,46 +33,46 @@ const config = fileIO.getFileAsJSON(CONFIG_FILE_NAME);
 /**Initializes sessions for login */
 app.use(session({ secret: config.sessionSecret, cookie: { maxAge: 6000000 }}));
 
-/** Template engine */
-const whiskers = require('whiskers');
+// /** Template engine */
+// const whiskers = require('whiskers');
 
 var rootDir = '/home/jeff/work/aaSchool/Algo/online Lectures/';
 
 var serverURL = "http://localhost:5000";
 
-function fetchInTemplate(templateContext, templateKey, filename)
-{
-    templateContext[templateKey] = fileIO.getFile(filename);
-}
-
-function renderHTML(request, result, templateFile, templateDependencyFunction)
-{
-    var templateContext = Object();
-    var prom = [];
-
-    prom.push(fileIO.getFile("./html/mainTemplate.html"));
-    prom.push(fetchInTemplate(templateContext, "header", "./html/header.html"));
-    prom.push(fetchInTemplate(templateContext, "footer", "./html/footer.html"));
-    if(checkPrivilege(request) >= PRIVILEGE.MEMBER)
-    {
-        templateContext.loggedIn = true;
-        if(checkPrivilege(request) === PRIVILEGE.ADMIN)
-            templateContext.admin = true;
-        if(templateDependencyFunction !== null)
-            prom.push(templateDependencyFunction(templateContext, request));
-        prom.push(fetchInTemplate(templateContext, "main","./html/" + templateFile));
-    }
-    else
-    {
-        prom.push(fetchInTemplate(templateContext, "login","./html/login.html"));
-    }
-
-    Promise.all(prom).then(function(content)
-    {
-        result.write(whiskers.render(content[0], templateContext));
-        result.end();
-    });
-}
+// function fetchInTemplate(templateContext, templateKey, filename)
+// {
+//     templateContext[templateKey] = fileIO.getFile(filename);
+// }
+
+// function renderHTML(request, result, templateFile, templateDependencyFunction)
+// {
+//     var templateContext = Object();
+//     var prom = [];
+//
+//     prom.push(fileIO.getFile("./html/mainTemplate.html"));
+//     prom.push(fetchInTemplate(templateContext, "header", "./html/header.html"));
+//     prom.push(fetchInTemplate(templateContext, "footer", "./html/footer.html"));
+//     if(checkPrivilege(request) >= PRIVILEGE.MEMBER)
+//     {
+//         templateContext.loggedIn = true;
+//         if(checkPrivilege(request) === PRIVILEGE.ADMIN)
+//             templateContext.admin = true;
+//         if(templateDependencyFunction !== null)
+//             prom.push(templateDependencyFunction(templateContext, request));
+//         prom.push(fetchInTemplate(templateContext, "main","./html/" + templateFile));
+//     }
+//     else
+//     {
+//         prom.push(fetchInTemplate(templateContext, "login","./html/login.html"));
+//     }
+//
+//     Promise.all(prom).then(function(content)
+//     {
+//         result.write(whiskers.render(content[0], templateContext));
+//         result.end();
+//     });
+// }
 
 function getUserInformation(templateContext, request)
 {
@@ -75,13 +82,13 @@ function getUserInformation(templateContext, request)
     templateContext.username = request.session.username;
 }
 
-function getHomePageInformation(templateContext, request)
-{
-    templateContext.username = request.session.username;
-}
+// function getHomePageInformation(templateContext, request)
+// {
+//     templateContext.username = request.session.username;
+// }
 
-app.get('/', (req, res) => renderHTML(req, res, "home.html", getHomePageInformation));
-app.get('/users', (req, res) => renderHTML(req, res, "users.html", getUserInformation));
+// app.get('/', (req, res) => renderHTML(req, res, "home.html", getHomePageInformation));
+// app.get('/users', (req, res) => renderHTML(req, res, "users.html", getUserInformation));
 
 app.use(express.static('css'));
 app.use(express.static('js'));
@@ -135,8 +142,8 @@ function getVideoTemplateInfo(templateContext, request)
     templateContext.videoURL = request.query.v.split(" ").join("%20");
 }
 
-app.get('/videos', (req, res) => renderHTML(req, res, "videos.html", getVideosTemplateInformation));
-app.get('/watch', (req, res) => renderHTML(req, res, "watch.html", getVideoTemplateInfo));
+// app.get('/videos', (req, res) => renderHTML(req, res, "videos.html", getVideosTemplateInformation));
+// app.get('/watch', (req, res) => renderHTML(req, res, "watch.html", getVideoTemplateInfo));
 
 
 function isPublicVideo(videoURL)