diff --git a/plugin.yml b/plugin.yml
index 2bf7be2..8765a40 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -30,7 +30,7 @@ commands:
   setcolourspawn:
     description: sets the spawn points for each colour in a button minigame
   setmatchstate:
-  	description: sets the current state of the ultrahardcore game.
+    description: sets the current state of the ultrahardcore game.
   addtouhc:
     description: Adds a player to the UltraHardcore match
   joinuhc:
diff --git a/src/alisolarflare/easyuhc/commands/SetupWorldBorders.java b/src/alisolarflare/easyuhc/commands/SetWorldBorders.java
similarity index 100%
rename from src/alisolarflare/easyuhc/commands/SetupWorldBorders.java
rename to src/alisolarflare/easyuhc/commands/SetWorldBorders.java
diff --git a/src/alisolarflare/components/gpowers/GPowerMemory.java b/src/alisolarflare/easyuhc/gpowers/GPowerMemory.java
similarity index 100%
rename from src/alisolarflare/components/gpowers/GPowerMemory.java
rename to src/alisolarflare/easyuhc/gpowers/GPowerMemory.java
diff --git a/src/alisolarflare/components/gpowers/GPowerModule.java b/src/alisolarflare/easyuhc/gpowers/GPowerModule.java
similarity index 100%
rename from src/alisolarflare/components/gpowers/GPowerModule.java
rename to src/alisolarflare/easyuhc/gpowers/GPowerModule.java
diff --git a/src/alisolarflare/components/gpowers/commands/GPower.java b/src/alisolarflare/easyuhc/gpowers/commands/GPower.java
similarity index 100%
rename from src/alisolarflare/components/gpowers/commands/GPower.java
rename to src/alisolarflare/easyuhc/gpowers/commands/GPower.java
diff --git a/src/alisolarflare/components/gpowers/commands/PowerDown.java b/src/alisolarflare/easyuhc/gpowers/commands/PowerDown.java
similarity index 100%
rename from src/alisolarflare/components/gpowers/commands/PowerDown.java
rename to src/alisolarflare/easyuhc/gpowers/commands/PowerDown.java
diff --git a/src/alisolarflare/components/gpowers/commands/PowerUp.java b/src/alisolarflare/easyuhc/gpowers/commands/PowerUp.java
similarity index 100%
rename from src/alisolarflare/components/gpowers/commands/PowerUp.java
rename to src/alisolarflare/easyuhc/gpowers/commands/PowerUp.java
diff --git a/src/alisolarflare/components/gpowers/listeners/gPowerApplyingTask.java b/src/alisolarflare/easyuhc/gpowers/listeners/gPowerApplyingTask.java
similarity index 100%
rename from src/alisolarflare/components/gpowers/listeners/gPowerApplyingTask.java
rename to src/alisolarflare/easyuhc/gpowers/listeners/gPowerApplyingTask.java
diff --git a/src/alisolarflare/components/gpowers/listeners/gPowerListener.java b/src/alisolarflare/easyuhc/gpowers/listeners/gPowerListener.java
similarity index 100%
rename from src/alisolarflare/components/gpowers/listeners/gPowerListener.java
rename to src/alisolarflare/easyuhc/gpowers/listeners/gPowerListener.java