diff --git a/src/client/actions/ActionsManager.js b/src/client/actions/ActionsManager.js
index 1986f5a77..ac95aa7fb 100644
--- a/src/client/actions/ActionsManager.js
+++ b/src/client/actions/ActionsManager.js
@@ -2,37 +2,36 @@ class ActionsManager {
   constructor(client) {
     this.client = client;
 
-    this.register('MessageCreate');
-    this.register('MessageDelete');
-    this.register('MessageDeleteBulk');
-    this.register('MessageUpdate');
-    this.register('MessageReactionAdd');
-    this.register('MessageReactionRemove');
-    this.register('MessageReactionRemoveAll');
-    this.register('ChannelCreate');
-    this.register('ChannelDelete');
-    this.register('ChannelUpdate');
-    this.register('GuildDelete');
-    this.register('GuildUpdate');
-    this.register('GuildMemberGet');
-    this.register('GuildMemberRemove');
-    this.register('GuildBanRemove');
-    this.register('GuildRoleCreate');
-    this.register('GuildRoleDelete');
-    this.register('GuildRoleUpdate');
-    this.register('UserGet');
-    this.register('UserUpdate');
-    this.register('UserNoteUpdate');
-    this.register('GuildSync');
-    this.register('GuildEmojiCreate');
-    this.register('GuildEmojiDelete');
-    this.register('GuildEmojiUpdate');
-    this.register('GuildRolesPositionUpdate');
+    this.register(require('./MessageCreate'));
+    this.register(require('./MessageDelete'));
+    this.register(require('./MessageDeleteBulk'));
+    this.register(require('./MessageUpdate'));
+    this.register(require('./MessageReactionAdd'));
+    this.register(require('./MessageReactionRemove'));
+    this.register(require('./MessageReactionRemoveAll'));
+    this.register(require('./ChannelCreate'));
+    this.register(require('./ChannelDelete'));
+    this.register(require('./ChannelUpdate'));
+    this.register(require('./GuildDelete'));
+    this.register(require('./GuildUpdate'));
+    this.register(require('./GuildMemberGet'));
+    this.register(require('./GuildMemberRemove'));
+    this.register(require('./GuildBanRemove'));
+    this.register(require('./GuildRoleCreate'));
+    this.register(require('./GuildRoleDelete'));
+    this.register(require('./GuildRoleUpdate'));
+    this.register(require('./UserGet'));
+    this.register(require('./UserUpdate'));
+    this.register(require('./UserNoteUpdate'));
+    this.register(require('./GuildSync'));
+    this.register(require('./GuildEmojiCreate'));
+    this.register(require('./GuildEmojiDelete'));
+    this.register(require('./GuildEmojiUpdate'));
+    this.register(require('./GuildRolesPositionUpdate'));
   }
 
-  register(name) {
-    const Action = require(`./${name}`);
-    this[name] = new Action(this.client);
+  register(Action) {
+    this[Action.name.replace(/Action$/, '')] = new Action(this.client);
   }
 }
 
diff --git a/src/client/websocket/packets/WebSocketPacketManager.js b/src/client/websocket/packets/WebSocketPacketManager.js
index e2bdcf3f8..9b3f04d31 100644
--- a/src/client/websocket/packets/WebSocketPacketManager.js
+++ b/src/client/websocket/packets/WebSocketPacketManager.js
@@ -15,47 +15,46 @@ class WebSocketPacketManager {
     this.handlers = {};
     this.queue = [];
 
-    this.register(Constants.WSEvents.READY, 'Ready');
-    this.register(Constants.WSEvents.GUILD_CREATE, 'GuildCreate');
-    this.register(Constants.WSEvents.GUILD_DELETE, 'GuildDelete');
-    this.register(Constants.WSEvents.GUILD_UPDATE, 'GuildUpdate');
-    this.register(Constants.WSEvents.GUILD_BAN_ADD, 'GuildBanAdd');
-    this.register(Constants.WSEvents.GUILD_BAN_REMOVE, 'GuildBanRemove');
-    this.register(Constants.WSEvents.GUILD_MEMBER_ADD, 'GuildMemberAdd');
-    this.register(Constants.WSEvents.GUILD_MEMBER_REMOVE, 'GuildMemberRemove');
-    this.register(Constants.WSEvents.GUILD_MEMBER_UPDATE, 'GuildMemberUpdate');
-    this.register(Constants.WSEvents.GUILD_ROLE_CREATE, 'GuildRoleCreate');
-    this.register(Constants.WSEvents.GUILD_ROLE_DELETE, 'GuildRoleDelete');
-    this.register(Constants.WSEvents.GUILD_ROLE_UPDATE, 'GuildRoleUpdate');
-    this.register(Constants.WSEvents.GUILD_MEMBERS_CHUNK, 'GuildMembersChunk');
-    this.register(Constants.WSEvents.CHANNEL_CREATE, 'ChannelCreate');
-    this.register(Constants.WSEvents.CHANNEL_DELETE, 'ChannelDelete');
-    this.register(Constants.WSEvents.CHANNEL_UPDATE, 'ChannelUpdate');
-    this.register(Constants.WSEvents.PRESENCE_UPDATE, 'PresenceUpdate');
-    this.register(Constants.WSEvents.USER_UPDATE, 'UserUpdate');
-    this.register(Constants.WSEvents.USER_NOTE_UPDATE, 'UserNoteUpdate');
-    this.register(Constants.WSEvents.VOICE_STATE_UPDATE, 'VoiceStateUpdate');
-    this.register(Constants.WSEvents.TYPING_START, 'TypingStart');
-    this.register(Constants.WSEvents.MESSAGE_CREATE, 'MessageCreate');
-    this.register(Constants.WSEvents.MESSAGE_DELETE, 'MessageDelete');
-    this.register(Constants.WSEvents.MESSAGE_UPDATE, 'MessageUpdate');
-    this.register(Constants.WSEvents.VOICE_SERVER_UPDATE, 'VoiceServerUpdate');
-    this.register(Constants.WSEvents.MESSAGE_DELETE_BULK, 'MessageDeleteBulk');
-    this.register(Constants.WSEvents.CHANNEL_PINS_UPDATE, 'ChannelPinsUpdate');
-    this.register(Constants.WSEvents.GUILD_SYNC, 'GuildSync');
-    this.register(Constants.WSEvents.RELATIONSHIP_ADD, 'RelationshipAdd');
-    this.register(Constants.WSEvents.RELATIONSHIP_REMOVE, 'RelationshipRemove');
-    this.register(Constants.WSEvents.MESSAGE_REACTION_ADD, 'MessageReactionAdd');
-    this.register(Constants.WSEvents.MESSAGE_REACTION_REMOVE, 'MessageReactionRemove');
-    this.register(Constants.WSEvents.MESSAGE_REACTION_REMOVE_ALL, 'MessageReactionRemoveAll');
+    this.register(Constants.WSEvents.READY, require('./handlers/Ready'));
+    this.register(Constants.WSEvents.GUILD_CREATE, require('./handlers/GuildCreate'));
+    this.register(Constants.WSEvents.GUILD_DELETE, require('./handlers/GuildDelete'));
+    this.register(Constants.WSEvents.GUILD_UPDATE, require('./handlers/GuildUpdate'));
+    this.register(Constants.WSEvents.GUILD_BAN_ADD, require('./handlers/GuildBanAdd'));
+    this.register(Constants.WSEvents.GUILD_BAN_REMOVE, require('./handlers/GuildBanRemove'));
+    this.register(Constants.WSEvents.GUILD_MEMBER_ADD, require('./handlers/GuildMemberAdd'));
+    this.register(Constants.WSEvents.GUILD_MEMBER_REMOVE, require('./handlers/GuildMemberRemove'));
+    this.register(Constants.WSEvents.GUILD_MEMBER_UPDATE, require('./handlers/GuildMemberUpdate'));
+    this.register(Constants.WSEvents.GUILD_ROLE_CREATE, require('./handlers/GuildRoleCreate'));
+    this.register(Constants.WSEvents.GUILD_ROLE_DELETE, require('./handlers/GuildRoleDelete'));
+    this.register(Constants.WSEvents.GUILD_ROLE_UPDATE, require('./handlers/GuildRoleUpdate'));
+    this.register(Constants.WSEvents.GUILD_MEMBERS_CHUNK, require('./handlers/GuildMembersChunk'));
+    this.register(Constants.WSEvents.CHANNEL_CREATE, require('./handlers/ChannelCreate'));
+    this.register(Constants.WSEvents.CHANNEL_DELETE, require('./handlers/ChannelDelete'));
+    this.register(Constants.WSEvents.CHANNEL_UPDATE, require('./handlers/ChannelUpdate'));
+    this.register(Constants.WSEvents.CHANNEL_PINS_UPDATE, require('./handlers/ChannelPinsUpdate'));
+    this.register(Constants.WSEvents.PRESENCE_UPDATE, require('./handlers/PresenceUpdate'));
+    this.register(Constants.WSEvents.USER_UPDATE, require('./handlers/UserUpdate'));
+    this.register(Constants.WSEvents.USER_NOTE_UPDATE, require('./handlers/UserNoteUpdate'));
+    this.register(Constants.WSEvents.VOICE_STATE_UPDATE, require('./handlers/VoiceStateUpdate'));
+    this.register(Constants.WSEvents.TYPING_START, require('./handlers/TypingStart'));
+    this.register(Constants.WSEvents.MESSAGE_CREATE, require('./handlers/MessageCreate'));
+    this.register(Constants.WSEvents.MESSAGE_DELETE, require('./handlers/MessageDelete'));
+    this.register(Constants.WSEvents.MESSAGE_UPDATE, require('./handlers/MessageUpdate'));
+    this.register(Constants.WSEvents.MESSAGE_DELETE_BULK, require('./handlers/MessageDeleteBulk'));
+    this.register(Constants.WSEvents.VOICE_SERVER_UPDATE, require('./handlers/VoiceServerUpdate'));
+    this.register(Constants.WSEvents.GUILD_SYNC, require('./handlers/GuildSync'));
+    this.register(Constants.WSEvents.RELATIONSHIP_ADD, require('./handlers/RelationshipAdd'));
+    this.register(Constants.WSEvents.RELATIONSHIP_REMOVE, require('./handlers/RelationshipRemove'));
+    this.register(Constants.WSEvents.MESSAGE_REACTION_ADD, require('./handlers/MessageReactionAdd'));
+    this.register(Constants.WSEvents.MESSAGE_REACTION_REMOVE, require('./handlers/MessageReactionRemove'));
+    this.register(Constants.WSEvents.MESSAGE_REACTION_REMOVE_ALL, require('./handlers/MessageReactionRemoveAll'));
   }
 
   get client() {
     return this.ws.client;
   }
 
-  register(event, handle) {
-    const Handler = require(`./handlers/${handle}`);
+  register(event, Handler) {
     this.handlers[event] = new Handler(this);
   }