diff --git a/.gitignore b/.gitignore
index c852a9f9..4f11942e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,8 @@
 *.class
 *.iml
 
-/data/rsa.pem
-/data/savedGames
+/game/data/rsa.pem
+/game/data/savedGames
 /lib/
 */target/
 */build/
diff --git a/game/build.gradle b/game/build.gradle
index a5eb72e8..491eceb4 100644
--- a/game/build.gradle
+++ b/game/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     testImplementation group: 'org.assertj', name: 'assertj-core', version: assertjVersion
 
     project(":game:plugin").subprojects { pluginProject ->
-        plugins.withId('apollo-plugin') {
+         if (pluginProject.buildFile.exists()) {
             runtimeClasspath pluginProject
         }
     }
@@ -41,4 +41,4 @@ applicationDistribution.from("$rootDir/data") {
     include '*.dat'
     include '*.xml'
     into "data/"
-}
\ No newline at end of file
+}
diff --git a/data/equipment-317.dat b/game/data/equipment-317.dat
similarity index 100%
rename from data/equipment-317.dat
rename to game/data/equipment-317.dat
diff --git a/data/equipment-377.dat b/game/data/equipment-377.dat
similarity index 100%
rename from data/equipment-377.dat
rename to game/data/equipment-377.dat
diff --git a/data/fs/.gitignore b/game/data/fs/.gitignore
similarity index 100%
rename from data/fs/.gitignore
rename to game/data/fs/.gitignore
diff --git a/data/login.xml b/game/data/login.xml
similarity index 100%
rename from data/login.xml
rename to game/data/login.xml
diff --git a/data/messages.xml b/game/data/messages.xml
similarity index 100%
rename from data/messages.xml
rename to game/data/messages.xml
diff --git a/data/net.xml b/game/data/net.xml
similarity index 100%
rename from data/net.xml
rename to game/data/net.xml
diff --git a/data/plugins/.rubocop.yml b/game/data/plugins/.rubocop.yml
similarity index 100%
rename from data/plugins/.rubocop.yml
rename to game/data/plugins/.rubocop.yml
diff --git a/data/plugins/areas/actions.rb b/game/data/plugins/areas/actions.rb
similarity index 100%
rename from data/plugins/areas/actions.rb
rename to game/data/plugins/areas/actions.rb
diff --git a/data/plugins/areas/areas.rb b/game/data/plugins/areas/areas.rb
similarity index 100%
rename from data/plugins/areas/areas.rb
rename to game/data/plugins/areas/areas.rb
diff --git a/data/plugins/areas/plugin.xml b/game/data/plugins/areas/plugin.xml
similarity index 100%
rename from data/plugins/areas/plugin.xml
rename to game/data/plugins/areas/plugin.xml
diff --git a/data/plugins/bank/bank.rb b/game/data/plugins/bank/bank.rb
similarity index 100%
rename from data/plugins/bank/bank.rb
rename to game/data/plugins/bank/bank.rb
diff --git a/data/plugins/bank/plugin.xml b/game/data/plugins/bank/plugin.xml
similarity index 100%
rename from data/plugins/bank/plugin.xml
rename to game/data/plugins/bank/plugin.xml
diff --git a/data/plugins/bootstrap.rb b/game/data/plugins/bootstrap.rb
similarity index 100%
rename from data/plugins/bootstrap.rb
rename to game/data/plugins/bootstrap.rb
diff --git a/data/plugins/chat/privacy/plugin.xml b/game/data/plugins/chat/privacy/plugin.xml
similarity index 100%
rename from data/plugins/chat/privacy/plugin.xml
rename to game/data/plugins/chat/privacy/plugin.xml
diff --git a/data/plugins/chat/privacy/privacy.rb b/game/data/plugins/chat/privacy/privacy.rb
similarity index 100%
rename from data/plugins/chat/privacy/privacy.rb
rename to game/data/plugins/chat/privacy/privacy.rb
diff --git a/data/plugins/chat/private-messaging/friend.rb b/game/data/plugins/chat/private-messaging/friend.rb
similarity index 100%
rename from data/plugins/chat/private-messaging/friend.rb
rename to game/data/plugins/chat/private-messaging/friend.rb
diff --git a/data/plugins/chat/private-messaging/ignore.rb b/game/data/plugins/chat/private-messaging/ignore.rb
similarity index 100%
rename from data/plugins/chat/private-messaging/ignore.rb
rename to game/data/plugins/chat/private-messaging/ignore.rb
diff --git a/data/plugins/chat/private-messaging/messaging.rb b/game/data/plugins/chat/private-messaging/messaging.rb
similarity index 100%
rename from data/plugins/chat/private-messaging/messaging.rb
rename to game/data/plugins/chat/private-messaging/messaging.rb
diff --git a/data/plugins/chat/private-messaging/plugin.xml b/game/data/plugins/chat/private-messaging/plugin.xml
similarity index 100%
rename from data/plugins/chat/private-messaging/plugin.xml
rename to game/data/plugins/chat/private-messaging/plugin.xml
diff --git a/data/plugins/cmd/animate/animate.rb b/game/data/plugins/cmd/animate/animate.rb
similarity index 100%
rename from data/plugins/cmd/animate/animate.rb
rename to game/data/plugins/cmd/animate/animate.rb
diff --git a/data/plugins/cmd/animate/plugin.xml b/game/data/plugins/cmd/animate/plugin.xml
similarity index 100%
rename from data/plugins/cmd/animate/plugin.xml
rename to game/data/plugins/cmd/animate/plugin.xml
diff --git a/data/plugins/cmd/bank/bank.rb b/game/data/plugins/cmd/bank/bank.rb
similarity index 100%
rename from data/plugins/cmd/bank/bank.rb
rename to game/data/plugins/cmd/bank/bank.rb
diff --git a/data/plugins/cmd/bank/plugin.xml b/game/data/plugins/cmd/bank/plugin.xml
similarity index 100%
rename from data/plugins/cmd/bank/plugin.xml
rename to game/data/plugins/cmd/bank/plugin.xml
diff --git a/data/plugins/cmd/item/item.rb b/game/data/plugins/cmd/item/item.rb
similarity index 100%
rename from data/plugins/cmd/item/item.rb
rename to game/data/plugins/cmd/item/item.rb
diff --git a/data/plugins/cmd/item/plugin.xml b/game/data/plugins/cmd/item/plugin.xml
similarity index 100%
rename from data/plugins/cmd/item/plugin.xml
rename to game/data/plugins/cmd/item/plugin.xml
diff --git a/data/plugins/cmd/lookup/lookup.rb b/game/data/plugins/cmd/lookup/lookup.rb
similarity index 100%
rename from data/plugins/cmd/lookup/lookup.rb
rename to game/data/plugins/cmd/lookup/lookup.rb
diff --git a/data/plugins/cmd/lookup/plugin.xml b/game/data/plugins/cmd/lookup/plugin.xml
similarity index 100%
rename from data/plugins/cmd/lookup/plugin.xml
rename to game/data/plugins/cmd/lookup/plugin.xml
diff --git a/data/plugins/cmd/messaging/broadcast.rb b/game/data/plugins/cmd/messaging/broadcast.rb
similarity index 100%
rename from data/plugins/cmd/messaging/broadcast.rb
rename to game/data/plugins/cmd/messaging/broadcast.rb
diff --git a/data/plugins/cmd/messaging/plugin.xml b/game/data/plugins/cmd/messaging/plugin.xml
similarity index 100%
rename from data/plugins/cmd/messaging/plugin.xml
rename to game/data/plugins/cmd/messaging/plugin.xml
diff --git a/data/plugins/cmd/npc/plugin.xml b/game/data/plugins/cmd/npc/plugin.xml
similarity index 100%
rename from data/plugins/cmd/npc/plugin.xml
rename to game/data/plugins/cmd/npc/plugin.xml
diff --git a/data/plugins/cmd/npc/spawn.rb b/game/data/plugins/cmd/npc/spawn.rb
similarity index 100%
rename from data/plugins/cmd/npc/spawn.rb
rename to game/data/plugins/cmd/npc/spawn.rb
diff --git a/data/plugins/cmd/punishment/plugin.xml b/game/data/plugins/cmd/punishment/plugin.xml
similarity index 100%
rename from data/plugins/cmd/punishment/plugin.xml
rename to game/data/plugins/cmd/punishment/plugin.xml
diff --git a/data/plugins/cmd/punishment/punish.rb b/game/data/plugins/cmd/punishment/punish.rb
similarity index 100%
rename from data/plugins/cmd/punishment/punish.rb
rename to game/data/plugins/cmd/punishment/punish.rb
diff --git a/data/plugins/cmd/skill/plugin.xml b/game/data/plugins/cmd/skill/plugin.xml
similarity index 100%
rename from data/plugins/cmd/skill/plugin.xml
rename to game/data/plugins/cmd/skill/plugin.xml
diff --git a/data/plugins/cmd/skill/skill.rb b/game/data/plugins/cmd/skill/skill.rb
similarity index 100%
rename from data/plugins/cmd/skill/skill.rb
rename to game/data/plugins/cmd/skill/skill.rb
diff --git a/data/plugins/cmd/teleport/plugin.xml b/game/data/plugins/cmd/teleport/plugin.xml
similarity index 100%
rename from data/plugins/cmd/teleport/plugin.xml
rename to game/data/plugins/cmd/teleport/plugin.xml
diff --git a/data/plugins/cmd/teleport/teleport.rb b/game/data/plugins/cmd/teleport/teleport.rb
similarity index 100%
rename from data/plugins/cmd/teleport/teleport.rb
rename to game/data/plugins/cmd/teleport/teleport.rb
diff --git a/data/plugins/combat/plugin.xml b/game/data/plugins/combat/plugin.xml
similarity index 100%
rename from data/plugins/combat/plugin.xml
rename to game/data/plugins/combat/plugin.xml
diff --git a/data/plugins/combat/wilderness.rb b/game/data/plugins/combat/wilderness.rb
similarity index 100%
rename from data/plugins/combat/wilderness.rb
rename to game/data/plugins/combat/wilderness.rb
diff --git a/data/plugins/consumables/consumable.rb b/game/data/plugins/consumables/consumable.rb
similarity index 100%
rename from data/plugins/consumables/consumable.rb
rename to game/data/plugins/consumables/consumable.rb
diff --git a/data/plugins/consumables/drink.rb b/game/data/plugins/consumables/drink.rb
similarity index 100%
rename from data/plugins/consumables/drink.rb
rename to game/data/plugins/consumables/drink.rb
diff --git a/data/plugins/consumables/food.rb b/game/data/plugins/consumables/food.rb
similarity index 100%
rename from data/plugins/consumables/food.rb
rename to game/data/plugins/consumables/food.rb
diff --git a/data/plugins/consumables/plugin.xml b/game/data/plugins/consumables/plugin.xml
similarity index 100%
rename from data/plugins/consumables/plugin.xml
rename to game/data/plugins/consumables/plugin.xml
diff --git a/data/plugins/consumables/potions.rb b/game/data/plugins/consumables/potions.rb
similarity index 100%
rename from data/plugins/consumables/potions.rb
rename to game/data/plugins/consumables/potions.rb
diff --git a/data/plugins/dialogue/dialogue.rb b/game/data/plugins/dialogue/dialogue.rb
similarity index 100%
rename from data/plugins/dialogue/dialogue.rb
rename to game/data/plugins/dialogue/dialogue.rb
diff --git a/data/plugins/dialogue/emotes.rb b/game/data/plugins/dialogue/emotes.rb
similarity index 100%
rename from data/plugins/dialogue/emotes.rb
rename to game/data/plugins/dialogue/emotes.rb
diff --git a/data/plugins/dialogue/plugin.xml b/game/data/plugins/dialogue/plugin.xml
similarity index 100%
rename from data/plugins/dialogue/plugin.xml
rename to game/data/plugins/dialogue/plugin.xml
diff --git a/data/plugins/dummy/dummy.rb b/game/data/plugins/dummy/dummy.rb
similarity index 100%
rename from data/plugins/dummy/dummy.rb
rename to game/data/plugins/dummy/dummy.rb
diff --git a/data/plugins/dummy/plugin.xml b/game/data/plugins/dummy/plugin.xml
similarity index 100%
rename from data/plugins/dummy/plugin.xml
rename to game/data/plugins/dummy/plugin.xml
diff --git a/data/plugins/emote-tab/emote_tab.rb b/game/data/plugins/emote-tab/emote_tab.rb
similarity index 100%
rename from data/plugins/emote-tab/emote_tab.rb
rename to game/data/plugins/emote-tab/emote_tab.rb
diff --git a/data/plugins/emote-tab/plugin.xml b/game/data/plugins/emote-tab/plugin.xml
similarity index 100%
rename from data/plugins/emote-tab/plugin.xml
rename to game/data/plugins/emote-tab/plugin.xml
diff --git a/data/plugins/entity/attributes/attributes.rb b/game/data/plugins/entity/attributes/attributes.rb
similarity index 100%
rename from data/plugins/entity/attributes/attributes.rb
rename to game/data/plugins/entity/attributes/attributes.rb
diff --git a/data/plugins/entity/attributes/plugin.xml b/game/data/plugins/entity/attributes/plugin.xml
similarity index 100%
rename from data/plugins/entity/attributes/plugin.xml
rename to game/data/plugins/entity/attributes/plugin.xml
diff --git a/data/plugins/entity/mob/extension/extension.rb b/game/data/plugins/entity/mob/extension/extension.rb
similarity index 100%
rename from data/plugins/entity/mob/extension/extension.rb
rename to game/data/plugins/entity/mob/extension/extension.rb
diff --git a/data/plugins/entity/mob/extension/plugin.xml b/game/data/plugins/entity/mob/extension/plugin.xml
similarity index 100%
rename from data/plugins/entity/mob/extension/plugin.xml
rename to game/data/plugins/entity/mob/extension/plugin.xml
diff --git a/data/plugins/entity/mob/following/following.rb b/game/data/plugins/entity/mob/following/following.rb
similarity index 100%
rename from data/plugins/entity/mob/following/following.rb
rename to game/data/plugins/entity/mob/following/following.rb
diff --git a/data/plugins/entity/mob/following/plugin.xml b/game/data/plugins/entity/mob/following/plugin.xml
similarity index 100%
rename from data/plugins/entity/mob/following/plugin.xml
rename to game/data/plugins/entity/mob/following/plugin.xml
diff --git a/data/plugins/entity/mob/walk-to/plugin.xml b/game/data/plugins/entity/mob/walk-to/plugin.xml
similarity index 100%
rename from data/plugins/entity/mob/walk-to/plugin.xml
rename to game/data/plugins/entity/mob/walk-to/plugin.xml
diff --git a/data/plugins/entity/mob/walk-to/walk_to.rb b/game/data/plugins/entity/mob/walk-to/walk_to.rb
similarity index 100%
rename from data/plugins/entity/mob/walk-to/walk_to.rb
rename to game/data/plugins/entity/mob/walk-to/walk_to.rb
diff --git a/data/plugins/entity/spawning/npc-spawn.rb b/game/data/plugins/entity/spawning/npc-spawn.rb
similarity index 100%
rename from data/plugins/entity/spawning/npc-spawn.rb
rename to game/data/plugins/entity/spawning/npc-spawn.rb
diff --git a/data/plugins/entity/spawning/plugin.xml b/game/data/plugins/entity/spawning/plugin.xml
similarity index 100%
rename from data/plugins/entity/spawning/plugin.xml
rename to game/data/plugins/entity/spawning/plugin.xml
diff --git a/data/plugins/location/al-kharid/npcs.rb b/game/data/plugins/location/al-kharid/npcs.rb
similarity index 100%
rename from data/plugins/location/al-kharid/npcs.rb
rename to game/data/plugins/location/al-kharid/npcs.rb
diff --git a/data/plugins/location/al-kharid/plugin.xml b/game/data/plugins/location/al-kharid/plugin.xml
similarity index 100%
rename from data/plugins/location/al-kharid/plugin.xml
rename to game/data/plugins/location/al-kharid/plugin.xml
diff --git a/data/plugins/location/edgeville/npcs.rb b/game/data/plugins/location/edgeville/npcs.rb
similarity index 100%
rename from data/plugins/location/edgeville/npcs.rb
rename to game/data/plugins/location/edgeville/npcs.rb
diff --git a/data/plugins/location/edgeville/plugin.xml b/game/data/plugins/location/edgeville/plugin.xml
similarity index 100%
rename from data/plugins/location/edgeville/plugin.xml
rename to game/data/plugins/location/edgeville/plugin.xml
diff --git a/data/plugins/location/falador/npcs.rb b/game/data/plugins/location/falador/npcs.rb
similarity index 100%
rename from data/plugins/location/falador/npcs.rb
rename to game/data/plugins/location/falador/npcs.rb
diff --git a/data/plugins/location/falador/plugin.xml b/game/data/plugins/location/falador/plugin.xml
similarity index 100%
rename from data/plugins/location/falador/plugin.xml
rename to game/data/plugins/location/falador/plugin.xml
diff --git a/data/plugins/location/lumbridge/npcs.rb b/game/data/plugins/location/lumbridge/npcs.rb
similarity index 100%
rename from data/plugins/location/lumbridge/npcs.rb
rename to game/data/plugins/location/lumbridge/npcs.rb
diff --git a/data/plugins/location/lumbridge/plugin.xml b/game/data/plugins/location/lumbridge/plugin.xml
similarity index 100%
rename from data/plugins/location/lumbridge/plugin.xml
rename to game/data/plugins/location/lumbridge/plugin.xml
diff --git a/data/plugins/location/tutorial-island/guide.rb b/game/data/plugins/location/tutorial-island/guide.rb
similarity index 100%
rename from data/plugins/location/tutorial-island/guide.rb
rename to game/data/plugins/location/tutorial-island/guide.rb
diff --git a/data/plugins/location/tutorial-island/instructions.rb b/game/data/plugins/location/tutorial-island/instructions.rb
similarity index 100%
rename from data/plugins/location/tutorial-island/instructions.rb
rename to game/data/plugins/location/tutorial-island/instructions.rb
diff --git a/data/plugins/location/tutorial-island/npcs.rb b/game/data/plugins/location/tutorial-island/npcs.rb
similarity index 100%
rename from data/plugins/location/tutorial-island/npcs.rb
rename to game/data/plugins/location/tutorial-island/npcs.rb
diff --git a/data/plugins/location/tutorial-island/plugin.xml b/game/data/plugins/location/tutorial-island/plugin.xml
similarity index 100%
rename from data/plugins/location/tutorial-island/plugin.xml
rename to game/data/plugins/location/tutorial-island/plugin.xml
diff --git a/data/plugins/location/tutorial-island/stages.rb b/game/data/plugins/location/tutorial-island/stages.rb
similarity index 100%
rename from data/plugins/location/tutorial-island/stages.rb
rename to game/data/plugins/location/tutorial-island/stages.rb
diff --git a/data/plugins/location/tutorial-island/survival.rb b/game/data/plugins/location/tutorial-island/survival.rb
similarity index 100%
rename from data/plugins/location/tutorial-island/survival.rb
rename to game/data/plugins/location/tutorial-island/survival.rb
diff --git a/data/plugins/location/tutorial-island/utils.rb b/game/data/plugins/location/tutorial-island/utils.rb
similarity index 100%
rename from data/plugins/location/tutorial-island/utils.rb
rename to game/data/plugins/location/tutorial-island/utils.rb
diff --git a/data/plugins/location/varrock/npcs.rb b/game/data/plugins/location/varrock/npcs.rb
similarity index 100%
rename from data/plugins/location/varrock/npcs.rb
rename to game/data/plugins/location/varrock/npcs.rb
diff --git a/data/plugins/location/varrock/plugin.xml b/game/data/plugins/location/varrock/plugin.xml
similarity index 100%
rename from data/plugins/location/varrock/plugin.xml
rename to game/data/plugins/location/varrock/plugin.xml
diff --git a/data/plugins/location/varrock/shops.rb b/game/data/plugins/location/varrock/shops.rb
similarity index 100%
rename from data/plugins/location/varrock/shops.rb
rename to game/data/plugins/location/varrock/shops.rb
diff --git a/data/plugins/logout/logout.rb b/game/data/plugins/logout/logout.rb
similarity index 100%
rename from data/plugins/logout/logout.rb
rename to game/data/plugins/logout/logout.rb
diff --git a/data/plugins/logout/plugin.xml b/game/data/plugins/logout/plugin.xml
similarity index 100%
rename from data/plugins/logout/plugin.xml
rename to game/data/plugins/logout/plugin.xml
diff --git a/data/plugins/navigation/door/constants.rb b/game/data/plugins/navigation/door/constants.rb
similarity index 100%
rename from data/plugins/navigation/door/constants.rb
rename to game/data/plugins/navigation/door/constants.rb
diff --git a/data/plugins/navigation/door/door.rb b/game/data/plugins/navigation/door/door.rb
similarity index 100%
rename from data/plugins/navigation/door/door.rb
rename to game/data/plugins/navigation/door/door.rb
diff --git a/data/plugins/navigation/door/plugin.xml b/game/data/plugins/navigation/door/plugin.xml
similarity index 100%
rename from data/plugins/navigation/door/plugin.xml
rename to game/data/plugins/navigation/door/plugin.xml
diff --git a/data/plugins/navigation/door/util.rb b/game/data/plugins/navigation/door/util.rb
similarity index 100%
rename from data/plugins/navigation/door/util.rb
rename to game/data/plugins/navigation/door/util.rb
diff --git a/data/plugins/player-action/action.rb b/game/data/plugins/player-action/action.rb
similarity index 100%
rename from data/plugins/player-action/action.rb
rename to game/data/plugins/player-action/action.rb
diff --git a/data/plugins/player-action/login.rb b/game/data/plugins/player-action/login.rb
similarity index 100%
rename from data/plugins/player-action/login.rb
rename to game/data/plugins/player-action/login.rb
diff --git a/data/plugins/player-action/plugin.xml b/game/data/plugins/player-action/plugin.xml
similarity index 100%
rename from data/plugins/player-action/plugin.xml
rename to game/data/plugins/player-action/plugin.xml
diff --git a/data/plugins/quest/plugin.xml b/game/data/plugins/quest/plugin.xml
similarity index 100%
rename from data/plugins/quest/plugin.xml
rename to game/data/plugins/quest/plugin.xml
diff --git a/data/plugins/quest/repository.rb b/game/data/plugins/quest/repository.rb
similarity index 100%
rename from data/plugins/quest/repository.rb
rename to game/data/plugins/quest/repository.rb
diff --git a/data/plugins/run/plugin.xml b/game/data/plugins/run/plugin.xml
similarity index 100%
rename from data/plugins/run/plugin.xml
rename to game/data/plugins/run/plugin.xml
diff --git a/data/plugins/run/run.rb b/game/data/plugins/run/run.rb
similarity index 100%
rename from data/plugins/run/run.rb
rename to game/data/plugins/run/run.rb
diff --git a/data/plugins/shops/currency.rb b/game/data/plugins/shops/currency.rb
similarity index 100%
rename from data/plugins/shops/currency.rb
rename to game/data/plugins/shops/currency.rb
diff --git a/data/plugins/shops/plugin.xml b/game/data/plugins/shops/plugin.xml
similarity index 100%
rename from data/plugins/shops/plugin.xml
rename to game/data/plugins/shops/plugin.xml
diff --git a/data/plugins/shops/shop.rb b/game/data/plugins/shops/shop.rb
similarity index 100%
rename from data/plugins/shops/shop.rb
rename to game/data/plugins/shops/shop.rb
diff --git a/data/plugins/shops/shop_item.rb b/game/data/plugins/shops/shop_item.rb
similarity index 100%
rename from data/plugins/shops/shop_item.rb
rename to game/data/plugins/shops/shop_item.rb
diff --git a/data/plugins/shops/shops.rb b/game/data/plugins/shops/shops.rb
similarity index 100%
rename from data/plugins/shops/shops.rb
rename to game/data/plugins/shops/shops.rb
diff --git a/data/plugins/skill/fishing/fish.rb b/game/data/plugins/skill/fishing/fish.rb
similarity index 100%
rename from data/plugins/skill/fishing/fish.rb
rename to game/data/plugins/skill/fishing/fish.rb
diff --git a/data/plugins/skill/fishing/fishing.rb b/game/data/plugins/skill/fishing/fishing.rb
similarity index 100%
rename from data/plugins/skill/fishing/fishing.rb
rename to game/data/plugins/skill/fishing/fishing.rb
diff --git a/data/plugins/skill/fishing/plugin.xml b/game/data/plugins/skill/fishing/plugin.xml
similarity index 100%
rename from data/plugins/skill/fishing/plugin.xml
rename to game/data/plugins/skill/fishing/plugin.xml
diff --git a/data/plugins/skill/fishing/spot.rb b/game/data/plugins/skill/fishing/spot.rb
similarity index 100%
rename from data/plugins/skill/fishing/spot.rb
rename to game/data/plugins/skill/fishing/spot.rb
diff --git a/data/plugins/skill/fishing/tool.rb b/game/data/plugins/skill/fishing/tool.rb
similarity index 100%
rename from data/plugins/skill/fishing/tool.rb
rename to game/data/plugins/skill/fishing/tool.rb
diff --git a/data/plugins/skill/herblore/herb.rb b/game/data/plugins/skill/herblore/herb.rb
similarity index 100%
rename from data/plugins/skill/herblore/herb.rb
rename to game/data/plugins/skill/herblore/herb.rb
diff --git a/data/plugins/skill/herblore/herblore.rb b/game/data/plugins/skill/herblore/herblore.rb
similarity index 100%
rename from data/plugins/skill/herblore/herblore.rb
rename to game/data/plugins/skill/herblore/herblore.rb
diff --git a/data/plugins/skill/herblore/ingredient.rb b/game/data/plugins/skill/herblore/ingredient.rb
similarity index 100%
rename from data/plugins/skill/herblore/ingredient.rb
rename to game/data/plugins/skill/herblore/ingredient.rb
diff --git a/data/plugins/skill/herblore/plugin.xml b/game/data/plugins/skill/herblore/plugin.xml
similarity index 100%
rename from data/plugins/skill/herblore/plugin.xml
rename to game/data/plugins/skill/herblore/plugin.xml
diff --git a/data/plugins/skill/herblore/potion.rb b/game/data/plugins/skill/herblore/potion.rb
similarity index 100%
rename from data/plugins/skill/herblore/potion.rb
rename to game/data/plugins/skill/herblore/potion.rb
diff --git a/data/plugins/skill/magic/alchemy.rb b/game/data/plugins/skill/magic/alchemy.rb
similarity index 100%
rename from data/plugins/skill/magic/alchemy.rb
rename to game/data/plugins/skill/magic/alchemy.rb
diff --git a/data/plugins/skill/magic/convert.rb b/game/data/plugins/skill/magic/convert.rb
similarity index 100%
rename from data/plugins/skill/magic/convert.rb
rename to game/data/plugins/skill/magic/convert.rb
diff --git a/data/plugins/skill/magic/element.rb b/game/data/plugins/skill/magic/element.rb
similarity index 100%
rename from data/plugins/skill/magic/element.rb
rename to game/data/plugins/skill/magic/element.rb
diff --git a/data/plugins/skill/magic/enchant.rb b/game/data/plugins/skill/magic/enchant.rb
similarity index 100%
rename from data/plugins/skill/magic/enchant.rb
rename to game/data/plugins/skill/magic/enchant.rb
diff --git a/data/plugins/skill/magic/magic.rb b/game/data/plugins/skill/magic/magic.rb
similarity index 100%
rename from data/plugins/skill/magic/magic.rb
rename to game/data/plugins/skill/magic/magic.rb
diff --git a/data/plugins/skill/magic/plugin.xml b/game/data/plugins/skill/magic/plugin.xml
similarity index 100%
rename from data/plugins/skill/magic/plugin.xml
rename to game/data/plugins/skill/magic/plugin.xml
diff --git a/data/plugins/skill/magic/teleport.rb b/game/data/plugins/skill/magic/teleport.rb
similarity index 100%
rename from data/plugins/skill/magic/teleport.rb
rename to game/data/plugins/skill/magic/teleport.rb
diff --git a/data/plugins/skill/mining/gem.rb b/game/data/plugins/skill/mining/gem.rb
similarity index 100%
rename from data/plugins/skill/mining/gem.rb
rename to game/data/plugins/skill/mining/gem.rb
diff --git a/data/plugins/skill/mining/mining.rb b/game/data/plugins/skill/mining/mining.rb
similarity index 100%
rename from data/plugins/skill/mining/mining.rb
rename to game/data/plugins/skill/mining/mining.rb
diff --git a/data/plugins/skill/mining/ore.rb b/game/data/plugins/skill/mining/ore.rb
similarity index 100%
rename from data/plugins/skill/mining/ore.rb
rename to game/data/plugins/skill/mining/ore.rb
diff --git a/data/plugins/skill/mining/pickaxe.rb b/game/data/plugins/skill/mining/pickaxe.rb
similarity index 100%
rename from data/plugins/skill/mining/pickaxe.rb
rename to game/data/plugins/skill/mining/pickaxe.rb
diff --git a/data/plugins/skill/mining/plugin.xml b/game/data/plugins/skill/mining/plugin.xml
similarity index 100%
rename from data/plugins/skill/mining/plugin.xml
rename to game/data/plugins/skill/mining/plugin.xml
diff --git a/data/plugins/skill/mining/respawn.rb b/game/data/plugins/skill/mining/respawn.rb
similarity index 100%
rename from data/plugins/skill/mining/respawn.rb
rename to game/data/plugins/skill/mining/respawn.rb
diff --git a/data/plugins/skill/prayer/bury.rb b/game/data/plugins/skill/prayer/bury.rb
similarity index 100%
rename from data/plugins/skill/prayer/bury.rb
rename to game/data/plugins/skill/prayer/bury.rb
diff --git a/data/plugins/skill/prayer/plugin.xml b/game/data/plugins/skill/prayer/plugin.xml
similarity index 100%
rename from data/plugins/skill/prayer/plugin.xml
rename to game/data/plugins/skill/prayer/plugin.xml
diff --git a/data/plugins/skill/prayer/prayers.rb b/game/data/plugins/skill/prayer/prayers.rb
similarity index 100%
rename from data/plugins/skill/prayer/prayers.rb
rename to game/data/plugins/skill/prayer/prayers.rb
diff --git a/data/plugins/skill/runecraft/altar.rb b/game/data/plugins/skill/runecraft/altar.rb
similarity index 100%
rename from data/plugins/skill/runecraft/altar.rb
rename to game/data/plugins/skill/runecraft/altar.rb
diff --git a/data/plugins/skill/runecraft/plugin.xml b/game/data/plugins/skill/runecraft/plugin.xml
similarity index 100%
rename from data/plugins/skill/runecraft/plugin.xml
rename to game/data/plugins/skill/runecraft/plugin.xml
diff --git a/data/plugins/skill/runecraft/rune.rb b/game/data/plugins/skill/runecraft/rune.rb
similarity index 100%
rename from data/plugins/skill/runecraft/rune.rb
rename to game/data/plugins/skill/runecraft/rune.rb
diff --git a/data/plugins/skill/runecraft/runecraft.rb b/game/data/plugins/skill/runecraft/runecraft.rb
similarity index 100%
rename from data/plugins/skill/runecraft/runecraft.rb
rename to game/data/plugins/skill/runecraft/runecraft.rb
diff --git a/data/plugins/skill/runecraft/talisman.rb b/game/data/plugins/skill/runecraft/talisman.rb
similarity index 100%
rename from data/plugins/skill/runecraft/talisman.rb
rename to game/data/plugins/skill/runecraft/talisman.rb
diff --git a/data/plugins/skill/runecraft/tiara.rb b/game/data/plugins/skill/runecraft/tiara.rb
similarity index 100%
rename from data/plugins/skill/runecraft/tiara.rb
rename to game/data/plugins/skill/runecraft/tiara.rb
diff --git a/data/plugins/util/command.rb b/game/data/plugins/util/command.rb
similarity index 100%
rename from data/plugins/util/command.rb
rename to game/data/plugins/util/command.rb
diff --git a/data/plugins/util/name_lookup.rb b/game/data/plugins/util/name_lookup.rb
similarity index 100%
rename from data/plugins/util/name_lookup.rb
rename to game/data/plugins/util/name_lookup.rb
diff --git a/data/plugins/util/plugin.xml b/game/data/plugins/util/plugin.xml
similarity index 100%
rename from data/plugins/util/plugin.xml
rename to game/data/plugins/util/plugin.xml
diff --git a/data/synchronizer.xml b/game/data/synchronizer.xml
similarity index 100%
rename from data/synchronizer.xml
rename to game/data/synchronizer.xml