From 33f0bc7707a66d96112b1887a8416586bc40184f Mon Sep 17 00:00:00 2001
From: DxsSucuk <dxssucuk@hotmail.com>
Date: Fri, 31 Dec 2021 16:27:41 +0100
Subject: [PATCH] Release 1.5.2

= Code reformation.
= Updated Documentation.
= Fixed Logback Configuration file.
---
 pom.xml                                       |   4 +-
 .../de/presti/ree6/addons/AddonLoader.java    |   2 +-
 .../ree6/addons/impl/ChatProtector.java       |  24 +--
 src/main/java/de/presti/ree6/api/JSONApi.java |   2 +-
 src/main/java/de/presti/ree6/bot/Webhook.java |   4 +-
 .../java/de/presti/ree6/commands/Command.java |   6 +-
 .../presti/ree6/commands/CommandManager.java  |   6 +-
 .../ree6/commands/impl/community/Rainbow.java |   8 +-
 .../impl/community/TwitchNotifier.java        |  26 +--
 .../ree6/commands/impl/fun/HornyJail.java     |   6 +-
 .../de/presti/ree6/commands/impl/fun/Hug.java |   4 +-
 .../presti/ree6/commands/impl/fun/Kiss.java   |   4 +-
 .../presti/ree6/commands/impl/fun/Slap.java   |   4 +-
 .../ree6/commands/impl/fun/Twitter.java       |   6 +-
 .../presti/ree6/commands/impl/fun/Waifu.java  |   2 +-
 .../commands/impl/hidden/ReloadAddons.java    |   4 +-
 .../ree6/commands/impl/hidden/Test.java       |   2 +-
 .../presti/ree6/commands/impl/info/Help.java  |   8 +-
 .../presti/ree6/commands/impl/info/Info.java  |   4 +-
 .../ree6/commands/impl/level/Level.java       |  18 +-
 .../de/presti/ree6/commands/impl/mod/Ban.java |   4 +-
 .../ree6/commands/impl/mod/ChatProtector.java |  12 +-
 .../presti/ree6/commands/impl/mod/Clear.java  |   6 +-
 .../presti/ree6/commands/impl/mod/Kick.java   |   4 +-
 .../presti/ree6/commands/impl/mod/Mute.java   |  10 +-
 .../presti/ree6/commands/impl/mod/Prefix.java |   4 +-
 .../presti/ree6/commands/impl/mod/Setup.java  |  58 +++----
 .../presti/ree6/commands/impl/mod/Unban.java  |   2 +-
 .../presti/ree6/commands/impl/mod/Unmute.java |  10 +-
 .../ree6/commands/impl/music/Clearqueue.java  |   2 +-
 .../ree6/commands/impl/music/Disconnect.java  |   4 +-
 .../presti/ree6/commands/impl/music/Loop.java |   6 +-
 .../ree6/commands/impl/music/Lyrics.java      |   2 +-
 .../ree6/commands/impl/music/Pause.java       |   2 +-
 .../presti/ree6/commands/impl/music/Play.java |  12 +-
 .../ree6/commands/impl/music/Resume.java      |   2 +-
 .../ree6/commands/impl/music/Shuffle.java     |   6 +-
 .../presti/ree6/commands/impl/music/Skip.java |   2 +-
 .../ree6/commands/impl/music/Songinfo.java    |   6 +-
 .../ree6/commands/impl/music/Songlist.java    |   4 +-
 .../presti/ree6/commands/impl/music/Stop.java |   4 +-
 .../ree6/commands/impl/music/Volume.java      |   4 +-
 .../de/presti/ree6/events/LoggingEvents.java  | 162 +++++++++---------
 .../de/presti/ree6/events/OtherEvents.java    |  30 ++--
 .../invitelogger/InviteContainerManager.java  |   8 +-
 .../de/presti/ree6/logger/LoggerQueue.java    |   4 +-
 src/main/java/de/presti/ree6/main/Main.java   | 139 +++++++++++----
 .../de/presti/ree6/music/MusicWorker.java     |  14 +-
 .../de/presti/ree6/music/TrackScheduler.java  |  20 +--
 .../java/de/presti/ree6/sql/SQLConnector.java |  14 +-
 .../java/de/presti/ree6/sql/SQLWorker.java    |   4 +-
 .../de/presti/ree6/stats/StatsManager.java    |  10 +-
 .../java/de/presti/ree6/utils/ArrayUtil.java  |  37 ++++
 .../de/presti/ree6/utils/AutoRoleHandler.java |  16 +-
 .../java/de/presti/ree6/utils/FileUtil.java   |   4 +-
 .../java/de/presti/ree6/utils/LoggerImpl.java |   2 +-
 .../java/de/presti/ree6/utils/Notifier.java   | 155 +++++++++++++++++
 .../presti/ree6/utils/SpotifyAPIHandler.java  |   6 +-
 .../presti/ree6/utils/TwitchAPIHandler.java   |  77 ---------
 .../presti/ree6/utils/YouTubeAPIHandler.java  |   8 +-
 src/main/resources/logback.xml                |  14 +-
 61 files changed, 613 insertions(+), 421 deletions(-)
 create mode 100644 src/main/java/de/presti/ree6/utils/Notifier.java
 delete mode 100644 src/main/java/de/presti/ree6/utils/TwitchAPIHandler.java

diff --git a/pom.xml b/pom.xml
index 004823ae1..f5b1cd9f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.presti</groupId>
     <artifactId>Ree6</artifactId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <build>
         <plugins>
             <plugin>
@@ -211,7 +211,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.3.0-alpha12</version>
+            <version>1.2.8</version>
         </dependency>
         <!-- using a fork of this to fix some issues faster -->
         <!-- dependency>
