diff --git a/pom.xml b/pom.xml
index e6be420..ab53025 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>Hadder</groupId>
     <artifactId>Hadder</artifactId>
-    <version>1.3.26</version>
+    <version>2.0.0</version>
     <name>Hadder</name>
     <inceptionYear>2019</inceptionYear>
     <description>Hadder is a multi-purpose Discord bot.</description>
@@ -130,7 +130,7 @@
                         <finalName>Hadder-Build</finalName>
                         <archive>
                             <manifest>
-                                <mainClass>com.bbn.hadder.Hadder</mainClass>
+                                <mainClass>one.bbn.hadder.Hadder</mainClass>
                             </manifest>
                         </archive>
                     </configuration>
@@ -169,7 +169,7 @@
                     <finalName>Hadder-Build</finalName>
                     <archive>
                         <manifest>
-                            <mainClass>com.bbn.hadder.Hadder</mainClass>
+                            <mainClass>one.bbn.hadder.Hadder</mainClass>
                         </manifest>
                     </archive>
                     <descriptorRefs>
diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/one/bbn/hadder/Hadder.java
similarity index 87%
rename from src/main/java/com/bbn/hadder/Hadder.java
rename to src/main/java/one/bbn/hadder/Hadder.java
index ba59d44..c685973 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/one/bbn/hadder/Hadder.java
@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder;
+package one.bbn.hadder;
 
-import com.bbn.hadder.audio.AudioManager;
-import com.bbn.hadder.commands.fun.AvatarCommand;
-import com.bbn.hadder.commands.fun.ClydeCommand;
-import com.bbn.hadder.commands.fun.GifCommand;
-import com.bbn.hadder.commands.fun.MemeCommand;
-import com.bbn.hadder.commands.general.*;
-import com.bbn.hadder.commands.misc.*;
-import com.bbn.hadder.commands.moderation.*;
-import com.bbn.hadder.commands.music.*;
-import com.bbn.hadder.commands.nsfw.*;
-import com.bbn.hadder.commands.owner.*;
-import com.bbn.hadder.commands.settings.LanguageCommand;
-import com.bbn.hadder.commands.settings.UserPrefixCommand;
-import com.bbn.hadder.core.CommandHandler;
-import com.bbn.hadder.core.Config;
-import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.listener.*;
+import one.bbn.hadder.audio.AudioManager;
+import one.bbn.hadder.commands.fun.AvatarCommand;
+import one.bbn.hadder.commands.fun.ClydeCommand;
+import one.bbn.hadder.commands.fun.GifCommand;
+import one.bbn.hadder.commands.fun.MemeCommand;
+import one.bbn.hadder.commands.general.*;
+import one.bbn.hadder.commands.misc.*;
+import one.bbn.hadder.commands.moderation.*;
+import one.bbn.hadder.commands.music.*;
+import one.bbn.hadder.commands.nsfw.*;
+import one.bbn.hadder.commands.owner.*;
+import one.bbn.hadder.commands.settings.LanguageCommand;
+import one.bbn.hadder.commands.settings.UserPrefixCommand;
+import one.bbn.hadder.core.CommandHandler;
+import one.bbn.hadder.core.Config;
+import one.bbn.hadder.db.Rethink;
+import one.bbn.hadder.listener.*;
 import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.requests.GatewayIntent;
