diff --git a/inhibitors/blacklist.js b/event/inhibitors/blacklist.js
similarity index 100%
rename from inhibitors/blacklist.js
rename to event/inhibitors/blacklist.js
diff --git a/listeners/commandblocked.js b/event/listeners/commandblocked.js
similarity index 100%
rename from listeners/commandblocked.js
rename to event/listeners/commandblocked.js
diff --git a/listeners/guildCreate.js b/event/listeners/guildCreate.js
similarity index 100%
rename from listeners/guildCreate.js
rename to event/listeners/guildCreate.js
diff --git a/listeners/guildDelete.js b/event/listeners/guildDelete.js
similarity index 100%
rename from listeners/guildDelete.js
rename to event/listeners/guildDelete.js
diff --git a/listeners/message.js b/event/listeners/message.js
similarity index 100%
rename from listeners/message.js
rename to event/listeners/message.js
diff --git a/listeners/messageReactionAdd.js b/event/listeners/messageReactionAdd.js
similarity index 100%
rename from listeners/messageReactionAdd.js
rename to event/listeners/messageReactionAdd.js
diff --git a/listeners/ready.js b/event/listeners/ready.js
similarity index 89%
rename from listeners/ready.js
rename to event/listeners/ready.js
index a5b8d45b..ef8a3b80 100644
--- a/listeners/ready.js
+++ b/event/listeners/ready.js
@@ -18,8 +18,8 @@ class ReadyListener extends Listener {
 		if (this.client.user.id == 377563711927484418) {
 			const channel = this.client.channels.get(statsChannel);
 			channel.send(`Ready to serve in ${this.client.channels.size} channels on ${this.client.guilds.size} servers, for a total of ${this.client.users.size} users. ${this.client.readyAt}`);
-			this.client.user.setActivity(`${prefix} feedback <feedback> to tell me what you think of the bot! | ${prefix} help`);
 		}
+		this.client.user.setActivity(`${prefix} feedback <feedback> to tell me what you think of the bot! | ${prefix} help`);
 	}
 }
 
diff --git a/index.js b/index.js
index 579f034d..6501bfbe 100644
--- a/index.js
+++ b/index.js
@@ -20,14 +20,14 @@ class hahaYesClient extends AkairoClient {
 		});
 
 		this.inhibitorHandler = new InhibitorHandler(this, {
-			directory: './inhibitors/',
+			directory: './event/inhibitors/',
 			emitters: {
 				process
 			},
 		});
 
 		this.listenerHandler = new ListenerHandler(this, {
-			directory: './listeners/'
+			directory: './event/listeners/'
 		});
 
 		this.listenerHandler.setEmitters({