diff --git a/src/main/java/de/presti/ree6/addons/AddonLoader.java b/src/main/java/de/presti/ree6/addons/AddonLoader.java
index 8968d52c8..da02ec93b 100644
--- a/src/main/java/de/presti/ree6/addons/AddonLoader.java
+++ b/src/main/java/de/presti/ree6/addons/AddonLoader.java
@@ -48,7 +48,7 @@ public static void loadAllAddons() {
             if (f.getName().endsWith("jar")) {
                 try {
                     // Try creating a Local-Addon and adding it into the loaded Addon List.
-                    Main.addonManager.loadAddon(loadAddon(f.getName()));
+                    Main.getInstance().getAddonManager().loadAddon(loadAddon(f.getName()));
                 } catch (Exception ex) {
                     // If the Methode loadAddon fails notify.
                     LoggerImpl.log("AddonManager", "Couldn't load the Addon " + f.getName() + "\nException: " + ex.getCause().getMessage());
diff --git a/src/main/java/de/presti/ree6/addons/impl/ChatProtector.java b/src/main/java/de/presti/ree6/addons/impl/ChatProtector.java
index dd8fcc9cd..2b106f71e 100644
--- a/src/main/java/de/presti/ree6/addons/impl/ChatProtector.java
+++ b/src/main/java/de/presti/ree6/addons/impl/ChatProtector.java
@@ -13,23 +13,23 @@ public class ChatProtector {
 
     public static void addWordToProtector(String gid, String word) {
 
-        ArrayList<String> words = Main.sqlConnector.getSqlWorker().getChatProtectorWords(gid);
+        ArrayList<String> words = Main.getInstance().getSqlConnector().getSqlWorker().getChatProtectorWords(gid);
 
         if (!words.isEmpty() && !words.contains(word)) {
-            Main.sqlConnector.getSqlWorker().addChatProtectorWord(gid, word);
+            Main.getInstance().getSqlConnector().getSqlWorker().addChatProtectorWord(gid, word);
         } else if (words.isEmpty()) {
-            Main.sqlConnector.getSqlWorker().addChatProtectorWord(gid, word);
+            Main.getInstance().getSqlConnector().getSqlWorker().addChatProtectorWord(gid, word);
         }
     }
 
     public static void addWordsToProtector(String gid, ArrayList<String> words2) {
 
-        ArrayList<String> words = Main.sqlConnector.getSqlWorker().getChatProtectorWords(gid);
+        ArrayList<String> words = Main.getInstance().getSqlConnector().getSqlWorker().getChatProtectorWords(gid);
 
         if (!words.isEmpty()) {
             for (String s : words2) {
                 if (!words.contains(s)) {
-                    Main.sqlConnector.getSqlWorker().addChatProtectorWord(gid, s);
+                    Main.getInstance().getSqlConnector().getSqlWorker().addChatProtectorWord(gid, s);
                     words.add(s);
                 }
             }
@@ -37,7 +37,7 @@ public static void addWordsToProtector(String gid, ArrayList<String> words2) {
 
             for (String s : words2) {
                 if (!words.contains(s)) {
-                    Main.sqlConnector.getSqlWorker().addChatProtectorWord(gid, s);
+                    Main.getInstance().getSqlConnector().getSqlWorker().addChatProtectorWord(gid, s);
                     words.add(s);
                 }
             }
@@ -45,12 +45,12 @@ public static void addWordsToProtector(String gid, ArrayList<String> words2) {
     }
 
     public static void removeWordsFromProtector(String gid, ArrayList<String> words2) {
-        ArrayList<String> words = Main.sqlConnector.getSqlWorker().getChatProtectorWords(gid);
+        ArrayList<String> words = Main.getInstance().getSqlConnector().getSqlWorker().getChatProtectorWords(gid);
 
         if (!words.isEmpty()) {
             for (String s : words2) {
                 if (words.contains(s)) {
-                    Main.sqlConnector.getSqlWorker().removeChatProtectorWord(gid, s);
+                    Main.getInstance().getSqlConnector().getSqlWorker().removeChatProtectorWord(gid, s);
                     words.remove(s);
                 }
             }
@@ -58,20 +58,20 @@ public static void removeWordsFromProtector(String gid, ArrayList<String> words2
     }
 
     public static void removeWordFromProtector(String gid, String word) {
-        ArrayList<String> words = Main.sqlConnector.getSqlWorker().getChatProtectorWords(gid);
+        ArrayList<String> words = Main.getInstance().getSqlConnector().getSqlWorker().getChatProtectorWords(gid);
         if(!words.isEmpty()) {
             if(words.contains(word)) {
-                Main.sqlConnector.getSqlWorker().removeChatProtectorWord(gid, word);
+                Main.getInstance().getSqlConnector().getSqlWorker().removeChatProtectorWord(gid, word);
             }
         }
     }
 
     public static boolean hasChatProtector(String gid) {
-        return Main.sqlConnector.getSqlWorker().isChatProtectorSetup(gid);
+        return Main.getInstance().getSqlConnector().getSqlWorker().isChatProtectorSetup(gid);
     }
 
     public static ArrayList<String> getChatProtector(String gid) {
-        return Main.sqlConnector.getSqlWorker().getChatProtectorWords(gid);
+        return Main.getInstance().getSqlConnector().getSqlWorker().getChatProtectorWords(gid);
     }
 
     public static boolean checkMessage(String gid, String message) {
diff --git a/src/main/java/de/presti/ree6/api/JSONApi.java b/src/main/java/de/presti/ree6/api/JSONApi.java
index e925d963a..4b92809f2 100644
--- a/src/main/java/de/presti/ree6/api/JSONApi.java
+++ b/src/main/java/de/presti/ree6/api/JSONApi.java
@@ -166,7 +166,7 @@ public static JSONObject getData(Requests type, String url, String post, String
 				j.put("_content", rawContent);
 			}
 		} catch (NullPointerException ex) {
-			Main.instance.getLogger().error("Error", ex.getCause());
+			Main.getInstance().getLogger().error("Error", ex.getCause());
 		} catch (MalformedURLException ex) {
 			j.put("_success", false);
 			j.put("_type", type.name());
diff --git a/src/main/java/de/presti/ree6/bot/Webhook.java b/src/main/java/de/presti/ree6/bot/Webhook.java
index e915c69e0..e73502dbf 100644
--- a/src/main/java/de/presti/ree6/bot/Webhook.java
+++ b/src/main/java/de/presti/ree6/bot/Webhook.java
@@ -24,7 +24,7 @@ public static void sendWebhook(LoggerMessage loggerMessage, WebhookMessage messa
         if (webhookToken.contains("Not setup!") || webhookId == 0) return;
 
         // Check if the given data is in the Database.
-        if (!Main.sqlConnector.getSqlWorker().existsLogData(webhookId, webhookToken)) return;
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().existsLogData(webhookId, webhookToken)) return;
 
         // Check if the LoggerMessage is null or canceled.
         if (loggerMessage == null || loggerMessage.isCanceled()) {
@@ -40,7 +40,7 @@ public static void sendWebhook(LoggerMessage loggerMessage, WebhookMessage messa
                 // If the error 404 comes that means that the webhook is invalid.
                 if (throwable.getMessage().contains("failure 404")) {
                     // Inform and delete invalid webhook.
-                    Main.sqlConnector.getSqlWorker().deleteLogWebhook(webhookId, webhookToken);
+                    Main.getInstance().getSqlConnector().getSqlWorker().deleteLogWebhook(webhookId, webhookToken);
                     LoggerImpl.log("Webhook", "Deleted invalid Webhook: " + webhookId + " - " + webhookToken);
                 } else if (throwable.getMessage().contains("failure 400")) {
                     // If 404 inform that the Message had an invalid Body.
diff --git a/src/main/java/de/presti/ree6/commands/Command.java b/src/main/java/de/presti/ree6/commands/Command.java
index 88c6db84f..8d1e7f21a 100644
--- a/src/main/java/de/presti/ree6/commands/Command.java
+++ b/src/main/java/de/presti/ree6/commands/Command.java
@@ -75,7 +75,7 @@ public void sendMessage(String msg, MessageChannel m, InteractionHook hook) {
     }
 
     public void sendMessage(String msg, int deleteSecond, MessageChannel m, InteractionHook hook) {
-        Main.commandManager.sendMessage(msg, deleteSecond, m, hook);
+        Main.getInstance().getCommandManager().sendMessage(msg, deleteSecond, m, hook);
     }
 
 
@@ -84,11 +84,11 @@ public void sendMessage(EmbedBuilder msg, MessageChannel m, InteractionHook hook
     }
 
     public void sendMessage(EmbedBuilder msg, int deleteSecond, MessageChannel m, InteractionHook hook) {
-        Main.commandManager.sendMessage(msg, deleteSecond, m, hook);
+        Main.getInstance().getCommandManager().sendMessage(msg, deleteSecond, m, hook);
     }
 
     public static void deleteMessage(Message message, InteractionHook hook) {
-        Main.commandManager.deleteMessage(message, hook);
+        Main.getInstance().getCommandManager().deleteMessage(message, hook);
     }
 
     public boolean isAlias(String arg) {
diff --git a/src/main/java/de/presti/ree6/commands/CommandManager.java b/src/main/java/de/presti/ree6/commands/CommandManager.java
index 418d6873b..42c6df53e 100644
--- a/src/main/java/de/presti/ree6/commands/CommandManager.java
+++ b/src/main/java/de/presti/ree6/commands/CommandManager.java
@@ -124,7 +124,7 @@ public void addCommand(Command c) {
 
     public boolean perform(Member sender, String msg, Message messageSelf, TextChannel m, InteractionHook interactionHook) {
 
-        if (!msg.toLowerCase().startsWith(Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue()))
+        if (!msg.toLowerCase().startsWith(Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue()))
             return false;
 
         if (ArrayUtil.commandCooldown.contains(sender.getUser().getId())) {
@@ -134,7 +134,7 @@ public boolean perform(Member sender, String msg, Message messageSelf, TextChann
             return false;
         }
 
-        msg = msg.substring(Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue().length());
+        msg = msg.substring(Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue().length());
 
         String[] oldArgs = msg.split(" ");
 
@@ -143,7 +143,7 @@ public boolean perform(Member sender, String msg, Message messageSelf, TextChann
         for (Command cmd : getCommands()) {
             if (cmd.getCmd().equalsIgnoreCase(oldArgs[0]) || cmd.isAlias(oldArgs[0])) {
 
-                if (!Main.sqlConnector.getSqlWorker().getSetting(m.getGuild().getId(), "command_" + cmd.getCmd().toLowerCase()).getBooleanValue() &&
+                if (!Main.getInstance().getSqlConnector().getSqlWorker().getSetting(m.getGuild().getId(), "command_" + cmd.getCmd().toLowerCase()).getBooleanValue() &&
                         cmd.getCategory() != Category.HIDDEN) {
                     sendMessage("This Command is blocked!", 5, m, interactionHook);
                     blocked = true;
diff --git a/src/main/java/de/presti/ree6/commands/impl/community/Rainbow.java b/src/main/java/de/presti/ree6/commands/impl/community/Rainbow.java
index cadd32a29..972e299f2 100644
--- a/src/main/java/de/presti/ree6/commands/impl/community/Rainbow.java
+++ b/src/main/java/de/presti/ree6/commands/impl/community/Rainbow.java
@@ -26,8 +26,8 @@ public Rainbow() {
     public void onPerform(Member sender, Message messageSelf, String[] args, TextChannel m, InteractionHook hook) {
         deleteMessage(messageSelf, hook);
 
-        if(!Main.sqlConnector.getSqlWorker().isRainbowSetup(m.getGuild().getId())) {
-            sendMessage("Rainbow Mate searcher isn't setuped!\nAsk a Admin to set it up with "+ Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup r6", 5, m, hook);
+        if(!Main.getInstance().getSqlConnector().getSqlWorker().isRainbowSetup(m.getGuild().getId())) {
+            sendMessage("Rainbow Mate searcher isn't setuped!\nAsk a Admin to set it up with "+ Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup r6", 5, m, hook);
             return;
         }
 
@@ -46,8 +46,8 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
         wm.addEmbeds(em.build());
 
         for(Guild g : BotInfo.botInstance.getGuilds()) {
-            if(Main.sqlConnector.getSqlWorker().isRainbowSetup(g.getId())) {
-                String[] info = Main.sqlConnector.getSqlWorker().getRainbowWebhook(g.getId());
+            if(Main.getInstance().getSqlConnector().getSqlWorker().isRainbowSetup(g.getId())) {
+                String[] info = Main.getInstance().getSqlConnector().getSqlWorker().getRainbowWebhook(g.getId());
                 Webhook.sendWebhook(null, wm.build(), Long.parseLong(info[0]), info[1]);
             }
         }
diff --git a/src/main/java/de/presti/ree6/commands/impl/community/TwitchNotifier.java b/src/main/java/de/presti/ree6/commands/impl/community/TwitchNotifier.java
index 2df1a7235..92a606ec3 100644
--- a/src/main/java/de/presti/ree6/commands/impl/community/TwitchNotifier.java
+++ b/src/main/java/de/presti/ree6/commands/impl/community/TwitchNotifier.java
@@ -21,7 +21,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
             if(args[0].equalsIgnoreCase("list")) {
                 StringBuilder end = new StringBuilder("```\n");
 
-                for(String users : Main.sqlConnector.getSqlWorker().getAllTwitchNames(m.getGuild().getId())) {
+                for(String users : Main.getInstance().getSqlConnector().getSqlWorker().getAllTwitchNames(m.getGuild().getId())) {
                     end.append(users).append("\n");
                 }
 
@@ -30,42 +30,42 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                 sendMessage(end.toString(), 10, m, hook);
 
             } else {
-                sendMessage("Please use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "twitch list/add/remove", 5, m, hook);
+                sendMessage("Please use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "twitch list/add/remove", 5, m, hook);
             }
         } else if(args.length == 3) {
 
             if (messageSelf.getMentionedChannels().size() == 0) {
-                sendMessage("Please use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "twitch add/remove TwitchName #Channel", 5, m, hook);
+                sendMessage("Please use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "twitch add/remove TwitchName #Channel", 5, m, hook);
                 return;
             }
 
             String name = args[1];
             if (args[0].equalsIgnoreCase("add")) {
-                messageSelf.getMentionedChannels().get(0).createWebhook("Ree6-TwitchNotifier-" + name).queue(w -> Main.sqlConnector.getSqlWorker().addTwitchWebhook(sender.getGuild().getId(), name.toLowerCase(), w.getId(), w.getToken()));
+                messageSelf.getMentionedChannels().get(0).createWebhook("Ree6-TwitchNotifier-" + name).queue(w -> Main.getInstance().getSqlConnector().getSqlWorker().addTwitchWebhook(sender.getGuild().getId(), name.toLowerCase(), w.getId(), w.getToken()));
                 sendMessage("A TwitchStream Notifier has been created for the User " + name + "!", 5, m, hook);
 
-                if (!Main.twitchAPIHandler.isRegisterd(name)) {
-                    Main.twitchAPIHandler.registerChannel(name);
+                if (!Main.getInstance().getNotifier().isTwitchRegistered(name)) {
+                    Main.getInstance().getNotifier().registerTwitchChannel(name);
                 }
             } else {
-                sendMessage("Please use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "twitch add TwitchName #Channel", 5, m, hook);
+                sendMessage("Please use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "twitch add TwitchName #Channel", 5, m, hook);
             }
         } else if(args.length == 2) {
             String name = args[1];
             if(args[0].equalsIgnoreCase("remove")) {
-                Main.sqlConnector.getSqlWorker().removeTwitchWebhook(sender.getGuild().getId(), name);
+                Main.getInstance().getSqlConnector().getSqlWorker().removeTwitchWebhook(sender.getGuild().getId(), name);
                 sendMessage("A TwitchStream Notifier has been removed from the User " + name + "!", 5, m, hook);
 
-                if(Main.twitchAPIHandler.isRegisterd(name)) {
-                    if(Main.sqlConnector.getSqlWorker().getTwitchWebhooksByName(name.toLowerCase()).isEmpty()) {
-                        Main.twitchAPIHandler.unregisterChannel(name);
+                if(Main.getInstance().getNotifier().isTwitchRegistered(name)) {
+                    if(Main.getInstance().getSqlConnector().getSqlWorker().getTwitchWebhooksByName(name.toLowerCase()).isEmpty()) {
+                        Main.getInstance().getNotifier().unregisterTwitchChannel(name);
                     }
                 }
             } else {
-                sendMessage("Please use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "twitch remove TwitchName", 5, m, hook);
+                sendMessage("Please use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "twitch remove TwitchName", 5, m, hook);
             }
         } else {
-            sendMessage("Please use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "twitch list/add/remove", 5, m, hook);
+            sendMessage("Please use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "twitch list/add/remove", 5, m, hook);
         }
         deleteMessage(messageSelf, hook);
     }
diff --git a/src/main/java/de/presti/ree6/commands/impl/fun/HornyJail.java b/src/main/java/de/presti/ree6/commands/impl/fun/HornyJail.java
index 02a56f2b9..768da0fde 100644
--- a/src/main/java/de/presti/ree6/commands/impl/fun/HornyJail.java
+++ b/src/main/java/de/presti/ree6/commands/impl/fun/HornyJail.java
@@ -36,7 +36,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
 
                     HttpClient httpClient = HttpClientBuilder.create().build();
                     HttpGet request = new HttpGet("https://api.dagpi.xyz/image/jail/?url=" + messageSelf.getMentionedMembers().get(0).getUser().getAvatarUrl());
-                    request.setHeader("Authorization", Main.config.getConfig().getString("dagpi.apitoken"));
+                    request.setHeader("Authorization", Main.getInstance().getConfig().getConfig().getString("dagpi.apitoken"));
                     HttpResponse response = httpClient.execute(request);
 
                     try (OutputStream outputStream =
@@ -54,11 +54,11 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                     m.sendFile(new File("imageapi/hornyjail/" + sender.getUser().getId() + ".png")).queue(message -> new File("imageapi/hornyjail/" + sender.getUser().getId() + ".png").delete());
 
                 } catch (Exception ex) {
-                    sendMessage("Error while putting someone in the Hornyjail!\nError: " + ex.getMessage().replaceAll(Main.config.getConfig().getString("dagpi.apitoken"), "Ree6TopSecretAPIToken"), m, hook);
+                    sendMessage("Error while putting someone in the Hornyjail!\nError: " + ex.getMessage().replaceAll(Main.getInstance().getConfig().getConfig().getString("dagpi.apitoken"), "Ree6TopSecretAPIToken"), m, hook);
                 }
             }
         } else {
-            sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "hornyjail @User", 5, m, hook);
+            sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "hornyjail @User", 5, m, hook);
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/de/presti/ree6/commands/impl/fun/Hug.java b/src/main/java/de/presti/ree6/commands/impl/fun/Hug.java
index d35e66f63..b896f864a 100644
--- a/src/main/java/de/presti/ree6/commands/impl/fun/Hug.java
+++ b/src/main/java/de/presti/ree6/commands/impl/fun/Hug.java
@@ -26,7 +26,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
         if (args.length == 1) {
             if(messageSelf.getMentionedMembers().isEmpty()) {
                 sendMessage("No User mentioned!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "hug @user", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "hug @user", 5, m, hook);
             } else {
 
                 User target = messageSelf.getMentionedMembers().get(0).getUser();
@@ -45,7 +45,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
             }
         } else {
             sendMessage("Not enough Arguments!", 5, m, hook);
-            sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "hug @user", 5, m, hook);
+            sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "hug @user", 5, m, hook);
         }
     }
 
diff --git a/src/main/java/de/presti/ree6/commands/impl/fun/Kiss.java b/src/main/java/de/presti/ree6/commands/impl/fun/Kiss.java
index 131d143b1..deff4ba76 100644
--- a/src/main/java/de/presti/ree6/commands/impl/fun/Kiss.java
+++ b/src/main/java/de/presti/ree6/commands/impl/fun/Kiss.java
@@ -26,7 +26,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
         if (args.length == 1) {
             if(messageSelf.getMentionedMembers().isEmpty()) {
                 sendMessage("No User mentioned!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "kiss @user", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "kiss @user", 5, m, hook);
             } else {
 
                 User target = messageSelf.getMentionedMembers().get(0).getUser();
@@ -45,7 +45,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
             }
         } else {
             sendMessage("Not enough Arguments!", 5, m, hook);
-            sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "kiss @user", 5, m, hook);
+            sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "kiss @user", 5, m, hook);
         }
     }
 }
diff --git a/src/main/java/de/presti/ree6/commands/impl/fun/Slap.java b/src/main/java/de/presti/ree6/commands/impl/fun/Slap.java
index 587dc4888..bc578b438 100644
--- a/src/main/java/de/presti/ree6/commands/impl/fun/Slap.java
+++ b/src/main/java/de/presti/ree6/commands/impl/fun/Slap.java
@@ -26,7 +26,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
         if (args.length == 1) {
             if (messageSelf.getMentionedMembers().isEmpty()) {
                 sendMessage("No User mentioned!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "slap @user", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "slap @user", 5, m, hook);
             } else {
 
                 User target = messageSelf.getMentionedMembers().get(0).getUser();
@@ -45,7 +45,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
             }
         } else {
             sendMessage("Not enough Arguments!", 5,m, hook);
-            sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "slap @user", 5, m, hook);
+            sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "slap @user", 5, m, hook);
         }
     }
 }
diff --git a/src/main/java/de/presti/ree6/commands/impl/fun/Twitter.java b/src/main/java/de/presti/ree6/commands/impl/fun/Twitter.java
index 76e22ff92..0e1c9d681 100644
--- a/src/main/java/de/presti/ree6/commands/impl/fun/Twitter.java
+++ b/src/main/java/de/presti/ree6/commands/impl/fun/Twitter.java
@@ -49,7 +49,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
 
                     HttpClient httpClient = HttpClientBuilder.create().build();
                     HttpGet request = new HttpGet("https://api.dagpi.xyz/image/tweet/?url=" + messageSelf.getMentionedMembers().get(0).getUser().getAvatarUrl() + "&username=" + name + "&text=" + text);
-                    request.setHeader("Authorization", Main.config.getConfig().getString("dagpi.apitoken"));
+                    request.setHeader("Authorization", Main.getInstance().getConfig().getConfig().getString("dagpi.apitoken"));
                     HttpResponse response = httpClient.execute(request);
 
                     try(OutputStream outputStream =
@@ -67,11 +67,11 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                     m.sendFile(new File("imageapi/twitter/" + sender.getUser().getId() + ".png")).queue(message -> new File("imageapi/twitter/" + sender.getUser().getId() + ".png").delete());
 
                 } catch (Exception ex) {
-                    sendMessage("Error while creating the Tweet!\nError: " + ex.getMessage().replaceAll(Main.config.getConfig().getString("dagpi.apitoken"), "Ree6TopSecretAPIToken"), m, hook);
+                    sendMessage("Error while creating the Tweet!\nError: " + ex.getMessage().replaceAll(Main.getInstance().getConfig().getConfig().getString("dagpi.apitoken"), "Ree6TopSecretAPIToken"), m, hook);
                 }
             }
         } else {
-            sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "twitter @User Yourtexthere", 5, m, hook);
+            sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "twitter @User Yourtexthere", 5, m, hook);
         }
     }
 }
diff --git a/src/main/java/de/presti/ree6/commands/impl/fun/Waifu.java b/src/main/java/de/presti/ree6/commands/impl/fun/Waifu.java
index 96b1209e6..e3374169b 100644
--- a/src/main/java/de/presti/ree6/commands/impl/fun/Waifu.java
+++ b/src/main/java/de/presti/ree6/commands/impl/fun/Waifu.java
@@ -20,7 +20,7 @@ public Waifu() {
 
     @Override
     public void onPerform(Member sender, Message messageSelf, String[] args, TextChannel m, InteractionHook hook) {
-        JSONObject js = JSONApi.getData(JSONApi.Requests.GET, "https://api.dagpi.xyz/data/waifu", "", Main.config.getConfig().getString("dagpi.apitoken"));
+        JSONObject js = JSONApi.getData(JSONApi.Requests.GET, "https://api.dagpi.xyz/data/waifu", "", Main.getInstance().getConfig().getConfig().getString("dagpi.apitoken"));
         JSONObject array = js.getJSONObject("series");
 
         EmbedBuilder em = new EmbedBuilder();
diff --git a/src/main/java/de/presti/ree6/commands/impl/hidden/ReloadAddons.java b/src/main/java/de/presti/ree6/commands/impl/hidden/ReloadAddons.java
index da1965506..7201f3d63 100644
--- a/src/main/java/de/presti/ree6/commands/impl/hidden/ReloadAddons.java
+++ b/src/main/java/de/presti/ree6/commands/impl/hidden/ReloadAddons.java
@@ -17,9 +17,9 @@ public ReloadAddons() {
     @Override
     public void onPerform(Member sender, Message messageSelf, String[] args, TextChannel m, InteractionHook hook) {
         if(sender.getUser().getId().equalsIgnoreCase("321580743488831490")) {
-            Main.addonManager.reload();
+            Main.getInstance().getAddonManager().reload();
         } else {
-            sendMessage("The Command " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "reloadaddons couldn't be found!", 5, m, hook);
+            sendMessage("The Command " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "reloadaddons couldn't be found!", 5, m, hook);
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/de/presti/ree6/commands/impl/hidden/Test.java b/src/main/java/de/presti/ree6/commands/impl/hidden/Test.java
index 26f505279..b2bd7552b 100644
--- a/src/main/java/de/presti/ree6/commands/impl/hidden/Test.java
+++ b/src/main/java/de/presti/ree6/commands/impl/hidden/Test.java
@@ -17,7 +17,7 @@ public Test() {
 
     @Override
     public void onPerform(Member sender, Message messageSelf, String[] args, TextChannel m, InteractionHook hook) {
-        Main.sqlConnector.getSqlWorker().createSettings(m.getGuild().getId());
+        Main.getInstance().getSqlConnector().getSqlWorker().createSettings(m.getGuild().getId());
         for (TimeFormat tm : TimeFormat.values()) {
             sendMessage(tm.now().toString(), 5, m, hook);
         }
diff --git a/src/main/java/de/presti/ree6/commands/impl/info/Help.java b/src/main/java/de/presti/ree6/commands/impl/info/Help.java
index e72f07738..f6ee5704a 100644
--- a/src/main/java/de/presti/ree6/commands/impl/info/Help.java
+++ b/src/main/java/de/presti/ree6/commands/impl/info/Help.java
@@ -34,7 +34,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
 
             for (Category cat : Category.values()) {
                 if (cat != Category.HIDDEN) {
-                    em.addField("**" + cat.name().toUpperCase().charAt(0) + cat.name().substring(1).toLowerCase() + "**",  Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "help " + cat.name().toLowerCase(), true);
+                    em.addField("**" + cat.name().toUpperCase().charAt(0) + cat.name().substring(1).toLowerCase() + "**",  Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "help " + cat.name().toLowerCase(), true);
                 }
             }
 
@@ -50,9 +50,9 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                 StringBuilder end = new StringBuilder();
 
                 Category cat = getCategoryFromString(args[0]);
-                for (Command cmd : Main.commandManager.getCommands()) {
+                for (Command cmd : Main.getInstance().getCommandManager().getCommands()) {
                     if (cmd.getCategory() == cat) {
-                        end.append("``"  + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue()).append(cmd.getCmd()).append("``\n").append(cmd.getDesc()).append("\n\n");
+                        end.append("``"  + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue()).append(cmd.getCmd()).append("``\n").append(cmd.getDesc()).append("\n\n");
                     }
                 }
 
@@ -60,7 +60,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
             } else {
                 for (Category cat : Category.values()) {
                     if (cat != Category.HIDDEN) {
-                        em.addField("**" + cat.name().toUpperCase().charAt(0) + cat.name().substring(1).toLowerCase() + "**",  Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "help " + cat.name().toLowerCase(), true);
+                        em.addField("**" + cat.name().toUpperCase().charAt(0) + cat.name().substring(1).toLowerCase() + "**",  Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "help " + cat.name().toLowerCase(), true);
                     }
                 }
             }
diff --git a/src/main/java/de/presti/ree6/commands/impl/info/Info.java b/src/main/java/de/presti/ree6/commands/impl/info/Info.java
index 7fe431bec..e8a4ef238 100644
--- a/src/main/java/de/presti/ree6/commands/impl/info/Info.java
+++ b/src/main/java/de/presti/ree6/commands/impl/info/Info.java
@@ -27,7 +27,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
             if (args.length == 1) {
                 if(messageSelf.getMentionedMembers().isEmpty()) {
                     sendMessage("No User mentioned!", 5, m, hook);
-                    sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "info @user", 5, m, hook);
+                    sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "info @user", 5, m, hook);
                 } else {
                     EmbedBuilder em = new EmbedBuilder();
 
@@ -46,7 +46,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                 }
             } else {
                 sendMessage("Not enough Arguments!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "info @user", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "info @user", 5, m, hook);
             }
     }
 }
diff --git a/src/main/java/de/presti/ree6/commands/impl/level/Level.java b/src/main/java/de/presti/ree6/commands/impl/level/Level.java
index e881a5f94..67e4c0b5f 100644
--- a/src/main/java/de/presti/ree6/commands/impl/level/Level.java
+++ b/src/main/java/de/presti/ree6/commands/impl/level/Level.java
@@ -29,7 +29,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                     em.setThumbnail(sender.getUser().getAvatarUrl());
                     em.setTitle("Level");
 
-                    long chatxp = Main.sqlConnector.getSqlWorker().getChatXP(m.getGuild().getId(), sender.getUser().getId());
+                    long chatxp = Main.getInstance().getSqlConnector().getSqlWorker().getChatXP(m.getGuild().getId(), sender.getUser().getId());
 
                     int chatlevel = 1;
 
@@ -38,7 +38,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                         chatlevel++;
                     }
 
-                    long voicexp = Main.sqlConnector.getSqlWorker().getVoiceXP(m.getGuild().getId(), sender.getUser().getId());
+                    long voicexp = Main.getInstance().getSqlConnector().getSqlWorker().getVoiceXP(m.getGuild().getId(), sender.getUser().getId());
 
                     int vclevel = 1;
 
@@ -51,9 +51,9 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                     em.addBlankField(true);
                     em.addField("Voice Level", vclevel + "",true);
 
-                    em.addField("Chat XP", getFormattedXP(Main.sqlConnector.getSqlWorker().getChatXP(m.getGuild().getId(), sender.getUser().getId())) + "", true);
+                    em.addField("Chat XP", getFormattedXP(Main.getInstance().getSqlConnector().getSqlWorker().getChatXP(m.getGuild().getId(), sender.getUser().getId())) + "", true);
                     em.addBlankField(true);
-                    em.addField("Voice XP", getFormattedXP(Main.sqlConnector.getSqlWorker().getVoiceXP(m.getGuild().getId(), sender.getUser().getId())) + "",true);
+                    em.addField("Voice XP", getFormattedXP(Main.getInstance().getSqlConnector().getSqlWorker().getVoiceXP(m.getGuild().getId(), sender.getUser().getId())) + "",true);
 
                     em.setFooter("Requested by " + sender.getUser().getAsTag() + " - " + Data.ADVERTISEMENT, sender.getUser().getAvatarUrl());
 
@@ -65,7 +65,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                     em.setThumbnail(messageSelf.getMentionedMembers().get(0).getUser().getAvatarUrl());
                     em.setTitle("Level");
 
-                    long chatxp = Main.sqlConnector.getSqlWorker().getChatXP(m.getGuild().getId(), messageSelf.getMentionedMembers().get(0).getUser().getId());
+                    long chatxp = Main.getInstance().getSqlConnector().getSqlWorker().getChatXP(m.getGuild().getId(), messageSelf.getMentionedMembers().get(0).getUser().getId());
 
                     int chatlevel = 1;
 
@@ -74,7 +74,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                         chatlevel++;
                     }
 
-                    long voicexp = Main.sqlConnector.getSqlWorker().getVoiceXP(m.getGuild().getId(), messageSelf.getMentionedMembers().get(0).getUser().getId());
+                    long voicexp = Main.getInstance().getSqlConnector().getSqlWorker().getVoiceXP(m.getGuild().getId(), messageSelf.getMentionedMembers().get(0).getUser().getId());
 
                     int vclevel = 1;
 
@@ -87,9 +87,9 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                     em.addBlankField(true);
                     em.addField("Voice Level", vclevel + "",true);
 
-                    em.addField("Chat XP", getFormattedXP(Main.sqlConnector.getSqlWorker().getChatXP(m.getGuild().getId(), messageSelf.getMentionedMembers().get(0).getUser().getId())) + "", true);
+                    em.addField("Chat XP", getFormattedXP(Main.getInstance().getSqlConnector().getSqlWorker().getChatXP(m.getGuild().getId(), messageSelf.getMentionedMembers().get(0).getUser().getId())) + "", true);
                     em.addBlankField(true);
-                    em.addField("Voice XP", getFormattedXP(Main.sqlConnector.getSqlWorker().getVoiceXP(m.getGuild().getId(), messageSelf.getMentionedMembers().get(0).getUser().getId())) + "",true);
+                    em.addField("Voice XP", getFormattedXP(Main.getInstance().getSqlConnector().getSqlWorker().getVoiceXP(m.getGuild().getId(), messageSelf.getMentionedMembers().get(0).getUser().getId())) + "",true);
 
                     em.setFooter("Requested by " + sender.getUser().getAsTag() + " - " + Data.ADVERTISEMENT, sender.getUser().getAvatarUrl());
 
@@ -97,7 +97,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                 }
             } else {
                 sendMessage("Not enough Arguments!", m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "level or " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "level @user", m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "level or " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "level @user", m, hook);
             }
     }
 
diff --git a/src/main/java/de/presti/ree6/commands/impl/mod/Ban.java b/src/main/java/de/presti/ree6/commands/impl/mod/Ban.java
index f9e323511..314771a8a 100644
--- a/src/main/java/de/presti/ree6/commands/impl/mod/Ban.java
+++ b/src/main/java/de/presti/ree6/commands/impl/mod/Ban.java
@@ -24,7 +24,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
             if (args.length == 1) {
                 if(messageSelf.getMentionedMembers().isEmpty()) {
                     sendMessage("No User mentioned!", 5, m, hook);
-                    sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "ban @user", 5, m, hook);
+                    sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "ban @user", 5, m, hook);
                 } else {
                     if (m.getGuild().getSelfMember().canInteract(messageSelf.getMentionedMembers().get(0)) && sender.canInteract(messageSelf.getMentionedMembers().get(0))) {
                         sendMessage("User " + messageSelf.getMentionedMembers().get(0).getAsMention() + " has been banned!", 5, m, hook);
@@ -35,7 +35,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                 }
             } else {
                 sendMessage("Not enough Arguments!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "ban @user", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "ban @user", 5, m, hook);
             }
         } else {
             sendMessage("You don't have the Permission for this Command!", 5, m, hook);
diff --git a/src/main/java/de/presti/ree6/commands/impl/mod/ChatProtector.java b/src/main/java/de/presti/ree6/commands/impl/mod/ChatProtector.java
index 12aab7668..18da1096d 100644
--- a/src/main/java/de/presti/ree6/commands/impl/mod/ChatProtector.java
+++ b/src/main/java/de/presti/ree6/commands/impl/mod/ChatProtector.java
@@ -24,10 +24,10 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                 if(args.length == 1) {
                     if(args[0].equalsIgnoreCase("add")) {
                         sendMessage("Not enough Arguments!", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "chatprotector add WORD WORD2 WORD3 AND MORE WORDS", 5, m, hook);
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "chatprotector add WORD WORD2 WORD3 AND MORE WORDS", 5, m, hook);
                     } else if(args[0].equalsIgnoreCase("remove")) {
                         sendMessage("Not enough Arguments!", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "chatprotector remove WORD", 5, m, hook);
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "chatprotector remove WORD", 5, m, hook);
                     } else if (args[0].equalsIgnoreCase("list")) {
                         if(de.presti.ree6.addons.impl.ChatProtector.hasChatProtector(m.getGuild().getId())) {
                             StringBuilder end = new StringBuilder();
@@ -39,11 +39,11 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                             sendMessage("```" + end + "```", m, hook);
                         } else {
                             sendMessage("Your ChatProtector isn't setuped!", 5, m, hook);
-                            sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "chatprotector add WORD WORD2 WORD3 AND MORE WORDS", 5, m, hook);
+                            sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "chatprotector add WORD WORD2 WORD3 AND MORE WORDS", 5, m, hook);
                         }
                     } else {
                         sendMessage("Couldn't find " + args[0] + "!", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "chatprotector add/remove/list", 5, m, hook);
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "chatprotector add/remove/list", 5, m, hook);
                     }
                 } else {
                     if(args[0].equalsIgnoreCase("add")) {
@@ -65,12 +65,12 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                         sendMessage("The Word " + args[1] + " has been removed from your ChatProtector!", 5, m, hook);
                     } else {
                         sendMessage("Couldn't find " + args[0] + "!", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "chatprotector add/remove/list", 5, m, hook);
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "chatprotector add/remove/list", 5, m, hook);
                     }
                 }
             } else {
                 sendMessage("Not enough Arguments!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "chatprotector add/remove/list", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "chatprotector add/remove/list", 5, m, hook);
             }
         } else {
             sendMessage("You don't have the Permission for this Command!", 5, m, hook);
diff --git a/src/main/java/de/presti/ree6/commands/impl/mod/Clear.java b/src/main/java/de/presti/ree6/commands/impl/mod/Clear.java
index aba63e902..2024aa449 100644
--- a/src/main/java/de/presti/ree6/commands/impl/mod/Clear.java
+++ b/src/main/java/de/presti/ree6/commands/impl/mod/Clear.java
@@ -44,16 +44,16 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
 
                     } else {
                         sendMessage(args[0] + " isn't between 2 and 100 !", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "clear 1-100", 5, m, hook);
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "clear 1-100", 5, m, hook);
                     }
                 } catch (Exception ex) {
                     sendMessage(args[0] + " isn't a number!", 5, m, hook);
-                    sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "clear 2-100", 5, m, hook);
+                    sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "clear 2-100", 5, m, hook);
                     LoggerImpl.log("Clear", ex.getMessage() + " - " + ex.getStackTrace()[0].toString());
                 }
             } else {
                 sendMessage("Not enough Arguments!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "clear 2-100", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "clear 2-100", 5, m, hook);
             }
         } else {
             sendMessage("You don't have the Permission for this Command!", 5, m, hook);
diff --git a/src/main/java/de/presti/ree6/commands/impl/mod/Kick.java b/src/main/java/de/presti/ree6/commands/impl/mod/Kick.java
index 7f0acfb28..4810bcdd8 100644
--- a/src/main/java/de/presti/ree6/commands/impl/mod/Kick.java
+++ b/src/main/java/de/presti/ree6/commands/impl/mod/Kick.java
@@ -24,7 +24,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
             if (args.length == 1) {
                 if(messageSelf.getMentionedMembers().isEmpty()) {
                     sendMessage("No User mentioned!", 5, m, hook);
-                    sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "kick @user", 5, m, hook);
+                    sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "kick @user", 5, m, hook);
                 } else {
                     if (m.getGuild().getSelfMember().canInteract(messageSelf.getMentionedMembers().get(0)) && sender.canInteract(messageSelf.getMentionedMembers().get(0))) {
                         sendMessage("User " + messageSelf.getMentionedMembers().get(0).getAsMention() + " has been kicked!", 5, m, hook);
@@ -35,7 +35,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                 }
             } else {
                 sendMessage("Not enough Arguments!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "kick @user", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "kick @user", 5, m, hook);
             }
         } else {
             sendMessage("You dont have the Permission for this Command!", 5, m, hook);
diff --git a/src/main/java/de/presti/ree6/commands/impl/mod/Mute.java b/src/main/java/de/presti/ree6/commands/impl/mod/Mute.java
index 8fa632feb..f9baf2bec 100644
--- a/src/main/java/de/presti/ree6/commands/impl/mod/Mute.java
+++ b/src/main/java/de/presti/ree6/commands/impl/mod/Mute.java
@@ -24,18 +24,18 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
         if (sender.hasPermission(Permission.ADMINISTRATOR)) {
             if (args.length == 1) {
 
-                if(!Main.sqlConnector.getSqlWorker().isMuteSetup(m.getGuild().getId())) {
-                    sendMessage("Mute Role hasn't been setuped!\nTo setup it up type " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup mute @MuteRole !", 5, m, hook);
+                if(!Main.getInstance().getSqlConnector().getSqlWorker().isMuteSetup(m.getGuild().getId())) {
+                    sendMessage("Mute Role hasn't been setuped!\nTo setup it up type " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup mute @MuteRole !", 5, m, hook);
                     return;
                 }
 
                 if(messageSelf.getMentionedUsers().isEmpty()) {
                     sendMessage("No User mentioned!", 5, m, hook);
-                    sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "mute @user", 5, m, hook);
+                    sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "mute @user", 5, m, hook);
                 } else {
                     if (m.getGuild().getSelfMember().canInteract(messageSelf.getMentionedMembers().get(0)) && sender.canInteract(messageSelf.getMentionedMembers().get(0))) {
                         sendMessage("User " + messageSelf.getMentionedMembers().get(0).getAsMention() + " has been muted!", 5, m, hook);
-                        Role r = m.getGuild().getRoleById(Main.sqlConnector.getSqlWorker().getMuteRole(sender.getGuild().getId()));
+                        Role r = m.getGuild().getRoleById(Main.getInstance().getSqlConnector().getSqlWorker().getMuteRole(sender.getGuild().getId()));
                         m.getGuild().addRoleToMember(messageSelf.getMentionedMembers().get(0), r).queue();
                     } else {
                         sendMessage("Couldn't mute this User because he has a higher Rank then me!", 5, m, hook);
@@ -43,7 +43,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                 }
             } else {
                 sendMessage("Not enough Arguments!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "mute @user", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "mute @user", 5, m, hook);
             }
         } else {
             sendMessage("You don't have the Permission for this Command!", 5, m, hook);
diff --git a/src/main/java/de/presti/ree6/commands/impl/mod/Prefix.java b/src/main/java/de/presti/ree6/commands/impl/mod/Prefix.java
index 5168c49f9..8e381adfe 100644
--- a/src/main/java/de/presti/ree6/commands/impl/mod/Prefix.java
+++ b/src/main/java/de/presti/ree6/commands/impl/mod/Prefix.java
@@ -24,9 +24,9 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
         if (sender.hasPermission(Permission.ADMINISTRATOR) && sender.hasPermission(Permission.MANAGE_SERVER)) {
             if (args.length != 1) {
                 sendMessage((args.length < 1 ? "Not enough" : "Too many") + " Arguments!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "prefix PREFIX", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "prefix PREFIX", 5, m, hook);
             } else {
-                Main.sqlConnector.getSqlWorker().setSetting(m.getGuild().getId(), "chatprefix", args[0]);
+                Main.getInstance().getSqlConnector().getSqlWorker().setSetting(m.getGuild().getId(), "chatprefix", args[0]);
                 sendMessage("Your new Prefix has been set to: " + args[0], 5, m, hook);
             }
         } else {
diff --git a/src/main/java/de/presti/ree6/commands/impl/mod/Setup.java b/src/main/java/de/presti/ree6/commands/impl/mod/Setup.java
index 3321f7ab0..0c665222e 100644
--- a/src/main/java/de/presti/ree6/commands/impl/mod/Setup.java
+++ b/src/main/java/de/presti/ree6/commands/impl/mod/Setup.java
@@ -22,59 +22,59 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                 if (args[0].equalsIgnoreCase("log")) {
                     if (messageSelf.getMentionedChannels().isEmpty()) {
                         sendMessage("No Channel mentioned!", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup log #Log-Channel", 5, m, hook);
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup log #Log-Channel", 5, m, hook);
                     } else {
-                        messageSelf.getMentionedChannels().get(0).createWebhook("Ree6-Log").queue(w -> Main.sqlConnector.getSqlWorker().setLogWebhook(sender.getGuild().getId(), w.getId(), w.getToken()));
+                        messageSelf.getMentionedChannels().get(0).createWebhook("Ree6-Log").queue(w -> Main.getInstance().getSqlConnector().getSqlWorker().setLogWebhook(sender.getGuild().getId(), w.getId(), w.getToken()));
                         sendMessage("Log channel has been set!", 5, m, hook);
                     }
                 } else if (args[0].equalsIgnoreCase("welcome")) {
                     if (messageSelf.getMentionedChannels().isEmpty()) {
                         sendMessage("No Channel mentioned!", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup welcome #Welcome-Channel", 5, m, hook);
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup welcome #Welcome-Channel", 5, m, hook);
                     } else {
-                        messageSelf.getMentionedChannels().get(0).createWebhook("Ree6-Welcome").queue(w -> Main.sqlConnector.getSqlWorker().setWelcomeWebhook(sender.getGuild().getId(), w.getId(), w.getToken()));
+                        messageSelf.getMentionedChannels().get(0).createWebhook("Ree6-Welcome").queue(w -> Main.getInstance().getSqlConnector().getSqlWorker().setWelcomeWebhook(sender.getGuild().getId(), w.getId(), w.getToken()));
                         sendMessage("Welcome channel has been set!", 5, m, hook);
                     }
                 } else if (args[0].equalsIgnoreCase("mute")) {
                     if (messageSelf.getMentionedRoles().isEmpty()) {
                         sendMessage("No Role mentioned!", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup mute @Muterole", 5, m, hook);
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup mute @Muterole", 5, m, hook);
                     } else {
-                        Main.sqlConnector.getSqlWorker().setMuteRole(sender.getGuild().getId(), messageSelf.getMentionedRoles().get(0).getId());
+                        Main.getInstance().getSqlConnector().getSqlWorker().setMuteRole(sender.getGuild().getId(), messageSelf.getMentionedRoles().get(0).getId());
                         sendMessage("Mute Role has been set!", 5, m, hook);
                     }
                 } else if (args[0].equalsIgnoreCase("autorole")) {
                     if (args.length == 3) {
                         if (messageSelf.getMentionedRoles().isEmpty()) {
                             sendMessage("No Role mentioned!", 5, m, hook);
-                            sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup autorole add/remove @role", 5, m, hook);
+                            sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup autorole add/remove @role", 5, m, hook);
                         } else {
                             if (args[1].equalsIgnoreCase("add")) {
-                                Main.sqlConnector.getSqlWorker().addAutoRole(m.getGuild().getId(), messageSelf.getMentionedRoles().get(0).getId());
+                                Main.getInstance().getSqlConnector().getSqlWorker().addAutoRole(m.getGuild().getId(), messageSelf.getMentionedRoles().get(0).getId());
                                 sendMessage("Autorole has been added!", 5, m, hook);
                             } else if (args[1].equalsIgnoreCase("remove")) {
-                                Main.sqlConnector.getSqlWorker().removeAutoRole(m.getGuild().getId(), messageSelf.getMentionedRoles().get(0).getId());
+                                Main.getInstance().getSqlConnector().getSqlWorker().removeAutoRole(m.getGuild().getId(), messageSelf.getMentionedRoles().get(0).getId());
                                 sendMessage("Autorole has been removed!", 5, m, hook);
                             } else {
-                                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup autorole add/remove @role", 5, m, hook);
+                                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup autorole add/remove @role", 5, m, hook);
                             }
                         }
                     } else {
                         sendMessage("Not enough Arguments!", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup autorole add/remove @role", 5, m, hook);
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup autorole add/remove @role", 5, m, hook);
                     }
                 } else if (args[0].equalsIgnoreCase("news")) {
                     if (messageSelf.getMentionedChannels().isEmpty()) {
                         sendMessage("No Channel mentioned!", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup news #Ree6-News", 5, m, hook);
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup news #Ree6-News", 5, m, hook);
                     } else {
-                        messageSelf.getMentionedChannels().get(0).createWebhook("Ree6-News").queue(w -> Main.sqlConnector.getSqlWorker().setNewsWebhook(sender.getGuild().getId(), w.getId(), w.getToken()));
+                        messageSelf.getMentionedChannels().get(0).createWebhook("Ree6-News").queue(w -> Main.getInstance().getSqlConnector().getSqlWorker().setNewsWebhook(sender.getGuild().getId(), w.getId(), w.getToken()));
                         sendMessage("News channel has been set!", 5, m, hook);
                     }
                 } else if (args[0].equalsIgnoreCase("join")) {
                     if (args.length == 1) {
                         sendMessage("No Message given!", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "join Your Join Message", 5, m, hook);
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "join Your Join Message", 5, m, hook);
                         sendMessage("Usable Syntaxes: %user_name%, %guild_name%, %user_mention%", 5, m, hook);
                     } else {
                         StringBuilder message = new StringBuilder();
@@ -89,59 +89,59 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                             return;
                         }
 
-                        Main.sqlConnector.getSqlWorker().setMessage(m.getGuild().getId(), message.toString());
+                        Main.getInstance().getSqlConnector().getSqlWorker().setMessage(m.getGuild().getId(), message.toString());
 
                         sendMessage("Join Message has been set!", 5, m, hook);
                     }
                 } else if (args[0].equalsIgnoreCase("r6")) {
                     if (messageSelf.getMentionedChannels().isEmpty()) {
                         sendMessage("No Channel mentioned!", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup r6 #R6-Mate-Search-Channel", 5, m, hook);
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup r6 #R6-Mate-Search-Channel", 5, m, hook);
                     } else {
-                        messageSelf.getMentionedChannels().get(0).createWebhook("Ree6-MateSearch").queue(w -> Main.sqlConnector.getSqlWorker().setRainbowWebhook(sender.getGuild().getId(), w.getId(), w.getToken()));
+                        messageSelf.getMentionedChannels().get(0).createWebhook("Ree6-MateSearch").queue(w -> Main.getInstance().getSqlConnector().getSqlWorker().setRainbowWebhook(sender.getGuild().getId(), w.getId(), w.getToken()));
                         sendMessage("R6 Mate Search channel has been set!", 5, m, hook);
                     }
                 } else if (args[0].equalsIgnoreCase("rewards")) {
                     if(args.length != 5) {
                         sendMessage("No Param. error!", 5, m, hook);
-                        sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "rewards vc/chat add/remove Level @Role", 5, m, hook);
-                    } else if (args.length == 5) {
+                        sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "rewards vc/chat add/remove Level @Role", 5, m, hook);
+                    } else {
                         if (messageSelf.getMentionedRoles().isEmpty()) {
                             sendMessage("No Role mentioned!", 5, m, hook);
-                            sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "rewards vc/chat add/remove Level @Role", 5, m, hook);
+                            sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "rewards vc/chat add/remove Level @Role", 5, m, hook);
                         } else {
                             if (args[2].equalsIgnoreCase("add")) {
                                 if(args[1].equalsIgnoreCase("vc")) {
-                                    Main.sqlConnector.getSqlWorker().addVoiceLevelReward(m.getGuild().getId(), messageSelf.getMentionedRoles().get(0).getId(), Integer.parseInt(args[3]));
+                                    Main.getInstance().getSqlConnector().getSqlWorker().addVoiceLevelReward(m.getGuild().getId(), messageSelf.getMentionedRoles().get(0).getId(), Integer.parseInt(args[3]));
                                     sendMessage("VoiceReward has been added!", 5, m, hook);
                                 } else if (args[1].equalsIgnoreCase("chat")) {
-                                    Main.sqlConnector.getSqlWorker().addChatLevelReward(m.getGuild().getId(), messageSelf.getMentionedRoles().get(0).getId(), Integer.parseInt(args[3]));
+                                    Main.getInstance().getSqlConnector().getSqlWorker().addChatLevelReward(m.getGuild().getId(), messageSelf.getMentionedRoles().get(0).getId(), Integer.parseInt(args[3]));
                                     sendMessage("ChatReward has been added!", 5, m, hook);
                                 } else {
-                                    sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "rewards vc/chat add/remove Level @Role", 5, m, hook);
+                                    sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "rewards vc/chat add/remove Level @Role", 5, m, hook);
                                 }
                             } else if (args[2].equalsIgnoreCase("remove")) {
                                 if(args[1].equalsIgnoreCase("vc")) {
-                                    Main.sqlConnector.getSqlWorker().removeVoiceLevelReward(m.getGuild().getId(), Integer.parseInt(args[3]));
+                                    Main.getInstance().getSqlConnector().getSqlWorker().removeVoiceLevelReward(m.getGuild().getId(), Integer.parseInt(args[3]));
                                     sendMessage("VoiceReward has been removed!", 5, m, hook);
                                 } else if (args[1].equalsIgnoreCase("chat")) {
-                                    Main.sqlConnector.getSqlWorker().removeChatLevelReward(m.getGuild().getId(), Integer.parseInt(args[3]));
+                                    Main.getInstance().getSqlConnector().getSqlWorker().removeChatLevelReward(m.getGuild().getId(), Integer.parseInt(args[3]));
                                     sendMessage("ChatReward has been removed!", 5, m, hook);
                                 } else {
-                                    sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "rewards vc/chat add/remove Level @Role", 5, m, hook);
+                                    sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "rewards vc/chat add/remove Level @Role", 5, m, hook);
                                 }
                             } else {
-                                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "rewards vc/chat add/remove Level @Role", 5, m, hook);
+                                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "rewards vc/chat add/remove Level @Role", 5, m, hook);
                             }
                         }
                     }
                 } else {
                     sendMessage("Couldnt find " + args[0] + "!", 5, m, hook);
-                    sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup log/welcome/news/r6/mute/autorole/join/rewards", 5, m, hook);
+                    sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup log/welcome/news/r6/mute/autorole/join/rewards", 5, m, hook);
                 }
             } else {
                 sendMessage("Not enough Arguments!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup log/welcome/news/r6/mute/autorole/rewards/join #Log/#Welcome/#Ree6-News/#R6-Mate-Search/@Mute/@Autorole/vc or chat/Your Custom Join Message", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup log/welcome/news/r6/mute/autorole/rewards/join #Log/#Welcome/#Ree6-News/#R6-Mate-Search/@Mute/@Autorole/vc or chat/Your Custom Join Message", 5, m, hook);
             }
         } else {
             sendMessage("You dont have the Permission for this Command!", 5, m, hook);
diff --git a/src/main/java/de/presti/ree6/commands/impl/mod/Unban.java b/src/main/java/de/presti/ree6/commands/impl/mod/Unban.java
index 62fe7cae4..6ab10f06f 100644
--- a/src/main/java/de/presti/ree6/commands/impl/mod/Unban.java
+++ b/src/main/java/de/presti/ree6/commands/impl/mod/Unban.java
@@ -27,7 +27,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                 sendMessage("User <@" + givenid + "> has been unbanned!", 5, m, hook);
             } else {
                 sendMessage("Not enough Arguments!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "unban @user", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "unban @user", 5, m, hook);
             }
         } else {
             sendMessage("You dont have the Permission for this Command!", 5, m, hook);
diff --git a/src/main/java/de/presti/ree6/commands/impl/mod/Unmute.java b/src/main/java/de/presti/ree6/commands/impl/mod/Unmute.java
index 620541b43..fdcf59832 100644
--- a/src/main/java/de/presti/ree6/commands/impl/mod/Unmute.java
+++ b/src/main/java/de/presti/ree6/commands/impl/mod/Unmute.java
@@ -24,22 +24,22 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
         if (sender.hasPermission(Permission.ADMINISTRATOR)) {
             if (args.length == 1) {
 
-                if(!Main.sqlConnector.getSqlWorker().isMuteSetup(m.getGuild().getId())) {
-                    sendMessage("Mute Role hasnt been setuped!\nTo setup it up type " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup mute @MuteRole !", 5, m, hook);
+                if(!Main.getInstance().getSqlConnector().getSqlWorker().isMuteSetup(m.getGuild().getId())) {
+                    sendMessage("Mute Role hasnt been setuped!\nTo setup it up type " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "setup mute @MuteRole !", 5, m, hook);
                     return;
                 }
 
                 if(messageSelf.getMentionedMembers().isEmpty()) {
                     sendMessage("No User mentioned!", 5, m, hook);
-                    sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "unmute @user", 5, m, hook);
+                    sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "unmute @user", 5, m, hook);
                 } else {
                     sendMessage("User " + messageSelf.getMentionedMembers().get(0).getAsMention() + " has been unmuted!", 5, m, hook);
-                    Role r = m.getGuild().getRoleById(Main.sqlConnector.getSqlWorker().getMuteRole(sender.getGuild().getId()));
+                    Role r = m.getGuild().getRoleById(Main.getInstance().getSqlConnector().getSqlWorker().getMuteRole(sender.getGuild().getId()));
                     m.getGuild().removeRoleFromMember(messageSelf.getMentionedMembers().get(0), r).queue();
                 }
             } else {
                 sendMessage("Not enough Arguments!", 5, m, hook);
-                sendMessage("Use " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "unmute @user", 5, m, hook);
+                sendMessage("Use " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "unmute @user", 5, m, hook);
             }
         } else {
             sendMessage("You dont have the Permission for this Command!", 5, m, hook);
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Clearqueue.java b/src/main/java/de/presti/ree6/commands/impl/music/Clearqueue.java
index eff2a4218..50d36b614 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Clearqueue.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Clearqueue.java
@@ -33,6 +33,6 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
         
         sendMessage(em, 5, m, hook);
 
-        Main.musicWorker.getGuildAudioPlayer(m.getGuild()).scheduler.clearQueue();
+        Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).scheduler.clearQueue();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Disconnect.java b/src/main/java/de/presti/ree6/commands/impl/music/Disconnect.java
index 14b21634b..6169ef4cf 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Disconnect.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Disconnect.java
@@ -21,8 +21,8 @@ public Disconnect() {
 
     @Override
     public void onPerform(Member sender, Message messageSelf, String[] args, TextChannel m, InteractionHook hook) {
-        if (Main.musicWorker.getGuildAudioPlayer(m.getGuild()) != null && Main.musicWorker.getGuildAudioPlayer(m.getGuild()).getSendHandler().isMusicPlaying(m.getGuild())) {
-            Main.musicWorker.getGuildAudioPlayer(m.getGuild()).scheduler.stopAll();
+        if (Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()) != null && Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).getSendHandler().isMusicPlaying(m.getGuild())) {
+            Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).scheduler.stopAll();
         } else {
             EmbedBuilder em = new EmbedBuilder();
 
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Loop.java b/src/main/java/de/presti/ree6/commands/impl/music/Loop.java
index bfd88a189..e8e532d83 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Loop.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Loop.java
@@ -23,15 +23,15 @@ public Loop() {
     public void onPerform(Member sender, Message messageSelf, String[] args, TextChannel m, InteractionHook hook) {
         EmbedBuilder em = new EmbedBuilder();
         
-        Main.musicWorker.getGuildAudioPlayer(
-                m.getGuild()).scheduler.loop = !Main.musicWorker.getGuildAudioPlayer(m.getGuild()).scheduler.loop;
+        Main.getInstance().getMusicWorker().getGuildAudioPlayer(
+                m.getGuild()).scheduler.loop = !Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).scheduler.loop;
 
         em.setAuthor(BotInfo.botInstance.getSelfUser().getName(), Data.WEBSITE,
                 BotInfo.botInstance.getSelfUser().getAvatarUrl());
         em.setTitle("Music Player!");
         em.setThumbnail(BotInfo.botInstance.getSelfUser().getAvatarUrl());
         em.setColor(Color.GREEN);
-        em.setDescription(Main.musicWorker.getGuildAudioPlayer(m.getGuild()).scheduler.loop ? "Song Loop has been activated!"
+        em.setDescription(Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).scheduler.loop ? "Song Loop has been activated!"
                 : "Song Loop has been deactivated!");
         em.setFooter(m.getGuild().getName() + " - " + Data.ADVERTISEMENT, m.getGuild().getIconUrl());
 
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Lyrics.java b/src/main/java/de/presti/ree6/commands/impl/music/Lyrics.java
index 4db08e8a8..ee4ba9656 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Lyrics.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Lyrics.java
@@ -30,7 +30,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
         AudioPlayerSendHandler sendingHandler = (AudioPlayerSendHandler) m.getGuild().getAudioManager().getSendingHandler();
 
         if (sendingHandler.isMusicPlaying(m.getGuild())) {
-            GuildMusicManager gmm = Main.musicWorker.getGuildAudioPlayer(m.getGuild());
+            GuildMusicManager gmm = Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild());
             String title = gmm.player.getPlayingTrack().getInfo().title.replace("(Official Music Video)", "").replace("(Official Video)", "")
                     .replace("(Music Video)", "").replace("(Official Music)", "").replace("(Official Lyrics)", "")
                     .replace("(Lyrics)", "").replace("(Audio)", "").replace("(Official Audio)", "");
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Pause.java b/src/main/java/de/presti/ree6/commands/impl/music/Pause.java
index a12109d64..d20c9d693 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Pause.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Pause.java
@@ -23,7 +23,7 @@ public Pause() {
     public void onPerform(Member sender, Message messageSelf, String[] args, TextChannel m, InteractionHook hook) {
         EmbedBuilder em = new EmbedBuilder();
 
-        Main.musicWorker.getGuildAudioPlayer(m.getGuild()).player.setPaused(true);
+        Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).player.setPaused(true);
 
         em.setAuthor(BotInfo.botInstance.getSelfUser().getName(), Data.WEBSITE,
                 BotInfo.botInstance.getSelfUser().getAvatarUrl());
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Play.java b/src/main/java/de/presti/ree6/commands/impl/music/Play.java
index 7b755c22b..ad20177ba 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Play.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Play.java
@@ -43,11 +43,11 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
             em.setTitle("Music Player!");
             em.setThumbnail(BotInfo.botInstance.getSelfUser().getAvatarUrl());
             em.setColor(Color.GREEN);
-            em.setDescription("Usage: " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "play (Url)");
+            em.setDescription("Usage: " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "play (Url)");
             em.setFooter(m.getGuild().getName() + " - " + Data.ADVERTISEMENT, m.getGuild().getIconUrl());
             sendMessage(em, 5, m, hook);
         } else {
-            if (Main.musicWorker.isConnectedMember(sender)) {
+            if (Main.getInstance().getMusicWorker().isConnectedMember(sender)) {
                 ArrayUtil.botJoin.remove(m.getGuild());
                 ArrayUtil.botJoin.put(m.getGuild(), sender);
             }
@@ -66,7 +66,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                 }
 
                 if (!isspotify) {
-                    Main.musicWorker.loadAndPlay(m, args[0]);
+                    Main.getInstance().getMusicWorker().loadAndPlay(m, args[0]);
                 } else {
                     ArrayList<String> loadfailed = new ArrayList<>();
                     boolean b = false;
@@ -77,10 +77,10 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                             loadfailed.add(search);
                         } else {
                             if (!b) {
-                                Main.musicWorker.loadAndPlay(m, ytresult);
+                                Main.getInstance().getMusicWorker().loadAndPlay(m, ytresult);
                                 b = true;
                             } else {
-                                Main.musicWorker.loadAndPlaySilence(m, ytresult);
+                                Main.getInstance().getMusicWorker().loadAndPlaySilence(m, ytresult);
                             }
                         }
                     }
@@ -115,7 +115,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
                     em.setFooter(m.getGuild().getName() + " - " + Data.ADVERTISEMENT, m.getGuild().getIconUrl());
                     sendMessage(em, 5, m, hook);
                 } else {
-                    Main.musicWorker.loadAndPlay(m, ytResult);
+                    Main.getInstance().getMusicWorker().loadAndPlay(m, ytResult);
                 }
             }
         }
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Resume.java b/src/main/java/de/presti/ree6/commands/impl/music/Resume.java
index adc101df0..34aef3796 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Resume.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Resume.java
@@ -23,7 +23,7 @@ public Resume() {
     public void onPerform(Member sender, Message messageSelf, String[] args, TextChannel m, InteractionHook hook) {
         EmbedBuilder em = new EmbedBuilder();
 
-        Main.musicWorker.getGuildAudioPlayer(m.getGuild()).player.setPaused(false);
+        Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).player.setPaused(false);
 
         em.setAuthor(BotInfo.botInstance.getSelfUser().getName(), Data.WEBSITE,
                 BotInfo.botInstance.getSelfUser().getAvatarUrl());
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Shuffle.java b/src/main/java/de/presti/ree6/commands/impl/music/Shuffle.java
index bcb61a5e5..c423cb82e 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Shuffle.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Shuffle.java
@@ -23,15 +23,15 @@ public Shuffle() {
     public void onPerform(Member sender, Message messageSelf, String[] args, TextChannel m, InteractionHook hook) {
         EmbedBuilder em = new EmbedBuilder();
 
-        Main.musicWorker.getGuildAudioPlayer(
-                m.getGuild()).scheduler.shuffle = !Main.musicWorker.getGuildAudioPlayer(m.getGuild()).scheduler.shuffle;
+        Main.getInstance().getMusicWorker().getGuildAudioPlayer(
+                m.getGuild()).scheduler.shuffle = !Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).scheduler.shuffle;
 
         em.setAuthor(BotInfo.botInstance.getSelfUser().getName(), Data.WEBSITE,
                 BotInfo.botInstance.getSelfUser().getAvatarUrl());
         em.setTitle("Music Player!");
         em.setThumbnail(BotInfo.botInstance.getSelfUser().getAvatarUrl());
         em.setColor(Color.GREEN);
-        em.setDescription(Main.musicWorker.getGuildAudioPlayer(m.getGuild()).scheduler.shuffle ? "Song Shuffle has been activated!"
+        em.setDescription(Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).scheduler.shuffle ? "Song Shuffle has been activated!"
                 : "Song Shuffle has been deactivated!");
         em.setFooter(m.getGuild().getName() + " - " + Data.ADVERTISEMENT, m.getGuild().getIconUrl());
 
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Skip.java b/src/main/java/de/presti/ree6/commands/impl/music/Skip.java
index cfd8ec2ad..72e4a798d 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Skip.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Skip.java
@@ -16,6 +16,6 @@ public Skip() {
 
     @Override
     public void onPerform(Member sender, Message messageSelf, String[] args, TextChannel m, InteractionHook hook) {
-        Main.musicWorker.skipTrack(m);
+        Main.getInstance().getMusicWorker().skipTrack(m);
     }
 }
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Songinfo.java b/src/main/java/de/presti/ree6/commands/impl/music/Songinfo.java
index c9faff74d..428525881 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Songinfo.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Songinfo.java
@@ -26,7 +26,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
 
         StringBuilder end = new StringBuilder("```");
 
-        for (AudioTrack track : Main.musicWorker.getGuildAudioPlayer(m.getGuild()).scheduler.getQueue()) {
+        for (AudioTrack track : Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).scheduler.getQueue()) {
             end.append("\n").append(track.getInfo().title);
         }
 
@@ -37,8 +37,8 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
         em.setTitle("Music Player!");
         em.setThumbnail(BotInfo.botInstance.getSelfUser().getAvatarUrl());
         em.setColor(Color.GREEN);
-        em.setDescription(Main.musicWorker.getGuildAudioPlayer(m.getGuild()).player.getPlayingTrack() == null ? "No Song is being played right now!" : "**Song:** ```"
-                + Main.musicWorker.getGuildAudioPlayer(m.getGuild()).player.getPlayingTrack().getInfo().title + " by " + Main.musicWorker.getGuildAudioPlayer(m.getGuild()).player.getPlayingTrack().getInfo().author + "```");
+        em.setDescription(Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).player.getPlayingTrack() == null ? "No Song is being played right now!" : "**Song:** ```"
+                + Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).player.getPlayingTrack().getInfo().title + " by " + Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).player.getPlayingTrack().getInfo().author + "```");
         em.setFooter(m.getGuild().getName() + " - " + Data.ADVERTISEMENT, m.getGuild().getIconUrl());
 
         sendMessage(em, 5, m, hook);
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Songlist.java b/src/main/java/de/presti/ree6/commands/impl/music/Songlist.java
index 9b8aa6cac..ba7a6304e 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Songlist.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Songlist.java
@@ -27,7 +27,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
         
         StringBuilder end = new StringBuilder("```");
 
-        for (AudioTrack track : Main.musicWorker.getGuildAudioPlayer(m.getGuild()).scheduler.getQueue()) {
+        for (AudioTrack track : Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).scheduler.getQueue()) {
             end.append("\n").append(track.getInfo().title);
         }
 
@@ -38,7 +38,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
         em.setTitle("Music Player!");
         em.setThumbnail(BotInfo.botInstance.getSelfUser().getAvatarUrl());
         em.setColor(Color.GREEN);
-        em.setDescription(Main.musicWorker.getGuildAudioPlayer(m.getGuild()).scheduler.getQueue().size() == 0 ? "No Song in the Queue" :  (end.length() > 4096 ? "Error (M-SL-01)" : "Songs: " + end));
+        em.setDescription(Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).scheduler.getQueue().size() == 0 ? "No Song in the Queue" :  (end.length() > 4096 ? "Error (M-SL-01)" : "Songs: " + end));
         em.setFooter(m.getGuild().getName() + " - " + Data.ADVERTISEMENT, m.getGuild().getIconUrl());
 
         sendMessage(em, 5, m, hook);
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Stop.java b/src/main/java/de/presti/ree6/commands/impl/music/Stop.java
index d3c159276..d82c3cd95 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Stop.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Stop.java
@@ -21,8 +21,8 @@ public Stop() {
 
     @Override
     public void onPerform(Member sender, Message messageSelf, String[] args, TextChannel m, InteractionHook hook) {
-        if (Main.musicWorker.getGuildAudioPlayer(m.getGuild()) != null) {
-            Main.musicWorker.getGuildAudioPlayer(m.getGuild()).scheduler.stopAll();
+        if (Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()) != null) {
+            Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).scheduler.stopAll();
         } else {
             EmbedBuilder em = new EmbedBuilder();
 
diff --git a/src/main/java/de/presti/ree6/commands/impl/music/Volume.java b/src/main/java/de/presti/ree6/commands/impl/music/Volume.java
index 425156f69..67c1e59b4 100644
--- a/src/main/java/de/presti/ree6/commands/impl/music/Volume.java
+++ b/src/main/java/de/presti/ree6/commands/impl/music/Volume.java
@@ -35,7 +35,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
             } catch (Exception e) {
                 vol = 50;
             }
-            Main.musicWorker.getGuildAudioPlayer(m.getGuild()).player.setVolume(vol);
+            Main.getInstance().getMusicWorker().getGuildAudioPlayer(m.getGuild()).player.setVolume(vol);
 
             em.setAuthor(BotInfo.botInstance.getSelfUser().getName(), Data.WEBSITE,
                     BotInfo.botInstance.getSelfUser().getAvatarUrl());
@@ -51,7 +51,7 @@ public void onPerform(Member sender, Message messageSelf, String[] args, TextCha
             em.setTitle("Music Player!");
             em.setThumbnail(BotInfo.botInstance.getSelfUser().getAvatarUrl());
             em.setColor(Color.GREEN);
-            em.setDescription("Type " + Main.sqlConnector.getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "volume [voulume]");
+            em.setDescription("Type " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(sender.getGuild().getId(), "chatprefix").getStringValue() + "volume [voulume]");
         }
         em.setFooter(m.getGuild().getName() + " - " + Data.ADVERTISEMENT, m.getGuild().getIconUrl());
 
diff --git a/src/main/java/de/presti/ree6/events/LoggingEvents.java b/src/main/java/de/presti/ree6/events/LoggingEvents.java
index 56eb78180..43c68ebe9 100644
--- a/src/main/java/de/presti/ree6/events/LoggingEvents.java
+++ b/src/main/java/de/presti/ree6/events/LoggingEvents.java
@@ -55,12 +55,12 @@ public class LoggingEvents extends ListenerAdapter {
     public void onGuildMemberJoin(GuildMemberJoinEvent event) {
 
 
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()))
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()))
             return;
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
 
-        if (Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_memberjoin").getBooleanValue()) {
+        if (Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_memberjoin").getBooleanValue()) {
             WebhookMessageBuilder wm = new WebhookMessageBuilder();
 
             wm.setAvatarUrl(BotInfo.botInstance.getSelfUser().getAvatarUrl());
@@ -75,10 +75,10 @@ public void onGuildMemberJoin(GuildMemberJoinEvent event) {
             we.setDescription(event.getUser().getAsMention() + " **joined the Server.**\n:timer: Age of the Account:\n``" + event.getUser().getTimeCreated().format(DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm")) + "``\n**" + TimeUtil.getFormattedDate(TimeUtil.getDifferenceBetween(event.getUser().getTimeCreated().toLocalDateTime(), LocalDateTime.now())) + "**");
 
             wm.addEmbeds(we.build());
-            Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.SERVER_JOIN));
+            Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.SERVER_JOIN));
         }
 
-        if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_SERVER) && Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_invite").getBooleanValue()) {
+        if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_SERVER) && Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_invite").getBooleanValue()) {
 
             WebhookMessageBuilder wm2 = new WebhookMessageBuilder();
 
@@ -95,15 +95,15 @@ public void onGuildMemberJoin(GuildMemberJoinEvent event) {
                 wm2.append("Couldn't find out how " + event.getMember().getAsMention() + " joined :C");
             }
 
-            Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm2.build(), LoggerMessage.LogTyp.SERVER_INVITE));
+            Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm2.build(), LoggerMessage.LogTyp.SERVER_INVITE));
         }
     }
 
     @Override
     public void onGuildMemberRemove(@Nonnull GuildMemberRemoveEvent event) {
 
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_memberleave").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_memberleave").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -121,16 +121,16 @@ public void onGuildMemberRemove(@Nonnull GuildMemberRemoveEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.SERVER_LEAVE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.SERVER_LEAVE));
     }
 
     @Override
     public void onGuildBan(@Nonnull GuildBanEvent event) {
 
 
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_memberban").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_memberban").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -148,15 +148,15 @@ public void onGuildBan(@Nonnull GuildBanEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.USER_BAN));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.USER_BAN));
     }
 
     @Override
     public void onGuildUnban(@Nonnull GuildUnbanEvent event) {
 
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_memberunban").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_memberunban").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -174,16 +174,16 @@ public void onGuildUnban(@Nonnull GuildUnbanEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.USER_UNBAN));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.USER_UNBAN));
     }
 
 
     @Override
     public void onGuildMemberUpdateNickname(@Nonnull GuildMemberUpdateNicknameEvent event) {
 
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_nickname").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_nickname").getBooleanValue())
             return;
 
 
