diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml
index cc3dea0..d710637 100644
--- a/Bukkit/pom.xml
+++ b/Bukkit/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, Rían Errity. All rights reserved.
+  ~ Copyright (c) 2021, Rían Errity. All rights reserved.
   ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   ~
   ~ This code is free software; you can redistribute it and/or modify it
@@ -28,17 +28,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>hiberniadiscord</artifactId>
-        <groupId>io.paradaux.hiberniadiscord</groupId>
-        <version>4.0.0</version>
+        <artifactId>conch</artifactId>
+        <groupId>io.paradaux.conch</groupId>
+        <version>1.0.0</version>
     </parent>
 
-    <artifactId>hiberniadiscord-bukkit</artifactId>
-    <version>4.0.0</version>
+    <artifactId>conch-bukkit</artifactId>
+    <version>1.0.0</version>
     <packaging>jar</packaging>
 
     <name>Bukkit</name>
-    <description>HiberniaDiscord's Bukkit Functionality</description>
+    <description>Conch's Bukkit Implementation</description>
 
     <build>
         <plugins>
@@ -68,6 +68,7 @@
                                 <filter>
                                     <artifact>*:*</artifact>
                                     <excludes>
+                                        <exclude>module-info.class</exclude>
                                         <exclude>META-INF/*.SF</exclude>
                                         <exclude>META-INF/*.DSA</exclude>
                                         <exclude>META-INF/*.RSA</exclude>
@@ -78,11 +79,7 @@
                             <relocations>
                                 <relocation>
                                     <pattern>bstats-bukkit</pattern>
-                                    <shadedPattern>io.paradaux.hiberniadiscord.bstats</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>hiberniadiscord-common</pattern>
-                                    <shadedPattern>io.paradaux.hiberniadiscord.common</shadedPattern>
+                                    <shadedPattern>io.paradaux.conch.bstats</shadedPattern>
                                 </relocation>
                             </relocations>
                         </configuration>
@@ -122,15 +119,12 @@
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
             <version>1.8</version>
-            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.paradaux.hiberniadiscord</groupId>
-            <artifactId>hiberniadiscord-common</artifactId>
-            <version>4.0.0</version>
-            <scope>compile</scope>
+            <groupId>io.paradaux.conch</groupId>
+            <artifactId>conch-common</artifactId>
+            <version>1.0.0</version>
         </dependency>
-
     </dependencies>
 </project>
diff --git a/Bukkit/src/main/java/io/paradaux/conch/bukkit/BukkitConch.java b/Bukkit/src/main/java/io/paradaux/conch/bukkit/BukkitConch.java
new file mode 100644
index 0000000..1b11306
--- /dev/null
+++ b/Bukkit/src/main/java/io/paradaux/conch/bukkit/BukkitConch.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 3 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 3 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
+ * if you need additional information or have any questions.
+ * See LICENSE.md for more details.
+ */
+
+package io.paradaux.conch.bukkit;
+
+import io.paradaux.conch.bukkit.api.BukkitAPI;
+import io.paradaux.conch.bukkit.api.BukkitConfigurationManager;
+import io.paradaux.conch.bukkit.bot.DiscordMessageListener;
+import io.paradaux.conch.bukkit.listeners.AsyncPlayerChatEventListener;
+import io.paradaux.conch.bukkit.managers.MetricsManager;
+import io.paradaux.conch.bukkit.managers.TaskManager;
+import io.paradaux.conch.bukkit.managers.UpdateManager;
+import io.paradaux.conch.common.api.DiscordManager;
+import io.paradaux.conch.common.api.I18NLogger;
+import io.paradaux.conch.common.api.I18NManager;
+import io.paradaux.conch.common.api.config.CachedBotSettings;
+import io.paradaux.conch.common.api.config.CachedEventSettings;
+import io.paradaux.conch.common.api.config.CachedServerSettings;
+import io.paradaux.conch.common.api.config.ConfigurationUtil;
+import io.paradaux.conch.common.bot.DiscordBot;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.slf4j.LoggerFactory;
+
+import javax.security.auth.login.LoginException;
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public class BukkitConch extends JavaPlugin {
+
+    private static BukkitAPI API;
+
+    private MetricsManager metrics;
+    private TaskManager tasks;
+    private UpdateManager updates;
+    private DiscordManager discord;
+    private DiscordBot discordBot;
+
+    @Override
+    public void onEnable() {
+        getLogger().info("Conch: Initialising locale.");
+        loadLocale();
+
+        I18NLogger.rawInfo("Initialising Taskchain");
+        tasks = new TaskManager(this);
+
+        I18NLogger.rawInfo("Loading Configuration");
+        loadConfiguration();
+
+        I18NLogger.rawInfo("Connecting to discord");
+        connect();
+
+        I18NLogger.rawInfo("Registering events");
+        registerEvents();
+
+        I18NLogger.rawInfo("Registering the API");
+        registerAPI();
+
+        I18NLogger.rawInfo("Starting the discord bot");
+        startDiscordBot();
+    }
+
+    @Override
+    public void onDisable() {
+        I18NLogger.info("shutdown.shutdown-message");
+    }
+
+    public void loadLocale() {
+        // TODO make additional locales available.
+        Locale locale = new Locale("en_US");
+
+        I18NManager i18NManager = new I18NManager(ResourceBundle.getBundle(I18NManager.RESOURCES_PATH, locale));
+
+        I18NLogger.setLogger(LoggerFactory.getLogger("io.paradaux.conch"));
+        I18NLogger.setI18nManager(i18NManager);
+
+        I18NLogger.info("startup.loading-message");
+    }
+
+    public void loadConfiguration() {
+        Path pluginData = this.getDataFolder().toPath();
+        BukkitConfigurationManager configurationManager = new BukkitConfigurationManager(pluginData);
+
+        configurationManager.deployResources();
+        configurationManager.loadConfigurationFiles();
+    }
+
+    public void connect() {
+        CachedServerSettings config = ConfigurationUtil.getGeneralSettings();
+        discord = new DiscordManager(config.getWebhookUrl(), true);
+    }
+
+    public void registerEvents() {
+        PluginManager pm = this.getServer().getPluginManager();
+        CachedEventSettings eventSettings = ConfigurationUtil.getEventSettings();
+
+        String serverName = ConfigurationUtil.getGeneralSettings().getServerName();
+        String messagePrefix = null;
+
+        boolean debug = ConfigurationUtil.isDebug();
+        pm.registerEvents(new AsyncPlayerChatEventListener(discord, debug, serverName, messagePrefix, eventSettings.getOnChatMessage()), this);
+    }
+
+    public void startDiscordBot() {
+        CachedBotSettings config = ConfigurationUtil.getBotSettings();
+
+        try {
+            discordBot = new DiscordBot();
+            discordBot.connect();
+            discordBot.addNewListener(new DiscordMessageListener(tasks, config));
+        } catch (LoginException ok) {
+            // TODO log
+        }
+
+    }
+
+    public void registerAPI() {
+        API = new BukkitAPI();
+    }
+}
diff --git a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/api/BukkitAPI.java b/Bukkit/src/main/java/io/paradaux/conch/bukkit/api/BukkitAPI.java
similarity index 73%
rename from Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/api/BukkitAPI.java
rename to Bukkit/src/main/java/io/paradaux/conch/bukkit/api/BukkitAPI.java
index 0ce3c2c..edf3bb8 100644
--- a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/api/BukkitAPI.java
+++ b/Bukkit/src/main/java/io/paradaux/conch/bukkit/api/BukkitAPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,13 +21,12 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.bukkit.api;
+package io.paradaux.conch.bukkit.api;
 