diff --git a/src/main/java/com/bbn/hadder/audio/AudioInfo.java b/src/main/java/one/bbn/hadder/audio/AudioInfo.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/audio/AudioInfo.java
rename to src/main/java/one/bbn/hadder/audio/AudioInfo.java
diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/one/bbn/hadder/audio/AudioManager.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/audio/AudioManager.java
rename to src/main/java/one/bbn/hadder/audio/AudioManager.java
diff --git a/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java b/src/main/java/one/bbn/hadder/audio/AudioPlayerSendHandler.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java
rename to src/main/java/one/bbn/hadder/audio/AudioPlayerSendHandler.java
diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/one/bbn/hadder/audio/TrackManager.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/audio/TrackManager.java
rename to src/main/java/one/bbn/hadder/audio/TrackManager.java
diff --git a/src/main/java/com/bbn/hadder/commands/Command.java b/src/main/java/one/bbn/hadder/commands/Command.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/Command.java
rename to src/main/java/one/bbn/hadder/commands/Command.java
diff --git a/src/main/java/com/bbn/hadder/commands/CommandEvent.java b/src/main/java/one/bbn/hadder/commands/CommandEvent.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/CommandEvent.java
rename to src/main/java/one/bbn/hadder/commands/CommandEvent.java
diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/one/bbn/hadder/commands/fun/AvatarCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
rename to src/main/java/one/bbn/hadder/commands/fun/AvatarCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java b/src/main/java/one/bbn/hadder/commands/fun/ClydeCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java
rename to src/main/java/one/bbn/hadder/commands/fun/ClydeCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/one/bbn/hadder/commands/fun/GifCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
rename to src/main/java/one/bbn/hadder/commands/fun/GifCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java b/src/main/java/one/bbn/hadder/commands/fun/MemeCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java
rename to src/main/java/one/bbn/hadder/commands/fun/MemeCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java b/src/main/java/one/bbn/hadder/commands/general/AboutCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/general/AboutCommand.java
rename to src/main/java/one/bbn/hadder/commands/general/AboutCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java b/src/main/java/one/bbn/hadder/commands/general/EqualsCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java
rename to src/main/java/one/bbn/hadder/commands/general/EqualsCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/one/bbn/hadder/commands/general/HelpCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/general/HelpCommand.java
rename to src/main/java/one/bbn/hadder/commands/general/HelpCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java b/src/main/java/one/bbn/hadder/commands/general/InviteCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/general/InviteCommand.java
rename to src/main/java/one/bbn/hadder/commands/general/InviteCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java b/src/main/java/one/bbn/hadder/commands/general/PingCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/general/PingCommand.java
rename to src/main/java/one/bbn/hadder/commands/general/PingCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java b/src/main/java/one/bbn/hadder/commands/misc/CodeCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/misc/CodeCommand.java
rename to src/main/java/one/bbn/hadder/commands/misc/CodeCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java b/src/main/java/one/bbn/hadder/commands/misc/CoronaCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/misc/CoronaCommand.java
rename to src/main/java/one/bbn/hadder/commands/misc/CoronaCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java b/src/main/java/one/bbn/hadder/commands/misc/FeedbackCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java
rename to src/main/java/one/bbn/hadder/commands/misc/FeedbackCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/one/bbn/hadder/commands/misc/GitHubCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java
rename to src/main/java/one/bbn/hadder/commands/misc/GitHubCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java b/src/main/java/one/bbn/hadder/commands/misc/MoveAllCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java
rename to src/main/java/one/bbn/hadder/commands/misc/MoveAllCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/one/bbn/hadder/commands/misc/ProfileCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
rename to src/main/java/one/bbn/hadder/commands/misc/ProfileCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java b/src/main/java/one/bbn/hadder/commands/misc/ScreenShareCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java
rename to src/main/java/one/bbn/hadder/commands/misc/ScreenShareCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/one/bbn/hadder/commands/misc/ServerStatsCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
rename to src/main/java/one/bbn/hadder/commands/misc/ServerStatsCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/one/bbn/hadder/commands/moderation/BanCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java
rename to src/main/java/one/bbn/hadder/commands/moderation/BanCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/one/bbn/hadder/commands/moderation/ClearCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java
rename to src/main/java/one/bbn/hadder/commands/moderation/ClearCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java b/src/main/java/one/bbn/hadder/commands/moderation/EditRulesCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java
rename to src/main/java/one/bbn/hadder/commands/moderation/EditRulesCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/one/bbn/hadder/commands/moderation/InviteDetectCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java
rename to src/main/java/one/bbn/hadder/commands/moderation/InviteDetectCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/one/bbn/hadder/commands/moderation/KickCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java
rename to src/main/java/one/bbn/hadder/commands/moderation/KickCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/one/bbn/hadder/commands/moderation/NickCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java
rename to src/main/java/one/bbn/hadder/commands/moderation/NickCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java b/src/main/java/one/bbn/hadder/commands/moderation/PrefixCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
rename to src/main/java/one/bbn/hadder/commands/moderation/PrefixCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/one/bbn/hadder/commands/moderation/RegionChangeCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
rename to src/main/java/one/bbn/hadder/commands/moderation/RegionChangeCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/one/bbn/hadder/commands/moderation/RoleCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
rename to src/main/java/one/bbn/hadder/commands/moderation/RoleCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/one/bbn/hadder/commands/moderation/RulesCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
rename to src/main/java/one/bbn/hadder/commands/moderation/RulesCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java b/src/main/java/one/bbn/hadder/commands/moderation/StarboardCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java
rename to src/main/java/one/bbn/hadder/commands/moderation/StarboardCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java b/src/main/java/one/bbn/hadder/commands/music/BassCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/music/BassCommand.java
rename to src/main/java/one/bbn/hadder/commands/music/BassCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java b/src/main/java/one/bbn/hadder/commands/music/EchoCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/music/EchoCommand.java
rename to src/main/java/one/bbn/hadder/commands/music/EchoCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java b/src/main/java/one/bbn/hadder/commands/music/InfoCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/music/InfoCommand.java
rename to src/main/java/one/bbn/hadder/commands/music/InfoCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java b/src/main/java/one/bbn/hadder/commands/music/JoinCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/music/JoinCommand.java
rename to src/main/java/one/bbn/hadder/commands/music/JoinCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java b/src/main/java/one/bbn/hadder/commands/music/LoopCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/music/LoopCommand.java
rename to src/main/java/one/bbn/hadder/commands/music/LoopCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java b/src/main/java/one/bbn/hadder/commands/music/PauseCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/music/PauseCommand.java
rename to src/main/java/one/bbn/hadder/commands/music/PauseCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/one/bbn/hadder/commands/music/PlayCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/music/PlayCommand.java
rename to src/main/java/one/bbn/hadder/commands/music/PlayCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java b/src/main/java/one/bbn/hadder/commands/music/QueueCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/music/QueueCommand.java
rename to src/main/java/one/bbn/hadder/commands/music/QueueCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java b/src/main/java/one/bbn/hadder/commands/music/RecordCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/music/RecordCommand.java
rename to src/main/java/one/bbn/hadder/commands/music/RecordCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java b/src/main/java/one/bbn/hadder/commands/music/SkipCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/music/SkipCommand.java
rename to src/main/java/one/bbn/hadder/commands/music/SkipCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java b/src/main/java/one/bbn/hadder/commands/music/StopCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/music/StopCommand.java
rename to src/main/java/one/bbn/hadder/commands/music/StopCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/one/bbn/hadder/commands/music/VolumeCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java
rename to src/main/java/one/bbn/hadder/commands/music/VolumeCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/AnalCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/AnalCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/BDSMCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/BDSMCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/BlowjobCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/BlowjobCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/BoobsCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/BoobsCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/CumCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/CumCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/EroticCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/EroticCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/FeetCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/FeetCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/FingeringCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/FingeringCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/LickingCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/LickingCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/PornCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/PornCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/PussyCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/PussyCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/RandomPornCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/RandomPornCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/SoloCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/SoloCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/SpankCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/SpankCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java b/src/main/java/one/bbn/hadder/commands/nsfw/TransCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java
rename to src/main/java/one/bbn/hadder/commands/nsfw/TransCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/one/bbn/hadder/commands/owner/BlacklistCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
rename to src/main/java/one/bbn/hadder/commands/owner/BlacklistCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/one/bbn/hadder/commands/owner/EvalCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java
rename to src/main/java/one/bbn/hadder/commands/owner/EvalCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java b/src/main/java/one/bbn/hadder/commands/owner/GuildLeaveCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java
rename to src/main/java/one/bbn/hadder/commands/owner/GuildLeaveCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java b/src/main/java/one/bbn/hadder/commands/owner/RebootCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java
rename to src/main/java/one/bbn/hadder/commands/owner/RebootCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java b/src/main/java/one/bbn/hadder/commands/owner/ShutdownCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java
rename to src/main/java/one/bbn/hadder/commands/owner/ShutdownCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java b/src/main/java/one/bbn/hadder/commands/owner/TestCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/owner/TestCommand.java
rename to src/main/java/one/bbn/hadder/commands/owner/TestCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/one/bbn/hadder/commands/settings/LanguageCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
rename to src/main/java/one/bbn/hadder/commands/settings/LanguageCommand.java
diff --git a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java b/src/main/java/one/bbn/hadder/commands/settings/UserPrefixCommand.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java
rename to src/main/java/one/bbn/hadder/commands/settings/UserPrefixCommand.java
diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/one/bbn/hadder/core/CommandHandler.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/core/CommandHandler.java
rename to src/main/java/one/bbn/hadder/core/CommandHandler.java
diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/one/bbn/hadder/core/Config.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/core/Config.java
rename to src/main/java/one/bbn/hadder/core/Config.java
diff --git a/src/main/java/com/bbn/hadder/core/Perm.java b/src/main/java/one/bbn/hadder/core/Perm.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/core/Perm.java
rename to src/main/java/one/bbn/hadder/core/Perm.java
diff --git a/src/main/java/com/bbn/hadder/core/Perms.java b/src/main/java/one/bbn/hadder/core/Perms.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/core/Perms.java
rename to src/main/java/one/bbn/hadder/core/Perms.java
diff --git a/src/main/java/com/bbn/hadder/db/Rethink.java b/src/main/java/one/bbn/hadder/db/Rethink.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/db/Rethink.java
rename to src/main/java/one/bbn/hadder/db/Rethink.java
diff --git a/src/main/java/com/bbn/hadder/db/RethinkServer.java b/src/main/java/one/bbn/hadder/db/RethinkServer.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/db/RethinkServer.java
rename to src/main/java/one/bbn/hadder/db/RethinkServer.java
diff --git a/src/main/java/com/bbn/hadder/db/RethinkUser.java b/src/main/java/one/bbn/hadder/db/RethinkUser.java
similarity index 100%
rename from src/main/java/com/bbn/hadder/db/RethinkUser.java
rename to src/main/java/one/bbn/hadder/db/RethinkUser.java
diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/one/bbn/hadder/listener/CommandListener.java
similarity index 94%
rename from src/main/java/com/bbn/hadder/listener/CommandListener.java
rename to src/main/java/one/bbn/hadder/listener/CommandListener.java
index 521912c..af5ad4b 100644
--- a/src/main/java/com/bbn/hadder/listener/CommandListener.java
+++ b/src/main/java/one/bbn/hadder/listener/CommandListener.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.listener;
+package one.bbn.hadder.listener;
 
