diff --git a/plugin.yml b/plugin.yml
index a57eb89..34fe825 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,4 +1,4 @@
-main: alisolarflare.AliPresents
+main: buttondevteam.AliPresents
 name: AliPresents
 version: 2.0.2
 
diff --git a/src/alisolarflare/components/creativeboundaries/CreativeBoundariesComponent.java b/src/alisolarflare/components/creativeboundaries/CreativeBoundariesComponent.java
deleted file mode 100644
index 4c96ef3..0000000
--- a/src/alisolarflare/components/creativeboundaries/CreativeBoundariesComponent.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package alisolarflare.components.creativeboundaries;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import alisolarflare.architecture.Component;
-import alisolarflare.components.creativeboundaries.commands.Cbgm0;
-import alisolarflare.components.creativeboundaries.commands.Cbgm1;
-import alisolarflare.components.creativeboundaries.commands.SetForceBoundaries;
-import alisolarflare.components.creativeboundaries.listeners.PlotChangeListener;
-
-
-public class CreativeBoundariesComponent extends Component{
-	@Override
-	public void register(JavaPlugin plugin) {
-		registerCommand(plugin, new Cbgm1());
-		registerCommand(plugin, new Cbgm0());
-		registerCommand(plugin, new SetForceBoundaries());
-		registerListener(plugin, new PlotChangeListener());
-		//registerListener(plugin, new ItemRestrictionListener(this));
-	}
-	
-}
diff --git a/src/alisolarflare/components/gpowers/GPowerComponent.java b/src/alisolarflare/components/gpowers/GPowerComponent.java
deleted file mode 100644
index 64d33cc..0000000
--- a/src/alisolarflare/components/gpowers/GPowerComponent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package alisolarflare.components.gpowers;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import alisolarflare.architecture.Component;
-import alisolarflare.components.gpowers.commands.GPower;
-import alisolarflare.components.gpowers.enchant.EnchantingLoop;
-import alisolarflare.components.gpowers.powerstate.PowerDown;
-import alisolarflare.components.gpowers.powerstate.PowerUp;
-
-public class GPowerComponent extends Component {
-
-	@Override
-	public void register(JavaPlugin plugin) {
-		registerCommand(plugin, new GPower());
-		registerCommand(plugin, new PowerUp());
-		registerCommand(plugin, new PowerDown());
-
-		registerListener(plugin, new EnchantingLoop(plugin));
-
-	}
-
-}
diff --git a/src/alisolarflare/components/magic/MagicComponent.java b/src/alisolarflare/components/magic/MagicComponent.java
deleted file mode 100644
index d49f08b..0000000
--- a/src/alisolarflare/components/magic/MagicComponent.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package alisolarflare.components.magic;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import alisolarflare.architecture.Component;
-import alisolarflare.components.magic.tricks.AliArrowListener;
-import alisolarflare.components.magic.tricks.BoomBowDeathListener;
-import alisolarflare.components.magic.tricks.BoomBowListener;
-import alisolarflare.components.magic.tricks.CannonBowListener;
-
-public class MagicComponent extends Component{
-
-	@Override
-	public void register(JavaPlugin plugin) {
-		registerListener(plugin, new AliArrowListener(plugin));
-		registerListener(plugin, new BoomBowDeathListener());
-		registerListener(plugin, new BoomBowListener(plugin));
-		registerListener(plugin, new CannonBowListener(plugin));
-	}
-}
diff --git a/src/alisolarflare/AliPresents.java b/src/buttondevteam/alipresents/AliPresents.java
similarity index 55%
rename from src/alisolarflare/AliPresents.java
rename to src/buttondevteam/alipresents/AliPresents.java
index 297bbcd..a7a7820 100644
--- a/src/alisolarflare/AliPresents.java
+++ b/src/buttondevteam/alipresents/AliPresents.java
@@ -1,4 +1,4 @@
-package alisolarflare;
+package buttondevteam.alipresents;
 
 import java.util.logging.Logger;
 
@@ -6,16 +6,16 @@ import org.bukkit.plugin.PluginDescriptionFile;
 //import alisolarflare.links.AliLinkSubPlug;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.alilinks.AliLinkComponent;
