From 7c57fca366c97af522b955d5ec56143d77aa90d7 Mon Sep 17 00:00:00 2001
From: fatchan <tom@69420.me>
Date: Fri, 28 Jun 2019 18:13:14 +0000
Subject: [PATCH] organise the helpers some

---
 controllers/forms.js                       | 14 +++++++-------
 controllers/pages.js                       |  6 +++---
 build.js => helpers/build.js               |  8 ++++----
 helpers/{ => captcha}/captchagenerate.js   |  0
 helpers/{ => captcha}/captchaverify.js     |  6 +++---
 helpers/{ => checks}/actionchecker.js      |  0
 helpers/{ => checks}/bancheck.js           |  2 +-
 helpers/{ => checks}/csrfmiddleware.js     |  0
 helpers/{ => checks}/hasperms.js           |  0
 helpers/{ => checks}/haspermsmiddleware.js |  0
 helpers/{ => checks}/isloggedin.js         |  0
 helpers/files/deletefailed.js              |  4 ++--
 helpers/files/deletepostfiles.js           |  4 ++--
 helpers/files/deletetempfiles.js           |  2 +-
 helpers/files/formatsize.js                |  5 +++--
 helpers/files/imageidentify.js             |  2 +-
 helpers/files/imagethumbnail.js            |  2 +-
 helpers/files/imageupload.js               |  2 +-
 helpers/files/uploadDirectory.js           |  6 ++++++
 helpers/files/videoidentify.js             |  2 +-
 helpers/files/videothumbnail.js            |  2 +-
 helpers/files/videoupload.js               |  2 +-
 helpers/{ => posting}/markdown.js          |  2 +-
 helpers/{ => posting}/quotes.js            |  4 ++--
 helpers/{ => posting}/tripcode.js          |  2 +-
 helpers/render.js                          |  2 +-
 helpers/uploadDirectory.js                 |  6 ------
 models/forms/actionhandler.js              |  2 +-
 models/forms/changeboardsettings.js        |  6 +++---
 models/forms/deletebanners.js              |  6 +++---
 models/forms/deletepost.js                 |  4 ++--
 models/forms/deletepostsfiles.js           |  4 ++--
 models/forms/makepost.js                   | 12 ++++++------
 models/forms/uploadbanners.js              |  4 ++--
 models/pages/banners.js                    |  4 ++--
 models/pages/board.js                      |  4 ++--
 models/pages/captcha.js                    |  2 +-
 models/pages/captchapage.js                |  4 ++--
 models/pages/catalog.js                    |  4 ++--
 models/pages/changepassword.js             |  4 ++--
 models/pages/home.js                       |  4 ++--
 models/pages/login.js                      |  4 ++--
 models/pages/register.js                   |  4 ++--
 models/pages/thread.js                     |  4 ++--
 44 files changed, 81 insertions(+), 80 deletions(-)
 rename build.js => helpers/build.js (95%)
 rename helpers/{ => captcha}/captchagenerate.js (100%)
 rename helpers/{ => captcha}/captchaverify.js (88%)
 rename helpers/{ => checks}/actionchecker.js (100%)
 rename helpers/{ => checks}/bancheck.js (89%)
 rename helpers/{ => checks}/csrfmiddleware.js (100%)
 rename helpers/{ => checks}/hasperms.js (100%)
 rename helpers/{ => checks}/haspermsmiddleware.js (100%)
 rename helpers/{ => checks}/isloggedin.js (100%)
 create mode 100644 helpers/files/uploadDirectory.js
 rename helpers/{ => posting}/markdown.js (96%)
 rename helpers/{ => posting}/quotes.js (96%)
 rename helpers/{ => posting}/tripcode.js (79%)
 delete mode 100644 helpers/uploadDirectory.js

