diff --git a/src/main/java/com/softwarerat/MLGRush/MLGRush/GameState/IngameState.java b/src/main/java/com/softwarerat/MLGRush/MLGRush/GameState/IngameState.java
index 83bcc3b..f5d0d65 100644
--- a/src/main/java/com/softwarerat/MLGRush/MLGRush/GameState/IngameState.java
+++ b/src/main/java/com/softwarerat/MLGRush/MLGRush/GameState/IngameState.java
@@ -11,7 +11,8 @@ import org.bukkit.entity.Player;
 
 import com.softwarerat.API.builder.SpigotInventory;
 import com.softwarerat.API.builder.SpigotItem;
-import com.softwarerat.API.gameState.IGameState;
+import com.softwarerat.API.data.gameState.GameStateManager;
+import com.softwarerat.API.data.gameState.IGameState;
 import com.softwarerat.MLGRush.MLGRush.MLGRush;
 import com.softwarerat.MLGRush.MLGRush.data.Scores;
 
@@ -34,7 +35,7 @@ public class IngameState implements IGameState {
     }
 
     @Override
-    public void Start() {
+    public void Start(GameStateManager manager) {
 
         Location redSpawn = getLocation("spawn.red");
         Location blueSpawn = getLocation("spawn.blue");
diff --git a/src/main/java/com/softwarerat/MLGRush/MLGRush/GameState/LobbyState.java b/src/main/java/com/softwarerat/MLGRush/MLGRush/GameState/LobbyState.java
index ef70ded..5306905 100644
--- a/src/main/java/com/softwarerat/MLGRush/MLGRush/GameState/LobbyState.java
+++ b/src/main/java/com/softwarerat/MLGRush/MLGRush/GameState/LobbyState.java
@@ -1,7 +1,8 @@
 package com.softwarerat.MLGRush.MLGRush.GameState;
 
-import com.softwarerat.API.gameState.IGameState;
-import com.softwarerat.API.world.WorldAPI;
+import com.softwarerat.API.data.gameState.GameStateManager;
+import com.softwarerat.API.data.gameState.IGameState;
+import com.softwarerat.API.data.world.WorldAPI;
 
 public class LobbyState implements IGameState {
     IngameState ingameState;
@@ -13,13 +14,13 @@ public class LobbyState implements IGameState {
     }
 
     @Override
-    public void Start() {
+    public void Start(GameStateManager manager) {
         worldAPI.loadWorld("ingame");
     }
 
     @Override
     public void Stop() {
-    
-    ingameState.Start();
+
+    ingameState.Start(null);
     }
 }
diff --git a/src/main/java/com/softwarerat/MLGRush/MLGRush/IPrefix.java b/src/main/java/com/softwarerat/MLGRush/MLGRush/IPrefix.java
index d7755e8..4bf438d 100644
--- a/src/main/java/com/softwarerat/MLGRush/MLGRush/IPrefix.java
+++ b/src/main/java/com/softwarerat/MLGRush/MLGRush/IPrefix.java
@@ -3,7 +3,7 @@ package com.softwarerat.MLGRush.MLGRush;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
-import com.softwarerat.API.prefix.PrefixAPI;
+import com.softwarerat.API.data.prefix.PrefixAPI;
 
 public class IPrefix {
     PrefixAPI prefixAPI;
diff --git a/src/main/java/com/softwarerat/MLGRush/MLGRush/MLGRush.java b/src/main/java/com/softwarerat/MLGRush/MLGRush/MLGRush.java
index 3e6cdbb..6508349 100644
--- a/src/main/java/com/softwarerat/MLGRush/MLGRush/MLGRush.java
+++ b/src/main/java/com/softwarerat/MLGRush/MLGRush/MLGRush.java
@@ -8,8 +8,8 @@ import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scoreboard.Scoreboard;
 
 import com.softwarerat.API.data.GameData;
-import com.softwarerat.API.prefix.PrefixAPI;
-import com.softwarerat.API.world.WorldAPI;
+import com.softwarerat.API.data.prefix.PrefixAPI;
+import com.softwarerat.API.data.world.WorldAPI;
 import com.softwarerat.GameAPI;
 import com.softwarerat.MLGRush.MLGRush.GameState.IngameState;
 import com.softwarerat.MLGRush.MLGRush.GameState.LobbyState;
@@ -96,6 +96,6 @@ public final class MLGRush extends JavaPlugin {
         scores = new Scores();
         ingameState = new IngameState(this,scores);
         lobbyState = new LobbyState(ingameState,new WorldAPI());
-        lobbyState.Start();
+        lobbyState.Start(null);
     }
 }
diff --git a/target/classes/com/softwarerat/MLGRush/MLGRush/GameState/IngameState.class b/target/classes/com/softwarerat/MLGRush/MLGRush/GameState/IngameState.class
index 6447e38..bc4bde9 100644
Binary files a/target/classes/com/softwarerat/MLGRush/MLGRush/GameState/IngameState.class and b/target/classes/com/softwarerat/MLGRush/MLGRush/GameState/IngameState.class differ
diff --git a/target/classes/com/softwarerat/MLGRush/MLGRush/GameState/LobbyState.class b/target/classes/com/softwarerat/MLGRush/MLGRush/GameState/LobbyState.class
index 8d1f47a..9d1c5fc 100644
Binary files a/target/classes/com/softwarerat/MLGRush/MLGRush/GameState/LobbyState.class and b/target/classes/com/softwarerat/MLGRush/MLGRush/GameState/LobbyState.class differ
diff --git a/target/classes/com/softwarerat/MLGRush/MLGRush/IPrefix.class b/target/classes/com/softwarerat/MLGRush/MLGRush/IPrefix.class
index 9af5bc6..141c609 100644
Binary files a/target/classes/com/softwarerat/MLGRush/MLGRush/IPrefix.class and b/target/classes/com/softwarerat/MLGRush/MLGRush/IPrefix.class differ
diff --git a/target/classes/com/softwarerat/MLGRush/MLGRush/MLGRush.class b/target/classes/com/softwarerat/MLGRush/MLGRush/MLGRush.class
index ccdb268..270f530 100644
Binary files a/target/classes/com/softwarerat/MLGRush/MLGRush/MLGRush.class and b/target/classes/com/softwarerat/MLGRush/MLGRush/MLGRush.class differ
diff --git a/target/classes/com/softwarerat/MLGRush/MLGRush/data/Scores.class b/target/classes/com/softwarerat/MLGRush/MLGRush/data/Scores.class
index 996af88..2560690 100644
Binary files a/target/classes/com/softwarerat/MLGRush/MLGRush/data/Scores.class and b/target/classes/com/softwarerat/MLGRush/MLGRush/data/Scores.class differ
diff --git a/target/classes/com/softwarerat/MLGRush/MLGRush/data/Yaml.class b/target/classes/com/softwarerat/MLGRush/MLGRush/data/Yaml.class
index cc6b023..acedd45 100644
Binary files a/target/classes/com/softwarerat/MLGRush/MLGRush/data/Yaml.class and b/target/classes/com/softwarerat/MLGRush/MLGRush/data/Yaml.class differ
diff --git a/target/classes/com/softwarerat/MLGRush/MLGRush/listener/BlockBreakListener.class b/target/classes/com/softwarerat/MLGRush/MLGRush/listener/BlockBreakListener.class
index 802cd6b..417787a 100644
Binary files a/target/classes/com/softwarerat/MLGRush/MLGRush/listener/BlockBreakListener.class and b/target/classes/com/softwarerat/MLGRush/MLGRush/listener/BlockBreakListener.class differ
diff --git a/target/classes/com/softwarerat/MLGRush/MLGRush/listener/JoinListener.class b/target/classes/com/softwarerat/MLGRush/MLGRush/listener/JoinListener.class
index b092f42..33fef8d 100644
Binary files a/target/classes/com/softwarerat/MLGRush/MLGRush/listener/JoinListener.class and b/target/classes/com/softwarerat/MLGRush/MLGRush/listener/JoinListener.class differ
diff --git a/target/classes/com/softwarerat/MLGRush/MLGRush/listener/OutOfAreaListener.class b/target/classes/com/softwarerat/MLGRush/MLGRush/listener/OutOfAreaListener.class
index 153362d..f74cfe0 100644
Binary files a/target/classes/com/softwarerat/MLGRush/MLGRush/listener/OutOfAreaListener.class and b/target/classes/com/softwarerat/MLGRush/MLGRush/listener/OutOfAreaListener.class differ
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
deleted file mode 100644
index 99dcbc9..0000000
--- a/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-artifactId=mlgrush
-groupId=com.softwarerat
-version=1.0.24-SNAPSHOT
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index e69de29..3187d8d 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,9 @@
+com\softwarerat\MLGRush\MLGRush\IPrefix.class
+com\softwarerat\MLGRush\MLGRush\MLGRush.class
+com\softwarerat\MLGRush\MLGRush\listener\JoinListener.class
+com\softwarerat\MLGRush\MLGRush\GameState\LobbyState.class
+com\softwarerat\MLGRush\MLGRush\listener\BlockBreakListener.class
+com\softwarerat\MLGRush\MLGRush\data\Yaml.class
+com\softwarerat\MLGRush\MLGRush\listener\OutOfAreaListener.class
+com\softwarerat\MLGRush\MLGRush\data\Scores.class
+com\softwarerat\MLGRush\MLGRush\GameState\IngameState.class
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
deleted file mode 100644
index e69de29..0000000
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index e69de29..0000000
diff --git a/target/mlgrush-1.0.24-SNAPSHOT.jar b/target/mlgrush-1.0.24-SNAPSHOT.jar
deleted file mode 100644
index 949aa9f..0000000
Binary files a/target/mlgrush-1.0.24-SNAPSHOT.jar and /dev/null differ
diff --git a/target/original-mlgrush-1.0.24-SNAPSHOT.jar b/target/original-mlgrush-1.0.24-SNAPSHOT.jar
deleted file mode 100644
index 85c4f20..0000000
Binary files a/target/original-mlgrush-1.0.24-SNAPSHOT.jar and /dev/null differ