-import alisolarflare.components.bankchest.BankChestComponent;
-import alisolarflare.components.cashmob.CashMobComponent;
-import alisolarflare.components.creativeboundaries.CreativeBoundariesComponent;
-import alisolarflare.components.flaircolouring.FlairColouringComponent;
-import alisolarflare.components.fruit.FruitComponent;
-import alisolarflare.components.gpowers.GPowerComponent;
-import alisolarflare.components.insurance.InsuranceComponent;
-import alisolarflare.components.magic.MagicComponent;
-import alisolarflare.components.spawn.SpawnComponent;
+import buttondevteam.alipresents.components.alilinks.AliLinkComponent;
+import buttondevteam.alipresents.components.bankchest.BankChestComponent;
+import buttondevteam.alipresents.components.cashmob.CashMobComponent;
+import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesComponent;
+import buttondevteam.alipresents.components.flaircolouring.FlairColouringComponent;
+import buttondevteam.alipresents.components.fruit.FruitComponent;
+import buttondevteam.alipresents.components.gpowers.GPowerComponent;
+import buttondevteam.alipresents.components.insurance.InsuranceComponent;
+import buttondevteam.alipresents.components.magic.MagicComponent;
+import buttondevteam.alipresents.components.spawn.SpawnComponent;
 
 public class AliPresents extends JavaPlugin{
 	public void onEnable(){
diff --git a/src/alisolarflare/architecture/Component.java b/src/buttondevteam/alipresents/architecture/Component.java
similarity index 95%
rename from src/alisolarflare/architecture/Component.java
rename to src/buttondevteam/alipresents/architecture/Component.java
index e2c4cd2..81b2f35 100644
--- a/src/alisolarflare/architecture/Component.java
+++ b/src/buttondevteam/alipresents/architecture/Component.java
@@ -1,4 +1,4 @@
-package alisolarflare.architecture;
+package buttondevteam.alipresents.architecture;
 
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.event.Listener;
diff --git a/src/alisolarflare/architecture/commands/BaseCommand.java b/src/buttondevteam/alipresents/architecture/commands/BaseCommand.java
similarity index 65%
rename from src/alisolarflare/architecture/commands/BaseCommand.java
rename to src/buttondevteam/alipresents/architecture/commands/BaseCommand.java
index bece01e..0f8e89a 100644
--- a/src/alisolarflare/architecture/commands/BaseCommand.java
+++ b/src/buttondevteam/alipresents/architecture/commands/BaseCommand.java
@@ -1,4 +1,4 @@
-package alisolarflare.architecture.commands;
+package buttondevteam.alipresents.architecture.commands;
 
 import buttondevteam.lib.chat.TBMCCommandBase;
 
diff --git a/src/alisolarflare/architecture/commands/ModCommand.java b/src/buttondevteam/alipresents/architecture/commands/ModCommand.java
similarity index 83%
rename from src/alisolarflare/architecture/commands/ModCommand.java
rename to src/buttondevteam/alipresents/architecture/commands/ModCommand.java
index 3c13446..d0e4f03 100644
--- a/src/alisolarflare/architecture/commands/ModCommand.java
+++ b/src/buttondevteam/alipresents/architecture/commands/ModCommand.java
@@ -1,4 +1,4 @@
-package alisolarflare.architecture.commands;
+package buttondevteam.alipresents.architecture.commands;
 
 public abstract class ModCommand extends PlayerCommand{
 
diff --git a/src/alisolarflare/architecture/commands/PlayerCommand.java b/src/buttondevteam/alipresents/architecture/commands/PlayerCommand.java
similarity index 93%
rename from src/alisolarflare/architecture/commands/PlayerCommand.java
rename to src/buttondevteam/alipresents/architecture/commands/PlayerCommand.java
index 8d85fbf..3812448 100644
--- a/src/alisolarflare/architecture/commands/PlayerCommand.java
+++ b/src/buttondevteam/alipresents/architecture/commands/PlayerCommand.java
@@ -1,4 +1,4 @@
-package alisolarflare.architecture.commands;
+package buttondevteam.alipresents.architecture.commands;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/src/alisolarflare/architecture/commands/subcommands/ModSubCommand.java b/src/buttondevteam/alipresents/architecture/commands/subcommands/ModSubCommand.java
similarity index 78%
rename from src/alisolarflare/architecture/commands/subcommands/ModSubCommand.java
rename to src/buttondevteam/alipresents/architecture/commands/subcommands/ModSubCommand.java
index ec3ee25..24ba0ee 100644
--- a/src/alisolarflare/architecture/commands/subcommands/ModSubCommand.java
+++ b/src/buttondevteam/alipresents/architecture/commands/subcommands/ModSubCommand.java
@@ -1,4 +1,4 @@
-package alisolarflare.architecture.commands.subcommands;
+package buttondevteam.alipresents.architecture.commands.subcommands;
 
 public abstract class ModSubCommand extends SubCommand{
 	@Override
diff --git a/src/alisolarflare/architecture/commands/subcommands/PlayerSubCommand.java b/src/buttondevteam/alipresents/architecture/commands/subcommands/PlayerSubCommand.java
similarity index 79%
rename from src/alisolarflare/architecture/commands/subcommands/PlayerSubCommand.java
rename to src/buttondevteam/alipresents/architecture/commands/subcommands/PlayerSubCommand.java
index c71665e..aa7a631 100644
--- a/src/alisolarflare/architecture/commands/subcommands/PlayerSubCommand.java
+++ b/src/buttondevteam/alipresents/architecture/commands/subcommands/PlayerSubCommand.java
@@ -1,4 +1,4 @@
-package alisolarflare.architecture.commands.subcommands;
+package buttondevteam.alipresents.architecture.commands.subcommands;
 
 public abstract class PlayerSubCommand extends SubCommand{
 	@Override
diff --git a/src/alisolarflare/architecture/commands/subcommands/SubCommand.java b/src/buttondevteam/alipresents/architecture/commands/subcommands/SubCommand.java
similarity index 80%
rename from src/alisolarflare/architecture/commands/subcommands/SubCommand.java
rename to src/buttondevteam/alipresents/architecture/commands/subcommands/SubCommand.java
index 119fb70..8a6a93d 100644
--- a/src/alisolarflare/architecture/commands/subcommands/SubCommand.java
+++ b/src/buttondevteam/alipresents/architecture/commands/subcommands/SubCommand.java
@@ -1,4 +1,4 @@
-package alisolarflare.architecture.commands.subcommands;
+package buttondevteam.alipresents.architecture.commands.subcommands;
 
 import org.bukkit.entity.Player;
 
diff --git a/src/alisolarflare/components/alilinks/AliLinkAPI.java b/src/buttondevteam/alipresents/components/alilinks/AliLinkAPI.java
similarity index 94%
rename from src/alisolarflare/components/alilinks/AliLinkAPI.java
rename to src/buttondevteam/alipresents/components/alilinks/AliLinkAPI.java
index b4d9ea2..8115268 100644
--- a/src/alisolarflare/components/alilinks/AliLinkAPI.java
+++ b/src/buttondevteam/alipresents/components/alilinks/AliLinkAPI.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.alilinks;
+package buttondevteam.alipresents.components.alilinks;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -12,7 +12,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.alilinks.entities.Link;
+import buttondevteam.alipresents.components.alilinks.entities.Link;
 
 public class AliLinkAPI {
 	private static List<Link> linkList;
diff --git a/src/alisolarflare/components/alilinks/AliLinkComponent.java b/src/buttondevteam/alipresents/components/alilinks/AliLinkComponent.java
similarity index 50%
rename from src/alisolarflare/components/alilinks/AliLinkComponent.java
rename to src/buttondevteam/alipresents/components/alilinks/AliLinkComponent.java
index 5a14d08..508e894 100644
--- a/src/alisolarflare/components/alilinks/AliLinkComponent.java
+++ b/src/buttondevteam/alipresents/components/alilinks/AliLinkComponent.java
@@ -1,9 +1,9 @@
-package alisolarflare.components.alilinks;
+package buttondevteam.alipresents.components.alilinks;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
-import alisolarflare.components.alilinks.commands.AliLink;
+import buttondevteam.alipresents.architecture.Component;
+import buttondevteam.alipresents.components.alilinks.commands.AliLink;
 
 public class AliLinkComponent extends Component {
 	@Override
diff --git a/src/alisolarflare/components/alilinks/commands/AliLink.java b/src/buttondevteam/alipresents/components/alilinks/commands/AliLink.java
similarity index 75%
rename from src/alisolarflare/components/alilinks/commands/AliLink.java
rename to src/buttondevteam/alipresents/components/alilinks/commands/AliLink.java
index 20884db..e5f9286 100644
--- a/src/alisolarflare/components/alilinks/commands/AliLink.java
+++ b/src/buttondevteam/alipresents/components/alilinks/commands/AliLink.java
@@ -1,10 +1,10 @@
-package alisolarflare.components.alilinks.commands;
+package buttondevteam.alipresents.components.alilinks.commands;
 
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.commands.PlayerCommand;
-import alisolarflare.components.alilinks.AliLinkAPI;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.components.alilinks.AliLinkAPI;
 
 public class AliLink extends PlayerCommand{
 	private JavaPlugin plugin;
diff --git a/src/alisolarflare/components/alilinks/entities/Link.java b/src/buttondevteam/alipresents/components/alilinks/entities/Link.java
similarity index 90%
rename from src/alisolarflare/components/alilinks/entities/Link.java
rename to src/buttondevteam/alipresents/components/alilinks/entities/Link.java
index 7fe08cf..2e73f13 100644
--- a/src/alisolarflare/components/alilinks/entities/Link.java
+++ b/src/buttondevteam/alipresents/components/alilinks/entities/Link.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.alilinks.entities;
+package buttondevteam.alipresents.components.alilinks.entities;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,7 +9,7 @@ import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.components.alilinks.tasks.UnpressTask;
+import buttondevteam.alipresents.components.alilinks.tasks.UnpressTask;
 
 public class Link{
 	
diff --git a/src/alisolarflare/components/alilinks/tasks/UnpressTask.java b/src/buttondevteam/alipresents/components/alilinks/tasks/UnpressTask.java
similarity index 84%
rename from src/alisolarflare/components/alilinks/tasks/UnpressTask.java
rename to src/buttondevteam/alipresents/components/alilinks/tasks/UnpressTask.java
index 38a06b0..c89c318 100644
--- a/src/alisolarflare/components/alilinks/tasks/UnpressTask.java
+++ b/src/buttondevteam/alipresents/components/alilinks/tasks/UnpressTask.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.alilinks.tasks;
+package buttondevteam.alipresents.components.alilinks.tasks;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
diff --git a/src/alisolarflare/components/bankchest/BankChestComponent.java b/src/buttondevteam/alipresents/components/bankchest/BankChestComponent.java
similarity index 69%
rename from src/alisolarflare/components/bankchest/BankChestComponent.java
rename to src/buttondevteam/alipresents/components/bankchest/BankChestComponent.java
index e331e28..a0fe761 100644
--- a/src/alisolarflare/components/bankchest/BankChestComponent.java
+++ b/src/buttondevteam/alipresents/components/bankchest/BankChestComponent.java
@@ -1,8 +1,8 @@
-package alisolarflare.components.bankchest;
+package buttondevteam.alipresents.components.bankchest;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
 
 public class BankChestComponent extends Component {
 
diff --git a/src/alisolarflare/components/bankchest/BankChestListener.java b/src/buttondevteam/alipresents/components/bankchest/BankChestListener.java
similarity index 61%
rename from src/alisolarflare/components/bankchest/BankChestListener.java
rename to src/buttondevteam/alipresents/components/bankchest/BankChestListener.java
index d413bad..b13dbba 100644
--- a/src/alisolarflare/components/bankchest/BankChestListener.java
+++ b/src/buttondevteam/alipresents/components/bankchest/BankChestListener.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.bankchest;
+package buttondevteam.alipresents.components.bankchest;
 
 import org.bukkit.event.Listener;
 
diff --git a/src/alisolarflare/components/bankchest/CreateBankChest.java b/src/buttondevteam/alipresents/components/bankchest/CreateBankChest.java
similarity index 65%
rename from src/alisolarflare/components/bankchest/CreateBankChest.java
rename to src/buttondevteam/alipresents/components/bankchest/CreateBankChest.java
index e73a27f..6af2665 100644
--- a/src/alisolarflare/components/bankchest/CreateBankChest.java
+++ b/src/buttondevteam/alipresents/components/bankchest/CreateBankChest.java
@@ -1,8 +1,8 @@
-package alisolarflare.components.bankchest;
+package buttondevteam.alipresents.components.bankchest;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
 
 public class CreateBankChest extends ModCommand {
 
diff --git a/src/alisolarflare/components/cashmob/CashMobComponent.java b/src/buttondevteam/alipresents/components/cashmob/CashMobComponent.java
similarity index 75%
rename from src/alisolarflare/components/cashmob/CashMobComponent.java
rename to src/buttondevteam/alipresents/components/cashmob/CashMobComponent.java
index dda2346..b4a427f 100644
--- a/src/alisolarflare/components/cashmob/CashMobComponent.java
+++ b/src/buttondevteam/alipresents/components/cashmob/CashMobComponent.java
@@ -1,11 +1,11 @@
-package alisolarflare.components.cashmob;
+package buttondevteam.alipresents.components.cashmob;
 
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import com.earth2me.essentials.Essentials;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
 
 public class CashMobComponent extends Component{
 
diff --git a/src/alisolarflare/components/cashmob/MobKillListener.java b/src/buttondevteam/alipresents/components/cashmob/MobKillListener.java
similarity index 94%
rename from src/alisolarflare/components/cashmob/MobKillListener.java
rename to src/buttondevteam/alipresents/components/cashmob/MobKillListener.java
index 2296a05..c1a4791 100644
--- a/src/alisolarflare/components/cashmob/MobKillListener.java
+++ b/src/buttondevteam/alipresents/components/cashmob/MobKillListener.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.cashmob;
+package buttondevteam.alipresents.components.cashmob;
 
 import java.math.BigDecimal;
 
diff --git a/src/alisolarflare/components/creativeboundaries/CreativeBoundariesAPI.java b/src/buttondevteam/alipresents/components/creativeboundaries/CreativeBoundariesAPI.java
similarity index 97%
rename from src/alisolarflare/components/creativeboundaries/CreativeBoundariesAPI.java
rename to src/buttondevteam/alipresents/components/creativeboundaries/CreativeBoundariesAPI.java
index 7658e14..4c6adea 100644
--- a/src/alisolarflare/components/creativeboundaries/CreativeBoundariesAPI.java
+++ b/src/buttondevteam/alipresents/components/creativeboundaries/CreativeBoundariesAPI.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.creativeboundaries;
+package buttondevteam.alipresents.components.creativeboundaries;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/buttondevteam/alipresents/components/creativeboundaries/CreativeBoundariesComponent.java b/src/buttondevteam/alipresents/components/creativeboundaries/CreativeBoundariesComponent.java
new file mode 100644
index 0000000..1435c91
--- /dev/null
+++ b/src/buttondevteam/alipresents/components/creativeboundaries/CreativeBoundariesComponent.java
@@ -0,0 +1,22 @@
+package buttondevteam.alipresents.components.creativeboundaries;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import buttondevteam.alipresents.architecture.Component;
+import buttondevteam.alipresents.components.creativeboundaries.commands.Cbgm0;
+import buttondevteam.alipresents.components.creativeboundaries.commands.Cbgm1;
+import buttondevteam.alipresents.components.creativeboundaries.commands.SetForceBoundaries;
+import buttondevteam.alipresents.components.creativeboundaries.listeners.PlotChangeListener;
+
+
+public class CreativeBoundariesComponent extends Component{
+	@Override
+	public void register(JavaPlugin plugin) {
+		registerCommand(plugin, new Cbgm1());
+		registerCommand(plugin, new Cbgm0());
+		registerCommand(plugin, new SetForceBoundaries());
+		registerListener(plugin, new PlotChangeListener());
+		//registerListener(plugin, new ItemRestrictionListener(this));
+	}
+	
+}
diff --git a/src/alisolarflare/components/creativeboundaries/commands/Cbgm0.java b/src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm0.java
similarity index 57%
rename from src/alisolarflare/components/creativeboundaries/commands/Cbgm0.java
rename to src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm0.java
index 106f1d6..17d6dda 100644
--- a/src/alisolarflare/components/creativeboundaries/commands/Cbgm0.java
+++ b/src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm0.java
@@ -1,9 +1,9 @@
-package alisolarflare.components.creativeboundaries.commands;
+package buttondevteam.alipresents.components.creativeboundaries.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
-import alisolarflare.components.creativeboundaries.CreativeBoundariesAPI;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesAPI;
 
 public class Cbgm0 extends PlayerCommand{
 	@Override
diff --git a/src/alisolarflare/components/creativeboundaries/commands/Cbgm1.java b/src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm1.java
similarity index 61%
rename from src/alisolarflare/components/creativeboundaries/commands/Cbgm1.java
rename to src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm1.java
index b4602ff..9266a52 100644
--- a/src/alisolarflare/components/creativeboundaries/commands/Cbgm1.java
+++ b/src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm1.java
@@ -1,9 +1,9 @@
-package alisolarflare.components.creativeboundaries.commands;
+package buttondevteam.alipresents.components.creativeboundaries.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
-import alisolarflare.components.creativeboundaries.CreativeBoundariesAPI;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesAPI;
 
 public class Cbgm1 extends PlayerCommand {
 	@Override
diff --git a/src/alisolarflare/components/creativeboundaries/commands/SetForceBoundaries.java b/src/buttondevteam/alipresents/components/creativeboundaries/commands/SetForceBoundaries.java
similarity index 60%
rename from src/alisolarflare/components/creativeboundaries/commands/SetForceBoundaries.java
rename to src/buttondevteam/alipresents/components/creativeboundaries/commands/SetForceBoundaries.java
index 55c67cf..22d2c98 100644
--- a/src/alisolarflare/components/creativeboundaries/commands/SetForceBoundaries.java
+++ b/src/buttondevteam/alipresents/components/creativeboundaries/commands/SetForceBoundaries.java
@@ -1,9 +1,9 @@
-package alisolarflare.components.creativeboundaries.commands;
+package buttondevteam.alipresents.components.creativeboundaries.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
-import alisolarflare.components.creativeboundaries.CreativeBoundariesAPI;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
+import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesAPI;
 
 public class SetForceBoundaries extends ModCommand{
 	@Override
diff --git a/src/alisolarflare/components/creativeboundaries/listeners/PlotChangeListener.java b/src/buttondevteam/alipresents/components/creativeboundaries/listeners/PlotChangeListener.java
similarity index 88%
rename from src/alisolarflare/components/creativeboundaries/listeners/PlotChangeListener.java
rename to src/buttondevteam/alipresents/components/creativeboundaries/listeners/PlotChangeListener.java
index aa575e9..2d29e5c 100644
--- a/src/alisolarflare/components/creativeboundaries/listeners/PlotChangeListener.java
+++ b/src/buttondevteam/alipresents/components/creativeboundaries/listeners/PlotChangeListener.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.creativeboundaries.listeners;
+package buttondevteam.alipresents.components.creativeboundaries.listeners;
 
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -12,7 +12,7 @@ import com.palmergames.bukkit.towny.object.Town;
 import com.palmergames.bukkit.towny.object.TownBlock;
 import com.palmergames.bukkit.towny.object.TownyUniverse;
 
-import alisolarflare.components.creativeboundaries.CreativeBoundariesAPI;
+import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesAPI;
 
 public class PlotChangeListener implements Listener{
 	@EventHandler
diff --git a/src/alisolarflare/components/flaircolouring/FlairColouringAPI.java b/src/buttondevteam/alipresents/components/flaircolouring/FlairColouringAPI.java
similarity index 97%
rename from src/alisolarflare/components/flaircolouring/FlairColouringAPI.java
rename to src/buttondevteam/alipresents/components/flaircolouring/FlairColouringAPI.java
index 293da95..91a2bba 100644
--- a/src/alisolarflare/components/flaircolouring/FlairColouringAPI.java
+++ b/src/buttondevteam/alipresents/components/flaircolouring/FlairColouringAPI.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.flaircolouring;
+package buttondevteam.alipresents.components.flaircolouring;
 
 import org.bukkit.DyeColor;
 
diff --git a/src/alisolarflare/components/flaircolouring/FlairColouringComponent.java b/src/buttondevteam/alipresents/components/flaircolouring/FlairColouringComponent.java
similarity index 60%
rename from src/alisolarflare/components/flaircolouring/FlairColouringComponent.java
rename to src/buttondevteam/alipresents/components/flaircolouring/FlairColouringComponent.java
index 10517a8..04b6575 100644
--- a/src/alisolarflare/components/flaircolouring/FlairColouringComponent.java
+++ b/src/buttondevteam/alipresents/components/flaircolouring/FlairColouringComponent.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.flaircolouring;
+package buttondevteam.alipresents.components.flaircolouring;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,14 +12,14 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import com.earth2me.essentials.Essentials;
 
-import alisolarflare.architecture.Component;
-import alisolarflare.components.flaircolouring.letterdyes.GetLetterDye;
-import alisolarflare.components.flaircolouring.letterdyes.LetterDye;
-import alisolarflare.components.flaircolouring.letterdyes.LetterDyeListener;
-import alisolarflare.components.flaircolouring.portals.FlairMe;
-import alisolarflare.components.flaircolouring.portals.PlayerProximityLoop;
-import alisolarflare.components.flaircolouring.portals.PortalListener;
-import alisolarflare.components.flaircolouring.portals.SetProximityLocation;
+import buttondevteam.alipresents.architecture.Component;
+import buttondevteam.alipresents.components.flaircolouring.letterdyes.GetLetterDye;
+import buttondevteam.alipresents.components.flaircolouring.letterdyes.LetterDye;
+import buttondevteam.alipresents.components.flaircolouring.letterdyes.LetterDyeListener;
+import buttondevteam.alipresents.components.flaircolouring.portals.FlairMe;
+import buttondevteam.alipresents.components.flaircolouring.portals.PlayerProximityLoop;
+import buttondevteam.alipresents.components.flaircolouring.portals.PortalListener;
+import buttondevteam.alipresents.components.flaircolouring.portals.SetProximityLocation;
 
 public class FlairColouringComponent extends Component {
 	public List<Player> playersToBeFlaired = new ArrayList<Player>();
diff --git a/src/alisolarflare/components/flaircolouring/letterdyes/GetLetterDye.java b/src/buttondevteam/alipresents/components/flaircolouring/letterdyes/GetLetterDye.java
similarity index 63%
rename from src/alisolarflare/components/flaircolouring/letterdyes/GetLetterDye.java
rename to src/buttondevteam/alipresents/components/flaircolouring/letterdyes/GetLetterDye.java
index aaf7e0a..efe7fa5 100644
--- a/src/alisolarflare/components/flaircolouring/letterdyes/GetLetterDye.java
+++ b/src/buttondevteam/alipresents/components/flaircolouring/letterdyes/GetLetterDye.java
@@ -1,8 +1,8 @@
-package alisolarflare.components.flaircolouring.letterdyes;
+package buttondevteam.alipresents.components.flaircolouring.letterdyes;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
 
 public class GetLetterDye extends PlayerCommand{
 	@Override
diff --git a/src/alisolarflare/components/flaircolouring/letterdyes/LetterDye.java b/src/buttondevteam/alipresents/components/flaircolouring/letterdyes/LetterDye.java
similarity index 86%
rename from src/alisolarflare/components/flaircolouring/letterdyes/LetterDye.java
rename to src/buttondevteam/alipresents/components/flaircolouring/letterdyes/LetterDye.java
index 9c9e5df..0c3cf0d 100644
--- a/src/alisolarflare/components/flaircolouring/letterdyes/LetterDye.java
+++ b/src/buttondevteam/alipresents/components/flaircolouring/letterdyes/LetterDye.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.flaircolouring.letterdyes;
+package buttondevteam.alipresents.components.flaircolouring.letterdyes;
 
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
diff --git a/src/alisolarflare/components/flaircolouring/letterdyes/LetterDyeListener.java b/src/buttondevteam/alipresents/components/flaircolouring/letterdyes/LetterDyeListener.java
similarity index 89%
rename from src/alisolarflare/components/flaircolouring/letterdyes/LetterDyeListener.java
rename to src/buttondevteam/alipresents/components/flaircolouring/letterdyes/LetterDyeListener.java
index ec16b12..0e20ba9 100644
--- a/src/alisolarflare/components/flaircolouring/letterdyes/LetterDyeListener.java
+++ b/src/buttondevteam/alipresents/components/flaircolouring/letterdyes/LetterDyeListener.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.flaircolouring.letterdyes;
+package buttondevteam.alipresents.components.flaircolouring.letterdyes;
 
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
@@ -12,7 +12,7 @@ import org.bukkit.material.Dye;
 import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.User;
 
-import alisolarflare.components.flaircolouring.FlairColouringAPI;
+import buttondevteam.alipresents.components.flaircolouring.FlairColouringAPI;
 
 public class LetterDyeListener implements Listener{
 	private Essentials essentials;
diff --git a/src/alisolarflare/components/flaircolouring/portals/FlairMe.java b/src/buttondevteam/alipresents/components/flaircolouring/portals/FlairMe.java
similarity index 72%
rename from src/alisolarflare/components/flaircolouring/portals/FlairMe.java
rename to src/buttondevteam/alipresents/components/flaircolouring/portals/FlairMe.java
index 5d428cc..6595949 100644
--- a/src/alisolarflare/components/flaircolouring/portals/FlairMe.java
+++ b/src/buttondevteam/alipresents/components/flaircolouring/portals/FlairMe.java
@@ -1,9 +1,9 @@
-package alisolarflare.components.flaircolouring.portals;
+package buttondevteam.alipresents.components.flaircolouring.portals;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
-import alisolarflare.components.flaircolouring.FlairColouringComponent;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.components.flaircolouring.FlairColouringComponent;
 
 public class FlairMe extends PlayerCommand {
 
diff --git a/src/alisolarflare/components/flaircolouring/portals/PlayerProximityLoop.java b/src/buttondevteam/alipresents/components/flaircolouring/portals/PlayerProximityLoop.java
similarity index 93%
rename from src/alisolarflare/components/flaircolouring/portals/PlayerProximityLoop.java
rename to src/buttondevteam/alipresents/components/flaircolouring/portals/PlayerProximityLoop.java
index fbbe1f8..d038db5 100644
--- a/src/alisolarflare/components/flaircolouring/portals/PlayerProximityLoop.java
+++ b/src/buttondevteam/alipresents/components/flaircolouring/portals/PlayerProximityLoop.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.flaircolouring.portals;
+package buttondevteam.alipresents.components.flaircolouring.portals;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -6,7 +6,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import alisolarflare.components.flaircolouring.FlairColouringComponent;
+import buttondevteam.alipresents.components.flaircolouring.FlairColouringComponent;
 
 public class PlayerProximityLoop extends BukkitRunnable implements Listener{
 	private static JavaPlugin plugin;
diff --git a/src/alisolarflare/components/flaircolouring/portals/PortalListener.java b/src/buttondevteam/alipresents/components/flaircolouring/portals/PortalListener.java
similarity index 87%
rename from src/alisolarflare/components/flaircolouring/portals/PortalListener.java
rename to src/buttondevteam/alipresents/components/flaircolouring/portals/PortalListener.java
index 8286e47..89151c9 100644
--- a/src/alisolarflare/components/flaircolouring/portals/PortalListener.java
+++ b/src/buttondevteam/alipresents/components/flaircolouring/portals/PortalListener.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.flaircolouring.portals;
+package buttondevteam.alipresents.components.flaircolouring.portals;
 
 import org.bukkit.Bukkit;
 import org.bukkit.DyeColor;
@@ -13,8 +13,8 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import com.earth2me.essentials.Essentials;
 
-import alisolarflare.components.flaircolouring.FlairColouringAPI;
-import alisolarflare.components.flaircolouring.FlairColouringComponent;
+import buttondevteam.alipresents.components.flaircolouring.FlairColouringAPI;
+import buttondevteam.alipresents.components.flaircolouring.FlairColouringComponent;
 
 public class PortalListener implements Listener{
 	public JavaPlugin plugin;
diff --git a/src/alisolarflare/components/flaircolouring/portals/SetProximityLocation.java b/src/buttondevteam/alipresents/components/flaircolouring/portals/SetProximityLocation.java
similarity index 87%
rename from src/alisolarflare/components/flaircolouring/portals/SetProximityLocation.java
rename to src/buttondevteam/alipresents/components/flaircolouring/portals/SetProximityLocation.java
index f60b8e9..51fb0bc 100644
--- a/src/alisolarflare/components/flaircolouring/portals/SetProximityLocation.java
+++ b/src/buttondevteam/alipresents/components/flaircolouring/portals/SetProximityLocation.java
@@ -1,8 +1,8 @@
-package alisolarflare.components.flaircolouring.portals;
+package buttondevteam.alipresents.components.flaircolouring.portals;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
 
 public class SetProximityLocation extends ModCommand{
 
diff --git a/src/alisolarflare/components/fruit/FruitComponent.java b/src/buttondevteam/alipresents/components/fruit/FruitComponent.java
similarity index 65%
rename from src/alisolarflare/components/fruit/FruitComponent.java
rename to src/buttondevteam/alipresents/components/fruit/FruitComponent.java
index c4a99ed..910f75f 100644
--- a/src/alisolarflare/components/fruit/FruitComponent.java
+++ b/src/buttondevteam/alipresents/components/fruit/FruitComponent.java
@@ -1,8 +1,8 @@
-package alisolarflare.components.fruit;
+package buttondevteam.alipresents.components.fruit;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
 
 public class FruitComponent extends Component{
 
diff --git a/src/alisolarflare/components/fruit/GrassBreakListener.java b/src/buttondevteam/alipresents/components/fruit/GrassBreakListener.java
similarity index 98%
rename from src/alisolarflare/components/fruit/GrassBreakListener.java
rename to src/buttondevteam/alipresents/components/fruit/GrassBreakListener.java
index 9bb54db..8279aa4 100644
--- a/src/alisolarflare/components/fruit/GrassBreakListener.java
+++ b/src/buttondevteam/alipresents/components/fruit/GrassBreakListener.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.fruit;
+package buttondevteam.alipresents.components.fruit;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
diff --git a/src/buttondevteam/alipresents/components/gpowers/GPowerComponent.java b/src/buttondevteam/alipresents/components/gpowers/GPowerComponent.java
new file mode 100644
index 0000000..9e9ce33
--- /dev/null
+++ b/src/buttondevteam/alipresents/components/gpowers/GPowerComponent.java
@@ -0,0 +1,23 @@
+package buttondevteam.alipresents.components.gpowers;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import buttondevteam.alipresents.architecture.Component;
+import buttondevteam.alipresents.components.gpowers.commands.GPower;
+import buttondevteam.alipresents.components.gpowers.enchant.EnchantingLoop;
+import buttondevteam.alipresents.components.gpowers.powerstate.PowerDown;
+import buttondevteam.alipresents.components.gpowers.powerstate.PowerUp;
+
+public class GPowerComponent extends Component {
+
+	@Override
+	public void register(JavaPlugin plugin) {
+		registerCommand(plugin, new GPower());
+		registerCommand(plugin, new PowerUp());
+		registerCommand(plugin, new PowerDown());
+
+		registerListener(plugin, new EnchantingLoop(plugin));
+
+	}
+
+}
diff --git a/src/alisolarflare/components/gpowers/PoweredPlayer.java b/src/buttondevteam/alipresents/components/gpowers/PoweredPlayer.java
similarity index 88%
rename from src/alisolarflare/components/gpowers/PoweredPlayer.java
rename to src/buttondevteam/alipresents/components/gpowers/PoweredPlayer.java
index 27b0116..7e33220 100644
--- a/src/alisolarflare/components/gpowers/PoweredPlayer.java
+++ b/src/buttondevteam/alipresents/components/gpowers/PoweredPlayer.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.gpowers;
+package buttondevteam.alipresents.components.gpowers;
 
 import java.util.UUID;
 
diff --git a/src/alisolarflare/components/gpowers/api/GPowerAPI.java b/src/buttondevteam/alipresents/components/gpowers/api/GPowerAPI.java
similarity index 94%
rename from src/alisolarflare/components/gpowers/api/GPowerAPI.java
rename to src/buttondevteam/alipresents/components/gpowers/api/GPowerAPI.java
index f4c242e..76ccfa9 100644
--- a/src/alisolarflare/components/gpowers/api/GPowerAPI.java
+++ b/src/buttondevteam/alipresents/components/gpowers/api/GPowerAPI.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.gpowers.api;
+package buttondevteam.alipresents.components.gpowers.api;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,7 +9,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-import alisolarflare.components.gpowers.PoweredPlayer;
+import buttondevteam.alipresents.components.gpowers.PoweredPlayer;
 
 public class GPowerAPI{
 	public static final int defaultPowerLength = 300;
diff --git a/src/alisolarflare/components/gpowers/commands/GPower.java b/src/buttondevteam/alipresents/components/gpowers/commands/GPower.java
similarity index 84%
rename from src/alisolarflare/components/gpowers/commands/GPower.java
rename to src/buttondevteam/alipresents/components/gpowers/commands/GPower.java
index 2b7c31f..8b9abac 100644
--- a/src/alisolarflare/components/gpowers/commands/GPower.java
+++ b/src/buttondevteam/alipresents/components/gpowers/commands/GPower.java
@@ -1,9 +1,9 @@
-package alisolarflare.components.gpowers.commands;
+package buttondevteam.alipresents.components.gpowers.commands;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
-import alisolarflare.components.gpowers.api.GPowerAPI;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.components.gpowers.api.GPowerAPI;
 
 public class GPower extends PlayerCommand {
 	@Override
diff --git a/src/alisolarflare/components/gpowers/enchant/EnchantingLoop.java b/src/buttondevteam/alipresents/components/gpowers/enchant/EnchantingLoop.java
similarity index 79%
rename from src/alisolarflare/components/gpowers/enchant/EnchantingLoop.java
rename to src/buttondevteam/alipresents/components/gpowers/enchant/EnchantingLoop.java
index 98d55c6..5cb224e 100644
--- a/src/alisolarflare/components/gpowers/enchant/EnchantingLoop.java
+++ b/src/buttondevteam/alipresents/components/gpowers/enchant/EnchantingLoop.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.gpowers.enchant;
+package buttondevteam.alipresents.components.gpowers.enchant;
 
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
@@ -6,7 +6,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import alisolarflare.components.gpowers.api.GPowerAPI;
+import buttondevteam.alipresents.components.gpowers.api.GPowerAPI;
 
 public class EnchantingLoop extends BukkitRunnable implements Listener{
 	private Server server;
diff --git a/src/alisolarflare/components/gpowers/powerstate/PowerAll.java b/src/buttondevteam/alipresents/components/gpowers/powerstate/PowerAll.java
similarity index 64%
rename from src/alisolarflare/components/gpowers/powerstate/PowerAll.java
rename to src/buttondevteam/alipresents/components/gpowers/powerstate/PowerAll.java
index 4873422..525a728 100644
--- a/src/alisolarflare/components/gpowers/powerstate/PowerAll.java
+++ b/src/buttondevteam/alipresents/components/gpowers/powerstate/PowerAll.java
@@ -1,9 +1,9 @@
-package alisolarflare.components.gpowers.powerstate;
+package buttondevteam.alipresents.components.gpowers.powerstate;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
-import alisolarflare.components.gpowers.api.GPowerAPI;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
+import buttondevteam.alipresents.components.gpowers.api.GPowerAPI;
 
 public class PowerAll extends ModCommand{
 	@Override
diff --git a/src/alisolarflare/components/gpowers/powerstate/PowerDown.java b/src/buttondevteam/alipresents/components/gpowers/powerstate/PowerDown.java
similarity index 61%
rename from src/alisolarflare/components/gpowers/powerstate/PowerDown.java
rename to src/buttondevteam/alipresents/components/gpowers/powerstate/PowerDown.java
index a2ab7b9..4217219 100644
--- a/src/alisolarflare/components/gpowers/powerstate/PowerDown.java
+++ b/src/buttondevteam/alipresents/components/gpowers/powerstate/PowerDown.java
@@ -1,9 +1,9 @@
-package alisolarflare.components.gpowers.powerstate;
+package buttondevteam.alipresents.components.gpowers.powerstate;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
-import alisolarflare.components.gpowers.api.GPowerAPI;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.components.gpowers.api.GPowerAPI;
 
 public class PowerDown extends PlayerCommand {
 	@Override
diff --git a/src/alisolarflare/components/gpowers/powerstate/PowerUp.java b/src/buttondevteam/alipresents/components/gpowers/powerstate/PowerUp.java
similarity index 62%
rename from src/alisolarflare/components/gpowers/powerstate/PowerUp.java
rename to src/buttondevteam/alipresents/components/gpowers/powerstate/PowerUp.java
index 6f7bc03..050f08f 100644
--- a/src/alisolarflare/components/gpowers/powerstate/PowerUp.java
+++ b/src/buttondevteam/alipresents/components/gpowers/powerstate/PowerUp.java
@@ -1,9 +1,9 @@
-package alisolarflare.components.gpowers.powerstate;
+package buttondevteam.alipresents.components.gpowers.powerstate;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.PlayerCommand;
-import alisolarflare.components.gpowers.api.GPowerAPI;
+import buttondevteam.alipresents.architecture.commands.PlayerCommand;
+import buttondevteam.alipresents.components.gpowers.api.GPowerAPI;
 
 public class PowerUp extends PlayerCommand {
 	@Override
diff --git a/src/alisolarflare/components/insurance/Insurance.java b/src/buttondevteam/alipresents/components/insurance/Insurance.java
similarity index 94%
rename from src/alisolarflare/components/insurance/Insurance.java
rename to src/buttondevteam/alipresents/components/insurance/Insurance.java
index afa8856..15a012a 100644
--- a/src/alisolarflare/components/insurance/Insurance.java
+++ b/src/buttondevteam/alipresents/components/insurance/Insurance.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.insurance;
+package buttondevteam.alipresents.components.insurance;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/alisolarflare/components/insurance/InsuranceComponent.java b/src/buttondevteam/alipresents/components/insurance/InsuranceComponent.java
similarity index 76%
rename from src/alisolarflare/components/insurance/InsuranceComponent.java
rename to src/buttondevteam/alipresents/components/insurance/InsuranceComponent.java
index 14f8d5d..1099605 100644
--- a/src/alisolarflare/components/insurance/InsuranceComponent.java
+++ b/src/buttondevteam/alipresents/components/insurance/InsuranceComponent.java
@@ -1,8 +1,8 @@
-package alisolarflare.components.insurance;
+package buttondevteam.alipresents.components.insurance;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
+import buttondevteam.alipresents.architecture.Component;
 
 public class InsuranceComponent extends Component {
 
diff --git a/src/alisolarflare/components/insurance/getInsurance.java b/src/buttondevteam/alipresents/components/insurance/getInsurance.java
similarity index 87%
rename from src/alisolarflare/components/insurance/getInsurance.java
rename to src/buttondevteam/alipresents/components/insurance/getInsurance.java
index 13bf55d..c760f5d 100644
--- a/src/alisolarflare/components/insurance/getInsurance.java
+++ b/src/buttondevteam/alipresents/components/insurance/getInsurance.java
@@ -1,10 +1,10 @@
-package alisolarflare.components.insurance;
+package buttondevteam.alipresents.components.insurance;
 
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
-import alisolarflare.components.insurance.Insurance.InsuranceType;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
+import buttondevteam.alipresents.components.insurance.Insurance.InsuranceType;
 
 public class getInsurance extends ModCommand {
 	private final int defaultAmount = 1;
diff --git a/src/alisolarflare/components/insurance/getInsuranceBar.java b/src/buttondevteam/alipresents/components/insurance/getInsuranceBar.java
similarity index 70%
rename from src/alisolarflare/components/insurance/getInsuranceBar.java
rename to src/buttondevteam/alipresents/components/insurance/getInsuranceBar.java
index 47bc004..af00805 100644
--- a/src/alisolarflare/components/insurance/getInsuranceBar.java
+++ b/src/buttondevteam/alipresents/components/insurance/getInsuranceBar.java
@@ -1,10 +1,10 @@
-package alisolarflare.components.insurance;
+package buttondevteam.alipresents.components.insurance;
 
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
-import alisolarflare.components.insurance.Insurance.InsuranceType;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
+import buttondevteam.alipresents.components.insurance.Insurance.InsuranceType;
 
 public class getInsuranceBar extends ModCommand {
 
diff --git a/src/alisolarflare/components/insurance/getInsuranceBlock.java b/src/buttondevteam/alipresents/components/insurance/getInsuranceBlock.java
similarity index 71%
rename from src/alisolarflare/components/insurance/getInsuranceBlock.java
rename to src/buttondevteam/alipresents/components/insurance/getInsuranceBlock.java
index 60c76b3..37b4173 100644
--- a/src/alisolarflare/components/insurance/getInsuranceBlock.java
+++ b/src/buttondevteam/alipresents/components/insurance/getInsuranceBlock.java
@@ -1,10 +1,10 @@
-package alisolarflare.components.insurance;
+package buttondevteam.alipresents.components.insurance;
 
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
-import alisolarflare.components.insurance.Insurance.InsuranceType;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
+import buttondevteam.alipresents.components.insurance.Insurance.InsuranceType;
 
 public class getInsuranceBlock extends ModCommand {
 
diff --git a/src/alisolarflare/components/insurance/getInsuranceNugget.java b/src/buttondevteam/alipresents/components/insurance/getInsuranceNugget.java
similarity index 71%
rename from src/alisolarflare/components/insurance/getInsuranceNugget.java
rename to src/buttondevteam/alipresents/components/insurance/getInsuranceNugget.java
index 24f1694..8363916 100644
--- a/src/alisolarflare/components/insurance/getInsuranceNugget.java
+++ b/src/buttondevteam/alipresents/components/insurance/getInsuranceNugget.java
@@ -1,10 +1,10 @@
-package alisolarflare.components.insurance;
+package buttondevteam.alipresents.components.insurance;
 
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
-import alisolarflare.components.insurance.Insurance.InsuranceType;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
+import buttondevteam.alipresents.components.insurance.Insurance.InsuranceType;
 
 public class getInsuranceNugget extends ModCommand {
 
diff --git a/src/buttondevteam/alipresents/components/magic/MagicComponent.java b/src/buttondevteam/alipresents/components/magic/MagicComponent.java
new file mode 100644
index 0000000..4dd2389
--- /dev/null
+++ b/src/buttondevteam/alipresents/components/magic/MagicComponent.java
@@ -0,0 +1,20 @@
+package buttondevteam.alipresents.components.magic;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+import buttondevteam.alipresents.architecture.Component;
+import buttondevteam.alipresents.components.magic.tricks.AliArrowListener;
+import buttondevteam.alipresents.components.magic.tricks.BoomBowDeathListener;
+import buttondevteam.alipresents.components.magic.tricks.BoomBowListener;
+import buttondevteam.alipresents.components.magic.tricks.CannonBowListener;
+
+public class MagicComponent extends Component{
+
+	@Override
+	public void register(JavaPlugin plugin) {
+		registerListener(plugin, new AliArrowListener(plugin));
+		registerListener(plugin, new BoomBowDeathListener());
+		registerListener(plugin, new BoomBowListener(plugin));
+		registerListener(plugin, new CannonBowListener(plugin));
+	}
+}
diff --git a/src/alisolarflare/components/magic/tricks/AliArrowListener.java b/src/buttondevteam/alipresents/components/magic/tricks/AliArrowListener.java
similarity index 91%
rename from src/alisolarflare/components/magic/tricks/AliArrowListener.java
rename to src/buttondevteam/alipresents/components/magic/tricks/AliArrowListener.java
index 694e8a8..1159074 100644
--- a/src/alisolarflare/components/magic/tricks/AliArrowListener.java
+++ b/src/buttondevteam/alipresents/components/magic/tricks/AliArrowListener.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.EntityType;
diff --git a/src/alisolarflare/components/magic/tricks/AliArrowTask.java b/src/buttondevteam/alipresents/components/magic/tricks/AliArrowTask.java
similarity index 90%
rename from src/alisolarflare/components/magic/tricks/AliArrowTask.java
rename to src/buttondevteam/alipresents/components/magic/tricks/AliArrowTask.java
index 6aa6665..cd4dd0b 100644
--- a/src/alisolarflare/components/magic/tricks/AliArrowTask.java
+++ b/src/buttondevteam/alipresents/components/magic/tricks/AliArrowTask.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.Particle;
 import org.bukkit.entity.Arrow;
diff --git a/src/alisolarflare/components/magic/tricks/BoomBowDeathListener.java b/src/buttondevteam/alipresents/components/magic/tricks/BoomBowDeathListener.java
similarity index 86%
rename from src/alisolarflare/components/magic/tricks/BoomBowDeathListener.java
rename to src/buttondevteam/alipresents/components/magic/tricks/BoomBowDeathListener.java
index 3d60143..6b5feba 100644
--- a/src/alisolarflare/components/magic/tricks/BoomBowDeathListener.java
+++ b/src/buttondevteam/alipresents/components/magic/tricks/BoomBowDeathListener.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
diff --git a/src/alisolarflare/components/magic/tricks/BoomBowListener.java b/src/buttondevteam/alipresents/components/magic/tricks/BoomBowListener.java
similarity index 95%
rename from src/alisolarflare/components/magic/tricks/BoomBowListener.java
rename to src/buttondevteam/alipresents/components/magic/tricks/BoomBowListener.java
index bdb5b02..40caa46 100644
--- a/src/alisolarflare/components/magic/tricks/BoomBowListener.java
+++ b/src/buttondevteam/alipresents/components/magic/tricks/BoomBowListener.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.GameMode;
 import org.bukkit.Location;
diff --git a/src/alisolarflare/components/magic/tricks/BoomBowRule.java b/src/buttondevteam/alipresents/components/magic/tricks/BoomBowRule.java
similarity index 89%
rename from src/alisolarflare/components/magic/tricks/BoomBowRule.java
rename to src/buttondevteam/alipresents/components/magic/tricks/BoomBowRule.java
index 40cac59..ee52cdf 100644
--- a/src/alisolarflare/components/magic/tricks/BoomBowRule.java
+++ b/src/buttondevteam/alipresents/components/magic/tricks/BoomBowRule.java
@@ -1,8 +1,8 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
 //HEHEHHEHEH EAASSSTER EGGS
 public class BoomBowRule extends ModCommand{
 	public static boolean boomDecay;
diff --git a/src/alisolarflare/components/magic/tricks/BoomDecayTask.java b/src/buttondevteam/alipresents/components/magic/tricks/BoomDecayTask.java
similarity index 85%
rename from src/alisolarflare/components/magic/tricks/BoomDecayTask.java
rename to src/buttondevteam/alipresents/components/magic/tricks/BoomDecayTask.java
index 15a5474..df6e085 100644
--- a/src/alisolarflare/components/magic/tricks/BoomDecayTask.java
+++ b/src/buttondevteam/alipresents/components/magic/tricks/BoomDecayTask.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
diff --git a/src/alisolarflare/components/magic/tricks/CannonBowListener.java b/src/buttondevteam/alipresents/components/magic/tricks/CannonBowListener.java
similarity index 97%
rename from src/alisolarflare/components/magic/tricks/CannonBowListener.java
rename to src/buttondevteam/alipresents/components/magic/tricks/CannonBowListener.java
index e2aaa84..83eebb2 100644
--- a/src/alisolarflare/components/magic/tricks/CannonBowListener.java
+++ b/src/buttondevteam/alipresents/components/magic/tricks/CannonBowListener.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.magic.tricks;
+package buttondevteam.alipresents.components.magic.tricks;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
diff --git a/src/alisolarflare/components/metrics/MetricsComponent.java b/src/buttondevteam/alipresents/components/metrics/MetricsComponent.java
similarity index 67%
rename from src/alisolarflare/components/metrics/MetricsComponent.java
rename to src/buttondevteam/alipresents/components/metrics/MetricsComponent.java
index 34bd000..ea57a09 100644
--- a/src/alisolarflare/components/metrics/MetricsComponent.java
+++ b/src/buttondevteam/alipresents/components/metrics/MetricsComponent.java
@@ -1,14 +1,14 @@
-package alisolarflare.components.metrics;
+package buttondevteam.alipresents.components.metrics;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
-import alisolarflare.components.metrics.collection.PlayerJoinListener;
-import alisolarflare.components.metrics.files.MetricsFile;
-import alisolarflare.components.metrics.output.GetLoginMetrics;
+import buttondevteam.alipresents.architecture.Component;
+import buttondevteam.alipresents.components.metrics.collection.PlayerJoinListener;
+import buttondevteam.alipresents.components.metrics.files.MetricsFile;
+import buttondevteam.alipresents.components.metrics.output.GetLoginMetrics;
 
 public class MetricsComponent extends Component{
 	String defaultPath = "src/alisolarflare/resources";
diff --git a/src/alisolarflare/components/metrics/collection/PlayerJoinListener.java b/src/buttondevteam/alipresents/components/metrics/collection/PlayerJoinListener.java
similarity index 76%
rename from src/alisolarflare/components/metrics/collection/PlayerJoinListener.java
rename to src/buttondevteam/alipresents/components/metrics/collection/PlayerJoinListener.java
index d997d32..fa1a9ef 100644
--- a/src/alisolarflare/components/metrics/collection/PlayerJoinListener.java
+++ b/src/buttondevteam/alipresents/components/metrics/collection/PlayerJoinListener.java
@@ -1,11 +1,11 @@
-package alisolarflare.components.metrics.collection;
+package buttondevteam.alipresents.components.metrics.collection;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-import alisolarflare.components.metrics.MetricsComponent;
-import alisolarflare.components.metrics.files.MetricsFile;
+import buttondevteam.alipresents.components.metrics.MetricsComponent;
+import buttondevteam.alipresents.components.metrics.files.MetricsFile;
 
 public class PlayerJoinListener implements Listener{
 	
diff --git a/src/alisolarflare/components/metrics/files/MetricsFile.java b/src/buttondevteam/alipresents/components/metrics/files/MetricsFile.java
similarity index 97%
rename from src/alisolarflare/components/metrics/files/MetricsFile.java
rename to src/buttondevteam/alipresents/components/metrics/files/MetricsFile.java
index baab52e..1290631 100644
--- a/src/alisolarflare/components/metrics/files/MetricsFile.java
+++ b/src/buttondevteam/alipresents/components/metrics/files/MetricsFile.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.metrics.files;
+package buttondevteam.alipresents.components.metrics.files;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/src/alisolarflare/components/metrics/output/GetLoginMetrics.java b/src/buttondevteam/alipresents/components/metrics/output/GetLoginMetrics.java
similarity index 89%
rename from src/alisolarflare/components/metrics/output/GetLoginMetrics.java
rename to src/buttondevteam/alipresents/components/metrics/output/GetLoginMetrics.java
index ce6b76e..3778d0f 100644
--- a/src/alisolarflare/components/metrics/output/GetLoginMetrics.java
+++ b/src/buttondevteam/alipresents/components/metrics/output/GetLoginMetrics.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.metrics.output;
+package buttondevteam.alipresents.components.metrics.output;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
@@ -9,8 +9,8 @@ import java.util.List;
 
 import org.bukkit.entity.Player;
 
-import alisolarflare.architecture.commands.ModCommand;
-import alisolarflare.components.metrics.MetricsComponent;
+import buttondevteam.alipresents.architecture.commands.ModCommand;
+import buttondevteam.alipresents.components.metrics.MetricsComponent;
 import buttondevteam.lib.TBMCCoreAPI;
 
 public class GetLoginMetrics extends ModCommand{
diff --git a/src/alisolarflare/components/spawn/SpawnComponent.java b/src/buttondevteam/alipresents/components/spawn/SpawnComponent.java
similarity index 53%
rename from src/alisolarflare/components/spawn/SpawnComponent.java
rename to src/buttondevteam/alipresents/components/spawn/SpawnComponent.java
index 60bd317..189d844 100644
--- a/src/alisolarflare/components/spawn/SpawnComponent.java
+++ b/src/buttondevteam/alipresents/components/spawn/SpawnComponent.java
@@ -1,9 +1,9 @@
-package alisolarflare.components.spawn;
+package buttondevteam.alipresents.components.spawn;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
-import alisolarflare.components.spawn.cows.CowSpawnLoop;
+import buttondevteam.alipresents.architecture.Component;
+import buttondevteam.alipresents.components.spawn.cows.CowSpawnLoop;
 
 public class SpawnComponent extends Component {
 
diff --git a/src/alisolarflare/components/spawn/cows/CowSpawnLoop.java b/src/buttondevteam/alipresents/components/spawn/cows/CowSpawnLoop.java
similarity index 96%
rename from src/alisolarflare/components/spawn/cows/CowSpawnLoop.java
rename to src/buttondevteam/alipresents/components/spawn/cows/CowSpawnLoop.java
index b7ded14..24ee650 100644
--- a/src/alisolarflare/components/spawn/cows/CowSpawnLoop.java
+++ b/src/buttondevteam/alipresents/components/spawn/cows/CowSpawnLoop.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.spawn.cows;
+package buttondevteam.alipresents.components.spawn.cows;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
diff --git a/src/graveyard/autouhc/UHCModule.java b/src/buttondevteam/alipresents/graveyard/autouhc/UHCModule.java
similarity index 91%
rename from src/graveyard/autouhc/UHCModule.java
rename to src/buttondevteam/alipresents/graveyard/autouhc/UHCModule.java
index b33ce22..2603269 100644
--- a/src/graveyard/autouhc/UHCModule.java
+++ b/src/buttondevteam/alipresents/graveyard/autouhc/UHCModule.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc;
 //package graveyard.autouhc;
 //import org.bukkit.plugin.java.JavaPlugin;
 //
diff --git a/src/graveyard/autouhc/controller/SetMatchState.java b/src/buttondevteam/alipresents/graveyard/autouhc/controller/SetMatchState.java
similarity index 96%
rename from src/graveyard/autouhc/controller/SetMatchState.java
rename to src/buttondevteam/alipresents/graveyard/autouhc/controller/SetMatchState.java
index 0f858f8..02f92e7 100644
--- a/src/graveyard/autouhc/controller/SetMatchState.java
+++ b/src/buttondevteam/alipresents/graveyard/autouhc/controller/SetMatchState.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.controller;
 //package graveyard.autouhc.controller;
 //
 //import org.bukkit.command.CommandSender;
diff --git a/src/graveyard/autouhc/idle/AddToUHC.java b/src/buttondevteam/alipresents/graveyard/autouhc/idle/AddToUHC.java
similarity index 93%
rename from src/graveyard/autouhc/idle/AddToUHC.java
rename to src/buttondevteam/alipresents/graveyard/autouhc/idle/AddToUHC.java
index 9c4de01..4bfb2a5 100644
--- a/src/graveyard/autouhc/idle/AddToUHC.java
+++ b/src/buttondevteam/alipresents/graveyard/autouhc/idle/AddToUHC.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.idle;
 //package graveyard.autouhc.idle;
 //
 //import org.bukkit.command.CommandSender;
diff --git a/src/graveyard/autouhc/idle/JoinUHC.java b/src/buttondevteam/alipresents/graveyard/autouhc/idle/JoinUHC.java
similarity index 92%
rename from src/graveyard/autouhc/idle/JoinUHC.java
rename to src/buttondevteam/alipresents/graveyard/autouhc/idle/JoinUHC.java
index 1236cd9..70e5206 100644
--- a/src/graveyard/autouhc/idle/JoinUHC.java
+++ b/src/buttondevteam/alipresents/graveyard/autouhc/idle/JoinUHC.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.idle;
 //package graveyard.autouhc.idle;
 //
 //import org.bukkit.command.CommandSender;
diff --git a/src/graveyard/autouhc/intro/ConfigureMatch.java b/src/buttondevteam/alipresents/graveyard/autouhc/intro/ConfigureMatch.java
similarity index 86%
rename from src/graveyard/autouhc/intro/ConfigureMatch.java
rename to src/buttondevteam/alipresents/graveyard/autouhc/intro/ConfigureMatch.java
index be784c8..467fef1 100644
--- a/src/graveyard/autouhc/intro/ConfigureMatch.java
+++ b/src/buttondevteam/alipresents/graveyard/autouhc/intro/ConfigureMatch.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.intro;
 //package graveyard.autouhc.intro;
 //
 //import org.bukkit.command.CommandSender;
diff --git a/src/graveyard/autouhc/intro/IntroductionCutscene.java b/src/buttondevteam/alipresents/graveyard/autouhc/intro/IntroductionCutscene.java
similarity index 70%
rename from src/graveyard/autouhc/intro/IntroductionCutscene.java
rename to src/buttondevteam/alipresents/graveyard/autouhc/intro/IntroductionCutscene.java
index 376c3d5..459a665 100644
--- a/src/graveyard/autouhc/intro/IntroductionCutscene.java
+++ b/src/buttondevteam/alipresents/graveyard/autouhc/intro/IntroductionCutscene.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.intro;
 //package graveyard.autouhc.intro;
 ///**@deprecated*/
 //public class IntroductionCutscene {
diff --git a/src/graveyard/autouhc/intro/ScheduleMatch.java b/src/buttondevteam/alipresents/graveyard/autouhc/intro/ScheduleMatch.java
similarity index 86%
rename from src/graveyard/autouhc/intro/ScheduleMatch.java
rename to src/buttondevteam/alipresents/graveyard/autouhc/intro/ScheduleMatch.java
index b887e1c..3c17e5a 100644
--- a/src/graveyard/autouhc/intro/ScheduleMatch.java
+++ b/src/buttondevteam/alipresents/graveyard/autouhc/intro/ScheduleMatch.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.intro;
 //package graveyard.autouhc.intro;
 //
 //import org.bukkit.command.CommandSender;
diff --git a/src/graveyard/autouhc/intro/StartMatch.java b/src/buttondevteam/alipresents/graveyard/autouhc/intro/StartMatch.java
similarity index 92%
rename from src/graveyard/autouhc/intro/StartMatch.java
rename to src/buttondevteam/alipresents/graveyard/autouhc/intro/StartMatch.java
index 5ba3fae..dc8911f 100644
--- a/src/graveyard/autouhc/intro/StartMatch.java
+++ b/src/buttondevteam/alipresents/graveyard/autouhc/intro/StartMatch.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.intro;
 //package graveyard.autouhc.intro;
 //
 //import org.bukkit.command.CommandSender;
diff --git a/src/graveyard/autouhc/listeners/MatchCyclingListener.java b/src/buttondevteam/alipresents/graveyard/autouhc/listeners/MatchCyclingListener.java
similarity index 87%
rename from src/graveyard/autouhc/listeners/MatchCyclingListener.java
rename to src/buttondevteam/alipresents/graveyard/autouhc/listeners/MatchCyclingListener.java
index 5ee5bfc..f5d74c4 100644
--- a/src/graveyard/autouhc/listeners/MatchCyclingListener.java
+++ b/src/buttondevteam/alipresents/graveyard/autouhc/listeners/MatchCyclingListener.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.listeners;
 //package graveyard.autouhc.listeners;
 //
 //import org.bukkit.event.Listener;
diff --git a/src/graveyard/autouhc/listeners/MatchMainLoop.java b/src/buttondevteam/alipresents/graveyard/autouhc/listeners/MatchMainLoop.java
similarity index 73%
rename from src/graveyard/autouhc/listeners/MatchMainLoop.java
rename to src/buttondevteam/alipresents/graveyard/autouhc/listeners/MatchMainLoop.java
index 6b10fb6..4f210d5 100644
--- a/src/graveyard/autouhc/listeners/MatchMainLoop.java
+++ b/src/buttondevteam/alipresents/graveyard/autouhc/listeners/MatchMainLoop.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.listeners;
 //package graveyard.autouhc.listeners;
 //
 //import org.bukkit.scheduler.BukkitRunnable;
diff --git a/src/graveyard/autouhc/memory/MatchState.java b/src/buttondevteam/alipresents/graveyard/autouhc/memory/MatchState.java
similarity index 85%
rename from src/graveyard/autouhc/memory/MatchState.java
rename to src/buttondevteam/alipresents/graveyard/autouhc/memory/MatchState.java
index f309e8b..d4f38d9 100644
--- a/src/graveyard/autouhc/memory/MatchState.java
+++ b/src/buttondevteam/alipresents/graveyard/autouhc/memory/MatchState.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.memory;
 //package graveyard.autouhc.memory;
 ///**@deprecated*/
 //public enum MatchState {
diff --git a/src/graveyard/autouhc/memory/UHCMatch.java b/src/buttondevteam/alipresents/graveyard/autouhc/memory/UHCMatch.java
similarity index 91%
rename from src/graveyard/autouhc/memory/UHCMatch.java
rename to src/buttondevteam/alipresents/graveyard/autouhc/memory/UHCMatch.java
index bf43e13..e372502 100644
--- a/src/graveyard/autouhc/memory/UHCMatch.java
+++ b/src/buttondevteam/alipresents/graveyard/autouhc/memory/UHCMatch.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.autouhc.memory;
 //package graveyard.autouhc.memory;
 //
 //import java.util.ArrayList;
diff --git a/src/graveyard/minigames/GameState.java b/src/buttondevteam/alipresents/graveyard/minigames/GameState.java
similarity index 57%
rename from src/graveyard/minigames/GameState.java
rename to src/buttondevteam/alipresents/graveyard/minigames/GameState.java
index 36ad955..a01eafe 100644
--- a/src/graveyard/minigames/GameState.java
+++ b/src/buttondevteam/alipresents/graveyard/minigames/GameState.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames;
 /*package graveyard.minigames;
 
 public enum GameState {
diff --git a/src/graveyard/minigames/MinigameComponent.java b/src/buttondevteam/alipresents/graveyard/minigames/MinigameComponent.java
similarity index 91%
rename from src/graveyard/minigames/MinigameComponent.java
rename to src/buttondevteam/alipresents/graveyard/minigames/MinigameComponent.java
index 29f375d..b056353 100644
--- a/src/graveyard/minigames/MinigameComponent.java
+++ b/src/buttondevteam/alipresents/graveyard/minigames/MinigameComponent.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames;
 /*package graveyard.minigames;
 
 import java.util.List;
diff --git a/src/graveyard/minigames/commands/JoinMinigame.java b/src/buttondevteam/alipresents/graveyard/minigames/commands/JoinMinigame.java
similarity index 89%
rename from src/graveyard/minigames/commands/JoinMinigame.java
rename to src/buttondevteam/alipresents/graveyard/minigames/commands/JoinMinigame.java
index f0a960b..07f024d 100644
--- a/src/graveyard/minigames/commands/JoinMinigame.java
+++ b/src/buttondevteam/alipresents/graveyard/minigames/commands/JoinMinigame.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames.commands;
 /*package graveyard.minigames.commands;
 
 import java.util.List;
diff --git a/src/graveyard/minigames/commands/LeaveMinigame.java b/src/buttondevteam/alipresents/graveyard/minigames/commands/LeaveMinigame.java
similarity index 90%
rename from src/graveyard/minigames/commands/LeaveMinigame.java
rename to src/buttondevteam/alipresents/graveyard/minigames/commands/LeaveMinigame.java
index 5a05279..e49b6fe 100644
--- a/src/graveyard/minigames/commands/LeaveMinigame.java
+++ b/src/buttondevteam/alipresents/graveyard/minigames/commands/LeaveMinigame.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames.commands;
 /*package graveyard.minigames.commands;
 
 import java.util.List;
diff --git a/src/graveyard/minigames/commands/ListFighters.java b/src/buttondevteam/alipresents/graveyard/minigames/commands/ListFighters.java
similarity index 87%
rename from src/graveyard/minigames/commands/ListFighters.java
rename to src/buttondevteam/alipresents/graveyard/minigames/commands/ListFighters.java
index 73b5d80..ddf3ede 100644
--- a/src/graveyard/minigames/commands/ListFighters.java
+++ b/src/buttondevteam/alipresents/graveyard/minigames/commands/ListFighters.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames.commands;
 /*package graveyard.minigames.commands;
 
 import org.bukkit.entity.Player;
diff --git a/src/graveyard/minigames/commands/SetColourSpawn.java b/src/buttondevteam/alipresents/graveyard/minigames/commands/SetColourSpawn.java
similarity index 92%
rename from src/graveyard/minigames/commands/SetColourSpawn.java
rename to src/buttondevteam/alipresents/graveyard/minigames/commands/SetColourSpawn.java
index 302ba1e..8863c2f 100644
--- a/src/graveyard/minigames/commands/SetColourSpawn.java
+++ b/src/buttondevteam/alipresents/graveyard/minigames/commands/SetColourSpawn.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames.commands;
 /*package graveyard.minigames.commands;
 
 import org.bukkit.entity.Player;
diff --git a/src/graveyard/minigames/data/SpawnSet.java b/src/buttondevteam/alipresents/graveyard/minigames/data/SpawnSet.java
similarity index 76%
rename from src/graveyard/minigames/data/SpawnSet.java
rename to src/buttondevteam/alipresents/graveyard/minigames/data/SpawnSet.java
index 1878177..180e3f0 100644
--- a/src/graveyard/minigames/data/SpawnSet.java
+++ b/src/buttondevteam/alipresents/graveyard/minigames/data/SpawnSet.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.minigames.data;
 /*package graveyard.minigames.data;
 
 import org.bukkit.Location;
diff --git a/src/graveyard/shulker/AliShulkerModule.java b/src/buttondevteam/alipresents/graveyard/shulker/AliShulkerModule.java
similarity index 52%
rename from src/graveyard/shulker/AliShulkerModule.java
rename to src/buttondevteam/alipresents/graveyard/shulker/AliShulkerModule.java
index 8ffde1e..83b006a 100644
--- a/src/graveyard/shulker/AliShulkerModule.java
+++ b/src/buttondevteam/alipresents/graveyard/shulker/AliShulkerModule.java
@@ -1,9 +1,9 @@
-package graveyard.shulker;
+package buttondevteam.alipresents.graveyard.shulker;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
-import alisolarflare.architecture.Component;
-import graveyard.shulker.commands.AliShulker;
+import buttondevteam.alipresents.architecture.Component;
+import buttondevteam.alipresents.graveyard.shulker.commands.AliShulker;
 
 /**@deprecated*/
 public class AliShulkerModule extends Component {
diff --git a/src/graveyard/shulker/SetFlairDoorColour.java b/src/buttondevteam/alipresents/graveyard/shulker/SetFlairDoorColour.java
similarity index 94%
rename from src/graveyard/shulker/SetFlairDoorColour.java
rename to src/buttondevteam/alipresents/graveyard/shulker/SetFlairDoorColour.java
index 83eceff..24a28b5 100644
--- a/src/graveyard/shulker/SetFlairDoorColour.java
+++ b/src/buttondevteam/alipresents/graveyard/shulker/SetFlairDoorColour.java
@@ -1,4 +1,4 @@
-package graveyard.shulker;
+package buttondevteam.alipresents.graveyard.shulker;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/graveyard/shulker/commands/AliShulker.java b/src/buttondevteam/alipresents/graveyard/shulker/commands/AliShulker.java
similarity index 93%
rename from src/graveyard/shulker/commands/AliShulker.java
rename to src/buttondevteam/alipresents/graveyard/shulker/commands/AliShulker.java
index abf44f3..c42d3e4 100644
--- a/src/graveyard/shulker/commands/AliShulker.java
+++ b/src/buttondevteam/alipresents/graveyard/shulker/commands/AliShulker.java
@@ -1,4 +1,4 @@
-package graveyard.shulker.commands;
+package buttondevteam.alipresents.graveyard.shulker.commands;
 
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
diff --git a/src/graveyard/thebuttonrebirth/ButtonRebirthPlugin.java b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/ButtonRebirthPlugin.java
similarity index 94%
rename from src/graveyard/thebuttonrebirth/ButtonRebirthPlugin.java
rename to src/buttondevteam/alipresents/graveyard/thebuttonrebirth/ButtonRebirthPlugin.java
index 35c07e6..a129c1e 100644
--- a/src/graveyard/thebuttonrebirth/ButtonRebirthPlugin.java
+++ b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/ButtonRebirthPlugin.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth;
 /*package graveyard.thebuttonrebirth;
 
 import java.util.ArrayList;
diff --git a/src/graveyard/thebuttonrebirth/admin/CreateShrine.java b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/admin/CreateShrine.java
similarity index 95%
rename from src/graveyard/thebuttonrebirth/admin/CreateShrine.java
rename to src/buttondevteam/alipresents/graveyard/thebuttonrebirth/admin/CreateShrine.java
index 7df84c0..1444219 100644
--- a/src/graveyard/thebuttonrebirth/admin/CreateShrine.java
+++ b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/admin/CreateShrine.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.admin;
 /*package graveyard.thebuttonrebirth.admin;
 
 import org.bukkit.Material;
diff --git a/src/graveyard/thebuttonrebirth/commands/ShowBars.java b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/commands/ShowBars.java
similarity index 87%
rename from src/graveyard/thebuttonrebirth/commands/ShowBars.java
rename to src/buttondevteam/alipresents/graveyard/thebuttonrebirth/commands/ShowBars.java
index fd52cb7..8d47c51 100644
--- a/src/graveyard/thebuttonrebirth/commands/ShowBars.java
+++ b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/commands/ShowBars.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.commands;
 /*package graveyard.thebuttonrebirth.commands;
 
 import org.bukkit.command.Command;
diff --git a/src/graveyard/thebuttonrebirth/listeners/CyclicalDisplayListener.java b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/listeners/CyclicalDisplayListener.java
similarity index 87%
rename from src/graveyard/thebuttonrebirth/listeners/CyclicalDisplayListener.java
rename to src/buttondevteam/alipresents/graveyard/thebuttonrebirth/listeners/CyclicalDisplayListener.java
index 11f1355..f3acc5c 100644
--- a/src/graveyard/thebuttonrebirth/listeners/CyclicalDisplayListener.java
+++ b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/listeners/CyclicalDisplayListener.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.listeners;
 /*package graveyard.thebuttonrebirth.listeners;
 
 import org.bukkit.event.Listener;
diff --git a/src/graveyard/thebuttonrebirth/listeners/MidnightListener.java b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/listeners/MidnightListener.java
similarity index 85%
rename from src/graveyard/thebuttonrebirth/listeners/MidnightListener.java
rename to src/buttondevteam/alipresents/graveyard/thebuttonrebirth/listeners/MidnightListener.java
index d8cfa04..64e1a88 100644
--- a/src/graveyard/thebuttonrebirth/listeners/MidnightListener.java
+++ b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/listeners/MidnightListener.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.listeners;
 /*package graveyard.thebuttonrebirth.listeners;
 
 import org.bukkit.event.Listener;
diff --git a/src/graveyard/thebuttonrebirth/listeners/StealChestListener.java b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/listeners/StealChestListener.java
similarity index 85%
rename from src/graveyard/thebuttonrebirth/listeners/StealChestListener.java
rename to src/buttondevteam/alipresents/graveyard/thebuttonrebirth/listeners/StealChestListener.java
index 1c6bd4d..a3ff35f 100644
--- a/src/graveyard/thebuttonrebirth/listeners/StealChestListener.java
+++ b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/listeners/StealChestListener.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.listeners;
 /*package graveyard.thebuttonrebirth.listeners;
 
 import org.bukkit.event.Listener;
diff --git a/src/graveyard/thebuttonrebirth/tasks/CheckChestTask.java b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/tasks/CheckChestTask.java
similarity index 96%
rename from src/graveyard/thebuttonrebirth/tasks/CheckChestTask.java
rename to src/buttondevteam/alipresents/graveyard/thebuttonrebirth/tasks/CheckChestTask.java
index 71b653c..1b905aa 100644
--- a/src/graveyard/thebuttonrebirth/tasks/CheckChestTask.java
+++ b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/tasks/CheckChestTask.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.tasks;
 //package graveyard.thebuttonrebirth.tasks;
 //
 //import java.time.Clock;
diff --git a/src/graveyard/thebuttonrebirth/tasks/CyclicalDisplayTask.java b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/tasks/CyclicalDisplayTask.java
similarity index 95%
rename from src/graveyard/thebuttonrebirth/tasks/CyclicalDisplayTask.java
rename to src/buttondevteam/alipresents/graveyard/thebuttonrebirth/tasks/CyclicalDisplayTask.java
index 4c80a6f..68d039a 100644
--- a/src/graveyard/thebuttonrebirth/tasks/CyclicalDisplayTask.java
+++ b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/tasks/CyclicalDisplayTask.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.tasks;
 /*package graveyard.thebuttonrebirth.tasks;
 
 import java.time.Clock;
diff --git a/src/graveyard/thebuttonrebirth/tasks/StealChestTask.java b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/tasks/StealChestTask.java
similarity index 96%
rename from src/graveyard/thebuttonrebirth/tasks/StealChestTask.java
rename to src/buttondevteam/alipresents/graveyard/thebuttonrebirth/tasks/StealChestTask.java
index ef1079e..e1f7990 100644
--- a/src/graveyard/thebuttonrebirth/tasks/StealChestTask.java
+++ b/src/buttondevteam/alipresents/graveyard/thebuttonrebirth/tasks/StealChestTask.java
@@ -1,3 +1,4 @@
+package buttondevteam.alipresents.graveyard.thebuttonrebirth.tasks;
 /*package graveyard.thebuttonrebirth.tasks;
 
 import java.time.Clock;
diff --git a/src/alisolarflare/resources/metrics.txt b/src/buttondevteam/alipresents/resources/metrics.txt
similarity index 100%
rename from src/alisolarflare/resources/metrics.txt
rename to src/buttondevteam/alipresents/resources/metrics.txt
diff --git a/src/alisolarflare/resources/playerLogins.txt b/src/buttondevteam/alipresents/resources/playerLogins.txt
similarity index 100%
rename from src/alisolarflare/resources/playerLogins.txt
rename to src/buttondevteam/alipresents/resources/playerLogins.txt