diff --git a/Gruntfile.js b/Gruntfile.js
index f3b15bc4b8..7c866dbe91 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -91,8 +91,8 @@ module.exports = function (grunt) {
 			},
 			clientUpdated: {
 				files: [
-					// 'public/src/modules/**/*.js',
-					// 'public/vendor/**/*.js',
+					'public/src/**/*.js',
+					'public/vendor/**/*.js',
 					...clientUpdated,
 					'node_modules/benchpressjs/build/benchpress.js',
 				],
diff --git a/public/src/app.js b/public/src/app.js
index 7bbf2dac9b..23069aeb40 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -14,9 +14,9 @@ const Benchpress = require('benchpressjs');
 
 Benchpress.setGlobal('config', config);
 if (app.inAdmin) {
- 	require('../../build/public/scripts-admin.min');
+ 	require('../scripts-admin.min');
 } else {
-	require('../../build/public/scripts-client.min');
+	require('../scripts-client.min');
 }
 
 require('./sockets');
@@ -55,16 +55,12 @@ app.flags = {};
 	app.importScript = async function (scriptName) {
 		let pageScript;
 		try {
-			if (scriptName.startsWith('admin/plugins')) {
-				pageScript = await import(/* webpackChunkName: "admin/plugins/[request]" */ 'admin/plugins/' + scriptName.replace(/^admin\/plugins\//, ''));
-			} else if (scriptName.startsWith('admin')) {
+			if (scriptName.startsWith('admin')) {
 				pageScript = await import(/* webpackChunkName: "admin/[request]" */ 'admin/' + scriptName.replace(/^admin\//, ''));
-			} else if (scriptName.startsWith('forum/plugins')) {
-				pageScript = await import(/* webpackChunkName: "forum/plugins/[request]" */ 'forum/plugins/' + scriptName.replace(/^forum\/plugins\//, ''));
 			} else if (scriptName.startsWith('forum')) {
 				pageScript = await import(/* webpackChunkName: "forum/[request]" */ 'forum/' + scriptName.replace(/^forum\//, ''));
 			} else {
-				pageScript = await import(/* webpackChunkName: "modules/[request]" */ '../../build/public/src/modules/' + scriptName);
+				pageScript = await import(/* webpackChunkName: "modules/[request]" */ 'modules/' + scriptName);
 			}
 		} catch (err) {
 			console.warn('error loading script' + err.stack);
diff --git a/src/meta/js.js b/src/meta/js.js
index 548b0d7f50..bf60b52575 100644
--- a/src/meta/js.js
+++ b/src/meta/js.js
@@ -42,8 +42,8 @@ async function linkModules() {
 	const { modules } = JS.scripts;
 
 	await Promise.all([
-		mkdirp(path.join(__dirname, '../../build/public/src/modules/admin/plugins')),
-		mkdirp(path.join(__dirname, '../../build/public/src/modules/forum/plugins')),
+		mkdirp(path.join(__dirname, '../../build/public/src/admin/plugins')),
+		mkdirp(path.join(__dirname, '../../build/public/src/client/plugins')),
 	]);
 
 	await Promise.all(Object.keys(modules).map(async (relPath) => {
@@ -77,8 +77,8 @@ JS.buildModules = async function () {
 
 	const fse = require('fs-extra');
 	await fse.copy(
-		path.join(__dirname, `../../public/src/modules`),
-		path.join(__dirname, `../../build/public/src/modules`)
+		path.join(__dirname, `../../public/src`),
+		path.join(__dirname, `../../build/public/src`)
 	);
 
 	await linkModules();
diff --git a/webpack.common.js b/webpack.common.js
index 70d471f0a1..c893f74564 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -23,8 +23,8 @@ module.exports = {
 		new CleanWebpackPlugin(), // cleans dist folder
 	],
 	entry: {
-		nodebb: './public/src/app.js',
-		admin: './public/src/admin/admin.js',
+		nodebb: './build/public/src/app.js',
+		admin: './build/public/src/admin/admin.js',
 	},
 	output: {
 		filename: '[name].min.js',
@@ -39,16 +39,14 @@ module.exports = {
 		symlinks: false,
 		modules: [
 			'build/public/src/modules',
-			'public/src',
+			'build/public/src',
 			'node_modules',
 			...activePlugins.map(p => `node_modules/${p}/node_modules`),
 		],
 		alias: {
 			assets: path.resolve(__dirname, 'build/public'),
-			'forum/plugins': path.resolve(__dirname, 'build/public/src/modules/forum/plugins'),
-			forum: path.resolve(__dirname, 'public/src/client'),
-			'admin/plugins': path.resolve(__dirname, 'build/public/src/modules/admin/plugins'),
-			admin: path.resolve(__dirname, 'public/src/admin'),
+			forum: path.resolve(__dirname, 'build/public/src/client'),
+			admin: path.resolve(__dirname, 'build/public/src/admin'),
 			vendor: path.resolve(__dirname, 'public/vendor'),
 			benchpress: path.resolve(__dirname, 'node_modules/benchpressjs'),
 			Chart: path.resolve(__dirname, 'node_modules/chart.js'),