diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar
index d85c08b..4f82b8a 100644
Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ
diff --git a/src/tk/sznp/thebuttonautoflair/AnnouncerThread.java b/src/io/github/norbipeti/thebuttonmc/AnnouncerThread.java
similarity index 94%
rename from src/tk/sznp/thebuttonautoflair/AnnouncerThread.java
rename to src/io/github/norbipeti/thebuttonmc/AnnouncerThread.java
index fec5459..8301935 100644
--- a/src/tk/sznp/thebuttonautoflair/AnnouncerThread.java
+++ b/src/io/github/norbipeti/thebuttonmc/AnnouncerThread.java
@@ -1,4 +1,4 @@
-package tk.sznp.thebuttonautoflair;
+package io.github.norbipeti.thebuttonmc;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/tk/sznp/thebuttonautoflair/Channel.java b/src/io/github/norbipeti/thebuttonmc/Channel.java
similarity index 93%
rename from src/tk/sznp/thebuttonautoflair/Channel.java
rename to src/io/github/norbipeti/thebuttonmc/Channel.java
index 4c9eb31..8fa37ed 100644
--- a/src/tk/sznp/thebuttonautoflair/Channel.java
+++ b/src/io/github/norbipeti/thebuttonmc/Channel.java
@@ -1,4 +1,4 @@
-package tk.sznp.thebuttonautoflair;
+package io.github.norbipeti.thebuttonmc;
 
 public class Channel {
 	public final String DisplayName;
diff --git a/src/tk/sznp/thebuttonautoflair/ChatProcessing.java b/src/io/github/norbipeti/thebuttonmc/ChatProcessing.java
similarity index 99%
rename from src/tk/sznp/thebuttonautoflair/ChatProcessing.java
rename to src/io/github/norbipeti/thebuttonmc/ChatProcessing.java
index 151685c..3dbc060 100644
--- a/src/tk/sznp/thebuttonautoflair/ChatProcessing.java
+++ b/src/io/github/norbipeti/thebuttonmc/ChatProcessing.java
@@ -1,4 +1,4 @@
-package tk.sznp.thebuttonautoflair;
+package io.github.norbipeti.thebuttonmc;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -218,7 +218,7 @@ public class ChatProcessing {
 								"(?i)" + Pattern.quote("@console"),
 								String.format(
 										"\",\"color\":\"%s\"},{\"text\":\"�b@console�r\",\"color\":\"blue\"},{\"text\":\"",
-										colormode)); //TODO: Add optional username option to setflair
+										colormode));
 				System.out.println("\007");
 			}
 		}
diff --git a/src/tk/sznp/thebuttonautoflair/Commands.java b/src/io/github/norbipeti/thebuttonmc/Commands.java
similarity index 99%
rename from src/tk/sznp/thebuttonautoflair/Commands.java
rename to src/io/github/norbipeti/thebuttonmc/Commands.java
index 0bd5b6b..1f90e70 100644
--- a/src/tk/sznp/thebuttonautoflair/Commands.java
+++ b/src/io/github/norbipeti/thebuttonmc/Commands.java
@@ -1,4 +1,4 @@
-package tk.sznp.thebuttonautoflair;
+package io.github.norbipeti.thebuttonmc;
 
 import org.apache.commons.io.FileUtils;
 import org.bukkit.Bukkit;