@@ -207,15 +207,15 @@ public void onGuildMemberUpdateNickname(@Nonnull GuildMemberUpdateNicknameEvent
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerMemberData(event.getEntity(), event.getOldNickname(), event.getNewNickname()), LoggerMessage.LogTyp.NICKNAME_CHANGE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerMemberData(event.getEntity(), event.getOldNickname(), event.getNewNickname()), LoggerMessage.LogTyp.NICKNAME_CHANGE));
     }
 
     @Override
     public void onGuildVoiceJoin(@Nonnull GuildVoiceJoinEvent event) {
 
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_voicejoin").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_voicejoin").getBooleanValue())
             return;
 
 
@@ -233,15 +233,15 @@ public void onGuildVoiceJoin(@Nonnull GuildVoiceJoinEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerVoiceData(event.getEntity(), event.getChannelJoined(), LoggerVoiceData.LoggerVoiceTyp.JOIN), LoggerMessage.LogTyp.VC_JOIN));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerVoiceData(event.getEntity(), event.getChannelJoined(), LoggerVoiceData.LoggerVoiceTyp.JOIN), LoggerMessage.LogTyp.VC_JOIN));
     }
 
     @Override
     public void onGuildVoiceMove(@Nonnull GuildVoiceMoveEvent event) {
 
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_voicemove").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_voicemove").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -258,15 +258,15 @@ public void onGuildVoiceMove(@Nonnull GuildVoiceMoveEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] info = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(info[0]), info[1], wm.build(), new LoggerVoiceData(event.getEntity(), event.getChannelLeft(), event.getChannelJoined(), LoggerVoiceData.LoggerVoiceTyp.MOVE), LoggerMessage.LogTyp.VC_MOVE));
+        String[] info = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(info[0]), info[1], wm.build(), new LoggerVoiceData(event.getEntity(), event.getChannelLeft(), event.getChannelJoined(), LoggerVoiceData.LoggerVoiceTyp.MOVE), LoggerMessage.LogTyp.VC_MOVE));
     }
 
     @Override
     public void onGuildVoiceLeave(@Nonnull GuildVoiceLeaveEvent event) {
 
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_voiceleave").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_voiceleave").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -283,15 +283,15 @@ public void onGuildVoiceLeave(@Nonnull GuildVoiceLeaveEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerVoiceData(event.getEntity(), event.getChannelLeft(), LoggerVoiceData.LoggerVoiceTyp.LEAVE), LoggerMessage.LogTyp.VC_LEAVE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerVoiceData(event.getEntity(), event.getChannelLeft(), LoggerVoiceData.LoggerVoiceTyp.LEAVE), LoggerMessage.LogTyp.VC_LEAVE));
     }
 
     @Override
     public void onGuildMemberRoleAdd(@Nonnull GuildMemberRoleAddEvent event) {
 
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_roleadd").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_roleadd").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -316,14 +316,14 @@ public void onGuildMemberRoleAdd(@Nonnull GuildMemberRoleAddEvent event) {
         we.addField(new WebhookEmbed.EmbedField(true, "**Roles:**", finalString.toString()));
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerMemberData(event.getMember(), null, new ArrayList<Role>(event.getRoles())), LoggerMessage.LogTyp.MEMBERROLE_CHANGE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerMemberData(event.getMember(), null, new ArrayList<Role>(event.getRoles())), LoggerMessage.LogTyp.MEMBERROLE_CHANGE));
     }
 
     @Override
     public void onGuildMemberRoleRemove(@Nonnull GuildMemberRoleRemoveEvent event) {
 
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) || !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_roleremove").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) || !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_roleremove").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -348,8 +348,8 @@ public void onGuildMemberRoleRemove(@Nonnull GuildMemberRoleRemoveEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerMemberData(event.getMember(), new ArrayList<Role>(event.getRoles()), null), LoggerMessage.LogTyp.MEMBERROLE_CHANGE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerMemberData(event.getMember(), new ArrayList<Role>(event.getRoles()), null), LoggerMessage.LogTyp.MEMBERROLE_CHANGE));
     }
 
     @Override
