diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
index 45cb695..86482ae 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
@@ -74,8 +74,6 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 	public static IChannel botchannel;
 	public static IChannel annchannel;
 	public static IChannel genchannel;
-	public static IChannel issuechannel;
-	public static IChannel debugchannel;
 	public static IChannel chatchannel;
 
 	public static boolean Test = true;
@@ -94,16 +92,12 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 				botchannel = mainServer.getChannelByID("209720707188260864"); // bot
 				annchannel = mainServer.getChannelByID("126795071927353344"); // announcements
 				genchannel = mainServer.getChannelByID("125813020357165056"); // general
-				issuechannel = devServer.getChannelByID("219643416496046081"); // server-issues
-				debugchannel = devServer.getChannelByID("250332016199860224"); // debug-channel
 				chatchannel = mainServer.getChannelByID("249663564057411596"); // minecraft_chat
 				dc.changeStatus(Status.game("on TBMC"));
 			} else {
 				botchannel = devServer.getChannelByID("239519012529111040"); // bottest
 				annchannel = devServer.getChannelByID("239519012529111040"); // bottest
 				genchannel = devServer.getChannelByID("239519012529111040"); // bottest
-				issuechannel = devServer.getChannelByID("239519012529111040"); // bottest
-				debugchannel = devServer.getChannelByID("239519012529111040"); //bottest
 				chatchannel = devServer.getChannelByID("248185455508455424"); // minecraft_chat_test
 				dc.changeStatus(Status.game("testing"));
 			}
diff --git a/src/main/java/buttondevteam/discordplugin/DebugMessageListener.java b/src/main/java/buttondevteam/discordplugin/listeners/DebugMessageListener.java
similarity index 75%
rename from src/main/java/buttondevteam/discordplugin/DebugMessageListener.java
rename to src/main/java/buttondevteam/discordplugin/listeners/DebugMessageListener.java
index adbe102..4f4b692 100644
--- a/src/main/java/buttondevteam/discordplugin/DebugMessageListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/DebugMessageListener.java
@@ -1,28 +1,29 @@
-package buttondevteam.discordplugin;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-import buttondevteam.lib.TBMCDebugMessageEvent;
-
-public class DebugMessageListener implements Listener{
-	@EventHandler
-	public void onException(TBMCDebugMessageEvent e) {
-		SendMessage(e.getDebugMessage());
-		e.setSent();
-	}
-
-	private static void SendMessage(String message) {
-		try {
-			StringBuilder sb = new StringBuilder();
-			sb.append("```").append("\n");
-			if (message.length() > 2000)
-				message = message.substring(0, 2000);
-			sb.append(message).append("\n");
-			sb.append("```");
-			DiscordPlugin.sendMessageToChannel(DiscordPlugin.debugchannel, sb.toString());
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-
-}
+package buttondevteam.discordplugin.listeners;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+import buttondevteam.discordplugin.DiscordPlugin;
+import buttondevteam.lib.TBMCDebugMessageEvent;
+
+public class DebugMessageListener implements Listener{
+	@EventHandler
+	public void onException(TBMCDebugMessageEvent e) {
+		SendMessage(e.getDebugMessage());
+		e.setSent();
+	}
+
+	private static void SendMessage(String message) {
+		try {
+			StringBuilder sb = new StringBuilder();
+			sb.append("```").append("\n");
+			if (message.length() > 2000)
+				message = message.substring(0, 2000);
+			sb.append(message).append("\n");
+			sb.append("```");
+			DiscordPlugin.sendMessageToChannel(DiscordPlugin.botchannel, sb.toString());
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+	}
+
+}
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java b/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java
index 4375819..6a460f9 100644
--- a/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java
@@ -24,7 +24,7 @@ public class ExceptionListener implements Listener {
 				stackTrace = stackTrace.substring(0, 2000);
 			sb.append(stackTrace).append("\n");
 			sb.append("```");
-			DiscordPlugin.sendMessageToChannel(DiscordPlugin.issuechannel, sb.toString());
+			DiscordPlugin.sendMessageToChannel(DiscordPlugin.botchannel, sb.toString());
 		} catch (Exception ex) {
 			ex.printStackTrace();
 		}