diff --git a/src/commands/Admin/resetuser.js b/src/commands/Admin/resetuser.js
index 0d99381a..e46b6758 100644
--- a/src/commands/Admin/resetuser.js
+++ b/src/commands/Admin/resetuser.js
@@ -9,7 +9,7 @@ const emojis = require("../../../Controller/emojis/emojis");
 const economyUser = require("../../models/Economy/usereconomy");
 
 // Warnings, we are not resetting them due to saveity (guild admins)
-const warnedUser = require("../../models/user");
+const warnedUser = require("../../models/User/user");
 
 // We are not resetting blacklists as they might be unfair.
 
diff --git a/src/commands/Moderation/addrole.js b/src/commands/Moderation/addrole.js
index fc093ee8..7a147f12 100644
--- a/src/commands/Moderation/addrole.js
+++ b/src/commands/Moderation/addrole.js
@@ -3,7 +3,7 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
 const { CommandInteraction, Permissions, MessageEmbed } = require("discord.js");
 
-const Guild = require("../../models/logs");
+const Guild = require("../../models/Logging/logs");
 
 module.exports.cooldown = {
     length: 10000, /* in ms */
diff --git a/src/commands/Moderation/ban.js b/src/commands/Moderation/ban.js
index b5a7e74c..fd33e754 100644
--- a/src/commands/Moderation/ban.js
+++ b/src/commands/Moderation/ban.js
@@ -3,7 +3,7 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
 const { CommandInteraction, Permissions, MessageEmbed } = require("discord.js");
 
-const Guild = require("../../models/logs");
+const Guild = require("../../models/Logging/logs");
 
 module.exports.cooldown = {
     length: 10000, /* in ms */
diff --git a/src/commands/Moderation/clear.js b/src/commands/Moderation/clear.js
index 854d90fd..ea74994e 100644
--- a/src/commands/Moderation/clear.js
+++ b/src/commands/Moderation/clear.js
@@ -5,7 +5,7 @@ const { CommandInteraction, Permissions, MessageEmbed } = require("discord.js");
 
 const ms = require("ms");
 
-const Guild = require("../../models/logs");
+const Guild = require("../../models/Logging/logs");
 
 module.exports.cooldown = {
     length: 10000, /* in ms */
diff --git a/src/commands/Moderation/kick.js b/src/commands/Moderation/kick.js
index bc057af0..3a602113 100644
--- a/src/commands/Moderation/kick.js
+++ b/src/commands/Moderation/kick.js
@@ -3,7 +3,7 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
 const { CommandInteraction, Permissions, MessageEmbed } = require("discord.js");
 
-const Guild = require("../../models/logs");
+const Guild = require("../../models/Logging/logs");
 
 module.exports.cooldown = {
     length: 10000, /* in ms */
diff --git a/src/commands/Moderation/lock.js b/src/commands/Moderation/lock.js
index f41cc1f6..4f60aa38 100644
--- a/src/commands/Moderation/lock.js
+++ b/src/commands/Moderation/lock.js
@@ -5,7 +5,7 @@ const { CommandInteraction, Permissions, MessageEmbed, Message } = require("disc
 
 const emojis = require("../../../Controller/emojis/emojis");
 
-const Guild = require("../../models/logs");
+const Guild = require("../../models/Logging/logs");
 
 module.exports.cooldown = {
     length: 10000, /* in ms */
diff --git a/src/commands/Moderation/removewarning.js b/src/commands/Moderation/removewarning.js
index 43ad19bd..942133b4 100644
--- a/src/commands/Moderation/removewarning.js
+++ b/src/commands/Moderation/removewarning.js
@@ -7,7 +7,7 @@ const { CommandInteraction, Permissions, MessageEmbed } = require("discord.js");
 const warnModel = require("../../models/Moderation/warning");
 
 // Server logging
-const Guild = require("../../models/logs");
+const Guild = require("../../models/Logging/logs");
 
 module.exports.cooldown = {
   length: 10000 /* in ms */,
diff --git a/src/commands/Moderation/report.js b/src/commands/Moderation/report.js
index 1227837d..318ce7e1 100644
--- a/src/commands/Moderation/report.js
+++ b/src/commands/Moderation/report.js
@@ -3,7 +3,7 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
 const { CommandInteraction, Permissions, MessageEmbed, Message } = require("discord.js");
 
-const Guild = require("../../models/report");
+const Guild = require("../../models/Report/report");
 
 const emojis = require("../../../Controller/emojis/emojis");
 
diff --git a/src/commands/Moderation/timeout.js b/src/commands/Moderation/timeout.js
index 132979f9..dd5451fd 100644
--- a/src/commands/Moderation/timeout.js
+++ b/src/commands/Moderation/timeout.js
@@ -7,7 +7,7 @@ const ms = require("moment");
 
 const emojis = require("../../../Controller/emojis/emojis");
 
-const Guild = require("../../models/logs");
+const Guild = require("../../models/Logging/logs");
 
 module.exports.cooldown = {
     length: 10000, /* in ms */
diff --git a/src/commands/Moderation/warn.js b/src/commands/Moderation/warn.js
index cd90a7b5..bf59173d 100644
--- a/src/commands/Moderation/warn.js
+++ b/src/commands/Moderation/warn.js
@@ -14,7 +14,7 @@ const {
 const warnModel = require("../../models/Moderation/warning");
 
 // Logging
-const Guild = require("../../models/logs");
+const Guild = require("../../models/Logging/logs");
 
 module.exports.cooldown = {
   length: 10000 /* in ms */,
diff --git a/src/commands/Setup/Logging/managelogging.js b/src/commands/Setup/Logging/managelogging.js
index 54eecaa9..7b6131cf 100644
--- a/src/commands/Setup/Logging/managelogging.js
+++ b/src/commands/Setup/Logging/managelogging.js
@@ -4,7 +4,7 @@ const { SlashCommandBuilder } = require("@discordjs/builders");
 const { CommandInteraction, MessageEmbed } = require("discord.js");
 
 // Database queries
-const Guild = require("../../../models/logs");
+const Guild = require("../../../models/Logging/logs");
 
 // Configs
 const emojis = require("../../../../Controller/emojis/emojis");
diff --git a/src/commands/Setup/Report/managereports.js b/src/commands/Setup/Report/managereports.js
index 593974a8..5fab0a6f 100644
--- a/src/commands/Setup/Report/managereports.js
+++ b/src/commands/Setup/Report/managereports.js
@@ -4,7 +4,7 @@ const { SlashCommandBuilder } = require("@discordjs/builders");
 const { CommandInteraction, MessageEmbed } = require("discord.js");
 
 // Database queries
-const Guild = require("../../../models/report");
+const Guild = require("../../../models/Report/report");
 
 // Configs
 const emojis = require("../../../../Controller/emojis/emojis");
diff --git a/src/commands/Setup/Tracker/managebots.js b/src/commands/Setup/Tracker/managebots.js
index 0388fcc8..b61ffa20 100644
--- a/src/commands/Setup/Tracker/managebots.js
+++ b/src/commands/Setup/Tracker/managebots.js
@@ -4,8 +4,8 @@ const { SlashCommandBuilder } = require("@discordjs/builders");
 const { CommandInteraction, MessageEmbed } = require("discord.js");
 
 // Database queries
-const Guild = require("../../../models/guilds.js");
-const Bot = require("../../../models/bots.js");
+const Guild = require("../../../models/Tracker/guilds.js");
+const Bot = require("../../../models/Tracker/bots.js");
 
 // Settings
 const emojis = require("../../../../Controller/emojis/emojis");
diff --git a/src/commands/Setup/Tracker/managetracker.js b/src/commands/Setup/Tracker/managetracker.js
index 7dab01e6..1320a699 100644
--- a/src/commands/Setup/Tracker/managetracker.js
+++ b/src/commands/Setup/Tracker/managetracker.js
@@ -3,9 +3,11 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
 const { CommandInteraction, MessageEmbed } = require("discord.js");
 
-const emojis = require("../../../../Controller/emojis/emojis");
+// Database queries
+const Guild = require("../../../models/Tracker/guilds");
 
-const Guild = require("../../../models/guilds");
+// Configs
+const emojis = require("../../../../Controller/emojis/emojis");
 
 module.exports.cooldown = {
   length: 10000,
diff --git a/src/commands/Setup/Verification/manageverification.js b/src/commands/Setup/Verification/manageverification.js
index ed798fb9..28e531d1 100644
--- a/src/commands/Setup/Verification/manageverification.js
+++ b/src/commands/Setup/Verification/manageverification.js
@@ -4,7 +4,7 @@ const { SlashCommandBuilder } = require("@discordjs/builders");
 const { CommandInteraction, MessageEmbed } = require("discord.js");
 
 // Database queries
-const GuildVerification = require("../../../models/verification");
+const GuildVerification = require("../../../models/Verification/verification");
 
 // Configs
 const emojis = require("../../../../Controller/emojis/emojis");
diff --git a/src/commands/Setup/Welcome/manageleave.js b/src/commands/Setup/Welcome/manageleave.js
index 0d940a51..546e546b 100644
--- a/src/commands/Setup/Welcome/manageleave.js
+++ b/src/commands/Setup/Welcome/manageleave.js
@@ -4,7 +4,7 @@ const { SlashCommandBuilder } = require("@discordjs/builders");
 const { CommandInteraction, MessageEmbed } = require("discord.js");
 
 // Database queries
-const Guild = require("../../../models/leave");
+const Guild = require("../../../models/Welcome/leave");
 
 // Configs
 const emojis = require("../../../../Controller/emojis/emojis");
diff --git a/src/commands/Setup/Welcome/managewelcome.js b/src/commands/Setup/Welcome/managewelcome.js
index cbc784e3..93b124db 100644
--- a/src/commands/Setup/Welcome/managewelcome.js
+++ b/src/commands/Setup/Welcome/managewelcome.js
@@ -4,7 +4,7 @@ const { SlashCommandBuilder } = require("@discordjs/builders");
 const { CommandInteraction, MessageEmbed } = require("discord.js");
 
 // Database queries
-const Guild = require("../../../models/welcome");
+const Guild = require("../../../models/Welcome/welcome");
 
 // Configs
 const emojis = require("../../../../Controller/emojis/emojis");
diff --git a/src/commands/Utility/status.js b/src/commands/Utility/status.js
index 9872dabf..20e93a13 100644
--- a/src/commands/Utility/status.js
+++ b/src/commands/Utility/status.js
@@ -35,7 +35,7 @@ module.exports.run = async (interaction, utils, client) => {
 
     // Database queries
     const Guild = require("../../models/welcome");
-    const GuildLogs = require("../../models/logs");
+    const GuildLogs = require("../../models/Logging/logs");
     const GuildTracker = require("../../models/guilds");
     const GuildSuggestion = require("../../models/suggestions");
 
diff --git a/src/commands/Utility/verify.js b/src/commands/Utility/verify.js
index c21d5c91..b10939f8 100644
--- a/src/commands/Utility/verify.js
+++ b/src/commands/Utility/verify.js
@@ -3,10 +3,12 @@
 const { SlashCommandBuilder } = require("@discordjs/builders");
 const { CommandInteraction, Permissions, MessageEmbed } = require("discord.js");
 
-const emojis = require("../../../Controller/emojis/emojis");
+// Database queries
+const GuildVerification = require("../../models/Verification/verification");
+const guildLogging = require("../../models/Logging/logs");
 
-const GuildVerification = require("../../models/verification");
-const guildLogging = require("../../models/logs");
+// Configs
+const emojis = require("../../../Controller/emojis/emojis");
 
 module.exports.cooldown = {
     length: 90000, /* in ms */
diff --git a/src/events/guildMemberAdd.js b/src/events/Logging/guildMemberAdd.js
similarity index 90%
rename from src/events/guildMemberAdd.js
rename to src/events/Logging/guildMemberAdd.js
index a114cb28..838cd71b 100644
--- a/src/events/guildMemberAdd.js
+++ b/src/events/Logging/guildMemberAdd.js
@@ -4,12 +4,12 @@ const { GuildMember, MessageEmbed, WebhookClient } = require("discord.js");
 const moment = require("moment");
 
 // Database queries
-const Guild = require("../models/welcome.js");
-const GuildLogs = require("../models/logs");
+const Guild = require("../../models/Welcome/welcome.js");
+const GuildLogs = require("../../models/Logging/logs");
 
 // Configs
-const emojis = require("../../Controller/emojis/emojis");
-const client = require("../util/bot.js");
+const emojis = require("../../../Controller/emojis/emojis");
+const client = require("../../util/bot.js");
 
 module.exports.data = {
   name: "guildMemberAdd",
diff --git a/src/events/guildMemberRemove.js b/src/events/Logging/guildMemberRemove.js
similarity index 92%
rename from src/events/guildMemberRemove.js
rename to src/events/Logging/guildMemberRemove.js
index 500f073e..047f203d 100644
--- a/src/events/guildMemberRemove.js
+++ b/src/events/Logging/guildMemberRemove.js
@@ -3,10 +3,10 @@
 const { GuildMember, MessageEmbed, Role } = require("discord.js");
 
 // Database queries
-const Guild = require("../models/leave");
+const Guild = require("../../models/Welcome/leave");
 
 // Configs
-const client = require("../util/bot.js");
+const client = require("../../util/bot");
 
 module.exports.data = {
   name: "guildMemberRemove",
diff --git a/src/events/messageDelete.js b/src/events/Logging/messageDelete.js
similarity index 92%
rename from src/events/messageDelete.js
rename to src/events/Logging/messageDelete.js
index 5d6fb57d..69b8e3d6 100644
--- a/src/events/messageDelete.js
+++ b/src/events/Logging/messageDelete.js
@@ -4,10 +4,10 @@ const { channelMention } = require("@discordjs/builders");
 const { GuildMember, MessageEmbed, WebhookClient } = require("discord.js");
 
 // Database queries
-const Guild = require("../models/logs");
+const Guild = require("../../models/Logging/logs");
 
 // Configs
-const emojis = require("../../Controller/emojis/emojis");
+const emojis = require("../../../Controller/emojis/emojis");
 
 module.exports.data = {
   name: "messageDelete",
diff --git a/src/events/messageUpdate.js b/src/events/Logging/messageUpdate.js
similarity index 94%
rename from src/events/messageUpdate.js
rename to src/events/Logging/messageUpdate.js
index 118f23ed..cec9f9f2 100644
--- a/src/events/messageUpdate.js
+++ b/src/events/Logging/messageUpdate.js
@@ -3,10 +3,10 @@
 const { GuildMember, MessageEmbed, WebhookClient } = require("discord.js");
 
 // Database queries
-const Guild = require("../models/logs");
+const Guild = require("../../models/Logging/logs");
 
 // Configs
-const emojis = require("../../Controller/emojis/emojis");
+const emojis = require("../../../Controller/emojis/emojis");
 
 module.exports.data = {
   name: "messageUpdate",
diff --git a/src/events/interactionCreate.js b/src/events/interactionCreate.js
index 36547b63..c0dddb9d 100644
--- a/src/events/interactionCreate.js
+++ b/src/events/interactionCreate.js
@@ -50,11 +50,11 @@ const { getKeyByValue, msToMinAndSec } = require('../util/util.js')
 const { red } = require('colors/safe')
 
 // Database queries
-const User = require('../models/Admin/userblacklist')
+const User = require('../models/Admin/userblacklist');
 
 // Configs
-const config = require('../../Controller/owners.json')
-const emojis = require('../../Controller/emojis/emojis')
+const config = require('../../Controller/owners.json');
+const emojis = require('../../Controller/emojis/emojis');
 
 module.exports.data = {
 	name: 'interactionCreate',
diff --git a/src/events/messageCreate.js b/src/events/messageCreate.js
index 0cd9fa2f..87461666 100644
--- a/src/events/messageCreate.js
+++ b/src/events/messageCreate.js
@@ -5,7 +5,7 @@ const ms = require("moment");
 
 // Database queries
 const Guild = require("../models/Antiscam/antiscam");
-const Logs = require("../models/logs");
+const Logs = require("../models/Logging/logs");
 
 // Configs
 const emojis = require("../../Controller/emojis/emojis");
diff --git a/src/events/presenceUpdate.js b/src/events/presenceUpdate.js
index 824b5457..4431a1ae 100644
--- a/src/events/presenceUpdate.js
+++ b/src/events/presenceUpdate.js
@@ -4,7 +4,7 @@ const { PresenceUpdateStatus } = require("discord-api-types/v9");
 const { Presence } = require("discord.js");
 
 // Database queries
-const Guild = require("../models/guilds.js");
+const Guild = require("../models/Tracker/guilds.js");
 
 // Configs
 const emojis = require("../../Controller/emojis/emojis");
diff --git a/src/models/logs.js b/src/models/Logging/logs.js
similarity index 100%
rename from src/models/logs.js
rename to src/models/Logging/logs.js
diff --git a/src/models/report.js b/src/models/Report/report.js
similarity index 100%
rename from src/models/report.js
rename to src/models/Report/report.js
diff --git a/src/models/bots.js b/src/models/Tracker/bots.js
similarity index 100%
rename from src/models/bots.js
rename to src/models/Tracker/bots.js
diff --git a/src/models/guilds.js b/src/models/Tracker/guilds.js
similarity index 100%
rename from src/models/guilds.js
rename to src/models/Tracker/guilds.js
diff --git a/src/models/user.js b/src/models/User/user.js
similarity index 100%
rename from src/models/user.js
rename to src/models/User/user.js
diff --git a/src/models/verification.js b/src/models/Verification/verification.js
similarity index 100%
rename from src/models/verification.js
rename to src/models/Verification/verification.js
diff --git a/src/models/leave.js b/src/models/Welcome/leave.js
similarity index 100%
rename from src/models/leave.js
rename to src/models/Welcome/leave.js
diff --git a/src/models/welcome.js b/src/models/Welcome/welcome.js
similarity index 100%
rename from src/models/welcome.js
rename to src/models/Welcome/welcome.js