@@ -358,8 +358,8 @@ public void onGenericChannel(@Nonnull GenericChannelEvent event) {
         // TODO rework this whole Methode.
 
         if (event.getChannelType().isAudio()) {
-            if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                    !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_voicechannel").getBooleanValue())
+            if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                    !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_voicechannel").getBooleanValue())
                 return;
 
             WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -403,11 +403,11 @@ public void onGenericChannel(@Nonnull GenericChannelEvent event) {
 
             wm.addEmbeds(we.build());
 
-            String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-            Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.CHANNELDATA_CHANGE));
+            String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+            Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.CHANNELDATA_CHANGE));
         } else if(event.getChannelType().isMessage()) {
-            if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                    !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_textchannel").getBooleanValue())
+            if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                    !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_textchannel").getBooleanValue())
                 return;
 
             WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -454,16 +454,16 @@ public void onGenericChannel(@Nonnull GenericChannelEvent event) {
 
             wm.addEmbeds(we.build());
 
-            String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-            Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.CHANNELDATA_CHANGE));
+            String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+            Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.CHANNELDATA_CHANGE));
 
         }
     }
 
     @Override
     public void onRoleCreate(@Nonnull RoleCreateEvent event) {
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_rolecreate").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_rolecreate").getBooleanValue())
             return;
 
 
