diff --git a/modules/main.js b/modules/main.js
index ff0aa85..831e0d5 100644
--- a/modules/main.js
+++ b/modules/main.js
@@ -60,7 +60,7 @@ app.get('/', function (req, res) {
 })
 
 app.get('*', function (req, res) {
-  res.render('404')
+  res.render('shared/404')
   res.status(404)
   // utils.AppendToFile(logger.GetDateString() + ": " + "404 GET", logFile);
 })
diff --git a/modules/qmining.js b/modules/qmining.js
index 8a1e2ad..1ed14ca 100644
--- a/modules/qmining.js
+++ b/modules/qmining.js
@@ -68,7 +68,7 @@ app.use(bodyParser.json({
 app.get('/', function (req, res) {
   // req.hostname
 
-  res.render('main', {
+  res.render('qmining/main', {
     siteurl: siteUrl,
     qa: actions.ProcessQA()
   })
@@ -76,7 +76,7 @@ app.get('/', function (req, res) {
 })
 
 app.get('/manual', function (req, res) {
-  res.render('man')
+  res.render('qmining/man')
   res.end()
   logger.LogReq(req)
 })
@@ -102,7 +102,7 @@ app.get('/legacy', function (req, res) {
   for (let i = 0; i < d.length; i++) { qcount += d.Subjects[i].length }
   let scount = d.length
 
-  res.render('alldata', {
+  res.render('qmining/alldata', {
     data: d,
     scount: scount,
     qcount: qcount,
@@ -121,7 +121,7 @@ app.post('/postfeedback', function (req, res) {
 app.get('/postfeedback', function (req, res) {
   // TODO: res.redirect("/"); or if needs this anyways, becouse /postfeedback post handler already
   // redirects
-  res.render('main', {
+  res.render('qmining/main', {
     sdata: utils.ReadFile(staticFile)
   })
 })
@@ -150,7 +150,7 @@ app.get('/allqr', function (req, res) {
   var f = utils.ReadFile(dataFile)
   var d = actions.LoadJSON(f)
 
-  res.render('allqr', {
+  res.render('qmining/allqr', {
     d: d.toString().split('\n')
   })
   logger.LogReq(req)
@@ -205,13 +205,13 @@ app.route('/fosuploader').post(function (req, res, next) {
 
 app.route('/badtestsender').post(function (req, res, next) {
   UploadFile(req, res, recivedFiles, (fn) => {
-    res.render('uploaded')
+    res.render('qmining/uploaded')
   })
   logger.LogReq(req)
 })
 
 app.get('*', function (req, res) {
-  res.render('404')
+  res.render('shared/404')
   res.status(404)
   // utils.AppendToFile(logger.GetDateString() + ": " + "404 GET", logFile);
 })
diff --git a/modules/sio.js b/modules/sio.js
index afc4c1a..0f9c5a2 100644
--- a/modules/sio.js
+++ b/modules/sio.js
@@ -59,7 +59,7 @@ app.use(bodyParser.json({
 // --------------------------------------------------------------
 
 app.get('/', function (req, res) {
-  res.render('uload')
+  res.render('sio/uload')
   res.end()
 })
 
@@ -92,7 +92,7 @@ app.route('/fosuploader').post(function (req, res, next) {
   })
 })
 app.get('*', function (req, res) {
-  res.render('404')
+  res.render('shared/404')
   res.status(404)
   // utils.AppendToFile(logger.GetDateString() + ": " + "404 GET", logFile);
 })
diff --git a/modules/stuff.js b/modules/stuff.js
index e2ef269..9005ff5 100644
--- a/modules/stuff.js
+++ b/modules/stuff.js
@@ -95,7 +95,7 @@ app.get('/*', function (req, res) {
       }
     })
 
-    res.render('folders', {
+    res.render('stuff/folders', {
       folders: f,
       dirname: relPath,
       prevDir
@@ -109,7 +109,7 @@ app.get('/*', function (req, res) {
 // -----------------------------------------------------------------------------------------------
 
 app.get('*', function (req, res) {
-  res.render('404')
+  res.render('shared/404')
   res.status(404)
   // utils.AppendToFile(logger.GetDateString() + ": " + "404 GET", logFile);
 })
diff --git a/views/alldata.ejs b/views/qmining/alldata.ejs
similarity index 100%
rename from views/alldata.ejs
rename to views/qmining/alldata.ejs
diff --git a/views/allqr.ejs b/views/qmining/allqr.ejs
similarity index 100%
rename from views/allqr.ejs
rename to views/qmining/allqr.ejs
diff --git a/views/aludni.ejs b/views/qmining/aludni.ejs
similarity index 100%
rename from views/aludni.ejs
rename to views/qmining/aludni.ejs
diff --git a/views/b.ejs b/views/qmining/b.ejs
similarity index 100%
rename from views/b.ejs
rename to views/qmining/b.ejs
diff --git a/views/main.ejs b/views/qmining/main.ejs
similarity index 100%
rename from views/main.ejs
rename to views/qmining/main.ejs
diff --git a/views/man.ejs b/views/qmining/man.ejs
similarity index 100%
rename from views/man.ejs
rename to views/qmining/man.ejs
diff --git a/views/qa.ejs b/views/qmining/qa.ejs
similarity index 100%
rename from views/qa.ejs
rename to views/qmining/qa.ejs
diff --git a/views/uploaded.ejs b/views/qmining/uploaded.ejs
similarity index 100%
rename from views/uploaded.ejs
rename to views/qmining/uploaded.ejs
diff --git a/views/404.ejs b/views/shared/404.ejs
similarity index 100%
rename from views/404.ejs
rename to views/shared/404.ejs
diff --git a/views/uload.ejs b/views/sio/uload.ejs
similarity index 100%
rename from views/uload.ejs
rename to views/sio/uload.ejs