-import com.bbn.hadder.audio.AudioManager;
-import com.bbn.hadder.core.CommandHandler;
-import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.db.RethinkServer;
-import com.bbn.hadder.db.RethinkUser;
+import one.bbn.hadder.audio.AudioManager;
+import one.bbn.hadder.core.CommandHandler;
+import one.bbn.hadder.db.Rethink;
+import one.bbn.hadder.db.RethinkServer;
+import one.bbn.hadder.db.RethinkUser;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.ChannelType;
diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/one/bbn/hadder/listener/GuildListener.java
similarity index 94%
rename from src/main/java/com/bbn/hadder/listener/GuildListener.java
rename to src/main/java/one/bbn/hadder/listener/GuildListener.java
index 1d09b4f..8cea22b 100644
--- a/src/main/java/com/bbn/hadder/listener/GuildListener.java
+++ b/src/main/java/one/bbn/hadder/listener/GuildListener.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.listener;
+package one.bbn.hadder.listener;
 
-import com.bbn.hadder.core.Config;
-import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.utils.BotList;
-import com.bbn.hadder.utils.MessageEditor;
+import one.bbn.hadder.core.Config;
+import one.bbn.hadder.db.Rethink;
+import one.bbn.hadder.utils.BotList;
+import one.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
 import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/one/bbn/hadder/listener/InviteLinkListener.java
