Flatten

32 files changed, 4 insertions, 7 deletions

diff --git a/server/.gitignore b/.gitignore
index 46de862..4bf93f7 100644
--- a/server/.gitignore
+++ b/.gitignore
@@ -60,4 +60,4 @@ typings/
 # next.js build output
 .next
 
-config/
\ No newline at end of file
+server/config/
\ No newline at end of file
diff --git a/README.md b/README.md
index 4a68ce6..24ab0cc 100644
--- a/README.md
+++ b/README.md
@@ -15,18 +15,16 @@ This is a backwards compatible continuation of the [work by Andrew Belt](https:/
 ## Installing
 
 1. [Clone](https://help.github.com/articles/cloning-a-repository/) the repository: `git clone https://github.com/hack-chat/main.git`
-1. Change the directory: `cd main/server`
 1. Install the dependencies using a package manager of your choice:
     - npm: `npm install`
     - yarn: `yarn install`
-1. Configure: `node main.js`
+1. Configure: `node main/server/main.js`
 
-    If you change the `websocketPort` option during the config setup then these changes will need to be reflected on [client.js](https://github.com/hack-chat/main/blob/master/client/client.js#L59).
+    If you change the `websocketPort` option during the config setup then these changes will need to be reflected on [line 59 of client.js](https://github.com/hack-chat/main/blob/master/client/client.js#L59).
 
 # Usage
 
-1. Change the directory: `cd main/server/`
-1. Start the server with a process manager. For example, with [PM2](https://github.com/Unitech/pm2): `pm2 start main.js --name HackChat` 
+1. Start the server with a process manager. For example, with [PM2](https://github.com/Unitech/pm2): `pm2 start main/server/main.js --name HackChat` 
 1. Launch: `main/client/index.html`
 1. (OPTIONAL) If you want to deploy your hack.chat instance to a server, push everything except the `node_modules` directory and install the dependencies using a package manager of your choice: 
     - npm: `npm install`
diff --git a/client/README.md b/client/README.md
deleted file mode 100644
index 292daab..0000000
--- a/client/README.md
+++ /dev/null
@@ -1 +0,0 @@
-(TODO)
diff --git a/server/package-lock.json b/package-lock.json
index c17f028..c17f028 100644
--- a/server/package-lock.json
+++ b/package-lock.json
diff --git a/server/package.json b/package.json
index 8417c13..8417c13 100644
--- a/server/package.json
+++ b/package.json
diff --git a/server/src/commands/admin/addmod.js b/server/commands/admin/addmod.js
index 4c13b22..4c13b22 100644
--- a/server/src/commands/admin/addmod.js
+++ b/server/commands/admin/addmod.js
diff --git a/server/src/commands/admin/listusers.js b/server/commands/admin/listusers.js
index a539a3c..a539a3c 100644
--- a/server/src/commands/admin/listusers.js
+++ b/server/commands/admin/listusers.js
diff --git a/server/src/commands/admin/reload.js b/server/commands/admin/reload.js
index e2cfbe6..e2cfbe6 100644
--- a/server/src/commands/admin/reload.js
+++ b/server/commands/admin/reload.js
diff --git a/server/src/commands/admin/saveconfig.js b/server/commands/admin/saveconfig.js
index ed3a312..ed3a312 100644
--- a/server/src/commands/admin/saveconfig.js
+++ b/server/commands/admin/saveconfig.js
diff --git a/server/src/commands/admin/shout.js b/server/commands/admin/shout.js
index 1358dd9..1358dd9 100644
--- a/server/src/commands/admin/shout.js
+++ b/server/commands/admin/shout.js
diff --git a/server/src/commands/core/changenick.js b/server/commands/core/changenick.js
index 4041bb0..4041bb0 100644
--- a/server/src/commands/core/changenick.js
+++ b/server/commands/core/changenick.js
diff --git a/server/src/commands/core/chat.js b/server/commands/core/chat.js
index bce6adb..bce6adb 100644
--- a/server/src/commands/core/chat.js
+++ b/server/commands/core/chat.js
diff --git a/server/src/commands/core/disconnect.js b/server/commands/core/disconnect.js
index 9b54214..9b54214 100644
--- a/server/src/commands/core/disconnect.js
+++ b/server/commands/core/disconnect.js
diff --git a/server/src/commands/core/help.js b/server/commands/core/help.js
index 7f63d3d..7f63d3d 100644
--- a/server/src/commands/core/help.js
+++ b/server/commands/core/help.js
diff --git a/server/src/commands/core/invite.js b/server/commands/core/invite.js
index bcf9097..bcf9097 100644
--- a/server/src/commands/core/invite.js
+++ b/server/commands/core/invite.js
diff --git a/server/src/commands/core/join.js b/server/commands/core/join.js
index f2b2c9d..f2b2c9d 100644
--- a/server/src/commands/core/join.js
+++ b/server/commands/core/join.js
diff --git a/server/src/commands/core/morestats.js b/server/commands/core/morestats.js
index 5510cb1..5510cb1 100644
--- a/server/src/commands/core/morestats.js
+++ b/server/commands/core/morestats.js
diff --git a/server/src/commands/core/move.js b/server/commands/core/move.js
index c5efafd..c5efafd 100644
--- a/server/src/commands/core/move.js
+++ b/server/commands/core/move.js
diff --git a/server/src/commands/core/stats.js b/server/commands/core/stats.js
index b9dc002..b9dc002 100644
--- a/server/src/commands/core/stats.js
+++ b/server/commands/core/stats.js
diff --git a/server/src/commands/mod/ban.js b/server/commands/mod/ban.js
index e19efc2..e19efc2 100644
--- a/server/src/commands/mod/ban.js
+++ b/server/commands/mod/ban.js
diff --git a/server/src/commands/mod/kick.js b/server/commands/mod/kick.js
index 157592d..157592d 100644
--- a/server/src/commands/mod/kick.js
+++ b/server/commands/mod/kick.js
diff --git a/server/src/commands/mod/unban.js b/server/commands/mod/unban.js
index e82f0b9..e82f0b9 100644
--- a/server/src/commands/mod/unban.js
+++ b/server/commands/mod/unban.js
diff --git a/server/src/core/rateLimiter.js b/server/core/rateLimiter.js
index 0c2a384..0c2a384 100644
--- a/server/src/core/rateLimiter.js
+++ b/server/core/rateLimiter.js
diff --git a/server/src/core/server.js b/server/core/server.js
index 855aeba..855aeba 100644
--- a/server/src/core/server.js
+++ b/server/core/server.js
diff --git a/server/src/managers/commands.js b/server/managers/commands.js
index c38fb4d..c38fb4d 100644
--- a/server/src/managers/commands.js
+++ b/server/managers/commands.js
diff --git a/server/src/managers/config.js b/server/managers/config.js
index 2865d00..2865d00 100644
--- a/server/src/managers/config.js
+++ b/server/managers/config.js
diff --git a/server/src/managers/imports-manager.js b/server/managers/imports-manager.js
index d8b2144..d8b2144 100644
--- a/server/src/managers/imports-manager.js
+++ b/server/managers/imports-manager.js
diff --git a/server/src/managers/index.js b/server/managers/index.js
index 2fac8fb..2fac8fb 100644
--- a/server/src/managers/index.js
+++ b/server/managers/index.js
diff --git a/server/src/managers/stats.js b/server/managers/stats.js
index 20f1ae3..20f1ae3 100644
--- a/server/src/managers/stats.js
+++ b/server/managers/stats.js
diff --git a/server/src/scripts/configure.js b/server/scripts/configure.js
index 0ecd858..0ecd858 100644
--- a/server/src/scripts/configure.js
+++ b/server/scripts/configure.js
diff --git a/server/src/scripts/debug.js b/server/scripts/debug.js
index 3a97d9f..3a97d9f 100644
--- a/server/src/scripts/debug.js
+++ b/server/scripts/debug.js
diff --git a/server/src/scripts/dev.js b/server/scripts/dev.js
index 5049b84..5049b84 100644
--- a/server/src/scripts/dev.js
+++ b/server/scripts/dev.js