diff --git a/KilluaBot.iml b/KilluaBot.iml
index 1e6e97c..3c97b68 100644
--- a/KilluaBot.iml
+++ b/KilluaBot.iml
@@ -5,8 +5,6 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/src/main/java/com/github/nilstrieb/core/Main.java b/src/main/java/com/github/nilstrieb/core/Main.java
index 08860f1..7db9e6f 100644
--- a/src/main/java/com/github/nilstrieb/core/Main.java
+++ b/src/main/java/com/github/nilstrieb/core/Main.java
@@ -3,6 +3,8 @@ package com.github.nilstrieb.core;
 import com.github.nilstrieb.cofig.Secrets;
 import com.github.nilstrieb.commands.info.EvalCommand;
 import com.github.nilstrieb.commands.info.HelpCommand;
+import com.github.nilstrieb.listener.CommandListener;
+import com.github.nilstrieb.listener.StartUpListener;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.entities.Activity;
@@ -15,9 +17,9 @@ public class Main {
     public static void main(String[] args) throws LoginException {
         JDABuilder builder = JDABuilder.createDefault(Secrets.TOKEN);
         builder.setCompression(Compression.ZLIB);
-        builder.setActivity(Activity.watching(" over Gon"));
+        builder.setActivity(Activity.watching("over Gon"));
 
-        builder.addEventListeners(builder);
+        builder.addEventListeners(new StartUpListener(), new CommandListener());
 
         JDA jda = builder.build();
         setupCommands();