similarity index 96%
rename from src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
rename to src/main/java/one/bbn/hadder/listener/InviteLinkListener.java
index f845009..22069d5 100644
--- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
+++ b/src/main/java/one/bbn/hadder/listener/InviteLinkListener.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.listener;
+package one.bbn.hadder.listener;
 
-import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.db.RethinkServer;
+import one.bbn.hadder.db.Rethink;
+import one.bbn.hadder.db.RethinkServer;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.entities.Guild;
diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/one/bbn/hadder/listener/MentionListener.java
similarity index 95%
rename from src/main/java/com/bbn/hadder/listener/MentionListener.java
rename to src/main/java/one/bbn/hadder/listener/MentionListener.java
index 8c7c8c8..2376769 100644
--- a/src/main/java/com/bbn/hadder/listener/MentionListener.java
+++ b/src/main/java/one/bbn/hadder/listener/MentionListener.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.listener;
+package one.bbn.hadder.listener;
 
-import com.bbn.hadder.core.Config;
-import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.db.RethinkServer;
-import com.bbn.hadder.db.RethinkUser;
+import one.bbn.hadder.core.Config;
+import one.bbn.hadder.db.Rethink;
+import one.bbn.hadder.db.RethinkServer;
+import one.bbn.hadder.db.RethinkUser;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
diff --git a/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java b/src/main/java/one/bbn/hadder/listener/OwnerMessageListener.java
similarity index 94%
rename from src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java
rename to src/main/java/one/bbn/hadder/listener/OwnerMessageListener.java
index db0736b..1e14619 100644
--- a/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java
+++ b/src/main/java/one/bbn/hadder/listener/OwnerMessageListener.java
@@ -2,9 +2,9 @@
  * @author Hax / Hax6775 / Schlauer_Hax
  */
 
