diff --git a/src/alisolarflare/components/alilinks/AliLinkAPI.java b/src/alisolarflare/components/alilinks/AliLinkAPI.java
index d5a990a..b4d9ea2 100644
--- a/src/alisolarflare/components/alilinks/AliLinkAPI.java
+++ b/src/alisolarflare/components/alilinks/AliLinkAPI.java
@@ -60,7 +60,7 @@ public class AliLinkAPI {
 		linkList.add(link);
 		return true;
 	}
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "unused" })
 	private List<Link> MapToLinkList(List<Map<?, ?>> mapList, Server server) {
 		List<Link> linkList = new ArrayList<Link>();
 		for (Map<?, ?> MapWithLinkData : mapList){
diff --git a/src/alisolarflare/components/gpowers/GPowerAPI.java b/src/alisolarflare/components/gpowers/api/GPowerAPI.java
similarity index 95%
rename from src/alisolarflare/components/gpowers/GPowerAPI.java
rename to src/alisolarflare/components/gpowers/api/GPowerAPI.java
index aa8bef0..f4c242e 100644
--- a/src/alisolarflare/components/gpowers/GPowerAPI.java
+++ b/src/alisolarflare/components/gpowers/api/GPowerAPI.java
@@ -1,4 +1,4 @@
-package alisolarflare.components.gpowers;
+package alisolarflare.components.gpowers.api;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,6 +9,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
+import alisolarflare.components.gpowers.PoweredPlayer;
+
 public class GPowerAPI{
 	public static final int defaultPowerLength = 300;
 	public static Map<UUID, PoweredPlayer> poweredPlayerList = new HashMap<UUID, PoweredPlayer>();
diff --git a/src/alisolarflare/components/gpowers/commands/GPower.java b/src/alisolarflare/components/gpowers/commands/GPower.java
index 3632f44..2b7c31f 100644
--- a/src/alisolarflare/components/gpowers/commands/GPower.java
+++ b/src/alisolarflare/components/gpowers/commands/GPower.java
@@ -3,7 +3,7 @@ package alisolarflare.components.gpowers.commands;
 import org.bukkit.entity.Player;
 
 import alisolarflare.architecture.commands.PlayerCommand;
-import alisolarflare.components.gpowers.GPowerAPI;
+import alisolarflare.components.gpowers.api.GPowerAPI;
 
 public class GPower extends PlayerCommand {
 	@Override
diff --git a/src/alisolarflare/components/gpowers/enchant/EnchantingLoop.java b/src/alisolarflare/components/gpowers/enchant/EnchantingLoop.java
index 098d13b..98d55c6 100644
--- a/src/alisolarflare/components/gpowers/enchant/EnchantingLoop.java
+++ b/src/alisolarflare/components/gpowers/enchant/EnchantingLoop.java
@@ -6,7 +6,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import alisolarflare.components.gpowers.GPowerAPI;
+import alisolarflare.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/alisolarflare/components/gpowers/powerstate/PowerAll.java
index 6fc8305..4873422 100644
--- a/src/alisolarflare/components/gpowers/powerstate/PowerAll.java
+++ b/src/alisolarflare/components/gpowers/powerstate/PowerAll.java
@@ -3,7 +3,7 @@ package alisolarflare.components.gpowers.powerstate;
 import org.bukkit.entity.Player;
 
 import alisolarflare.architecture.commands.ModCommand;
-import alisolarflare.components.gpowers.GPowerAPI;
+import alisolarflare.components.gpowers.api.GPowerAPI;
 
 public class PowerAll extends ModCommand{
 	@Override
diff --git a/src/alisolarflare/components/gpowers/powerstate/PowerDown.java b/src/alisolarflare/components/gpowers/powerstate/PowerDown.java
index 6badc03..a2ab7b9 100644
--- a/src/alisolarflare/components/gpowers/powerstate/PowerDown.java
+++ b/src/alisolarflare/components/gpowers/powerstate/PowerDown.java
@@ -3,7 +3,7 @@ package alisolarflare.components.gpowers.powerstate;
 import org.bukkit.entity.Player;
 
 import alisolarflare.architecture.commands.PlayerCommand;
-import alisolarflare.components.gpowers.GPowerAPI;
+import alisolarflare.components.gpowers.api.GPowerAPI;
 
 public class PowerDown extends PlayerCommand {
 	@Override
diff --git a/src/alisolarflare/components/gpowers/powerstate/PowerUp.java b/src/alisolarflare/components/gpowers/powerstate/PowerUp.java
index 50f89d3..6f7bc03 100644
--- a/src/alisolarflare/components/gpowers/powerstate/PowerUp.java
+++ b/src/alisolarflare/components/gpowers/powerstate/PowerUp.java
@@ -3,7 +3,7 @@ package alisolarflare.components.gpowers.powerstate;
 import org.bukkit.entity.Player;
 
 import alisolarflare.architecture.commands.PlayerCommand;
-import alisolarflare.components.gpowers.GPowerAPI;
+import alisolarflare.components.gpowers.api.GPowerAPI;
 
 public class PowerUp extends PlayerCommand {
 	@Override