@@ -275,7 +275,7 @@ public class Commands implements CommandExecutor {
 				return true;
 			}
 			case "tableflip": {
-				String msg = "(╯°□°）╯︵ ┻━┻";
+				String msg = "(╯°□°）╯︵ ┻�?┻";
 				if (args.length > 0) {
 					msg = args[0] + " " + msg;
 				}
@@ -283,7 +283,7 @@ public class Commands implements CommandExecutor {
 				return true;
 			}
 			case "unflip": {
-				String msg = "┬─┬ ノ( ゜-゜ノ)";
+				String msg = "┬─┬ �?�( ゜-゜�?�)";
 				if (args.length > 0) {
 					msg = args[0] + "" + msg;
 				}
diff --git a/src/tk/sznp/thebuttonautoflair/CreativeGlobalMechanic.java b/src/io/github/norbipeti/thebuttonmc/CreativeGlobalMechanic.java
similarity index 97%
rename from src/tk/sznp/thebuttonautoflair/CreativeGlobalMechanic.java
rename to src/io/github/norbipeti/thebuttonmc/CreativeGlobalMechanic.java
index 6acd52d..79158e4 100644
--- a/src/tk/sznp/thebuttonautoflair/CreativeGlobalMechanic.java
+++ b/src/io/github/norbipeti/thebuttonmc/CreativeGlobalMechanic.java
@@ -1,4 +1,4 @@
-package tk.sznp.thebuttonautoflair;
+package io.github.norbipeti.thebuttonmc;
 
 import java.util.EnumSet;
 import java.util.List;
diff --git a/src/tk/sznp/thebuttonautoflair/FlairStates.java b/src/io/github/norbipeti/thebuttonmc/FlairStates.java
similarity index 66%
rename from src/tk/sznp/thebuttonautoflair/FlairStates.java
rename to src/io/github/norbipeti/thebuttonmc/FlairStates.java
index 13668bd..70aabeb 100644
--- a/src/tk/sznp/thebuttonautoflair/FlairStates.java
+++ b/src/io/github/norbipeti/thebuttonmc/FlairStates.java
@@ -1,4 +1,4 @@
-package tk.sznp.thebuttonautoflair;
+package io.github.norbipeti.thebuttonmc;
 
 public enum FlairStates {
 	Accepted, Ignored, Recognised, Commented, NoComment
diff --git a/src/tk/sznp/thebuttonautoflair/JarUtils.java b/src/io/github/norbipeti/thebuttonmc/JarUtils.java
similarity index 98%
rename from src/tk/sznp/thebuttonautoflair/JarUtils.java
rename to src/io/github/norbipeti/thebuttonmc/JarUtils.java
index fcb69fa..342bbe9 100644
--- a/src/tk/sznp/thebuttonautoflair/JarUtils.java
+++ b/src/io/github/norbipeti/thebuttonmc/JarUtils.java
@@ -1,4 +1,4 @@
-package tk.sznp.thebuttonautoflair;
+package io.github.norbipeti.thebuttonmc;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java b/src/io/github/norbipeti/thebuttonmc/MaybeOfflinePlayer.java
similarity index 99%
rename from src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java
rename to src/io/github/norbipeti/thebuttonmc/MaybeOfflinePlayer.java
index 5d63dc9..24727ab 100644
--- a/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java
+++ b/src/io/github/norbipeti/thebuttonmc/MaybeOfflinePlayer.java
@@ -1,4 +1,4 @@
-package tk.sznp.thebuttonautoflair;
+package io.github.norbipeti.thebuttonmc;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/tk/sznp/thebuttonautoflair/PlayerJoinTimerTask.java b/src/io/github/norbipeti/thebuttonmc/PlayerJoinTimerTask.java
similarity index 80%
rename from src/tk/sznp/thebuttonautoflair/PlayerJoinTimerTask.java
rename to src/io/github/norbipeti/thebuttonmc/PlayerJoinTimerTask.java
index d23372e..6bfe602 100644
--- a/src/tk/sznp/thebuttonautoflair/PlayerJoinTimerTask.java
+++ b/src/io/github/norbipeti/thebuttonmc/PlayerJoinTimerTask.java
@@ -1,4 +1,4 @@
-package tk.sznp.thebuttonautoflair;
+package io.github.norbipeti.thebuttonmc;
 
 import java.util.TimerTask;
 
diff --git a/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/src/io/github/norbipeti/thebuttonmc/PlayerListener.java
similarity index 99%
rename from src/tk/sznp/thebuttonautoflair/PlayerListener.java
rename to src/io/github/norbipeti/thebuttonmc/PlayerListener.java
index d11d149..694a170 100644
--- a/src/tk/sznp/thebuttonautoflair/PlayerListener.java
+++ b/src/io/github/norbipeti/thebuttonmc/PlayerListener.java
@@ -1,4 +1,4 @@
-package tk.sznp.thebuttonautoflair;
+package io.github.norbipeti.thebuttonmc;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/tk/sznp/thebuttonautoflair/PluginMain.java b/src/io/github/norbipeti/thebuttonmc/PluginMain.java
similarity index 99%
rename from src/tk/sznp/thebuttonautoflair/PluginMain.java
rename to src/io/github/norbipeti/thebuttonmc/PluginMain.java
index e05e8d4..e3faf83 100644
--- a/src/tk/sznp/thebuttonautoflair/PluginMain.java
+++ b/src/io/github/norbipeti/thebuttonmc/PluginMain.java
@@ -1,4 +1,4 @@
-package tk.sznp.thebuttonautoflair;
+package io.github.norbipeti.thebuttonmc;
 
 import net.milkbowl.vault.chat.Chat;
 import net.milkbowl.vault.economy.Economy;