-package com.bbn.hadder.listener;
+package one.bbn.hadder.listener;
 
-import com.bbn.hadder.core.Config;
+import one.bbn.hadder.core.Config;
 import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/one/bbn/hadder/listener/PrivateMessageListener.java
similarity index 95%
rename from src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
rename to src/main/java/one/bbn/hadder/listener/PrivateMessageListener.java
index f931313..fdf01c7 100644
--- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
+++ b/src/main/java/one/bbn/hadder/listener/PrivateMessageListener.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.listener;
+package one.bbn.hadder.listener;
 
-import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.db.RethinkUser;
-import com.bbn.hadder.utils.MessageEditor;
+import one.bbn.hadder.db.Rethink;
+import one.bbn.hadder.db.RethinkUser;
+import one.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.entities.PrivateChannel;
diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/one/bbn/hadder/listener/ReadyListener.java
similarity index 92%
rename from src/main/java/com/bbn/hadder/listener/ReadyListener.java
rename to src/main/java/one/bbn/hadder/listener/ReadyListener.java
index 323f62b..6486b64 100644
--- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java
+++ b/src/main/java/one/bbn/hadder/listener/ReadyListener.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.listener;
+package one.bbn.hadder.listener;
 
-import com.bbn.hadder.core.Config;
-import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.utils.BotList;
+import one.bbn.hadder.core.Config;
+import one.bbn.hadder.db.Rethink;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.ReadyEvent;
diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/one/bbn/hadder/listener/RulesListener.java
similarity index 97%
rename from src/main/java/com/bbn/hadder/listener/RulesListener.java
rename to src/main/java/one/bbn/hadder/listener/RulesListener.java
index 5a58835..40bd2b6 100644
--- a/src/main/java/com/bbn/hadder/listener/RulesListener.java
+++ b/src/main/java/one/bbn/hadder/listener/RulesListener.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.listener;
+package one.bbn.hadder.listener;
 
