diff --git a/bot.py b/bot.py
index fa5776c..0fba56e 100644
--- a/bot.py
+++ b/bot.py
@@ -21,8 +21,29 @@ async def load(ctx, extension):
 async def unload(ctx, extension):
     client.unload_extension(f'cogs.{extension}')
 
-for filename in os.listdir('./cogs'):
+# Subfolders
+for filename in os.listdir('./cogs/fun'):
     if filename.endswith('.py'):
-        client.load_extension(f'cogs.{filename[:-3]}')
+        client.load_extension(f'cogs.music.{filename[:-3]}')
+
+for filename in os.listdir('./cogs/general'):
+    if filename.endswith('.py'):
+        client.load_extension(f'cogs.general.{filename[:-3]}')
+
+for filename in os.listdir('./cogs/info'):
+    if filename.endswith('.py'):
+        client.load_extension(f'cogs.music.{filename[:-3]}')
+
+for filename in os.listdir('./cogs/moderation'):
+    if filename.endswith('.py'):
+        client.load_extension(f'cogs.moderation.{filename[:-3]}')
+
+for filename in os.listdir('./cogs/music'):
+    if filename.endswith('.py'):
+        client.load_extension(f'cogs.music.{filename[:-3]}')
+
+for filename in os.listdir('./cogs/owner'):
+    if filename.endswith('.py'):
+        client.load_extension(f'cogs.music.{filename[:-3]}')
 
 client.run(TOKEN)
\ No newline at end of file
diff --git a/cogs/pingCog.py b/cogs/info/pingCog.py
similarity index 100%
rename from cogs/pingCog.py
rename to cogs/info/pingCog.py
diff --git a/cogs/moderationCog.py b/cogs/moderation/kick.py
similarity index 100%
rename from cogs/moderationCog.py
rename to cogs/moderation/kick.py