@@ -481,14 +481,14 @@ public void onRoleCreate(@Nonnull RoleCreateEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), event.getRole().getName(), true, false, false, false), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), event.getRole().getName(), true, false, false, false), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
     }
 
     @Override
     public void onRoleDelete(@Nonnull RoleDeleteEvent event) {
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_roledelete").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_roledelete").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -505,14 +505,14 @@ public void onRoleDelete(@Nonnull RoleDeleteEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), event.getRole().getName(), false, true, false, false), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), event.getRole().getName(), false, true, false, false), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
     }
 
     @Override
     public void onRoleUpdateName(@Nonnull RoleUpdateNameEvent event) {
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_rolename").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_rolename").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -531,14 +531,14 @@ public void onRoleUpdateName(@Nonnull RoleUpdateNameEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), event.getOldName(), event.getNewName()), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), event.getOldName(), event.getNewName()), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
     }
 
     @Override
     public void onRoleUpdateMentionable(@Nonnull RoleUpdateMentionableEvent event) {
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_rolemention").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_rolemention").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -557,14 +557,14 @@ public void onRoleUpdateMentionable(@Nonnull RoleUpdateMentionableEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), event.getRole().getName(), false, false, false, true), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), event.getRole().getName(), false, false, false, true), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
     }
 
     @Override
     public void onRoleUpdateHoisted(@Nonnull RoleUpdateHoistedEvent event) {
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) &&
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_rolehoisted").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) &&
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_rolehoisted").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -583,14 +583,14 @@ public void onRoleUpdateHoisted(@Nonnull RoleUpdateHoistedEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), event.getRole().getName(), false, false, true, false), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), event.getRole().getName(), false, false, true, false), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
     }
 
     @Override
     public void onRoleUpdatePermissions(@Nonnull RoleUpdatePermissionsEvent event) {
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) &&
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_rolepermission").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) &&
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_rolepermission").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -634,15 +634,15 @@ public void onRoleUpdatePermissions(@Nonnull RoleUpdatePermissionsEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), event.getOldPermissions(), event.getNewPermissions()), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), event.getOldPermissions(), event.getNewPermissions()), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
     }
 
     @Override
     public void onRoleUpdateColor(@Nonnull RoleUpdateColorEvent event) {
 
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_rolecolor").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_rolecolor").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -661,8 +661,8 @@ public void onRoleUpdateColor(@Nonnull RoleUpdateColorEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), (event.getOldColor() != null ? event.getOldColor() : Color.gray), (event.getNewColor() != null ? event.getNewColor() : Color.gray)), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), new LoggerRoleData(event.getRole().getIdLong(), (event.getOldColor() != null ? event.getOldColor() : Color.gray), (event.getNewColor() != null ? event.getNewColor() : Color.gray)), LoggerMessage.LogTyp.ROLEDATA_CHANGE));
     }
 
 
@@ -699,8 +699,8 @@ public void onGuildMessageUpdate(@Nonnull GuildMessageUpdateEvent event) {
     @Override
     public void onMessageDelete(@Nonnull MessageDeleteEvent event) {
 
-        if (!Main.sqlConnector.getSqlWorker().isLogSetup(event.getGuild().getId()) ||
-                !Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "logging_messagedelete").getBooleanValue())
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isLogSetup(event.getGuild().getId()) ||
+                !Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "logging_messagedelete").getBooleanValue())
             return;
 
         WebhookMessageBuilder wm = new WebhookMessageBuilder();
@@ -717,8 +717,8 @@ public void onMessageDelete(@Nonnull MessageDeleteEvent event) {
 
         wm.addEmbeds(we.build());
 
-        String[] infos = Main.sqlConnector.getSqlWorker().getLogWebhook(event.getGuild().getId());
-        Main.loggerQueue.add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.MESSAGE_DELETE));
+        String[] infos = Main.getInstance().getSqlConnector().getSqlWorker().getLogWebhook(event.getGuild().getId());
+        Main.getInstance().getLoggerQueue().add(new LoggerMessage(event.getGuild(), Long.parseLong(infos[0]), infos[1], wm.build(), LoggerMessage.LogTyp.MESSAGE_DELETE));
     }
 
     @Override
diff --git a/src/main/java/de/presti/ree6/events/OtherEvents.java b/src/main/java/de/presti/ree6/events/OtherEvents.java
index 5b254d67a..6d1bf6e50 100644
--- a/src/main/java/de/presti/ree6/events/OtherEvents.java
+++ b/src/main/java/de/presti/ree6/events/OtherEvents.java
@@ -32,23 +32,23 @@ public class OtherEvents extends ListenerAdapter {
     @Override
     public void onReady(@Nonnull ReadyEvent event) {
         BotInfo.state = BotState.STARTED;
-        Main.instance.getLogger().info("Boot up finished!");
+        Main.getInstance().getLogger().info("Boot up finished!");
 
-        Main.commandManager.addSlashCommand();
+        Main.getInstance().getCommandManager().addSlashCommand();
 
-        Main.instance.createCheckerThread();
+        Main.getInstance().createCheckerThread();
 
         BotUtil.setActivity(BotInfo.botInstance.getGuilds().size() + " Guilds", Activity.ActivityType.WATCHING);
     }
 
     @Override
     public void onGuildJoin(@NotNull GuildJoinEvent event) {
-        Main.sqlConnector.getSqlWorker().createSettings(event.getGuild().getId());
+        Main.getInstance().getSqlConnector().getSqlWorker().createSettings(event.getGuild().getId());
     }
 
     @Override
     public void onGuildLeave(@Nonnull GuildLeaveEvent event) {
-        Main.sqlConnector.getSqlWorker().deleteAllData(event.getGuild().getId());
+        Main.getInstance().getSqlConnector().getSqlWorker().deleteAllData(event.getGuild().getId());
     }
 
     @Override
@@ -56,16 +56,16 @@ public void onGuildMemberJoin(@Nonnull GuildMemberJoinEvent event) {
 
         AutoRoleHandler.handleMemberJoin(event.getGuild(), event.getMember());
 
-        if (!Main.sqlConnector.getSqlWorker().isWelcomeSetup(event.getGuild().getId()))
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isWelcomeSetup(event.getGuild().getId()))
             return;
 
         WebhookMessageBuilder wmb = new WebhookMessageBuilder();
 
         wmb.setAvatarUrl(BotInfo.botInstance.getSelfUser().getAvatarUrl());
         wmb.setUsername("Welcome!");
-        wmb.setContent((Main.sqlConnector.getSqlWorker().getMessage(event.getGuild().getId())).replaceAll("%user_name%", event.getMember().getUser().getName()).replaceAll("%user_mention%", event.getMember().getUser().getAsMention()).replaceAll("%guild_name%", event.getGuild().getName()));
+        wmb.setContent((Main.getInstance().getSqlConnector().getSqlWorker().getMessage(event.getGuild().getId())).replaceAll("%user_name%", event.getMember().getUser().getName()).replaceAll("%user_mention%", event.getMember().getUser().getAsMention()).replaceAll("%guild_name%", event.getGuild().getName()));
 
-        String[] info = Main.sqlConnector.getSqlWorker().getWelcomeWebhook(event.getGuild().getId());
+        String[] info = Main.getInstance().getSqlConnector().getSqlWorker().getWelcomeWebhook(event.getGuild().getId());
 
         Webhook.sendWebhook(null, wmb.build(), Long.parseLong(info[0]), info[1]);
     }