-import io.paradaux.hiberniadiscord.common.API;
-import io.paradaux.hiberniadiscord.common.api.BotManager;
-import io.paradaux.hiberniadiscord.common.api.ConfigurationManager;
-import io.paradaux.hiberniadiscord.common.api.DiscordManager;
-import io.paradaux.hiberniadiscord.common.api.I18NManager;
+import io.paradaux.conch.common.API;
+import io.paradaux.conch.common.api.ConfigurationManager;
+import io.paradaux.conch.common.api.DiscordManager;
+import io.paradaux.conch.common.api.I18NManager;
 
 public class BukkitAPI implements API {
 
@@ -36,11 +35,6 @@ public DiscordManager getDiscordManager() {
         return null;
     }
 
-    @Override
-    public BotManager getBotManager() {
-        return null;
-    }
-
     @Override
     public I18NManager getI18nManager() {
         return null;
diff --git a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/api/BukkitConfigurationManager.java b/Bukkit/src/main/java/io/paradaux/conch/bukkit/api/BukkitConfigurationManager.java
similarity index 71%
rename from Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/api/BukkitConfigurationManager.java
rename to Bukkit/src/main/java/io/paradaux/conch/bukkit/api/BukkitConfigurationManager.java
index 0314aa0..52e0062 100644
--- a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/api/BukkitConfigurationManager.java
+++ b/Bukkit/src/main/java/io/paradaux/conch/bukkit/api/BukkitConfigurationManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,48 +21,41 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.bukkit.api;
+package io.paradaux.conch.bukkit.api;
 
-import io.paradaux.hiberniadiscord.common.api.ConfigurationManager;
-import io.paradaux.hiberniadiscord.common.api.I18NLogger;
-import io.paradaux.hiberniadiscord.common.api.config.*;
-import io.paradaux.hiberniadiscord.common.api.exceptions.NoSuchResourceException;
-import org.bukkit.plugin.Plugin;
+import io.paradaux.conch.common.api.ConfigurationManager;
+import io.paradaux.conch.common.api.I18NLogger;
+import io.paradaux.conch.common.api.config.CachedBotSettings;
+import io.paradaux.conch.common.api.config.CachedEventSettings;
+import io.paradaux.conch.common.api.config.CachedServerSettings;
+import io.paradaux.conch.common.api.config.ConfigurationLoader;
+import io.paradaux.conch.common.api.config.ConfigurationUtil;
+import io.paradaux.conch.common.api.exceptions.NoSuchResourceException;
 import org.spongepowered.configurate.ConfigurateException;
 
-import java.io.File;
 import java.nio.file.Path;
 
 public class BukkitConfigurationManager extends ConfigurationManager {
 
-    CachedSettings generalSettings;
-    CachedEventSettings eventSettings;
-    CachedBotSettings botSettings;
+    private CachedServerSettings generalSettings;
+    private CachedEventSettings eventSettings;
+    private CachedBotSettings botSettings;
 
-    ConfigurationLoader loader = getConfigurationLoader();
-    Plugin plugin;
+    private ConfigurationLoader loader = getConfigurationLoader();
+    private Path configurationDirectory;
 
     /**
      * BukkitConfigurationLoader uses Sponge's Configurate to load the HOCON values in the three settings files.
      *
      * @param configurationDirectory The directory in which the configuration files are being saved to.
      */
-    public BukkitConfigurationManager(Path configurationDirectory, Plugin plugin) {
+    public BukkitConfigurationManager(Path configurationDirectory) {
         super(configurationDirectory);
-        this.plugin = plugin;
+        this.configurationDirectory = configurationDirectory;
     }
 
     @Override
-    public void deployResource() {
-        File configurationDir = plugin.getDataFolder();
-        if (!plugin.getDataFolder().exists()) {
-            boolean result = configurationDir.mkdir();
-
-            if (!result) {
-                I18NLogger.error("configuration.make-plugin-directory-failure");
-            }
-        }
-
+    public void deployResources() {
         try {
             if (!loader.doesBotSettingsExist()) {
                 exportResource(ConfigurationLoader.BOT_SETTINGS_FILE_NAME, loader.getBotSettingsPath().toString());
@@ -88,12 +81,11 @@ public void loadConfigurationFiles() {
             eventSettings = loader.loadEventSettings();
             botSettings = loader.loadBotSettings();
         } catch (ConfigurateException exception) {
-            I18NLogger.error("");
+            I18NLogger.error(""); // TODO add error for failure to load configuration
             return;
         }
-        ConfigurationUtil.loadConfigurationValues(generalSettings, eventSettings, botSettings);
 
-        System.out.println("Test: " + eventSettings.getOnChatMessage().getEventName());
+        ConfigurationUtil.loadConfigurationValues(generalSettings, eventSettings, botSettings);
     }
 
     @Override
diff --git a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/api/PlaceholderWrapper.java b/Bukkit/src/main/java/io/paradaux/conch/bukkit/api/PlaceholderWrapper.java
similarity index 93%
rename from Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/api/PlaceholderWrapper.java
rename to Bukkit/src/main/java/io/paradaux/conch/bukkit/api/PlaceholderWrapper.java
index b0a99de..b8cd824 100644
--- a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/api/PlaceholderWrapper.java
+++ b/Bukkit/src/main/java/io/paradaux/conch/bukkit/api/PlaceholderWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.bukkit.api;
+package io.paradaux.conch.bukkit.api;
 
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.OfflinePlayer;
diff --git a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/api/VersionChecker.java b/Bukkit/src/main/java/io/paradaux/conch/bukkit/api/VersionChecker.java
similarity index 68%
rename from Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/api/VersionChecker.java
rename to Bukkit/src/main/java/io/paradaux/conch/bukkit/api/VersionChecker.java
index b7cd96d..61c94e3 100644
--- a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/api/VersionChecker.java
+++ b/Bukkit/src/main/java/io/paradaux/conch/bukkit/api/VersionChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,9 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.bukkit.api;
+package io.paradaux.conch.bukkit.api;
 
-import io.paradaux.hiberniadiscord.bukkit.controllers.TaskController;
+import io.paradaux.conch.bukkit.managers.TaskManager;
 import org.bukkit.util.Consumer;
 import org.slf4j.Logger;
 
@@ -47,19 +47,19 @@ public VersionChecker(int resourceId) {
      * */
     public void getVersion(final Consumer<String> consumer) {
 
-        TaskController.newChain().async(() -> {
-            try (InputStream inputStream = new URL("https://api.spigotmc.org/legacy/update.php?resource="
-                    + this.resourceId).openStream(); Scanner scanner = new Scanner(inputStream)) {
-
-                if (scanner.hasNext()) {
-                    consumer.accept(scanner.next());
-                }
-
-            } catch (IOException exception) {
-                // TODO: log
-
-            }
-        }).execute();
+//        TaskManager.newChain().async(() -> {
+//            try (InputStream inputStream = new URL("https://api.spigotmc.org/legacy/update.php?resource="
+//                    + this.resourceId).openStream(); Scanner scanner = new Scanner(inputStream)) {
+//
+//                if (scanner.hasNext()) {
+//                    consumer.accept(scanner.next());
+//                }
+//
+//            } catch (IOException exception) {
+//                // TODO: log
+//
+//            }
+//        }).execute();
 
     }
 
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/bot/DiscordMessageListener.java b/Bukkit/src/main/java/io/paradaux/conch/bukkit/bot/DiscordMessageListener.java
similarity index 63%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/bot/DiscordMessageListener.java
rename to Bukkit/src/main/java/io/paradaux/conch/bukkit/bot/DiscordMessageListener.java
index 80ad276..198baf8 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/bot/DiscordMessageListener.java
+++ b/Bukkit/src/main/java/io/paradaux/conch/bukkit/bot/DiscordMessageListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,14 +21,15 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.bot;
+package io.paradaux.conch.bukkit.bot;
 
-import co.aikar.taskchain.TaskChainFactory;
-import io.paradaux.hiberniadiscord.common.api.events.DiscordMessageReceivedEvent;
+import io.paradaux.conch.bukkit.managers.TaskManager;
+import io.paradaux.conch.common.api.config.CachedBotSettings;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -36,19 +37,16 @@
 
 public class DiscordMessageListener extends ListenerAdapter {
 
-    TaskChainFactory taskChainFactory;
-    String messageFormat;
-    List<String> monitoredChannels;
-    boolean ignoreBots;
+    private final CachedBotSettings config;
+    private final TaskManager tasks;
 
     /**
      * Handles discord messages coming in.
      * */
-    public DiscordMessageListener(List<String> monitoredChannels, TaskChainFactory taskChainFactory,
-                                  String messageFormat, boolean ignoreBots) {
-        this.monitoredChannels = monitoredChannels;
-        this.taskChainFactory = taskChainFactory;
-        this.ignoreBots = ignoreBots;
+    public DiscordMessageListener(TaskManager tasks, CachedBotSettings config) {
+
+        this.tasks = tasks;
+        this.config = config;
     }
 
     @Override
@@ -56,32 +54,31 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
         Member member = event.getMember();
 
         // If the message wasn't in a monitored channel, ignore it.
-        if (!monitoredChannels.contains(event.getChannel().getId())) {
+        if (!config.getMonitoredChannels().contains(event.getChannel().getId())) {
             return;
         }
 
         // If ignore bots is enabled, respect it.
-        if (event.getAuthor().isBot() && ignoreBots) {
+        if (event.getAuthor().isBot() && !config.isSendBotMessages()) {
             return;
         }
 
-        taskChainFactory.newChain().async(() -> {
-            String message = event.getMessage().getContentStripped();
-
+        tasks.newChain().async(() -> {
             // Member is null when the event is triggered by a webhook rather than a bot/user
             if (member == null) {
                 return;
             }
 
-            Role mainRole = getHighestFrom(member);
-
-            DiscordMessageReceivedEvent messageEvent = new DiscordMessageReceivedEvent()
-                    .setUsername(event.getAuthor().getName())
-                    .setNickname(member.getNickname() == null ? "" : member.getNickname())
-                    .setGuildName(event.getMessage().getGuild().getName())
-                    .setRole(mainRole == null ? "" : mainRole.getName());
-
-
+            Role highestRole = getHighestFrom(member);
+            Bukkit.getServer().broadcastMessage(config.getMessageFormat()
+                    .replace("%discord_nickname%", member.getEffectiveName())
+                    .replace("%discord_tag%", event.getAuthor().getAsTag())
+                    .replace("%discord_username%", event.getAuthor().getName())
+                    .replace("%discord_discriminator%", event.getAuthor().getDiscriminator())
+                    .replace("%discord_message%", event.getMessage().getContentStripped())
+                    .replace("%discord_topRole%",  highestRole == null ? "" : highestRole.getName())
+                    .replace("%discord_channel%", event.getChannel().getName())
+                    .replace("%discord_guild%", event.getGuild().getName()));
         }).execute();
     }
 
@@ -109,5 +106,5 @@ public Role getHighestFrom(Member member) {
         }).get();
     }
 
-
 }
+
diff --git a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/listeners/AsyncPlayerChatEventListener.java b/Bukkit/src/main/java/io/paradaux/conch/bukkit/listeners/AsyncPlayerChatEventListener.java
similarity index 50%
rename from Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/listeners/AsyncPlayerChatEventListener.java
rename to Bukkit/src/main/java/io/paradaux/conch/bukkit/listeners/AsyncPlayerChatEventListener.java
index 4ac08d8..d24863f 100644
--- a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/listeners/AsyncPlayerChatEventListener.java
+++ b/Bukkit/src/main/java/io/paradaux/conch/bukkit/listeners/AsyncPlayerChatEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,49 +21,53 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.bukkit.listeners;
+package io.paradaux.conch.bukkit.listeners;
 
-import io.paradaux.hiberniadiscord.bukkit.api.PlaceholderWrapper;
-import io.paradaux.hiberniadiscord.common.api.DiscordManager;
+import io.paradaux.conch.bukkit.api.PlaceholderWrapper;
+import io.paradaux.conch.common.api.DiscordManager;
+import io.paradaux.conch.common.api.I18NLogger;
+import io.paradaux.conch.common.api.config.EventConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 
 import javax.annotation.Nullable;
 
-import static io.paradaux.hiberniadiscord.bukkit.api.PlaceholderWrapper.withPlaceholders;
+import static io.paradaux.conch.bukkit.api.PlaceholderWrapper.withPlaceholders;
 
 public class AsyncPlayerChatEventListener extends GenericListener {
 
-    Logger logger;
-    String messagePrefix;
-    boolean debug;
+    private final DiscordManager discord;
 
-    public AsyncPlayerChatEventListener(String avatarApiUrl, String userNameFormat, String serverName,
-                                        @Nullable String messagePrefix, Logger logger, boolean debug) {
-        super(avatarApiUrl, userNameFormat, serverName);
-        this.messagePrefix = messagePrefix;
-        this.logger = logger;
+    private final boolean debug;
+    private final String serverName;
+    private final String messagePrefix; // TODO implement
+
+    private final String avatarApiFormat;
+    private final String userNameFormat;
+    private final String messageFormat;
+
+    public AsyncPlayerChatEventListener(DiscordManager discord, boolean debug, String serverName, String messagePrefix, EventConfiguration config) {
+        this.discord = discord;
         this.debug = debug;
+        this.serverName = serverName;
+        this.messagePrefix = messagePrefix;
+        this.avatarApiFormat = config.getWebhookAvatarFormat();
+        this.userNameFormat = config.getWebhookUsernameFormat();
+        this.messageFormat = config.getWebhookMessageFormat();
     }
 
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler(priority = EventPriority.LOWEST)
     public void onAsyncPlayerChatEvent(AsyncPlayerChatEvent event) {
-        Player player = event.getPlayer();
-        String userName = parsePlaceholders(player, getUserNameFormat());
-        String messageContent = parsePlaceholders(player, event.getMessage());
+        final Player player = event.getPlayer();
 
-        if (PlaceholderWrapper.isPresent()) {
-            userName = withPlaceholders(player, userName);
-            messageContent = withPlaceholders(player, messageContent);
-        }
+        String discordAvatarUrl = parsePlaceholders(player, serverName, avatarApiFormat, avatarApiFormat);
+        String discordUserName = parsePlaceholders(player, serverName, avatarApiFormat,userNameFormat);
 
-        if (userName == null || messageContent == null) {
-            logger.error("Something went wrong. AsyncPlayerChatEvent null.");
-            return;
-        }
+        String messageContent = parsePlaceholders(player, serverName, avatarApiFormat, event.getMessage());
 
         // Only send the message if it starts with the configured prefix (if applicable)
         if (messagePrefix != null) {
@@ -76,11 +80,11 @@ public void onAsyncPlayerChatEvent(AsyncPlayerChatEvent event) {
         }
 
         if (debug) {
-            logger.info("{} has sent a message in chat which will be relayed to the discord webhook.", player.getName());
+            // TODO log
+//            logger.info("{} has sent a message in chat which will be relayed to the discord webhook.", player.getName());
         }
 
-//        DiscordManager.sendDiscordMessage(userName, parseAvatarApi(player), messageContent);
-
+        discord.sendDiscordMessage(discordUserName, discordAvatarUrl, messageContent);
     }
 
 }
diff --git a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/listeners/GenericListener.java b/Bukkit/src/main/java/io/paradaux/conch/bukkit/listeners/GenericListener.java
similarity index 50%
rename from Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/listeners/GenericListener.java
rename to Bukkit/src/main/java/io/paradaux/conch/bukkit/listeners/GenericListener.java
index a4ddf5c..b3d3cfd 100644
--- a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/listeners/GenericListener.java
+++ b/Bukkit/src/main/java/io/paradaux/conch/bukkit/listeners/GenericListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,10 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.bukkit.listeners;
+package io.paradaux.conch.bukkit.listeners;
 
+import io.paradaux.conch.bukkit.api.PlaceholderWrapper;
+import io.paradaux.conch.common.api.config.ConfigurationUtil;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
@@ -33,17 +35,11 @@
 
 public class GenericListener implements Listener {
 
-    private final String avatarApiUrl;
-    private final String serverName;
-    private final String userNameFormat;
-
     /**
      * Represents a non-specific bukkit listener with the configuration values required to run.
      * */
-    public GenericListener(String avatarApiUrl, String userNameFormat, String serverName) {
-        this.avatarApiUrl = avatarApiUrl;
-        this.userNameFormat = userNameFormat;
-        this.serverName = serverName;
+    public GenericListener() {
+
     }
 
     /**
@@ -51,8 +47,12 @@ public GenericListener(String avatarApiUrl, String userNameFormat, String server
      * */
     @Nullable
     @CheckReturnValue
-    protected String parsePlaceholders(Player player, @NotNull String str) {
-        return parsePlaceholders((OfflinePlayer) player, str);
+    protected String parsePlaceholders(Player player, @NotNull String serverName, String avatarApi,String str) {
+        if (PlaceholderWrapper.isPresent()) {
+            str = PlaceholderWrapper.withPlaceholders(player, str);
+        }
+
+        return parseCustomPlaceholders(player, serverName, avatarApi, str);
     }
 
     /**
@@ -60,48 +60,47 @@ protected String parsePlaceholders(Player player, @NotNull String str) {
      * */
     @Nullable
     @CheckReturnValue
-    protected String parsePlaceholders(OfflinePlayer player, @NotNull String str) {
-        if (player == null || player.getName() == null) {
-            return null;
+    protected String parsePlaceholders(OfflinePlayer player, @NotNull String serverName, String avatarApi,String str) {
+        if (PlaceholderWrapper.isPresent()) {
+            str = PlaceholderWrapper.withPlaceholders(player, str);
         }
 
-        String avatarUrl = parseAvatarApi(player);
+        return parseCustomPlaceholders(player, serverName, avatarApi, str);
+    }
 
-        if (avatarUrl == null) {
-            avatarUrl = "";
+    /**
+     * Parses purely the custom placeholders.
+     * */
+    protected String parseCustomPlaceholders(OfflinePlayer player, String serverName, String avatarApi, String str) {
+        if (avatarApi == null) {
+            avatarApi = "";
         }
 
-        return str.replace("%playername%", player.getName())
-                .replace("%playeruuid%", player.getUniqueId().toString())
-                .replace("%servername%", serverName)
-                .replace("%avatarapi%", avatarUrl);
+        return str.replace("%playerUserName%", player.getName())
+                .replace("%playerDisplayName%", player.getPlayer() == null ? "" : player.getPlayer().getDisplayName())
+                .replace("%playerUUID", player.getUniqueId().toString())
+                .replace("%avatarApi%", parseAvatarApi(player, avatarApi))
+                .replace("%serverName%", serverName);
+
     }
 
     @Nullable
     @CheckReturnValue
-    protected String parseAvatarApi(Player player) {
-        return parseAvatarApi((OfflinePlayer) player);
+    protected String parseAvatarApi(Player player, String avatarApiUrl) {
+        return parseAvatarApi((OfflinePlayer) player, avatarApiUrl);
     }
 
     @Nullable
     @CheckReturnValue
-    protected String parseAvatarApi(OfflinePlayer player) {
+    protected String parseAvatarApi(OfflinePlayer player, String avatarApiUrl) {
         if (player == null) {
-            return null;
+            throw new IllegalStateException("This player is not available.");
         }
 
-        return avatarApiUrl.replace("%playeruuid%", player.getUniqueId().toString());
-    }
-
-    public String getAvatarApiUrl() {
-        return avatarApiUrl;
-    }
+        String uuid = player.getUniqueId().toString();
 
-    public String getServerName() {
-        return serverName;
+        avatarApiUrl = avatarApiUrl.replace("%avatarApi%", ConfigurationUtil.getGeneralSettings().getAvatarApi());
+        return avatarApiUrl.replace("%playerUUID%", ConfigurationUtil.getGeneralSettings().isAvatarApiHyphen() ? uuid : uuid.replace("-", ""));
     }
 
-    public String getUserNameFormat() {
-        return userNameFormat;
-    }
 }
diff --git a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/controllers/MetricsController.java b/Bukkit/src/main/java/io/paradaux/conch/bukkit/managers/MetricsManager.java
similarity index 88%
rename from Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/controllers/MetricsController.java
rename to Bukkit/src/main/java/io/paradaux/conch/bukkit/managers/MetricsManager.java
index b65fc8b..e1b5f9b 100644
--- a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/controllers/MetricsController.java
+++ b/Bukkit/src/main/java/io/paradaux/conch/bukkit/managers/MetricsManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,17 +21,17 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.bukkit.controllers;
+package io.paradaux.conch.bukkit.managers;
 
 import org.bstats.bukkit.Metrics;
 import org.bukkit.plugin.Plugin;
 
 
-public class MetricsController {
+public class MetricsManager {
 
     private static final int PLUGIN_ID = 8386;
 
-    public static MetricsController INSTANCE;
+    public static MetricsManager INSTANCE;
 
     boolean bstatsEnabled;
     boolean botEnabled;
@@ -42,7 +42,8 @@ public class MetricsController {
     /**
      * Creates the Metrics Instance which relays to BStats various things about the host server.
      * */
-    public MetricsController(Plugin plugin) {
+    public MetricsManager(Plugin plugin) {
+
         if (bstatsEnabled) {
             return;
         }
diff --git a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/controllers/TaskController.java b/Bukkit/src/main/java/io/paradaux/conch/bukkit/managers/TaskManager.java
similarity index 70%
rename from Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/controllers/TaskController.java
rename to Bukkit/src/main/java/io/paradaux/conch/bukkit/managers/TaskManager.java
index 0eaac47..1039f88 100644
--- a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/controllers/TaskController.java
+++ b/Bukkit/src/main/java/io/paradaux/conch/bukkit/managers/TaskManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,31 +21,25 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.bukkit.controllers;
+package io.paradaux.conch.bukkit.managers;
 
 import co.aikar.taskchain.BukkitTaskChainFactory;
 import co.aikar.taskchain.TaskChain;
 import co.aikar.taskchain.TaskChainFactory;
 import org.bukkit.plugin.Plugin;
 
-public class TaskController {
+public class TaskManager {
 
-    public static TaskController INSTANCE;
-    private static TaskChainFactory taskChainFactory;
+    private final TaskChainFactory taskChainFactory;
 
     /**
      * Initialise the TaskController.
      * */
-    public TaskController(Plugin plugin) {
-        BukkitTaskChainFactory.create(plugin);
-        INSTANCE = this;
+    public TaskManager(Plugin plugin) {
+        taskChainFactory = BukkitTaskChainFactory.create(plugin);
     }
 
-    public static <T> TaskChain<T> newChain() {
+    public <T> TaskChain<T> newChain() {
         return taskChainFactory.newChain();
     }
-
-    public static <T> TaskChain<T> newSharedChain(String name) {
-        return taskChainFactory.newSharedChain(name);
-    }
 }
diff --git a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/controllers/VersionNotificationController.java b/Bukkit/src/main/java/io/paradaux/conch/bukkit/managers/UpdateManager.java
similarity index 86%
rename from Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/controllers/VersionNotificationController.java
rename to Bukkit/src/main/java/io/paradaux/conch/bukkit/managers/UpdateManager.java
index bc4e5a3..001af02 100644
--- a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/controllers/VersionNotificationController.java
+++ b/Bukkit/src/main/java/io/paradaux/conch/bukkit/managers/UpdateManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.bukkit.controllers;
+package io.paradaux.conch.bukkit.managers;
 
-public class VersionNotificationController {
+public class UpdateManager {
 }
diff --git a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/HiberniaDiscord.java b/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/HiberniaDiscord.java
deleted file mode 100644
index b385d33..0000000
--- a/Bukkit/src/main/java/io/paradaux/hiberniadiscord/bukkit/HiberniaDiscord.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 3 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 3 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
- * if you need additional information or have any questions.
- * See LICENSE.md for more details.
- */
-
-package io.paradaux.hiberniadiscord.bukkit;
-
-import co.aikar.taskchain.BukkitTaskChainFactory;
-import co.aikar.taskchain.TaskChainFactory;
-import io.paradaux.hiberniadiscord.bukkit.api.BukkitAPI;
-import io.paradaux.hiberniadiscord.bukkit.api.BukkitConfigurationManager;
-import io.paradaux.hiberniadiscord.common.api.I18NLogger;
-import io.paradaux.hiberniadiscord.common.api.I18NManager;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.file.Path;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-public class HiberniaDiscord extends JavaPlugin {
-
-    private static BukkitAPI API;
-
-    private static Logger logger;
-
-
-    @Override
-    public void onEnable() {
-        getLogger().info("HiberniaDiscord: INIT Locale.");
-        loadLocale();
-
-        I18NLogger.rawInfo("INIT: Taskchain.");
-        TaskChainFactory taskChainFactory = BukkitTaskChainFactory.create(this);
-
-        I18NLogger.rawInfo("INIT: Configuration.");
-        loadConfiguration();
-
-        I18NLogger.rawInfo("INIT: Events.");
-        registerEvents();
-
-        I18NLogger.rawInfo("INIT: API.");
-        registerAPI();
-    }
-
-    @Override
-    public void onDisable() {
-        I18NLogger.info("shutdown.shutdown-message");
-    }
-
-    public void loadLocale() {
-        Locale locale = new Locale("en_US");
-        I18NManager i18NManager = new I18NManager(ResourceBundle.getBundle(I18NManager.RESOURCES_PATH, locale));
-
-        I18NLogger.setLogger(LoggerFactory.getLogger("io.paradaux.hiberniadiscord"));
-        I18NLogger.setI18nManager(i18NManager);
-
-        I18NLogger.info("startup.loading-message");
-    }
-
-
-    public void loadConfiguration() {
-        Path configDir = this.getDataFolder().toPath();
-        BukkitConfigurationManager configurationManager = new BukkitConfigurationManager(configDir, this);
-
-        configurationManager.deployResource();
-        configurationManager.loadConfigurationFiles();
-    }
-
-
-    public void registerEvents() {
-        String avatarApiUrl = "https://mc-heads.net/combo/%playeruuid%";
-        String userNameFormat = "%playername%";
-        String serverName = "Test Server";
-        String messagePrefix = null;
-
-//        PluginManager pluginManager = getServer().getPluginManager();
-//
-//        pluginManager.registerEvents(new AsyncPlayerChatEventListener(avatarApiUrl, userNameFormat, serverName, messagePrefix,
-//                                    logger, true), this);
-    }
-
-    public void registerAPI() {
-        API = new BukkitAPI();
-    }
-
-
-}
diff --git a/Bukkit/src/main/resources/bot-settings.conf b/Bukkit/src/main/resources/bot-settings.conf
index 2ce2d76..df5f70d 100644
--- a/Bukkit/src/main/resources/bot-settings.conf
+++ b/Bukkit/src/main/resources/bot-settings.conf
@@ -1,6 +1,6 @@
-# HiberniaDiscord v4.0.0 by Rían Errity <rian@paradaux.io> Licensed under GPLv3 | Bot Configuration.
+# Conch 1.0 by Rían Errity <rian@paradaux.io> Licensed under GPLv3 | Bot Configuration.
 
-// HiberniaDiscord comes bundled with a built-in discord bot. In order to make use of this you must create a discord
+// Conch comes bundled with a built-in discord bot. In order to make use of this you must create a discord
 // token and place it between the double quotes ("") in the token field on line 8. The discord bot permits you to have
 // discord messages show up in game.
 
@@ -8,7 +8,7 @@
 
 enabled: false
 
-// The Bot Token is your API key so HiberniaDiscord can talk to discord as a bot. You must create the bot account here:
+// The Bot Token is your API key so Conch can talk to discord as a bot. You must create the bot account here:
 // https://discord.com/developers/applications Please see https://hiberniadiscrd.paradaux.io/#/bot-configuration for
 // more user-friendly instructions.
 
@@ -23,10 +23,10 @@ command-prefix: ';'
 send-messages-from-bots: false
 
 // This is an array of discord channel IDs which the discord bot will listen to messages from
-monitored-channels: ["731716903742996531", "736301820351086656", "739708755767329350"]
+monitored-channels: ["822245879556997122", "736301820351086656", "739708755767329350"]
 
 // This configuration option only works on proxies, but allows you to map servers to monitored disocrd channels.
-// This is an advanced configuration option https://hiberniadiscord.paradaux.io/#/network-configuration for more
+// This is an advanced configuration option {TODO INSERT DOC LINK} for more
 // information as to how to set this up.
 
 // N.B :: Enabling this disables the monitors listed in monitored-channels
@@ -43,9 +43,14 @@ proxy-monitored-channels: {
 // This is how you configure how your messages appear in-game as they are broadcast to your users.
 
 // Available Placeholders:
-// - %playerUserName%     :: The Player's Username.
-// - %playerDisplayName%  :: The Player's Display name (Used by other plugins for Nicknames, prefixes etc)
-// - %playerUUID%         :: The Player's Unique ID.
-// - %avatarAPI%          :: The Player's Head as defined in general-settings.conf
-// - %serverName%         :: The Name of the server as defined in general-settings.conf
-message-format: "&7D: &7#%channel%: <&c%mainrole%&7> <&c%username%#%discriminator%&7>: &7%message%"
+// - %discord_nickname%        :: The nickname of discord user who sent a message.
+// - %discord_tag%             :: The tag (Username#Descriminator) of the user who sent a message.
+// - %discord_username%        :: The username of that user.
+// - %discord_descriminator%   :: The descriminator of that user.
+// - %discord_message%         :: The message sent by that user.
+// - %discord_topRole%         :: The highest role that user has.
+// - %discord_channel%         :: The channel in which the message was sent.
+// - %discord_guild%           :: The guild in which that message was sent.
+
+// TODO adventure support
+message-format: " #%discord_channel% <%discord_topRole%> %discord_nickname% » %discord_message%"
diff --git a/Bukkit/src/main/resources/event-settings.conf b/Bukkit/src/main/resources/event-settings.conf
index 8f752a6..01b32ee 100644
--- a/Bukkit/src/main/resources/event-settings.conf
+++ b/Bukkit/src/main/resources/event-settings.conf
@@ -1,4 +1,4 @@
-# HiberniaDiscord v4.0.0 by Rían Errity <rian@paradaux.io> Licensed under GPLv3 | Event Configuration.
+# Conch 1.0 by Rían Errity <rian@paradaux.io> Licensed under GPLv3 | Event Configuration.
 
 // This is where you configure how certain events are displayed when they are sent to discord
 // If you do not wish for them to be sent to discord please set enabled to false.
diff --git a/Bukkit/src/main/resources/general-settings.conf b/Bukkit/src/main/resources/general-settings.conf
index e40c2ca..2373320 100644
--- a/Bukkit/src/main/resources/general-settings.conf
+++ b/Bukkit/src/main/resources/general-settings.conf
@@ -1,37 +1,24 @@
-# HiberniaDiscord v4.0.0 by Rían Errity <rian@paradaux.io> Licensed under GPLv3 | General Settings.
+# Conch 1.0 by Rían Errity <rian@paradaux.io> Licensed under GPLv3 | General Settings.
 
 // This is where you configure the webhook and some general plugin settings.
 // If you do not wish for them to be sent to discord please set enabled to false.
 // We're open to adding more events, if you have any ideas please send them our way via a github issue.
 
-configuration-version: "4.0.0"
+configuration-version: "1.0.0"
 debug: false
 locale: en_US
 
 webhook-configuration: {
-  // See creating a webhook @ https://hiberniadiscord.paradaux.io/#/creating-a-webhook/
-  // This is the webhook used by the events system. HiberniaDiscord Addons have the option of using their own webhook.
+  // See creating a webhook @ https://docs.conch.rocks/discord-guides/creating-a-webhook
+  // This is the webhook used by the events system. Conch Addons have the option of using their own webhook.
   webhook-url: ""
 
-  // If you only want to use HiberniaDiscord's Plugin's functionality disable the event listeners here.
+  // If you only want to use Conch's api functionality disable the event listeners here.
   events: true
 }
 
 placeholders: {
   server-name: "Server"
-  avatar-api: "https://crafatar.com/renders/head/%playeruuid%?size=10&overlay"
-}
-
-// Enabling this enables the below proy-webhook-configuration settings which allows you to map servers to webhooks.
-// This option only exists for Proxies such as Bungeecord and Velocity.
-// See https://hiberniadiscord.paradaux.io/#/network-configuration for more information on how to setup a multi-server
-// / proxy setup.
-// Example:
-// "lobby": "https://discord.com/api/webhooks/794401363609649203/JY_EjgCw0dqkTckv8uB-kDo0wSovu9a8mFnGGXkyaGISvMTe3_zZKA"
-// You can have as many entries as you like!
-proxy-based-webhook-configuration: true
-
-proxy-webhook-configuration: {
-  "serverName": "webhook1",
-  "serverName2": "webhook2"
+  include-hyphens-in-uuid: false // Whether or not to remove hypens from the UUID (Some APIs are faster with this enabled.)
+  avatar-api: "https://visage.surgeplay.com/head/512/%playerUUID%"
 }
\ No newline at end of file
diff --git a/Bukkit/src/main/resources/plugin.yml b/Bukkit/src/main/resources/plugin.yml
index f84b09b..30262f7 100644
--- a/Bukkit/src/main/resources/plugin.yml
+++ b/Bukkit/src/main/resources/plugin.yml
@@ -1,8 +1,6 @@
-name: HiberniaDiscord
+name: Conch
 version: ${project.version}
-main: io.paradaux.hiberniadiscord.bukkit.HiberniaDiscord
+main: io.paradaux.conch.bukkit.BukkitConch
 api-version: 1.16
-description: HiberniaDiscord's Bukkit Functioanlity
+description: Conch's Bukkit Implementation
 commands:
-  disable:
-    usage: /disable
\ No newline at end of file
diff --git a/Bungeecord/pom.xml b/Bungeecord/pom.xml
index 55d4f43..9d39614 100644
--- a/Bungeecord/pom.xml
+++ b/Bungeecord/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, Rían Errity. All rights reserved.
+  ~ Copyright (c) 2021, Rían Errity. All rights reserved.
   ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   ~
   ~ This code is free software; you can redistribute it and/or modify it
@@ -28,17 +28,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>hiberniadiscord</artifactId>
-        <groupId>io.paradaux.hiberniadiscord</groupId>
-        <version>4.0.0</version>
+        <artifactId>conch</artifactId>
+        <groupId>io.paradaux.conch</groupId>
+        <version>1.0.0</version>
     </parent>
 
-    <artifactId>hiberniadiscord-bungeecord</artifactId>
-    <version>4.0.0</version>
+    <artifactId>conch-bungeecord</artifactId>
+    <version>1.0.0</version>
     <packaging>jar</packaging>
 
     <name>Bungeecord</name>
-    <description>HiberniaDiscord's Bungeecord Functionality</description>
+    <description>Conch's Bungeecord Functionality</description>
 
     <build>
         <defaultGoal>clean package</defaultGoal>
@@ -87,6 +87,13 @@
         </resources>
     </build>
 
+    <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>net.md-5</groupId>
@@ -96,10 +103,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.paradaux.hiberniadiscord</groupId>
-            <artifactId>hiberniadiscord-common</artifactId>
-            <version>4.0.0</version>
-            <scope>compile</scope>
+            <groupId>io.paradaux.conch</groupId>
+            <artifactId>conch-common</artifactId>
+            <version>1.0.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/Bungeecord/src/main/java/io/paradaux/hiberniadiscord/bungeecord/HiberniaDiscord.java b/Bungeecord/src/main/java/io/paradaux/conch/bungeecord/BungeeConch.java
similarity index 51%
rename from Bungeecord/src/main/java/io/paradaux/hiberniadiscord/bungeecord/HiberniaDiscord.java
rename to Bungeecord/src/main/java/io/paradaux/conch/bungeecord/BungeeConch.java
index 73b1e9e..6bf43dc 100644
--- a/Bungeecord/src/main/java/io/paradaux/hiberniadiscord/bungeecord/HiberniaDiscord.java
+++ b/Bungeecord/src/main/java/io/paradaux/conch/bungeecord/BungeeConch.java
@@ -1,7 +1,29 @@
-package io.paradaux.hiberniadiscord.bungeecord;
-
-import io.paradaux.hiberniadiscord.bungeecord.listeners.ChatEventListener;
-import io.paradaux.hiberniadiscord.common.api.DiscordManager;
+/*
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 3 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 3 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
+ * if you need additional information or have any questions.
+ * See LICENSE.md for more details.
+ */
+
+package io.paradaux.conch.bungeecord;
+
+import io.paradaux.conch.bungeecord.listeners.ChatEventListener;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,7 +31,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public final class HiberniaDiscord extends Plugin {
+public final class BungeeConch extends Plugin {
 
     private static Logger logger;
 
@@ -25,7 +47,7 @@ public final class HiberniaDiscord extends Plugin {
     @Override
     public void onEnable() {
         // Plugin startup logic
-        logger = LoggerFactory.getLogger("io.paradaux.hiberniadiscord");
+        logger = LoggerFactory.getLogger("io.paradaux.conch");
 
 //        DiscordManager.initialise(webhookUrl, true, logger);
 //        DiscordManager.sendDiscordMessage("Test", iconUrl, "hello world");
diff --git a/Bungeecord/src/main/java/io/paradaux/hiberniadiscord/bungeecord/listeners/ChatEventListener.java b/Bungeecord/src/main/java/io/paradaux/conch/bungeecord/listeners/ChatEventListener.java
similarity index 94%
rename from Bungeecord/src/main/java/io/paradaux/hiberniadiscord/bungeecord/listeners/ChatEventListener.java
rename to Bungeecord/src/main/java/io/paradaux/conch/bungeecord/listeners/ChatEventListener.java
index 8f20ed4..733ef8f 100644
--- a/Bungeecord/src/main/java/io/paradaux/hiberniadiscord/bungeecord/listeners/ChatEventListener.java
+++ b/Bungeecord/src/main/java/io/paradaux/conch/bungeecord/listeners/ChatEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,8 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.bungeecord.listeners;
+package io.paradaux.conch.bungeecord.listeners;
 
-import io.paradaux.hiberniadiscord.common.api.DiscordManager;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ChatEvent;
 import net.md_5.bungee.event.EventHandler;
diff --git a/Bungeecord/src/main/java/io/paradaux/hiberniadiscord/bungeecord/listeners/GenericListener.java b/Bungeecord/src/main/java/io/paradaux/conch/bungeecord/listeners/GenericListener.java
similarity index 96%
rename from Bungeecord/src/main/java/io/paradaux/hiberniadiscord/bungeecord/listeners/GenericListener.java
rename to Bungeecord/src/main/java/io/paradaux/conch/bungeecord/listeners/GenericListener.java
index 8580382..a123f62 100644
--- a/Bungeecord/src/main/java/io/paradaux/hiberniadiscord/bungeecord/listeners/GenericListener.java
+++ b/Bungeecord/src/main/java/io/paradaux/conch/bungeecord/listeners/GenericListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.bungeecord.listeners;
+package io.paradaux.conch.bungeecord.listeners;
 
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Listener;
diff --git a/Bungeecord/src/main/resources/bungee.yml b/Bungeecord/src/main/resources/bungee.yml
index 1b5e905..1af8094 100644
--- a/Bungeecord/src/main/resources/bungee.yml
+++ b/Bungeecord/src/main/resources/bungee.yml
@@ -1,4 +1,4 @@
-name: HiberniaDiscord
+name: Conch
 version: ${project.version}
-main: io.paradaux.hiberniadiscord.bungeecord.HiberniaDiscord
-description: HiberniaDiscord's Bungee Functionality 
+main: io.paradaux.conch.bungeecord.BungeeConch
+description: BungeeConch
diff --git a/Bungeecord/src/main/resources/log4j.properties b/Bungeecord/src/main/resources/log4j.properties
deleted file mode 100644
index 533678b..0000000
--- a/Bungeecord/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2020, Rían Errity. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3 only, as
-# published by the Free Software Foundation.
-
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 3 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-
-# You should have received a copy of the GNU General Public License version
-# 3 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
-# if you need additional information or have any questions.
-
-log4j.logger.io.paradaux.hiberniadiscord=debug, HiberniaDiscordAppender
-log4j.additivity.io.paradaux.hiberniadiscord=true
-
-log4j.appender.HiberniaDiscordAppender=org.apache.log4j.ConsoleAppender
-log4j.appender.HiberniaDiscordAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.HiberniaDiscordAppender.layout.ConversionPattern=[HiberniaDiscord: %p] %m%n
\ No newline at end of file
diff --git a/Common/pom.xml b/Common/pom.xml
index 9551fd1..bd28c2f 100644
--- a/Common/pom.xml
+++ b/Common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, Rían Errity. All rights reserved.
+  ~ Copyright (c) 2021, Rían Errity. All rights reserved.
   ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   ~
   ~ This code is free software; you can redistribute it and/or modify it
@@ -29,14 +29,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>hiberniadiscord</artifactId>
-        <groupId>io.paradaux.hiberniadiscord</groupId>
-        <version>4.0.0</version>
+        <artifactId>conch</artifactId>
+        <groupId>io.paradaux.conch</groupId>
+        <version>1.0.0</version>
     </parent>
 
-    <artifactId>hiberniadiscord-common</artifactId>
+    <artifactId>conch-common</artifactId>
     <name>Common</name>
-    <version>4.0.0</version>
+    <version>1.0.0</version>
 
     <build>
         <plugins>
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/API.java b/Common/src/main/java/io/paradaux/conch/common/API.java
similarity index 63%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/API.java
rename to Common/src/main/java/io/paradaux/conch/common/API.java
index 0d4018f..de7a009 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/API.java
+++ b/Common/src/main/java/io/paradaux/conch/common/API.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,19 +21,18 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common;
+package io.paradaux.conch.common;
 
-import io.paradaux.hiberniadiscord.common.api.BotManager;
-import io.paradaux.hiberniadiscord.common.api.ConfigurationManager;
-import io.paradaux.hiberniadiscord.common.api.DiscordManager;
-import io.paradaux.hiberniadiscord.common.api.I18NManager;
+import io.paradaux.conch.common.api.ConfigurationManager;
+import io.paradaux.conch.common.api.DiscordManager;
+import io.paradaux.conch.common.api.I18NManager;
 
 /**
- * The HiberniaDiscord API.
+ * The Conch API.
  *
- * <p>This exposes several key Utility/Management Classes which allow you to directly modify the behaviour of HiberniaDiscord externally.
- * In order to use this io.paradaux.hiberniadiscord.common.API you will have to grab an instance of this interface obtainable from the Main
- * class of the respective edition of HiberniaDiscord which you are using.</p>
+ * <p>This exposes several key Utility/Management Classes which allow you to directly modify the behaviour of Conch externally.
+ * In order to use this API you will have to grab an instance of this interface obtainable from the Main
+ * class of the respective edition of Conch which you are using.</p>
  *
  * @since 4.0.0
  * @author Rían Errity [rian@paradaux.io]
@@ -46,30 +45,21 @@ public interface API {
      * Gets the {@link DiscordManager}, which maintains the discord-webhook connection and
      * allows you to send messages to the default webhook channel or you may specify your own.
      *
-     * @return the MinnDevelopment/discord-webhooks wrapper used by HiberniaDiscord.
+     * @return the MinnDevelopment/discord-webhooks wrapper used by Conch.
      * @see DiscordManager
      * */
     DiscordManager getDiscordManager();
 
     /**
-     * Gets the {@link BotManager}, which manages HiberniaDiscord's integrated discord bot.
-     * Using this manager will allow you to register additional JDA Event Listeners or listen
-     * to HiberniaDiscords Integrated Event System, send messages as the bot and so on.
-     *
-     * @return The JDA 4.X Discord Bot Manager used by HiberniaDiscord.
-     * */
-    BotManager getBotManager();
-
-    /**
-     * Gets the {@link I18NManager}, which allows the developer to access HiberniaDiscord's ResourceBundles and
-     * translate keys from HiberniaDiscord's locale, as well as get the user's locale.
+     * Gets the {@link I18NManager}, which allows the developer to access Conch's ResourceBundles and
+     * translate keys from Conch's locale, as well as get the user's locale.
      *
      * @return The I18NManager which permits use of user-facing Text Displayable Content.
      * */
     I18NManager getI18nManager();
 
     /**
-     * Gets the {@link ConfigurationManager}, which allows access to HiberniaDiscord's configuration files as well as instances of Cached
+     * Gets the {@link ConfigurationManager}, which allows access to Conch's configuration files as well as instances of Cached
      * Settings, CachedEventSettings and CachedBotSettings, which contain the configuration values for their respective platforms. Also
      * contains helper methods for dealing with deploying configuration files, updating them and parsing HOCON via Sponge's Configurate.
      *
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/Common.java b/Common/src/main/java/io/paradaux/conch/common/Common.java
similarity index 90%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/Common.java
rename to Common/src/main/java/io/paradaux/conch/common/Common.java
index 48bde0b..d7a94c7 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/Common.java
+++ b/Common/src/main/java/io/paradaux/conch/common/Common.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,9 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common;public class Common {
+package io.paradaux.conch.common;
+
+public class Common {
 
     public static void main(String[] args) {
         System.out.println("You cannot execute this jar.");
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/PluginEdition.java b/Common/src/main/java/io/paradaux/conch/common/PluginEdition.java
similarity index 91%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/PluginEdition.java
rename to Common/src/main/java/io/paradaux/conch/common/PluginEdition.java
index 5e34b10..975d881 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/PluginEdition.java
+++ b/Common/src/main/java/io/paradaux/conch/common/PluginEdition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common;
+package io.paradaux.conch.common;
 
 public enum PluginEdition {
 
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/ConfigurationManager.java b/Common/src/main/java/io/paradaux/conch/common/api/ConfigurationManager.java
similarity index 86%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/ConfigurationManager.java
rename to Common/src/main/java/io/paradaux/conch/common/api/ConfigurationManager.java
index f54f067..2d8542a 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/ConfigurationManager.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/ConfigurationManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,10 +21,11 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api;
+package io.paradaux.conch.common.api;
 
-import io.paradaux.hiberniadiscord.common.api.config.ConfigurationLoader;
-import io.paradaux.hiberniadiscord.common.api.exceptions.NoSuchResourceException;
+import io.paradaux.conch.common.api.config.ConfigurationLoader;
+import io.paradaux.conch.common.api.config.ConfigurationUtil;
+import io.paradaux.conch.common.api.exceptions.NoSuchResourceException;
 
 import java.io.*;
 import java.nio.file.Path;
@@ -32,12 +33,14 @@
 public abstract class ConfigurationManager {
 
     private ConfigurationLoader configurationLoader;
+    private Path configurationDirectory;
 
     /**
      * Constructor which allows the use of String paths rather than the direct Paths themselves. Internally calls the correct constructor.
      * @see ConfigurationManager(Path, Path, Path, Path)
      * */
     public ConfigurationManager(Path configurationDirectory) {
+        this.configurationDirectory = configurationDirectory;
         configurationLoader = new ConfigurationLoader(configurationDirectory);
     }
 
@@ -47,10 +50,10 @@ public ConfigurationManager(Path configurationDirectory) {
      * @implSpec How we have to get a JAR Resource varies by platform, getResourceAsStream should be
      *           a last resort.
      * */
-    public abstract void deployResource();
+    public abstract void deployResources();
 
     /**
-     * Load the configuration file's values into the Singleton Holders in {@link io.paradaux.hiberniadiscord.common.api.config.ConfigurationUtil}
+     * Load the configuration file's values into the Singleton Holders in {@link ConfigurationUtil}
      * @implSpec Not every platform will implement every configuration field, making it platform-specific.
      *
      * */
@@ -97,4 +100,8 @@ public static void exportResource(String resourceName, String outputPath) throws
             throw new NoSuchResourceException("Failed to deploy resource : " + exception.getMessage());
         }
     }
+
+    public Path getConfigurationDirectory() {
+        return configurationDirectory;
+    }
 }
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/DiscordManager.java b/Common/src/main/java/io/paradaux/conch/common/api/DiscordManager.java
similarity index 79%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/DiscordManager.java
rename to Common/src/main/java/io/paradaux/conch/common/api/DiscordManager.java
index 9d875e9..d74cbd8 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/DiscordManager.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/DiscordManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api;
+package io.paradaux.conch.common.api;
 
 import club.minnced.discord.webhook.WebhookClient;
 import club.minnced.discord.webhook.WebhookClientBuilder;
@@ -39,46 +39,30 @@ public class DiscordManager {
             .compile("(?:https?://)?(?:\\w+\\.)?discord(?:app)?\\.com/api(?:/v\\d+)?/webhooks/(\\d+)/([\\w-]+)(?:/(?:\\w+)?)?");
     private static final String ZERO_WIDTH_SPACE = "\u200B";
 
-    private static volatile DiscordManager instance;
-
-    public static DiscordManager getInstance() {
-        if (instance == null) {
-            throw new NullPointerException("getInstance() being called before being instantiated.");
-        }
-
-        return instance;
-    }
-
-    private String webhookUrl;
-    private boolean sanitiseMentions = true;
+    private final boolean sanitiseMentions;
     private WebhookClient client;
-    private Logger logger;
 
     /**
      * Constructor to set fields and construct an instance of {@link WebhookClient}.
      * */
-    public DiscordManager(String webhookUrl, boolean sanitiseMentions, Logger logger) {
-        this.webhookUrl = webhookUrl;
+    public DiscordManager(String webhookUrl, boolean sanitiseMentions) {
         this.sanitiseMentions = sanitiseMentions;
-        this.logger = logger;
 
-        if (!isValidWebhook(webhookUrl)) {
-            logger.error("Your webhook URL is invalid or not set.");
-            return;
-        }
+//        if (!isValidWebhook(webhookUrl)) {
+////            logger.error("Your webhook URL is invalid or not set."); TODO Log
+//            return;
+//        }
 
         WebhookClientBuilder builder = new WebhookClientBuilder(webhookUrl);
         builder.setThreadFactory((job) -> {
             Thread thread = new Thread(job);
-            thread.setName("HiberniaDiscord");
+            thread.setName("Conch");
             thread.setDaemon(true);
             return thread;
         });
 
         builder.setWait(true);
         client = builder.build();
-
-        instance = this;
     }
 
     /**
@@ -88,7 +72,7 @@ public void sendDiscordMessage(WebhookMessage message) {
         try {
             client.send(message).get();
         } catch (ExecutionException | InterruptedException exception) {
-            logger.error("An error occurred", exception);
+//            logger.error("An error occurred", exception); TODO log
         }
     }
 
@@ -97,7 +81,7 @@ public void sendDiscordMessage(WebhookMessage message) {
      * */
     public void sendDiscordMessage(String username, String avatarUrl, String message) {
         if (message.isEmpty()) {
-            message = String.valueOf(ZERO_WIDTH_SPACE);
+            message = ZERO_WIDTH_SPACE;
         }
 
         if (sanitiseMentions) {
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/I18NLogger.java b/Common/src/main/java/io/paradaux/conch/common/api/I18NLogger.java
similarity index 95%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/I18NLogger.java
rename to Common/src/main/java/io/paradaux/conch/common/api/I18NLogger.java
index 1413d92..f20565d 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/I18NLogger.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/I18NLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api;
+package io.paradaux.conch.common.api;
 
 import org.slf4j.Logger;
 
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/I18NManager.java b/Common/src/main/java/io/paradaux/conch/common/api/I18NManager.java
similarity index 89%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/I18NManager.java
rename to Common/src/main/java/io/paradaux/conch/common/api/I18NManager.java
index 2f89659..f3c36d2 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/I18NManager.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/I18NManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,14 +21,14 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api;
+package io.paradaux.conch.common.api;
 
 import java.util.Locale;
 import java.util.ResourceBundle;
 
 public class I18NManager {
 
-    public static final String RESOURCES_PATH = "HiberniaDiscord";
+    public static final String RESOURCES_PATH = "Conch";
 
     private static final Locale[] locales = {
             Locale.getDefault(),
diff --git a/Common/src/main/java/io/paradaux/conch/common/api/StringUtils.java b/Common/src/main/java/io/paradaux/conch/common/api/StringUtils.java
new file mode 100644
index 0000000..25087cf
--- /dev/null
+++ b/Common/src/main/java/io/paradaux/conch/common/api/StringUtils.java
@@ -0,0 +1,9 @@
+package io.paradaux.conch.common.api;
+
+public class StringUtils {
+
+    public static String pluralise(int i) {
+        return (i == 1) ? "" : "s";
+    }
+
+}
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/CachedBotSettings.java b/Common/src/main/java/io/paradaux/conch/common/api/config/CachedBotSettings.java
similarity index 95%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/CachedBotSettings.java
rename to Common/src/main/java/io/paradaux/conch/common/api/config/CachedBotSettings.java
index 4fa67b2..a88c02c 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/CachedBotSettings.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/config/CachedBotSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api.config;
+package io.paradaux.conch.common.api.config;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -39,9 +39,9 @@ public class CachedBotSettings {
     private String commandPrefix;
     private boolean sendBotMessages;
     private List<String> monitoredChannels;
-    boolean proxyBasedMonitoring;
-    Map<String, String> proxyMonitoredChannels;
-    String messageFormat;
+    private boolean proxyBasedMonitoring;
+    private Map<String, String> proxyMonitoredChannels;
+    private String messageFormat;
 
     private CachedBotSettings() {
         // Using The Builder is the requested method as various fields will differ between platforms.
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/CachedEventSettings.java b/Common/src/main/java/io/paradaux/conch/common/api/config/CachedEventSettings.java
similarity index 89%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/CachedEventSettings.java
rename to Common/src/main/java/io/paradaux/conch/common/api/config/CachedEventSettings.java
index 806d800..5705ba5 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/CachedEventSettings.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/config/CachedEventSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,9 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api.config;
+package io.paradaux.conch.common.api.config;
 
-import io.paradaux.hiberniadiscord.common.api.exceptions.NoSuchEventListenerException;
+import io.paradaux.conch.common.api.exceptions.NoSuchEventListenerException;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.CheckReturnValue;
@@ -32,15 +32,15 @@ public class CachedEventSettings {
 
     // Fields in the order they're defined in event-settings.conf
 
-    EventConfiguration onChatMessage;
-    EventConfiguration onPlayerJoin;
-    EventConfiguration onPlayerLeave;
-    EventConfiguration onPlayerDeath;
-    EventConfiguration onPlayerAchievementCompleted;
-    EventConfiguration onPlayerKick;
-    EventConfiguration onPlayerRespawn;
-    EventConfiguration onServerStartup;
-    EventConfiguration onGracefulShutdown;
+    private EventConfiguration onChatMessage;
+    private EventConfiguration onPlayerJoin;
+    private EventConfiguration onPlayerLeave;
+    private EventConfiguration onPlayerDeath;
+    private EventConfiguration onPlayerAchievementCompleted;
+    private EventConfiguration onPlayerKick;
+    private EventConfiguration onPlayerRespawn;
+    private EventConfiguration onServerStartup;
+    private EventConfiguration onGracefulShutdown;
 
     private CachedEventSettings() {
         // Using The Builder is the requested method as various fields will differ between platforms.
diff --git a/Common/src/main/java/io/paradaux/conch/common/api/config/CachedProxySettings.java b/Common/src/main/java/io/paradaux/conch/common/api/config/CachedProxySettings.java
new file mode 100644
index 0000000..9a0631d
--- /dev/null
+++ b/Common/src/main/java/io/paradaux/conch/common/api/config/CachedProxySettings.java
@@ -0,0 +1,136 @@
+package io.paradaux.conch.common.api.config;
+
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.CheckReturnValue;
+import java.util.Map;
+
+public class CachedProxySettings {
+
+    private String configurationVersion;
+    private boolean debug;
+    private String localeCode;
+    private String webhookUrl;
+    private boolean eventsEnabled;
+    private String networkName;
+    private boolean avatarApiHyphen;
+    private String avatarApi;
+    private boolean proxyBasedWebhookConfiguration;
+    private Map<String, String> proxyWebhookConfiguration;
+
+    private CachedProxySettings() {
+        // Using The Builder is the requested method as various fields will differ between platforms.
+    }
+
+    public static CachedProxySettings.Builder builder() {
+        return new CachedProxySettings.Builder();
+    }
+
+    public static class Builder {
+
+        private final CachedProxySettings settings;
+
+        private Builder() {
+            settings = new CachedProxySettings();
+            // Please use the static method CachedSettings#builder to get an instance of this class.
+        }
+
+        public CachedProxySettings.Builder setConfigurationVersion(String configurationVersion) {
+            settings.configurationVersion = configurationVersion;
+            return this;
+        }
+
+        public CachedProxySettings.Builder setDebug(boolean debug) {
+            settings.debug = debug;
+            return this;
+        }
+
+        public CachedProxySettings.Builder setLocaleCode(String localeCode) {
+            settings.localeCode = localeCode;
+            return this;
+        }
+
+        public CachedProxySettings.Builder setWebhookUrl(String webhookUrl) {
+            settings.webhookUrl = webhookUrl;
+            return this;
+        }
+
+        public CachedProxySettings.Builder setEventsEnabled(boolean eventsEnabled) {
+            settings.eventsEnabled = eventsEnabled;
+            return this;
+        }
+
+        public CachedProxySettings.Builder setNetworkName(String networkName) {
+            settings.networkName = networkName;
+            return this;
+        }
+
+        public CachedProxySettings.Builder setAvatarApiHyphen(boolean avatarApiHyphen) {
+            settings.avatarApiHyphen = avatarApiHyphen;
+            return this;
+        }
+
+        public CachedProxySettings.Builder setAvatarApi(String avatarApi) {
+            settings.avatarApi = avatarApi;
+            return this;
+        }
+
+        public CachedProxySettings.Builder setProxyBasedWebhookConfiguration(boolean proxyBasedWebhookConfiguration) {
+            settings.proxyBasedWebhookConfiguration = proxyBasedWebhookConfiguration;
+            return this;
+        }
+
+        public CachedProxySettings.Builder setProxyWebhookConfiguration(Map<String, String> proxyWebhookConfiguration) {
+            settings.proxyWebhookConfiguration = proxyWebhookConfiguration;
+            return this;
+        }
+
+        @CheckReturnValue
+        @NotNull
+        public CachedProxySettings build() {
+            return settings;
+        }
+
+    }
+
+    public String getConfigurationVersion() {
+        return configurationVersion;
+    }
+
+    public boolean isDebug() {
+        return debug;
+    }
+
+    public String getLocaleCode() {
+        return localeCode;
+    }
+
+    public String getWebhookUrl() {
+        return webhookUrl;
+    }
+
+    public boolean isEventsEnabled() {
+        return eventsEnabled;
+    }
+
+    public String getNetworkName() {
+        return networkName;
+    }
+
+    public boolean isAvatarApiHyphen() {
+        return avatarApiHyphen;
+    }
+
+    public String getAvatarApi() {
+        return avatarApi;
+    }
+
+    public boolean isProxyBasedWebhookConfiguration() {
+        return proxyBasedWebhookConfiguration;
+    }
+
+    public Map<String, String> getProxyWebhookConfiguration() {
+        return proxyWebhookConfiguration;
+    }
+
+}
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/CachedSettings.java b/Common/src/main/java/io/paradaux/conch/common/api/config/CachedServerSettings.java
similarity index 61%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/CachedSettings.java
rename to Common/src/main/java/io/paradaux/conch/common/api/config/CachedServerSettings.java
index 953a672..97d775e 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/CachedSettings.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/config/CachedServerSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,90 +21,96 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api.config;
+package io.paradaux.conch.common.api.config;
 
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.CheckReturnValue;
 import java.util.Map;
 
-public class CachedSettings {
+public class CachedServerSettings {
 
-    String configurationVersion;
-    boolean debug;
-    String localeCode;
-    String webhookUrl;
-    boolean eventsEnabled;
-    String serverName;
-    String avatarApi;
-    boolean proxyBasedWebhookConfiguration;
-    Map<String, String> proxyWebhookConfiguration;
+    private String configurationVersion;
+    private boolean debug;
+    private String localeCode;
+    private String webhookUrl;
+    private boolean eventsEnabled;
+    private String serverName;
+    private boolean avatarApiHyphen;
+    private String avatarApi;
+    private boolean proxyBasedWebhookConfiguration;
+    private Map<String, String> proxyWebhookConfiguration;
 
-    private CachedSettings() {
+    private CachedServerSettings() {
         // Using The Builder is the requested method as various fields will differ between platforms.
     }
 
-    public static CachedSettings.Builder builder() {
-        return new CachedSettings.Builder();
+    public static CachedServerSettings.Builder builder() {
+        return new CachedServerSettings.Builder();
     }
 
     public static class Builder {
 
-        private final CachedSettings settings;
+        private final CachedServerSettings settings;
 
         private Builder() {
-            settings = new CachedSettings();
+            settings = new CachedServerSettings();
             // Please use the static method CachedSettings#builder to get an instance of this class.
         }
 
-        public CachedSettings.Builder setConfigurationVersion(String configurationVersion) {
+        public CachedServerSettings.Builder setConfigurationVersion(String configurationVersion) {
             settings.configurationVersion = configurationVersion;
             return this;
         }
 
-        public CachedSettings.Builder setDebug(boolean debug) {
+        public CachedServerSettings.Builder setDebug(boolean debug) {
             settings.debug = debug;
             return this;
         }
 
-        public CachedSettings.Builder setLocaleCode(String localeCode) {
+        public CachedServerSettings.Builder setLocaleCode(String localeCode) {
             settings.localeCode = localeCode;
             return this;
         }
 
-        public CachedSettings.Builder setWebhookUrl(String webhookUrl) {
+        public CachedServerSettings.Builder setWebhookUrl(String webhookUrl) {
             settings.webhookUrl = webhookUrl;
             return this;
         }
 
-        public CachedSettings.Builder setEventsEnabled(boolean eventsEnabled) {
+        public CachedServerSettings.Builder setEventsEnabled(boolean eventsEnabled) {
             settings.eventsEnabled = eventsEnabled;
             return this;
         }
 
-        public CachedSettings.Builder setServerName(String serverName) {
+        public CachedServerSettings.Builder setServerName(String serverName) {
             settings.serverName = serverName;
             return this;
         }
 
-        public CachedSettings.Builder setAvatarApi(String avatarApi) {
+        public CachedServerSettings.Builder setAvatarApiHyphen(boolean avatarApiHyphen) {
+            settings.avatarApiHyphen = avatarApiHyphen;
+            return this;
+        }
+
+        public CachedServerSettings.Builder setAvatarApi(String avatarApi) {
             settings.avatarApi = avatarApi;
             return this;
         }
 
-        public CachedSettings.Builder setProxyBasedWebhookConfiguration(boolean proxyBasedWebhookConfiguration) {
+        public CachedServerSettings.Builder setProxyBasedWebhookConfiguration(boolean proxyBasedWebhookConfiguration) {
             settings.proxyBasedWebhookConfiguration = proxyBasedWebhookConfiguration;
             return this;
         }
 
-        public CachedSettings.Builder setProxyWebhookConfiguration(Map<String, String> proxyWebhookConfiguration) {
+        public CachedServerSettings.Builder setProxyWebhookConfiguration(Map<String, String> proxyWebhookConfiguration) {
             settings.proxyWebhookConfiguration = proxyWebhookConfiguration;
             return this;
         }
 
         @CheckReturnValue
         @NotNull
-        public CachedSettings build() {
+        public CachedServerSettings build() {
             return settings;
         }
 
@@ -134,6 +140,10 @@ public String getServerName() {
         return serverName;
     }
 
+    public boolean isAvatarApiHyphen() {
+        return avatarApiHyphen;
+    }
+
     public String getAvatarApi() {
         return avatarApi;
     }
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/ConfigurationLoader.java b/Common/src/main/java/io/paradaux/conch/common/api/config/ConfigurationLoader.java
similarity index 53%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/ConfigurationLoader.java
rename to Common/src/main/java/io/paradaux/conch/common/api/config/ConfigurationLoader.java
index 3c5fde9..7ac83a2 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/ConfigurationLoader.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/config/ConfigurationLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,11 +21,11 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api.config;
+package io.paradaux.conch.common.api.config;
 
 import io.leangen.geantyref.TypeToken;
-import io.paradaux.hiberniadiscord.common.api.I18NLogger;
-import io.paradaux.hiberniadiscord.common.api.exceptions.NoSuchEventListenerException;
+import io.paradaux.conch.common.api.I18NLogger;
+import io.paradaux.conch.common.api.exceptions.NoSuchEventListenerException;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
@@ -36,7 +36,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
-import java.util.Map;
 
 public class ConfigurationLoader {
 
@@ -47,14 +46,19 @@ public class ConfigurationLoader {
     public static final String SETTINGS_FILE_NAME = "general-settings.conf";
     public static final String EVENT_SETTINGS_FILE_NAME = "event-settings.conf";
     public static final String BOT_SETTINGS_FILE_NAME = "bot-settings.conf";
+    public static final String PROXY_SETTINGS_FILE_NAME = "proxy-settings.conf";
+
+    private static final TypeToken<HashMap<String, String>> stringMap = new TypeToken<HashMap<String, String>>() {};
 
     private final Path generalSettingsPath;
     private final Path eventSettingsPath;
     private final Path botSettingsPath;
+    private final Path proxySettingsPath;
 
     private final HoconConfigurationLoader generalSettingsLoader;
     private final HoconConfigurationLoader eventSettingsLoader;
     private final HoconConfigurationLoader botSettingsLoader;
+    private final HoconConfigurationLoader proxySettingsLoader;
 
     public ConfigurationLoader(Path configurationDirectory) {
         this(configurationDirectory.toString());
@@ -64,6 +68,7 @@ public ConfigurationLoader(String configurationDirectory) {
         generalSettingsPath = Paths.get(configurationDirectory, SETTINGS_FILE_NAME);
         eventSettingsPath = Paths.get(configurationDirectory, EVENT_SETTINGS_FILE_NAME);
         botSettingsPath = Paths.get(configurationDirectory, BOT_SETTINGS_FILE_NAME);
+        proxySettingsPath = Paths.get(configurationDirectory, PROXY_SETTINGS_FILE_NAME);
 
         generalSettingsLoader = HoconConfigurationLoader.builder()
                 .path(generalSettingsPath)
@@ -76,12 +81,30 @@ public ConfigurationLoader(String configurationDirectory) {
         botSettingsLoader = HoconConfigurationLoader.builder()
                 .path(botSettingsPath)
                 .build();
+
+        proxySettingsLoader = HoconConfigurationLoader.builder()
+                .path(proxySettingsPath)
+                .build();
     }
 
     @CheckReturnValue
     @NotNull
-    public CachedSettings loadGeneralSettings() throws ConfigurateException {
-        return CachedSettings.builder().build();
+    public CachedServerSettings loadGeneralSettings() throws ConfigurateException {
+        CachedServerSettings.Builder builder = CachedServerSettings.builder();
+        ConfigurationNode root = generalSettingsLoader.load();
+
+        builder.setConfigurationVersion(root.node("configuration-version").getString())
+                .setDebug(root.node("debug").getBoolean())
+                .setLocaleCode(root.node("locale").getString())
+                .setWebhookUrl(root.node("webhook-configuration").node("webhook-url").getString())
+                .setEventsEnabled(root.node("webhook-configuration").node("events").getBoolean())
+                .setServerName(root.node("placeholders").node("server-name").getString())
+                .setAvatarApiHyphen(root.node("placeholders").node("include-hyphens-in-uuid").getBoolean())
+                .setAvatarApi(root.node("placeholders").node("avatar-api").getString())
+                .setProxyBasedWebhookConfiguration(root.node("proxy-based-webhook-configuration").getBoolean())
+                .setProxyWebhookConfiguration(root.node("proxy-webhook-configuration").get(stringMap));
+
+        return builder.build();
     }
 
     @CheckReturnValue
@@ -96,10 +119,10 @@ public CachedEventSettings loadEventSettings() throws ConfigurateException {
             ConfigurationNode eventListenerNode = root.node(eventListenerStr);
 
             eventBuilder.setEventName(eventListenerStr)
-                        .setEnabled(eventListenerNode.getBoolean())
-                        .setWebhookUsernameFormat(eventListenerNode.getString())
-                        .setWebhookAvatarFormat(eventListenerNode.getString())
-                        .setWebhookMessageFormat(eventListenerNode.getString());
+                        .setEnabled(eventListenerNode.node("enabled").getBoolean())
+                        .setWebhookUsernameFormat(eventListenerNode.node("webhook-username-format").getString())
+                        .setWebhookAvatarFormat(eventListenerNode.node("webhook-avatar-format").getString())
+                        .setWebhookMessageFormat(eventListenerNode.node("webhook-message-format").getString());
 
             try {
                 builder.set(eventBuilder.build());
@@ -113,30 +136,40 @@ public CachedEventSettings loadEventSettings() throws ConfigurateException {
 
     @CheckReturnValue
     @NotNull
-    public  CachedBotSettings loadBotSettings() throws ConfigurateException {
-        ConfigurationNode root = eventSettingsLoader.load();
-
-        TypeToken<Map<String, String>> type = new TypeToken<Map<String, String>>() {};
-        Map<String, String> mapResult = root.node("proxy-monitored-channels").get(type);
-
-        if (mapResult instanceof HashMap) {
-            HashMap proxyMonitoredChannels = (HashMap) mapResult;
-
-
-
-        }
+    public CachedBotSettings loadBotSettings() throws ConfigurateException {
+        ConfigurationNode root = botSettingsLoader.load();
 
         return CachedBotSettings.builder()
-                .setEnabled(root.node("").getBoolean())
-                .setToken(root.node("").getString())
-                .setDiscordCommandsEnabled(root.node("").getBoolean())
-                .setCommandPrefix(root.node("").getString())
-                .setSendBotMessages(root.node("").getBoolean())
-                .setMonitoredChannels(root.node("").getList(String.class))
-                .setProxyBasedMonitoring(root.node("").getBoolean())
+                .setEnabled(root.node("enabled").getBoolean())
+                .setToken(root.node("token").getString())
+                .setDiscordCommandsEnabled(root.node("discord-commands-enabled").getBoolean())
+                .setCommandPrefix(root.node("command-prefix").getString())
+                .setSendBotMessages(root.node("send-messages-from-bots").getBoolean())
+                .setMonitoredChannels(root.node("monitored-channels").getList(String.class))
+                .setProxyBasedMonitoring(root.node("proxy-based-monitoring").getBoolean())
+                .setProxyMonitoredChannels(root.node("proxy-monitored-channels").get(stringMap))
+                .setMessageFormat(root.node("message-format").getString())
+                .build();
+    }
+
+    public CachedProxySettings loadProxySettings() throws ConfigurateException {
+        ConfigurationNode root = proxySettingsLoader.load();
+
+        return CachedProxySettings.builder()
+                .setConfigurationVersion(root.node("configuration-version").getString())
+                .setDebug(root.node("debug").getBoolean())
+                .setLocaleCode(root.node("locale").getString())
+                .setWebhookUrl(root.node("webhook-configuration").node("webhook-url").getString())
+                .setEventsEnabled(root.node("webhook-configuration").node("events").getBoolean())
+                .setNetworkName(root.node("placeholders").node("network-name").getString())
+                .setAvatarApiHyphen(root.node("placeholders").node("include-hyphens-in-uuid").getBoolean())
+                .setAvatarApi(root.node("placeholders").node("avatar-api").getString())
+                .setProxyBasedWebhookConfiguration(root.node("per-server-webhook-configuration").getBoolean())
+                .setProxyWebhookConfiguration(root.node("proxy-webhook-configuration").get(stringMap))
                 .build();
     }
 
+
     @CheckReturnValue
     public boolean doesEventSettingsExist() {
         return Files.exists(eventSettingsPath);
@@ -152,6 +185,11 @@ public boolean doesGeneralSettingsExist() {
         return Files.exists(eventSettingsPath);
     }
 
+    @CheckReturnValue
+    public boolean doesProxySettingsExist() {
+        return Files.exists(proxySettingsPath);
+    }
+
     @CheckReturnValue
     public Path getGeneralSettingsPath() {
         return generalSettingsPath;
@@ -166,4 +204,9 @@ public Path getEventSettingsPath() {
     public Path getBotSettingsPath() {
         return botSettingsPath;
     }
+
+    @CheckReturnValue
+    public Path getProxySettingsPath() {
+        return proxySettingsPath;
+    }
 }
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/ConfigurationUpdater.java b/Common/src/main/java/io/paradaux/conch/common/api/config/ConfigurationUpdater.java
similarity index 90%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/ConfigurationUpdater.java
rename to Common/src/main/java/io/paradaux/conch/common/api/config/ConfigurationUpdater.java
index 60bb0fc..a3a4277 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/ConfigurationUpdater.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/config/ConfigurationUpdater.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api.config;
+package io.paradaux.conch.common.api.config;
 
 public class ConfigurationUpdater {
 
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/ConfigurationUtil.java b/Common/src/main/java/io/paradaux/conch/common/api/config/ConfigurationUtil.java
similarity index 64%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/ConfigurationUtil.java
rename to Common/src/main/java/io/paradaux/conch/common/api/config/ConfigurationUtil.java
index 917b743..1296723 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/ConfigurationUtil.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/config/ConfigurationUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api.config;
+package io.paradaux.conch.common.api.config;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nullable;
@@ -34,10 +34,10 @@ public class ConfigurationUtil {
 
     private static boolean debug;
 
-    /* General Settings which */
-    private static CachedSettings generalSettings = null;
+    private static CachedServerSettings generalSettings = null;
     private static CachedBotSettings botSettings = null;
     private static CachedEventSettings eventSettings = null;
+    private static CachedProxySettings proxySettings = null;
 
     private ConfigurationUtil() {
         // No instantiation of utility classes, dang it!
@@ -45,7 +45,7 @@ private ConfigurationUtil() {
     
     @CheckReturnValue
     @Nullable
-    public static CachedSettings getGeneralSettings() {
+    public static CachedServerSettings getGeneralSettings() {
         return generalSettings;
     }
 
@@ -61,6 +61,12 @@ public static CachedEventSettings getEventSettings() {
         return eventSettings;
     }
 
+    @CheckReturnValue
+    @Nullable
+    public static CachedProxySettings getProxySettings() {
+        return proxySettings;
+    }
+
     @CheckReturnValue
     public static boolean isDebug() {
         return debug;
@@ -70,11 +76,11 @@ public static boolean isDebug() {
      * <p>(Re)Sets the configuration file singletons.</p>
      *
      * <p>In the event of a reload we want to be able to re-set the instances.</p>>
-     * @param generalSettings settings.conf cached values.
+     * @param generalSettings server-settings.conf cached values.
      * @param botSettings bot-settings.conf cached values.
      * @param eventSettings event-settings.conf cached values.
      * */
-    public static void loadConfigurationValues(CachedSettings generalSettings,
+    public static void loadConfigurationValues(CachedServerSettings generalSettings,
                                                CachedEventSettings eventSettings,
                                                CachedBotSettings botSettings) {
         ConfigurationUtil.generalSettings = generalSettings;
@@ -83,4 +89,21 @@ public static void loadConfigurationValues(CachedSettings generalSettings,
         ConfigurationUtil.debug = generalSettings.isDebug();
     }
 
+    /**
+     * <p>(Re)Sets the configuration file singletons.</p>
+     *
+     * <p>In the event of a reload we want to be able to re-set the instances.</p>>
+     * @param proxySettings proxy-settings.conf cached values.
+     * @param botSettings bot-settings.conf cached values.
+     * @param eventSettings event-settings.conf cached values.
+     * */
+    public static void loadConfigurationValues(CachedProxySettings proxySettings,
+                                               CachedEventSettings eventSettings,
+                                               CachedBotSettings botSettings) {
+        ConfigurationUtil.proxySettings = proxySettings;
+        ConfigurationUtil.botSettings = botSettings;
+        ConfigurationUtil.eventSettings = eventSettings;
+        ConfigurationUtil.debug = proxySettings.isDebug();
+    }
+
 }
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/EventConfiguration.java b/Common/src/main/java/io/paradaux/conch/common/api/config/EventConfiguration.java
similarity index 91%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/EventConfiguration.java
rename to Common/src/main/java/io/paradaux/conch/common/api/config/EventConfiguration.java
index 665fb54..643bea7 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/config/EventConfiguration.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/config/EventConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api.config;
+package io.paradaux.conch.common.api.config;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -29,12 +29,11 @@
 
 public class EventConfiguration {
 
-    String eventName;
-
-    boolean enabled;
-    String webhookUsernameFormat;
-    String webhookAvatarFormat;
-    String webhookMessageFormat;
+    private String eventName;
+    private boolean enabled;
+    private String webhookUsernameFormat;
+    private String webhookAvatarFormat;
+    private String webhookMessageFormat;
 
     private EventConfiguration() {
         // Use the builder!
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/exceptions/NoSuchEventListenerException.java b/Common/src/main/java/io/paradaux/conch/common/api/exceptions/NoSuchEventListenerException.java
similarity index 90%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/exceptions/NoSuchEventListenerException.java
rename to Common/src/main/java/io/paradaux/conch/common/api/exceptions/NoSuchEventListenerException.java
index ed739c1..fe60639 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/exceptions/NoSuchEventListenerException.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/exceptions/NoSuchEventListenerException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api.exceptions;
+package io.paradaux.conch.common.api.exceptions;
 
 public class NoSuchEventListenerException extends Exception {
     public NoSuchEventListenerException(String str) {
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/exceptions/NoSuchResourceException.java b/Common/src/main/java/io/paradaux/conch/common/api/exceptions/NoSuchResourceException.java
similarity index 90%
rename from Common/src/main/java/io/paradaux/hiberniadiscord/common/api/exceptions/NoSuchResourceException.java
rename to Common/src/main/java/io/paradaux/conch/common/api/exceptions/NoSuchResourceException.java
index 1607d39..12c1d9a 100644
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/exceptions/NoSuchResourceException.java
+++ b/Common/src/main/java/io/paradaux/conch/common/api/exceptions/NoSuchResourceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.common.api.exceptions;
+package io.paradaux.conch.common.api.exceptions;
 
 public class NoSuchResourceException extends Exception {
 
diff --git a/Common/src/main/java/io/paradaux/conch/common/bot/DiscordBot.java b/Common/src/main/java/io/paradaux/conch/common/bot/DiscordBot.java
new file mode 100644
index 0000000..938cac9
--- /dev/null
+++ b/Common/src/main/java/io/paradaux/conch/common/bot/DiscordBot.java
@@ -0,0 +1,64 @@
+package io.paradaux.conch.common.bot;
+
+import io.paradaux.conch.common.api.I18NLogger;
+import io.paradaux.conch.common.api.StringUtils;
+import io.paradaux.conch.common.api.config.CachedBotSettings;
+import io.paradaux.conch.common.api.config.ConfigurationUtil;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.events.ReadyEvent;
+import net.dv8tion.jda.api.hooks.EventListener;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import org.jetbrains.annotations.NotNull;
+
+import javax.security.auth.login.LoginException;
+
+public class DiscordBot {
+
+    private final String token;
+    private JDA client;
+
+    public DiscordBot() throws LoginException {
+        CachedBotSettings config = ConfigurationUtil.getBotSettings();
+        this.token = config.getToken();
+    }
+
+    public void addNewListener(EventListener listener) {
+        I18NLogger.rawInfo("Registered new event listener: " + listener.getClass().getSimpleName());
+        client.addEventListener(listener);
+    }
+
+    public void connect() throws LoginException {
+        client = login(token);
+    }
+
+    private JDA login(String token) throws LoginException {
+        // TODO Envoirnment varialbe support
+        JDABuilder builder = JDABuilder.createDefault(token)
+                .setBulkDeleteSplittingEnabled(false)
+                .addEventListeners(new ReadyListener());
+
+        return builder.build();
+    }
+
+    private static class ReadyListener extends ListenerAdapter {
+
+        @Override
+        public void onReady(@NotNull ReadyEvent event) {
+
+            int guildCount = event.getGuildAvailableCount();
+            int userCount = 0;
+
+            for (Guild guild : event.getJDA().getGuilds()) {
+                userCount += guild.getMemberCount();
+            }
+
+            I18NLogger.rawInfo("Bot Started: Serving {} user{} in {} guild{}", String.valueOf(userCount), StringUtils.pluralise(userCount),
+                    String.valueOf(guildCount), StringUtils.pluralise(guildCount)); // TODO ADD TO LOCALE
+        }
+
+    }
+
+
+}
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/BotManager.java b/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/BotManager.java
deleted file mode 100644
index d8cadf5..0000000
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/BotManager.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 3 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 3 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
- * if you need additional information or have any questions.
- * See LICENSE.md for more details.
- */
-
-package io.paradaux.hiberniadiscord.common.api;
-
-import co.aikar.taskchain.TaskChainFactory;
-import io.paradaux.hiberniadiscord.common.api.events.DiscordMessageReceivedEvent;
-import io.paradaux.hiberniadiscord.common.bot.DiscordMessageListener;
-import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.JDABuilder;
-import net.dv8tion.jda.api.utils.Compression;
-import net.dv8tion.jda.api.utils.cache.CacheFlag;
-import org.slf4j.Logger;
-
-import javax.security.auth.login.LoginException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class BotManager {
-
-    private static JDA client;
-    private static Logger logger;
-    private static TaskChainFactory taskChainFactory;
-
-
-    /**
-     * Instances of DiscordMessageReceivedListener which will respond when a disocrd message
-     * is received from the discord bot.
-     * */
-    private static final List<DiscordMessageReceivedEvent> eventListeners = new ArrayList<>();
-
-    /**
-     * Sets up the manager.
-     * */
-    public static void initialise(String token, Logger logger, List<String> monitoredChannels,
-                                  TaskChainFactory taskChainFactory, String messageFormat, boolean ignoreBots) {
-        BotManager.logger = logger;
-
-        JDABuilder builder = JDABuilder.createDefault(token);
-
-        builder.disableCache(CacheFlag.MEMBER_OVERRIDES, CacheFlag.VOICE_STATE);
-
-        builder.setBulkDeleteSplittingEnabled(false);
-        builder.setCompression(Compression.ZLIB);
-
-        builder.addEventListeners(new DiscordMessageListener(monitoredChannels, taskChainFactory, messageFormat, ignoreBots));
-
-        if (token == null) {
-            logger.warn("You have not set the token for your discord bot for discord2mc"
-                    + " functionality. This has been disabled.");
-            return;
-        }
-
-        try {
-            client = builder.build();
-        } catch(LoginException exception) {
-            client = null;
-            logger.warn("FAILED TO LOGIN TO DISCORD USING TOKEN"
-                    + " PROVIDED");
-        }
-    }
-
-}
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/DiscordEvent.java b/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/DiscordEvent.java
deleted file mode 100644
index 3f04cf1..0000000
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/DiscordEvent.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 3 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 3 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
- * if you need additional information or have any questions.
- * See LICENSE.md for more details.
- */
-
-package io.paradaux.hiberniadiscord.common.api;
-
-import io.paradaux.hiberniadiscord.common.api.events.DiscordMessageReceivedEvent;
-
-public interface DiscordEvent {
-
-    void listener(DiscordMessageReceivedEvent event);
-
-}
diff --git a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/events/DiscordMessageReceivedEvent.java b/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/events/DiscordMessageReceivedEvent.java
deleted file mode 100644
index d231574..0000000
--- a/Common/src/main/java/io/paradaux/hiberniadiscord/common/api/events/DiscordMessageReceivedEvent.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 3 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 3 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
- * if you need additional information or have any questions.
- * See LICENSE.md for more details.
- */
-
-package io.paradaux.hiberniadiscord.common.api.events;
-
-/**
- * Represents a message which was sent into a monitored discord channel so it can then be
- * viewed in game.
- * */
-public class DiscordMessageReceivedEvent {
-
-    String username;
-    String nickname;
-    String discriminator;
-    String tag = "%s#%s";
-
-    String guildName;
-    String channel;
-
-    String messageContent;
-    String role;
-
-    /**
-     * Builder constructor.
-     * */
-    public DiscordMessageReceivedEvent() {
-
-    }
-
-    /**
-     * Default constructor.
-     * */
-    public DiscordMessageReceivedEvent(String username, String nickname, String discriminator, String guildName, String channel,
-                                       String messageContent, String role) {
-        this.username = username;
-        this.nickname = nickname;
-        this.discriminator = discriminator;
-        this.guildName = guildName;
-        this.channel = channel;
-        this.messageContent = messageContent;
-        this.role = role;
-    }
-
-    public String getMessageContent() {
-        return messageContent;
-    }
-
-
-
-    public String getUsername() {
-        return username;
-    }
-
-    public String getNickname() {
-        return nickname;
-    }
-
-    public String getDiscriminator() {
-        return discriminator;
-    }
-
-    public String getTag() {
-        return tag;
-    }
-
-    public String getGuildName() {
-        return guildName;
-    }
-
-    public String getChannel() {
-        return channel;
-    }
-
-    public String getRole() {
-        return role;
-    }
-
-    public DiscordMessageReceivedEvent setUsername(String username) {
-        this.username = username;
-        return this;
-    }
-
-    public DiscordMessageReceivedEvent setNickname(String nickname) {
-        this.nickname = nickname;
-        return this;
-    }
-
-    public DiscordMessageReceivedEvent setDiscriminator(String discriminator) {
-        this.discriminator = discriminator;
-        return this;
-    }
-
-    public DiscordMessageReceivedEvent setTag(String tag) {
-        this.tag = tag;
-        return this;
-    }
-
-    public DiscordMessageReceivedEvent setGuildName(String guildName) {
-        this.guildName = guildName;
-        return this;
-    }
-
-    public DiscordMessageReceivedEvent setChannel(String channel) {
-        this.channel = channel;
-        return this;
-    }
-
-    public DiscordMessageReceivedEvent setMessageContent(String messageContent) {
-        this.messageContent = messageContent;
-        return this;
-    }
-
-    public DiscordMessageReceivedEvent setRole(String role) {
-        this.role = role;
-        return this;
-    }
-}
diff --git a/Common/src/main/resources/Conch.properties b/Common/src/main/resources/Conch.properties
new file mode 100644
index 0000000..1fcb399
--- /dev/null
+++ b/Common/src/main/resources/Conch.properties
@@ -0,0 +1,49 @@
+#
+# Copyright (c) 2021, Rían Errity. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 3 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 3 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
+# if you need additional information or have any questions.
+# See LICENSE.md for more details.
+#
+configuration.invalid-event=Conch » Configuration Loader has tried to load an invalid or malconfigured event.
+startup.loading-message=\n + ------------------------------------ +\
+\n |         Running Conch v1.0.0         |\
+\n |       © Rían Errity (Paradaux)       |\
+\n |         https://paradaux.io          |\
+\n + ------------------------------------ +\
+\n\
+\n LICENSED UNDER GNU General Public License v3.0
+shutdown.shutdown-message=\n + ------------------------------------ +\
+\n |         Running Conch v1.0.0         |\
+\n |       © Rían Errity (Paradaux)       |\
+\n |         https://paradaux.io          |\
+\n + ------------------------------------ +\
+\n\
+\n LICENSED UNDER GNU General Public License v3.0
+configuration.old-config-version=Conch » There was an error creating the plugin directory.
+configuration.config-doesnt-exist=Conch » Your configuration file doesn't seem to exist, is it invalid? a new version has been deployed. If this is your first run, this isn't cause for concern.
+configuration.backup-failure=Conch » An issue occurred whilst backing up your configuration file.
+general.no-permission=Conch » &cYou do not have permission.
+general.reload-sucess=Conch » &cconfig.yml &7& &clocale.yml &c have been &creloaded&7
+general.reload-failure=Conch » &cconfig.yml &7& &clocale.yml &c have not been &creloaded&7 due to an &cerror&7.
+general.command-default=Conch » &cDeveloped &7and &cMaintained&7 by &cParadaux\
+&7This is &copen source &7software, please leave this &cattribution&7.\
+&7For support: &chttps://paradaux.io/discord
+configuration.deploy-failure=Conch » There was an error while deploying {} to your plugin directory.
+configuration.make-plugin-directory-failure=Conch » There was an error creating the plugin directory.
+configuration.load-failure=Conch » There was an error loading your configuration. {}
diff --git a/Common/src/main/resources/Conch_en_US.properties b/Common/src/main/resources/Conch_en_US.properties
new file mode 100644
index 0000000..c87c791
--- /dev/null
+++ b/Common/src/main/resources/Conch_en_US.properties
@@ -0,0 +1,49 @@
+#
+# Copyright (c) 2021, Rían Errity. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 3 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 3 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
+# if you need additional information or have any questions.
+# See LICENSE.md for more details.
+#
+configuration.invalid-event=Conch » Configuration Loader has tried to load an invalid or malconfigured event.
+startup.loading-message=\n + ------------------------------------ +\
+\n |         Running Conch v1.0.0         |\
+\n |       © Rían Errity (Paradaux)       |\
+\n |         https://paradaux.io          |\
+\n + ------------------------------------ +\
+\n\
+\n LICENSED UNDER GNU General Public License v3.0
+shutdown.shutdown-message=\n + ------------------------------------ +\
+\n |         Running Conch v1.0.0         |\
+\n |       © Rían Errity (Paradaux)       |\
+\n |         https://paradaux.io          |\
+\n + ------------------------------------ +\
+\n\
+\n LICENSED UNDER GNU General Public License v3.0
+configuration.old-config-version=Conch » There was an error creating the plugin directory.
+configuration.config-doesnt-exist=Conch » Your configuration file doesn't seem to exist, is it invalid? a new version has been deployed. If this is your first run, this isn't cause for concern.
+configuration.backup-failure=Conch » An issue occurred whilst backing up your configuration file.
+general.no-permission=Conch » &cYou do not have permission.
+general.reload-sucess=Conch » &cconfig.yml &7& &clocale.yml &c have been &creloaded&7
+general..reload-failure=Conch » &cconfig.yml &7& &clocale.yml &c have not been &creloaded&7 due to an &cerror&7.
+general.command-default=Conch » &cDeveloped &7and &cMaintained&7 by &cParadaux\
+&7This is &copen source &7software, please leave this &cattribution&7.\
+&7For support: &chttps://paradaux.io/discord
+configuration.deploy-failure=Conch » There was an error while deploying {} to your plugin directory.
+configuration.make-plugin-directory-failure=Conch » There was an error creating the plugin directory.
+configuration.load-failure=Conch » There was an error loading your configuration. {}
diff --git a/Common/src/main/resources/HiberniaDiscord_fr_FR.properties b/Common/src/main/resources/Conch_fr_FR.properties
similarity index 66%
rename from Common/src/main/resources/HiberniaDiscord_fr_FR.properties
rename to Common/src/main/resources/Conch_fr_FR.properties
index a5a76d8..4849f45 100644
--- a/Common/src/main/resources/HiberniaDiscord_fr_FR.properties
+++ b/Common/src/main/resources/Conch_fr_FR.properties
@@ -1,5 +1,4 @@
-#
-# Copyright (c) 2020, Rían Errity. All rights reserved.
+# Copyright (c) 2021, Rían Errity. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -21,20 +20,20 @@
 # See LICENSE.md for more details.
 #
 configuration.invalid-event=TODO
-startup.loading-message=\n+ ------------------------------------ +\
-\n| En utilisant HiberniaDiscord v4.0.0  |\
-\n|       © Rían Errity (Paradaux)       |\
-\n|         https://paradaux.io          |\
-\n+ ------------------------------------ +\
+startup.loading-message=\n + ------------------------------------ +\
+\n |       En utilisant Conch v4.0.0      |\
+\n |       © Rían Errity (Paradaux)       |\
+\n |         https://paradaux.io          |\
+\n + ------------------------------------ +\
 \n\
-\nSOUS LA LICENSE DE GNU General Public License v3.0
-shutdown.shutdown-message=\n+ ------------------------------------ +\
-\n|   Déchargé HiberniaDiscord v4.0.0    |\
-\n|       © Rían Errity (Paradaux)       |\
-\n|         https://paradaux.io          |\
-\n+ ------------------------------------ +\
+\n SOUS LA LICENSE DE GNU General Public License v3.0
+shutdown.shutdown-message=\n + ------------------------------------ +\
+\n |        Déchargé Conch v4.0.0         |\
+\n |       © Rían Errity (Paradaux)       |\
+\n |         https://paradaux.io          |\
+\n + ------------------------------------ +\
 \n\
-\nSOUS LA LICENSE DE GNU General Public License v3.0
+\n SOUS LA LICENSE DE GNU General Public License v3.0
 configuration.old-config-version=TODO
 configuration.config-doesnt-exist=TODO
 configuration.backup-failure=TODO
diff --git a/Common/src/main/resources/HiberniaDiscord.properties b/Common/src/main/resources/HiberniaDiscord.properties
deleted file mode 100644
index a2d1bd5..0000000
--- a/Common/src/main/resources/HiberniaDiscord.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2020, Rían Errity. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 3 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 3 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
-# if you need additional information or have any questions.
-# See LICENSE.md for more details.
-#
-configuration.invalid-event=HiberniaDiscord » Configuration Loader has tried to load an invalid or malconfigured event.
-startup.loading-message=\n+ ------------------------------------ +\
-\n|   Running HiberniaDiscord v4.0.0     |\
-\n|       © Rían Errity (Paradaux)       |\
-\n|         https://paradaux.io          |\
-\n+ ------------------------------------ +\
-\n\
-\nLICENSED UNDER GNU General Public License v3.0
-shutdown.shutdown-message=\n+ ------------------------------------ +\
-\n|   Running HiberniaDiscord v4.0.0     |\
-\n|       © Rían Errity (Paradaux)       |\
-\n|         https://paradaux.io          |\
-\n+ ------------------------------------ +\
-\n\
-\nLICENSED UNDER GNU General Public License v3.0
-configuration.old-config-version=HiberniaDiscord » There was an error creating the plugin directory.
-configuration.config-doesnt-exist=HiberniaDiscord » Your configuration file doesn't seem to exist, is it invalid? a new version has been deployed. If this is your first run, this isn't cause for concern.
-configuration.backup-failure=HiberniaDiscord » An issue occurred whilst backing up your configuration file.
-general.no-permission=HiberniaDiscord » &cYou do not have permission.
-general.reload-sucess=HiberniaDiscord » &cconfig.yml &7& &clocale.yml &c have been &creloaded&7
-general..reload-failure=HiberniaDiscord » &cconfig.yml &7& &clocale.yml &c have not been &creloaded&7 due to an &cerror&7.
-general.command-default=HiberniaDiscord » &cDeveloped &7and &cMaintained&7 by &cParadaux\
-&7This is &copen source &7software, please leave this &cattribution&7.\
-&7For support: &chttps://paradaux.io/discord
-configuration.deploy-failure=HiberniaDiscord » There was an error while deploying {} to your plugin directory.
-configuration.make-plugin-directory-failure=HiberniaDiscord » There was an error creating the plugin directory.
-configuration.load-failure=HiberniaDiscord » There was an error loading your configuration. {}
diff --git a/Common/src/main/resources/HiberniaDiscord_en_US.properties b/Common/src/main/resources/HiberniaDiscord_en_US.properties
deleted file mode 100644
index a2d1bd5..0000000
--- a/Common/src/main/resources/HiberniaDiscord_en_US.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2020, Rían Errity. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 3 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 3 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
-# if you need additional information or have any questions.
-# See LICENSE.md for more details.
-#
-configuration.invalid-event=HiberniaDiscord » Configuration Loader has tried to load an invalid or malconfigured event.
-startup.loading-message=\n+ ------------------------------------ +\
-\n|   Running HiberniaDiscord v4.0.0     |\
-\n|       © Rían Errity (Paradaux)       |\
-\n|         https://paradaux.io          |\
-\n+ ------------------------------------ +\
-\n\
-\nLICENSED UNDER GNU General Public License v3.0
-shutdown.shutdown-message=\n+ ------------------------------------ +\
-\n|   Running HiberniaDiscord v4.0.0     |\
-\n|       © Rían Errity (Paradaux)       |\
-\n|         https://paradaux.io          |\
-\n+ ------------------------------------ +\
-\n\
-\nLICENSED UNDER GNU General Public License v3.0
-configuration.old-config-version=HiberniaDiscord » There was an error creating the plugin directory.
-configuration.config-doesnt-exist=HiberniaDiscord » Your configuration file doesn't seem to exist, is it invalid? a new version has been deployed. If this is your first run, this isn't cause for concern.
-configuration.backup-failure=HiberniaDiscord » An issue occurred whilst backing up your configuration file.
-general.no-permission=HiberniaDiscord » &cYou do not have permission.
-general.reload-sucess=HiberniaDiscord » &cconfig.yml &7& &clocale.yml &c have been &creloaded&7
-general..reload-failure=HiberniaDiscord » &cconfig.yml &7& &clocale.yml &c have not been &creloaded&7 due to an &cerror&7.
-general.command-default=HiberniaDiscord » &cDeveloped &7and &cMaintained&7 by &cParadaux\
-&7This is &copen source &7software, please leave this &cattribution&7.\
-&7For support: &chttps://paradaux.io/discord
-configuration.deploy-failure=HiberniaDiscord » There was an error while deploying {} to your plugin directory.
-configuration.make-plugin-directory-failure=HiberniaDiscord » There was an error creating the plugin directory.
-configuration.load-failure=HiberniaDiscord » There was an error loading your configuration. {}
diff --git a/Common/src/main/resources/log4j.properties b/Common/src/main/resources/log4j.properties
index 533678b..66e9c6a 100644
--- a/Common/src/main/resources/log4j.properties
+++ b/Common/src/main/resources/log4j.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Rían Errity. All rights reserved.
+# Copyright (c) 2021, Rían Errity. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 # This code is free software; you can redistribute it and/or modify it
@@ -18,9 +18,9 @@
 # Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
 # if you need additional information or have any questions.
 
-log4j.logger.io.paradaux.hiberniadiscord=debug, HiberniaDiscordAppender
-log4j.additivity.io.paradaux.hiberniadiscord=true
+log4j.logger.io.paradaux.conch=debug, ConchAppender
+log4j.additivity.io.paradaux.conch=true
 
-log4j.appender.HiberniaDiscordAppender=org.apache.log4j.ConsoleAppender
-log4j.appender.HiberniaDiscordAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.HiberniaDiscordAppender.layout.ConversionPattern=[HiberniaDiscord: %p] %m%n
\ No newline at end of file
+log4j.appender.ConchAppender=org.apache.log4j.ConsoleAppender
+log4j.appender.ConchAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.ConchAppender.layout.ConversionPattern=[ConchAppender: %p] %m%n
\ No newline at end of file
diff --git a/LICENSE.md b/LICENSE.md
index abee48d..7c68566 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-HiberniaDiscord is Copyright © 2018-2020 of Rían Errity (Paradaux)
+Conch is Copyright © 2018-2021 of Rían Errity (Paradaux)
 
 # GNU GENERAL PUBLIC LICENSE
 Version 3, 29 June 2007
diff --git a/README.md b/README.md
index 054c85e..9b90cbd 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-![HiberniaDiscord Logo](https://cdn.paradaux.io/static/plugin-branding/hiberniadiscord/hibernia-discord-banner.png)
+![Conch Logo](https://cdn.paradaux.io/static/plugin-branding/Conch/hibernia-discord-banner.png)
 
 
 ## Introduction
 
-HiberniaDiscord is a lightweight Minecraft <-> Discord Bridge allowing you to syncronise in-game messages with a channel on your discord via discord-webhooks and an integrated discord bot. Users will appear as "bots" with their player head as the avatar. Using the Integrated Discord Bot you can configure discord messages to appear in game. 
+Conch is a lightweight Minecraft <-> Discord Bridge allowing you to syncronise in-game messages with a channel on your discord via discord-webhooks and an integrated discord bot. Users will appear as "bots" with their player head as the avatar. Using the Integrated Discord Bot you can configure discord messages to appear in game. 
 
-HiberniaDiscord 4.0.0 is designed to be modular. It is based around a "core" which provides all necessary functionality, then platform-specific implementations via modules. 
+Conch 4.0.0 is designed to be modular. It is based around a "core" which provides all necessary functionality, then platform-specific implementations via modules. 
 
-HiberniaDiscord supports all major Minecraft Server and Proxy Implementations 
+Conch supports all major Minecraft Server and Proxy Implementations 
 - Bukkit-based (Paper, Spigot etc) 
 - Sponge7-based (Spongeforge & Spongevanilla)
 - Velocity
@@ -17,7 +17,7 @@ You can expect Fabric and Sponge8 support in late Q1-Early Q2 of 2021
 
 ## Installation Instructions
 
-All Installation Instructions have been moved to the HiberniaDiscord website.
+All Installation Instructions have been moved to the Conch website.
 https://hiberniadiscord.paradaux.io
 
 ## Development Builds
@@ -28,7 +28,7 @@ https://ci.paradaux.io
 ## Planned Addons 
 
 - HDReport (4.0)
-HiberniaReport fork that's built directly into HiberniaDiscord!
+HiberniaReport fork that's built directly into Conch!
 
 - HDConsole (4.1)
 Console logging and togglable ability to execute commands as console via discord!
@@ -45,7 +45,7 @@ Ability to sync a staff chat in-game and out-of-game with RabbitMQ support for s
 
 ## Compatibility / Planned Compatibility 
 
-HiberniaDiscord strives to be compatible with common plugin combinations. For now this only includes PlaceholderAPI on Bukkit, however there are plans to add more in 4.X releases.
+Conch strives to be compatible with common plugin combinations. For now this only includes PlaceholderAPI on Bukkit, however there are plans to add more in 4.X releases.
 
 - Vanish and Staff Chat Plugin Support
 - CarbonChat Integration with Channel Support
@@ -56,8 +56,8 @@ If there's a plugin you would like to see me implement please let me know!
 
 As of the time of writing this there are no current external libraries used.
 
-1.  :: Download the latest copy of HiberniaDiscord from the releases page.
-2.  :: Move HiberniaDiscord.jar into your plugins folder
+1.  :: Download the latest copy of Conch from the releases page.
+2.  :: Move Conch.jar into your plugins folder
 3.  :: Restart (Do *Not* Reload) your server to generate the necessary configuration files.
 4.  :: Configure the plugin to use your webhook. 
 
@@ -70,7 +70,7 @@ in project root:
 
 ## Contributings
 
-HiberniaDiscord is FOSS, if you would like a feature, simply fork the respository, add the requested functionality and open a pull request. I review them as they come in, and will aid you in merging it ino production in due course.
+Conch is FOSS, if you would like a feature, simply fork the respository, add the requested functionality and open a pull request. I review them as they come in, and will aid you in merging it ino production in due course.
 
 ## v4.0 Contributors!
 * **Rían Errity**
diff --git a/Sponge/pom.xml b/Sponge/pom.xml
index e5af352..1007742 100644
--- a/Sponge/pom.xml
+++ b/Sponge/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, Rían Errity. All rights reserved.
+  ~ Copyright (c) 2021, Rían Errity. All rights reserved.
   ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   ~
   ~ This code is free software; you can redistribute it and/or modify it
@@ -28,13 +28,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>hiberniadiscord</artifactId>
-        <groupId>io.paradaux.hiberniadiscord</groupId>
-        <version>4.0.0</version>
+        <artifactId>conch</artifactId>
+        <groupId>io.paradaux.conch</groupId>
+        <version>1.0.0</version>
     </parent>
 
-    <artifactId>hiberniadiscord-sponge</artifactId>
-    <version>4.0.0</version>
+    <artifactId>conch-sponge</artifactId>
+    <version>1.0.0</version>
     <packaging>jar</packaging>
 
     <name>Sponge</name>
@@ -217,10 +217,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.paradaux.hiberniadiscord</groupId>
-            <artifactId>hiberniadiscord-common</artifactId>
-            <version>4.0.0</version>
-            <scope>compile</scope>
+            <groupId>io.paradaux.conch</groupId>
+            <artifactId>conch-common</artifactId>
+            <version>1.0.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/Sponge/src/main/java/io/paradaux/hiberniadiscord/sponge/HiberniaDiscord.java b/Sponge/src/main/java/io/paradaux/conch/sponge/HiberniaDiscord.java
similarity index 56%
rename from Sponge/src/main/java/io/paradaux/hiberniadiscord/sponge/HiberniaDiscord.java
rename to Sponge/src/main/java/io/paradaux/conch/sponge/HiberniaDiscord.java
index 4e4082a..f881074 100644
--- a/Sponge/src/main/java/io/paradaux/hiberniadiscord/sponge/HiberniaDiscord.java
+++ b/Sponge/src/main/java/io/paradaux/conch/sponge/HiberniaDiscord.java
@@ -1,7 +1,30 @@
-package io.paradaux.hiberniadiscord.sponge;
+/*
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 3 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 3 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
+ * if you need additional information or have any questions.
+ * See LICENSE.md for more details.
+ */
+
+package io.paradaux.conch.sponge;
 
 import com.google.inject.Inject;
-import io.paradaux.hiberniadiscord.sponge.listeners.MessageChannelEventChatListener;
+import io.paradaux.conch.sponge.listeners.MessageChannelEventChatListener;
 import org.slf4j.Logger;
 import org.spongepowered.api.Game;
 import org.spongepowered.api.Sponge;
@@ -14,7 +37,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@Plugin(id = "hiberniadiscord", name = "HiberniaDiscord", version = "4.0.0", description = "Discord to chat Bridge")
+@Plugin(id = "conch", name = "Conch", version = "1.0.0", description = "Discord to chat Bridge")
 public class HiberniaDiscord {
 
     @Inject
diff --git a/Sponge/src/main/java/io/paradaux/hiberniadiscord/sponge/listeners/GenericListener.java b/Sponge/src/main/java/io/paradaux/conch/sponge/listeners/GenericListener.java
similarity index 96%
rename from Sponge/src/main/java/io/paradaux/hiberniadiscord/sponge/listeners/GenericListener.java
rename to Sponge/src/main/java/io/paradaux/conch/sponge/listeners/GenericListener.java
index 90479f6..23da044 100644
--- a/Sponge/src/main/java/io/paradaux/hiberniadiscord/sponge/listeners/GenericListener.java
+++ b/Sponge/src/main/java/io/paradaux/conch/sponge/listeners/GenericListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.sponge.listeners;
+package io.paradaux.conch.sponge.listeners;
 
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.api.entity.living.player.Player;
diff --git a/Sponge/src/main/java/io/paradaux/hiberniadiscord/sponge/listeners/MessageChannelEventChatListener.java b/Sponge/src/main/java/io/paradaux/conch/sponge/listeners/MessageChannelEventChatListener.java
similarity index 96%
rename from Sponge/src/main/java/io/paradaux/hiberniadiscord/sponge/listeners/MessageChannelEventChatListener.java
rename to Sponge/src/main/java/io/paradaux/conch/sponge/listeners/MessageChannelEventChatListener.java
index 1013264..fa3c988 100644
--- a/Sponge/src/main/java/io/paradaux/hiberniadiscord/sponge/listeners/MessageChannelEventChatListener.java
+++ b/Sponge/src/main/java/io/paradaux/conch/sponge/listeners/MessageChannelEventChatListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.sponge.listeners;
+package io.paradaux.conch.sponge.listeners;
 
 import org.slf4j.Logger;
 import org.spongepowered.api.entity.living.player.Player;
diff --git a/Velocity/pom.xml b/Velocity/pom.xml
index 13ebb50..b6a1de0 100644
--- a/Velocity/pom.xml
+++ b/Velocity/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, Rían Errity. All rights reserved.
+  ~ Copyright (c) 2021, Rían Errity. All rights reserved.
   ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   ~
   ~ This code is free software; you can redistribute it and/or modify it
@@ -28,13 +28,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>hiberniadiscord</artifactId>
-        <groupId>io.paradaux.hiberniadiscord</groupId>
-        <version>4.0.0</version>
+        <artifactId>conch</artifactId>
+        <groupId>io.paradaux.conch</groupId>
+        <version>1.0.0</version>
     </parent>
 
-    <artifactId>hiberniadiscord-velocity</artifactId>
-    <version>4.0.0</version>
+    <artifactId>conch-velocity</artifactId>
+    <version>1.0.0</version>
     <packaging>jar</packaging>
 
     <name>Velocity</name>
@@ -220,10 +220,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.paradaux.hiberniadiscord</groupId>
-            <artifactId>hiberniadiscord-common</artifactId>
-            <version>4.0.0</version>
-            <scope>compile</scope>
+            <groupId>io.paradaux.conch</groupId>
+            <artifactId>conch-common</artifactId>
+            <version>1.0.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/Velocity/src/main/java/io/paradaux/conch/velocity/VelocityConch.java b/Velocity/src/main/java/io/paradaux/conch/velocity/VelocityConch.java
new file mode 100644
index 0000000..fce4be0
--- /dev/null
+++ b/Velocity/src/main/java/io/paradaux/conch/velocity/VelocityConch.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 3 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 3 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
+ * if you need additional information or have any questions.
+ * See LICENSE.md for more details.
+ */
+
+package io.paradaux.conch.velocity;
+
+import com.google.inject.Inject;
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
+import com.velocitypowered.api.plugin.Plugin;
+import com.velocitypowered.api.plugin.annotation.DataDirectory;
+import com.velocitypowered.api.proxy.ProxyServer;
+import io.paradaux.conch.common.api.DiscordManager;
+import io.paradaux.conch.common.api.I18NLogger;
+import io.paradaux.conch.common.api.I18NManager;
+import io.paradaux.conch.common.api.config.CachedBotSettings;
+import io.paradaux.conch.common.api.config.CachedProxySettings;
+import io.paradaux.conch.common.api.config.ConfigurationUtil;
+import io.paradaux.conch.common.bot.DiscordBot;
+import io.paradaux.conch.velocity.api.VelocityConfigurationManager;
+import io.paradaux.conch.velocity.listeners.PlayerChatEventListener;
+import io.paradaux.conch.velocity.managers.TaskManager;
+import org.slf4j.Logger;
+
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+@Plugin(id = "conch", name = "Conch", version = "1.0.0",
+        url = "https://conch.rocks", description = "Discord to chat Bridge", authors = {"Paradaux"})
+public class VelocityConch {
+
+    private final ProxyServer server;
+    private final Logger logger;
+    private final Path pluginData;
+    private final TaskManager tasks;
+    private DiscordManager discord;
+    private DiscordBot discordBot;
+
+    @Inject
+    public VelocityConch(ProxyServer server, Logger logger, @DataDirectory Path pluginData) {
+        this.server = server;
+        this.logger = logger;
+        this.pluginData = pluginData;
+
+        logger.info("Conch: Initialising locale.");
+        loadLocale(logger);
+
+        I18NLogger.rawInfo("Initialising Scheduler");
+        this.tasks = new TaskManager(this, server.getScheduler());
+
+    }
+
+    @Subscribe
+    public void onProxyInitialization(ProxyInitializeEvent event) {
+
+        I18NLogger.rawInfo("Loading Configuration");
+        loadConfiguration();
+
+        I18NLogger.rawInfo("Connecting to discord");
+        connect();
+
+        I18NLogger.rawInfo("Registering events");
+        registerEvents();
+
+        I18NLogger.rawInfo("Starting the discord bot");
+    }
+
+    public void loadLocale(Logger logger) {
+        Locale locale = new Locale("en_US");
+
+        I18NManager i18NManager = new I18NManager(ResourceBundle.getBundle(I18NManager.RESOURCES_PATH, locale));
+
+        I18NLogger.setLogger(logger);
+        I18NLogger.setI18nManager(i18NManager);
+
+        I18NLogger.info("startup.loading-message");
+    }
+
+    public void loadConfiguration() {
+        VelocityConfigurationManager configurationManager = new VelocityConfigurationManager(pluginData);
+
+        configurationManager.deployResources();
+        configurationManager.loadConfigurationFiles();
+
+    }
+
+
+    public void connect() {
+        CachedProxySettings config = ConfigurationUtil.getProxySettings();
+        try {
+            discord = new DiscordManager(config.getWebhookUrl(), true);
+        } catch(IllegalArgumentException exception) {
+            I18NLogger.rawInfo("You have not configured a webhook"); // TODO locale
+        }
+    }
+
+    public void registerEvents() {
+        String networkName = ConfigurationUtil.getProxySettings().getNetworkName();
+        String avatarApi = ConfigurationUtil.getProxySettings().getAvatarApi();
+        String messagePrefix = null;
+
+        server.getEventManager().register(this, new PlayerChatEventListener(discord, tasks, networkName, avatarApi, messagePrefix, ConfigurationUtil.getEventSettings().getOnChatMessage(), ConfigurationUtil.isDebug()));
+    }
+
+    public void startDiscordBot() {
+        CachedBotSettings config = ConfigurationUtil.getBotSettings();
+
+//        try {
+//            discordBot = new DiscordBot();
+//            discordBot.connect();
+//            discordBot.addNewListener(new DiscordMessageListener(tasks, config));
+//        } catch (LoginException ok) {
+//            // TODO log
+//        }
+    }
+}
diff --git a/Velocity/src/main/java/io/paradaux/conch/velocity/api/VelocityConfigurationManager.java b/Velocity/src/main/java/io/paradaux/conch/velocity/api/VelocityConfigurationManager.java
new file mode 100644
index 0000000..a370f31
--- /dev/null
+++ b/Velocity/src/main/java/io/paradaux/conch/velocity/api/VelocityConfigurationManager.java
@@ -0,0 +1,81 @@
+package io.paradaux.conch.velocity.api;
+
+import io.paradaux.conch.common.api.ConfigurationManager;
+import io.paradaux.conch.common.api.I18NLogger;
+import io.paradaux.conch.common.api.config.CachedBotSettings;
+import io.paradaux.conch.common.api.config.CachedEventSettings;
+import io.paradaux.conch.common.api.config.CachedProxySettings;
+import io.paradaux.conch.common.api.config.ConfigurationLoader;
+import io.paradaux.conch.common.api.config.ConfigurationUtil;
+import io.paradaux.conch.common.api.exceptions.NoSuchResourceException;
+import org.spongepowered.configurate.ConfigurateException;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class VelocityConfigurationManager extends ConfigurationManager {
+
+    private CachedProxySettings proxySettings;
+    private CachedEventSettings eventSettings;
+    private CachedBotSettings botSettings;
+
+    private ConfigurationLoader loader = getConfigurationLoader();
+
+    /**
+     * BukkitConfigurationLoader uses Sponge's Configurate to load the HOCON values in the three settings files.
+     *
+     * @param configurationDirectory The directory in which the configuration files are being saved to.
+     */
+    public VelocityConfigurationManager(Path configurationDirectory) {
+        super(configurationDirectory);
+    }
+
+    @Override
+    public void deployResources() {
+
+        if (!Files.exists(getConfigurationDirectory())) {
+            if (getConfigurationDirectory().toFile().mkdir()) {
+                I18NLogger.rawInfo("Created the plugin directory"); // TODO locale
+            } else {
+                I18NLogger.rawInfo("Failed to create the plugin directory");
+            }
+        }
+
+        try {
+            if (!loader.doesBotSettingsExist()) {
+                exportResource(ConfigurationLoader.BOT_SETTINGS_FILE_NAME, loader.getBotSettingsPath().toString());
+            }
+
+            if (!loader.doesProxySettingsExist()) {
+                exportResource(ConfigurationLoader.PROXY_SETTINGS_FILE_NAME, loader.getProxySettingsPath().toString());
+            }
+
+            if (!loader.doesEventSettingsExist()) {
+                exportResource(ConfigurationLoader.EVENT_SETTINGS_FILE_NAME, loader.getEventSettingsPath().toString());
+            }
+        } catch (NoSuchResourceException exception) {
+            I18NLogger.error("configuration.deploy-failure", exception.getMessage());
+        }
+
+    }
+
+    @Override
+    public void loadConfigurationFiles() {
+        try {
+            proxySettings = loader.loadProxySettings();
+            eventSettings = loader.loadEventSettings();
+            botSettings = loader.loadBotSettings();
+        } catch (ConfigurateException exception) {
+            I18NLogger.error(""); // TODO add error for failure to load configuration
+            return;
+        }
+
+        ConfigurationUtil.loadConfigurationValues(proxySettings, eventSettings, botSettings);
+    }
+
+    @Override
+    public void checkConfigurationVersions() {
+
+    }
+
+}
diff --git a/Velocity/src/main/java/io/paradaux/conch/velocity/bot/DiscordMessageListener.java b/Velocity/src/main/java/io/paradaux/conch/velocity/bot/DiscordMessageListener.java
new file mode 100644
index 0000000..c12d353
--- /dev/null
+++ b/Velocity/src/main/java/io/paradaux/conch/velocity/bot/DiscordMessageListener.java
@@ -0,0 +1,93 @@
+package io.paradaux.conch.velocity.bot;
+
+import io.paradaux.conch.common.api.config.CachedBotSettings;
+import io.paradaux.conch.velocity.managers.TaskManager;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+public class DiscordMessageListener extends ListenerAdapter {
+
+    private final CachedBotSettings config;
+    private final TaskManager tasks;
+
+    /**
+     * Handles discord messages coming in.
+     * */
+    public DiscordMessageListener(TaskManager tasks, CachedBotSettings config) {
+
+        this.tasks = tasks;
+        this.config = config;
+    }
+
+    @Override
+    public void onMessageReceived(@NotNull MessageReceivedEvent event) {
+        Member member = event.getMember();
+
+        // If the message wasn't in a monitored channel, ignore it.
+        if (!config.getMonitoredChannels().contains(event.getChannel().getId())) {
+            return;
+        }
+
+        // If ignore bots is enabled, respect it.
+        if (event.getAuthor().isBot() && !config.isSendBotMessages()) {
+            return;
+        }
+
+        tasks.newTask(() -> {
+            // Member is null when the event is triggered by a webhook rather than a bot/user
+            if (member == null) {
+                return;
+            }
+
+            Role highestRole = getHighestFrom(member);
+
+
+
+
+
+
+
+
+            Bukkit.getServer().broadcastMessage(config.getMessageFormat()
+                    .replace("%discord_nickname%", member.getEffectiveName())
+                    .replace("%discord_tag%", event.getAuthor().getAsTag())
+                    .replace("%discord_username%", event.getAuthor().getName())
+                    .replace("%discord_discriminator%", event.getAuthor().getDiscriminator())
+                    .replace("%discord_message%", event.getMessage().getContentStripped())
+                    .replace("%discord_topRole%",  highestRole == null ? "" : highestRole.getName())
+                    .replace("%discord_channel%", event.getChannel().getName())
+                    .replace("%discord_guild%", event.getGuild().getName()));
+        }).schedule();
+    }
+
+    /**
+     * Determines the highest role (i.e the role displayed when the user speaks) of the member provided.
+     * */
+    @Nullable
+    public Role getHighestFrom(Member member) {
+        if (member == null) {
+            return null;
+        }
+
+        List<Role> roles = member.getRoles();
+
+        if (roles.isEmpty()) {
+            return null;
+        }
+
+        return roles.stream().min((first, second) -> {
+            if (first.getPosition() == second.getPosition()) {
+                return 0;
+            }
+
+            return first.getPosition() > second.getPosition() ? -1 : 1;
+        }).get();
+    }
+
+}
diff --git a/Velocity/src/main/java/io/paradaux/conch/velocity/listeners/GenericListener.java b/Velocity/src/main/java/io/paradaux/conch/velocity/listeners/GenericListener.java
new file mode 100644
index 0000000..2129cdf
--- /dev/null
+++ b/Velocity/src/main/java/io/paradaux/conch/velocity/listeners/GenericListener.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 3 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 3 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
+ * if you need additional information or have any questions.
+ * See LICENSE.md for more details.
+ */
+
+package io.paradaux.conch.velocity.listeners;
+
+import com.velocitypowered.api.proxy.Player;
+import io.paradaux.conch.common.api.config.ConfigurationUtil;
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nullable;
+
+public class GenericListener {
+
+    /**
+     * Represents a non-specific bukkit listener with the configuration values required to run.
+     * */
+    public GenericListener() {
+
+    }
+
+    /**
+     * Parses purely the custom placeholders.
+     * */
+    protected String parseCustomPlaceholders(Player player, String networkName, String serverName, String avatarApi, String str) {
+        if (avatarApi == null) {
+            avatarApi = "";
+        }
+
+        // The proxy has no idea of what the display name is.
+        return str.replace("%playerUserName%", player.getUsername())
+                .replace("%playerUUID", player.getUniqueId().toString())
+                .replace("%avatarApi%", parseAvatarApi(player, avatarApi))
+                .replace("%networkName", networkName)
+                .replace("%serverName%", serverName);
+
+    }
+
+    @Nullable
+    @CheckReturnValue
+    protected String parseAvatarApi(Player player, String avatarApiUrl) {
+        if (player == null) {
+            throw new IllegalStateException("This player is not available.");
+        }
+
+        String uuid = player.getUniqueId().toString();
+
+        avatarApiUrl = avatarApiUrl.replace("%avatarApi%", avatarApiUrl);
+        return avatarApiUrl.replace("%playerUUID%", ConfigurationUtil.getProxySettings().isAvatarApiHyphen() ? uuid : uuid.replace("-", ""));
+    }
+
+
+}
diff --git a/Velocity/src/main/java/io/paradaux/hiberniadiscord/velocity/listeners/PlayerChatEventListener.java b/Velocity/src/main/java/io/paradaux/conch/velocity/listeners/PlayerChatEventListener.java
similarity index 51%
rename from Velocity/src/main/java/io/paradaux/hiberniadiscord/velocity/listeners/PlayerChatEventListener.java
rename to Velocity/src/main/java/io/paradaux/conch/velocity/listeners/PlayerChatEventListener.java
index df11f73..5bf6bb6 100644
--- a/Velocity/src/main/java/io/paradaux/hiberniadiscord/velocity/listeners/PlayerChatEventListener.java
+++ b/Velocity/src/main/java/io/paradaux/conch/velocity/listeners/PlayerChatEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
+ * Copyright (c) 2021, Rían Errity. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,38 +21,61 @@
  * See LICENSE.md for more details.
  */
 
-package io.paradaux.hiberniadiscord.velocity.listeners;
+package io.paradaux.conch.velocity.listeners;
 
 import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.player.PlayerChatEvent;
 import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.ServerConnection;
+import io.paradaux.conch.common.api.DiscordManager;
+import io.paradaux.conch.common.api.I18NLogger;
+import io.paradaux.conch.common.api.config.EventConfiguration;
+import io.paradaux.conch.velocity.managers.TaskManager;
 import org.slf4j.Logger;
 
 import javax.annotation.Nullable;
+import java.util.Optional;
 
 public class PlayerChatEventListener extends GenericListener {
 
-    Logger logger;
-    String messagePrefix;
-    boolean debug;
+    private final DiscordManager discord;
+    private final TaskManager tasks;
+    private final String networkName;
+    private final String avatarApi;
+    private final String messagePrefix;
+    private final EventConfiguration config;
 
-    public PlayerChatEventListener(String avatarApiUrl, String userNameFormat, String serverName,
-                                   @Nullable String messagePrefix, Logger logger, boolean debug) {
-        super(avatarApiUrl, serverName, userNameFormat);
-        this.logger = logger;
+    private final boolean debug;
+    public PlayerChatEventListener(DiscordManager discord, TaskManager tasks, String networkName, String avatarApi, String messagePrefix,
+                                   EventConfiguration config, boolean debug) {
+        this.discord = discord;
+        this.tasks = tasks;
+        this.networkName = networkName;
+        this.avatarApi = avatarApi;
         this.messagePrefix = messagePrefix;
+        this.config = config;
         this.debug = debug;
     }
 
     @Subscribe(order = PostOrder.NORMAL)
     public void onPlayerChat(PlayerChatEvent event) {
+
         Player player = event.getPlayer();
-        String userName = parsePlaceholders(player, getUserNameFormat());
-        String messageContent = parsePlaceholders(player, event.getMessage());
+
+        Optional<ServerConnection> server = event.getPlayer().getCurrentServer();
+        String serverName = "";
+
+        if (server.isPresent()) {
+            serverName = server.get().getServer().getServerInfo().getName();
+        }
+
+        String userName = parseCustomPlaceholders(player, networkName, serverName, avatarApi, config.getWebhookUsernameFormat());
+        String messageContent = parseCustomPlaceholders(player, networkName, serverName, avatarApi, event.getMessage());
+
 
         if (userName == null || messageContent == null) {
-            logger.error("Something went wrong. AsyncPlayerChatEvent null.");
+            I18NLogger.error("Something went wrong. AsyncPlayerChatEvent null.");
             return;
         }
 
@@ -67,11 +90,13 @@ public void onPlayerChat(PlayerChatEvent event) {
         }
 
         if (debug) {
-            logger.info("{} has sent a message in chat which will be relayed to the discord webhook.", player.getUsername());
+            I18NLogger.rawInfo("{} has sent a message in chat which will be relayed to the discord webhook.", player.getUsername());
         }
 
-//        DiscordManager.sendDiscordMessage(userName, parseAvatarApi(player), messageContent);
-
+        final String msg = messageContent;
+        tasks.newTask(() -> {
+            discord.sendDiscordMessage(userName, parseAvatarApi(player, avatarApi), msg);
+        }).schedule();
     }
 
 }
diff --git a/Velocity/src/main/java/io/paradaux/conch/velocity/managers/TaskManager.java b/Velocity/src/main/java/io/paradaux/conch/velocity/managers/TaskManager.java
new file mode 100644
index 0000000..13b3f90
--- /dev/null
+++ b/Velocity/src/main/java/io/paradaux/conch/velocity/managers/TaskManager.java
@@ -0,0 +1,19 @@
+package io.paradaux.conch.velocity.managers;
+
+import com.velocitypowered.api.scheduler.Scheduler;
+
+public class TaskManager {
+
+    private final Object plugin;
+    private final Scheduler scheduler;
+
+    public TaskManager(Object plugin, Scheduler scheduler) {
+        this.plugin = plugin;
+        this.scheduler = scheduler;
+    }
+
+    public Scheduler.TaskBuilder newTask(Runnable task) {
+        return scheduler.buildTask(plugin, task);
+    }
+
+}
diff --git a/Velocity/src/main/java/io/paradaux/hiberniadiscord/velocity/HiberniaDiscord.java b/Velocity/src/main/java/io/paradaux/hiberniadiscord/velocity/HiberniaDiscord.java
deleted file mode 100644
index 3ec9d16..0000000
--- a/Velocity/src/main/java/io/paradaux/hiberniadiscord/velocity/HiberniaDiscord.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.paradaux.hiberniadiscord.velocity;
-
-import com.google.inject.Inject;
-import com.velocitypowered.api.event.Subscribe;
-import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
-import com.velocitypowered.api.plugin.Plugin;
-import com.velocitypowered.api.plugin.annotation.DataDirectory;
-import com.velocitypowered.api.proxy.ProxyServer;
-import io.paradaux.hiberniadiscord.velocity.listeners.PlayerChatEventListener;
-import org.slf4j.Logger;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-
-@Plugin(id = "hiberniadiscord", name = "HiberniaDiscord", version = "4.0.0",
-        url = "https://hiberniadiscord.paradaux.io", description = "Discord to chat Bridge", authors = {"Paradaux"})
-public class HiberniaDiscord {
-
-
-    private final ProxyServer server;
-    private final Logger logger;
-    private final Path dataDirectory;
-
-    List<String> monitoredChannels = new ArrayList<>();
-
-    String webhookUrl = "https://discord.com/api/webhooks/763065395833602048/xUUX016wrPYPGWRJyfsGaDtwtxHJFrbWHrEfj4XMa5PvFT0jSc-kgcA9qF3ZP9cpH5Mv";
-
-    String iconUrl = "https://cdn.paradaux.io/static/plugin-branding/hiberniadiscord/hibernia-discord.png";
-    String token = "";
-    String messageFormat = "";
-
-    @Inject
-    public HiberniaDiscord(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) {
-        this.server = server;
-        this.logger = logger;
-        this.dataDirectory = dataDirectory;
-    }
-
-    @Subscribe
-    public void onProxyInitialization(ProxyInitializeEvent event) {
-
-//        DiscordManager.initialise(webhookUrl, true, logger);
-//        DiscordManager.sendDiscordMessage("Test", iconUrl, "hello world");
-
-        registerEvents();
-    }
-
-    public void registerEvents() {
-        String avatarApiUrl = "https://mc-heads.net/combo/%playeruuid%";
-        String userNameFormat = "%playername%";
-        String serverName = "Test Server";
-        String messagePrefix = null;
-
-        server.getEventManager().register(this, new PlayerChatEventListener(avatarApiUrl, userNameFormat, serverName, messagePrefix,
-                logger, true));
-    }
-}
diff --git a/Velocity/src/main/java/io/paradaux/hiberniadiscord/velocity/listeners/GenericListener.java b/Velocity/src/main/java/io/paradaux/hiberniadiscord/velocity/listeners/GenericListener.java
deleted file mode 100644
index 6e49700..0000000
--- a/Velocity/src/main/java/io/paradaux/hiberniadiscord/velocity/listeners/GenericListener.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2020, Rían Errity. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 3 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 3 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Rían Errity <rian@paradaux.io> or visit https://paradaux.io
- * if you need additional information or have any questions.
- * See LICENSE.md for more details.
- */
-
-package io.paradaux.hiberniadiscord.velocity.listeners;
-
-import com.velocitypowered.api.proxy.Player;
-import org.jetbrains.annotations.NotNull;
-
-import javax.annotation.CheckReturnValue;
-import javax.annotation.Nullable;
-
-public class GenericListener {
-
-    private final String avatarApiUrl;
-    private final String serverName;
-    private final String userNameFormat;
-
-    /**
-     * Represents a non-specific bukkit listener with the configuration values required to run.
-     * */
-    public GenericListener(String avatarApiUrl, String serverName, String userNameFormat) {
-        this.avatarApiUrl = avatarApiUrl;
-        this.serverName = serverName;
-        this.userNameFormat = userNameFormat;
-    }
-
-    /**
-     * Formats the string provided accounting for the various placeholders, which are injected into from the provided OfflinePlayer Object.
-     * */
-    @Nullable
-    @CheckReturnValue
-    protected String parsePlaceholders(Player player, @NotNull String str) {
-        if (player == null || player.getUsername() == null) {
-            return null;
-        }
-
-        String avatarUrl = parseAvatarApi(player);
-
-        if (avatarUrl == null) {
-            avatarUrl = "";
-        }
-
-        return str.replace("%playername%", player.getUsername())
-                .replace("%playeruuid%", player.getUniqueId().toString())
-                .replace("%servername%", serverName)
-                .replace("%avatarapi%", avatarUrl);
-    }
-
-    @Nullable
-    @CheckReturnValue
-    protected String parseAvatarApi(Player player) {
-        if (player == null) {
-            return null;
-        }
-
-        return avatarApiUrl.replace("%playeruuid%", player.getUniqueId().toString());
-    }
-
-    public String getAvatarApiUrl() {
-        return avatarApiUrl;
-    }
-
-    public String getServerName() {
-        return serverName;
-    }
-
-    public String getUserNameFormat() {
-        return userNameFormat;
-    }
-
-
-}
diff --git a/Velocity/src/main/resources/bot-settings.conf b/Velocity/src/main/resources/bot-settings.conf
new file mode 100644
index 0000000..55087fb
--- /dev/null
+++ b/Velocity/src/main/resources/bot-settings.conf
@@ -0,0 +1,57 @@
+# Conch 1.0 by Rían Errity <rian@paradaux.io> Licensed under GPLv3 | Bot Configuration.
+
+// Conch comes bundled with a built-in discord bot. In order to make use of this you must create a discord
+// token and place it between the double quotes ("") in the token field on line 8. The discord bot permits you to have
+// discord messages show up in game.
+
+// Set this to true to enable the built-in discord bot.
+
+enabled: false
+
+// The Bot Token is your API key so Conch can talk to discord as a bot. You must create the bot account here:
+// https://discord.com/developers/applications Please see https://hiberniadiscrd.paradaux.io/#/bot-configuration for
+// more user-friendly instructions.
+
+// In order for your discord bot to see the messages in your discord server you must also invite the discord bot to your
+// discord server. Please see https://hiberniadiscrd.paradaux.io/#/bot-configuration for more explicit instructions as
+// to how to do this.
+token: ""
+
+discord-commands-enabled: true
+command-prefix: ';'
+
+send-messages-from-bots: false
+
+// This is an array of discord channel IDs which the discord bot will listen to messages from
+monitored-channels: ["822245879556997122", "736301820351086656", "739708755767329350"]
+
+// This configuration option only works on proxies, but allows you to map servers to monitored disocrd channels.
+// This configuration option only works on proxies, but allows you to map servers to monitored disocrd channels.
+// This is an advanced configuration option {TODO INSERT DOC LINK} for more
+// information as to how to set this up.
+
+// N.B :: Enabling this disables the monitors listed in monitored-channels
+proxy-based-monitoring: true
+
+// Example:
+// "lobby": "736301820351086656"
+// Entries must be comma seperated as shown below, the last entry does not require a comma.
+proxy-monitored-channels: {
+  "serverName": "ChannelID",
+  "serverName2": "ChannelID2"
+}
+
+// This is how you configure how your messages appear in-game as they are broadcast to your users.
+
+// Available Placeholders:
+// - %discord_nickname%        :: The nickname of discord user who sent a message.
+// - %discord_tag%             :: The tag (Username#Descriminator) of the user who sent a message.
+// - %discord_username%        :: The username of that user.
+// - %discord_descriminator%   :: The descriminator of that user.
+// - %discord_message%         :: The message sent by that user.
+// - %discord_topRole%         :: The highest role that user has.
+// - %discord_channel%         :: The channel in which the message was sent.
+// - %discord_guild%           :: The guild in which that message was sent.
+
+// TODO adventure support
+message-format: " #%discord_channel% <%discord_topRole%> %discord_nickname% » %discord_message%"
diff --git a/Velocity/src/main/resources/event-settings.conf b/Velocity/src/main/resources/event-settings.conf
new file mode 100644
index 0000000..b61f616
--- /dev/null
+++ b/Velocity/src/main/resources/event-settings.conf
@@ -0,0 +1,71 @@
+# Conch 1.0 by Rían Errity <rian@paradaux.io> Licensed under GPLv3 | Event Configuration.
+
+// This is where you configure how certain events are displayed when they are sent to discord
+// If you do not wish for them to be sent to discord please set enabled to false.
+// We're open to adding more events, if you have any ideas please send them our way via a github issue.
+
+// Available Placeholders:
+// - %playerUserName%     :: The Player's Username.
+// - %playerDisplayName%  :: The Player's Display name (Used by other plugins for Nicknames, prefixes etc)
+// - %playerUUID%         :: The Player's Unique ID.
+// - %avatarAPI%          :: The Player's Head as defined in general-settings.conf
+// - %networkName%        :: The Name of the network as defined in general-settings.conf
+// - %serverName%         :: The Name of the server the user is connected to
+
+// Certain events have event-specific placeholders which will be defined before the configuration node for that event.
+// "" referred to as an empty string denotes no message, which will be converted to a zero-width space, so it can be
+// sent to discord without error.
+
+// AsyncPlayerChatEvent Custom Placeholders:
+// - %messageContent% :: The message which was sent.
+
+// DEVELOPMENT BUILD NOTICE.
+// ONLY THE EVENTS LISTED ARE IMPLEMENTED.
+// CONFIGURATION FILES ARE SUBJECT TO BREAKING CHANGES, WITH NO AUTOMATIC UPGRADES.
+
+onChatMessage: {
+  enabled: true
+  webhook-username-format: "%playerUserName%"
+  webhook-avatar-format: "%avatarApi%"
+  webhook-message-format: "%messageContent%"
+}
+
+// PlayerJoinEvent Custom Placeholders:
+// - %joinMessage% :: The join mesage as set by other plugins or by the minecraft server itself.
+onPlayerJoin: {
+  enabled: true
+  webhook-username-format: "%playerUserName% has joined the game."
+  webhook-avatar-format: "%avatarApi%"
+  webhook-message-format: ""
+}
+
+// PlayerJoinEvent Custom Placeholders:
+// - %leaveMessage% :: The leave mesage as set by other plugins or by the minecraft server itself.
+onPlayerLeave: {
+  enabled: true
+  webhook-username-format: "%playerUserName% has left the game."
+  webhook-avatar-format: "%avatarApi%"
+  webhook-message-format: "%messageContent%"
+}
+
+onPlayerKick: {
+  enabled: false
+  webhook-username-format: ""
+  webhook-avatar-format: "%avatarApi%"
+  webhook-message-format: "%messageContent%"
+}
+
+onServerStartup: {
+  enabled: true
+  webhook-username-format: ""
+  webhook-avatar-format: "%avatarApi%"
+  webhook-message-format: "%messageContent%"
+}
+
+onGracefulShutdown: {
+  enabled: true
+  webhook-username-format: ""
+  webhook-avatar-format: "%avatarApi%"
+  webhook-message-format: "%messageContent%"
+}
+
diff --git a/Velocity/src/main/resources/proxy-settings.conf b/Velocity/src/main/resources/proxy-settings.conf
new file mode 100644
index 0000000..faf1159
--- /dev/null
+++ b/Velocity/src/main/resources/proxy-settings.conf
@@ -0,0 +1,37 @@
+# Conch 1.0 by Rían Errity <rian@paradaux.io> Licensed under GPLv3 | General Settings.
+
+// This is where you configure the webhook and some general plugin settings.
+// If you do not wish for them to be sent to discord please set enabled to false.
+// We're open to adding more events, if you have any ideas please send them our way via a github issue.
+
+configuration-version: "1.0.0"
+debug: false
+locale: en_US
+
+webhook-configuration: {
+  // See creating a webhook: https://docs.conch.rocks/discord-guides/creating-a-webhook
+  // This is the webhook used by the events system. Conch Addons have the option of using their own webhook.
+  webhook-url: ""
+
+  // If you only want to use Conch's api functionality disable the event listeners here.
+  events: true
+}
+
+placeholders: {
+  network-name: "Network"
+  include-hyphens-in-uuid: false // Whether or not to remove hypens from the UUID (Some APIs are faster with this enabled.)
+  avatar-api: "https://visage.surgeplay.com/head/512/%playerUUID%"
+}
+
+// Enabling this enables the below proxy-webhook-configuration settings which allows you to map servers to webhooks.
+// See Proxy Configuration: https://docs.conch.rocks/configuration/proxy-configuration for more information on how to setup a multi-server mapping.
+// You can have as many entries as you like!
+
+// By default all messages from all servers go to the one webhook, defined above. If a server does not exist in the mapping, it will fall back
+// to the webhook specified above.
+per-server-webhook-configuration: true
+
+proxy-webhook-configuration: {
+  "serverName": "webhook1",
+  "serverName2": "webhook2"
+}
\ No newline at end of file
diff --git a/dev-move-bukkit.bat b/dev-move-bukkit.bat
new file mode 100644
index 0000000..0808f98
--- /dev/null
+++ b/dev-move-bukkit.bat
@@ -0,0 +1,3 @@
+rm plugins/conch-bukkit-1.0.0.jar
+mv ../../Bukkit/target/conch-bukkit-1.0.0.jar plugins/
+java -jar server.jar -nogui
\ No newline at end of file
diff --git a/dev-move-velocity.bat b/dev-move-velocity.bat
new file mode 100644
index 0000000..45a2f2b
--- /dev/null
+++ b/dev-move-velocity.bat
@@ -0,0 +1,3 @@
+rm plugins/conch-velocity-1.0.0.jar
+mv ../../Velocity/target/conch-velocity-1.0.0.jar plugins/
+java -jar velocity.jar
\ No newline at end of file
diff --git a/dev-move.bat b/dev-move.bat
deleted file mode 100644
index f828063..0000000
--- a/dev-move.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-rm server/plugins/hiberniadiscord-bukkit-4.0.0.jar
-mv bukkit/target/hiberniadiscord-bukkit-4.0.0.jar server/plugins/
\ No newline at end of file
diff --git a/maven-metadata.xml b/maven-metadata.xml
deleted file mode 100644
index c45109a..0000000
--- a/maven-metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<metadata modelVersion="1.1.0">
-<groupId>co.paradaux</groupId>
-<artifactId>io.paradaux.hiberniadiscord.bukkit.HiberniaDiscord</artifactId>
-<versioning>
-<latest>2.1.1</latest>
-<release>2.1.1</release>
-<versions>
-<version>2.1.0</version>
-<version>2.1.1</version>
-</versions>
-<lastUpdated>20190620090813</lastUpdated>
-</versioning>
-</metadata>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 02121fd..a4ddeeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,19 +4,19 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.paradaux.hiberniadiscord</groupId>
-    <artifactId>hiberniadiscord</artifactId>
-    <version>4.0.0</version>
+    <groupId>io.paradaux.conch</groupId>
+    <artifactId>conch</artifactId>
+    <version>1.0.0</version>
 
-    <name>HiberniaDiscord</name>
-    <url>https://hiberniadiscord.paradaux.io</url>
+    <name>Conch</name>
+    <url>https://conch.rocks</url>
     <packaging>pom</packaging>
 
     <modules>
         <module>Common</module>
         <module>Bukkit</module>
         <module>Sponge</module>
-        <module>Bungeecord</module>
+<!--        <module>Bungeecord</module>-->
         <module>Velocity</module>
     </modules>
 
@@ -26,21 +26,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>DEVELOPMENT</id>
-        </profile>
-
-        <profile>
-            <id>SNAPSHOT</id>
-        </profile>
-
-        <profile>
-            <id>RELEASE</id>
-        </profile>
-    </profiles>
-
-
     <build>
         <pluginManagement>
             <plugins>
@@ -97,18 +82,16 @@
             <id>aikar</id>
             <url>https://repo.aikar.co/content/groups/aikar/</url>
         </repository>
+
         <repository>
             <id>bintray-jcenter</id>
             <url>https://jcenter.bintray.com</url>
         </repository>
+
         <repository>
             <id>placeholderapi</id>
             <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
-        <repository>
-            <id>bungeecord-repo</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </repository>
     </repositories>
 
     <dependencies>
@@ -146,6 +129,7 @@
             <version>5.4.2</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
@@ -162,7 +146,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.2.0_225</version>
+            <version>4.2.0_228</version>
             <exclusions>
                 <exclusion>
                     <groupId>club.minnced</groupId>