diff --git a/controllers/forms.js b/controllers/forms.js
index 203c58ff..e2df680e 100644
--- a/controllers/forms.js
+++ b/controllers/forms.js
@@ -5,7 +5,7 @@ const express  = require('express')
 	, Boards = require(__dirname+'/../db/boards.js')
 	, Posts = require(__dirname+'/../db/posts.js')
 	, Mongo = require(__dirname+'/../db/db.js')
-	, remove = require('fs-extra').remove
+	, { remove } = require('fs-extra')
 	, upload = require('express-fileupload')
 	, path = require('path')
 	, postFiles = upload({
@@ -41,14 +41,14 @@ const express  = require('express')
 	, changePassword = require(__dirname+'/../models/forms/changepassword.js')
 	, changeBoardSettings = require(__dirname+'/../models/forms/changeboardsettings.js')
 	, registerAccount = require(__dirname+'/../models/forms/register.js')
-	, checkPermsMiddleware = require(__dirname+'/../helpers/haspermsmiddleware.js')
-	, checkPerms = require(__dirname+'/../helpers/hasperms.js')
+	, checkPermsMiddleware = require(__dirname+'/../helpers/checks/haspermsmiddleware.js')
+	, checkPerms = require(__dirname+'/../helpers/checks/hasperms.js')
 	, paramConverter = require(__dirname+'/../helpers/paramconverter.js')
-	, banCheck = require(__dirname+'/../helpers/bancheck.js')
-	, verifyCaptcha = require(__dirname+'/../helpers/captchaverify.js')
+	, banCheck = require(__dirname+'/../helpers/checks/bancheck.js')
+	, verifyCaptcha = require(__dirname+'/../helpers/captcha/captchaverify.js')
 	, actionHandler = require(__dirname+'/../models/forms/actionhandler.js')
-	, csrf = require(__dirname+'/../helpers/csrfmiddleware.js')
-	, actionChecker = require(__dirname+'/../helpers/actionchecker.js');
+	, csrf = require(__dirname+'/../helpers/checks/csrfmiddleware.js')
+	, actionChecker = require(__dirname+'/../helpers/checks/actionchecker.js');
 
 
 // login to account
diff --git a/controllers/pages.js b/controllers/pages.js
index 36c91d29..5b6cbb95 100644
--- a/controllers/pages.js
+++ b/controllers/pages.js
@@ -4,10 +4,10 @@ const express  = require('express')
 	, router = express.Router()
 	, Boards = require(__dirname+'/../db/boards.js')
 	, Posts = require(__dirname+'/../db/posts.js')
-	, hasPerms = require(__dirname+'/../helpers/haspermsmiddleware.js')
-	, isLoggedIn = require(__dirname+'/../helpers/isloggedin.js')
+	, hasPerms = require(__dirname+'/../helpers/checks/haspermsmiddleware.js')
+	, isLoggedIn = require(__dirname+'/../helpers/checks/isloggedin.js')
 	, paramConverter = require(__dirname+'/../helpers/paramconverter.js')
-	, csrf = require(__dirname+'/../helpers/csrfmiddleware.js')
+	, csrf = require(__dirname+'/../helpers/checks/csrfmiddleware.js')
 	//page models
 	, home = require(__dirname+'/../models/pages/home.js')
 	, register = require(__dirname+'/../models/pages/register.js')
diff --git a/build.js b/helpers/build.js
similarity index 95%
rename from build.js
rename to helpers/build.js
index 5c6bf32c..48587a80 100644
--- a/build.js
+++ b/helpers/build.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const Posts = require(__dirname+'/db/posts.js')
-	, Boards = require(__dirname+'/db/boards.js')
-	, uploadDirectory = require(__dirname+'/helpers/uploadDirectory.js')
-	, render = require(__dirname+'/helpers/render.js');
+const Posts = require(__dirname+'/../db/posts.js')
+	, Boards = require(__dirname+'/../db/boards.js')
+	, uploadDirectory = require(__dirname+'/files/uploadDirectory.js')
+	, render = require(__dirname+'/render.js');
 
 function addBacklinks(thread, preview) { //preview means this is not the full thread
 	const postMap = new Map()
diff --git a/helpers/captchagenerate.js b/helpers/captcha/captchagenerate.js
similarity index 100%
rename from helpers/captchagenerate.js
rename to helpers/captcha/captchagenerate.js
diff --git a/helpers/captchaverify.js b/helpers/captcha/captchaverify.js
similarity index 88%
rename from helpers/captchaverify.js
rename to helpers/captcha/captchaverify.js
index ec939409..f567ef08 100644
--- a/helpers/captchaverify.js
+++ b/helpers/captcha/captchaverify.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const Captchas = require(__dirname+'/../db/captchas.js')
-	, Mongo = require(__dirname+'/../db/db.js')
+const Captchas = require(__dirname+'/../../db/captchas.js')
+	, Mongo = require(__dirname+'/../../db/db.js')
 	, remove = require('fs-extra').remove
-	, uploadDirectory = require(__dirname+'/../helpers/uploadDirectory.js');
+	, uploadDirectory = require(__dirname+'/../files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 
diff --git a/helpers/actionchecker.js b/helpers/checks/actionchecker.js
similarity index 100%
rename from helpers/actionchecker.js
rename to helpers/checks/actionchecker.js
diff --git a/helpers/bancheck.js b/helpers/checks/bancheck.js
similarity index 89%
rename from helpers/bancheck.js
rename to helpers/checks/bancheck.js
index 684f4cbf..868d7423 100644
--- a/helpers/bancheck.js
+++ b/helpers/checks/bancheck.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const Bans = require(__dirname+'/../db/bans.js')
+const Bans = require(__dirname+'/../../db/bans.js')
 	, hasPerms = require(__dirname+'/hasperms.js');
 
 module.exports = async (req, res, next) => {
diff --git a/helpers/csrfmiddleware.js b/helpers/checks/csrfmiddleware.js
similarity index 100%
rename from helpers/csrfmiddleware.js
rename to helpers/checks/csrfmiddleware.js
diff --git a/helpers/hasperms.js b/helpers/checks/hasperms.js
similarity index 100%
rename from helpers/hasperms.js
rename to helpers/checks/hasperms.js
diff --git a/helpers/haspermsmiddleware.js b/helpers/checks/haspermsmiddleware.js
similarity index 100%
rename from helpers/haspermsmiddleware.js
rename to helpers/checks/haspermsmiddleware.js
diff --git a/helpers/isloggedin.js b/helpers/checks/isloggedin.js
similarity index 100%
rename from helpers/isloggedin.js
rename to helpers/checks/isloggedin.js
diff --git a/helpers/files/deletefailed.js b/helpers/files/deletefailed.js
index d05c5ed6..988ea524 100644
--- a/helpers/files/deletefailed.js
+++ b/helpers/files/deletefailed.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const remove = require('fs-extra').remove
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { remove } = require('fs-extra')
+	, uploadDirectory = require(__dirname+'/uploadDirectory.js');
 
 module.exports = async (filenames, folder) => {
 
diff --git a/helpers/files/deletepostfiles.js b/helpers/files/deletepostfiles.js
index b339e6b2..7faa1a4e 100644
--- a/helpers/files/deletepostfiles.js
+++ b/helpers/files/deletepostfiles.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const remove = require('fs-extra').remove
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
+const { remove } = require('fs-extra')
+	, uploadDirectory = require(__dirname+'/uploadDirectory.js')
 
 module.exports = (fileNames) => {
 
diff --git a/helpers/files/deletetempfiles.js b/helpers/files/deletetempfiles.js
index 6a383e10..ae0b4857 100644
--- a/helpers/files/deletetempfiles.js
+++ b/helpers/files/deletetempfiles.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const remove = require('fs-extra').remove;
+const { remove } = require('fs-extra')
 
 module.exports = async (req) => {
 
diff --git a/helpers/files/formatsize.js b/helpers/files/formatsize.js
index b34f8819..3fd5c2dd 100644
--- a/helpers/files/formatsize.js
+++ b/helpers/files/formatsize.js
@@ -1,6 +1,7 @@
 'use strict';
-const sizes = ['B', 'KB', 'MB'];
-const k = 1024;
+
+const sizes = ['B', 'KB', 'MB']
+	, k = 1024;
 
 module.exports = (bytes) => {
     if (bytes === 0)  {
diff --git a/helpers/files/imageidentify.js b/helpers/files/imageidentify.js
index f42789b3..828a773c 100644
--- a/helpers/files/imageidentify.js
+++ b/helpers/files/imageidentify.js
@@ -1,6 +1,6 @@
 const gm = require('@tohru/gm')
 	, configs = require(__dirname+'/../../configs/main.json')
-	, uploadDirectory = require(__dirname+'/../uploadDirectory.js');
+	, uploadDirectory = require(__dirname+'/uploadDirectory.js');
 
 module.exports = (filename, folder, temp) => {
 
diff --git a/helpers/files/imagethumbnail.js b/helpers/files/imagethumbnail.js
index 269782a3..64a72cb9 100644
--- a/helpers/files/imagethumbnail.js
+++ b/helpers/files/imagethumbnail.js
@@ -1,6 +1,6 @@
 const gm = require('@tohru/gm')
 	, configs = require(__dirname+'/../../configs/main.json')
-	, uploadDirectory = require(__dirname+'/../uploadDirectory.js');
+	, uploadDirectory = require(__dirname+'/uploadDirectory.js');
 
 module.exports = (filename) => {
 
diff --git a/helpers/files/imageupload.js b/helpers/files/imageupload.js
index 310143f4..6d422023 100644
--- a/helpers/files/imageupload.js
+++ b/helpers/files/imageupload.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const uploadDirectory = require(__dirname+'/../uploadDirectory.js')
+const uploadDirectory = require(__dirname+'/uploadDirectory.js')
 	, gm = require('@tohru/gm');
 
 module.exports = (file, filename, folder) => {
diff --git a/helpers/files/uploadDirectory.js b/helpers/files/uploadDirectory.js
new file mode 100644
index 00000000..f58090ef
--- /dev/null
+++ b/helpers/files/uploadDirectory.js
@@ -0,0 +1,6 @@
+'use strict';
+
+const path = require('path')
+	, directory = path.join(__dirname+'/../../static/')
+
+module.exports = directory;
diff --git a/helpers/files/videoidentify.js b/helpers/files/videoidentify.js
index a4ebbe57..7d4f8453 100644
--- a/helpers/files/videoidentify.js
+++ b/helpers/files/videoidentify.js
@@ -1,6 +1,6 @@
 const ffmpeg = require('fluent-ffmpeg')
 	, configs = require(__dirname+'/../../configs/main.json')
-	, uploadDirectory = require(__dirname+'/../uploadDirectory.js');
+	, uploadDirectory = require(__dirname+'/uploadDirectory.js');
 
 module.exports = (filename, folder, temp) => {
 
diff --git a/helpers/files/videothumbnail.js b/helpers/files/videothumbnail.js
index c05e7fc9..a77797c1 100644
--- a/helpers/files/videothumbnail.js
+++ b/helpers/files/videothumbnail.js
@@ -1,6 +1,6 @@
 const ffmpeg = require('fluent-ffmpeg')
 	, configs = require(__dirname+'/../../configs/main.json')
-	, uploadDirectory = require(__dirname+'/../uploadDirectory.js');
+	, uploadDirectory = require(__dirname+'/uploadDirectory.js');
 
 module.exports = (filename, geometry) => {
 
diff --git a/helpers/files/videoupload.js b/helpers/files/videoupload.js
index a709d272..30ce7831 100644
--- a/helpers/files/videoupload.js
+++ b/helpers/files/videoupload.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const uploadDirectory = require(__dirname+'/../uploadDirectory.js');
+const uploadDirectory = require(__dirname+'/uploadDirectory.js');
 
 module.exports = (file, filename, folder) => {
 
diff --git a/helpers/markdown.js b/helpers/posting/markdown.js
similarity index 96%
rename from helpers/markdown.js
rename to helpers/posting/markdown.js
index 3c3dcdf5..bdbfb625 100644
--- a/helpers/markdown.js
+++ b/helpers/posting/markdown.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const Posts = require(__dirname+'/../db/posts.js')
+const Posts = require(__dirname+'/../../db/posts.js')
 	, greentextRegex = /^>([^>].+)/gm
 	, pinktextRegex = /^<([^<].+)/gm
 	, boldRegex = /""(.+)""/gm
diff --git a/helpers/quotes.js b/helpers/posting/quotes.js
similarity index 96%
rename from helpers/quotes.js
rename to helpers/posting/quotes.js
index fcd1fac9..bef95f2c 100644
--- a/helpers/quotes.js
+++ b/helpers/posting/quotes.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const Posts = require(__dirname+'/../db/posts.js')
-	, Boards = require(__dirname+'/../db/posts.js')
+const Posts = require(__dirname+'/../../db/posts.js')
+	, Boards = require(__dirname+'/../../db/boards.js')
 	, quoteRegex = />>\d+/g
 	, crossQuoteRegex = />>>\/\w+\/\d*$/gm;
 
diff --git a/helpers/tripcode.js b/helpers/posting/tripcode.js
similarity index 79%
rename from helpers/tripcode.js
rename to helpers/posting/tripcode.js
index ab815484..7a0eda2a 100644
--- a/helpers/tripcode.js
+++ b/helpers/posting/tripcode.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { tripcodeSecret } = require(__dirname+'/../configs/main.json')
+const { tripcodeSecret } = require(__dirname+'/../../configs/main.json')
     , { createHash } = require('crypto')
 
 module.exports = async (password) => {
diff --git a/helpers/render.js b/helpers/render.js
index 2795450c..dffaf963 100644
--- a/helpers/render.js
+++ b/helpers/render.js
@@ -4,7 +4,7 @@ const { cacheTemplates, openGraph }= require(__dirname+'/../configs/main.json')
 	, { outputFile } = require('fs-extra')
 	, pug = require('pug')
 	, path = require('path')
-	, uploadDirectory = require(__dirname+'/uploadDirectory.js')
+	, uploadDirectory = require(__dirname+'/files/uploadDirectory.js')
 	, templateDirectory = path.join(__dirname+'/../views/pages/');
 
 module.exports = async (htmlName, templateName, options) => {
diff --git a/helpers/uploadDirectory.js b/helpers/uploadDirectory.js
deleted file mode 100644
index 78c0c921..00000000
--- a/helpers/uploadDirectory.js
+++ /dev/null
@@ -1,6 +0,0 @@
-'use strict';
-
-const path = require('path');
-const directory = path.join(__dirname+'/../static/')
-
-module.exports = directory;
diff --git a/models/forms/actionhandler.js b/models/forms/actionhandler.js
index 6dc3745c..957a2cf3 100644
--- a/models/forms/actionhandler.js
+++ b/models/forms/actionhandler.js
@@ -14,7 +14,7 @@ const Posts = require(__dirname+'/../../db/posts.js')
 	, globalReportPosts = require(__dirname+'/globalreportpost.js')
 	, dismissReports = require(__dirname+'/dismissreport.js')
 	, dismissGlobalReports = require(__dirname+'/dismissglobalreport.js')
-	, { buildCatalog, buildThread, buildBoardMultiple } = require(__dirname+'/../../build.js');
+	, { buildCatalog, buildThread, buildBoardMultiple } = require(__dirname+'/../../helpers/build.js');
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/forms/changeboardsettings.js b/models/forms/changeboardsettings.js
index 9482700c..02d095a2 100644
--- a/models/forms/changeboardsettings.js
+++ b/models/forms/changeboardsettings.js
@@ -2,9 +2,9 @@
 
 const Boards = require(__dirname+'/../../db/boards.js')
 	, Posts = require(__dirname+'/../../db/posts.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
-	, { buildHomepage, buildCatalog, buildBoardMultiple } = require(__dirname+'/../../build.js')
-	, remove = require('fs-extra').remove
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
+	, { buildHomepage, buildCatalog, buildBoardMultiple } = require(__dirname+'/../../helpers/build.js')
+	, { remove } = require('fs-extra')
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/forms/deletebanners.js b/models/forms/deletebanners.js
index 697d954d..e89a3032 100644
--- a/models/forms/deletebanners.js
+++ b/models/forms/deletebanners.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const remove = require('fs-extra').remove
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
+const { remove } = require('fs-extra')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
 	, Boards = require(__dirname+'/../../db/boards.js')
-	, { buildBanners } = require(__dirname+'/../../build.js')
+	, { buildBanners } = require(__dirname+'/../../helpers/build.js')
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/forms/deletepost.js b/models/forms/deletepost.js
index 39c6eb30..2e94794c 100644
--- a/models/forms/deletepost.js
+++ b/models/forms/deletepost.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
-	, remove = require('fs-extra').remove
+const uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
+	, { remove } = require('fs-extra')
 	, Mongo = require(__dirname+'/../../db/db.js')
 	, Posts = require(__dirname+'/../../db/posts.js');
 
diff --git a/models/forms/deletepostsfiles.js b/models/forms/deletepostsfiles.js
index beeb509d..e2338f5a 100644
--- a/models/forms/deletepostsfiles.js
+++ b/models/forms/deletepostsfiles.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const remove = require('fs-extra').remove
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
+const { remove } = require('fs-extra')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
 
 module.exports = async (posts, unlinkOnly) => {
 
diff --git a/models/forms/makepost.js b/models/forms/makepost.js
index f46aafe0..998a8684 100644
--- a/models/forms/makepost.js
+++ b/models/forms/makepost.js
@@ -5,11 +5,11 @@ const path = require('path')
 	, crypto = require('crypto')
 	, randomBytes = util.promisify(crypto.randomBytes)
 	, { remove, pathExists } = require('fs-extra')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
 	, Posts = require(__dirname+'/../../db/posts.js')
-	, getTripCode = require(__dirname+'/../../helpers/tripcode.js')
-	, linkQuotes = require(__dirname+'/../../helpers/quotes.js')
-	, simpleMarkdown = require(__dirname+'/../../helpers/markdown.js')
+	, getTripCode = require(__dirname+'/../../helpers/posting/tripcode.js')
+	, linkQuotes = require(__dirname+'/../../helpers/posting/quotes.js')
+	, simpleMarkdown = require(__dirname+'/../../helpers/posting/markdown.js')
 	, sanitize = require('sanitize-html')
 	, sanitizeOptions = {
 		allowedTags: [ 'span', 'a', 'em', 'strong', 'small' ],
@@ -19,7 +19,7 @@ const path = require('path')
 		}
 	}
 	, nameRegex = /^(?<name>[^\s#]+)?(?:##(?<tripcode>[^ ]{1}[^\s#]+))?(?:## (?<capcode>[^\s#]+))?$/
-	, permsCheck = require(__dirname+'/../../helpers/hasperms.js')
+	, permsCheck = require(__dirname+'/../../helpers/checks/hasperms.js')
 	, imageUpload = require(__dirname+'/../../helpers/files/imageupload.js')
 	, videoUpload = require(__dirname+'/../../helpers/files/videoupload.js')
 	, fileCheckMimeType = require(__dirname+'/../../helpers/files/mimetypes.js')
@@ -29,7 +29,7 @@ const path = require('path')
 	, videoIdentify = require(__dirname+'/../../helpers/files/videoidentify.js')
 	, formatSize = require(__dirname+'/../../helpers/files/formatsize.js')
 	, deleteTempFiles = require(__dirname+'/../../helpers/files/deletetempfiles.js')
-	, { buildCatalog, buildThread, buildBoard, buildBoardMultiple } = require(__dirname+'/../../build.js');
+	, { buildCatalog, buildThread, buildBoard, buildBoardMultiple } = require(__dirname+'/../../helpers/build.js');
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/forms/uploadbanners.js b/models/forms/uploadbanners.js
index 70dd901f..a4b5a579 100644
--- a/models/forms/uploadbanners.js
+++ b/models/forms/uploadbanners.js
@@ -2,13 +2,13 @@
 
 const path = require('path')
 	, { remove, pathExists, ensureDir } = require('fs-extra')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js')
 	, imageUpload = require(__dirname+'/../../helpers/files/imageupload.js')
 	, fileCheckMimeType = require(__dirname+'/../../helpers/files/mimetypes.js')
 	, imageIdentify = require(__dirname+'/../../helpers/files/imageidentify.js')
 	, deleteTempFiles = require(__dirname+'/../../helpers/files/deletetempfiles.js')
 	, Boards = require(__dirname+'/../../db/boards.js')
-	, { buildBanners } = require(__dirname+'/../../build.js')
+	, { buildBanners } = require(__dirname+'/../../helpers/build.js')
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/pages/banners.js b/models/pages/banners.js
index d6ee6f00..9d77e4a2 100644
--- a/models/pages/banners.js
+++ b/models/pages/banners.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildBanners } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildBanners } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/pages/board.js b/models/pages/board.js
index 000a2d45..47a7bb2e 100644
--- a/models/pages/board.js
+++ b/models/pages/board.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const Posts = require(__dirname+'/../../db/posts.js')
-	, { buildBoard } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+	, { buildBoard } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/pages/captcha.js b/models/pages/captcha.js
index f7b3c6b0..1ccb724f 100644
--- a/models/pages/captcha.js
+++ b/models/pages/captcha.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const Captchas = require(__dirname+'/../../db/captchas.js')
-	, generateCaptcha = require(__dirname+'/../../helpers/captchagenerate.js');
+	, generateCaptcha = require(__dirname+'/../../helpers/captcha/captchagenerate.js');
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/pages/captchapage.js b/models/pages/captchapage.js
index 9e3e1052..32631d9d 100644
--- a/models/pages/captchapage.js
+++ b/models/pages/captchapage.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildCaptcha } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildCaptcha } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/pages/catalog.js b/models/pages/catalog.js
index d818bb3d..d2239f83 100644
--- a/models/pages/catalog.js
+++ b/models/pages/catalog.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildCatalog } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildCatalog } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/pages/changepassword.js b/models/pages/changepassword.js
index ac3be547..aa360ceb 100644
--- a/models/pages/changepassword.js
+++ b/models/pages/changepassword.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildChangePassword } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildChangePassword } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/pages/home.js b/models/pages/home.js
index 044cbbb0..33034889 100644
--- a/models/pages/home.js
+++ b/models/pages/home.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildHomepage } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildHomepage } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/pages/login.js b/models/pages/login.js
index bd28f578..66792cff 100644
--- a/models/pages/login.js
+++ b/models/pages/login.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildLogin } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildLogin } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/pages/register.js b/models/pages/register.js
index caa5eece..84716ca3 100644
--- a/models/pages/register.js
+++ b/models/pages/register.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildRegister } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildRegister } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {
 
diff --git a/models/pages/thread.js b/models/pages/thread.js
index 16c20c5f..f59b045d 100644
--- a/models/pages/thread.js
+++ b/models/pages/thread.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const { buildThread } = require(__dirname+'/../../build.js')
-	, uploadDirectory = require(__dirname+'/../../helpers/uploadDirectory.js');
+const { buildThread } = require(__dirname+'/../../helpers/build.js')
+	, uploadDirectory = require(__dirname+'/../../helpers/files/uploadDirectory.js');
 
 module.exports = async (req, res, next) => {