-import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.db.RethinkServer;
+import one.bbn.hadder.db.Rethink;
+import one.bbn.hadder.db.RethinkServer;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/one/bbn/hadder/listener/StarboardListener.java
similarity index 98%
rename from src/main/java/com/bbn/hadder/listener/StarboardListener.java
rename to src/main/java/one/bbn/hadder/listener/StarboardListener.java
index dc1226a..8c5dfbc 100644
--- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java
+++ b/src/main/java/one/bbn/hadder/listener/StarboardListener.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.listener;
+package one.bbn.hadder.listener;
 
-import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.db.RethinkServer;
+import one.bbn.hadder.db.Rethink;
+import one.bbn.hadder.db.RethinkServer;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.entities.MessageReaction;
diff --git a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java b/src/main/java/one/bbn/hadder/listener/VoiceLeaveListener.java
similarity index 95%
rename from src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java
rename to src/main/java/one/bbn/hadder/listener/VoiceLeaveListener.java
index aeeb667..cc6fe5b 100644
--- a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java
+++ b/src/main/java/one/bbn/hadder/listener/VoiceLeaveListener.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.listener;
+package one.bbn.hadder.listener;
 
-import com.bbn.hadder.audio.AudioManager;
+import one.bbn.hadder.audio.AudioManager;
 import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/one/bbn/hadder/utils/BotList.java
similarity index 98%
rename from src/main/java/com/bbn/hadder/utils/BotList.java
rename to src/main/java/one/bbn/hadder/utils/BotList.java
index 04374c8..3a9197d 100644
--- a/src/main/java/com/bbn/hadder/utils/BotList.java
+++ b/src/main/java/one/bbn/hadder/utils/BotList.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.utils;
+package one.bbn.hadder.utils;
 
-import com.bbn.hadder.Hadder;
-import com.bbn.hadder.core.Config;
+import one.bbn.hadder.Hadder;
+import one.bbn.hadder.core.Config;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
diff --git a/src/main/java/com/bbn/hadder/utils/EventWaiter.java b/src/main/java/one/bbn/hadder/utils/EventWaiter.java
similarity index 98%
rename from src/main/java/com/bbn/hadder/utils/EventWaiter.java
rename to src/main/java/one/bbn/hadder/utils/EventWaiter.java
index c07120b..6a8e2cf 100644
--- a/src/main/java/com/bbn/hadder/utils/EventWaiter.java
+++ b/src/main/java/one/bbn/hadder/utils/EventWaiter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.utils;
+package one.bbn.hadder.utils;
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.User;
diff --git a/src/main/java/com/bbn/hadder/utils/Http.java b/src/main/java/one/bbn/hadder/utils/Http.java
similarity index 98%
rename from src/main/java/com/bbn/hadder/utils/Http.java
rename to src/main/java/one/bbn/hadder/utils/Http.java
index 3caa009..0776c8d 100644
--- a/src/main/java/com/bbn/hadder/utils/Http.java
+++ b/src/main/java/one/bbn/hadder/utils/Http.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.utils;
+package one.bbn.hadder.utils;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Response;
diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/one/bbn/hadder/utils/MessageEditor.java
similarity index 98%
rename from src/main/java/com/bbn/hadder/utils/MessageEditor.java
rename to src/main/java/one/bbn/hadder/utils/MessageEditor.java
index 7f1f80e..9eca450 100644
--- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java
+++ b/src/main/java/one/bbn/hadder/utils/MessageEditor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder.utils;
+package one.bbn.hadder.utils;
 
-import com.bbn.hadder.db.RethinkUser;
+import one.bbn.hadder.db.RethinkUser;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.User;
 
diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
index 222bc42..50b5d17 100644
--- a/src/main/resources/META-INF/MANIFEST.MF
+++ b/src/main/resources/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: com.bbn.hadder.Hadder
+Main-Class: one.bbn.hadder.Hadder