diff --git a/commands/admin/ctx_add_self_roles.js b/commands/admin/self_roles/context/add.js
similarity index 97%
rename from commands/admin/ctx_add_self_roles.js
rename to commands/admin/self_roles/context/add.js
index bce7e65..f45babc 100644
--- a/commands/admin/ctx_add_self_roles.js
+++ b/commands/admin/self_roles/context/add.js
@@ -5,7 +5,7 @@ import {
 	ApplicationCommandType,
 	ContextMenuCommandBuilder
 } from 'discord.js';
-import { addSelfRoles } from '../../shared.js';
+import { addSelfRoles } from '../../../../shared.js';
 
 export const data = new ContextMenuCommandBuilder()
 	.setDMPermission(false)
diff --git a/commands/admin/ctx_register_self_roles.js b/commands/admin/self_roles/context/register.js
similarity index 94%
rename from commands/admin/ctx_register_self_roles.js
rename to commands/admin/self_roles/context/register.js
index 485216b..ece08c0 100644
--- a/commands/admin/ctx_register_self_roles.js
+++ b/commands/admin/self_roles/context/register.js
@@ -1,4 +1,4 @@
-import { Message } from '../../database.js';
+import { Message } from '../../../../database.js';
 import { ApplicationCommandType, ContextMenuCommandBuilder } from 'discord.js';
 
 export const data = new ContextMenuCommandBuilder()
diff --git a/commands/admin/slash_self_roles.js b/commands/admin/self_roles/slash.js
similarity index 97%
rename from commands/admin/slash_self_roles.js
rename to commands/admin/self_roles/slash.js
index 1abf70d..375b254 100644
--- a/commands/admin/slash_self_roles.js
+++ b/commands/admin/self_roles/slash.js
@@ -1,6 +1,6 @@
+import { addSelfRoles } from '../../../shared.js';
 import { SlashCommandBuilder } from 'discord.js';
-import { Message } from './../../database.js';
-import { addSelfRoles } from '../../shared.js';
+import { Message } from '../../../database.js';
 
 const createSelfRoles = async (interaction) => {
 	const { options, channel } = interaction;
diff --git a/events/voiceStateUpdate.js b/events/channels/voiceStateUpdate.js
similarity index 100%
rename from events/voiceStateUpdate.js
rename to events/channels/voiceStateUpdate.js
diff --git a/events/reactionAdd.js b/events/reactions/reactionAdd.js
similarity index 95%
rename from events/reactionAdd.js
rename to events/reactions/reactionAdd.js
index 8e6d4e5..f907e7f 100644
--- a/events/reactionAdd.js
+++ b/events/reactions/reactionAdd.js
@@ -1,6 +1,6 @@
 import { config } from 'dotenv';
 import { Events } from 'discord.js';
-import { Message, RoleEmojiPair } from '../database.js';
+import { Message, RoleEmojiPair } from '../../database.js';
 config();
 
 export const name = Events.MessageReactionAdd;
diff --git a/events/reactionRemove.js b/events/reactions/reactionRemove.js
similarity index 95%
rename from events/reactionRemove.js
rename to events/reactions/reactionRemove.js
index bd3d56e..2c0f2e3 100644
--- a/events/reactionRemove.js
+++ b/events/reactions/reactionRemove.js
@@ -1,6 +1,6 @@
 import { config } from 'dotenv';
 import { Events } from 'discord.js';
-import { Message, RoleEmojiPair } from '../database.js';
+import { Message, RoleEmojiPair } from '../../database.js';
 config();
 
 export const name = Events.MessageReactionRemove;