@@ -89,7 +89,7 @@ public void onGuildVoiceLeave(@Nonnull GuildVoiceLeaveEvent event) {
                 addxp += RandomUtils.random.nextInt(9) + 1;
             }
 
-            Main.sqlConnector.getSqlWorker().addVoiceXP(event.getGuild().getId(), event.getMember().getUser().getId(), addxp);
+            Main.getInstance().getSqlConnector().getSqlWorker().addVoiceXP(event.getGuild().getId(), event.getMember().getUser().getId(), addxp);
 
             AutoRoleHandler.handleVoiceLevelReward(event.getGuild(), event.getMember());
 
@@ -125,21 +125,21 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
 
             if (ChatProtector.hasChatProtector(event.getGuild().getId())) {
                 if (ChatProtector.checkMessage(event.getGuild().getId(), event.getMessage().getContentRaw())) {
-                    Main.commandManager.deleteMessage(event.getMessage(), null);
+                    Main.getInstance().getCommandManager().deleteMessage(event.getMessage(), null);
                     event.getChannel().sendMessage("You can't write that!").queue();
                     return;
                 }
             }
 
-            if (!Main.commandManager.perform(event.getMember(), event.getMessage().getContentRaw(), event.getMessage(), event.getTextChannel(), null)) {
+            if (!Main.getInstance().getCommandManager().perform(event.getMember(), event.getMessage().getContentRaw(), event.getMessage(), event.getTextChannel(), null)) {
 
                 if (!event.getMessage().getMentionedUsers().isEmpty() && event.getMessage().getMentionedUsers().contains(BotInfo.botInstance.getSelfUser())) {
-                    event.getChannel().sendMessage("Usage " + Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "chatprefix").getStringValue() + "help").queue();
+                    event.getChannel().sendMessage("Usage " + Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "chatprefix").getStringValue() + "help").queue();
                 }
 
                 if (!ArrayUtil.timeout.contains(event.getMember())) {
 
-                    Main.sqlConnector.getSqlWorker().addChatXP(event.getGuild().getId(), event.getAuthor().getId(), (long)RandomUtils.random.nextInt(25) + 1);
+                    Main.getInstance().getSqlConnector().getSqlWorker().addChatXP(event.getGuild().getId(), event.getAuthor().getId(), (long)RandomUtils.random.nextInt(25) + 1);
 
                     ArrayUtil.timeout.add(event.getMember());
 
@@ -174,10 +174,10 @@ public void onSlashCommand(SlashCommandEvent event) {
         if (event.getOption("target") != null)
             messageBuilder.mentionUsers(event.getOption("target").getAsUser().getId());
 
-        messageBuilder.setContent(Main.sqlConnector.getSqlWorker().getSetting(event.getGuild().getId(), "chatprefix").getStringValue() + event.getName() + " " + (event.getOption("target") != null ? event.getOption("target").getAsMember().getAsMention() : event.getOption("name") != null ? event.getOption("name").getAsString() : ""));
+        messageBuilder.setContent(Main.getInstance().getSqlConnector().getSqlWorker().getSetting(event.getGuild().getId(), "chatprefix").getStringValue() + event.getName() + " " + (event.getOption("target") != null ? event.getOption("target").getAsMember().getAsMention() : event.getOption("name") != null ? event.getOption("name").getAsString() : ""));
 
         Message message = messageBuilder.build();
 
-        Main.commandManager.perform(event.getMember(), message.getContentRaw(), message, event.getTextChannel(), event.getHook().setEphemeral(true));
+        Main.getInstance().getCommandManager().perform(event.getMember(), message.getContentRaw(), message, event.getTextChannel(), event.getHook().setEphemeral(true));
     }
 }
diff --git a/src/main/java/de/presti/ree6/invitelogger/InviteContainerManager.java b/src/main/java/de/presti/ree6/invitelogger/InviteContainerManager.java
index b8ee221b5..c36e214b7 100644
--- a/src/main/java/de/presti/ree6/invitelogger/InviteContainerManager.java
+++ b/src/main/java/de/presti/ree6/invitelogger/InviteContainerManager.java
@@ -24,7 +24,7 @@ public class InviteContainerManager {
      */
     public static void addInvite(InviteContainer inviteContainer, String guildID) {
         try {
-            Main.sqlConnector.getSqlWorker().setInvite(guildID, inviteContainer.getCode(), inviteContainer.getCreatorId(), inviteContainer.getUses());
+            Main.getInstance().getSqlConnector().getSqlWorker().setInvite(guildID, inviteContainer.getCode(), inviteContainer.getCreatorId(), inviteContainer.getUses());
         } catch (Exception ex) {
             LoggerImpl.log("InviteManager", "Error while Saving Invites: " + ex.getMessage());
         }
@@ -38,7 +38,7 @@ public static void addInvite(InviteContainer inviteContainer, String guildID) {
      * @param code    the Code of the Invite.
      */
     public static void removeInvite(String guildID, String creator, String code) {
-        Main.sqlConnector.getSqlWorker().removeInvite(guildID, creator, code);
+        Main.getInstance().getSqlConnector().getSqlWorker().removeInvite(guildID, creator, code);
     }
 
     /**
@@ -48,7 +48,7 @@ public static void removeInvite(String guildID, String creator, String code) {
      * @param code    the Code of the Invite.
      */
     public static void removeInvite(String guildID, String code) {
-        Main.sqlConnector.getSqlWorker().removeInvite(guildID, code);
+        Main.getInstance().getSqlConnector().getSqlWorker().removeInvite(guildID, code);
     }
 
     /**
@@ -92,7 +92,7 @@ public static InviteContainer getRightInvite(Guild guild) {
      * @return {@link ArrayList<InviteContainer>} with every Invite saved in our Database.
      */
     public static ArrayList<InviteContainer> getInvites(String guildId) {
-        return Main.sqlConnector.getSqlWorker().getInvites(guildId);
+        return Main.getInstance().getSqlConnector().getSqlWorker().getInvites(guildId);
     }
 
     /**
diff --git a/src/main/java/de/presti/ree6/logger/LoggerQueue.java b/src/main/java/de/presti/ree6/logger/LoggerQueue.java
index 58d99219f..d22059870 100644
--- a/src/main/java/de/presti/ree6/logger/LoggerQueue.java
+++ b/src/main/java/de/presti/ree6/logger/LoggerQueue.java
@@ -75,7 +75,9 @@ else if (loggerMessage.getType() == LoggerMessage.LogTyp.VC_MOVE) {
 
                     // Cancel every Log-Message which indicates that the person moved.
                     logs.stream().filter(loggerMessages -> loggerMessages.getId() == loggerMessage.getId() &&
-                            loggerMessages != loggerMessage && loggerMessages.getVoiceData().getMember() == loggerMessage.getVoiceData().getMember() && !loggerMessages.isCanceled() &&
+                            loggerMessages != loggerMessage &&
+                            loggerMessages.getVoiceData() != null &&
+                            loggerMessages.getVoiceData().getMember() == loggerMessage.getVoiceData().getMember() && !loggerMessages.isCanceled() &&
                             loggerMessages.getType() == LoggerMessage.LogTyp.VC_MOVE).forEach(loggerMessages -> loggerMessages.setCanceled(true));
 
                     // Set the new Webhook Message.
diff --git a/src/main/java/de/presti/ree6/main/Main.java b/src/main/java/de/presti/ree6/main/Main.java
index bd07a9f0b..c606c5dd9 100644
--- a/src/main/java/de/presti/ree6/main/Main.java
+++ b/src/main/java/de/presti/ree6/main/Main.java
@@ -18,7 +18,7 @@
 import de.presti.ree6.utils.ArrayUtil;
 import de.presti.ree6.utils.Config;
 import de.presti.ree6.utils.LoggerImpl;
-import de.presti.ree6.utils.TwitchAPIHandler;
+import de.presti.ree6.utils.Notifier;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.entities.Guild;
 import org.slf4j.Logger;
@@ -30,51 +30,51 @@
 
 public class Main {
 
-    public static Main instance;
+    static Main instance;
 
-    public static TwitchAPIHandler twitchAPIHandler;
+    Notifier notifier;
 
-    public static CommandManager commandManager;
-    public static AddonManager addonManager;
-    public static SQLConnector sqlConnector;
-    public static LoggerQueue loggerQueue;
-    public static MusicWorker musicWorker;
+    CommandManager commandManager;
+    AddonManager addonManager;
+    SQLConnector sqlConnector;
+    LoggerQueue loggerQueue;
+    MusicWorker musicWorker;
 
-    static Logger logger;
+    Logger logger;
 
-    public static Thread checker;
-    public static Config config;
+    Thread checker;
+    Config config;
 
-    public static String lastDay = "";
+    String lastDay = "";
 
     public static void main(String[] args) {
         instance = new Main();
 
-        logger = LoggerFactory.getLogger(Main.class);
+        instance.logger = LoggerFactory.getLogger(Main.class);
 
-        loggerQueue = new LoggerQueue();
+        instance.loggerQueue = new LoggerQueue();
 
-        config = new Config();
+        instance.config = new Config();
 
-        config.init();
+        instance.config.init();
 
-        Thread.setDefaultUncaughtExceptionHandler((t, e) -> new RaygunClient(config.getConfig().getString("raygun.apitoken")).send(e));
+        Thread.setDefaultUncaughtExceptionHandler((t, e) -> new RaygunClient(instance.config.getConfig().getString("raygun.apitoken")).send(e));
 
-        sqlConnector = new SQLConnector(config.getConfig().getString("mysql.user"), config.getConfig().getString("mysql.db"), config.getConfig().getString("mysql.pw"), config.getConfig().getString("mysql.host"), config.getConfig().getInt("mysql.port"));
+        instance.sqlConnector = new SQLConnector(instance.config.getConfig().getString("mysql.user"),
+                instance.config.getConfig().getString("mysql.db"), instance.config.getConfig().getString("mysql.pw"),
+                instance.config.getConfig().getString("mysql.host"), instance.config.getConfig().getInt("mysql.port"));
 
-        commandManager = new CommandManager();
+        instance.commandManager = new CommandManager();
 
-        twitchAPIHandler = new TwitchAPIHandler();
+        instance.notifier = new Notifier();
 
-        for (String name : sqlConnector.getSqlWorker().getAllTwitchNames()) {
-            twitchAPIHandler.registerChannel(name);
-        }
+        instance.notifier.registerTwitchChannel(instance.sqlConnector.getSqlWorker().getAllTwitchNames());
 
-        twitchAPIHandler.registerTwitchLive();
+        instance.notifier.registerTwitchEventHandler();
 
         try {
-            BotUtil.createBot(BotVersion.PUBLIC, "1.5.1");
-            musicWorker = new MusicWorker();
+            BotUtil.createBot(BotVersion.DEV, "1.5.2");
+            instance.musicWorker = new MusicWorker();
             instance.addEvents();
         } catch (Exception ex) {
             LoggerImpl.log("Main", "Error while init: " + ex.getMessage());
@@ -84,9 +84,9 @@ public static void main(String[] args) {
 
         BotInfo.startTime = System.currentTimeMillis();
 
-        addonManager = new AddonManager();
+        instance.addonManager = new AddonManager();
         AddonLoader.loadAllAddons();
-        addonManager.startAddons();
+        instance.addonManager.startAddons();
     }
 
     private void addEvents() {
@@ -104,14 +104,18 @@ private void shutdown() {
 
         if (sqlConnector != null && (sqlConnector.IsConnected())) {
             LoggerImpl.log("Main", "Closing Database Connection!");
-            sqlConnector.close();
+            getSqlConnector().close();
             LoggerImpl.log("Main", "Closed Database Connection!");
         }
 
         LoggerImpl.log("Main", "Disabling every Addon!");
-        addonManager.stopAddons();
+        getAddonManager().stopAddons();
         LoggerImpl.log("Main", "Every Addon has been disabled!");
 
+        LoggerImpl.log("Main", "Closing Twitch API Instance!");
+        getNotifier().getTwitchClient().close();
+        LoggerImpl.log("Main", "Twitch API Instance closed!");
+
         LoggerImpl.log("Main", "JDA Instance shutdown init. !");
         BotUtil.shutdown();
         LoggerImpl.log("Main", "JDA Instance has been shut down!");
@@ -126,11 +130,10 @@ public void createCheckerThread() {
 
                 if (!lastDay.equalsIgnoreCase(new SimpleDateFormat("dd").format(new Date()))) {
 
-                    sqlConnector.close();
+                    getSqlConnector().close();
 
                     sqlConnector =new SQLConnector(config.getConfig().getString("mysql.user"), config.getConfig().getString("mysql.db"), config.getConfig().getString("mysql.pw"), config.getConfig().getString("mysql.host"), config.getConfig().getInt("mysql.port"));
 
-
                     ArrayUtil.messageIDwithMessage.clear();
                     ArrayUtil.messageIDwithUser.clear();
 
@@ -171,9 +174,81 @@ public void createCheckerThread() {
         checker.start();
     }
 
+    /**
+     * Retrieve the Instance of the Main class.
+     * @return {@link Main} Instance of the Main class.
+     */
+    public static Main getInstance() {
+        return instance;
+    }
+
+    /**
+     * Retrieve the Instance of the Notifier.
+     * @return {@link Notifier} Instance of the Notifier.
+     */
+    public Notifier getNotifier() {
+        return notifier;
+    }
+
+    /**
+     * Retrieve the Instance of the CommandManager.
+     * @return {@link CommandManager} Instance of the CommandManager.
+     */
+    public CommandManager getCommandManager() {
+        return commandManager;
+    }
+
+    /**
+     * Retrieve the Instance of the AddonManager.
+     * @return {@link AddonManager} Instance of the AddonManager.
+     */
+    public AddonManager getAddonManager() {
+        return addonManager;
+    }
+
+    /**
+     * Retrieve the Instance of the SQL-Connector.
+     * @return {@link SQLConnector} Instance of the SQL-Connector.
+     */
+    public SQLConnector getSqlConnector() {
+        return sqlConnector;
+    }
+
+    /**
+     * Retrieve the Instance of the LoggerQueue.
+     * @return {@link LoggerQueue} Instance of the LoggerQueue.
+     */
+    public LoggerQueue getLoggerQueue() {
+        return loggerQueue;
+    }
+
+    /**
+     * Retrieve the Instance of the Music-Worker.
+     * @return {@link MusicWorker} Instance of the Music-Worker.
+     */
+    public MusicWorker getMusicWorker() {
+        return musicWorker;
+    }
+
     /**
      * Retrieve the Instance of the Logger.
      * @return {@link Logger} Instance of the Logger.
      */
     public Logger getLogger() { return logger; }
+
+    /**
+     * Retrieve the Instance of the Checker-Thread.
+     * @return {@link Thread} Instance of the Checker-Thread.
+     */
+    public Thread getChecker() {
+        return checker;
+    }
+
+    /**
+     * Retrieve the Instance of the Config.
+     * @return {@link Config} Instance of the Config.
+     */
+    public Config getConfig() {
+        return config;
+    }
 }
diff --git a/src/main/java/de/presti/ree6/music/MusicWorker.java b/src/main/java/de/presti/ree6/music/MusicWorker.java
index 369eadd5e..b3e8490c1 100644
--- a/src/main/java/de/presti/ree6/music/MusicWorker.java
+++ b/src/main/java/de/presti/ree6/music/MusicWorker.java
@@ -92,7 +92,7 @@ public void noMatches() {
                 em.setDescription("A Song with the URL ``" + trackUrl + "`` couldn't be found!");
                 em.setFooter(channel.getGuild().getName() + " - " + Data.ADVERTISEMENT, channel.getGuild().getIconUrl());
 
-                Main.commandManager.sendMessage(em, 5, channel, null);
+                Main.getInstance().getCommandManager().sendMessage(em, 5, channel, null);
             }
 
             @Override
@@ -105,7 +105,7 @@ public void loadFailed(FriendlyException exception) {
                 em.setDescription("Error while playing: " + exception.getMessage());
                 em.setFooter(channel.getGuild().getName() + " - " + Data.ADVERTISEMENT, channel.getGuild().getIconUrl());
 
-                Main.commandManager.sendMessage(em, 5, channel);
+                Main.getInstance().getCommandManager().sendMessage(em, 5, channel);
             }
         });
     }
@@ -127,7 +127,7 @@ public void trackLoaded(AudioTrack track) {
                 em.setDescription("The Song ``" + track.getInfo().title + "`` has been added to the Queue!");
                 em.setFooter(channel.getGuild().getName() + " - " + Data.ADVERTISEMENT, channel.getGuild().getIconUrl());
 
-                Main.commandManager.sendMessage(em, 5, channel);
+                Main.getInstance().getCommandManager().sendMessage(em, 5, channel);
 
                 play(channel.getGuild(), musicManager, track);
             }
@@ -149,7 +149,7 @@ public void playlistLoaded(AudioPlaylist playlist) {
                         + "`` has been added to the Queue! (The first Song of the Playlist: " + playlist.getName() + ")");
                 em.setFooter(channel.getGuild().getName() + " - " + Data.ADVERTISEMENT, channel.getGuild().getIconUrl());
 
-                Main.commandManager.sendMessage(em, 5, channel);
+                Main.getInstance().getCommandManager().sendMessage(em, 5, channel);
 
                 play(channel.getGuild(), musicManager, firstTrack);
 
