diff --git a/src/plugins/config/modules/audits.ts b/src/plugins/config/modules/audits/index.ts
similarity index 100%
rename from src/plugins/config/modules/audits.ts
rename to src/plugins/config/modules/audits/index.ts
diff --git a/src/plugins/config/modules/credits.ts b/src/plugins/config/modules/credits/index.ts
similarity index 100%
rename from src/plugins/config/modules/credits.ts
rename to src/plugins/config/modules/credits/index.ts
diff --git a/src/plugins/config/modules/points.ts b/src/plugins/config/modules/points/index.ts
similarity index 100%
rename from src/plugins/config/modules/points.ts
rename to src/plugins/config/modules/points/index.ts
diff --git a/src/plugins/config/modules/pterodactyl.ts b/src/plugins/config/modules/pterodactyl/index.ts
similarity index 100%
rename from src/plugins/config/modules/pterodactyl.ts
rename to src/plugins/config/modules/pterodactyl/index.ts
diff --git a/src/plugins/config/modules/shop.ts b/src/plugins/config/modules/shop/index.ts
similarity index 100%
rename from src/plugins/config/modules/shop.ts
rename to src/plugins/config/modules/shop/index.ts
diff --git a/src/plugins/config/modules/welcome.ts b/src/plugins/config/modules/welcome/index.ts
similarity index 77%
rename from src/plugins/config/modules/welcome.ts
rename to src/plugins/config/modules/welcome/index.ts
index 48399c7..bdd962b 100644
--- a/src/plugins/config/modules/welcome.ts
+++ b/src/plugins/config/modules/welcome/index.ts
@@ -96,39 +96,39 @@ export default {
     await guildDB?.save()?.then(async () => {
       logger?.silly(`Guild welcome updated.`);
 
+      if (!guildDB?.welcome?.status) {
+        return interaction?.editReply({
+          embeds: [
+            {
+              title: "[:tools:] Welcome",
+              description: `This module is currently disabled, please enable it to continue.`,
+              color: successColor,
+              timestamp: new Date(),
+              footer: {
+                iconURL: footerIcon,
+                text: footerText,
+              },
+            },
+          ],
+        });
+      }
+
       return interaction?.editReply({
         embeds: [
           {
-            title: ":hammer: Settings - Guild [Welcome]",
-            description: `Welcome settings updated.`,
+            title: "[:tools:] Welcome",
+            description: `The following configuration will be used.
+
+            [👋] **Welcome**
+
+            ㅤ**Channel**: <#${guildDB?.welcome?.joinChannel}>
+            ㅤ**Message**: ${guildDB?.welcome?.joinChannelMessage}
+
+            [🚪] **Leave**
+
+            ㅤ**Channel**: <#${guildDB?.welcome?.leaveChannel}>
+            ㅤ**Message**: ${guildDB?.welcome?.leaveChannelMessage}`,
             color: successColor,
-            fields: [
-              {
-                name: "🤖 Status",
-                value: `${guildDB?.welcome?.status}`,
-                inline: true,
-              },
-              {
-                name: "🌊 Join Channel",
-                value: `${guildDB?.welcome?.joinChannel}`,
-                inline: true,
-              },
-              {
-                name: "🌊 Leave Channel",
-                value: `${guildDB?.welcome?.leaveChannel}`,
-                inline: true,
-              },
-              {
-                name: "📄 Join Channel Message",
-                value: `${guildDB?.welcome?.joinChannelMessage}`,
-                inline: true,
-              },
-              {
-                name: "📄 Leave Channel Message",
-                value: `${guildDB?.welcome?.leaveChannelMessage}`,
-                inline: true,
-              },
-            ],
             timestamp: new Date(),
             footer: {
               iconURL: footerIcon,