diff --git a/README.md b/README.md
index a373d42..a4fee43 100644
--- a/README.md
+++ b/README.md
@@ -6,14 +6,14 @@ A Node.js based forum software.
 - Run `npm i` to install **dependencies**.
 - Enter your database credentials in `.env`.
 - Run `npm start` for run it. 
-- Go /setup page for setup your forum.
+- Go `/setup` page for setup your forum.
 
 ### Extra (If you are not use `setup` page)
 Run `node util/reset` to **reset the database** for duplicate key errors, and run `node util/admin` for give admin perms to first member.
-Edit `config.json` for default theme color (`black` or `white`) of users, and forum name, meta description, character limits, discord auth enabler, global ratelimit.
+Edit `config.json` for default theme for users, forum name, meta description, character limits, discord auth enabler, global ratelimit etc.
 
 ### How to install theme:
-- Copy your theme to `themes` folder.
+- Copy your theme to `src/themes` folder.
 Additional note for themes: If a theme has not got any .ejs file, it will use default theme's .ejs files. default theme is in themes folder, named as `common`.
 
 ### DISCORD AUTH: 
@@ -62,7 +62,8 @@ Akf-forum has got an API for AJAX (fetch), other clients etc. And, you can learn
 - add support for transition around gravatar
 - BETTER SETUP PAGE
 - add used open source libraries to README.md
-- better folder system
+- send public to common/public
+- new screenshoots
 ### front-end
 - text alling center body
 - add a css file for CodeMirror in threads / send message ok
diff --git a/package.json b/package.json
index 964079a..0a9b3f8 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "akf-forum",
   "version": "5.2.2",
   "description": "A Node.js based forum software",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
     "start": "node .",
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/index.js b/src/index.js
similarity index 88%
rename from index.js
rename to src/index.js
index d6f33f8..4fe0fcd 100644
--- a/index.js
+++ b/src/index.js
@@ -1,6 +1,6 @@
 require("dotenv").config();
 const
-    { def_theme, forum_name, description, limits, global_ratelimit: RLS, discord_auth, host } = require("./config.json"),
+    { def_theme, forum_name, description, limits, global_ratelimit: RLS, discord_auth, host } = require("../config.json"),
     { UserModel, BanModel } = require("./models"),
     port = process.env.PORT || 3000,
     mongoose = require("mongoose"),
@@ -25,11 +25,11 @@ app.set("limits", limits);
 
 if (RLS.enabled) app.use(RL(RLS.windowMs, RLS.max));
 