@@ -172,7 +172,7 @@ public void noMatches() {
                 em.setDescription("A Song with the URL ``" + trackUrl + "`` couldn't be found!");
                 em.setFooter(channel.getGuild().getName() + " - " + Data.ADVERTISEMENT, channel.getGuild().getIconUrl());
 
-                Main.commandManager.sendMessage(em, 5, channel);
+                Main.getInstance().getCommandManager().sendMessage(em, 5, channel);
             }
 
             @Override
@@ -185,7 +185,7 @@ public void loadFailed(FriendlyException exception) {
                 em.setDescription("Error while playing: " + exception.getMessage());
                 em.setFooter(channel.getGuild().getName() + " - " + Data.ADVERTISEMENT, channel.getGuild().getIconUrl());
 
-                Main.commandManager.sendMessage(em, 5, channel);
+                Main.getInstance().getCommandManager().sendMessage(em, 5, channel);
             }
         });
     }
@@ -209,7 +209,7 @@ public void skipTrack(TextChannel channel) {
         em.setDescription("Skipping to the next Song!");
         em.setFooter(channel.getGuild().getName() + " - " + Data.ADVERTISEMENT, channel.getGuild().getIconUrl());
 
-        Main.commandManager.sendMessage(em, 5, channel);
+        Main.getInstance().getCommandManager().sendMessage(em, 5, channel);
 
         musicManager.scheduler.nextTrack(channel);
     }
diff --git a/src/main/java/de/presti/ree6/music/TrackScheduler.java b/src/main/java/de/presti/ree6/music/TrackScheduler.java
index 81138ba6f..1204b254a 100644
--- a/src/main/java/de/presti/ree6/music/TrackScheduler.java
+++ b/src/main/java/de/presti/ree6/music/TrackScheduler.java
@@ -129,7 +129,7 @@ public void nextRandomTrack(TextChannel channel) {
                 em.setDescription("Next Song!\nSong: ``" + track.getInfo().title + "``");
                 em.setFooter(channel.getGuild().getName() + " - " + Data.ADVERTISEMENT, channel.getGuild().getIconUrl());
 
-                Main.commandManager.sendMessage(em, 5, channel);
+                Main.getInstance().getCommandManager().sendMessage(em, 5, channel);
             }
             player.startTrack(track, false);
         }
@@ -154,7 +154,7 @@ public void nextTrack(TextChannel channel) {
                 em.setDescription("Next Song!\nSong: ``" + track.getInfo().title + "``");
                 em.setFooter(channel.getGuild().getName() + " - " + Data.ADVERTISEMENT, channel.getGuild().getIconUrl());
 
-                Main.commandManager.sendMessage(em, 5, channel);
+                Main.getInstance().getCommandManager().sendMessage(em, 5, channel);
             }
             player.startTrack(track, false);
         }
@@ -181,7 +181,7 @@ public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason
                     em.setDescription("Error while playing: ``" + track.getInfo().title + "``\nError: Track is not existing!");
                     em.setFooter(thechannel.getGuild().getName() + " - " + Data.ADVERTISEMENT, thechannel.getGuild().getIconUrl());
 
-                    Main.commandManager.sendMessage(em, 5, thechannel);
+                    Main.getInstance().getCommandManager().sendMessage(em, 5, thechannel);
 
                     nextTrack(thechannel);
                 }
@@ -196,7 +196,7 @@ public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason
                         + endReason.name());
                 em.setFooter(thechannel.getGuild().getName() + " - " + Data.ADVERTISEMENT, thechannel.getGuild().getIconUrl());
 
-                Main.commandManager.sendMessage(em, 5, thechannel);
+                Main.getInstance().getCommandManager().sendMessage(em, 5, thechannel);
 
                 nextTrack(thechannel);
             }
@@ -213,7 +213,7 @@ public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason
                             + endReason.name());
                     em.setFooter(thechannel.getGuild().getName() + " - " + Data.ADVERTISEMENT, thechannel.getGuild().getIconUrl());
 
-                    Main.commandManager.sendMessage(em, 5, thechannel);
+                    Main.getInstance().getCommandManager().sendMessage(em, 5, thechannel);
                 }
                 nextRandomTrack(thechannel);
             }
@@ -230,7 +230,7 @@ public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason
                             + endReason.name());
                     em.setFooter(thechannel.getGuild().getName() + " - " + Data.ADVERTISEMENT, thechannel.getGuild().getIconUrl());
 
-                    Main.commandManager.sendMessage(em, 5, thechannel);
+                    Main.getInstance().getCommandManager().sendMessage(em, 5, thechannel);
                 }
                 nextTrack(thechannel);
             }
@@ -239,15 +239,15 @@ public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason
 
     public void stopAll() {
         EmbedBuilder em = new EmbedBuilder();
-        if (Main.musicWorker.isConnected(thechannel.getGuild()) || getPlayer().getPlayingTrack() != null) {
+        if (Main.getInstance().getMusicWorker().isConnected(thechannel.getGuild()) || getPlayer().getPlayingTrack() != null) {
 
-            GuildMusicManager gmm = Main.musicWorker.getGuildAudioPlayer(thechannel.getGuild());
+            GuildMusicManager gmm = Main.getInstance().getMusicWorker().getGuildAudioPlayer(thechannel.getGuild());
 
             gmm.player.stopTrack();
 
             gmm.scheduler.clearQueue();
 
-            Main.musicWorker.disconnect(thechannel.getGuild());
+            Main.getInstance().getMusicWorker().disconnect(thechannel.getGuild());
             em.setAuthor(BotInfo.botInstance.getSelfUser().getName(), Data.WEBSITE,
                     BotInfo.botInstance.getSelfUser().getAvatarUrl());
             em.setTitle("Music Player!");
@@ -264,6 +264,6 @@ public void stopAll() {
         }
 
         em.setFooter(Data.ADVERTISEMENT);
-        Main.commandManager.sendMessage(em, 5, thechannel);
+        Main.getInstance().getCommandManager().sendMessage(em, 5, thechannel);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/de/presti/ree6/sql/SQLConnector.java b/src/main/java/de/presti/ree6/sql/SQLConnector.java
index fceaaccab..e24ddb122 100644
--- a/src/main/java/de/presti/ree6/sql/SQLConnector.java
+++ b/src/main/java/de/presti/ree6/sql/SQLConnector.java
@@ -64,21 +64,21 @@ public void connectToSQLServer() {
             try {
                 // Close if there is and notify.
                 connection.close();
-                Main.instance.getLogger().info("Service (MariaDB) has been stopped.");
+                Main.getInstance().getLogger().info("Service (MariaDB) has been stopped.");
             } catch (Exception ignore) {
                 // Notify if there was an error.
-                Main.instance.getLogger().error("Service (MariaDB) couldn't be stopped.");
+                Main.getInstance().getLogger().error("Service (MariaDB) couldn't be stopped.");
             }
         }
 
         try {
             // Create a new Connection by using the SQL DriverManager and the MariaDB Java Driver and notify if successful.
             connection = DriverManager.getConnection("jdbc:mysql://" + databaseServerIP + ":" + databaseServerPort + "/" + databaseName + "?autoReconnect=true", databaseUser, databasePassword);
-            Main.instance.getLogger().info("Service (MariaDB) has been started. Connection was successful.");
+            Main.getInstance().getLogger().info("Service (MariaDB) has been started. Connection was successful.");
         } catch (Exception ignore) {
             ignore.printStackTrace();
             // Notify if there was an error.
-            Main.instance.getLogger().error("Service (MariaDB) couldn't be started. Connection was unsuccessful.");
+            Main.getInstance().getLogger().error("Service (MariaDB) couldn't be started. Connection was unsuccessful.");
         }
     }
 
@@ -118,7 +118,7 @@ public void createTables() {
             } catch (SQLException ignore) {
 
                 // Notify if there was an error.
-                Main.instance.getLogger().error("Couldn't create {0} Table.", entry.getKey());
+                Main.getInstance().getLogger().error("Couldn't create {0} Table.", entry.getKey());
             }
         }
 
@@ -146,10 +146,10 @@ public void close() {
             try {
                 // Close if there is and notify.
                 connection.close();
-                Main.instance.getLogger().info("Service (MariaDB) has been stopped.");
+                Main.getInstance().getLogger().info("Service (MariaDB) has been stopped.");
             } catch (Exception ignore) {
                 // Notify if there was an error.
-                Main.instance.getLogger().error("Service (MariaDB) couldn't be stopped.");
+                Main.getInstance().getLogger().error("Service (MariaDB) couldn't be stopped.");
             }
         }
     }
