diff --git a/src/command-line/index.js b/src/command-line/index.js
index a167601b..20d7273b 100644
--- a/src/command-line/index.js
+++ b/src/command-line/index.js
@@ -51,11 +51,7 @@ Helper.setHome(home);
 
 require("./start");
 require("./config");
-require("./list");
-require("./add");
-require("./remove");
-require("./reset");
-require("./edit");
+require("./users");
 require("./install");
 
 // TODO: Remove this when releasing The Lounge v3
diff --git a/src/command-line/add.js b/src/command-line/users/add.js
similarity index 91%
rename from src/command-line/add.js
rename to src/command-line/users/add.js
index 31945de9..d50766cb 100644
--- a/src/command-line/add.js
+++ b/src/command-line/users/add.js
@@ -3,8 +3,8 @@
 const colors = require("colors/safe");
 const program = require("commander");
 const fs = require("fs");
-const Helper = require("../helper");
-const Utils = require("./utils");
+const Helper = require("../../helper");
+const Utils = require("../utils");
 
 program
 	.command("add <name>")
@@ -16,7 +16,7 @@ program
 			return;
 		}
 
-		const ClientManager = require("../clientManager");
+		const ClientManager = require("../../clientManager");
 
 		if (Helper.config.public) {
 			log.warn(`Users have no effect in ${colors.bold("public")} mode.`);
diff --git a/src/command-line/edit.js b/src/command-line/users/edit.js
similarity index 88%
rename from src/command-line/edit.js
rename to src/command-line/users/edit.js
index 23e552e7..56df03a4 100644
--- a/src/command-line/edit.js
+++ b/src/command-line/users/edit.js
@@ -4,8 +4,8 @@ const program = require("commander");
 const child = require("child_process");
 const colors = require("colors/safe");
 const fs = require("fs");
-const Helper = require("../helper");
-const Utils = require("./utils");
+const Helper = require("../../helper");
+const Utils = require("../utils");
 
 program
 	.command("edit <name>")
@@ -17,7 +17,7 @@ program
 			return;
 		}
 
-		const ClientManager = require("../clientManager");
+		const ClientManager = require("../../clientManager");
 
 		var users = new ClientManager().getUsers();
 
diff --git a/src/command-line/users/index.js b/src/command-line/users/index.js
new file mode 100644
index 00000000..3a5b4960
--- /dev/null
+++ b/src/command-line/users/index.js
@@ -0,0 +1,7 @@
+"use strict";
+
+require("./list");
+require("./add");
+require("./remove");
+require("./reset");
+require("./edit");
diff --git a/src/command-line/list.js b/src/command-line/users/list.js
similarity index 86%
rename from src/command-line/list.js
rename to src/command-line/users/list.js
index 6123ffd6..bce6cd08 100644
--- a/src/command-line/list.js
+++ b/src/command-line/users/list.js
@@ -3,8 +3,8 @@
 const colors = require("colors/safe");
 const program = require("commander");
 const fs = require("fs");
-const Helper = require("../helper");
-const Utils = require("./utils");
+const Helper = require("../../helper");
+const Utils = require("../utils");
 
 program
 	.command("list")
@@ -16,7 +16,7 @@ program
 			return;
 		}
 
-		const ClientManager = require("../clientManager");
+		const ClientManager = require("../../clientManager");
 
 		if (Helper.config.public) {
 			log.warn(`Users have no effect in ${colors.bold("public")} mode.`);
diff --git a/src/command-line/remove.js b/src/command-line/users/remove.js
similarity index 83%
rename from src/command-line/remove.js
rename to src/command-line/users/remove.js
index d0cdb6f4..ae90cd7f 100644
--- a/src/command-line/remove.js
+++ b/src/command-line/users/remove.js
@@ -3,8 +3,8 @@
 const colors = require("colors/safe");
 const program = require("commander");
 const fs = require("fs");
-const Helper = require("../helper");
-const Utils = require("./utils");
+const Helper = require("../../helper");
+const Utils = require("../utils");
 
 program
 	.command("remove <name>")
@@ -16,7 +16,7 @@ program
 			return;
 		}
 
-		const ClientManager = require("../clientManager");
+		const ClientManager = require("../../clientManager");
 		const manager = new ClientManager();
 
 		try {
diff --git a/src/command-line/reset.js b/src/command-line/users/reset.js
similarity index 88%
rename from src/command-line/reset.js
rename to src/command-line/users/reset.js
index 24f540dc..bcc4038b 100644
--- a/src/command-line/reset.js
+++ b/src/command-line/users/reset.js
@@ -3,8 +3,8 @@
 const colors = require("colors/safe");
 const program = require("commander");
 const fs = require("fs");
-const Helper = require("../helper");
-const Utils = require("./utils");
+const Helper = require("../../helper");
+const Utils = require("../utils");
 
 program
 	.command("reset <name>")
@@ -16,7 +16,7 @@ program
 			return;
 		}
 
-		const ClientManager = require("../clientManager");
+		const ClientManager = require("../../clientManager");
 
 		var users = new ClientManager().getUsers();