-for (const theme of fs.readdirSync("./themes"))
-    app.use(`/themes/${theme}`, express.static(`./themes/${theme}/public/`));
+for (const theme of fs.readdirSync(join(__dirname, "themes")))
+    app.use(`/themes/${theme}`, express.static(join(__dirname, "themes", theme, "public")));
 
 
-app.use(express.static("public"), express.json(), express.urlencoded({ extended: true }), IP(),
+app.use(express.static(join(__dirname, "public")), express.json(), express.urlencoded({ extended: true }), IP(),
     SES({ secret: process.env.SECRET, store: MS.create({ clientPromise: DB, stringify: false }), resave: false, saveUninitialized: false }),
     async (req, res, next) => {
         if (app.ips.includes(req.clientIp)) return res.status(403).send("You are banned from this forum.");
@@ -73,7 +73,7 @@ app.use(express.static("public"), express.json(), express.urlencoded({ extended:
 if (discord_auth)
     app.set("discord_auth", `https://discord.com/api/oauth2/authorize?client_id=${discord_auth}&redirect_uri=${host}%2Fauth%2Fdiscord&response_type=code&scope=identify`);
 
-for (const file of fs.readdirSync("./routes"))
+for (const file of fs.readdirSync(join(__dirname, "routes")))
     app.use("/" + file.replace(".js", ""), require(`./routes/${file}`));
 
 app.all("*", (req, res) => res.error(404, "This page does not exist on this forum."));
diff --git a/lib.js b/src/lib.js
similarity index 86%
rename from lib.js
rename to src/lib.js
index 7866db1..c0b96ee 100644
--- a/lib.js
+++ b/src/lib.js
@@ -1,12 +1,12 @@
 const RL = require('express-rate-limit');
 const nodemailer = require("nodemailer");
-const config = require("./config.json");
+const config = require("../config.json");
 const crypto = require("crypto");
 const { readdirSync } = require('fs');
-
+const { join } = require('path');
 require("dotenv").config();
 module.exports = {
-    themes: readdirSync("./themes").filter(f => f !== "common").map(f => require(`./themes/${f}`)),
+    themes: readdirSync(join(__dirname, "themes")).filter(f => f !== "common").map(f => require(`./themes/${f}`)),
     threadEnum: ["OPEN", "APPROVAL", "DELETED"],
     userEnum: ["ACTIVE", "APPROVAL", "DELETED", "BANNED"],
     RL(windowMs = 60_000, max = 1) {
diff --git a/models/Ban.js b/src/models/Ban.js
similarity index 100%
rename from models/Ban.js
rename to src/models/Ban.js
diff --git a/models/Category.js b/src/models/Category.js
similarity index 100%
rename from models/Category.js
rename to src/models/Category.js
diff --git a/models/Message.js b/src/models/Message.js
similarity index 93%
rename from models/Message.js
rename to src/models/Message.js
index 35ae4df..9c210a7 100644
--- a/models/Message.js
+++ b/src/models/Message.js
@@ -1,6 +1,6 @@
 const mongoose = require("mongoose");
 const cache = require("./cache");
-const { limits } = require("../config.json");
+const { limits } = require("../../config.json");
 
 const schema = new mongoose.Schema({
     id: { type: String, unique: true },
diff --git a/models/Thread.js b/src/models/Thread.js
similarity index 95%
rename from models/Thread.js
rename to src/models/Thread.js
index 941cd9c..3322707 100644
--- a/models/Thread.js
+++ b/src/models/Thread.js
@@ -1,7 +1,7 @@
 const mongoose = require("mongoose");
 const cache = require("./cache")
 const MessageModel = require("./Message");
-const { limits, default_thread_state } = require("../config.json");
+const { limits, default_thread_state } = require("../../config.json");
 const { threadEnum } = require("../lib");
 const schema = new mongoose.Schema({
     id: { type: String, unique: true },
diff --git a/models/User.js b/src/models/User.js
similarity index 94%
rename from models/User.js
rename to src/models/User.js
index 22e6eae..ba1455f 100644
--- a/models/User.js
+++ b/src/models/User.js
@@ -1,5 +1,5 @@
 const mongoose = require("mongoose")
-const { def_theme, limits, default_user_state } = require("../config.json");
+const { def_theme, limits, default_user_state } = require("../../config.json");
 const { userEnum } = require("../lib");
 
 const schema = new mongoose.Schema({
diff --git a/models/cache.js b/src/models/cache.js
similarity index 100%
rename from models/cache.js
rename to src/models/cache.js
diff --git a/models/index.js b/src/models/index.js
similarity index 100%
rename from models/index.js
rename to src/models/index.js
diff --git a/public/favicon.ico b/src/public/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to src/public/favicon.ico
diff --git a/src/public/images/avatars/0.jpg b/src/public/images/avatars/0.jpg
new file mode 100644
index 0000000..bcbd923
Binary files /dev/null and b/src/public/images/avatars/0.jpg differ
diff --git a/src/public/images/avatars/1.jpg b/src/public/images/avatars/1.jpg
new file mode 100644
index 0000000..be41118
Binary files /dev/null and b/src/public/images/avatars/1.jpg differ
diff --git a/public/images/avatars/default.jpg b/src/public/images/avatars/default.jpg
similarity index 100%
rename from public/images/avatars/default.jpg
rename to src/public/images/avatars/default.jpg
diff --git a/public/images/guest.png b/src/public/images/guest.png
similarity index 100%
rename from public/images/guest.png
rename to src/public/images/guest.png
diff --git a/public/js/editor.js b/src/public/js/editor.js
similarity index 100%
rename from public/js/editor.js
rename to src/public/js/editor.js
diff --git a/public/js/modal.js b/src/public/js/modal.js
similarity index 100%
rename from public/js/modal.js
rename to src/public/js/modal.js
diff --git a/public/js/request.js b/src/public/js/request.js
similarity index 100%
rename from public/js/request.js
rename to src/public/js/request.js
diff --git a/public/js/thread.js b/src/public/js/thread.js
similarity index 100%
rename from public/js/thread.js
rename to src/public/js/thread.js
diff --git a/public/libs/cropperjs/cropper.css b/src/public/libs/cropperjs/cropper.css
similarity index 100%
rename from public/libs/cropperjs/cropper.css
rename to src/public/libs/cropperjs/cropper.css
diff --git a/public/libs/cropperjs/cropper.js b/src/public/libs/cropperjs/cropper.js
similarity index 100%
rename from public/libs/cropperjs/cropper.js
rename to src/public/libs/cropperjs/cropper.js
diff --git a/public/libs/simplemde/simplemde.min.css b/src/public/libs/simplemde/simplemde.min.css
similarity index 100%
rename from public/libs/simplemde/simplemde.min.css
rename to src/public/libs/simplemde/simplemde.min.css
diff --git a/public/libs/simplemde/simplemde.min.js b/src/public/libs/simplemde/simplemde.min.js
similarity index 100%
rename from public/libs/simplemde/simplemde.min.js
rename to src/public/libs/simplemde/simplemde.min.js
diff --git a/routes/.js b/src/routes/.js
similarity index 100%
rename from routes/.js
rename to src/routes/.js
diff --git a/routes/admin.js b/src/routes/admin.js
similarity index 100%
rename from routes/admin.js
rename to src/routes/admin.js
diff --git a/routes/api/index.js b/src/routes/api/index.js
similarity index 91%
rename from routes/api/index.js
rename to src/routes/api/index.js
index 971a642..eb1cd28 100644
--- a/routes/api/index.js
+++ b/src/routes/api/index.js
@@ -3,7 +3,7 @@ const app = Router();
 const fs = require("fs");
 const bcrypt = require("bcrypt");
 const { UserModel } = require("../../models");
-
+const{join}=require("path");
 
 app.use(async (req, res, next) => {
     res.error = (status, error) => res.status(status).json({ error });
@@ -31,7 +31,7 @@ app.use(async (req, res, next) => {
 
 app.get("/me", (req, res) => res.complate(req.user))
 
-for (const file of fs.readdirSync("./routes/api/routes"))
+for (const file of fs.readdirSync(join(__dirname, "routes")))
     app.use("/" + file.replace(".js", ""), require(`./routes/${file}`));
 
 app.all("*", (req, res) => res.error(400, "Bad request"));
diff --git a/routes/api/routes/bans.js b/src/routes/api/routes/bans.js
similarity index 100%
rename from routes/api/routes/bans.js
rename to src/routes/api/routes/bans.js
diff --git a/routes/api/routes/categories.js b/src/routes/api/routes/categories.js
similarity index 100%
rename from routes/api/routes/categories.js
rename to src/routes/api/routes/categories.js
diff --git a/routes/api/routes/config.js b/src/routes/api/routes/config.js
similarity index 59%
rename from routes/api/routes/config.js
rename to src/routes/api/routes/config.js
index 504df08..195d102 100644
--- a/routes/api/routes/config.js
+++ b/src/routes/api/routes/config.js
@@ -16,10 +16,10 @@ app.get("/", (req, res) => {
     }
 });
 app.put("/", (req, res) => {
-    const write= req.query.text ? req.body : JSON.stringify(req.body, null, 4)
-    fs.writeFileSync("./config.json",write );
-    require.cache[require.resolve("../../../config.json")] = require("../../../config.json");
-    res.complate(require("../../../config.json"));
+    const write = req.query.text ? req.body : JSON.stringify(req.body, null, 4)
+    fs.writeFileSync("./config.json", write);
+    require.cache[require.resolve("../../../../config.json")] = require("../../../../config.json");
+    res.complate(require("../../../../config.json"));
 });
 
 module.exports = app;
\ No newline at end of file
diff --git a/routes/api/routes/messages.js b/src/routes/api/routes/messages.js
similarity index 100%
rename from routes/api/routes/messages.js
rename to src/routes/api/routes/messages.js
diff --git a/routes/api/routes/search.js b/src/routes/api/routes/search.js
similarity index 100%
rename from routes/api/routes/search.js
rename to src/routes/api/routes/search.js
diff --git a/routes/api/routes/themes.js b/src/routes/api/routes/themes.js
similarity index 100%
rename from routes/api/routes/themes.js
rename to src/routes/api/routes/themes.js
diff --git a/routes/api/routes/threads.js b/src/routes/api/routes/threads.js
similarity index 100%
rename from routes/api/routes/threads.js
rename to src/routes/api/routes/threads.js
diff --git a/routes/api/routes/users.js b/src/routes/api/routes/users.js
similarity index 96%
rename from routes/api/routes/users.js
rename to src/routes/api/routes/users.js
index 9af5917..3090267 100644
--- a/routes/api/routes/users.js
+++ b/src/routes/api/routes/users.js
@@ -3,7 +3,7 @@ const { Router } = require("express");
 const multer = require("multer");
 const { themes } = require("../../../lib")
 const app = Router();
-
+const { join } = require("path");
 app.param("id", async (req, res, next, id) => {
     req.member = await UserModel.get(id, req.user.admin ? "+lastSeen +ips" : "");
 
@@ -80,7 +80,7 @@ app.post("/:id/ban", async (req, res) => {
 });
 
 const storage = multer.diskStorage({
-    destination:'./public/images/avatars',
+    destination: join(__dirname, "..", "..", "..", "public", "images", "avatars"),
     filename: function (req, _file, cb) {
         cb(null, req.member.id + ".jpg")
     }
@@ -89,7 +89,7 @@ const storage = multer.diskStorage({
 const upload = multer({ storage })
 
 app.post("/:id/avatar", upload.single('avatar'), async (req, res) => {
-   
+
     const { member } = req;
 
     if (req.user.id !== member.id && !req.user.admin) return res.error(403, "You have not got permission for this.");
diff --git a/routes/auth.js b/src/routes/auth.js
similarity index 97%
rename from routes/auth.js
rename to src/routes/auth.js
index 37393a4..d63111e 100644
--- a/routes/auth.js
+++ b/src/routes/auth.js
@@ -2,7 +2,7 @@ const { Router } = require("express")
 const { UserModel } = require("../models");
 const fetch = require("node-fetch");
 const app = Router();
-const { host, discord_auth, email_auth } = require("../config.json")
+const { host, discord_auth, email_auth } = require("../../config.json")
 
 app.get("/discord", async (req, res) => {
     const client_id = discord_auth;
diff --git a/routes/categories.js b/src/routes/categories.js
similarity index 100%
rename from routes/categories.js
rename to src/routes/categories.js
diff --git a/routes/login.js b/src/routes/login.js
similarity index 100%
rename from routes/login.js
rename to src/routes/login.js
diff --git a/routes/messages.js b/src/routes/messages.js
similarity index 100%
rename from routes/messages.js
rename to src/routes/messages.js
diff --git a/routes/register.js b/src/routes/register.js
similarity index 95%
rename from routes/register.js
rename to src/routes/register.js
index 9577741..e6c47d7 100644
--- a/routes/register.js
+++ b/src/routes/register.js
@@ -3,7 +3,7 @@ const { Router } = require("express")
 const bcrypt = require("bcrypt");
 const { RL, transporter, emailRegEx, getGravatar } = require('../lib');
 const app = Router();
-const { email_auth, forum_name, host } = require("../config.json");
+const { email_auth, forum_name, host } = require("../../config.json");
 app.get("/", (req, res) => res.reply("register", { user: null, discord: req.app.get("discord_auth"), mail: email_auth }));
 
 app.post("/", RL(24 * 60 * 60_000, 5), async (req, res) => {
diff --git a/routes/search.js b/src/routes/search.js
similarity index 100%
rename from routes/search.js
rename to src/routes/search.js
diff --git a/routes/setup.js b/src/routes/setup.js
similarity index 89%
rename from routes/setup.js
rename to src/routes/setup.js
index 368e1f0..37978c3 100644
--- a/routes/setup.js
+++ b/src/routes/setup.js
@@ -27,7 +27,7 @@ app.post("/", async (req, res) => {
             original[key] = content[key];
 
     fs.writeFileSync("./config.json", JSON.stringify(original, null, 4));
-    require.cache[require.resolve("../config.json")] = require("../config.json");
+    require.cache[require.resolve("../../config.json")] = require("../../config.json");
     res.redirect("/register");
 })
 
diff --git a/routes/threads.js b/src/routes/threads.js
similarity index 100%
rename from routes/threads.js
rename to src/routes/threads.js
diff --git a/routes/users.js b/src/routes/users.js
similarity index 100%
rename from routes/users.js
rename to src/routes/users.js
diff --git a/themes/bootstrap_black/index.js b/src/themes/bootstrap_black/index.js
similarity index 100%
rename from themes/bootstrap_black/index.js
rename to src/themes/bootstrap_black/index.js
diff --git a/themes/bootstrap_black/public/bootstrap-night.min.css b/src/themes/bootstrap_black/public/bootstrap-night.min.css
similarity index 100%
rename from themes/bootstrap_black/public/bootstrap-night.min.css
rename to src/themes/bootstrap_black/public/bootstrap-night.min.css
diff --git a/themes/bootstrap_black/public/bootstrap.min.js b/src/themes/bootstrap_black/public/bootstrap.min.js
similarity index 100%
rename from themes/bootstrap_black/public/bootstrap.min.js
rename to src/themes/bootstrap_black/public/bootstrap.min.js
diff --git a/themes/bootstrap_black/public/main.css b/src/themes/bootstrap_black/public/main.css
similarity index 100%
rename from themes/bootstrap_black/public/main.css
rename to src/themes/bootstrap_black/public/main.css
diff --git a/themes/bootstrap_black/views/extra/footer.ejs b/src/themes/bootstrap_black/views/extra/footer.ejs
similarity index 100%
rename from themes/bootstrap_black/views/extra/footer.ejs
rename to src/themes/bootstrap_black/views/extra/footer.ejs
diff --git a/themes/bootstrap_black/views/extra/meta.ejs b/src/themes/bootstrap_black/views/extra/meta.ejs
similarity index 100%
rename from themes/bootstrap_black/views/extra/meta.ejs
rename to src/themes/bootstrap_black/views/extra/meta.ejs
diff --git a/themes/bootstrap_black/views/extra/navbar.ejs b/src/themes/bootstrap_black/views/extra/navbar.ejs
similarity index 100%
rename from themes/bootstrap_black/views/extra/navbar.ejs
rename to src/themes/bootstrap_black/views/extra/navbar.ejs
diff --git a/themes/bootstrap_black/views/extra/usermenu.ejs b/src/themes/bootstrap_black/views/extra/usermenu.ejs
similarity index 100%
rename from themes/bootstrap_black/views/extra/usermenu.ejs
rename to src/themes/bootstrap_black/views/extra/usermenu.ejs
diff --git a/themes/bootstrap_black/views/index.ejs b/src/themes/bootstrap_black/views/index.ejs
similarity index 100%
rename from themes/bootstrap_black/views/index.ejs
rename to src/themes/bootstrap_black/views/index.ejs
diff --git a/themes/common/public/main.css b/src/themes/common/public/main.css
similarity index 100%
rename from themes/common/public/main.css
rename to src/themes/common/public/main.css
diff --git a/themes/common/views/admin.ejs b/src/themes/common/views/admin.ejs
similarity index 100%
rename from themes/common/views/admin.ejs
rename to src/themes/common/views/admin.ejs
diff --git a/themes/common/views/avatar_upload.ejs b/src/themes/common/views/avatar_upload.ejs
similarity index 100%
rename from themes/common/views/avatar_upload.ejs
rename to src/themes/common/views/avatar_upload.ejs
diff --git a/themes/common/views/categories.ejs b/src/themes/common/views/categories.ejs
similarity index 100%
rename from themes/common/views/categories.ejs
rename to src/themes/common/views/categories.ejs
diff --git a/themes/common/views/config.ejs b/src/themes/common/views/config.ejs
similarity index 100%
rename from themes/common/views/config.ejs
rename to src/themes/common/views/config.ejs
diff --git a/themes/common/views/create_category.ejs b/src/themes/common/views/create_category.ejs
similarity index 100%
rename from themes/common/views/create_category.ejs
rename to src/themes/common/views/create_category.ejs
diff --git a/themes/common/views/create_thread.ejs b/src/themes/common/views/create_thread.ejs
similarity index 100%
rename from themes/common/views/create_thread.ejs
rename to src/themes/common/views/create_thread.ejs
diff --git a/themes/common/views/edit_user.ejs b/src/themes/common/views/edit_user.ejs
similarity index 100%
rename from themes/common/views/edit_user.ejs
rename to src/themes/common/views/edit_user.ejs
diff --git a/themes/common/views/error.ejs b/src/themes/common/views/error.ejs
similarity index 100%
rename from themes/common/views/error.ejs
rename to src/themes/common/views/error.ejs
diff --git a/themes/common/views/extra/footer.ejs b/src/themes/common/views/extra/footer.ejs
similarity index 100%
rename from themes/common/views/extra/footer.ejs
rename to src/themes/common/views/extra/footer.ejs
diff --git a/themes/common/views/extra/navbar.ejs b/src/themes/common/views/extra/navbar.ejs
similarity index 100%
rename from themes/common/views/extra/navbar.ejs
rename to src/themes/common/views/extra/navbar.ejs
diff --git a/themes/common/views/extra/usermenu.ejs b/src/themes/common/views/extra/usermenu.ejs
similarity index 100%
rename from themes/common/views/extra/usermenu.ejs
rename to src/themes/common/views/extra/usermenu.ejs
diff --git a/themes/common/views/index.ejs b/src/themes/common/views/index.ejs
similarity index 100%
rename from themes/common/views/index.ejs
rename to src/themes/common/views/index.ejs
diff --git a/themes/common/views/login.ejs b/src/themes/common/views/login.ejs
similarity index 100%
rename from themes/common/views/login.ejs
rename to src/themes/common/views/login.ejs
diff --git a/themes/common/views/messages.ejs b/src/themes/common/views/messages.ejs
similarity index 100%
rename from themes/common/views/messages.ejs
rename to src/themes/common/views/messages.ejs
diff --git a/themes/common/views/register.ejs b/src/themes/common/views/register.ejs
similarity index 100%
rename from themes/common/views/register.ejs
rename to src/themes/common/views/register.ejs
diff --git a/themes/common/views/search.ejs b/src/themes/common/views/search.ejs
similarity index 100%
rename from themes/common/views/search.ejs
rename to src/themes/common/views/search.ejs
diff --git a/themes/common/views/setup.ejs b/src/themes/common/views/setup.ejs
similarity index 100%
rename from themes/common/views/setup.ejs
rename to src/themes/common/views/setup.ejs
diff --git a/themes/common/views/thread.ejs b/src/themes/common/views/thread.ejs
similarity index 100%
rename from themes/common/views/thread.ejs
rename to src/themes/common/views/thread.ejs
diff --git a/themes/common/views/threads.ejs b/src/themes/common/views/threads.ejs
similarity index 100%
rename from themes/common/views/threads.ejs
rename to src/themes/common/views/threads.ejs
diff --git a/themes/common/views/user.ejs b/src/themes/common/views/user.ejs
similarity index 100%
rename from themes/common/views/user.ejs
rename to src/themes/common/views/user.ejs
diff --git a/themes/common/views/users.ejs b/src/themes/common/views/users.ejs
similarity index 100%
rename from themes/common/views/users.ejs
rename to src/themes/common/views/users.ejs
diff --git a/themes/default_black/index.js b/src/themes/default_black/index.js
similarity index 100%
rename from themes/default_black/index.js
rename to src/themes/default_black/index.js
diff --git a/themes/default_black/public/main.css b/src/themes/default_black/public/main.css
similarity index 100%
rename from themes/default_black/public/main.css
rename to src/themes/default_black/public/main.css
diff --git a/themes/default_black/views/extra/footer.ejs b/src/themes/default_black/views/extra/footer.ejs
similarity index 100%
rename from themes/default_black/views/extra/footer.ejs
rename to src/themes/default_black/views/extra/footer.ejs
diff --git a/themes/default_black/views/extra/meta.ejs b/src/themes/default_black/views/extra/meta.ejs
similarity index 100%
rename from themes/default_black/views/extra/meta.ejs
rename to src/themes/default_black/views/extra/meta.ejs
diff --git a/themes/default_black/views/extra/navbar.ejs b/src/themes/default_black/views/extra/navbar.ejs
similarity index 100%
rename from themes/default_black/views/extra/navbar.ejs
rename to src/themes/default_black/views/extra/navbar.ejs
diff --git a/themes/default_black/views/extra/usermenu.ejs b/src/themes/default_black/views/extra/usermenu.ejs
similarity index 100%
rename from themes/default_black/views/extra/usermenu.ejs
rename to src/themes/default_black/views/extra/usermenu.ejs
diff --git a/themes/default_white/index.js b/src/themes/default_white/index.js
similarity index 100%
rename from themes/default_white/index.js
rename to src/themes/default_white/index.js
diff --git a/themes/default_white/public/main.css b/src/themes/default_white/public/main.css
similarity index 100%
rename from themes/default_white/public/main.css
rename to src/themes/default_white/public/main.css
diff --git a/themes/default_white/views/extra/footer.ejs b/src/themes/default_white/views/extra/footer.ejs
similarity index 100%
rename from themes/default_white/views/extra/footer.ejs
rename to src/themes/default_white/views/extra/footer.ejs
diff --git a/themes/default_white/views/extra/meta.ejs b/src/themes/default_white/views/extra/meta.ejs
similarity index 100%
rename from themes/default_white/views/extra/meta.ejs
rename to src/themes/default_white/views/extra/meta.ejs
diff --git a/themes/default_white/views/extra/navbar.ejs b/src/themes/default_white/views/extra/navbar.ejs
similarity index 100%
rename from themes/default_white/views/extra/navbar.ejs
rename to src/themes/default_white/views/extra/navbar.ejs
diff --git a/themes/default_white/views/extra/usermenu.ejs b/src/themes/default_white/views/extra/usermenu.ejs
similarity index 100%
rename from themes/default_white/views/extra/usermenu.ejs
rename to src/themes/default_white/views/extra/usermenu.ejs
diff --git a/util/admin.js b/util/admin.js
index 5def012..fada446 100644
--- a/util/admin.js
+++ b/util/admin.js
@@ -3,7 +3,7 @@ require("dotenv").config();
 
 mongoose.connect(process.env.MONGO_DB_URL, () => console.log("Database is connected"));
 
-const { UserModel } = require("../models");
+const { UserModel } = require("../src/models");
 (async () => {
 
   const member = await UserModel.get("0");
diff --git a/util/reset.js b/util/reset.js
index 9d51846..50172b3 100644
--- a/util/reset.js
+++ b/util/reset.js
@@ -3,6 +3,6 @@ require("dotenv").config();
 
 mongoose.connect(process.env.MONGO_DB_URL, () => console.log("Database is connected"));
 
-const Models = require("../models");
+const Models = require("../src/models");
 
 Object.values(Models).forEach(model => model.collection.drop().then(console.log));