diff --git a/src/main/java/de/presti/ree6/sql/SQLWorker.java b/src/main/java/de/presti/ree6/sql/SQLWorker.java
index 0e314ea69..305b55161 100644
--- a/src/main/java/de/presti/ree6/sql/SQLWorker.java
+++ b/src/main/java/de/presti/ree6/sql/SQLWorker.java
@@ -1941,7 +1941,7 @@ public void createSettings(String guildId) {
         if (!hasSetting(guildId, "chatprefix")) setSetting(guildId, new Setting("chatprefix", "ree!"));
 
         // Create Command Settings.
-        for (Command command : Main.commandManager.getCommands()) {
+        for (Command command : Main.getInstance().getCommandManager().getCommands()) {
 
             // Skip the hidden Commands.
             if (command.getCategory() == Category.HIDDEN) continue;
@@ -2202,7 +2202,7 @@ public void querySQL(String sqlQuery) {
         try (Statement statement = sqlConnector.getConnection().createStatement()) {
             statement.executeUpdate(sqlQuery);
         } catch (Exception ignore) {
-            Main.instance.getLogger().error("Couldn't send Query to SQL-Server");
+            Main.getInstance().getLogger().error("Couldn't send Query to SQL-Server");
         }
     }
 
diff --git a/src/main/java/de/presti/ree6/stats/StatsManager.java b/src/main/java/de/presti/ree6/stats/StatsManager.java
index a3753679c..175554467 100644
--- a/src/main/java/de/presti/ree6/stats/StatsManager.java
+++ b/src/main/java/de/presti/ree6/stats/StatsManager.java
@@ -18,7 +18,7 @@ public class StatsManager {
      */
     public static void addStatsForCommand(Command command, String guildId) {
         if (command != null) {
-            Main.sqlConnector.getSqlWorker().addStats(guildId, command.getCmd());
+            Main.getInstance().getSqlConnector().getSqlWorker().addStats(guildId, command.getCmd());
         }
     }
 
@@ -29,7 +29,7 @@ public static void addStatsForCommand(Command command, String guildId) {
      * @return {@link HashMap<String, Long>} with the Stats of the Guild.
      */
     public static HashMap<String, Long> getCommandStats(String guildId) {
-        return Main.sqlConnector.getSqlWorker().getStats(guildId);
+        return Main.getInstance().getSqlConnector().getSqlWorker().getStats(guildId);
     }
 
     /**
@@ -38,7 +38,7 @@ public static HashMap<String, Long> getCommandStats(String guildId) {
      * @return {@link Long} as Usage.
      */
     public static long getUsageForCommand(Command command) {
-        return Main.sqlConnector.getSqlWorker().getStatsCommandGlobal(command.getCmd());
+        return Main.getInstance().getSqlConnector().getSqlWorker().getStatsCommandGlobal(command.getCmd());
     }
 
     /**
@@ -47,7 +47,7 @@ public static long getUsageForCommand(Command command) {
      * @return {@link Long} as Usage.
      */
     public static long getUsageForCommand(String command) {
-        return Main.sqlConnector.getSqlWorker().getStatsCommandGlobal(command);
+        return Main.getInstance().getSqlConnector().getSqlWorker().getStatsCommandGlobal(command);
     }
 
     /**
@@ -56,7 +56,7 @@ public static long getUsageForCommand(String command) {
      * @return {@link HashMap<String, Long>} with every Stat.
      */
     public static HashMap<String, Long> getCommandStats() {
-        return Main.sqlConnector.getSqlWorker().getStatsGlobal();
+        return Main.getInstance().getSqlConnector().getSqlWorker().getStatsGlobal();
     }
 
 }
diff --git a/src/main/java/de/presti/ree6/utils/ArrayUtil.java b/src/main/java/de/presti/ree6/utils/ArrayUtil.java
index 8a1573a88..b5fd1f625 100644
--- a/src/main/java/de/presti/ree6/utils/ArrayUtil.java
+++ b/src/main/java/de/presti/ree6/utils/ArrayUtil.java
@@ -8,19 +8,40 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
+/**
+ * Utility class used to store Data for a shorter period of time.
+ */
 @SuppressWarnings("Java8MapApi")
 public class ArrayUtil {
 
+    //TODO rework. Such as removing the botJoin HashMap.
+
+    // HashMap used to store message contents and their IDs, to show the content when the message gets deleted.
     public static final HashMap<String, String> messageIDwithMessage = new HashMap<>();
+
+    // HashMap used to store user Ids that are associated with a message, to show the content when the message gets deleted.
     public static final HashMap<String, User> messageIDwithUser = new HashMap<>();
+
+    // HashMap used to store user Ids and their VC join time, to track VoiceXP.
     public static final HashMap<User, Long> voiceJoined = new HashMap<>();
+
+    // HashMap used to store a Guild ID and a Member, for later Music Bot Join.
     public static final HashMap<Guild, Member> botJoin = new HashMap<>();
+
+    // HashMap used to store a users Ids, to keep them from spamming commands.
     public static final ArrayList<String> commandCooldown = new ArrayList<>();
 
+    // HashMap used to store a users Ids, to keep them from earning XP with every message.
     public static final ArrayList<Member> timeout = new ArrayList<>();
 
+    // String Array used to store answer options, for later use by the 8Ball command.
     public static final String[] answers = new String[]{"It is certain.", "It is decidedly so.", "Without a doubt.", "Yes – definitely.", "You may rely on it.", "As I see it, yes.", "Most likely.", "Outlook good.", "Yes.", "Signs point to yes", "Reply hazy, try again.", "Ask again later.", "Better not tell you now.", "Cannot predict now.", "Concentrate and ask again.", "Don't count on it.", "My reply is no.", "My sources say no.", "Outlook not so good.", "Very doubtful."};
 
+    /**
+     * Get a String fully of random Number by the given length.
+     * @param length the wanted Length.
+     * @return the {@link String} with the wanted Length.
+     */
     public static String getRandomShit(int length) {
         StringBuilder end = new StringBuilder();
 
@@ -31,6 +52,11 @@ public static String getRandomShit(int length) {
         return end.toString();
     }
 
+    /**
+     * Get the User from that send a specific Message that has been deleted.
+     * @param id the ID of the Message.
+     * @return the {@link User} that send the Message.
+     */
     public static User getUserFromMessageList(String id) {
         if (!messageIDwithUser.containsKey(id)) {
             return BotInfo.botInstance.getSelfUser();
@@ -39,6 +65,11 @@ public static User getUserFromMessageList(String id) {
         }
     }
 
+    /**
+     * Get the Message content, of a deleted Message, by the ID.
+     * @param id the ID of the Message.
+     * @return the Content of the deleted Message.
+     */
     public static String getMessageFromMessageList(String id) {
         if (!messageIDwithMessage.containsKey(id)) {
             return "Couldn't be found!";
@@ -47,6 +78,12 @@ public static String getMessageFromMessageList(String id) {
         }
     }
 
+    /**
+     * Methode used to update Messages in the HashMap.
+     * @param messageId the ID of the Message.
+     * @param contentRaw the current Content of the Message.
+     */
+    @Deprecated(since = "1.4.5", forRemoval = true)
     public static void updateMessage(String messageId, String contentRaw) {
         messageIDwithMessage.remove(messageId);
         messageIDwithMessage.put(messageId, contentRaw);
diff --git a/src/main/java/de/presti/ree6/utils/AutoRoleHandler.java b/src/main/java/de/presti/ree6/utils/AutoRoleHandler.java
index 26232df9e..84346911e 100644
--- a/src/main/java/de/presti/ree6/utils/AutoRoleHandler.java
+++ b/src/main/java/de/presti/ree6/utils/AutoRoleHandler.java
@@ -10,7 +10,7 @@ public class AutoRoleHandler {
 
     public static void handleMemberJoin(Guild g, Member m) {
 
-        if (!Main.sqlConnector.getSqlWorker().isAutoRoleSetup(g.getId()))
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isAutoRoleSetup(g.getId()))
             return;
 
         new Thread(() -> {
@@ -23,7 +23,7 @@ public static void handleMemberJoin(Guild g, Member m) {
                 return;
             }
 
-            for (String ids : Main.sqlConnector.getSqlWorker().getAutoRoles(g.getId())) {
+            for (String ids : Main.getInstance().getSqlConnector().getSqlWorker().getAutoRoles(g.getId())) {
                 if (!m.getRoles().contains(g.getRoleById(ids))) {
                     if (g.getSelfMember().canInteract(g.getRoleById(ids))) {
                         g.addRoleToMember(m, g.getRoleById(ids)).queue();
@@ -41,12 +41,12 @@ public static void handleMemberJoin(Guild g, Member m) {
 
     public static void handleVoiceLevelReward(Guild g, Member m) {
 
-        if (!Main.sqlConnector.getSqlWorker().isVoiceLevelRewardSetup(g.getId()))
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isVoiceLevelRewardSetup(g.getId()))
             return;
 
         new Thread(() -> {
 
-            long currentxp = Main.sqlConnector.getSqlWorker().getVoiceXP(g.getId(), m.getUser().getId());
+            long currentxp = Main.getInstance().getSqlConnector().getSqlWorker().getVoiceXP(g.getId(), m.getUser().getId());
 
             int level = 1;
 
@@ -63,7 +63,7 @@ public static void handleVoiceLevelReward(Guild g, Member m) {
                 return;
             }
 
-            for (Map.Entry<Integer, String> entry : Main.sqlConnector.getSqlWorker().getVoiceLevelRewards(g.getId()).entrySet()) {
+            for (Map.Entry<Integer, String> entry : Main.getInstance().getSqlConnector().getSqlWorker().getVoiceLevelRewards(g.getId()).entrySet()) {
 
                 if (entry.getKey() <= level) {
                     if (!m.getRoles().contains(g.getRoleById(entry.getValue()))) {
@@ -84,12 +84,12 @@ public static void handleVoiceLevelReward(Guild g, Member m) {
 
     public static void handleChatLevelReward(Guild g, Member m) {
 
-        if (!Main.sqlConnector.getSqlWorker().isChatLevelRewardSetup(g.getId()))
+        if (!Main.getInstance().getSqlConnector().getSqlWorker().isChatLevelRewardSetup(g.getId()))
             return;
 
         new Thread(() -> {
 
-            long currentxp = Main.sqlConnector.getSqlWorker().getChatXP(g.getId(), m.getUser().getId());
+            long currentxp = Main.getInstance().getSqlConnector().getSqlWorker().getChatXP(g.getId(), m.getUser().getId());
 
             int level = 1;
 
@@ -106,7 +106,7 @@ public static void handleChatLevelReward(Guild g, Member m) {
                 return;
             }
 
-            for (Map.Entry<Integer, String> entry : Main.sqlConnector.getSqlWorker().getChatLevelRewards(g.getId()).entrySet()) {
+            for (Map.Entry<Integer, String> entry : Main.getInstance().getSqlConnector().getSqlWorker().getChatLevelRewards(g.getId()).entrySet()) {
 
                 if (entry.getKey() <= level) {
                     if (!m.getRoles().contains(g.getRoleById(entry.getValue()))) {
diff --git a/src/main/java/de/presti/ree6/utils/FileUtil.java b/src/main/java/de/presti/ree6/utils/FileUtil.java
index f7a4aaa6f..01546838a 100644
--- a/src/main/java/de/presti/ree6/utils/FileUtil.java
+++ b/src/main/java/de/presti/ree6/utils/FileUtil.java
@@ -8,9 +8,9 @@ public class FileUtil {
 
     public static String getToken() {
         if (BotInfo.version == BotVersion.DEV) {
-            return Main.config.getConfig().getString("bot.tokens.dev");
+            return Main.getInstance().getConfig().getConfig().getString("bot.tokens.dev");
         } else if (BotInfo.version == BotVersion.PUBLIC || BotInfo.version == BotVersion.PRERELASE) {
-            return Main.config.getConfig().getString("bot.tokens.rel");
+            return Main.getInstance().getConfig().getConfig().getString("bot.tokens.rel");
         } else {
             return "error";
         }
diff --git a/src/main/java/de/presti/ree6/utils/LoggerImpl.java b/src/main/java/de/presti/ree6/utils/LoggerImpl.java
index 33db54a3c..89bc55be5 100644
--- a/src/main/java/de/presti/ree6/utils/LoggerImpl.java
+++ b/src/main/java/de/presti/ree6/utils/LoggerImpl.java
@@ -5,7 +5,7 @@
 public class LoggerImpl {
 
     public static void log(String name, String message) {
-        Main.instance.getLogger().info("[{0}] {1}", name, message);
+        Main.getInstance().getLogger().info("[" + name + "] " + message);
     }
 
 }
diff --git a/src/main/java/de/presti/ree6/utils/Notifier.java b/src/main/java/de/presti/ree6/utils/Notifier.java
new file mode 100644
index 000000000..9192197f3
--- /dev/null
+++ b/src/main/java/de/presti/ree6/utils/Notifier.java
@@ -0,0 +1,155 @@
+package de.presti.ree6.utils;
+
+import club.minnced.discord.webhook.send.WebhookEmbed;
+import club.minnced.discord.webhook.send.WebhookEmbedBuilder;
+import club.minnced.discord.webhook.send.WebhookMessageBuilder;
+import com.github.twitch4j.TwitchClient;
+import com.github.twitch4j.TwitchClientBuilder;
+import com.github.twitch4j.events.ChannelGoLiveEvent;
+import com.github.twitch4j.helix.domain.User;
+import de.presti.ree6.bot.BotInfo;
+import de.presti.ree6.bot.Webhook;
+import de.presti.ree6.main.Data;
+import de.presti.ree6.main.Main;
+import twitter4j.Twitter;
+import twitter4j.TwitterFactory;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Utility class used for Event Notifiers. Such as Twitch Livestream, YouTube Upload or Twitter Tweet.
+ */
+public class Notifier {
+
+    // Instance of the Twitch API Client.
+    private final TwitchClient twitchClient;
+
+    // Instance of the Twitter API Client.
+    private final Twitter twitterClient;
+
+    private final ArrayList<String> registeredTwitchChannels = new ArrayList<>();
+
+    /**
+     * Constructor used to created instance of the API Clients.
+     */
+    public Notifier() {
+        twitchClient = TwitchClientBuilder.builder().withEnableHelix(true).withClientId(Main.getInstance().getConfig().cfg.getString("twitch.client.id"))
+                .withClientSecret(Main.getInstance().getConfig().cfg.getString("twitch.client.secret")).build();
+
+        twitterClient = TwitterFactory.getSingleton();
+    }
+
+    //region Twitch
+
+    /**
+     * Register a EventHandler for the Twitch Livestream Event.
+     */
+    public void registerTwitchEventHandler() {
+        getTwitchClient().getEventManager().onEvent(ChannelGoLiveEvent.class, channelGoLiveEvent -> {
+
+            // Go through every Webhook that is registered for the Twitch Channel
+            for (String[] credits : Main.getInstance().getSqlConnector().getSqlWorker().getTwitchWebhooksByName(channelGoLiveEvent.getStream().getUserName().toLowerCase())) {
+
+                // Create Webhook Message.
+                WebhookMessageBuilder wmb = new WebhookMessageBuilder();
+
+                wmb.setAvatarUrl(BotInfo.botInstance.getSelfUser().getAvatarUrl());
+                wmb.setUsername("Ree6");
+
+                WebhookEmbedBuilder webhookEmbedBuilder = new WebhookEmbedBuilder();
+
+                webhookEmbedBuilder.setTitle(new WebhookEmbed.EmbedTitle(channelGoLiveEvent.getStream().getUserName(), null));
+                webhookEmbedBuilder.setAuthor(new WebhookEmbed.EmbedAuthor("Twitch Notifier", BotInfo.botInstance.getSelfUser().getAvatarUrl(), null));
+
+                // Try getting the User.
+                Optional<User> twitchUserRequest = getTwitchClient().getHelix().getUsers(null, null, Collections.singletonList(channelGoLiveEvent.getStream().getUserName())).execute().getUsers().stream().findFirst();
+                if (getTwitchClient().getHelix().getUsers(null, null, Collections.singletonList(channelGoLiveEvent.getStream().getUserName())).execute().getUsers().stream().findFirst().isPresent()) {
+                    webhookEmbedBuilder.setImageUrl(twitchUserRequest.get().getProfileImageUrl());
+                } else {
+                    webhookEmbedBuilder.setImageUrl(channelGoLiveEvent.getStream().getThumbnailUrl());
+                }
+
+                // Set rest of the Information.
+                webhookEmbedBuilder.setDescription(channelGoLiveEvent.getStream().getUserName() +" is now Live on Twitch! Come and join the Stream <https://twitch.tv/" + channelGoLiveEvent.getChannel().getName() + "> !");
+                webhookEmbedBuilder.addField(new WebhookEmbed.EmbedField(true,"**Title**", channelGoLiveEvent.getStream().getTitle()));
+                webhookEmbedBuilder.addField(new WebhookEmbed.EmbedField(true,"**Game**", channelGoLiveEvent.getStream().getGameName()));
+                webhookEmbedBuilder.addField(new WebhookEmbed.EmbedField(true,"**Viewer**", "" + channelGoLiveEvent.getStream().getViewerCount()));
+                webhookEmbedBuilder.setFooter(new WebhookEmbed.EmbedFooter(Data.ADVERTISEMENT, BotInfo.botInstance.getSelfUser().getAvatarUrl()));
+                webhookEmbedBuilder.setColor(Color.MAGENTA.getRGB());
+
+                wmb.addEmbeds(webhookEmbedBuilder.build());
+
+                Webhook.sendWebhook(null, wmb.build(), Long.parseLong(credits[0]), credits[1]);
+            }
+        });
+    }
+
+    /**
+     * Used to Register a Livestream Event for the given Twitch Channel
+     *
+     * @param twitchChannel the Name of the Twitch Channel.
+     */
+    public void registerTwitchChannel(String twitchChannel) {
+        if (getTwitchClient() == null) return;
+
+        twitchChannel = twitchChannel.toLowerCase();
+
+        if (!isTwitchRegistered(twitchChannel)) registeredTwitchChannels.add(twitchChannel);
+
+        getTwitchClient().getClientHelper().enableStreamEventListener(twitchChannel);
+    }
+
+    /**
+     * Used to Register a Livestream Event for the given Twitch Channels
+     *
+     * @param twitchChannels the Names of the Twitch Channels.
+     */
+    public void registerTwitchChannel(List<String> twitchChannels) {
+        if (getTwitchClient() == null) return;
+
+        twitchChannels.forEach(s -> {
+            s = s.toLowerCase();
+            if (!isTwitchRegistered(s)) registeredTwitchChannels.add(s);
+        });
+
+        getTwitchClient().getClientHelper().enableStreamEventListener(twitchChannels);
+    }
+
+    /**
+     * Used to Unregister a Livestream Event for the given Twitch Channel
+     *
+     * @param twitchChannel the Name of the Twitch Channel.
+     */
+    public void unregisterTwitchChannel(String twitchChannel) {
+        if (getTwitchClient() == null) return;
+
+        twitchChannel = twitchChannel.toLowerCase();
+
+        if (isTwitchRegistered(twitchChannel)) registeredTwitchChannels.remove(twitchChannel);
+
+        getTwitchClient().getClientHelper().disableStreamEventListener(twitchChannel);
+    }
+
+    /**
+     * Check if a Twitch Channel is already being checked.
+     * @param twitchChannel the Name of the Twitch Channel.
+     * @return true, if there is an Event for the Channel | false, if there isn't a Event for the Channel.
+     */
+    public boolean isTwitchRegistered(String twitchChannel) {
+        return registeredTwitchChannels.contains(twitchChannel.toLowerCase());
+    }
+
+    //endregion
+
+    public TwitchClient getTwitchClient() {
+        return twitchClient;
+    }
+
+    public Twitter getTwitterClient() {
+        return twitterClient;
+    }
+}
diff --git a/src/main/java/de/presti/ree6/utils/SpotifyAPIHandler.java b/src/main/java/de/presti/ree6/utils/SpotifyAPIHandler.java
index 26b2e25d8..697bb8ff5 100644
--- a/src/main/java/de/presti/ree6/utils/SpotifyAPIHandler.java
+++ b/src/main/java/de/presti/ree6/utils/SpotifyAPIHandler.java
@@ -25,15 +25,15 @@ public SpotifyAPIHandler() {
         try {
             initSpotify();
         } catch (ParseException | SpotifyWebApiException | IOException e) {
-            Main.instance.getLogger().error("Couldn't create a Spotify Instance", e);
+            Main.getInstance().getLogger().error("Couldn't create a Spotify Instance", e);
         }
         instance = this;
     }
 
     public void initSpotify() throws ParseException, SpotifyWebApiException, IOException {
         this.spotifyApi = new SpotifyApi.Builder()
-                .setClientId(Main.config.getConfig().getString("spotify.client.id"))
-                .setClientSecret(Main.config.getConfig().getString("spotify.client.secret"))
+                .setClientId(Main.getInstance().getConfig().getConfig().getString("spotify.client.id"))
+                .setClientSecret(Main.getInstance().getConfig().getConfig().getString("spotify.client.secret"))
                 .build();
 
         ClientCredentialsRequest.Builder request = new ClientCredentialsRequest.Builder(spotifyApi.getClientId(), spotifyApi.getClientSecret());
diff --git a/src/main/java/de/presti/ree6/utils/TwitchAPIHandler.java b/src/main/java/de/presti/ree6/utils/TwitchAPIHandler.java
deleted file mode 100644
index 9ca35c150..000000000
--- a/src/main/java/de/presti/ree6/utils/TwitchAPIHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package de.presti.ree6.utils;
-
-import club.minnced.discord.webhook.send.WebhookEmbed;
-import club.minnced.discord.webhook.send.WebhookEmbedBuilder;
-import club.minnced.discord.webhook.send.WebhookMessageBuilder;
-import com.github.twitch4j.TwitchClient;
-import com.github.twitch4j.TwitchClientBuilder;
-import com.github.twitch4j.events.ChannelGoLiveEvent;
-import de.presti.ree6.bot.BotInfo;
-import de.presti.ree6.bot.Webhook;
-import de.presti.ree6.main.Data;
-import de.presti.ree6.main.Main;
-
-import java.awt.*;
-import java.util.ArrayList;
-
-public class TwitchAPIHandler {
-
-    final ArrayList<String> registerChannels = new ArrayList<>();
-
-    private final TwitchClient twitchClient;
-
-    public TwitchAPIHandler() {
-        twitchClient = TwitchClientBuilder.builder().withEnableHelix(true).withClientId(Main.config.cfg.getString("twitch.client.id")).withClientSecret(Main.config.cfg.getString("twitch.client.secret")).build();
-    }
-
-    public TwitchClient getTwitchClient() {
-        return twitchClient;
-    }
-
-    public void registerChannel(String name) {
-        twitchClient.getClientHelper().enableStreamEventListener(name.toLowerCase());
-        registerChannels.add(name.toLowerCase());
-    }
-
-    public void unregisterChannel(String name) {
-        twitchClient.getClientHelper().disableStreamEventListener(name.toLowerCase());
-        if (isRegisterd(name.toLowerCase())) {
-            registerChannels.remove(name.toLowerCase());
-        }
-    }
-
-    public void registerTwitchLive() {
-        twitchClient.getEventManager().onEvent(ChannelGoLiveEvent.class, channelGoLiveEvent -> {
-            ArrayList<String[]> twitchWebhooks = Main.sqlConnector.getSqlWorker().getTwitchWebhooksByName(channelGoLiveEvent.getStream().getUserName().toLowerCase());
-
-            for (String[] credits : twitchWebhooks) {
-                if (credits[0].equalsIgnoreCase("No setup!")) {
-                    LoggerImpl.log("TwitchNotifier", "Error while getting Infos (" + channelGoLiveEvent.getStream().getUserName() + ")");
-                    return;
-                }
-
-                WebhookMessageBuilder wmb = new WebhookMessageBuilder();
-
-                wmb.setAvatarUrl(BotInfo.botInstance.getSelfUser().getAvatarUrl());
-                wmb.setUsername("Ree6");
-
-                WebhookEmbedBuilder webhookEmbedBuilder = new WebhookEmbedBuilder();
-
-                webhookEmbedBuilder.setTitle(new WebhookEmbed.EmbedTitle(channelGoLiveEvent.getStream().getUserName(), null));
-                webhookEmbedBuilder.setAuthor(new WebhookEmbed.EmbedAuthor("Twitch Notifier", null, null));
-                webhookEmbedBuilder.setImageUrl(channelGoLiveEvent.getStream().getThumbnailUrl());
-                webhookEmbedBuilder.setDescription("Hey the User " + channelGoLiveEvent.getStream().getUserName() + " is now LIVE!\n\nhttps://twitch.tv/" + channelGoLiveEvent.getStream().getUserName() + "\n\nTitle: " + channelGoLiveEvent.getStream().getTitle() + "\nViewercount: " + channelGoLiveEvent.getStream().getViewerCount() + "\nGame: " + channelGoLiveEvent.getStream().getGameName());
-                webhookEmbedBuilder.setFooter(new WebhookEmbed.EmbedFooter(Data.ADVERTISEMENT, null));
-                webhookEmbedBuilder.setColor(Color.MAGENTA.getRGB());
-
-                wmb.addEmbeds(webhookEmbedBuilder.build());
-
-                Webhook.sendWebhook(null, wmb.build(), Long.parseLong(credits[0]), credits[1]);
-            }
-        });
-    }
-
-    public boolean isRegisterd(String name) {
-        return registerChannels.contains(name.toLowerCase());
-    }
-}
diff --git a/src/main/java/de/presti/ree6/utils/YouTubeAPIHandler.java b/src/main/java/de/presti/ree6/utils/YouTubeAPIHandler.java
index 2fa1a8916..bd6b7bfd4 100644
--- a/src/main/java/de/presti/ree6/utils/YouTubeAPIHandler.java
+++ b/src/main/java/de/presti/ree6/utils/YouTubeAPIHandler.java
@@ -21,7 +21,7 @@ public YouTubeAPIHandler() {
         try {
             createYouTube();
         } catch (Exception e) {
-            Main.instance.getLogger().error("Couldn't create a YouTube Instance", e);
+            Main.getInstance().getLogger().error("Couldn't create a YouTube Instance", e);
         }
         instance = this;
     }
@@ -36,7 +36,7 @@ public String searchYoutube(String search) {
                     .list(Collections.singletonList("snippet"))
                     .setQ(search)
                     .setMaxResults(2L)
-                    .setKey(Main.config.getConfig().getString("youtube.api.key"))
+                    .setKey(Main.getInstance().getConfig().getConfig().getString("youtube.api.key"))
                     .execute()
                     .getItems();
 
@@ -54,7 +54,7 @@ public String searchYoutube(String search) {
 
         }
         catch (Exception e) {
-            Main.instance.getLogger().error("Couldn't search on YouTube", e);
+            Main.getInstance().getLogger().error("Couldn't search on YouTube", e);
         }
 
         return null;
@@ -71,7 +71,7 @@ public void createYouTube() {
                     .build();
         }
         catch (Exception e) {
-            Main.instance.getLogger().error("Couldn't create a YouTube Instance", e);
+            Main.getInstance().getLogger().error("Couldn't create a YouTube Instance", e);
         }
     }
 }
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 94d330c41..3d96203e4 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<configuration scan="true">
+<configuration>
     <!-- Configure Twitch4J logger level -->
     <logger name="com.github.twitch4j" level="INFO"/>
 
     <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>logfile.log</file>
+        <file>logs\latest.log</file>
         <append>true</append>
         <encoder>
-            <pattern>%-4relative [%thread] %-5level %logger{35} - %msg %n</pattern>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg %n</pattern>
         </encoder>
     </appender>
 
@@ -20,10 +20,10 @@
     </appender>
 
     <!-- Appender Output Configuration -->
-    <root level="info">
-        <appender-ref ref="CONSOLE"/>
-    </root>
     <root>
-        <appender-ref ref="FILE"/>
+        <appender-ref ref="FILE" />
+    </root>
+    <root level="info">
+        <appender-ref ref="CONSOLE" />
     </root>
 </configuration>
\ No newline at end of file