diff --git a/Server/src/main/java/Server/core/ServerConstants.backup b/Server/src/main/java/core/ServerConstants.backup
similarity index 100%
rename from Server/src/main/java/Server/core/ServerConstants.backup
rename to Server/src/main/java/core/ServerConstants.backup
diff --git a/Server/src/main/java/Server/core/Util.java b/Server/src/main/java/core/Util.java
similarity index 100%
rename from Server/src/main/java/Server/core/Util.java
rename to Server/src/main/java/core/Util.java
diff --git a/Server/src/main/java/Server/core/cache/Cache.java b/Server/src/main/java/core/cache/Cache.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/Cache.java
rename to Server/src/main/java/core/cache/Cache.java
diff --git a/Server/src/main/java/Server/core/cache/CacheFile.java b/Server/src/main/java/core/cache/CacheFile.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/CacheFile.java
rename to Server/src/main/java/core/cache/CacheFile.java
diff --git a/Server/src/main/java/Server/core/cache/CacheFileManager.java b/Server/src/main/java/core/cache/CacheFileManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/CacheFileManager.java
rename to Server/src/main/java/core/cache/CacheFileManager.java
diff --git a/Server/src/main/java/Server/core/cache/ServerStore.java b/Server/src/main/java/core/cache/ServerStore.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/ServerStore.java
rename to Server/src/main/java/core/cache/ServerStore.java
diff --git a/Server/src/main/java/Server/core/cache/StoreFile.java b/Server/src/main/java/core/cache/StoreFile.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/StoreFile.java
rename to Server/src/main/java/core/cache/StoreFile.java
diff --git a/Server/src/main/java/Server/core/cache/bzip2/BZip2BlockEntry.java b/Server/src/main/java/core/cache/bzip2/BZip2BlockEntry.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/bzip2/BZip2BlockEntry.java
rename to Server/src/main/java/core/cache/bzip2/BZip2BlockEntry.java
diff --git a/Server/src/main/java/Server/core/cache/bzip2/BZip2Decompressor.java b/Server/src/main/java/core/cache/bzip2/BZip2Decompressor.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/bzip2/BZip2Decompressor.java
rename to Server/src/main/java/core/cache/bzip2/BZip2Decompressor.java
diff --git a/Server/src/main/java/Server/core/cache/crypto/ISAACCipher.java b/Server/src/main/java/core/cache/crypto/ISAACCipher.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/crypto/ISAACCipher.java
rename to Server/src/main/java/core/cache/crypto/ISAACCipher.java
diff --git a/Server/src/main/java/Server/core/cache/crypto/ISAACPair.java b/Server/src/main/java/core/cache/crypto/ISAACPair.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/crypto/ISAACPair.java
rename to Server/src/main/java/core/cache/crypto/ISAACPair.java
diff --git a/Server/src/main/java/Server/core/cache/crypto/XTEACryption.java b/Server/src/main/java/core/cache/crypto/XTEACryption.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/crypto/XTEACryption.java
rename to Server/src/main/java/core/cache/crypto/XTEACryption.java
diff --git a/Server/src/main/java/Server/core/cache/def/Definition.java b/Server/src/main/java/core/cache/def/Definition.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/def/Definition.java
rename to Server/src/main/java/core/cache/def/Definition.java
diff --git a/Server/src/main/java/Server/core/cache/def/impl/AnimationDefinition.java b/Server/src/main/java/core/cache/def/impl/AnimationDefinition.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/def/impl/AnimationDefinition.java
rename to Server/src/main/java/core/cache/def/impl/AnimationDefinition.java
diff --git a/Server/src/main/java/Server/core/cache/def/impl/CS2Mapping.java b/Server/src/main/java/core/cache/def/impl/CS2Mapping.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/def/impl/CS2Mapping.java
rename to Server/src/main/java/core/cache/def/impl/CS2Mapping.java
diff --git a/Server/src/main/java/Server/core/cache/def/impl/ClothDefinition.java b/Server/src/main/java/core/cache/def/impl/ClothDefinition.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/def/impl/ClothDefinition.java
rename to Server/src/main/java/core/cache/def/impl/ClothDefinition.java
diff --git a/Server/src/main/java/Server/core/cache/def/impl/GraphicDefinition.java b/Server/src/main/java/core/cache/def/impl/GraphicDefinition.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/def/impl/GraphicDefinition.java
rename to Server/src/main/java/core/cache/def/impl/GraphicDefinition.java
diff --git a/Server/src/main/java/Server/core/cache/def/impl/ItemDefinition.java b/Server/src/main/java/core/cache/def/impl/ItemDefinition.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/def/impl/ItemDefinition.java
rename to Server/src/main/java/core/cache/def/impl/ItemDefinition.java
diff --git a/Server/src/main/java/Server/core/cache/def/impl/NPCDefinition.java b/Server/src/main/java/core/cache/def/impl/NPCDefinition.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/def/impl/NPCDefinition.java
rename to Server/src/main/java/core/cache/def/impl/NPCDefinition.java
diff --git a/Server/src/main/java/Server/core/cache/def/impl/ObjectDefinition.java b/Server/src/main/java/core/cache/def/impl/ObjectDefinition.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/def/impl/ObjectDefinition.java
rename to Server/src/main/java/core/cache/def/impl/ObjectDefinition.java
diff --git a/Server/src/main/java/Server/core/cache/def/impl/RenderAnimationDefinition.java b/Server/src/main/java/core/cache/def/impl/RenderAnimationDefinition.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/def/impl/RenderAnimationDefinition.java
rename to Server/src/main/java/core/cache/def/impl/RenderAnimationDefinition.java
diff --git a/Server/src/main/java/Server/core/cache/def/impl/VarbitDefinition.java b/Server/src/main/java/core/cache/def/impl/VarbitDefinition.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/def/impl/VarbitDefinition.java
rename to Server/src/main/java/core/cache/def/impl/VarbitDefinition.java
diff --git a/Server/src/main/java/Server/core/cache/def/impl/test.txt b/Server/src/main/java/core/cache/def/impl/test.txt
similarity index 100%
rename from Server/src/main/java/Server/core/cache/def/impl/test.txt
rename to Server/src/main/java/core/cache/def/impl/test.txt
diff --git a/Server/src/main/java/Server/core/cache/gzip/GZipDecompressor.java b/Server/src/main/java/core/cache/gzip/GZipDecompressor.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/gzip/GZipDecompressor.java
rename to Server/src/main/java/core/cache/gzip/GZipDecompressor.java
diff --git a/Server/src/main/java/Server/core/cache/misc/Container.java b/Server/src/main/java/core/cache/misc/Container.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/misc/Container.java
rename to Server/src/main/java/core/cache/misc/Container.java
diff --git a/Server/src/main/java/Server/core/cache/misc/ContainersInformation.java b/Server/src/main/java/core/cache/misc/ContainersInformation.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/misc/ContainersInformation.java
rename to Server/src/main/java/core/cache/misc/ContainersInformation.java
diff --git a/Server/src/main/java/Server/core/cache/misc/FilesContainer.java b/Server/src/main/java/core/cache/misc/FilesContainer.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/misc/FilesContainer.java
rename to Server/src/main/java/core/cache/misc/FilesContainer.java
diff --git a/Server/src/main/java/Server/core/cache/misc/buffer/BufferInputStream.java b/Server/src/main/java/core/cache/misc/buffer/BufferInputStream.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/misc/buffer/BufferInputStream.java
rename to Server/src/main/java/core/cache/misc/buffer/BufferInputStream.java
diff --git a/Server/src/main/java/Server/core/cache/misc/buffer/BufferOutputStream.java b/Server/src/main/java/core/cache/misc/buffer/BufferOutputStream.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/misc/buffer/BufferOutputStream.java
rename to Server/src/main/java/core/cache/misc/buffer/BufferOutputStream.java
diff --git a/Server/src/main/java/Server/core/cache/misc/buffer/ByteBufferUtils.java b/Server/src/main/java/core/cache/misc/buffer/ByteBufferUtils.java
similarity index 100%
rename from Server/src/main/java/Server/core/cache/misc/buffer/ByteBufferUtils.java
rename to Server/src/main/java/core/cache/misc/buffer/ByteBufferUtils.java
diff --git a/Server/src/main/java/Server/core/game/component/AccessMaskBuilder.java b/Server/src/main/java/core/game/component/AccessMaskBuilder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/component/AccessMaskBuilder.java
rename to Server/src/main/java/core/game/component/AccessMaskBuilder.java
diff --git a/Server/src/main/java/Server/core/game/component/CloseEvent.java b/Server/src/main/java/core/game/component/CloseEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/component/CloseEvent.java
rename to Server/src/main/java/core/game/component/CloseEvent.java
diff --git a/Server/src/main/java/Server/core/game/component/Component.java b/Server/src/main/java/core/game/component/Component.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/component/Component.java
rename to Server/src/main/java/core/game/component/Component.java
diff --git a/Server/src/main/java/Server/core/game/component/ComponentDefinition.java b/Server/src/main/java/core/game/component/ComponentDefinition.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/component/ComponentDefinition.java
rename to Server/src/main/java/core/game/component/ComponentDefinition.java
diff --git a/Server/src/main/java/Server/core/game/component/ComponentPlugin.java b/Server/src/main/java/core/game/component/ComponentPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/component/ComponentPlugin.java
rename to Server/src/main/java/core/game/component/ComponentPlugin.java
diff --git a/Server/src/main/java/Server/core/game/component/InterfaceType.java b/Server/src/main/java/core/game/component/InterfaceType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/component/InterfaceType.java
rename to Server/src/main/java/core/game/component/InterfaceType.java
diff --git a/Server/src/main/java/Server/core/game/container/Container.java b/Server/src/main/java/core/game/container/Container.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/container/Container.java
rename to Server/src/main/java/core/game/container/Container.java
diff --git a/Server/src/main/java/Server/core/game/container/ContainerEvent.java b/Server/src/main/java/core/game/container/ContainerEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/container/ContainerEvent.java
rename to Server/src/main/java/core/game/container/ContainerEvent.java
diff --git a/Server/src/main/java/Server/core/game/container/ContainerListener.java b/Server/src/main/java/core/game/container/ContainerListener.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/container/ContainerListener.java
rename to Server/src/main/java/core/game/container/ContainerListener.java
diff --git a/Server/src/main/java/Server/core/game/container/ContainerType.java b/Server/src/main/java/core/game/container/ContainerType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/container/ContainerType.java
rename to Server/src/main/java/core/game/container/ContainerType.java
diff --git a/Server/src/main/java/Server/core/game/container/SortType.java b/Server/src/main/java/core/game/container/SortType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/container/SortType.java
rename to Server/src/main/java/core/game/container/SortType.java
diff --git a/Server/src/main/java/Server/core/game/container/access/BitregisterAssembler.java b/Server/src/main/java/core/game/container/access/BitregisterAssembler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/container/access/BitregisterAssembler.java
rename to Server/src/main/java/core/game/container/access/BitregisterAssembler.java
diff --git a/Server/src/main/java/Server/core/game/container/access/InterfaceContainer.java b/Server/src/main/java/core/game/container/access/InterfaceContainer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/container/access/InterfaceContainer.java
rename to Server/src/main/java/core/game/container/access/InterfaceContainer.java
diff --git a/Server/src/main/java/Server/core/game/container/impl/BankContainer.java b/Server/src/main/java/core/game/container/impl/BankContainer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/container/impl/BankContainer.java
rename to Server/src/main/java/core/game/container/impl/BankContainer.java
diff --git a/Server/src/main/java/Server/core/game/container/impl/EquipmentContainer.java b/Server/src/main/java/core/game/container/impl/EquipmentContainer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/container/impl/EquipmentContainer.java
rename to Server/src/main/java/core/game/container/impl/EquipmentContainer.java
diff --git a/Server/src/main/java/Server/core/game/container/impl/InventoryListener.java b/Server/src/main/java/core/game/container/impl/InventoryListener.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/container/impl/InventoryListener.java
rename to Server/src/main/java/core/game/container/impl/InventoryListener.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/ActivityManager.java b/Server/src/main/java/core/game/content/activity/ActivityManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/ActivityManager.java
rename to Server/src/main/java/core/game/content/activity/ActivityManager.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/ActivityPlugin.java b/Server/src/main/java/core/game/content/activity/ActivityPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/ActivityPlugin.java
rename to Server/src/main/java/core/game/content/activity/ActivityPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/CutscenePlugin.java b/Server/src/main/java/core/game/content/activity/CutscenePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/CutscenePlugin.java
rename to Server/src/main/java/core/game/content/activity/CutscenePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/barrows/BarrowBrother.java b/Server/src/main/java/core/game/content/activity/barrows/BarrowBrother.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/barrows/BarrowBrother.java
rename to Server/src/main/java/core/game/content/activity/barrows/BarrowBrother.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/barrows/BarrowsActivityPlugin.java b/Server/src/main/java/core/game/content/activity/barrows/BarrowsActivityPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/barrows/BarrowsActivityPlugin.java
rename to Server/src/main/java/core/game/content/activity/barrows/BarrowsActivityPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/barrows/BarrowsCrypt.java b/Server/src/main/java/core/game/content/activity/barrows/BarrowsCrypt.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/barrows/BarrowsCrypt.java
rename to Server/src/main/java/core/game/content/activity/barrows/BarrowsCrypt.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/barrows/BarrowsPuzzle.java b/Server/src/main/java/core/game/content/activity/barrows/BarrowsPuzzle.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/barrows/BarrowsPuzzle.java
rename to Server/src/main/java/core/game/content/activity/barrows/BarrowsPuzzle.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/barrows/TunnelEntranceDialogue.java b/Server/src/main/java/core/game/content/activity/barrows/TunnelEntranceDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/barrows/TunnelEntranceDialogue.java
rename to Server/src/main/java/core/game/content/activity/barrows/TunnelEntranceDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/bountyhunter/BHOptionHandler.java b/Server/src/main/java/core/game/content/activity/bountyhunter/BHOptionHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/bountyhunter/BHOptionHandler.java
rename to Server/src/main/java/core/game/content/activity/bountyhunter/BHOptionHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/bountyhunter/BHScoreBoard.java b/Server/src/main/java/core/game/content/activity/bountyhunter/BHScoreBoard.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/bountyhunter/BHScoreBoard.java
rename to Server/src/main/java/core/game/content/activity/bountyhunter/BHScoreBoard.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/bountyhunter/BountyEntry.java b/Server/src/main/java/core/game/content/activity/bountyhunter/BountyEntry.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/bountyhunter/BountyEntry.java
rename to Server/src/main/java/core/game/content/activity/bountyhunter/BountyEntry.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/bountyhunter/BountyHunterActivity.java b/Server/src/main/java/core/game/content/activity/bountyhunter/BountyHunterActivity.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/bountyhunter/BountyHunterActivity.java
rename to Server/src/main/java/core/game/content/activity/bountyhunter/BountyHunterActivity.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/bountyhunter/BountyLocateSpell.java b/Server/src/main/java/core/game/content/activity/bountyhunter/BountyLocateSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/bountyhunter/BountyLocateSpell.java
rename to Server/src/main/java/core/game/content/activity/bountyhunter/BountyLocateSpell.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/bountyhunter/CraterType.java b/Server/src/main/java/core/game/content/activity/bountyhunter/CraterType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/bountyhunter/CraterType.java
rename to Server/src/main/java/core/game/content/activity/bountyhunter/CraterType.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/clanwars/CWChallengeOption.java b/Server/src/main/java/core/game/content/activity/clanwars/CWChallengeOption.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/clanwars/CWChallengeOption.java
rename to Server/src/main/java/core/game/content/activity/clanwars/CWChallengeOption.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java b/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java
rename to Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/clanwars/ClanWarsChallengeRoom.java b/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsChallengeRoom.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/clanwars/ClanWarsChallengeRoom.java
rename to Server/src/main/java/core/game/content/activity/clanwars/ClanWarsChallengeRoom.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/duel/ChallengeOptionPlugin.java b/Server/src/main/java/core/game/content/activity/duel/ChallengeOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/duel/ChallengeOptionPlugin.java
rename to Server/src/main/java/core/game/content/activity/duel/ChallengeOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/duel/DuelArea.java b/Server/src/main/java/core/game/content/activity/duel/DuelArea.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/duel/DuelArea.java
rename to Server/src/main/java/core/game/content/activity/duel/DuelArea.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/duel/DuelArenaActivity.java b/Server/src/main/java/core/game/content/activity/duel/DuelArenaActivity.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/duel/DuelArenaActivity.java
rename to Server/src/main/java/core/game/content/activity/duel/DuelArenaActivity.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/duel/DuelComponentPlugin.java b/Server/src/main/java/core/game/content/activity/duel/DuelComponentPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/duel/DuelComponentPlugin.java
rename to Server/src/main/java/core/game/content/activity/duel/DuelComponentPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/duel/DuelReqModule.java b/Server/src/main/java/core/game/content/activity/duel/DuelReqModule.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/duel/DuelReqModule.java
rename to Server/src/main/java/core/game/content/activity/duel/DuelReqModule.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/duel/DuelRule.java b/Server/src/main/java/core/game/content/activity/duel/DuelRule.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/duel/DuelRule.java
rename to Server/src/main/java/core/game/content/activity/duel/DuelRule.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/duel/DuelSession.java b/Server/src/main/java/core/game/content/activity/duel/DuelSession.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/duel/DuelSession.java
rename to Server/src/main/java/core/game/content/activity/duel/DuelSession.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/duel/StakeContainer.java b/Server/src/main/java/core/game/content/activity/duel/StakeContainer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/duel/StakeContainer.java
rename to Server/src/main/java/core/game/content/activity/duel/StakeContainer.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/fog/FOGActivityPlugin.java b/Server/src/main/java/core/game/content/activity/fog/FOGActivityPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/fog/FOGActivityPlugin.java
rename to Server/src/main/java/core/game/content/activity/fog/FOGActivityPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/fog/FOGLobbyZone.java b/Server/src/main/java/core/game/content/activity/fog/FOGLobbyZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/fog/FOGLobbyZone.java
rename to Server/src/main/java/core/game/content/activity/fog/FOGLobbyZone.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/fog/FOGPlayer.java b/Server/src/main/java/core/game/content/activity/fog/FOGPlayer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/fog/FOGPlayer.java
rename to Server/src/main/java/core/game/content/activity/fog/FOGPlayer.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/fog/FOGWaitingZone.java b/Server/src/main/java/core/game/content/activity/fog/FOGWaitingZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/fog/FOGWaitingZone.java
rename to Server/src/main/java/core/game/content/activity/fog/FOGWaitingZone.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecopter/GCInformationSign.java b/Server/src/main/java/core/game/content/activity/gnomecopter/GCInformationSign.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecopter/GCInformationSign.java
rename to Server/src/main/java/core/game/content/activity/gnomecopter/GCInformationSign.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecopter/GnomeCopterActivity.java b/Server/src/main/java/core/game/content/activity/gnomecopter/GnomeCopterActivity.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecopter/GnomeCopterActivity.java
rename to Server/src/main/java/core/game/content/activity/gnomecopter/GnomeCopterActivity.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/guild/CraftingGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/CraftingGuildPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/guild/CraftingGuildPlugin.java
rename to Server/src/main/java/core/game/content/activity/guild/CraftingGuildPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/guild/FishingGuild.java b/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/guild/FishingGuild.java
rename to Server/src/main/java/core/game/content/activity/guild/FishingGuild.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/guild/HeroGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/HeroGuildPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/guild/HeroGuildPlugin.java
rename to Server/src/main/java/core/game/content/activity/guild/HeroGuildPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/guild/MiningGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/MiningGuildPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/guild/MiningGuildPlugin.java
rename to Server/src/main/java/core/game/content/activity/guild/MiningGuildPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/guild/RangingGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/RangingGuildPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/guild/RangingGuildPlugin.java
rename to Server/src/main/java/core/game/content/activity/guild/RangingGuildPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/guild/WizardGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/WizardGuildPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/guild/WizardGuildPlugin.java
rename to Server/src/main/java/core/game/content/activity/guild/WizardGuildPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gwd/EcumenicalKeyHandler.java b/Server/src/main/java/core/game/content/activity/gwd/EcumenicalKeyHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gwd/EcumenicalKeyHandler.java
rename to Server/src/main/java/core/game/content/activity/gwd/EcumenicalKeyHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gwd/GWDGraardorSwingHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GWDGraardorSwingHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gwd/GWDGraardorSwingHandler.java
rename to Server/src/main/java/core/game/content/activity/gwd/GWDGraardorSwingHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gwd/GWDKreeArraSwingHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GWDKreeArraSwingHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gwd/GWDKreeArraSwingHandler.java
rename to Server/src/main/java/core/game/content/activity/gwd/GWDKreeArraSwingHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gwd/GWDTsutsarothSwingHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GWDTsutsarothSwingHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gwd/GWDTsutsarothSwingHandler.java
rename to Server/src/main/java/core/game/content/activity/gwd/GWDTsutsarothSwingHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gwd/GWDZilyanaSwingHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GWDZilyanaSwingHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gwd/GWDZilyanaSwingHandler.java
rename to Server/src/main/java/core/game/content/activity/gwd/GWDZilyanaSwingHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gwd/GodWarsFaction.java b/Server/src/main/java/core/game/content/activity/gwd/GodWarsFaction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gwd/GodWarsFaction.java
rename to Server/src/main/java/core/game/content/activity/gwd/GodWarsFaction.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gwd/GodWarsMinionNPC.java b/Server/src/main/java/core/game/content/activity/gwd/GodWarsMinionNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gwd/GodWarsMinionNPC.java
rename to Server/src/main/java/core/game/content/activity/gwd/GodWarsMinionNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gwd/GodWarsNPC.java b/Server/src/main/java/core/game/content/activity/gwd/GodWarsNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gwd/GodWarsNPC.java
rename to Server/src/main/java/core/game/content/activity/gwd/GodWarsNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gwd/GodwarsBossNPC.java b/Server/src/main/java/core/game/content/activity/gwd/GodwarsBossNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gwd/GodwarsBossNPC.java
rename to Server/src/main/java/core/game/content/activity/gwd/GodwarsBossNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gwd/GodwarsEntranceHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GodwarsEntranceHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gwd/GodwarsEntranceHandler.java
rename to Server/src/main/java/core/game/content/activity/gwd/GodwarsEntranceHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/gwd/GodwarsMapzone.java b/Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gwd/GodwarsMapzone.java
rename to Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/magearena/ChamberGuardianDialogue.java b/Server/src/main/java/core/game/content/activity/magearena/ChamberGuardianDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/magearena/ChamberGuardianDialogue.java
rename to Server/src/main/java/core/game/content/activity/magearena/ChamberGuardianDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/magearena/KolodionDialogue.java b/Server/src/main/java/core/game/content/activity/magearena/KolodionDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/magearena/KolodionDialogue.java
rename to Server/src/main/java/core/game/content/activity/magearena/KolodionDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/magearena/KolodionNPC.java b/Server/src/main/java/core/game/content/activity/magearena/KolodionNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/magearena/KolodionNPC.java
rename to Server/src/main/java/core/game/content/activity/magearena/KolodionNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/magearena/KolodionSession.java b/Server/src/main/java/core/game/content/activity/magearena/KolodionSession.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/magearena/KolodionSession.java
rename to Server/src/main/java/core/game/content/activity/magearena/KolodionSession.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/magearena/LundailDialogue.java b/Server/src/main/java/core/game/content/activity/magearena/LundailDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/magearena/LundailDialogue.java
rename to Server/src/main/java/core/game/content/activity/magearena/LundailDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/magearena/MageArenaNPC.java b/Server/src/main/java/core/game/content/activity/magearena/MageArenaNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/magearena/MageArenaNPC.java
rename to Server/src/main/java/core/game/content/activity/magearena/MageArenaNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/magearena/MageArenaPlugin.java b/Server/src/main/java/core/game/content/activity/magearena/MageArenaPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/magearena/MageArenaPlugin.java
rename to Server/src/main/java/core/game/content/activity/magearena/MageArenaPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/magearena/MageArenaZone.java b/Server/src/main/java/core/game/content/activity/magearena/MageArenaZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/magearena/MageArenaZone.java
rename to Server/src/main/java/core/game/content/activity/magearena/MageArenaZone.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/AlchemyGuardianDialogue.java b/Server/src/main/java/core/game/content/activity/mta/AlchemyGuardianDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/AlchemyGuardianDialogue.java
rename to Server/src/main/java/core/game/content/activity/mta/AlchemyGuardianDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/AlchemySpell.java b/Server/src/main/java/core/game/content/activity/mta/AlchemySpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/AlchemySpell.java
rename to Server/src/main/java/core/game/content/activity/mta/AlchemySpell.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/BonesConvertingSpells.java b/Server/src/main/java/core/game/content/activity/mta/BonesConvertingSpells.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/BonesConvertingSpells.java
rename to Server/src/main/java/core/game/content/activity/mta/BonesConvertingSpells.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/CharmedWarriorDialogue.java b/Server/src/main/java/core/game/content/activity/mta/CharmedWarriorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/CharmedWarriorDialogue.java
rename to Server/src/main/java/core/game/content/activity/mta/CharmedWarriorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/EnchantmentGuardianDialogue.java b/Server/src/main/java/core/game/content/activity/mta/EnchantmentGuardianDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/EnchantmentGuardianDialogue.java
rename to Server/src/main/java/core/game/content/activity/mta/EnchantmentGuardianDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/EntranceGuardianDialogue.java b/Server/src/main/java/core/game/content/activity/mta/EntranceGuardianDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/EntranceGuardianDialogue.java
rename to Server/src/main/java/core/game/content/activity/mta/EntranceGuardianDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/GraveyardGuardianDialogue.java b/Server/src/main/java/core/game/content/activity/mta/GraveyardGuardianDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/GraveyardGuardianDialogue.java
rename to Server/src/main/java/core/game/content/activity/mta/GraveyardGuardianDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/MTAShop.java b/Server/src/main/java/core/game/content/activity/mta/MTAShop.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/MTAShop.java
rename to Server/src/main/java/core/game/content/activity/mta/MTAShop.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/MTAType.java b/Server/src/main/java/core/game/content/activity/mta/MTAType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/MTAType.java
rename to Server/src/main/java/core/game/content/activity/mta/MTAType.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/MTAZone.java b/Server/src/main/java/core/game/content/activity/mta/MTAZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/MTAZone.java
rename to Server/src/main/java/core/game/content/activity/mta/MTAZone.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/MageTrainingArenaPlugin.java b/Server/src/main/java/core/game/content/activity/mta/MageTrainingArenaPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/MageTrainingArenaPlugin.java
rename to Server/src/main/java/core/game/content/activity/mta/MageTrainingArenaPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/MazeGuardianDialogue.java b/Server/src/main/java/core/game/content/activity/mta/MazeGuardianDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/MazeGuardianDialogue.java
rename to Server/src/main/java/core/game/content/activity/mta/MazeGuardianDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/ProgressHatDialogue.java b/Server/src/main/java/core/game/content/activity/mta/ProgressHatDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/ProgressHatDialogue.java
rename to Server/src/main/java/core/game/content/activity/mta/ProgressHatDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/RewardsGuardianDialogue.java b/Server/src/main/java/core/game/content/activity/mta/RewardsGuardianDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/RewardsGuardianDialogue.java
rename to Server/src/main/java/core/game/content/activity/mta/RewardsGuardianDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/TelekineticGrabSpell.java b/Server/src/main/java/core/game/content/activity/mta/TelekineticGrabSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/TelekineticGrabSpell.java
rename to Server/src/main/java/core/game/content/activity/mta/TelekineticGrabSpell.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/TelekineticGuardianDialogue.java b/Server/src/main/java/core/game/content/activity/mta/TelekineticGuardianDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/TelekineticGuardianDialogue.java
rename to Server/src/main/java/core/game/content/activity/mta/TelekineticGuardianDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/impl/AlchemistZone.java b/Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/impl/AlchemistZone.java
rename to Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/impl/EnchantingZone.java b/Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/impl/EnchantingZone.java
rename to Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/impl/GraveyardZone.java b/Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/impl/GraveyardZone.java
rename to Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/impl/TelekineticZone.java b/Server/src/main/java/core/game/content/activity/mta/impl/TelekineticZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/impl/TelekineticZone.java
rename to Server/src/main/java/core/game/content/activity/mta/impl/TelekineticZone.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/package-info.java b/Server/src/main/java/core/game/content/activity/package-info.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/package-info.java
rename to Server/src/main/java/core/game/content/activity/package-info.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/partyroom/BalloonManager.java b/Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/partyroom/BalloonManager.java
rename to Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/partyroom/ChestViewer.java b/Server/src/main/java/core/game/content/activity/partyroom/ChestViewer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/partyroom/ChestViewer.java
rename to Server/src/main/java/core/game/content/activity/partyroom/ChestViewer.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/partyroom/PartyRoomPlugin.java b/Server/src/main/java/core/game/content/activity/partyroom/PartyRoomPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/partyroom/PartyRoomPlugin.java
rename to Server/src/main/java/core/game/content/activity/partyroom/PartyRoomPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/PCIslandZone.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PCIslandZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/PCIslandZone.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/PCIslandZone.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/PCLanderZone.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PCLanderZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/PCLanderZone.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/PCLanderZone.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/PCObjectHandler.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/PCObjectHandler.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/PCPortalNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PCPortalNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/PCPortalNPC.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/PCPortalNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/PCSquireNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PCSquireNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/PCSquireNPC.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/PCSquireNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/PestControlActivityPlugin.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlActivityPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/PestControlActivityPlugin.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/PestControlActivityPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/PestControlSession.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/PestControlSession.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/PestControlSquire.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSquire.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/PestControlSquire.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSquire.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/VoidSealPlugin.java b/Server/src/main/java/core/game/content/activity/pestcontrol/VoidSealPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/VoidSealPlugin.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/VoidSealPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/monsters/PCDefilerNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCDefilerNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/monsters/PCDefilerNPC.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCDefilerNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/monsters/PCRavagerNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCRavagerNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/monsters/PCRavagerNPC.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCRavagerNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/monsters/PCShifterNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCShifterNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/monsters/PCShifterNPC.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCShifterNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/monsters/PCSpinnerNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSpinnerNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/monsters/PCSpinnerNPC.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSpinnerNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/monsters/PCSplatterNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSplatterNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/monsters/PCSplatterNPC.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSplatterNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/monsters/PCTorcherNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCTorcherNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/monsters/PCTorcherNPC.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCTorcherNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/reward/PCIslandOptionPlugin.java b/Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCIslandOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/reward/PCIslandOptionPlugin.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCIslandOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/reward/PCRewardInterface.java b/Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCRewardInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/reward/PCRewardInterface.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCRewardInterface.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/reward/VoidKnightDialogue.java b/Server/src/main/java/core/game/content/activity/pestcontrol/reward/VoidKnightDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/reward/VoidKnightDialogue.java
rename to Server/src/main/java/core/game/content/activity/pestcontrol/reward/VoidKnightDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/puropuro/ElnockInquisitorDialogue.java b/Server/src/main/java/core/game/content/activity/puropuro/ElnockInquisitorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/puropuro/ElnockInquisitorDialogue.java
rename to Server/src/main/java/core/game/content/activity/puropuro/ElnockInquisitorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/puropuro/FairyAerykaDialogue.java b/Server/src/main/java/core/game/content/activity/puropuro/FairyAerykaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/puropuro/FairyAerykaDialogue.java
rename to Server/src/main/java/core/game/content/activity/puropuro/FairyAerykaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/puropuro/ImpDefenderNPC.java b/Server/src/main/java/core/game/content/activity/puropuro/ImpDefenderNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/puropuro/ImpDefenderNPC.java
rename to Server/src/main/java/core/game/content/activity/puropuro/ImpDefenderNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/puropuro/PuroPuroPlugin.java b/Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/puropuro/PuroPuroPlugin.java
rename to Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/puropuro/WanderingImplingDialogue.java b/Server/src/main/java/core/game/content/activity/puropuro/WanderingImplingDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/puropuro/WanderingImplingDialogue.java
rename to Server/src/main/java/core/game/content/activity/puropuro/WanderingImplingDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pyramidplunder/GuardMummyDialogue.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/GuardMummyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pyramidplunder/GuardMummyDialogue.java
rename to Server/src/main/java/core/game/content/activity/pyramidplunder/GuardMummyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PlunderObject.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObject.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PlunderObject.java
rename to Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObject.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PlunderObjectManager.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObjectManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PlunderObjectManager.java
rename to Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObjectManager.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PlunderZones.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderZones.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PlunderZones.java
rename to Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderZones.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidOptionHandler.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidOptionHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidOptionHandler.java
rename to Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidOptionHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidPlunderActivity.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderActivity.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidPlunderActivity.java
rename to Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderActivity.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidPlunderMummyNPC.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderMummyNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidPlunderMummyNPC.java
rename to Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderMummyNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidPlunderNPC.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidPlunderNPC.java
rename to Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidPlunderOptions.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderOptions.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidPlunderOptions.java
rename to Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderOptions.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidPlunderRoom.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderRoom.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidPlunderRoom.java
rename to Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderRoom.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidPlunderSwarmNPC.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderSwarmNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PyramidPlunderSwarmNPC.java
rename to Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderSwarmNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/stronghold/BoxOfHealthDialogue.java b/Server/src/main/java/core/game/content/activity/stronghold/BoxOfHealthDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/stronghold/BoxOfHealthDialogue.java
rename to Server/src/main/java/core/game/content/activity/stronghold/BoxOfHealthDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/stronghold/CradleOfLifeDialogue.java b/Server/src/main/java/core/game/content/activity/stronghold/CradleOfLifeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/stronghold/CradleOfLifeDialogue.java
rename to Server/src/main/java/core/game/content/activity/stronghold/CradleOfLifeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/stronghold/GiftOfPeaceDialogue.java b/Server/src/main/java/core/game/content/activity/stronghold/GiftOfPeaceDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/stronghold/GiftOfPeaceDialogue.java
rename to Server/src/main/java/core/game/content/activity/stronghold/GiftOfPeaceDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/stronghold/GrainOfPlentyDialogue.java b/Server/src/main/java/core/game/content/activity/stronghold/GrainOfPlentyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/stronghold/GrainOfPlentyDialogue.java
rename to Server/src/main/java/core/game/content/activity/stronghold/GrainOfPlentyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/stronghold/StrongHoldSecurityPlugin.java b/Server/src/main/java/core/game/content/activity/stronghold/StrongHoldSecurityPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/stronghold/StrongHoldSecurityPlugin.java
rename to Server/src/main/java/core/game/content/activity/stronghold/StrongHoldSecurityPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/stronghold/playersafety/GuardDialoguePlugin.java b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/GuardDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/stronghold/playersafety/GuardDialoguePlugin.java
rename to Server/src/main/java/core/game/content/activity/stronghold/playersafety/GuardDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java
rename to Server/src/main/java/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/stronghold/playersafety/PlayerSafetyTest.java b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/PlayerSafetyTest.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/stronghold/playersafety/PlayerSafetyTest.java
rename to Server/src/main/java/core/game/content/activity/stronghold/playersafety/PlayerSafetyTest.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/stronghold/playersafety/ProfessorHenryDialogue.java b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/ProfessorHenryDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/stronghold/playersafety/ProfessorHenryDialogue.java
rename to Server/src/main/java/core/game/content/activity/stronghold/playersafety/ProfessorHenryDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/stronghold/playersafety/SafetyMapZone.java b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/SafetyMapZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/stronghold/playersafety/SafetyMapZone.java
rename to Server/src/main/java/core/game/content/activity/stronghold/playersafety/SafetyMapZone.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/stronghold/playersafety/StrongHoldOfPlayerSafetyPlugin.java b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/StrongHoldOfPlayerSafetyPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/stronghold/playersafety/StrongHoldOfPlayerSafetyPlugin.java
rename to Server/src/main/java/core/game/content/activity/stronghold/playersafety/StrongHoldOfPlayerSafetyPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/tzhaar/TzhaarFightCaveNPC.java b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCaveNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/tzhaar/TzhaarFightCaveNPC.java
rename to Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCaveNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java
rename to Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java
rename to Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/wguild/WarriorsGuild.java b/Server/src/main/java/core/game/content/activity/wguild/WarriorsGuild.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/wguild/WarriorsGuild.java
rename to Server/src/main/java/core/game/content/activity/wguild/WarriorsGuild.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/wguild/animator/AnimatedArmour.java b/Server/src/main/java/core/game/content/activity/wguild/animator/AnimatedArmour.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/wguild/animator/AnimatedArmour.java
rename to Server/src/main/java/core/game/content/activity/wguild/animator/AnimatedArmour.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/wguild/animator/AnimationRoom.java b/Server/src/main/java/core/game/content/activity/wguild/animator/AnimationRoom.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/wguild/animator/AnimationRoom.java
rename to Server/src/main/java/core/game/content/activity/wguild/animator/AnimationRoom.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/wguild/barrel/BarrelRoom.java b/Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/wguild/barrel/BarrelRoom.java
rename to Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/wguild/catapult/CatapultRoom.java b/Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/wguild/catapult/CatapultRoom.java
rename to Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java b/Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java
rename to Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/wguild/dummy/DummyRoom.java b/Server/src/main/java/core/game/content/activity/wguild/dummy/DummyRoom.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/wguild/dummy/DummyRoom.java
rename to Server/src/main/java/core/game/content/activity/wguild/dummy/DummyRoom.java
diff --git a/Server/src/main/java/Server/core/game/content/activity/wguild/shot/ShotPutRoom.java b/Server/src/main/java/core/game/content/activity/wguild/shot/ShotPutRoom.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/wguild/shot/ShotPutRoom.java
rename to Server/src/main/java/core/game/content/activity/wguild/shot/ShotPutRoom.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/AntiMacroDialogue.java b/Server/src/main/java/core/game/content/ame/AntiMacroDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/AntiMacroDialogue.java
rename to Server/src/main/java/core/game/content/ame/AntiMacroDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/AntiMacroEvent.java b/Server/src/main/java/core/game/content/ame/AntiMacroEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/AntiMacroEvent.java
rename to Server/src/main/java/core/game/content/ame/AntiMacroEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/AntiMacroHandler.java b/Server/src/main/java/core/game/content/ame/AntiMacroHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/AntiMacroHandler.java
rename to Server/src/main/java/core/game/content/ame/AntiMacroHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/AntiMacroNPC.java b/Server/src/main/java/core/game/content/ame/AntiMacroNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/AntiMacroNPC.java
rename to Server/src/main/java/core/game/content/ame/AntiMacroNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/ExperienceMonitor.java b/Server/src/main/java/core/game/content/ame/ExperienceMonitor.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/ExperienceMonitor.java
rename to Server/src/main/java/core/game/content/ame/ExperienceMonitor.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/drilldemon/DrillDemonEvent.java b/Server/src/main/java/core/game/content/ame/events/drilldemon/DrillDemonEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/drilldemon/DrillDemonEvent.java
rename to Server/src/main/java/core/game/content/ame/events/drilldemon/DrillDemonEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/drilldemon/SergeantDamienNPC.java b/Server/src/main/java/core/game/content/ame/events/drilldemon/SergeantDamienNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/drilldemon/SergeantDamienNPC.java
rename to Server/src/main/java/core/game/content/ame/events/drilldemon/SergeantDamienNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/drunkdwarf/DrunkDwarfEvent.java b/Server/src/main/java/core/game/content/ame/events/drunkdwarf/DrunkDwarfEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/drunkdwarf/DrunkDwarfEvent.java
rename to Server/src/main/java/core/game/content/ame/events/drunkdwarf/DrunkDwarfEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/drunkdwarf/DrunkenDwarfNPC.java b/Server/src/main/java/core/game/content/ame/events/drunkdwarf/DrunkenDwarfNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/drunkdwarf/DrunkenDwarfNPC.java
rename to Server/src/main/java/core/game/content/ame/events/drunkdwarf/DrunkenDwarfNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/evilchicken/EvilChickenNPC.java b/Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/evilchicken/EvilChickenNPC.java
rename to Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/evilchicken/EvilChickenRandomEvent.java b/Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenRandomEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/evilchicken/EvilChickenRandomEvent.java
rename to Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenRandomEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/eviltwin/EvilTwinRandomEvent.java b/Server/src/main/java/core/game/content/ame/events/eviltwin/EvilTwinRandomEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/eviltwin/EvilTwinRandomEvent.java
rename to Server/src/main/java/core/game/content/ame/events/eviltwin/EvilTwinRandomEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/eviltwin/MollyDialogue.java b/Server/src/main/java/core/game/content/ame/events/eviltwin/MollyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/eviltwin/MollyDialogue.java
rename to Server/src/main/java/core/game/content/ame/events/eviltwin/MollyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/eviltwin/TwinClothColor.java b/Server/src/main/java/core/game/content/ame/events/eviltwin/TwinClothColor.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/eviltwin/TwinClothColor.java
rename to Server/src/main/java/core/game/content/ame/events/eviltwin/TwinClothColor.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/genie/GenieNPC.java b/Server/src/main/java/core/game/content/ame/events/genie/GenieNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/genie/GenieNPC.java
rename to Server/src/main/java/core/game/content/ame/events/genie/GenieNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/genie/GenieRandomEvent.java b/Server/src/main/java/core/game/content/ame/events/genie/GenieRandomEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/genie/GenieRandomEvent.java
rename to Server/src/main/java/core/game/content/ame/events/genie/GenieRandomEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/lostandfound/LostFoundRandomEvent.java b/Server/src/main/java/core/game/content/ame/events/lostandfound/LostFoundRandomEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/lostandfound/LostFoundRandomEvent.java
rename to Server/src/main/java/core/game/content/ame/events/lostandfound/LostFoundRandomEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/lostpirate/CapnHandEvent.java b/Server/src/main/java/core/game/content/ame/events/lostpirate/CapnHandEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/lostpirate/CapnHandEvent.java
rename to Server/src/main/java/core/game/content/ame/events/lostpirate/CapnHandEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/lostpirate/CapnHandNPC.java b/Server/src/main/java/core/game/content/ame/events/lostpirate/CapnHandNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/lostpirate/CapnHandNPC.java
rename to Server/src/main/java/core/game/content/ame/events/lostpirate/CapnHandNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java b/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java
rename to Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/quizmaster/QuizMasterEvent.java b/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/quizmaster/QuizMasterEvent.java
rename to Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/quizmaster/QuizMasterNPC.java b/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/quizmaster/QuizMasterNPC.java
rename to Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/rickturpentine/RickTurpentineEvent.java b/Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/rickturpentine/RickTurpentineEvent.java
rename to Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/rickturpentine/RickTurpentineNPC.java b/Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/rickturpentine/RickTurpentineNPC.java
rename to Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/rivertroll/RiverTrollEvent.java b/Server/src/main/java/core/game/content/ame/events/rivertroll/RiverTrollEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/rivertroll/RiverTrollEvent.java
rename to Server/src/main/java/core/game/content/ame/events/rivertroll/RiverTrollEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/rivertroll/RiverTrollNPC.java b/Server/src/main/java/core/game/content/ame/events/rivertroll/RiverTrollNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/rivertroll/RiverTrollNPC.java
rename to Server/src/main/java/core/game/content/ame/events/rivertroll/RiverTrollNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/shade/ShadeEvent.java b/Server/src/main/java/core/game/content/ame/events/shade/ShadeEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/shade/ShadeEvent.java
rename to Server/src/main/java/core/game/content/ame/events/shade/ShadeEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/shade/ShadeNPC.java b/Server/src/main/java/core/game/content/ame/events/shade/ShadeNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/shade/ShadeNPC.java
rename to Server/src/main/java/core/game/content/ame/events/shade/ShadeNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/treespirit/TreeSpiritEvent.java b/Server/src/main/java/core/game/content/ame/events/treespirit/TreeSpiritEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/treespirit/TreeSpiritEvent.java
rename to Server/src/main/java/core/game/content/ame/events/treespirit/TreeSpiritEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/treespirit/TreeSpiritRandomNPC.java b/Server/src/main/java/core/game/content/ame/events/treespirit/TreeSpiritRandomNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/treespirit/TreeSpiritRandomNPC.java
rename to Server/src/main/java/core/game/content/ame/events/treespirit/TreeSpiritRandomNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/zombie/ZombieAmeNPC.java b/Server/src/main/java/core/game/content/ame/events/zombie/ZombieAmeNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/zombie/ZombieAmeNPC.java
rename to Server/src/main/java/core/game/content/ame/events/zombie/ZombieAmeNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/zombie/ZombieEvent.java b/Server/src/main/java/core/game/content/ame/events/zombie/ZombieEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/zombie/ZombieEvent.java
rename to Server/src/main/java/core/game/content/ame/events/zombie/ZombieEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/BarbarianMix.java b/Server/src/main/java/core/game/content/consumable/BarbarianMix.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/BarbarianMix.java
rename to Server/src/main/java/core/game/content/consumable/BarbarianMix.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/Cake.java b/Server/src/main/java/core/game/content/consumable/Cake.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/Cake.java
rename to Server/src/main/java/core/game/content/consumable/Cake.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/Consumable.java b/Server/src/main/java/core/game/content/consumable/Consumable.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/Consumable.java
rename to Server/src/main/java/core/game/content/consumable/Consumable.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/ConsumableEffect.java b/Server/src/main/java/core/game/content/consumable/ConsumableEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/ConsumableEffect.java
rename to Server/src/main/java/core/game/content/consumable/ConsumableEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/Consumables.java b/Server/src/main/java/core/game/content/consumable/Consumables.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/Consumables.java
rename to Server/src/main/java/core/game/content/consumable/Consumables.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/CookingProperties.java b/Server/src/main/java/core/game/content/consumable/CookingProperties.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/CookingProperties.java
rename to Server/src/main/java/core/game/content/consumable/CookingProperties.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/Drink.java b/Server/src/main/java/core/game/content/consumable/Drink.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/Drink.java
rename to Server/src/main/java/core/game/content/consumable/Drink.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/FakeConsumable.java b/Server/src/main/java/core/game/content/consumable/FakeConsumable.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/FakeConsumable.java
rename to Server/src/main/java/core/game/content/consumable/FakeConsumable.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/Food.java b/Server/src/main/java/core/game/content/consumable/Food.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/Food.java
rename to Server/src/main/java/core/game/content/consumable/Food.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/HalfableFood.java b/Server/src/main/java/core/game/content/consumable/HalfableFood.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/HalfableFood.java
rename to Server/src/main/java/core/game/content/consumable/HalfableFood.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/Potion.java b/Server/src/main/java/core/game/content/consumable/Potion.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/Potion.java
rename to Server/src/main/java/core/game/content/consumable/Potion.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/AchievementEffect.java b/Server/src/main/java/core/game/content/consumable/effects/AchievementEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/AchievementEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/AchievementEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/DamageEffect.java b/Server/src/main/java/core/game/content/consumable/effects/DamageEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/DamageEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/DamageEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/DraynorCabbageEffect.java b/Server/src/main/java/core/game/content/consumable/effects/DraynorCabbageEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/DraynorCabbageEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/DraynorCabbageEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/DwarvenRockCakeEffect.java b/Server/src/main/java/core/game/content/consumable/effects/DwarvenRockCakeEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/DwarvenRockCakeEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/DwarvenRockCakeEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/EnergyEffect.java b/Server/src/main/java/core/game/content/consumable/effects/EnergyEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/EnergyEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/EnergyEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/HealingEffect.java b/Server/src/main/java/core/game/content/consumable/effects/HealingEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/HealingEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/HealingEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/KebabEffect.java b/Server/src/main/java/core/game/content/consumable/effects/KebabEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/KebabEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/KebabEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/KegOfBeerEffect.java b/Server/src/main/java/core/game/content/consumable/effects/KegOfBeerEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/KegOfBeerEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/KegOfBeerEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/MatureWmbEffect.java b/Server/src/main/java/core/game/content/consumable/effects/MatureWmbEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/MatureWmbEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/MatureWmbEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/MultiEffect.java b/Server/src/main/java/core/game/content/consumable/effects/MultiEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/MultiEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/MultiEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/NettleTeaEffect.java b/Server/src/main/java/core/game/content/consumable/effects/NettleTeaEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/NettleTeaEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/NettleTeaEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/PercentHeal.java b/Server/src/main/java/core/game/content/consumable/effects/PercentHeal.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/PercentHeal.java
rename to Server/src/main/java/core/game/content/consumable/effects/PercentHeal.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/PercentageHealthEffect.java b/Server/src/main/java/core/game/content/consumable/effects/PercentageHealthEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/PercentageHealthEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/PercentageHealthEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/PoisonEffect.java b/Server/src/main/java/core/game/content/consumable/effects/PoisonEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/PoisonEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/PoisonEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/PoisonKarambwanEffect.java b/Server/src/main/java/core/game/content/consumable/effects/PoisonKarambwanEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/PoisonKarambwanEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/PoisonKarambwanEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/PrayerEffect.java b/Server/src/main/java/core/game/content/consumable/effects/PrayerEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/PrayerEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/PrayerEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/RandomEnergyEffect.java b/Server/src/main/java/core/game/content/consumable/effects/RandomEnergyEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/RandomEnergyEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/RandomEnergyEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/RandomHealthEffect.java b/Server/src/main/java/core/game/content/consumable/effects/RandomHealthEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/RandomHealthEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/RandomHealthEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/RandomPrayerEffect.java b/Server/src/main/java/core/game/content/consumable/effects/RandomPrayerEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/RandomPrayerEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/RandomPrayerEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/RandomSkillEffect.java b/Server/src/main/java/core/game/content/consumable/effects/RandomSkillEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/RandomSkillEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/RandomSkillEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/RemoveStateEffect.java b/Server/src/main/java/core/game/content/consumable/effects/RemoveStateEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/RemoveStateEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/RemoveStateEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/RestoreEffect.java b/Server/src/main/java/core/game/content/consumable/effects/RestoreEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/RestoreEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/RestoreEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/RockCakeEffect.java b/Server/src/main/java/core/game/content/consumable/effects/RockCakeEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/RockCakeEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/RockCakeEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/SetAttributeEffect.java b/Server/src/main/java/core/game/content/consumable/effects/SetAttributeEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/SetAttributeEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/SetAttributeEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/SkillEffect.java b/Server/src/main/java/core/game/content/consumable/effects/SkillEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/SkillEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/SkillEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/SmellingUgthankiKebabEffect.java b/Server/src/main/java/core/game/content/consumable/effects/SmellingUgthankiKebabEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/SmellingUgthankiKebabEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/SmellingUgthankiKebabEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/SuperKebabEffect.java b/Server/src/main/java/core/game/content/consumable/effects/SuperKebabEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/SuperKebabEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/SuperKebabEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/TroubleBrewingRumEffect.java b/Server/src/main/java/core/game/content/consumable/effects/TroubleBrewingRumEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/TroubleBrewingRumEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/TroubleBrewingRumEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/UgthankiKebabEffect.java b/Server/src/main/java/core/game/content/consumable/effects/UgthankiKebabEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/UgthankiKebabEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/UgthankiKebabEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/WizardsMindBombEffect.java b/Server/src/main/java/core/game/content/consumable/effects/WizardsMindBombEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/WizardsMindBombEffect.java
rename to Server/src/main/java/core/game/content/consumable/effects/WizardsMindBombEffect.java
diff --git a/Server/src/main/java/Server/core/game/content/cutscene/DBRCutscenePlugin.java b/Server/src/main/java/core/game/content/cutscene/DBRCutscenePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/cutscene/DBRCutscenePlugin.java
rename to Server/src/main/java/core/game/content/cutscene/DBRCutscenePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/cutscene/GECutscenePlugin.java b/Server/src/main/java/core/game/content/cutscene/GECutscenePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/cutscene/GECutscenePlugin.java
rename to Server/src/main/java/core/game/content/cutscene/GECutscenePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/cutscene/JulietCutscenePlugin.java b/Server/src/main/java/core/game/content/cutscene/JulietCutscenePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/cutscene/JulietCutscenePlugin.java
rename to Server/src/main/java/core/game/content/cutscene/JulietCutscenePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/cutscene/JulietDialogue.java b/Server/src/main/java/core/game/content/cutscene/JulietDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/cutscene/JulietDialogue.java
rename to Server/src/main/java/core/game/content/cutscene/JulietDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/cutscene/OrganCutScene.java b/Server/src/main/java/core/game/content/cutscene/OrganCutScene.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/cutscene/OrganCutScene.java
rename to Server/src/main/java/core/game/content/cutscene/OrganCutScene.java
diff --git a/Server/src/main/java/Server/core/game/content/cutscene/RJCutscenePlugin.java b/Server/src/main/java/core/game/content/cutscene/RJCutscenePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/cutscene/RJCutscenePlugin.java
rename to Server/src/main/java/core/game/content/cutscene/RJCutscenePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AablaDialogue.java b/Server/src/main/java/core/game/content/dialogue/AablaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AablaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/AablaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AbbotLangleyDialogue.java b/Server/src/main/java/core/game/content/dialogue/AbbotLangleyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AbbotLangleyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/AbbotLangleyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ActivateEnchantedGem.java b/Server/src/main/java/core/game/content/dialogue/ActivateEnchantedGem.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ActivateEnchantedGem.java
rename to Server/src/main/java/core/game/content/dialogue/ActivateEnchantedGem.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AeonisigRaispher.java b/Server/src/main/java/core/game/content/dialogue/AeonisigRaispher.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AeonisigRaispher.java
rename to Server/src/main/java/core/game/content/dialogue/AeonisigRaispher.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AggieDialogue.java b/Server/src/main/java/core/game/content/dialogue/AggieDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AggieDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/AggieDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AhabDialogue.java b/Server/src/main/java/core/game/content/dialogue/AhabDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AhabDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/AhabDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AjjatDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/AjjatDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AjjatDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/AjjatDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AleckDialogue.java b/Server/src/main/java/core/game/content/dialogue/AleckDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AleckDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/AleckDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AlfonseWaiterDialogue.java b/Server/src/main/java/core/game/content/dialogue/AlfonseWaiterDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AlfonseWaiterDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/AlfonseWaiterDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AmbassadorFernook.java b/Server/src/main/java/core/game/content/dialogue/AmbassadorFernook.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AmbassadorFernook.java
rename to Server/src/main/java/core/game/content/dialogue/AmbassadorFernook.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AnjaDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/AnjaDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AnjaDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/AnjaDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AnnaIsaakson.java b/Server/src/main/java/core/game/content/dialogue/AnnaIsaakson.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AnnaIsaakson.java
rename to Server/src/main/java/core/game/content/dialogue/AnnaIsaakson.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AntonDialogue.java b/Server/src/main/java/core/game/content/dialogue/AntonDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AntonDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/AntonDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ApothecaryDialogue.java b/Server/src/main/java/core/game/content/dialogue/ApothecaryDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ApothecaryDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ApothecaryDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ArchaeologicalExpertDialogue.java b/Server/src/main/java/core/game/content/dialogue/ArchaeologicalExpertDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ArchaeologicalExpertDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ArchaeologicalExpertDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ArdougneBaker.java b/Server/src/main/java/core/game/content/dialogue/ArdougneBaker.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ArdougneBaker.java
rename to Server/src/main/java/core/game/content/dialogue/ArdougneBaker.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ArdougneShopKeeperPlugin.java b/Server/src/main/java/core/game/content/dialogue/ArdougneShopKeeperPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ArdougneShopKeeperPlugin.java
rename to Server/src/main/java/core/game/content/dialogue/ArdougneShopKeeperPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BKListenDialogue.java b/Server/src/main/java/core/game/content/dialogue/BKListenDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BKListenDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BKListenDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BananaCrateDialogue.java b/Server/src/main/java/core/game/content/dialogue/BananaCrateDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BananaCrateDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BananaCrateDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BanditCampBartenderDialogue.java b/Server/src/main/java/core/game/content/dialogue/BanditCampBartenderDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BanditCampBartenderDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BanditCampBartenderDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BankerTutorDialogue.java b/Server/src/main/java/core/game/content/dialogue/BankerTutorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BankerTutorDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BankerTutorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BaraekDialogue.java b/Server/src/main/java/core/game/content/dialogue/BaraekDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BaraekDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BaraekDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BarbarianDialogue.java b/Server/src/main/java/core/game/content/dialogue/BarbarianDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BarbarianDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BarbarianDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BarfyBill.java b/Server/src/main/java/core/game/content/dialogue/BarfyBill.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BarfyBill.java
rename to Server/src/main/java/core/game/content/dialogue/BarfyBill.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BarkerDialogue.java b/Server/src/main/java/core/game/content/dialogue/BarkerDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BarkerDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BarkerDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BeaverDialogue.java b/Server/src/main/java/core/game/content/dialogue/BeaverDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BeaverDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BeaverDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BennyDialogue.java b/Server/src/main/java/core/game/content/dialogue/BennyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BennyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BennyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BernaldDialogue.java b/Server/src/main/java/core/game/content/dialogue/BernaldDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BernaldDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BernaldDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BettyDialogue.java b/Server/src/main/java/core/game/content/dialogue/BettyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BettyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BettyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BillTeachDialogue.java b/Server/src/main/java/core/game/content/dialogue/BillTeachDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BillTeachDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BillTeachDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BobBarterDialogue.java b/Server/src/main/java/core/game/content/dialogue/BobBarterDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BobBarterDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BobBarterDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BootDialogue.java b/Server/src/main/java/core/game/content/dialogue/BootDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BootDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BootDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BorderGuardDialogue.java b/Server/src/main/java/core/game/content/dialogue/BorderGuardDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BorderGuardDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BorderGuardDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BreocaDialogue.java b/Server/src/main/java/core/game/content/dialogue/BreocaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BreocaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BreocaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BrianArcheryDialogue.java b/Server/src/main/java/core/game/content/dialogue/BrianArcheryDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BrianArcheryDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BrianArcheryDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BrianORichardDialogue.java b/Server/src/main/java/core/game/content/dialogue/BrianORichardDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BrianORichardDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BrianORichardDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BrimhavenBartenderDialogue.java b/Server/src/main/java/core/game/content/dialogue/BrimhavenBartenderDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BrimhavenBartenderDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BrimhavenBartenderDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BrimhavenPirateDialogue.java b/Server/src/main/java/core/game/content/dialogue/BrimhavenPirateDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BrimhavenPirateDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BrimhavenPirateDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BrosDialogue.java b/Server/src/main/java/core/game/content/dialogue/BrosDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BrosDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BrosDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BrotherJeredDialogue.java b/Server/src/main/java/core/game/content/dialogue/BrotherJeredDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BrotherJeredDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BrotherJeredDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BurthorpeSoldierDialogue.java b/Server/src/main/java/core/game/content/dialogue/BurthorpeSoldierDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BurthorpeSoldierDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/BurthorpeSoldierDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CabinBoyJenkins.java b/Server/src/main/java/core/game/content/dialogue/CabinBoyJenkins.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CabinBoyJenkins.java
rename to Server/src/main/java/core/game/content/dialogue/CabinBoyJenkins.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CallistoCubDialogue.java b/Server/src/main/java/core/game/content/dialogue/CallistoCubDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CallistoCubDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CallistoCubDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CamelDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/CamelDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CamelDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/CamelDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CamelotGuardDialogue.java b/Server/src/main/java/core/game/content/dialogue/CamelotGuardDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CamelotGuardDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CamelotGuardDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CandleSellerPlugin.java b/Server/src/main/java/core/game/content/dialogue/CandleSellerPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CandleSellerPlugin.java
rename to Server/src/main/java/core/game/content/dialogue/CandleSellerPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CapeMerchantDialogue.java b/Server/src/main/java/core/game/content/dialogue/CapeMerchantDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CapeMerchantDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CapeMerchantDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CapnIzzyDialogue.java b/Server/src/main/java/core/game/content/dialogue/CapnIzzyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CapnIzzyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CapnIzzyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CaptainBarnabyDialogue.java b/Server/src/main/java/core/game/content/dialogue/CaptainBarnabyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CaptainBarnabyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CaptainBarnabyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CaptainBentleyDialogue.java b/Server/src/main/java/core/game/content/dialogue/CaptainBentleyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CaptainBentleyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CaptainBentleyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CaptainDalburDialogue.java b/Server/src/main/java/core/game/content/dialogue/CaptainDalburDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CaptainDalburDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CaptainDalburDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CaptainShanksDialogue.java b/Server/src/main/java/core/game/content/dialogue/CaptainShanksDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CaptainShanksDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CaptainShanksDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CassieDialogue.java b/Server/src/main/java/core/game/content/dialogue/CassieDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CassieDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CassieDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CaveMonk.java b/Server/src/main/java/core/game/content/dialogue/CaveMonk.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CaveMonk.java
rename to Server/src/main/java/core/game/content/dialogue/CaveMonk.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CeolburgDialogue.java b/Server/src/main/java/core/game/content/dialogue/CeolburgDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CeolburgDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CeolburgDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ChaosElementalJRDialogue.java b/Server/src/main/java/core/game/content/dialogue/ChaosElementalJRDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ChaosElementalJRDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ChaosElementalJRDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CharlieTheTrampDialogue.java b/Server/src/main/java/core/game/content/dialogue/CharlieTheTrampDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CharlieTheTrampDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CharlieTheTrampDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ChemistDialogue.java b/Server/src/main/java/core/game/content/dialogue/ChemistDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ChemistDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ChemistDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ConeDialogue.java b/Server/src/main/java/core/game/content/dialogue/ConeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ConeDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ConeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CookingTutorDialogue.java b/Server/src/main/java/core/game/content/dialogue/CookingTutorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CookingTutorDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CookingTutorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CraftingTutorDialogue.java b/Server/src/main/java/core/game/content/dialogue/CraftingTutorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CraftingTutorDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CraftingTutorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CrossbowDialogue.java b/Server/src/main/java/core/game/content/dialogue/CrossbowDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CrossbowDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CrossbowDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CuffsDialogue.java b/Server/src/main/java/core/game/content/dialogue/CuffsDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CuffsDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CuffsDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/CustomsOfficerDialogue.java b/Server/src/main/java/core/game/content/dialogue/CustomsOfficerDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/CustomsOfficerDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/CustomsOfficerDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DSChestDialogue.java b/Server/src/main/java/core/game/content/dialogue/DSChestDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DSChestDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DSChestDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DairyChurnDialogue.java b/Server/src/main/java/core/game/content/dialogue/DairyChurnDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DairyChurnDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DairyChurnDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DairyChurnOptionPlugin.java b/Server/src/main/java/core/game/content/dialogue/DairyChurnOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DairyChurnOptionPlugin.java
rename to Server/src/main/java/core/game/content/dialogue/DairyChurnOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DartCreateDialogue.java b/Server/src/main/java/core/game/content/dialogue/DartCreateDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DartCreateDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DartCreateDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DavonDialogue.java b/Server/src/main/java/core/game/content/dialogue/DavonDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DavonDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DavonDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DelMontyDialogue.java b/Server/src/main/java/core/game/content/dialogue/DelMontyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DelMontyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DelMontyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DenulthDialogue.java b/Server/src/main/java/core/game/content/dialogue/DenulthDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DenulthDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DenulthDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DestroyItemPlugin.java b/Server/src/main/java/core/game/content/dialogue/DestroyItemPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DestroyItemPlugin.java
rename to Server/src/main/java/core/game/content/dialogue/DestroyItemPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DialogueAction.java b/Server/src/main/java/core/game/content/dialogue/DialogueAction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DialogueAction.java
rename to Server/src/main/java/core/game/content/dialogue/DialogueAction.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DialogueInterpreter.java b/Server/src/main/java/core/game/content/dialogue/DialogueInterpreter.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DialogueInterpreter.java
rename to Server/src/main/java/core/game/content/dialogue/DialogueInterpreter.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/DialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/DialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DiangoDialogue.java b/Server/src/main/java/core/game/content/dialogue/DiangoDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DiangoDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DiangoDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DismissDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/DismissDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DismissDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/DismissDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DommikDialogue.java b/Server/src/main/java/core/game/content/dialogue/DommikDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DommikDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DommikDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DonieDialogue.java b/Server/src/main/java/core/game/content/dialogue/DonieDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DonieDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DonieDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DoomsayerDialogue.java b/Server/src/main/java/core/game/content/dialogue/DoomsayerDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DoomsayerDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DoomsayerDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DoorPerilDialogue.java b/Server/src/main/java/core/game/content/dialogue/DoorPerilDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DoorPerilDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DoorPerilDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DoricDialogue.java b/Server/src/main/java/core/game/content/dialogue/DoricDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DoricDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DoricDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DrHarlowDialogue.java b/Server/src/main/java/core/game/content/dialogue/DrHarlowDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DrHarlowDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DrHarlowDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DrOnglewipDialogue.java b/Server/src/main/java/core/game/content/dialogue/DrOnglewipDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DrOnglewipDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DrOnglewipDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DragonShieldDialogue.java b/Server/src/main/java/core/game/content/dialogue/DragonShieldDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DragonShieldDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DragonShieldDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DraulLeptoc.java b/Server/src/main/java/core/game/content/dialogue/DraulLeptoc.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DraulLeptoc.java
rename to Server/src/main/java/core/game/content/dialogue/DraulLeptoc.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DraynorBankGuard.java b/Server/src/main/java/core/game/content/dialogue/DraynorBankGuard.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DraynorBankGuard.java
rename to Server/src/main/java/core/game/content/dialogue/DraynorBankGuard.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DrezelDialogue.java b/Server/src/main/java/core/game/content/dialogue/DrezelDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DrezelDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DrezelDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DrezelMonumentDialogue.java b/Server/src/main/java/core/game/content/dialogue/DrezelMonumentDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DrezelMonumentDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DrezelMonumentDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DrokarDialogue.java b/Server/src/main/java/core/game/content/dialogue/DrokarDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DrokarDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DrokarDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DumpContainer.java b/Server/src/main/java/core/game/content/dialogue/DumpContainer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DumpContainer.java
rename to Server/src/main/java/core/game/content/dialogue/DumpContainer.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DunstanDialogue.java b/Server/src/main/java/core/game/content/dialogue/DunstanDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DunstanDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DunstanDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DwarfShopDialogue.java b/Server/src/main/java/core/game/content/dialogue/DwarfShopDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DwarfShopDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/DwarfShopDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/EadburgDialogue.java b/Server/src/main/java/core/game/content/dialogue/EadburgDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/EadburgDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/EadburgDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/EblisDialogue.java b/Server/src/main/java/core/game/content/dialogue/EblisDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/EblisDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/EblisDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/EdgevilleMonkDialogue.java b/Server/src/main/java/core/game/content/dialogue/EdgevilleMonkDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/EdgevilleMonkDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/EdgevilleMonkDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/EdgevilleShopKeeperDialogue.java b/Server/src/main/java/core/game/content/dialogue/EdgevilleShopKeeperDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/EdgevilleShopKeeperDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/EdgevilleShopKeeperDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/EllamariaDialogue.java b/Server/src/main/java/core/game/content/dialogue/EllamariaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/EllamariaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/EllamariaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/EllyTheCamelDialogue.java b/Server/src/main/java/core/game/content/dialogue/EllyTheCamelDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/EllyTheCamelDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/EllyTheCamelDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/EmeraldBenedictDialogue.java b/Server/src/main/java/core/game/content/dialogue/EmeraldBenedictDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/EmeraldBenedictDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/EmeraldBenedictDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/EnchantTiaraDialogue.java b/Server/src/main/java/core/game/content/dialogue/EnchantTiaraDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/EnchantTiaraDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/EnchantTiaraDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/EntranaChurchMonk.java b/Server/src/main/java/core/game/content/dialogue/EntranaChurchMonk.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/EntranaChurchMonk.java
rename to Server/src/main/java/core/game/content/dialogue/EntranaChurchMonk.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ErnestDialogue.java b/Server/src/main/java/core/game/content/dialogue/ErnestDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ErnestDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ErnestDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/EventLocatorDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/EventLocatorDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/EventLocatorDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/EventLocatorDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ExplorerJackDialogue.java b/Server/src/main/java/core/game/content/dialogue/ExplorerJackDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ExplorerJackDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ExplorerJackDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FacialExpression.java b/Server/src/main/java/core/game/content/dialogue/FacialExpression.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FacialExpression.java
rename to Server/src/main/java/core/game/content/dialogue/FacialExpression.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FadliDialogue.java b/Server/src/main/java/core/game/content/dialogue/FadliDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FadliDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FadliDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FaladorGardenerDialogue.java b/Server/src/main/java/core/game/content/dialogue/FaladorGardenerDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FaladorGardenerDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FaladorGardenerDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FaladorManHouseDialogue.java b/Server/src/main/java/core/game/content/dialogue/FaladorManHouseDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FaladorManHouseDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FaladorManHouseDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FaladorShopKeeperDialogue.java b/Server/src/main/java/core/game/content/dialogue/FaladorShopKeeperDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FaladorShopKeeperDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FaladorShopKeeperDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FaladorSquireDialogue.java b/Server/src/main/java/core/game/content/dialogue/FaladorSquireDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FaladorSquireDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FaladorSquireDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FaladorWomenParkDialogue.java b/Server/src/main/java/core/game/content/dialogue/FaladorWomenParkDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FaladorWomenParkDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FaladorWomenParkDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FamiliarDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/FamiliarDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FamiliarDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/FamiliarDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FaridMorrisaneDialogue.java b/Server/src/main/java/core/game/content/dialogue/FaridMorrisaneDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FaridMorrisaneDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FaridMorrisaneDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FatherLawrenceDialogue.java b/Server/src/main/java/core/game/content/dialogue/FatherLawrenceDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FatherLawrenceDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FatherLawrenceDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FenitasDialogue.java b/Server/src/main/java/core/game/content/dialogue/FenitasDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FenitasDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FenitasDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FilelioDialogue.java b/Server/src/main/java/core/game/content/dialogue/FilelioDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FilelioDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FilelioDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FishingTutorDialogue.java b/Server/src/main/java/core/game/content/dialogue/FishingTutorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FishingTutorDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FishingTutorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FlynnDialogue.java b/Server/src/main/java/core/game/content/dialogue/FlynnDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FlynnDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FlynnDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FortressGuardDialogue.java b/Server/src/main/java/core/game/content/dialogue/FortressGuardDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FortressGuardDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FortressGuardDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FortunatoDialogue.java b/Server/src/main/java/core/game/content/dialogue/FortunatoDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FortunatoDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FortunatoDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FredTheFarmer.java b/Server/src/main/java/core/game/content/dialogue/FredTheFarmer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FredTheFarmer.java
rename to Server/src/main/java/core/game/content/dialogue/FredTheFarmer.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FrincosDialogue.java b/Server/src/main/java/core/game/content/dialogue/FrincosDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FrincosDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FrincosDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FritzGlassBlowerDialogue.java b/Server/src/main/java/core/game/content/dialogue/FritzGlassBlowerDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FritzGlassBlowerDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/FritzGlassBlowerDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/FurTradePlugin.java b/Server/src/main/java/core/game/content/dialogue/FurTradePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/FurTradePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/FurTradePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GWDKnightDialogue.java b/Server/src/main/java/core/game/content/dialogue/GWDKnightDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GWDKnightDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GWDKnightDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GalahadDialogue.java b/Server/src/main/java/core/game/content/dialogue/GalahadDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GalahadDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GalahadDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GamFredDialoue.java b/Server/src/main/java/core/game/content/dialogue/GamFredDialoue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GamFredDialoue.java
rename to Server/src/main/java/core/game/content/dialogue/GamFredDialoue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GarvDialogue.java b/Server/src/main/java/core/game/content/dialogue/GarvDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GarvDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GarvDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GeeDialogue.java b/Server/src/main/java/core/game/content/dialogue/GeeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GeeDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GeeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GemMerchantDialogue.java b/Server/src/main/java/core/game/content/dialogue/GemMerchantDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GemMerchantDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GemMerchantDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GemTradeDialogue.java b/Server/src/main/java/core/game/content/dialogue/GemTradeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GemTradeDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GemTradeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GerrantDialogue.java b/Server/src/main/java/core/game/content/dialogue/GerrantDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GerrantDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GerrantDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GertrudeDialogue.java b/Server/src/main/java/core/game/content/dialogue/GertrudeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GertrudeDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GertrudeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GertrudesCatDialogue.java b/Server/src/main/java/core/game/content/dialogue/GertrudesCatDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GertrudesCatDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GertrudesCatDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GhommalDialogue.java b/Server/src/main/java/core/game/content/dialogue/GhommalDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GhommalDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GhommalDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GnomeSpiritTreeDialogue.java b/Server/src/main/java/core/game/content/dialogue/GnomeSpiritTreeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GnomeSpiritTreeDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GnomeSpiritTreeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GnomeTrainerPlugin.java b/Server/src/main/java/core/game/content/dialogue/GnomeTrainerPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GnomeTrainerPlugin.java
rename to Server/src/main/java/core/game/content/dialogue/GnomeTrainerPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GoblinVillageDialogue.java b/Server/src/main/java/core/game/content/dialogue/GoblinVillageDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GoblinVillageDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GoblinVillageDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GoblinVillageGuardDialogue.java b/Server/src/main/java/core/game/content/dialogue/GoblinVillageGuardDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GoblinVillageGuardDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GoblinVillageGuardDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GodswordDialogue.java b/Server/src/main/java/core/game/content/dialogue/GodswordDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GodswordDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GodswordDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GraardoorJRDialogue.java b/Server/src/main/java/core/game/content/dialogue/GraardoorJRDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GraardoorJRDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GraardoorJRDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GrandExchangeClerk.java b/Server/src/main/java/core/game/content/dialogue/GrandExchangeClerk.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GrandExchangeClerk.java
rename to Server/src/main/java/core/game/content/dialogue/GrandExchangeClerk.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GrandExchangeTutor.java b/Server/src/main/java/core/game/content/dialogue/GrandExchangeTutor.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GrandExchangeTutor.java
rename to Server/src/main/java/core/game/content/dialogue/GrandExchangeTutor.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GregoryDialogue.java b/Server/src/main/java/core/game/content/dialogue/GregoryDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GregoryDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GregoryDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GrimgnashDialogue.java b/Server/src/main/java/core/game/content/dialogue/GrimgnashDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GrimgnashDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GrimgnashDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GruborDialogue.java b/Server/src/main/java/core/game/content/dialogue/GruborDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GruborDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GruborDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GrumDialogue.java b/Server/src/main/java/core/game/content/dialogue/GrumDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GrumDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GrumDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GuidorsWifeDialogue.java b/Server/src/main/java/core/game/content/dialogue/GuidorsWifeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GuidorsWifeDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GuidorsWifeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GunthorBraveDialogue.java b/Server/src/main/java/core/game/content/dialogue/GunthorBraveDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GunthorBraveDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/GunthorBraveDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HairdresserDialogue.java b/Server/src/main/java/core/game/content/dialogue/HairdresserDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HairdresserDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HairdresserDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HansDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/HansDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HansDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/HansDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HariDialogue.java b/Server/src/main/java/core/game/content/dialogue/HariDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HariDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HariDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HarlanDialogue.java b/Server/src/main/java/core/game/content/dialogue/HarlanDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HarlanDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HarlanDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HarrallakMenarous.java b/Server/src/main/java/core/game/content/dialogue/HarrallakMenarous.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HarrallakMenarous.java
rename to Server/src/main/java/core/game/content/dialogue/HarrallakMenarous.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HarryDialogue.java b/Server/src/main/java/core/game/content/dialogue/HarryDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HarryDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HarryDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HassanDialogue.java b/Server/src/main/java/core/game/content/dialogue/HassanDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HassanDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HassanDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HeadChefDialogue.java b/Server/src/main/java/core/game/content/dialogue/HeadChefDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HeadChefDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HeadChefDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HengelDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/HengelDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HengelDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/HengelDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HeronDialogue.java b/Server/src/main/java/core/game/content/dialogue/HeronDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HeronDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HeronDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HerquinDialogue.java b/Server/src/main/java/core/game/content/dialogue/HerquinDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HerquinDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HerquinDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HettyDialogue.java b/Server/src/main/java/core/game/content/dialogue/HettyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HettyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HettyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HicktonDialogue.java b/Server/src/main/java/core/game/content/dialogue/HicktonDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HicktonDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HicktonDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HighPriestDialogue.java b/Server/src/main/java/core/game/content/dialogue/HighPriestDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HighPriestDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HighPriestDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HildDialogue.java b/Server/src/main/java/core/game/content/dialogue/HildDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HildDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HildDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HistanDialogue.java b/Server/src/main/java/core/game/content/dialogue/HistanDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HistanDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HistanDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HiylikMynaDialogue.java b/Server/src/main/java/core/game/content/dialogue/HiylikMynaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HiylikMynaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HiylikMynaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HofutThandDialogue.java b/Server/src/main/java/core/game/content/dialogue/HofutThandDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HofutThandDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HofutThandDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HoodedMonkDialogue.java b/Server/src/main/java/core/game/content/dialogue/HoodedMonkDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HoodedMonkDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HoodedMonkDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HooknosedJackDialogue.java b/Server/src/main/java/core/game/content/dialogue/HooknosedJackDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HooknosedJackDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HooknosedJackDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HorvikDialogue.java b/Server/src/main/java/core/game/content/dialogue/HorvikDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HorvikDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HorvikDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HuntingExpert.java b/Server/src/main/java/core/game/content/dialogue/HuntingExpert.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HuntingExpert.java
rename to Server/src/main/java/core/game/content/dialogue/HuntingExpert.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HuraDialogue.java b/Server/src/main/java/core/game/content/dialogue/HuraDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HuraDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HuraDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/HygdDialogue.java b/Server/src/main/java/core/game/content/dialogue/HygdDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/HygdDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/HygdDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/IcyCavernDialogue.java b/Server/src/main/java/core/game/content/dialogue/IcyCavernDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/IcyCavernDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/IcyCavernDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/IgnatiusVulcanDialogue.java b/Server/src/main/java/core/game/content/dialogue/IgnatiusVulcanDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/IgnatiusVulcanDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/IgnatiusVulcanDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/InformationclerkMuseumDialogue.java b/Server/src/main/java/core/game/content/dialogue/InformationclerkMuseumDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/InformationclerkMuseumDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/InformationclerkMuseumDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/IrinaDialogue.java b/Server/src/main/java/core/game/content/dialogue/IrinaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/IrinaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/IrinaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/JackSeagullDialogue.java b/Server/src/main/java/core/game/content/dialogue/JackSeagullDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/JackSeagullDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/JackSeagullDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/JaraahDialogue.java b/Server/src/main/java/core/game/content/dialogue/JaraahDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/JaraahDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/JaraahDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/JatixDialogue.java b/Server/src/main/java/core/game/content/dialogue/JatixDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/JatixDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/JatixDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/JeffDialogue.java b/Server/src/main/java/core/game/content/dialogue/JeffDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/JeffDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/JeffDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/JiminuaDialogue.java b/Server/src/main/java/core/game/content/dialogue/JiminuaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/JiminuaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/JiminuaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/JoeGuardDialogue.java b/Server/src/main/java/core/game/content/dialogue/JoeGuardDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/JoeGuardDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/JoeGuardDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/JosephDialogue.java b/Server/src/main/java/core/game/content/dialogue/JosephDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/JosephDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/JosephDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/JossikDialogue.java b/Server/src/main/java/core/game/content/dialogue/JossikDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/JossikDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/JossikDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/JungleForesterDialogue.java b/Server/src/main/java/core/game/content/dialogue/JungleForesterDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/JungleForesterDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/JungleForesterDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KalebDialgoue.java b/Server/src/main/java/core/game/content/dialogue/KalebDialgoue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KalebDialgoue.java
rename to Server/src/main/java/core/game/content/dialogue/KalebDialgoue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KalebParamaya.java b/Server/src/main/java/core/game/content/dialogue/KalebParamaya.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KalebParamaya.java
rename to Server/src/main/java/core/game/content/dialogue/KalebParamaya.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KamfreenaDialogue.java b/Server/src/main/java/core/game/content/dialogue/KamfreenaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KamfreenaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/KamfreenaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KanelDialogue.java b/Server/src/main/java/core/game/content/dialogue/KanelDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KanelDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/KanelDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KangaiMauDialogue.java b/Server/src/main/java/core/game/content/dialogue/KangaiMauDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KangaiMauDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/KangaiMauDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KaqemeexDialogue.java b/Server/src/main/java/core/game/content/dialogue/KaqemeexDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KaqemeexDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/KaqemeexDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KaramajaManDialogue.java b/Server/src/main/java/core/game/content/dialogue/KaramajaManDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KaramajaManDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/KaramajaManDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KarimDialogue.java b/Server/src/main/java/core/game/content/dialogue/KarimDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KarimDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/KarimDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KayleeDialogue.java b/Server/src/main/java/core/game/content/dialogue/KayleeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KayleeDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/KayleeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KeyMasterDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/KeyMasterDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KeyMasterDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/KeyMasterDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KittenInteractDialogue.java b/Server/src/main/java/core/game/content/dialogue/KittenInteractDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KittenInteractDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/KittenInteractDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KlarenseDialogue.java b/Server/src/main/java/core/game/content/dialogue/KlarenseDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KlarenseDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/KlarenseDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KreeJrDialogue.java b/Server/src/main/java/core/game/content/dialogue/KreeJrDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KreeJrDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/KreeJrDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KrilJRDialogue.java b/Server/src/main/java/core/game/content/dialogue/KrilJRDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KrilJRDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/KrilJRDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LakkiDwarfDialogue.java b/Server/src/main/java/core/game/content/dialogue/LakkiDwarfDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LakkiDwarfDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LakkiDwarfDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LarxusDialogue.java b/Server/src/main/java/core/game/content/dialogue/LarxusDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LarxusDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LarxusDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LeatherCraftDialogue.java b/Server/src/main/java/core/game/content/dialogue/LeatherCraftDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LeatherCraftDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LeatherCraftDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LeelaDialogue.java b/Server/src/main/java/core/game/content/dialogue/LeelaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LeelaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LeelaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LeonDialogue.java b/Server/src/main/java/core/game/content/dialogue/LeonDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LeonDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LeonDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LidioDialogue.java b/Server/src/main/java/core/game/content/dialogue/LidioDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LidioDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LidioDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LillyDialogue.java b/Server/src/main/java/core/game/content/dialogue/LillyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LillyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LillyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LimbDialogue.java b/Server/src/main/java/core/game/content/dialogue/LimbDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LimbDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LimbDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LitaraDialogue.java b/Server/src/main/java/core/game/content/dialogue/LitaraDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LitaraDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LitaraDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LokarSearunnerDialogue.java b/Server/src/main/java/core/game/content/dialogue/LokarSearunnerDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LokarSearunnerDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LokarSearunnerDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LongbowBenDialogue.java b/Server/src/main/java/core/game/content/dialogue/LongbowBenDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LongbowBenDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LongbowBenDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LouiLegsDialogue.java b/Server/src/main/java/core/game/content/dialogue/LouiLegsDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LouiLegsDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LouiLegsDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LoweDialogue.java b/Server/src/main/java/core/game/content/dialogue/LoweDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LoweDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LoweDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LubufuDialogue.java b/Server/src/main/java/core/game/content/dialogue/LubufuDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LubufuDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LubufuDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LucyPartyRoomDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/LucyPartyRoomDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LucyPartyRoomDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/LucyPartyRoomDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LumbridgeGuideDialogue.java b/Server/src/main/java/core/game/content/dialogue/LumbridgeGuideDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LumbridgeGuideDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LumbridgeGuideDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LumbridgeJailGuard.java b/Server/src/main/java/core/game/content/dialogue/LumbridgeJailGuard.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LumbridgeJailGuard.java
rename to Server/src/main/java/core/game/content/dialogue/LumbridgeJailGuard.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LumbridgeSwampArcher.java b/Server/src/main/java/core/game/content/dialogue/LumbridgeSwampArcher.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LumbridgeSwampArcher.java
rename to Server/src/main/java/core/game/content/dialogue/LumbridgeSwampArcher.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LumbridgeSwampMonk.java b/Server/src/main/java/core/game/content/dialogue/LumbridgeSwampMonk.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LumbridgeSwampMonk.java
rename to Server/src/main/java/core/game/content/dialogue/LumbridgeSwampMonk.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LumbridgeSwampWizard.java b/Server/src/main/java/core/game/content/dialogue/LumbridgeSwampWizard.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LumbridgeSwampWizard.java
rename to Server/src/main/java/core/game/content/dialogue/LumbridgeSwampWizard.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LuthasDialogue.java b/Server/src/main/java/core/game/content/dialogue/LuthasDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LuthasDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/LuthasDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MagicStoreDialogue.java b/Server/src/main/java/core/game/content/dialogue/MagicStoreDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MagicStoreDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MagicStoreDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MagicTutorDialogue.java b/Server/src/main/java/core/game/content/dialogue/MagicTutorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MagicTutorDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MagicTutorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MakeOverMageDialogue.java b/Server/src/main/java/core/game/content/dialogue/MakeOverMageDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MakeOverMageDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MakeOverMageDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MalakDialogue.java b/Server/src/main/java/core/game/content/dialogue/MalakDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MalakDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MalakDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MamaDialogue.java b/Server/src/main/java/core/game/content/dialogue/MamaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MamaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MamaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ManDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/ManDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ManDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/ManDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ManorFountainDialogue.java b/Server/src/main/java/core/game/content/dialogue/ManorFountainDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ManorFountainDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ManorFountainDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MartinTheMasterGardener.java b/Server/src/main/java/core/game/content/dialogue/MartinTheMasterGardener.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MartinTheMasterGardener.java
rename to Server/src/main/java/core/game/content/dialogue/MartinTheMasterGardener.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MartinThwaitDialogue.java b/Server/src/main/java/core/game/content/dialogue/MartinThwaitDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MartinThwaitDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MartinThwaitDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MathiasFlaconryDialogue.java b/Server/src/main/java/core/game/content/dialogue/MathiasFlaconryDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MathiasFlaconryDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MathiasFlaconryDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MazionDialogue.java b/Server/src/main/java/core/game/content/dialogue/MazionDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MazionDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MazionDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MeleeShopDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/MeleeShopDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MeleeShopDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/MeleeShopDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MiningGuildDwarf.java b/Server/src/main/java/core/game/content/dialogue/MiningGuildDwarf.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MiningGuildDwarf.java
rename to Server/src/main/java/core/game/content/dialogue/MiningGuildDwarf.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MiningSkillCapeDwarfDialogue.java b/Server/src/main/java/core/game/content/dialogue/MiningSkillCapeDwarfDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MiningSkillCapeDwarfDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MiningSkillCapeDwarfDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MiningtutorDialogue.java b/Server/src/main/java/core/game/content/dialogue/MiningtutorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MiningtutorDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MiningtutorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MissSchismDialogue.java b/Server/src/main/java/core/game/content/dialogue/MissSchismDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MissSchismDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MissSchismDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MithGrappleDialogue.java b/Server/src/main/java/core/game/content/dialogue/MithGrappleDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MithGrappleDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MithGrappleDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MithrilSeedsDialogue.java b/Server/src/main/java/core/game/content/dialogue/MithrilSeedsDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MithrilSeedsDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MithrilSeedsDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MithrilSeedsPlugin.java b/Server/src/main/java/core/game/content/dialogue/MithrilSeedsPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MithrilSeedsPlugin.java
rename to Server/src/main/java/core/game/content/dialogue/MithrilSeedsPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MonkOfEntranaDialogue.java b/Server/src/main/java/core/game/content/dialogue/MonkOfEntranaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MonkOfEntranaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MonkOfEntranaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MonkeyDialogue.java b/Server/src/main/java/core/game/content/dialogue/MonkeyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MonkeyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MonkeyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MorganDialogue.java b/Server/src/main/java/core/game/content/dialogue/MorganDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MorganDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MorganDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MubarizDialogue.java b/Server/src/main/java/core/game/content/dialogue/MubarizDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MubarizDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MubarizDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MurkyMattDialogue.java b/Server/src/main/java/core/game/content/dialogue/MurkyMattDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MurkyMattDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/MurkyMattDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/NarfsDialogue.java b/Server/src/main/java/core/game/content/dialogue/NarfsDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/NarfsDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/NarfsDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/NikitiaDialogue.java b/Server/src/main/java/core/game/content/dialogue/NikitiaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/NikitiaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/NikitiaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/NurmofDialogue.java b/Server/src/main/java/core/game/content/dialogue/NurmofDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/NurmofDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/NurmofDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/OcaDialogue.java b/Server/src/main/java/core/game/content/dialogue/OcaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/OcaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/OcaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/OliviaDialogue.java b/Server/src/main/java/core/game/content/dialogue/OliviaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/OliviaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/OliviaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/OllieTheCamelDialogue.java b/Server/src/main/java/core/game/content/dialogue/OllieTheCamelDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/OllieTheCamelDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/OllieTheCamelDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/OracleDialogue.java b/Server/src/main/java/core/game/content/dialogue/OracleDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/OracleDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/OracleDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/OutpostSquireDialogue.java b/Server/src/main/java/core/game/content/dialogue/OutpostSquireDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/OutpostSquireDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/OutpostSquireDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PartyPeteDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/PartyPeteDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PartyPeteDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/PartyPeteDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PatchyDialogue.java b/Server/src/main/java/core/game/content/dialogue/PatchyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PatchyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PatchyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PeksaDialogue.java b/Server/src/main/java/core/game/content/dialogue/PeksaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PeksaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PeksaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PendaDialogue.java b/Server/src/main/java/core/game/content/dialogue/PendaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PendaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PendaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PetshopOwnerTaverly.java b/Server/src/main/java/core/game/content/dialogue/PetshopOwnerTaverly.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PetshopOwnerTaverly.java
rename to Server/src/main/java/core/game/content/dialogue/PetshopOwnerTaverly.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PhantuwtiFantstuwiFarSight.java b/Server/src/main/java/core/game/content/dialogue/PhantuwtiFantstuwiFarSight.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PhantuwtiFantstuwiFarSight.java
rename to Server/src/main/java/core/game/content/dialogue/PhantuwtiFantstuwiFarSight.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PhillipaDialogue.java b/Server/src/main/java/core/game/content/dialogue/PhillipaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PhillipaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PhillipaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PhilopDialogue.java b/Server/src/main/java/core/game/content/dialogue/PhilopDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PhilopDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PhilopDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PikkupstixDialogue.java b/Server/src/main/java/core/game/content/dialogue/PikkupstixDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PikkupstixDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PikkupstixDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PirateJackieDialogue.java b/Server/src/main/java/core/game/content/dialogue/PirateJackieDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PirateJackieDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PirateJackieDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PortSarimBartenderDialogue.java b/Server/src/main/java/core/game/content/dialogue/PortSarimBartenderDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PortSarimBartenderDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PortSarimBartenderDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PortSarimBrianDialogue.java b/Server/src/main/java/core/game/content/dialogue/PortSarimBrianDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PortSarimBrianDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PortSarimBrianDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PoxDialogue.java b/Server/src/main/java/core/game/content/dialogue/PoxDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PoxDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PoxDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PrayerTutorDialogue.java b/Server/src/main/java/core/game/content/dialogue/PrayerTutorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PrayerTutorDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PrayerTutorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PrinceAliDialogue.java b/Server/src/main/java/core/game/content/dialogue/PrinceAliDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PrinceAliDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PrinceAliDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/PrinceBlackDragonDialogue.java b/Server/src/main/java/core/game/content/dialogue/PrinceBlackDragonDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/PrinceBlackDragonDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/PrinceBlackDragonDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ProfessorOddensteinPlugin.java b/Server/src/main/java/core/game/content/dialogue/ProfessorOddensteinPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ProfessorOddensteinPlugin.java
rename to Server/src/main/java/core/game/content/dialogue/ProfessorOddensteinPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/QuarterMasterDialogue.java b/Server/src/main/java/core/game/content/dialogue/QuarterMasterDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/QuarterMasterDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/QuarterMasterDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/RanaelDialogue.java b/Server/src/main/java/core/game/content/dialogue/RanaelDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/RanaelDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/RanaelDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/RangedTutorDialogue.java b/Server/src/main/java/core/game/content/dialogue/RangedTutorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/RangedTutorDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/RangedTutorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ReadbeardFrankDialogue.java b/Server/src/main/java/core/game/content/dialogue/ReadbeardFrankDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ReadbeardFrankDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ReadbeardFrankDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ReffDialogue.java b/Server/src/main/java/core/game/content/dialogue/ReffDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ReffDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ReffDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ReloboBlinyoDialogue.java b/Server/src/main/java/core/game/content/dialogue/ReloboBlinyoDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ReloboBlinyoDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ReloboBlinyoDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ResearcherDialogue.java b/Server/src/main/java/core/game/content/dialogue/ResearcherDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ResearcherDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ResearcherDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/RimmingtonShopKeeperDialogue.java b/Server/src/main/java/core/game/content/dialogue/RimmingtonShopKeeperDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/RimmingtonShopKeeperDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/RimmingtonShopKeeperDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/RockGolemDialogue.java b/Server/src/main/java/core/game/content/dialogue/RockGolemDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/RockGolemDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/RockGolemDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/RoladDialogue.java b/Server/src/main/java/core/game/content/dialogue/RoladDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/RoladDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/RoladDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/RomilyWeaklaxDialogue.java b/Server/src/main/java/core/game/content/dialogue/RomilyWeaklaxDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/RomilyWeaklaxDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/RomilyWeaklaxDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/RoomikDialogue.java b/Server/src/main/java/core/game/content/dialogue/RoomikDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/RoomikDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/RoomikDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/RufusDialogue.java b/Server/src/main/java/core/game/content/dialogue/RufusDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/RufusDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/RufusDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/RugMerchantDialogue.java b/Server/src/main/java/core/game/content/dialogue/RugMerchantDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/RugMerchantDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/RugMerchantDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/RustyDialogue.java b/Server/src/main/java/core/game/content/dialogue/RustyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/RustyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/RustyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SabreenDialogue.java b/Server/src/main/java/core/game/content/dialogue/SabreenDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SabreenDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SabreenDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SandyDialogue.java b/Server/src/main/java/core/game/content/dialogue/SandyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SandyDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SandyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SanfewDialogue.java b/Server/src/main/java/core/game/content/dialogue/SanfewDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SanfewDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SanfewDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SaniDialogue.java b/Server/src/main/java/core/game/content/dialogue/SaniDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SaniDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SaniDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SanibochDialogue.java b/Server/src/main/java/core/game/content/dialogue/SanibochDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SanibochDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SanibochDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SarahFarmingPlugin.java b/Server/src/main/java/core/game/content/dialogue/SarahFarmingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SarahFarmingPlugin.java
rename to Server/src/main/java/core/game/content/dialogue/SarahFarmingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SawmillOperator.java b/Server/src/main/java/core/game/content/dialogue/SawmillOperator.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SawmillOperator.java
rename to Server/src/main/java/core/game/content/dialogue/SawmillOperator.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SbottDialogue.java b/Server/src/main/java/core/game/content/dialogue/SbottDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SbottDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SbottDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ScavvoDialogue.java b/Server/src/main/java/core/game/content/dialogue/ScavvoDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ScavvoDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ScavvoDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ScorpiasOffspringDialogue.java b/Server/src/main/java/core/game/content/dialogue/ScorpiasOffspringDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ScorpiasOffspringDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ScorpiasOffspringDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SeamanDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/SeamanDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SeamanDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/SeamanDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SeerBartenderDialogue.java b/Server/src/main/java/core/game/content/dialogue/SeerBartenderDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SeerBartenderDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SeerBartenderDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SeerDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/SeerDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SeerDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/SeerDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SeravelDialogue.java b/Server/src/main/java/core/game/content/dialogue/SeravelDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SeravelDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SeravelDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ServantDialogue.java b/Server/src/main/java/core/game/content/dialogue/ServantDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ServantDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ServantDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SethGroatsDialogue.java b/Server/src/main/java/core/game/content/dialogue/SethGroatsDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SethGroatsDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SethGroatsDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ShanomiDialogue.java b/Server/src/main/java/core/game/content/dialogue/ShanomiDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ShanomiDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ShanomiDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ShantayDialogue.java b/Server/src/main/java/core/game/content/dialogue/ShantayDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ShantayDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ShantayDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ShantayGuard.java b/Server/src/main/java/core/game/content/dialogue/ShantayGuard.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ShantayGuard.java
rename to Server/src/main/java/core/game/content/dialogue/ShantayGuard.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ShilopDialogue.java b/Server/src/main/java/core/game/content/dialogue/ShilopDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ShilopDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ShilopDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ShopkeeperDialogue.java b/Server/src/main/java/core/game/content/dialogue/ShopkeeperDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ShopkeeperDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ShopkeeperDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SigmundDialogue.java b/Server/src/main/java/core/game/content/dialogue/SigmundDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SigmundDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SigmundDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SigurdDialogue.java b/Server/src/main/java/core/game/content/dialogue/SigurdDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SigurdDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SigurdDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SilkMerchantPlugin.java b/Server/src/main/java/core/game/content/dialogue/SilkMerchantPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SilkMerchantPlugin.java
rename to Server/src/main/java/core/game/content/dialogue/SilkMerchantPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SilkTradeDialogue.java b/Server/src/main/java/core/game/content/dialogue/SilkTradeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SilkTradeDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SilkTradeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SilverMechantPlugin.java b/Server/src/main/java/core/game/content/dialogue/SilverMechantPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SilverMechantPlugin.java
rename to Server/src/main/java/core/game/content/dialogue/SilverMechantPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SimonTempleton.java b/Server/src/main/java/core/game/content/dialogue/SimonTempleton.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SimonTempleton.java
rename to Server/src/main/java/core/game/content/dialogue/SimonTempleton.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SimpleDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/SimpleDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SimpleDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/SimpleDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SimpleEntityMessage.java b/Server/src/main/java/core/game/content/dialogue/SimpleEntityMessage.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SimpleEntityMessage.java
rename to Server/src/main/java/core/game/content/dialogue/SimpleEntityMessage.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SirReniteeDialogue.java b/Server/src/main/java/core/game/content/dialogue/SirReniteeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SirReniteeDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SirReniteeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SirTiffyCashienDialogue.java b/Server/src/main/java/core/game/content/dialogue/SirTiffyCashienDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SirTiffyCashienDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SirTiffyCashienDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SirVyvinDialogue.java b/Server/src/main/java/core/game/content/dialogue/SirVyvinDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SirVyvinDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SirVyvinDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SkillDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/SkillDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SkillDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/SkillDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SkullSceptreDialogue.java b/Server/src/main/java/core/game/content/dialogue/SkullSceptreDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SkullSceptreDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SkullSceptreDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SloaneDialogue.java b/Server/src/main/java/core/game/content/dialogue/SloaneDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SloaneDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SloaneDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SmithingApparenticeDialogue.java b/Server/src/main/java/core/game/content/dialogue/SmithingApparenticeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SmithingApparenticeDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SmithingApparenticeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SofiyaDialogue.java b/Server/src/main/java/core/game/content/dialogue/SofiyaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SofiyaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SofiyaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SorcceresDialouge.java b/Server/src/main/java/core/game/content/dialogue/SorcceresDialouge.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SorcceresDialouge.java
rename to Server/src/main/java/core/game/content/dialogue/SorcceresDialouge.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SpellbookSwapDialogue.java b/Server/src/main/java/core/game/content/dialogue/SpellbookSwapDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SpellbookSwapDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SpellbookSwapDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SpiceSellerPlugin.java b/Server/src/main/java/core/game/content/dialogue/SpiceSellerPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SpiceSellerPlugin.java
rename to Server/src/main/java/core/game/content/dialogue/SpiceSellerPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SpiritGraahkDialogue.java b/Server/src/main/java/core/game/content/dialogue/SpiritGraahkDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SpiritGraahkDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SpiritGraahkDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SpiritKyattDialogue.java b/Server/src/main/java/core/game/content/dialogue/SpiritKyattDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SpiritKyattDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SpiritKyattDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SquireDialogue.java b/Server/src/main/java/core/game/content/dialogue/SquireDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SquireDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SquireDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SquireMagicDialougue.java b/Server/src/main/java/core/game/content/dialogue/SquireMagicDialougue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SquireMagicDialougue.java
rename to Server/src/main/java/core/game/content/dialogue/SquireMagicDialougue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SquireTypeDialogue.java b/Server/src/main/java/core/game/content/dialogue/SquireTypeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SquireTypeDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SquireTypeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/StankersDialogue.java b/Server/src/main/java/core/game/content/dialogue/StankersDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/StankersDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/StankersDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/StringBowDialogue.java b/Server/src/main/java/core/game/content/dialogue/StringBowDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/StringBowDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/StringBowDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SurgeonGeneralTafani.java b/Server/src/main/java/core/game/content/dialogue/SurgeonGeneralTafani.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SurgeonGeneralTafani.java
rename to Server/src/main/java/core/game/content/dialogue/SurgeonGeneralTafani.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SurokMagis.java b/Server/src/main/java/core/game/content/dialogue/SurokMagis.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SurokMagis.java
rename to Server/src/main/java/core/game/content/dialogue/SurokMagis.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SvetlanaDialogue.java b/Server/src/main/java/core/game/content/dialogue/SvetlanaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SvetlanaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/SvetlanaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/TakiDwarfDialogue.java b/Server/src/main/java/core/game/content/dialogue/TakiDwarfDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/TakiDwarfDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/TakiDwarfDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/TarquinDialogue.java b/Server/src/main/java/core/game/content/dialogue/TarquinDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/TarquinDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/TarquinDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/TaxidermistDialogue.java b/Server/src/main/java/core/game/content/dialogue/TaxidermistDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/TaxidermistDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/TaxidermistDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/TeaSellerDialogue.java b/Server/src/main/java/core/game/content/dialogue/TeaSellerDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/TeaSellerDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/TeaSellerDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/TeegidDialogue.java b/Server/src/main/java/core/game/content/dialogue/TeegidDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/TeegidDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/TeegidDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ThessaliaDialogue.java b/Server/src/main/java/core/game/content/dialogue/ThessaliaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ThessaliaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ThessaliaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ThuroDialogue.java b/Server/src/main/java/core/game/content/dialogue/ThuroDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ThuroDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ThuroDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/TostigDialogue.java b/Server/src/main/java/core/game/content/dialogue/TostigDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/TostigDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/TostigDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/TownCrierDialogue.java b/Server/src/main/java/core/game/content/dialogue/TownCrierDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/TownCrierDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/TownCrierDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/TownCrierDialogue.java.orig b/Server/src/main/java/core/game/content/dialogue/TownCrierDialogue.java.orig
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/TownCrierDialogue.java.orig
rename to Server/src/main/java/core/game/content/dialogue/TownCrierDialogue.java.orig
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/TraderCrewmemberDialogue.java b/Server/src/main/java/core/game/content/dialogue/TraderCrewmemberDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/TraderCrewmemberDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/TraderCrewmemberDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/TraibornDialogue.java b/Server/src/main/java/core/game/content/dialogue/TraibornDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/TraibornDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/TraibornDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/TrampDialogue.java b/Server/src/main/java/core/game/content/dialogue/TrampDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/TrampDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/TrampDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/UliziusDialogue.java b/Server/src/main/java/core/game/content/dialogue/UliziusDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/UliziusDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/UliziusDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ValaineDialogue.java b/Server/src/main/java/core/game/content/dialogue/ValaineDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ValaineDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ValaineDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/VanessaDialogue.java b/Server/src/main/java/core/game/content/dialogue/VanessaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/VanessaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/VanessaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/VanstromKlause.java b/Server/src/main/java/core/game/content/dialogue/VanstromKlause.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/VanstromKlause.java
rename to Server/src/main/java/core/game/content/dialogue/VanstromKlause.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/VelorinaDialogue.java b/Server/src/main/java/core/game/content/dialogue/VelorinaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/VelorinaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/VelorinaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/VenenatisSpiderlingDialogue.java b/Server/src/main/java/core/game/content/dialogue/VenenatisSpiderlingDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/VenenatisSpiderlingDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/VenenatisSpiderlingDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/VeronicaDialogue.java b/Server/src/main/java/core/game/content/dialogue/VeronicaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/VeronicaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/VeronicaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/VetionJRDialogue.java b/Server/src/main/java/core/game/content/dialogue/VetionJRDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/VetionJRDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/VetionJRDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/WayneDialogue.java b/Server/src/main/java/core/game/content/dialogue/WayneDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/WayneDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/WayneDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/WhiteKnightDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/WhiteKnightDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/WhiteKnightDialoguePlugin.java
rename to Server/src/main/java/core/game/content/dialogue/WhiteKnightDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/WiloughDialogue.java b/Server/src/main/java/core/game/content/dialogue/WiloughDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/WiloughDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/WiloughDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/WiseOldManDialogue.java b/Server/src/main/java/core/game/content/dialogue/WiseOldManDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/WiseOldManDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/WiseOldManDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/WoodsmanTutorDialogue.java b/Server/src/main/java/core/game/content/dialogue/WoodsmanTutorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/WoodsmanTutorDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/WoodsmanTutorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/WydinDialogue.java b/Server/src/main/java/core/game/content/dialogue/WydinDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/WydinDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/WydinDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/YadvigaDialogue.java b/Server/src/main/java/core/game/content/dialogue/YadvigaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/YadvigaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/YadvigaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/YuriDialogue.java b/Server/src/main/java/core/game/content/dialogue/YuriDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/YuriDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/YuriDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ZahwaDialogue.java b/Server/src/main/java/core/game/content/dialogue/ZahwaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ZahwaDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ZahwaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ZamboDialogue.java b/Server/src/main/java/core/game/content/dialogue/ZamboDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ZamboDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ZamboDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ZekeDialogue.java b/Server/src/main/java/core/game/content/dialogue/ZekeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ZekeDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ZekeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ZilyanaJRDialogue.java b/Server/src/main/java/core/game/content/dialogue/ZilyanaJRDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ZilyanaJRDialogue.java
rename to Server/src/main/java/core/game/content/dialogue/ZilyanaJRDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/book/Book.java b/Server/src/main/java/core/game/content/dialogue/book/Book.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/book/Book.java
rename to Server/src/main/java/core/game/content/dialogue/book/Book.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/book/BookLine.java b/Server/src/main/java/core/game/content/dialogue/book/BookLine.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/book/BookLine.java
rename to Server/src/main/java/core/game/content/dialogue/book/BookLine.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/book/GrimDiary.java b/Server/src/main/java/core/game/content/dialogue/book/GrimDiary.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/book/GrimDiary.java
rename to Server/src/main/java/core/game/content/dialogue/book/GrimDiary.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/book/KeldagrimRuleBook.java b/Server/src/main/java/core/game/content/dialogue/book/KeldagrimRuleBook.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/book/KeldagrimRuleBook.java
rename to Server/src/main/java/core/game/content/dialogue/book/KeldagrimRuleBook.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/book/Page.java b/Server/src/main/java/core/game/content/dialogue/book/Page.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/book/Page.java
rename to Server/src/main/java/core/game/content/dialogue/book/Page.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/book/PageSet.java b/Server/src/main/java/core/game/content/dialogue/book/PageSet.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/book/PageSet.java
rename to Server/src/main/java/core/game/content/dialogue/book/PageSet.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/book/SecurityBookPlugin.java b/Server/src/main/java/core/game/content/dialogue/book/SecurityBookPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/book/SecurityBookPlugin.java
rename to Server/src/main/java/core/game/content/dialogue/book/SecurityBookPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/book/StrongholdNotes.java b/Server/src/main/java/core/game/content/dialogue/book/StrongholdNotes.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/book/StrongholdNotes.java
rename to Server/src/main/java/core/game/content/dialogue/book/StrongholdNotes.java
diff --git a/Server/src/main/java/Server/core/game/content/eco/EcoStatus.java b/Server/src/main/java/core/game/content/eco/EcoStatus.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/eco/EcoStatus.java
rename to Server/src/main/java/core/game/content/eco/EcoStatus.java
diff --git a/Server/src/main/java/Server/core/game/content/eco/EconomyManagement.java b/Server/src/main/java/core/game/content/eco/EconomyManagement.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/eco/EconomyManagement.java
rename to Server/src/main/java/core/game/content/eco/EconomyManagement.java
diff --git a/Server/src/main/java/Server/core/game/content/global/BirdNest.java b/Server/src/main/java/core/game/content/global/BirdNest.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/BirdNest.java
rename to Server/src/main/java/core/game/content/global/BirdNest.java
diff --git a/Server/src/main/java/Server/core/game/content/global/Bones.java b/Server/src/main/java/core/game/content/global/Bones.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/Bones.java
rename to Server/src/main/java/core/game/content/global/Bones.java
diff --git a/Server/src/main/java/Server/core/game/content/global/BossKillCounter.java b/Server/src/main/java/core/game/content/global/BossKillCounter.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/BossKillCounter.java
rename to Server/src/main/java/core/game/content/global/BossKillCounter.java
diff --git a/Server/src/main/java/Server/core/game/content/global/Dyes.java b/Server/src/main/java/core/game/content/global/Dyes.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/Dyes.java
rename to Server/src/main/java/core/game/content/global/Dyes.java
diff --git a/Server/src/main/java/Server/core/game/content/global/EnchantedJewellery.java b/Server/src/main/java/core/game/content/global/EnchantedJewellery.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/EnchantedJewellery.java
rename to Server/src/main/java/core/game/content/global/EnchantedJewellery.java
diff --git a/Server/src/main/java/Server/core/game/content/global/GodBook.java b/Server/src/main/java/core/game/content/global/GodBook.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/GodBook.java
rename to Server/src/main/java/core/game/content/global/GodBook.java
diff --git a/Server/src/main/java/Server/core/game/content/global/GodType.java b/Server/src/main/java/core/game/content/global/GodType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/GodType.java
rename to Server/src/main/java/core/game/content/global/GodType.java
diff --git a/Server/src/main/java/Server/core/game/content/global/Lamps.java b/Server/src/main/java/core/game/content/global/Lamps.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/Lamps.java
rename to Server/src/main/java/core/game/content/global/Lamps.java
diff --git a/Server/src/main/java/Server/core/game/content/global/LightSource.java b/Server/src/main/java/core/game/content/global/LightSource.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/LightSource.java
rename to Server/src/main/java/core/game/content/global/LightSource.java
diff --git a/Server/src/main/java/Server/core/game/content/global/RepairItem.java b/Server/src/main/java/core/game/content/global/RepairItem.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/RepairItem.java
rename to Server/src/main/java/core/game/content/global/RepairItem.java
diff --git a/Server/src/main/java/Server/core/game/content/global/Skillcape.java b/Server/src/main/java/core/game/content/global/Skillcape.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/Skillcape.java
rename to Server/src/main/java/core/game/content/global/Skillcape.java
diff --git a/Server/src/main/java/Server/core/game/content/global/SkillcapePerks.java b/Server/src/main/java/core/game/content/global/SkillcapePerks.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/SkillcapePerks.java
rename to Server/src/main/java/core/game/content/global/SkillcapePerks.java
diff --git a/Server/src/main/java/Server/core/game/content/global/SkillingPets.java b/Server/src/main/java/core/game/content/global/SkillingPets.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/SkillingPets.java
rename to Server/src/main/java/core/game/content/global/SkillingPets.java
diff --git a/Server/src/main/java/Server/core/game/content/global/action/ClimbActionHandler.java b/Server/src/main/java/core/game/content/global/action/ClimbActionHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/action/ClimbActionHandler.java
rename to Server/src/main/java/core/game/content/global/action/ClimbActionHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/global/action/DigAction.java b/Server/src/main/java/core/game/content/global/action/DigAction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/action/DigAction.java
rename to Server/src/main/java/core/game/content/global/action/DigAction.java
diff --git a/Server/src/main/java/Server/core/game/content/global/action/DigSpadeHandler.java b/Server/src/main/java/core/game/content/global/action/DigSpadeHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/action/DigSpadeHandler.java
rename to Server/src/main/java/core/game/content/global/action/DigSpadeHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/global/action/DoorActionHandler.java b/Server/src/main/java/core/game/content/global/action/DoorActionHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/action/DoorActionHandler.java
rename to Server/src/main/java/core/game/content/global/action/DoorActionHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/global/action/DropItemHandler.java b/Server/src/main/java/core/game/content/global/action/DropItemHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/action/DropItemHandler.java
rename to Server/src/main/java/core/game/content/global/action/DropItemHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/global/action/SpecialLadders.java b/Server/src/main/java/core/game/content/global/action/SpecialLadders.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/action/SpecialLadders.java
rename to Server/src/main/java/core/game/content/global/action/SpecialLadders.java
diff --git a/Server/src/main/java/Server/core/game/content/global/presets/Preset.java b/Server/src/main/java/core/game/content/global/presets/Preset.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/presets/Preset.java
rename to Server/src/main/java/core/game/content/global/presets/Preset.java
diff --git a/Server/src/main/java/Server/core/game/content/global/presets/PresetManager.java b/Server/src/main/java/core/game/content/global/presets/PresetManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/presets/PresetManager.java
rename to Server/src/main/java/core/game/content/global/presets/PresetManager.java
diff --git a/Server/src/main/java/Server/core/game/content/global/report/AbuseReport.java b/Server/src/main/java/core/game/content/global/report/AbuseReport.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/report/AbuseReport.java
rename to Server/src/main/java/core/game/content/global/report/AbuseReport.java
diff --git a/Server/src/main/java/Server/core/game/content/global/report/Rule.java b/Server/src/main/java/core/game/content/global/report/Rule.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/report/Rule.java
rename to Server/src/main/java/core/game/content/global/report/Rule.java
diff --git a/Server/src/main/java/Server/core/game/content/global/shop/Shop.java b/Server/src/main/java/core/game/content/global/shop/Shop.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/shop/Shop.java
rename to Server/src/main/java/core/game/content/global/shop/Shop.java
diff --git a/Server/src/main/java/Server/core/game/content/global/shop/ShopViewer.java b/Server/src/main/java/core/game/content/global/shop/ShopViewer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/shop/ShopViewer.java
rename to Server/src/main/java/core/game/content/global/shop/ShopViewer.java
diff --git a/Server/src/main/java/Server/core/game/content/global/travel/MinigameGroupFinder.java b/Server/src/main/java/core/game/content/global/travel/MinigameGroupFinder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/travel/MinigameGroupFinder.java
rename to Server/src/main/java/core/game/content/global/travel/MinigameGroupFinder.java
diff --git a/Server/src/main/java/Server/core/game/content/global/travel/canoe/Canoe.java b/Server/src/main/java/core/game/content/global/travel/canoe/Canoe.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/travel/canoe/Canoe.java
rename to Server/src/main/java/core/game/content/global/travel/canoe/Canoe.java
diff --git a/Server/src/main/java/Server/core/game/content/global/travel/canoe/CanoeExtension.java b/Server/src/main/java/core/game/content/global/travel/canoe/CanoeExtension.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/travel/canoe/CanoeExtension.java
rename to Server/src/main/java/core/game/content/global/travel/canoe/CanoeExtension.java
diff --git a/Server/src/main/java/Server/core/game/content/global/travel/canoe/CanoeStation.java b/Server/src/main/java/core/game/content/global/travel/canoe/CanoeStation.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/travel/canoe/CanoeStation.java
rename to Server/src/main/java/core/game/content/global/travel/canoe/CanoeStation.java
diff --git a/Server/src/main/java/Server/core/game/content/global/travel/glider/GliderPulse.java b/Server/src/main/java/core/game/content/global/travel/glider/GliderPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/travel/glider/GliderPulse.java
rename to Server/src/main/java/core/game/content/global/travel/glider/GliderPulse.java
diff --git a/Server/src/main/java/Server/core/game/content/global/travel/glider/Gliders.java b/Server/src/main/java/core/game/content/global/travel/glider/Gliders.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/travel/glider/Gliders.java
rename to Server/src/main/java/core/game/content/global/travel/glider/Gliders.java
diff --git a/Server/src/main/java/Server/core/game/content/global/travel/ship/ShipCharter.java b/Server/src/main/java/core/game/content/global/travel/ship/ShipCharter.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/travel/ship/ShipCharter.java
rename to Server/src/main/java/core/game/content/global/travel/ship/ShipCharter.java
diff --git a/Server/src/main/java/Server/core/game/content/global/travel/ship/ShipTravelPulse.java b/Server/src/main/java/core/game/content/global/travel/ship/ShipTravelPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/travel/ship/ShipTravelPulse.java
rename to Server/src/main/java/core/game/content/global/travel/ship/ShipTravelPulse.java
diff --git a/Server/src/main/java/Server/core/game/content/global/travel/ship/Ships.java b/Server/src/main/java/core/game/content/global/travel/ship/Ships.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/travel/ship/Ships.java
rename to Server/src/main/java/core/game/content/global/travel/ship/Ships.java
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ScoreboardEntry.java b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardEntry.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ScoreboardEntry.java
rename to Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardEntry.java
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ScoreboardHandler.java b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ScoreboardHandler.java
rename to Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ScoreboardManager.java b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ScoreboardManager.java
rename to Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardManager.java
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStarScoreboard.java b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ShootingStarScoreboard.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStarScoreboard.java
rename to Server/src/main/java/core/game/content/global/worldevents/shootingstar/ShootingStarScoreboard.java
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java
rename to Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/holiday/HolidayEvent.java b/Server/src/main/java/core/game/content/holiday/HolidayEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/holiday/HolidayEvent.java
rename to Server/src/main/java/core/game/content/holiday/HolidayEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/holiday/HolidayItem.java b/Server/src/main/java/core/game/content/holiday/HolidayItem.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/holiday/HolidayItem.java
rename to Server/src/main/java/core/game/content/holiday/HolidayItem.java
diff --git a/Server/src/main/java/Server/core/game/content/holiday/HolidayType.java b/Server/src/main/java/core/game/content/holiday/HolidayType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/holiday/HolidayType.java
rename to Server/src/main/java/core/game/content/holiday/HolidayType.java
diff --git a/Server/src/main/java/Server/core/game/content/holiday/ItemLimitation.java b/Server/src/main/java/core/game/content/holiday/ItemLimitation.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/holiday/ItemLimitation.java
rename to Server/src/main/java/core/game/content/holiday/ItemLimitation.java
diff --git a/Server/src/main/java/Server/core/game/content/holiday/christmas/ChristmasEvent.java b/Server/src/main/java/core/game/content/holiday/christmas/ChristmasEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/holiday/christmas/ChristmasEvent.java
rename to Server/src/main/java/core/game/content/holiday/christmas/ChristmasEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/holiday/easter/BasketofEggsEvent.java b/Server/src/main/java/core/game/content/holiday/easter/BasketofEggsEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/holiday/easter/BasketofEggsEvent.java
rename to Server/src/main/java/core/game/content/holiday/easter/BasketofEggsEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/holiday/halloween/DeathMansionEvent.java b/Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/holiday/halloween/DeathMansionEvent.java
rename to Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java
diff --git a/Server/src/main/java/Server/core/game/content/package-info.java b/Server/src/main/java/core/game/content/package-info.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/package-info.java
rename to Server/src/main/java/core/game/content/package-info.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/PluginInteraction.java b/Server/src/main/java/core/game/content/quest/PluginInteraction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/PluginInteraction.java
rename to Server/src/main/java/core/game/content/quest/PluginInteraction.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/PluginInteractionManager.java b/Server/src/main/java/core/game/content/quest/PluginInteractionManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/PluginInteractionManager.java
rename to Server/src/main/java/core/game/content/quest/PluginInteractionManager.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/DoricsQuest.java b/Server/src/main/java/core/game/content/quest/free/DoricsQuest.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/DoricsQuest.java
rename to Server/src/main/java/core/game/content/quest/free/DoricsQuest.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/ErnestTheChicken.java b/Server/src/main/java/core/game/content/quest/free/ErnestTheChicken.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/ErnestTheChicken.java
rename to Server/src/main/java/core/game/content/quest/free/ErnestTheChicken.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/ImpCatcher.java b/Server/src/main/java/core/game/content/quest/free/ImpCatcher.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/ImpCatcher.java
rename to Server/src/main/java/core/game/content/quest/free/ImpCatcher.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/RomeoJuliet.java b/Server/src/main/java/core/game/content/quest/free/RomeoJuliet.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/RomeoJuliet.java
rename to Server/src/main/java/core/game/content/quest/free/RomeoJuliet.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/SheepShearer.java b/Server/src/main/java/core/game/content/quest/free/SheepShearer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/SheepShearer.java
rename to Server/src/main/java/core/game/content/quest/free/SheepShearer.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/TheKnightsSword.java b/Server/src/main/java/core/game/content/quest/free/TheKnightsSword.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/TheKnightsSword.java
rename to Server/src/main/java/core/game/content/quest/free/TheKnightsSword.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/VampireSlayer.java b/Server/src/main/java/core/game/content/quest/free/VampireSlayer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/VampireSlayer.java
rename to Server/src/main/java/core/game/content/quest/free/VampireSlayer.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/WitchsPotion.java b/Server/src/main/java/core/game/content/quest/free/WitchsPotion.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/WitchsPotion.java
rename to Server/src/main/java/core/game/content/quest/free/WitchsPotion.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/blackknightsfortress/BKCabbagePlugin.java b/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BKCabbagePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/blackknightsfortress/BKCabbagePlugin.java
rename to Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BKCabbagePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/blackknightsfortress/BKFortressPlugin.java b/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BKFortressPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/blackknightsfortress/BKFortressPlugin.java
rename to Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BKFortressPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/blackknightsfortress/BlackKnightsFortress.java b/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BlackKnightsFortress.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/blackknightsfortress/BlackKnightsFortress.java
rename to Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BlackKnightsFortress.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/blackknightsfortress/SirAmikVarzeDialogue.java b/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/SirAmikVarzeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/blackknightsfortress/SirAmikVarzeDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/blackknightsfortress/SirAmikVarzeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/demonslayer/DSlayerDrainPlugin.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/DSlayerDrainPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/demonslayer/DSlayerDrainPlugin.java
rename to Server/src/main/java/core/game/content/quest/free/demonslayer/DSlayerDrainPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/demonslayer/DemonSlayer.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/demonslayer/DemonSlayer.java
rename to Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayer.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/demonslayer/DemonSlayerCutscene.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerCutscene.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/demonslayer/DemonSlayerCutscene.java
rename to Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerCutscene.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java
rename to Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/demonslayer/GypsyArisDialogue.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/GypsyArisDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/demonslayer/GypsyArisDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/demonslayer/GypsyArisDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/demonslayer/SirPyrsinDialogue.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/SirPyrsinDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/demonslayer/SirPyrsinDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/demonslayer/SirPyrsinDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/demonslayer/TraibornDialogue.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/TraibornDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/demonslayer/TraibornDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/demonslayer/TraibornDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/demonslayer/WallyCutscenePlugin.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/WallyCutscenePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/demonslayer/WallyCutscenePlugin.java
rename to Server/src/main/java/core/game/content/quest/free/demonslayer/WallyCutscenePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/CrandorMapPlugin.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/CrandorMapPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/CrandorMapPlugin.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/CrandorMapPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DSChestDialogue.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DSChestDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DSChestDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/DSChestDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DSMagicDoorPlugin.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DSMagicDoorPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DSMagicDoorPlugin.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/DSMagicDoorPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DSNedNPC.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DSNedNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DSNedNPC.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/DSNedNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DragonSlayer.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DragonSlayer.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayer.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DragonSlayerCutscene.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerCutscene.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DragonSlayerCutscene.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerCutscene.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DragonSlayerPlugin.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DragonSlayerPlugin.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/ElvargNPC.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/ElvargNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/ElvargNPC.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/ElvargNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/GuildmasterDialogue.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/GuildmasterDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/GuildmasterDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/GuildmasterDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/MazeDemonNPC.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/MazeDemonNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/MazeDemonNPC.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/MazeDemonNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/MazeGhostNPC.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/MazeGhostNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/MazeGhostNPC.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/MazeGhostNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/MazeSkeletonNPC.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/MazeSkeletonNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/MazeSkeletonNPC.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/MazeSkeletonNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/MazeZombieNPC.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/MazeZombieNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/MazeZombieNPC.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/MazeZombieNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/MeldarMadNPC.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/MeldarMadNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/MeldarMadNPC.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/MeldarMadNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/OziachDialogue.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/OziachDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/OziachDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/OziachDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/WormbrainDialogue.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/WormbrainDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/WormbrainDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/WormbrainDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/WormbrainNPC.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/WormbrainNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/WormbrainNPC.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/WormbrainNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/ZombieRatNPC.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/ZombieRatNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/ZombieRatNPC.java
rename to Server/src/main/java/core/game/content/quest/free/dragonslayer/ZombieRatNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/goblindiplomacy/GDiplomacyCutscene.java b/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GDiplomacyCutscene.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/goblindiplomacy/GDiplomacyCutscene.java
rename to Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GDiplomacyCutscene.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacy.java b/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacy.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacy.java
rename to Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacy.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacyPlugin.java b/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacyPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacyPlugin.java
rename to Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacyPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/goblindiplomacy/GrubFoot.java b/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GrubFoot.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/goblindiplomacy/GrubFoot.java
rename to Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GrubFoot.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/goblindiplomacy/GrubfootDialogue.java b/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GrubfootDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/goblindiplomacy/GrubfootDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GrubfootDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/piratestreasure/PiratesTreasure.java b/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasure.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/piratestreasure/PiratesTreasure.java
rename to Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasure.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java b/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java
rename to Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/princealirescue/LadyKeliDialogue.java b/Server/src/main/java/core/game/content/quest/free/princealirescue/LadyKeliDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/princealirescue/LadyKeliDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/princealirescue/LadyKeliDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/princealirescue/LadyKeliNPC.java b/Server/src/main/java/core/game/content/quest/free/princealirescue/LadyKeliNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/princealirescue/LadyKeliNPC.java
rename to Server/src/main/java/core/game/content/quest/free/princealirescue/LadyKeliNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/princealirescue/PrinceAliRescue.java b/Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/princealirescue/PrinceAliRescue.java
rename to Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/princealirescue/PrinceAliRescuePlugin.java b/Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescuePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/princealirescue/PrinceAliRescuePlugin.java
rename to Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescuePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/princealirescue/WigDyePlugin.java b/Server/src/main/java/core/game/content/quest/free/princealirescue/WigDyePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/princealirescue/WigDyePlugin.java
rename to Server/src/main/java/core/game/content/quest/free/princealirescue/WigDyePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/runemysteries/RuneMysteries.java b/Server/src/main/java/core/game/content/quest/free/runemysteries/RuneMysteries.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/runemysteries/RuneMysteries.java
rename to Server/src/main/java/core/game/content/quest/free/runemysteries/RuneMysteries.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/CertificatePlugin.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/CertificatePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/CertificatePlugin.java
rename to Server/src/main/java/core/game/content/quest/free/shieldofarrav/CertificatePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/CuratorHaigHalenDialogue.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/CuratorHaigHalenDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/CuratorHaigHalenDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/shieldofarrav/CuratorHaigHalenDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/JohnnyBeardNPC.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/JohnnyBeardNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/JohnnyBeardNPC.java
rename to Server/src/main/java/core/game/content/quest/free/shieldofarrav/JohnnyBeardNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/JonnytheBeardPlugin.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/JonnytheBeardPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/JonnytheBeardPlugin.java
rename to Server/src/main/java/core/game/content/quest/free/shieldofarrav/JonnytheBeardPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/KatrineDialogue.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/KatrineDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/KatrineDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/shieldofarrav/KatrineDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/ReldoDialogue.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ReldoDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/ReldoDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/shieldofarrav/ReldoDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java
rename to Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/ShieldofArrav.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldofArrav.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/ShieldofArrav.java
rename to Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldofArrav.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/ShieldofArravBook.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldofArravBook.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/ShieldofArravBook.java
rename to Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldofArravBook.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/StravenDialogue.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/StravenDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/StravenDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/shieldofarrav/StravenDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/WeaponsMasterDialogue.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/WeaponsMasterDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/WeaponsMasterDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/shieldofarrav/WeaponsMasterDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/FatherAereckDialogue.java b/Server/src/main/java/core/game/content/quest/free/therestlessghost/FatherAereckDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/FatherAereckDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/therestlessghost/FatherAereckDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/FatherUhrneyDialogue.java b/Server/src/main/java/core/game/content/quest/free/therestlessghost/FatherUhrneyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/FatherUhrneyDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/therestlessghost/FatherUhrneyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/RestlessGhost.java b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhost.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/RestlessGhost.java
rename to Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhost.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/RestlessGhostDialogue.java b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/RestlessGhostDialogue.java
rename to Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/RestlessGhostPlugin.java b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/RestlessGhostPlugin.java
rename to Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java
rename to Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/SkullDropPlugin.java b/Server/src/main/java/core/game/content/quest/free/therestlessghost/SkullDropPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/therestlessghost/SkullDropPlugin.java
rename to Server/src/main/java/core/game/content/quest/free/therestlessghost/SkullDropPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/DruidicRitual.java b/Server/src/main/java/core/game/content/quest/members/DruidicRitual.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/DruidicRitual.java
rename to Server/src/main/java/core/game/content/quest/members/DruidicRitual.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/GertrudesCat.java b/Server/src/main/java/core/game/content/quest/members/GertrudesCat.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/GertrudesCat.java
rename to Server/src/main/java/core/game/content/quest/members/GertrudesCat.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/WolfWhistle.java b/Server/src/main/java/core/game/content/quest/members/WolfWhistle.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/WolfWhistle.java
rename to Server/src/main/java/core/game/content/quest/members/WolfWhistle.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/AliceDialogue.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AliceDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/AliceDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/animalmagnetism/AliceDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/AliceHusbandDialogue.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AliceHusbandDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/AliceHusbandDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/animalmagnetism/AliceHusbandDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/AnimalMagnetism.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetism.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/AnimalMagnetism.java
rename to Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetism.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/AvaDialogue.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/AvaDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/AvasDevicePlugin.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvasDevicePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/AvasDevicePlugin.java
rename to Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvasDevicePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/OldCronDialogue.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/OldCronDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/OldCronDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/animalmagnetism/OldCronDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/WitchDialogue.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/WitchDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/animalmagnetism/WitchDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/animalmagnetism/WitchDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/asoulsbane/ASoulsBane.java b/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBane.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/asoulsbane/ASoulsBane.java
rename to Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBane.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java b/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java
rename to Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/CannonBallPlugin.java b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/CannonBallPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/CannonBallPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/dwarfcannon/CannonBallPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/CaptainLawgofDialogue.java b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/CaptainLawgofDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/CaptainLawgofDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/dwarfcannon/CaptainLawgofDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/CaptainLawgofNPC.java b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/CaptainLawgofNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/CaptainLawgofNPC.java
rename to Server/src/main/java/core/game/content/quest/members/dwarfcannon/CaptainLawgofNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/DwarfCannon.java b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannon.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/DwarfCannon.java
rename to Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannon.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/DwarfCannonPlugin.java b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannonPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/DwarfCannonPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannonPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/LollkDialogue.java b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/LollkDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/LollkDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/dwarfcannon/LollkDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/NulodionDialogue.java b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/NulodionDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/dwarfcannon/NulodionDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/dwarfcannon/NulodionDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/BigDaveDialogue.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/BigDaveDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/BigDaveDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/BigDaveDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/BonzoDialogue.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/BonzoDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/BonzoDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/BonzoDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/DwarfDialogue.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/DwarfDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/DwarfDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/DwarfDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/FenceInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/FenceInteraction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/FenceInteraction.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/FenceInteraction.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/FishingContest.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/FishingContest.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/FishingContest.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/FishingContest.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/FishingContestCutscene.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/FishingContestCutscene.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/FishingContestCutscene.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/FishingContestCutscene.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/FishingSpotInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/FishingSpotInteraction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/FishingSpotInteraction.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/FishingSpotInteraction.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/ForesterDialogue.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/ForesterDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/ForesterDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/ForesterDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/GateInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/GateInteraction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/GateInteraction.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/GateInteraction.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/JoshuaDialogue.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/JoshuaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/JoshuaDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/JoshuaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/MorrisDialogue.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/MorrisDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/MorrisDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/MorrisDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/SinisterStrangerDialogue.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/SinisterStrangerDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/SinisterStrangerDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/SinisterStrangerDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/StairInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/StairInteraction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/StairInteraction.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/StairInteraction.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/VineInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/VineInteraction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/VineInteraction.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/VineInteraction.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/grandpaJack.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/grandpaJack.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/fishingcontest/grandpaJack.java
rename to Server/src/main/java/core/game/content/quest/members/fishingcontest/grandpaJack.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/icthlarinslittlehelper/WandererDialogue.java b/Server/src/main/java/core/game/content/quest/members/icthlarinslittlehelper/WandererDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/icthlarinslittlehelper/WandererDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/icthlarinslittlehelper/WandererDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/junglepotion/JunglePotion.java b/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotion.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/junglepotion/JunglePotion.java
rename to Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotion.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java b/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/junglepotion/TrufitusDialogue.java b/Server/src/main/java/core/game/content/quest/members/junglepotion/TrufitusDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/junglepotion/TrufitusDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/junglepotion/TrufitusDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/lostcity/DramenStaffPlugin.java b/Server/src/main/java/core/game/content/quest/members/lostcity/DramenStaffPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/lostcity/DramenStaffPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/lostcity/DramenStaffPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/lostcity/LostCity.java b/Server/src/main/java/core/game/content/quest/members/lostcity/LostCity.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/lostcity/LostCity.java
rename to Server/src/main/java/core/game/content/quest/members/lostcity/LostCity.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/lostcity/LostCityPlugin.java b/Server/src/main/java/core/game/content/quest/members/lostcity/LostCityPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/lostcity/LostCityPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/lostcity/LostCityPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/lostcity/ShamusDialogue.java b/Server/src/main/java/core/game/content/quest/members/lostcity/ShamusDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/lostcity/ShamusDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/lostcity/ShamusDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/lostcity/TreeSpiritNPC.java b/Server/src/main/java/core/game/content/quest/members/lostcity/TreeSpiritNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/lostcity/TreeSpiritNPC.java
rename to Server/src/main/java/core/game/content/quest/members/lostcity/TreeSpiritNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/lostcity/WarriorDialogue.java b/Server/src/main/java/core/game/content/quest/members/lostcity/WarriorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/lostcity/WarriorDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/lostcity/WarriorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/ArheinShopDialogue.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/ArheinShopDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/ArheinShopDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/ArheinShopDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/BeggarDialogue.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/BeggarDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/BeggarDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/BeggarDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/CandleMakerDialogue.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CandleMakerDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/CandleMakerDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/CandleMakerDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/KingArthurDialogue.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/KingArthurDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/KingArthurDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/KingArthurDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/MerlinCrystal.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystal.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/MerlinCrystal.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystal.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/MerlinCrystalPlugin.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/MerlinCrystalPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/RenegadeKnightDialogue.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/RenegadeKnightDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/RenegadeKnightDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/RenegadeKnightDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/SirGawainDialogue.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirGawainDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/SirGawainDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirGawainDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/SirKayDialogue.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirKayDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/SirKayDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirKayDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/SirLancelotDialogue.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirLancelotDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/SirLancelotDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirLancelotDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/SirLucan.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirLucan.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/SirLucan.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirLucan.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/SirMordredNPC.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirMordredNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/SirMordredNPC.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirMordredNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/SirPalomedes.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirPalomedes.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/SirPalomedes.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirPalomedes.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/TheLadyOfTheLake.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/TheLadyOfTheLake.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/TheLadyOfTheLake.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/TheLadyOfTheLake.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/ThrantaxDialogue.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/ThrantaxDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/merlinscrystal/ThrantaxDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/merlinscrystal/ThrantaxDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/priestinperil/PriestInPeril.java b/Server/src/main/java/core/game/content/quest/members/priestinperil/PriestInPeril.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/priestinperil/PriestInPeril.java
rename to Server/src/main/java/core/game/content/quest/members/priestinperil/PriestInPeril.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/rovingelves/ElunedDialogue.java b/Server/src/main/java/core/game/content/quest/members/rovingelves/ElunedDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/rovingelves/ElunedDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/rovingelves/ElunedDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/rovingelves/IslwynDialogue.java b/Server/src/main/java/core/game/content/quest/members/rovingelves/IslwynDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/rovingelves/IslwynDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/rovingelves/IslwynDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/rovingelves/MossGiantGuardianNPC.java b/Server/src/main/java/core/game/content/quest/members/rovingelves/MossGiantGuardianNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/rovingelves/MossGiantGuardianNPC.java
rename to Server/src/main/java/core/game/content/quest/members/rovingelves/MossGiantGuardianNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/rovingelves/RovingElves.java b/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElves.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/rovingelves/RovingElves.java
rename to Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElves.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/rovingelves/RovingElvesObstacles.java b/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesObstacles.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/rovingelves/RovingElvesObstacles.java
rename to Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesObstacles.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/rovingelves/RovingElvesPlugin.java b/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/rovingelves/RovingElvesPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/sheepherder/GateInteractionHandler.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/GateInteractionHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/sheepherder/GateInteractionHandler.java
rename to Server/src/main/java/core/game/content/quest/members/sheepherder/GateInteractionHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/sheepherder/HalgriveDialogue.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/HalgriveDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/sheepherder/HalgriveDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/sheepherder/HalgriveDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/sheepherder/HerderSheepNPC.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/HerderSheepNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/sheepherder/HerderSheepNPC.java
rename to Server/src/main/java/core/game/content/quest/members/sheepherder/HerderSheepNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/sheepherder/IncineratorHandler.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/IncineratorHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/sheepherder/IncineratorHandler.java
rename to Server/src/main/java/core/game/content/quest/members/sheepherder/IncineratorHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/sheepherder/OrbonDialogue.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/OrbonDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/sheepherder/OrbonDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/sheepherder/OrbonDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/sheepherder/ProdActionHandler.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/ProdActionHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/sheepherder/ProdActionHandler.java
rename to Server/src/main/java/core/game/content/quest/members/sheepherder/ProdActionHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/sheepherder/SheepHerder.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/SheepHerder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/sheepherder/SheepHerder.java
rename to Server/src/main/java/core/game/content/quest/members/sheepherder/SheepHerder.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/sheepherder/SheepPoisonHandler.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/SheepPoisonHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/sheepherder/SheepPoisonHandler.java
rename to Server/src/main/java/core/game/content/quest/members/sheepherder/SheepPoisonHandler.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/AlShabimDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/AlShabimDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/AlShabimDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/AlShabimDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/AnaDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/AnaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/AnaDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/AnaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/CaptainSiadDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/CaptainSiadDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/CaptainSiadDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/CaptainSiadDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/DesertGuardDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/DesertGuardDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/DesertGuardDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/DesertGuardDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/IrenaDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/IrenaDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/IrenaDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/IrenaDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/MaleSlaveDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MaleSlaveDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/MaleSlaveDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/MaleSlaveDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/MercenaryCaptainDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MercenaryCaptainDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/MercenaryCaptainDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/MercenaryCaptainDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/MercenaryDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MercenaryDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/MercenaryDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/MercenaryDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/MineSlaveNPC.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MineSlaveNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/MineSlaveNPC.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/MineSlaveNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/MinecartDriverDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MinecartDriverDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/MinecartDriverDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/MinecartDriverDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/MiningCampZone.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MiningCampZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/MiningCampZone.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/MiningCampZone.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/RowdySlaveNPC.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/RowdySlaveNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/RowdySlaveNPC.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/RowdySlaveNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/TouristTrap.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrap.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/TouristTrap.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrap.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/TouristTrapPlugin.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrapPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thetouristrap/TouristTrapPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrapPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/AlmeraDialogue.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/AlmeraDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/AlmeraDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/waterfallquest/AlmeraDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/BookOnBaxtorianPlugin.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/BookOnBaxtorianPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/BookOnBaxtorianPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/waterfallquest/BookOnBaxtorianPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/GolrieDialogue.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/GolrieDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/GolrieDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/waterfallquest/GolrieDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/HadleyDialogue.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/HadleyDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/HadleyDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/waterfallquest/HadleyDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/HudonDialogue.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/HudonDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/HudonDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/waterfallquest/HudonDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/WaterFall.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterFall.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/WaterFall.java
rename to Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterFall.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/WaterfallTreeDialogue.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallTreeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/waterfallquest/WaterfallTreeDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallTreeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/AnnaJonesDialogue.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/AnnaJonesDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/AnnaJonesDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/whatliesbelow/AnnaJonesDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/KingRoaldNPC.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/KingRoaldNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/KingRoaldNPC.java
rename to Server/src/main/java/core/game/content/quest/members/whatliesbelow/KingRoaldNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/OutlawNPC.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/OutlawNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/OutlawNPC.java
rename to Server/src/main/java/core/game/content/quest/members/whatliesbelow/OutlawNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/RatBurgissDialogue.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/RatBurgissDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/RatBurgissDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/whatliesbelow/RatBurgissDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/SurokMagisDialogue.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/SurokMagisDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/SurokMagisDialogue.java
rename to Server/src/main/java/core/game/content/quest/members/whatliesbelow/SurokMagisDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/WLBelowCutscene.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowCutscene.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/WLBelowCutscene.java
rename to Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowCutscene.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java
rename to Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/WhatLiesBelow.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WhatLiesBelow.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/whatliesbelow/WhatLiesBelow.java
rename to Server/src/main/java/core/game/content/quest/members/whatliesbelow/WhatLiesBelow.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/witchshouse/BallInteraction.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/BallInteraction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/witchshouse/BallInteraction.java
rename to Server/src/main/java/core/game/content/quest/members/witchshouse/BallInteraction.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/witchshouse/BoyDialoguePlugin.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/BoyDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/witchshouse/BoyDialoguePlugin.java
rename to Server/src/main/java/core/game/content/quest/members/witchshouse/BoyDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/witchshouse/ExperimentSession.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/ExperimentSession.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/witchshouse/ExperimentSession.java
rename to Server/src/main/java/core/game/content/quest/members/witchshouse/ExperimentSession.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/witchshouse/MouseNPC.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/MouseNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/witchshouse/MouseNPC.java
rename to Server/src/main/java/core/game/content/quest/members/witchshouse/MouseNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/witchshouse/NoraTHaggNPC.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/NoraTHaggNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/witchshouse/NoraTHaggNPC.java
rename to Server/src/main/java/core/game/content/quest/members/witchshouse/NoraTHaggNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/witchshouse/WitchsDiaryBook.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsDiaryBook.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/witchshouse/WitchsDiaryBook.java
rename to Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsDiaryBook.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/witchshouse/WitchsExperimentNPC.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsExperimentNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/witchshouse/WitchsExperimentNPC.java
rename to Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsExperimentNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/witchshouse/WitchsHouse.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsHouse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/witchshouse/WitchsHouse.java
rename to Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsHouse.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/witchshouse/WitchsHousePlugin.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsHousePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/witchshouse/WitchsHousePlugin.java
rename to Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsHousePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/miniquest/barcrawl/BarcrawlDialogue.java b/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/miniquest/barcrawl/BarcrawlDialogue.java
rename to Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/miniquest/barcrawl/BarcrawlManager.java b/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/miniquest/barcrawl/BarcrawlManager.java
rename to Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlManager.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/miniquest/barcrawl/BarcrawlPlugin.java b/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/miniquest/barcrawl/BarcrawlPlugin.java
rename to Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/miniquest/surok/DakhThoulanAegisDialogue.java b/Server/src/main/java/core/game/content/quest/miniquest/surok/DakhThoulanAegisDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/miniquest/surok/DakhThoulanAegisDialogue.java
rename to Server/src/main/java/core/game/content/quest/miniquest/surok/DakhThoulanAegisDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/miniquest/surok/HuntForSurokPlugin.java b/Server/src/main/java/core/game/content/quest/miniquest/surok/HuntForSurokPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/miniquest/surok/HuntForSurokPlugin.java
rename to Server/src/main/java/core/game/content/quest/miniquest/surok/HuntForSurokPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/miniquest/surok/MishkalunDornDialogue.java b/Server/src/main/java/core/game/content/quest/miniquest/surok/MishkalunDornDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/miniquest/surok/MishkalunDornDialogue.java
rename to Server/src/main/java/core/game/content/quest/miniquest/surok/MishkalunDornDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/miniquest/surok/SilasDahcsnuDialogue.java b/Server/src/main/java/core/game/content/quest/miniquest/surok/SilasDahcsnuDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/miniquest/surok/SilasDahcsnuDialogue.java
rename to Server/src/main/java/core/game/content/quest/miniquest/surok/SilasDahcsnuDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/miniquest/surok/SurokMagisDialogue.java b/Server/src/main/java/core/game/content/quest/miniquest/surok/SurokMagisDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/miniquest/surok/SurokMagisDialogue.java
rename to Server/src/main/java/core/game/content/quest/miniquest/surok/SurokMagisDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/learningtheropes/CellarMapZone.java b/Server/src/main/java/core/game/content/quest/tutorials/learningtheropes/CellarMapZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/learningtheropes/CellarMapZone.java
rename to Server/src/main/java/core/game/content/quest/tutorials/learningtheropes/CellarMapZone.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/learningtheropes/LTRDragonFightCutscene.java b/Server/src/main/java/core/game/content/quest/tutorials/learningtheropes/LTRDragonFightCutscene.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/learningtheropes/LTRDragonFightCutscene.java
rename to Server/src/main/java/core/game/content/quest/tutorials/learningtheropes/LTRDragonFightCutscene.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/learningtheropes/SirVantDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/learningtheropes/SirVantDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/learningtheropes/SirVantDialogue.java
rename to Server/src/main/java/core/game/content/quest/tutorials/learningtheropes/SirVantDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/BasicStarter.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/BasicStarter.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/BasicStarter.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/BasicStarter.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/BrotherBraceDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/BrotherBraceDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/BrotherBraceDialogue.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/BrotherBraceDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/CharacterDesign.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/CharacterDesign.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/CharacterDesign.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/CharacterDesign.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/CombatInstructorDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/CombatInstructorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/CombatInstructorDialogue.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/CombatInstructorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/FinancialAdvisorDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/FinancialAdvisorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/FinancialAdvisorDialogue.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/FinancialAdvisorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/MasterChefDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/MasterChefDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/MasterChefDialogue.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/MasterChefDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/MiningInstructorDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/MiningInstructorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/MiningInstructorDialogue.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/MiningInstructorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/QuestGuideDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/QuestGuideDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/QuestGuideDialogue.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/QuestGuideDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/RSGuideDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/RSGuideDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/RSGuideDialogue.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/RSGuideDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/SurvivalExpertDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/SurvivalExpertDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/SurvivalExpertDialogue.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/SurvivalExpertDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/TutorialBook.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialBook.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/TutorialBook.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialBook.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/TutorialCompletionDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialCompletionDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/TutorialCompletionDialogue.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialCompletionDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/TutorialSession.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialSession.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/TutorialSession.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialSession.java
diff --git a/Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/TutorialStage.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialStage.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/tutorials/tutorialisland/TutorialStage.java
rename to Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialStage.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/ClueLevel.java b/Server/src/main/java/core/game/content/ttrail/ClueLevel.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/ClueLevel.java
rename to Server/src/main/java/core/game/content/ttrail/ClueLevel.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/ClueScrollPlugin.java b/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/ClueScrollPlugin.java
rename to Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/CoordinateCluePlugin.java b/Server/src/main/java/core/game/content/ttrail/CoordinateCluePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/CoordinateCluePlugin.java
rename to Server/src/main/java/core/game/content/ttrail/CoordinateCluePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/CoordinateClueScroll.java b/Server/src/main/java/core/game/content/ttrail/CoordinateClueScroll.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/CoordinateClueScroll.java
rename to Server/src/main/java/core/game/content/ttrail/CoordinateClueScroll.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/EmoteCluePlugin.java b/Server/src/main/java/core/game/content/ttrail/EmoteCluePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/EmoteCluePlugin.java
rename to Server/src/main/java/core/game/content/ttrail/EmoteCluePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/EmoteClueScroll.java b/Server/src/main/java/core/game/content/ttrail/EmoteClueScroll.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/EmoteClueScroll.java
rename to Server/src/main/java/core/game/content/ttrail/EmoteClueScroll.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/MapCluePlugin.java b/Server/src/main/java/core/game/content/ttrail/MapCluePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/MapCluePlugin.java
rename to Server/src/main/java/core/game/content/ttrail/MapCluePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/MapClueScroll.java b/Server/src/main/java/core/game/content/ttrail/MapClueScroll.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/MapClueScroll.java
rename to Server/src/main/java/core/game/content/ttrail/MapClueScroll.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/SaradominWizardNPC.java b/Server/src/main/java/core/game/content/ttrail/SaradominWizardNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/SaradominWizardNPC.java
rename to Server/src/main/java/core/game/content/ttrail/SaradominWizardNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/TreasureTrailManager.java b/Server/src/main/java/core/game/content/ttrail/TreasureTrailManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/TreasureTrailManager.java
rename to Server/src/main/java/core/game/content/ttrail/TreasureTrailManager.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/TreasureTrailPlugin.java b/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/TreasureTrailPlugin.java
rename to Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/UriNPC.java b/Server/src/main/java/core/game/content/ttrail/UriNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/UriNPC.java
rename to Server/src/main/java/core/game/content/ttrail/UriNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/ttrail/ZamorakWizardNPC.java b/Server/src/main/java/core/game/content/ttrail/ZamorakWizardNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ttrail/ZamorakWizardNPC.java
rename to Server/src/main/java/core/game/content/ttrail/ZamorakWizardNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/CairnIslandZone.java b/Server/src/main/java/core/game/content/zone/CairnIslandZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/CairnIslandZone.java
rename to Server/src/main/java/core/game/content/zone/CairnIslandZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/ChaosTunnelZone.java b/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/ChaosTunnelZone.java
rename to Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/CrandorZone.java b/Server/src/main/java/core/game/content/zone/CrandorZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/CrandorZone.java
rename to Server/src/main/java/core/game/content/zone/CrandorZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/DesertZone.java b/Server/src/main/java/core/game/content/zone/DesertZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/DesertZone.java
rename to Server/src/main/java/core/game/content/zone/DesertZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/DraynorMansionCourtyardZone.java b/Server/src/main/java/core/game/content/zone/DraynorMansionCourtyardZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/DraynorMansionCourtyardZone.java
rename to Server/src/main/java/core/game/content/zone/DraynorMansionCourtyardZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/DraynorMarketZone.java b/Server/src/main/java/core/game/content/zone/DraynorMarketZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/DraynorMarketZone.java
rename to Server/src/main/java/core/game/content/zone/DraynorMarketZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/FredsFarmHouseZone.java b/Server/src/main/java/core/game/content/zone/FredsFarmHouseZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/FredsFarmHouseZone.java
rename to Server/src/main/java/core/game/content/zone/FredsFarmHouseZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/IcePathZone.java b/Server/src/main/java/core/game/content/zone/IcePathZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/IcePathZone.java
rename to Server/src/main/java/core/game/content/zone/IcePathZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/TzhaarZone.java b/Server/src/main/java/core/game/content/zone/TzhaarZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/TzhaarZone.java
rename to Server/src/main/java/core/game/content/zone/TzhaarZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/WildernessAreaZone.java b/Server/src/main/java/core/game/content/zone/WildernessAreaZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/WildernessAreaZone.java
rename to Server/src/main/java/core/game/content/zone/WildernessAreaZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/YanilleAgilityDungeon.java b/Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/YanilleAgilityDungeon.java
rename to Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/fremmenik/FremmenikPlugin.java b/Server/src/main/java/core/game/content/zone/fremmenik/FremmenikPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/fremmenik/FremmenikPlugin.java
rename to Server/src/main/java/core/game/content/zone/fremmenik/FremmenikPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/neitiznot/MawnisBurowgarDialogue.java b/Server/src/main/java/core/game/content/zone/neitiznot/MawnisBurowgarDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/neitiznot/MawnisBurowgarDialogue.java
rename to Server/src/main/java/core/game/content/zone/neitiznot/MawnisBurowgarDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/neitiznot/NeitiznotZone.java b/Server/src/main/java/core/game/content/zone/neitiznot/NeitiznotZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/neitiznot/NeitiznotZone.java
rename to Server/src/main/java/core/game/content/zone/neitiznot/NeitiznotZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/neitiznot/ThakkradYakDialogue.java b/Server/src/main/java/core/game/content/zone/neitiznot/ThakkradYakDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/neitiznot/ThakkradYakDialogue.java
rename to Server/src/main/java/core/game/content/zone/neitiznot/ThakkradYakDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/neitiznot/YakArmourPlugin.java b/Server/src/main/java/core/game/content/zone/neitiznot/YakArmourPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/neitiznot/YakArmourPlugin.java
rename to Server/src/main/java/core/game/content/zone/neitiznot/YakArmourPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/phasmatys/EctoplasmFillPlugin.java b/Server/src/main/java/core/game/content/zone/phasmatys/EctoplasmFillPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/phasmatys/EctoplasmFillPlugin.java
rename to Server/src/main/java/core/game/content/zone/phasmatys/EctoplasmFillPlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/phasmatys/GhostDiscipleDialogue.java b/Server/src/main/java/core/game/content/zone/phasmatys/GhostDiscipleDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/phasmatys/GhostDiscipleDialogue.java
rename to Server/src/main/java/core/game/content/zone/phasmatys/GhostDiscipleDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/phasmatys/GhostInkeeperDialogue.java b/Server/src/main/java/core/game/content/zone/phasmatys/GhostInkeeperDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/phasmatys/GhostInkeeperDialogue.java
rename to Server/src/main/java/core/game/content/zone/phasmatys/GhostInkeeperDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/phasmatys/GhostSailorDialogue.java b/Server/src/main/java/core/game/content/zone/phasmatys/GhostSailorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/phasmatys/GhostSailorDialogue.java
rename to Server/src/main/java/core/game/content/zone/phasmatys/GhostSailorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/phasmatys/GhostVillagerDialogue.java b/Server/src/main/java/core/game/content/zone/phasmatys/GhostVillagerDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/phasmatys/GhostVillagerDialogue.java
rename to Server/src/main/java/core/game/content/zone/phasmatys/GhostVillagerDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/phasmatys/GravingasNPC.java b/Server/src/main/java/core/game/content/zone/phasmatys/GravingasNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/phasmatys/GravingasNPC.java
rename to Server/src/main/java/core/game/content/zone/phasmatys/GravingasNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/phasmatys/NecrovarusDialogue.java b/Server/src/main/java/core/game/content/zone/phasmatys/NecrovarusDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/phasmatys/NecrovarusDialogue.java
rename to Server/src/main/java/core/game/content/zone/phasmatys/NecrovarusDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/phasmatys/PhasmatysZone.java b/Server/src/main/java/core/game/content/zone/phasmatys/PhasmatysZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/phasmatys/PhasmatysZone.java
rename to Server/src/main/java/core/game/content/zone/phasmatys/PhasmatysZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/phasmatys/TokenCollectOption.java b/Server/src/main/java/core/game/content/zone/phasmatys/TokenCollectOption.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/phasmatys/TokenCollectOption.java
rename to Server/src/main/java/core/game/content/zone/phasmatys/TokenCollectOption.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/rellekka/JarvaldDialogue.java b/Server/src/main/java/core/game/content/zone/rellekka/JarvaldDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/rellekka/JarvaldDialogue.java
rename to Server/src/main/java/core/game/content/zone/rellekka/JarvaldDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/rellekka/LightHousePlugin.java b/Server/src/main/java/core/game/content/zone/rellekka/LightHousePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/rellekka/LightHousePlugin.java
rename to Server/src/main/java/core/game/content/zone/rellekka/LightHousePlugin.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/rellekka/MariaGunnarsDialogue.java b/Server/src/main/java/core/game/content/zone/rellekka/MariaGunnarsDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/rellekka/MariaGunnarsDialogue.java
rename to Server/src/main/java/core/game/content/zone/rellekka/MariaGunnarsDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/rellekka/RellekkaZone.java b/Server/src/main/java/core/game/content/zone/rellekka/RellekkaZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/rellekka/RellekkaZone.java
rename to Server/src/main/java/core/game/content/zone/rellekka/RellekkaZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/rellekka/SailorDialogue.java b/Server/src/main/java/core/game/content/zone/rellekka/SailorDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/rellekka/SailorDialogue.java
rename to Server/src/main/java/core/game/content/zone/rellekka/SailorDialogue.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/wbisland/DagannothKingNPC.java b/Server/src/main/java/core/game/content/zone/wbisland/DagannothKingNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/wbisland/DagannothKingNPC.java
rename to Server/src/main/java/core/game/content/zone/wbisland/DagannothKingNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/wbisland/SpinolypNPC.java b/Server/src/main/java/core/game/content/zone/wbisland/SpinolypNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/wbisland/SpinolypNPC.java
rename to Server/src/main/java/core/game/content/zone/wbisland/SpinolypNPC.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/wbisland/WaterBirthDungeonZone.java b/Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/wbisland/WaterBirthDungeonZone.java
rename to Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java
diff --git a/Server/src/main/java/Server/core/game/content/zone/wbisland/WaterBirthIslandZone.java b/Server/src/main/java/core/game/content/zone/wbisland/WaterBirthIslandZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/wbisland/WaterBirthIslandZone.java
rename to Server/src/main/java/core/game/content/zone/wbisland/WaterBirthIslandZone.java
diff --git a/Server/src/main/java/Server/core/game/ge/BuyingLimitation.java b/Server/src/main/java/core/game/ge/BuyingLimitation.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/ge/BuyingLimitation.java
rename to Server/src/main/java/core/game/ge/BuyingLimitation.java
diff --git a/Server/src/main/java/Server/core/game/ge/GEGuidePrice.java b/Server/src/main/java/core/game/ge/GEGuidePrice.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/ge/GEGuidePrice.java
rename to Server/src/main/java/core/game/ge/GEGuidePrice.java
diff --git a/Server/src/main/java/Server/core/game/ge/GEItemSet.java b/Server/src/main/java/core/game/ge/GEItemSet.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/ge/GEItemSet.java
rename to Server/src/main/java/core/game/ge/GEItemSet.java
diff --git a/Server/src/main/java/Server/core/game/ge/GrandExchangeDatabase.java b/Server/src/main/java/core/game/ge/GrandExchangeDatabase.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/ge/GrandExchangeDatabase.java
rename to Server/src/main/java/core/game/ge/GrandExchangeDatabase.java
diff --git a/Server/src/main/java/Server/core/game/ge/GrandExchangeEntry.java b/Server/src/main/java/core/game/ge/GrandExchangeEntry.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/ge/GrandExchangeEntry.java
rename to Server/src/main/java/core/game/ge/GrandExchangeEntry.java
diff --git a/Server/src/main/java/Server/core/game/ge/OfferState.java b/Server/src/main/java/core/game/ge/OfferState.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/ge/OfferState.java
rename to Server/src/main/java/core/game/ge/OfferState.java
diff --git a/Server/src/main/java/Server/core/game/interaction/DestinationFlag.java b/Server/src/main/java/core/game/interaction/DestinationFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/DestinationFlag.java
rename to Server/src/main/java/core/game/interaction/DestinationFlag.java
diff --git a/Server/src/main/java/Server/core/game/interaction/Interaction.java b/Server/src/main/java/core/game/interaction/Interaction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/Interaction.java
rename to Server/src/main/java/core/game/interaction/Interaction.java
diff --git a/Server/src/main/java/Server/core/game/interaction/MovementPulse.java b/Server/src/main/java/core/game/interaction/MovementPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/MovementPulse.java
rename to Server/src/main/java/core/game/interaction/MovementPulse.java
diff --git a/Server/src/main/java/Server/core/game/interaction/NodeUsageEvent.java b/Server/src/main/java/core/game/interaction/NodeUsageEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/NodeUsageEvent.java
rename to Server/src/main/java/core/game/interaction/NodeUsageEvent.java
diff --git a/Server/src/main/java/Server/core/game/interaction/Option.java b/Server/src/main/java/core/game/interaction/Option.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/Option.java
rename to Server/src/main/java/core/game/interaction/Option.java
diff --git a/Server/src/main/java/Server/core/game/interaction/OptionHandler.java b/Server/src/main/java/core/game/interaction/OptionHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/OptionHandler.java
rename to Server/src/main/java/core/game/interaction/OptionHandler.java
diff --git a/Server/src/main/java/Server/core/game/interaction/SpecialGroundInteraction.java b/Server/src/main/java/core/game/interaction/SpecialGroundInteraction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/SpecialGroundInteraction.java
rename to Server/src/main/java/core/game/interaction/SpecialGroundInteraction.java
diff --git a/Server/src/main/java/Server/core/game/interaction/SpecialGroundItems.java b/Server/src/main/java/core/game/interaction/SpecialGroundItems.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/SpecialGroundItems.java
rename to Server/src/main/java/core/game/interaction/SpecialGroundItems.java
diff --git a/Server/src/main/java/Server/core/game/interaction/UseWithHandler.java b/Server/src/main/java/core/game/interaction/UseWithHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/UseWithHandler.java
rename to Server/src/main/java/core/game/interaction/UseWithHandler.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/BedabinPlugin.java b/Server/src/main/java/core/game/interaction/city/BedabinPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/BedabinPlugin.java
rename to Server/src/main/java/core/game/interaction/city/BedabinPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/BrimhavenDungeonPlugin.java b/Server/src/main/java/core/game/interaction/city/BrimhavenDungeonPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/BrimhavenDungeonPlugin.java
rename to Server/src/main/java/core/game/interaction/city/BrimhavenDungeonPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/BurthorpePlugin.java b/Server/src/main/java/core/game/interaction/city/BurthorpePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/BurthorpePlugin.java
rename to Server/src/main/java/core/game/interaction/city/BurthorpePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/CamelotNodePlugin.java b/Server/src/main/java/core/game/interaction/city/CamelotNodePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/CamelotNodePlugin.java
rename to Server/src/main/java/core/game/interaction/city/CamelotNodePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/DraynorManorPlugin.java b/Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/DraynorManorPlugin.java
rename to Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/DraynorNodePlugin.java b/Server/src/main/java/core/game/interaction/city/DraynorNodePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/DraynorNodePlugin.java
rename to Server/src/main/java/core/game/interaction/city/DraynorNodePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/EdgevilleNodePlugin.java b/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/EdgevilleNodePlugin.java
rename to Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/EntranaObjectPlugin.java b/Server/src/main/java/core/game/interaction/city/EntranaObjectPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/EntranaObjectPlugin.java
rename to Server/src/main/java/core/game/interaction/city/EntranaObjectPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/FaladorNodePlugin.java b/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/FaladorNodePlugin.java
rename to Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/GnomeStrongholdPlugin.java b/Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/GnomeStrongholdPlugin.java
rename to Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/HamHideoutPlugin.java b/Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/HamHideoutPlugin.java
rename to Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/HomePlugin.java b/Server/src/main/java/core/game/interaction/city/HomePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/HomePlugin.java
rename to Server/src/main/java/core/game/interaction/city/HomePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/KaramajaOptionPlugin.java b/Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/KaramajaOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/KhardianDesertPlugin.java b/Server/src/main/java/core/game/interaction/city/KhardianDesertPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/KhardianDesertPlugin.java
rename to Server/src/main/java/core/game/interaction/city/KhardianDesertPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/LumbridgeNodePlugin.java b/Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/LumbridgeNodePlugin.java
rename to Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/LunarIslePlugin.java b/Server/src/main/java/core/game/interaction/city/LunarIslePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/LunarIslePlugin.java
rename to Server/src/main/java/core/game/interaction/city/LunarIslePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/MonasteryPlugin.java b/Server/src/main/java/core/game/interaction/city/MonasteryPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/MonasteryPlugin.java
rename to Server/src/main/java/core/game/interaction/city/MonasteryPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/PortSarimPlugin.java b/Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/PortSarimPlugin.java
rename to Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/RCGuildMap.java b/Server/src/main/java/core/game/interaction/city/RCGuildMap.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/RCGuildMap.java
rename to Server/src/main/java/core/game/interaction/city/RCGuildMap.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/RCGuildPortal.java b/Server/src/main/java/core/game/interaction/city/RCGuildPortal.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/RCGuildPortal.java
rename to Server/src/main/java/core/game/interaction/city/RCGuildPortal.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/ShiloVillagePlugin.java b/Server/src/main/java/core/game/interaction/city/ShiloVillagePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/ShiloVillagePlugin.java
rename to Server/src/main/java/core/game/interaction/city/ShiloVillagePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/SophanemPlugin.java b/Server/src/main/java/core/game/interaction/city/SophanemPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/SophanemPlugin.java
rename to Server/src/main/java/core/game/interaction/city/SophanemPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/TaverlyDungeonPlugin.java b/Server/src/main/java/core/game/interaction/city/TaverlyDungeonPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/TaverlyDungeonPlugin.java
rename to Server/src/main/java/core/game/interaction/city/TaverlyDungeonPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/TrollheimPlugin.java b/Server/src/main/java/core/game/interaction/city/TrollheimPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/TrollheimPlugin.java
rename to Server/src/main/java/core/game/interaction/city/TrollheimPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/TzhaarCityPlugin.java b/Server/src/main/java/core/game/interaction/city/TzhaarCityPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/TzhaarCityPlugin.java
rename to Server/src/main/java/core/game/interaction/city/TzhaarCityPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/VarrockNodePlugin.java b/Server/src/main/java/core/game/interaction/city/VarrockNodePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/VarrockNodePlugin.java
rename to Server/src/main/java/core/game/interaction/city/VarrockNodePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/WildernessPlugin.java b/Server/src/main/java/core/game/interaction/city/WildernessPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/WildernessPlugin.java
rename to Server/src/main/java/core/game/interaction/city/WildernessPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/WizardTowerPlugin.java b/Server/src/main/java/core/game/interaction/city/WizardTowerPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/WizardTowerPlugin.java
rename to Server/src/main/java/core/game/interaction/city/WizardTowerPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/ZanarisPlugin.java b/Server/src/main/java/core/game/interaction/city/ZanarisPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/ZanarisPlugin.java
rename to Server/src/main/java/core/game/interaction/city/ZanarisPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/falador/WineOfZamorakInteraction.java b/Server/src/main/java/core/game/interaction/city/falador/WineOfZamorakInteraction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/falador/WineOfZamorakInteraction.java
rename to Server/src/main/java/core/game/interaction/city/falador/WineOfZamorakInteraction.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/lumbridge/CowFieldSign.java b/Server/src/main/java/core/game/interaction/city/lumbridge/CowFieldSign.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/lumbridge/CowFieldSign.java
rename to Server/src/main/java/core/game/interaction/city/lumbridge/CowFieldSign.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/lumbridge/CowPenZone.java b/Server/src/main/java/core/game/interaction/city/lumbridge/CowPenZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/lumbridge/CowPenZone.java
rename to Server/src/main/java/core/game/interaction/city/lumbridge/CowPenZone.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/lumbridge/FredChest.java b/Server/src/main/java/core/game/interaction/city/lumbridge/FredChest.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/lumbridge/FredChest.java
rename to Server/src/main/java/core/game/interaction/city/lumbridge/FredChest.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/lumbridge/GnomeCopterSign.java b/Server/src/main/java/core/game/interaction/city/lumbridge/GnomeCopterSign.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/lumbridge/GnomeCopterSign.java
rename to Server/src/main/java/core/game/interaction/city/lumbridge/GnomeCopterSign.java
diff --git a/Server/src/main/java/Server/core/game/interaction/city/portsarim/AhabBeerInteraction.java b/Server/src/main/java/core/game/interaction/city/portsarim/AhabBeerInteraction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/portsarim/AhabBeerInteraction.java
rename to Server/src/main/java/core/game/interaction/city/portsarim/AhabBeerInteraction.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/AgilityTicketInterface.java b/Server/src/main/java/core/game/interaction/inter/AgilityTicketInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/AgilityTicketInterface.java
rename to Server/src/main/java/core/game/interaction/inter/AgilityTicketInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/AutocastSelectPlugin.java b/Server/src/main/java/core/game/interaction/inter/AutocastSelectPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/AutocastSelectPlugin.java
rename to Server/src/main/java/core/game/interaction/inter/AutocastSelectPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/BankPinInterface.java b/Server/src/main/java/core/game/interaction/inter/BankPinInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/BankPinInterface.java
rename to Server/src/main/java/core/game/interaction/inter/BankPinInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/BoltEnchantingInterface.java b/Server/src/main/java/core/game/interaction/inter/BoltEnchantingInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/BoltEnchantingInterface.java
rename to Server/src/main/java/core/game/interaction/inter/BoltEnchantingInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/CanoeInterfacePlugin.java b/Server/src/main/java/core/game/interaction/inter/CanoeInterfacePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/CanoeInterfacePlugin.java
rename to Server/src/main/java/core/game/interaction/inter/CanoeInterfacePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/CharacterDesignInterface.java b/Server/src/main/java/core/game/interaction/inter/CharacterDesignInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/CharacterDesignInterface.java
rename to Server/src/main/java/core/game/interaction/inter/CharacterDesignInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/ClanInterfacePlugin.java b/Server/src/main/java/core/game/interaction/inter/ClanInterfacePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/ClanInterfacePlugin.java
rename to Server/src/main/java/core/game/interaction/inter/ClanInterfacePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/CombatTabInterface.java b/Server/src/main/java/core/game/interaction/inter/CombatTabInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/CombatTabInterface.java
rename to Server/src/main/java/core/game/interaction/inter/CombatTabInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/CrystalKeyChestPlugin.java b/Server/src/main/java/core/game/interaction/inter/CrystalKeyChestPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/CrystalKeyChestPlugin.java
rename to Server/src/main/java/core/game/interaction/inter/CrystalKeyChestPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/DeathInterfacePlugin.java b/Server/src/main/java/core/game/interaction/inter/DeathInterfacePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/DeathInterfacePlugin.java
rename to Server/src/main/java/core/game/interaction/inter/DeathInterfacePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/EllisDialogue.java b/Server/src/main/java/core/game/interaction/inter/EllisDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/EllisDialogue.java
rename to Server/src/main/java/core/game/interaction/inter/EllisDialogue.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/EmoteTabInterface.java b/Server/src/main/java/core/game/interaction/inter/EmoteTabInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/EmoteTabInterface.java
rename to Server/src/main/java/core/game/interaction/inter/EmoteTabInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/EquipmentInterface.java b/Server/src/main/java/core/game/interaction/inter/EquipmentInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/EquipmentInterface.java
rename to Server/src/main/java/core/game/interaction/inter/EquipmentInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/GameInterface.java b/Server/src/main/java/core/game/interaction/inter/GameInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/GameInterface.java
rename to Server/src/main/java/core/game/interaction/inter/GameInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/GlassInterface.java b/Server/src/main/java/core/game/interaction/inter/GlassInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/GlassInterface.java
rename to Server/src/main/java/core/game/interaction/inter/GlassInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/GliderInterface.java b/Server/src/main/java/core/game/interaction/inter/GliderInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/GliderInterface.java
rename to Server/src/main/java/core/game/interaction/inter/GliderInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/GrandExchangeInterface.java b/Server/src/main/java/core/game/interaction/inter/GrandExchangeInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/GrandExchangeInterface.java
rename to Server/src/main/java/core/game/interaction/inter/GrandExchangeInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/GravePurchaseInterface.java b/Server/src/main/java/core/game/interaction/inter/GravePurchaseInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/GravePurchaseInterface.java
rename to Server/src/main/java/core/game/interaction/inter/GravePurchaseInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/JewelleryInterface.java b/Server/src/main/java/core/game/interaction/inter/JewelleryInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/JewelleryInterface.java
rename to Server/src/main/java/core/game/interaction/inter/JewelleryInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/LeatherCraftInterface.java b/Server/src/main/java/core/game/interaction/inter/LeatherCraftInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/LeatherCraftInterface.java
rename to Server/src/main/java/core/game/interaction/inter/LeatherCraftInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/LeatherCraftPlugin.java b/Server/src/main/java/core/game/interaction/inter/LeatherCraftPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/LeatherCraftPlugin.java
rename to Server/src/main/java/core/game/interaction/inter/LeatherCraftPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/LoginInterfacePlugin.java b/Server/src/main/java/core/game/interaction/inter/LoginInterfacePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/LoginInterfacePlugin.java
rename to Server/src/main/java/core/game/interaction/inter/LoginInterfacePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/LogoutInterface.java b/Server/src/main/java/core/game/interaction/inter/LogoutInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/LogoutInterface.java
rename to Server/src/main/java/core/game/interaction/inter/LogoutInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/MagicBookInterface.java b/Server/src/main/java/core/game/interaction/inter/MagicBookInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/MagicBookInterface.java
rename to Server/src/main/java/core/game/interaction/inter/MagicBookInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/MusicTabInterface.java b/Server/src/main/java/core/game/interaction/inter/MusicTabInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/MusicTabInterface.java
rename to Server/src/main/java/core/game/interaction/inter/MusicTabInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/MysticStaffEnchantingPlugin.java b/Server/src/main/java/core/game/interaction/inter/MysticStaffEnchantingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/MysticStaffEnchantingPlugin.java
rename to Server/src/main/java/core/game/interaction/inter/MysticStaffEnchantingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/OrbViewingInterface.java b/Server/src/main/java/core/game/interaction/inter/OrbViewingInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/OrbViewingInterface.java
rename to Server/src/main/java/core/game/interaction/inter/OrbViewingInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/PlayerExamineInterfacePlugin.java b/Server/src/main/java/core/game/interaction/inter/PlayerExamineInterfacePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/PlayerExamineInterfacePlugin.java
rename to Server/src/main/java/core/game/interaction/inter/PlayerExamineInterfacePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/PrayerTabInterface.java b/Server/src/main/java/core/game/interaction/inter/PrayerTabInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/PrayerTabInterface.java
rename to Server/src/main/java/core/game/interaction/inter/PrayerTabInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/QuestTabInterface.java b/Server/src/main/java/core/game/interaction/inter/QuestTabInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/QuestTabInterface.java
rename to Server/src/main/java/core/game/interaction/inter/QuestTabInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/RequestAssistInterface.java b/Server/src/main/java/core/game/interaction/inter/RequestAssistInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/RequestAssistInterface.java
rename to Server/src/main/java/core/game/interaction/inter/RequestAssistInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/SawmillPlankInterface.java b/Server/src/main/java/core/game/interaction/inter/SawmillPlankInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/SawmillPlankInterface.java
rename to Server/src/main/java/core/game/interaction/inter/SawmillPlankInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/SettingTabInterface.java b/Server/src/main/java/core/game/interaction/inter/SettingTabInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/SettingTabInterface.java
rename to Server/src/main/java/core/game/interaction/inter/SettingTabInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/ShipCharterInterface.java b/Server/src/main/java/core/game/interaction/inter/ShipCharterInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/ShipCharterInterface.java
rename to Server/src/main/java/core/game/interaction/inter/ShipCharterInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/ShoppingPlugin.java b/Server/src/main/java/core/game/interaction/inter/ShoppingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/ShoppingPlugin.java
rename to Server/src/main/java/core/game/interaction/inter/ShoppingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/SilverInterface.java b/Server/src/main/java/core/game/interaction/inter/SilverInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/SilverInterface.java
rename to Server/src/main/java/core/game/interaction/inter/SilverInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/SkillInterface.java b/Server/src/main/java/core/game/interaction/inter/SkillInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/SkillInterface.java
rename to Server/src/main/java/core/game/interaction/inter/SkillInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/SkillTabInterface.java b/Server/src/main/java/core/game/interaction/inter/SkillTabInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/SkillTabInterface.java
rename to Server/src/main/java/core/game/interaction/inter/SkillTabInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/SmeltingInterface.java b/Server/src/main/java/core/game/interaction/inter/SmeltingInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/SmeltingInterface.java
rename to Server/src/main/java/core/game/interaction/inter/SmeltingInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/SmithingInterface.java b/Server/src/main/java/core/game/interaction/inter/SmithingInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/SmithingInterface.java
rename to Server/src/main/java/core/game/interaction/inter/SmithingInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/SpinningInterface.java b/Server/src/main/java/core/game/interaction/inter/SpinningInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/SpinningInterface.java
rename to Server/src/main/java/core/game/interaction/inter/SpinningInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/TanningInterface.java b/Server/src/main/java/core/game/interaction/inter/TanningInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/TanningInterface.java
rename to Server/src/main/java/core/game/interaction/inter/TanningInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/TradeInterfacePlugin.java b/Server/src/main/java/core/game/interaction/inter/TradeInterfacePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/TradeInterfacePlugin.java
rename to Server/src/main/java/core/game/interaction/inter/TradeInterfacePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/WorldMapInterface.java b/Server/src/main/java/core/game/interaction/inter/WorldMapInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/WorldMapInterface.java
rename to Server/src/main/java/core/game/interaction/inter/WorldMapInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/BirdNestPlugin.java b/Server/src/main/java/core/game/interaction/item/BirdNestPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/BirdNestPlugin.java
rename to Server/src/main/java/core/game/interaction/item/BirdNestPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/BookreadOption.java b/Server/src/main/java/core/game/interaction/item/BookreadOption.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/BookreadOption.java
rename to Server/src/main/java/core/game/interaction/item/BookreadOption.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/CasketPlugin.java b/Server/src/main/java/core/game/interaction/item/CasketPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/CasketPlugin.java
rename to Server/src/main/java/core/game/interaction/item/CasketPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/ConsumableOptionPlugin.java b/Server/src/main/java/core/game/interaction/item/ConsumableOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/ConsumableOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/item/ConsumableOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/DiangoItemPlugin.java b/Server/src/main/java/core/game/interaction/item/DiangoItemPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/DiangoItemPlugin.java
rename to Server/src/main/java/core/game/interaction/item/DiangoItemPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/DragonfireShieldPlugin.java b/Server/src/main/java/core/game/interaction/item/DragonfireShieldPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/DragonfireShieldPlugin.java
rename to Server/src/main/java/core/game/interaction/item/DragonfireShieldPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/DustHandPlugin.java b/Server/src/main/java/core/game/interaction/item/DustHandPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/DustHandPlugin.java
rename to Server/src/main/java/core/game/interaction/item/DustHandPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/EmptyOptionPlugin.java b/Server/src/main/java/core/game/interaction/item/EmptyOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/EmptyOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/item/EmptyOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/EnchantedGemPlugin.java b/Server/src/main/java/core/game/interaction/item/EnchantedGemPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/EnchantedGemPlugin.java
rename to Server/src/main/java/core/game/interaction/item/EnchantedGemPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/ExplorersRingPlugin.java b/Server/src/main/java/core/game/interaction/item/ExplorersRingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/ExplorersRingPlugin.java
rename to Server/src/main/java/core/game/interaction/item/ExplorersRingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/FaladorShieldPlugin.java b/Server/src/main/java/core/game/interaction/item/FaladorShieldPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/FaladorShieldPlugin.java
rename to Server/src/main/java/core/game/interaction/item/FaladorShieldPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/FishbowlPlugin.java b/Server/src/main/java/core/game/interaction/item/FishbowlPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/FishbowlPlugin.java
rename to Server/src/main/java/core/game/interaction/item/FishbowlPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/GnomeCopterPlugin.java b/Server/src/main/java/core/game/interaction/item/GnomeCopterPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/GnomeCopterPlugin.java
rename to Server/src/main/java/core/game/interaction/item/GnomeCopterPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/GnomecopterTicket.java b/Server/src/main/java/core/game/interaction/item/GnomecopterTicket.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/GnomecopterTicket.java
rename to Server/src/main/java/core/game/interaction/item/GnomecopterTicket.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/GodBookPlugin.java b/Server/src/main/java/core/game/interaction/item/GodBookPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/GodBookPlugin.java
rename to Server/src/main/java/core/game/interaction/item/GodBookPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/GodswordDismantlePlugin.java b/Server/src/main/java/core/game/interaction/item/GodswordDismantlePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/GodswordDismantlePlugin.java
rename to Server/src/main/java/core/game/interaction/item/GodswordDismantlePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/HerbBoxPlugin.java b/Server/src/main/java/core/game/interaction/item/HerbBoxPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/HerbBoxPlugin.java
rename to Server/src/main/java/core/game/interaction/item/HerbBoxPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/HouseTeleTabOptionPlugin.java b/Server/src/main/java/core/game/interaction/item/HouseTeleTabOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/HouseTeleTabOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/item/HouseTeleTabOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/KeldagrimVotingBond.java b/Server/src/main/java/core/game/interaction/item/KeldagrimVotingBond.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/KeldagrimVotingBond.java
rename to Server/src/main/java/core/game/interaction/item/KeldagrimVotingBond.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/LampPlugin.java b/Server/src/main/java/core/game/interaction/item/LampPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/LampPlugin.java
rename to Server/src/main/java/core/game/interaction/item/LampPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/MorphItemPlugin.java b/Server/src/main/java/core/game/interaction/item/MorphItemPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/MorphItemPlugin.java
rename to Server/src/main/java/core/game/interaction/item/MorphItemPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/NewComerMapPlugin.java b/Server/src/main/java/core/game/interaction/item/NewComerMapPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/NewComerMapPlugin.java
rename to Server/src/main/java/core/game/interaction/item/NewComerMapPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/NewsPaperPlugin.java b/Server/src/main/java/core/game/interaction/item/NewsPaperPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/NewsPaperPlugin.java
rename to Server/src/main/java/core/game/interaction/item/NewsPaperPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/OysterPlugin.java b/Server/src/main/java/core/game/interaction/item/OysterPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/OysterPlugin.java
rename to Server/src/main/java/core/game/interaction/item/OysterPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/PharoahSceptre.java b/Server/src/main/java/core/game/interaction/item/PharoahSceptre.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/PharoahSceptre.java
rename to Server/src/main/java/core/game/interaction/item/PharoahSceptre.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/PickupPlugin.java b/Server/src/main/java/core/game/interaction/item/PickupPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/PickupPlugin.java
rename to Server/src/main/java/core/game/interaction/item/PickupPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/QuestCapePlugin.java b/Server/src/main/java/core/game/interaction/item/QuestCapePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/QuestCapePlugin.java
rename to Server/src/main/java/core/game/interaction/item/QuestCapePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/RingUnchargePlugin.java b/Server/src/main/java/core/game/interaction/item/RingUnchargePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/RingUnchargePlugin.java
rename to Server/src/main/java/core/game/interaction/item/RingUnchargePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/RunePackPlugin.java b/Server/src/main/java/core/game/interaction/item/RunePackPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/RunePackPlugin.java
rename to Server/src/main/java/core/game/interaction/item/RunePackPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/SilverSicklePlugin.java b/Server/src/main/java/core/game/interaction/item/SilverSicklePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/SilverSicklePlugin.java
rename to Server/src/main/java/core/game/interaction/item/SilverSicklePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/SkullSceptreOption.java b/Server/src/main/java/core/game/interaction/item/SkullSceptreOption.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/SkullSceptreOption.java
rename to Server/src/main/java/core/game/interaction/item/SkullSceptreOption.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/SpadeDigOptionPlugin.java b/Server/src/main/java/core/game/interaction/item/SpadeDigOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/SpadeDigOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/item/SpadeDigOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/StarterPackPlugin.java b/Server/src/main/java/core/game/interaction/item/StarterPackPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/StarterPackPlugin.java
rename to Server/src/main/java/core/game/interaction/item/StarterPackPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/TeleTabsOptionPlugin.java b/Server/src/main/java/core/game/interaction/item/TeleTabsOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/TeleTabsOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/item/TeleTabsOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/TeleportCrystalPlugin.java b/Server/src/main/java/core/game/interaction/item/TeleportCrystalPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/TeleportCrystalPlugin.java
rename to Server/src/main/java/core/game/interaction/item/TeleportCrystalPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/ToyHorsePlugin.java b/Server/src/main/java/core/game/interaction/item/ToyHorsePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/ToyHorsePlugin.java
rename to Server/src/main/java/core/game/interaction/item/ToyHorsePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/brawling_gloves/BrawlingGloves.java b/Server/src/main/java/core/game/interaction/item/brawling_gloves/BrawlingGloves.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/brawling_gloves/BrawlingGloves.java
rename to Server/src/main/java/core/game/interaction/item/brawling_gloves/BrawlingGloves.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/brawling_gloves/BrawlingGlovesManager.java b/Server/src/main/java/core/game/interaction/item/brawling_gloves/BrawlingGlovesManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/brawling_gloves/BrawlingGlovesManager.java
rename to Server/src/main/java/core/game/interaction/item/brawling_gloves/BrawlingGlovesManager.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/toys/ChocatriceCape.java b/Server/src/main/java/core/game/interaction/item/toys/ChocatriceCape.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/toys/ChocatriceCape.java
rename to Server/src/main/java/core/game/interaction/item/toys/ChocatriceCape.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/toys/DiangoOptionHandler.java b/Server/src/main/java/core/game/interaction/item/toys/DiangoOptionHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/toys/DiangoOptionHandler.java
rename to Server/src/main/java/core/game/interaction/item/toys/DiangoOptionHandler.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/toys/DiangoReclaimInterface.java b/Server/src/main/java/core/game/interaction/item/toys/DiangoReclaimInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/toys/DiangoReclaimInterface.java
rename to Server/src/main/java/core/game/interaction/item/toys/DiangoReclaimInterface.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/toys/MarionettePlugin.java b/Server/src/main/java/core/game/interaction/item/toys/MarionettePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/toys/MarionettePlugin.java
rename to Server/src/main/java/core/game/interaction/item/toys/MarionettePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/toys/ReindeerHatPlugin.java b/Server/src/main/java/core/game/interaction/item/toys/ReindeerHatPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/toys/ReindeerHatPlugin.java
rename to Server/src/main/java/core/game/interaction/item/toys/ReindeerHatPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/toys/SnowGlobePlugin.java b/Server/src/main/java/core/game/interaction/item/toys/SnowGlobePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/toys/SnowGlobePlugin.java
rename to Server/src/main/java/core/game/interaction/item/toys/SnowGlobePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/toys/YoyoPlugin.java b/Server/src/main/java/core/game/interaction/item/toys/YoyoPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/toys/YoyoPlugin.java
rename to Server/src/main/java/core/game/interaction/item/toys/YoyoPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/toys/ZombieHeadPlugin.java b/Server/src/main/java/core/game/interaction/item/toys/ZombieHeadPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/toys/ZombieHeadPlugin.java
rename to Server/src/main/java/core/game/interaction/item/toys/ZombieHeadPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/CapeDyeingPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/CapeDyeingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/CapeDyeingPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/CapeDyeingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/ChestKeyPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/ChestKeyPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/ChestKeyPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/ChestKeyPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/CrystalKeyCreatePlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/CrystalKeyCreatePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/CrystalKeyCreatePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/CrystalKeyCreatePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/DarkBowDyePlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/DarkBowDyePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/DarkBowDyePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/DarkBowDyePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/FirelighterPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/FirelighterPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/FirelighterPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/FirelighterPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/FishfoodPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/FishfoodPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/FishfoodPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/FishfoodPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/FruitCuttingPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/FruitCuttingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/FruitCuttingPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/FruitCuttingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/GodswordHiltAttachPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/GodswordHiltAttachPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/GodswordHiltAttachPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/GodswordHiltAttachPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/GraniteMaulPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/GraniteMaulPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/GraniteMaulPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/GraniteMaulPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/GraniteSplittingPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/GraniteSplittingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/GraniteSplittingPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/GraniteSplittingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/ImpJarCreatePlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/ImpJarCreatePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/ImpJarCreatePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/ImpJarCreatePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/KaramjanSilkPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/KaramjanSilkPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/KaramjanSilkPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/KaramjanSilkPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/LavaScalePlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/LavaScalePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/LavaScalePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/LavaScalePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/MakeGlassInterfacePlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/MakeGlassInterfacePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/MakeGlassInterfacePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/MakeGlassInterfacePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/PoisonRemovePlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/PoisonRemovePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/PoisonRemovePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/PoisonRemovePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/PoisonWeaponPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/PoisonWeaponPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/PoisonWeaponPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/PoisonWeaponPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/SeasonedSardinePlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/SeasonedSardinePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/SeasonedSardinePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/SeasonedSardinePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/SkullSceptrePlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/SkullSceptrePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/SkullSceptrePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/SkullSceptrePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/SoftclayPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/SoftclayPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/SoftclayPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/SoftclayPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/WaterSkinPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/WaterSkinPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/WaterSkinPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withitem/WaterSkinPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withnpc/ForestersArmsCiderPlugin.java b/Server/src/main/java/core/game/interaction/item/withnpc/ForestersArmsCiderPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withnpc/ForestersArmsCiderPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withnpc/ForestersArmsCiderPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withnpc/GertrudeCatUsePlugin.java b/Server/src/main/java/core/game/interaction/item/withnpc/GertrudeCatUsePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withnpc/GertrudeCatUsePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withnpc/GertrudeCatUsePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withnpc/KingArthurPoisonChalicePlugin.java b/Server/src/main/java/core/game/interaction/item/withnpc/KingArthurPoisonChalicePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withnpc/KingArthurPoisonChalicePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withnpc/KingArthurPoisonChalicePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withnpc/LadyKeliRopePlugin.java b/Server/src/main/java/core/game/interaction/item/withnpc/LadyKeliRopePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withnpc/LadyKeliRopePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withnpc/LadyKeliRopePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withnpc/NeedleCowPlugin.java b/Server/src/main/java/core/game/interaction/item/withnpc/NeedleCowPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withnpc/NeedleCowPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withnpc/NeedleCowPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withnpc/StrayDogBonesPlugin.java b/Server/src/main/java/core/game/interaction/item/withnpc/StrayDogBonesPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withnpc/StrayDogBonesPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withnpc/StrayDogBonesPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/BankUnnotePlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/BankUnnotePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/BankUnnotePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/BankUnnotePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/BurnMeatPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/BurnMeatPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/BurnMeatPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/BurnMeatPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/CauldronOfThunder.java b/Server/src/main/java/core/game/interaction/item/withobject/CauldronOfThunder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/CauldronOfThunder.java
rename to Server/src/main/java/core/game/interaction/item/withobject/CauldronOfThunder.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/DragonPlatebody.java b/Server/src/main/java/core/game/interaction/item/withobject/DragonPlatebody.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/DragonPlatebody.java
rename to Server/src/main/java/core/game/interaction/item/withobject/DragonPlatebody.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/EctophialFillPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/EctophialFillPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/EctophialFillPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/EctophialFillPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/GWDEntranceRopeUsage.java b/Server/src/main/java/core/game/interaction/item/withobject/GWDEntranceRopeUsage.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/GWDEntranceRopeUsage.java
rename to Server/src/main/java/core/game/interaction/item/withobject/GWDEntranceRopeUsage.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/GildedAltarPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/GildedAltarPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/GildedAltarPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/GildedAltarPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/HairdresserCheesePlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/HairdresserCheesePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/HairdresserCheesePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/HairdresserCheesePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/IncubatorPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/IncubatorPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/IncubatorPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/IncubatorPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/KaramajaBananaCrate.java b/Server/src/main/java/core/game/interaction/item/withobject/KaramajaBananaCrate.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/KaramajaBananaCrate.java
rename to Server/src/main/java/core/game/interaction/item/withobject/KaramajaBananaCrate.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/PoisonFountainPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/PoisonFountainPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/PoisonFountainPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/PoisonFountainPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/SandSourcePlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/SandSourcePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/SandSourcePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/SandSourcePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/SapCollectPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/SapCollectPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/SapCollectPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/SapCollectPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/SmithingPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/SmithingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/SmithingPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/SmithingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/SpiritShieldBlessPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/SpiritShieldBlessPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/SpiritShieldBlessPlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/SpiritShieldBlessPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/SwampHoleRopePlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/SwampHoleRopePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/SwampHoleRopePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/SwampHoleRopePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/TutorialItemHandler.java b/Server/src/main/java/core/game/interaction/item/withobject/TutorialItemHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/TutorialItemHandler.java
rename to Server/src/main/java/core/game/interaction/item/withobject/TutorialItemHandler.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/WaterSkinHandler.java b/Server/src/main/java/core/game/interaction/item/withobject/WaterSkinHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/WaterSkinHandler.java
rename to Server/src/main/java/core/game/interaction/item/withobject/WaterSkinHandler.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/WaterSourcePlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/WaterSourcePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/WaterSourcePlugin.java
rename to Server/src/main/java/core/game/interaction/item/withobject/WaterSourcePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withplayer/ChristmasCrackerUsage.java b/Server/src/main/java/core/game/interaction/item/withplayer/ChristmasCrackerUsage.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withplayer/ChristmasCrackerUsage.java
rename to Server/src/main/java/core/game/interaction/item/withplayer/ChristmasCrackerUsage.java
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withplayer/FieldRationUsage.java b/Server/src/main/java/core/game/interaction/item/withplayer/FieldRationUsage.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withplayer/FieldRationUsage.java
rename to Server/src/main/java/core/game/interaction/item/withplayer/FieldRationUsage.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/AlKahridLeafletPlugin.java b/Server/src/main/java/core/game/interaction/npc/AlKahridLeafletPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/AlKahridLeafletPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/AlKahridLeafletPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/AlkharidHealPlugin.java b/Server/src/main/java/core/game/interaction/npc/AlkharidHealPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/AlkharidHealPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/AlkharidHealPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/BogrogPlugin.java b/Server/src/main/java/core/game/interaction/npc/BogrogPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/BogrogPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/BogrogPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/BurthorpeOptionPlugin.java b/Server/src/main/java/core/game/interaction/npc/BurthorpeOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/BurthorpeOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/BurthorpeOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/BurthorpeTrainNPC.java b/Server/src/main/java/core/game/interaction/npc/BurthorpeTrainNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/BurthorpeTrainNPC.java
rename to Server/src/main/java/core/game/interaction/npc/BurthorpeTrainNPC.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/CanafisWereWolfPlugin.java b/Server/src/main/java/core/game/interaction/npc/CanafisWereWolfPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/CanafisWereWolfPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/CanafisWereWolfPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/CustomsOfficerPlugin.java b/Server/src/main/java/core/game/interaction/npc/CustomsOfficerPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/CustomsOfficerPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/CustomsOfficerPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/DoomsayerTogglePlugin.java b/Server/src/main/java/core/game/interaction/npc/DoomsayerTogglePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/DoomsayerTogglePlugin.java
rename to Server/src/main/java/core/game/interaction/npc/DoomsayerTogglePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/GabootyTrade.java b/Server/src/main/java/core/game/interaction/npc/GabootyTrade.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/GabootyTrade.java
rename to Server/src/main/java/core/game/interaction/npc/GabootyTrade.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/GameInstructorPlugin.java b/Server/src/main/java/core/game/interaction/npc/GameInstructorPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/GameInstructorPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/GameInstructorPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/GliderPlugin.java b/Server/src/main/java/core/game/interaction/npc/GliderPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/GliderPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/GliderPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/HairCutPlugin.java b/Server/src/main/java/core/game/interaction/npc/HairCutPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/HairCutPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/HairCutPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/NPCDisturbPlugin.java b/Server/src/main/java/core/game/interaction/npc/NPCDisturbPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/NPCDisturbPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/NPCDisturbPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/NPCTalkPlugin.java b/Server/src/main/java/core/game/interaction/npc/NPCTalkPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/NPCTalkPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/NPCTalkPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/NPCTradePlugin.java b/Server/src/main/java/core/game/interaction/npc/NPCTradePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/NPCTradePlugin.java
rename to Server/src/main/java/core/game/interaction/npc/NPCTradePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/RechargeSceptre.java b/Server/src/main/java/core/game/interaction/npc/RechargeSceptre.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/RechargeSceptre.java
rename to Server/src/main/java/core/game/interaction/npc/RechargeSceptre.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/RoavarDialogue.java b/Server/src/main/java/core/game/interaction/npc/RoavarDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/RoavarDialogue.java
rename to Server/src/main/java/core/game/interaction/npc/RoavarDialogue.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/RoavarOptionPlugin.java b/Server/src/main/java/core/game/interaction/npc/RoavarOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/RoavarOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/RoavarOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/SanibochPlugin.java b/Server/src/main/java/core/game/interaction/npc/SanibochPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/SanibochPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/SanibochPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/SawmillOptionPlugin.java b/Server/src/main/java/core/game/interaction/npc/SawmillOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/SawmillOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/SawmillOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/SeamanPlugin.java b/Server/src/main/java/core/game/interaction/npc/SeamanPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/SeamanPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/SeamanPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/SecurityGuardPlugin.java b/Server/src/main/java/core/game/interaction/npc/SecurityGuardPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/SecurityGuardPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/SecurityGuardPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/ShantayOptionPlugin.java b/Server/src/main/java/core/game/interaction/npc/ShantayOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/ShantayOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/ShantayOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/SheepShearPlugin.java b/Server/src/main/java/core/game/interaction/npc/SheepShearPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/SheepShearPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/SheepShearPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/ShipCharterNPCPlugin.java b/Server/src/main/java/core/game/interaction/npc/ShipCharterNPCPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/ShipCharterNPCPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/ShipCharterNPCPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/ShooAwayStrayDogPlugin.java b/Server/src/main/java/core/game/interaction/npc/ShooAwayStrayDogPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/ShooAwayStrayDogPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/ShooAwayStrayDogPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/SimonScepterInteraction.java b/Server/src/main/java/core/game/interaction/npc/SimonScepterInteraction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/SimonScepterInteraction.java
rename to Server/src/main/java/core/game/interaction/npc/SimonScepterInteraction.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/SpiritGraahkOptionPlugin.java b/Server/src/main/java/core/game/interaction/npc/SpiritGraahkOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/SpiritGraahkOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/SpiritGraahkOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/SpiritKyattOptionPlugin.java b/Server/src/main/java/core/game/interaction/npc/SpiritKyattOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/SpiritKyattOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/SpiritKyattOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/TanningNPC.java b/Server/src/main/java/core/game/interaction/npc/TanningNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/TanningNPC.java
rename to Server/src/main/java/core/game/interaction/npc/TanningNPC.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/ThessaliaPlugin.java b/Server/src/main/java/core/game/interaction/npc/ThessaliaPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/ThessaliaPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/ThessaliaPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/ZaffPlugin.java b/Server/src/main/java/core/game/interaction/npc/ZaffPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/ZaffPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/ZaffPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/ZahurOptionPlugin.java b/Server/src/main/java/core/game/interaction/npc/ZahurOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/ZahurOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/npc/ZahurOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/bob/BobDialogue.java b/Server/src/main/java/core/game/interaction/npc/bob/BobDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/bob/BobDialogue.java
rename to Server/src/main/java/core/game/interaction/npc/bob/BobDialogue.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/bob/BobRepairItem.java b/Server/src/main/java/core/game/interaction/npc/bob/BobRepairItem.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/bob/BobRepairItem.java
rename to Server/src/main/java/core/game/interaction/npc/bob/BobRepairItem.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/sorceress_app/SorceressApprenticeDialogue.java b/Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticeDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/sorceress_app/SorceressApprenticeDialogue.java
rename to Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticeDialogue.java
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/sorceress_app/SorceressApprenticePlugin.java b/Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/sorceress_app/SorceressApprenticePlugin.java
rename to Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/BankingPlugin.java b/Server/src/main/java/core/game/interaction/object/BankingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/BankingPlugin.java
rename to Server/src/main/java/core/game/interaction/object/BankingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/BarrowsBoatPlugin.java b/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/BarrowsBoatPlugin.java
rename to Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/BarrowsTunnelShortcut.java b/Server/src/main/java/core/game/interaction/object/BarrowsTunnelShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/BarrowsTunnelShortcut.java
rename to Server/src/main/java/core/game/interaction/object/BarrowsTunnelShortcut.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/BeehivePlugin.java b/Server/src/main/java/core/game/interaction/object/BeehivePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/BeehivePlugin.java
rename to Server/src/main/java/core/game/interaction/object/BeehivePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/BrassKeyDoorPlugin.java b/Server/src/main/java/core/game/interaction/object/BrassKeyDoorPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/BrassKeyDoorPlugin.java
rename to Server/src/main/java/core/game/interaction/object/BrassKeyDoorPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/BrokenCartBypass.java b/Server/src/main/java/core/game/interaction/object/BrokenCartBypass.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/BrokenCartBypass.java
rename to Server/src/main/java/core/game/interaction/object/BrokenCartBypass.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/BuyCrateOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/BuyCrateOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/BuyCrateOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/object/BuyCrateOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/CanoeOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/CanoeOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/CanoeOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/object/CanoeOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/CavadaBerriesPlugin.java b/Server/src/main/java/core/game/interaction/object/CavadaBerriesPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/CavadaBerriesPlugin.java
rename to Server/src/main/java/core/game/interaction/object/CavadaBerriesPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/ChampionsArenaPlugin.java b/Server/src/main/java/core/game/interaction/object/ChampionsArenaPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/ChampionsArenaPlugin.java
rename to Server/src/main/java/core/game/interaction/object/ChampionsArenaPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/ChampionsGuildDoor.java b/Server/src/main/java/core/game/interaction/object/ChampionsGuildDoor.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/ChampionsGuildDoor.java
rename to Server/src/main/java/core/game/interaction/object/ChampionsGuildDoor.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/ChefGuildDoorPlugin.java b/Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/ChefGuildDoorPlugin.java
rename to Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/CowMilkingPlugin.java b/Server/src/main/java/core/game/interaction/object/CowMilkingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/CowMilkingPlugin.java
rename to Server/src/main/java/core/game/interaction/object/CowMilkingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/CrystalChestPlugin.java b/Server/src/main/java/core/game/interaction/object/CrystalChestPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/CrystalChestPlugin.java
rename to Server/src/main/java/core/game/interaction/object/CrystalChestPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/CrystalKeyObjectPlugin.java b/Server/src/main/java/core/game/interaction/object/CrystalKeyObjectPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/CrystalKeyObjectPlugin.java
rename to Server/src/main/java/core/game/interaction/object/CrystalKeyObjectPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/CulinomancerChestPliugin.java b/Server/src/main/java/core/game/interaction/object/CulinomancerChestPliugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/CulinomancerChestPliugin.java
rename to Server/src/main/java/core/game/interaction/object/CulinomancerChestPliugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/DoogleLeafPlugin.java b/Server/src/main/java/core/game/interaction/object/DoogleLeafPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/DoogleLeafPlugin.java
rename to Server/src/main/java/core/game/interaction/object/DoogleLeafPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/DoorManagingPlugin.java b/Server/src/main/java/core/game/interaction/object/DoorManagingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/DoorManagingPlugin.java
rename to Server/src/main/java/core/game/interaction/object/DoorManagingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/DropPartyLeverOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/DropPartyLeverOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/DropPartyLeverOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/object/DropPartyLeverOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/DummyAttackPlugin.java b/Server/src/main/java/core/game/interaction/object/DummyAttackPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/DummyAttackPlugin.java
rename to Server/src/main/java/core/game/interaction/object/DummyAttackPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/ErnestTheChickenPlugin.java b/Server/src/main/java/core/game/interaction/object/ErnestTheChickenPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/ErnestTheChickenPlugin.java
rename to Server/src/main/java/core/game/interaction/object/ErnestTheChickenPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/FieldPickingPlugin.java b/Server/src/main/java/core/game/interaction/object/FieldPickingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/FieldPickingPlugin.java
rename to Server/src/main/java/core/game/interaction/object/FieldPickingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/FlourMakingPlugin.java b/Server/src/main/java/core/game/interaction/object/FlourMakingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/FlourMakingPlugin.java
rename to Server/src/main/java/core/game/interaction/object/FlourMakingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/GertrudeCatPlugin.java b/Server/src/main/java/core/game/interaction/object/GertrudeCatPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/GertrudeCatPlugin.java
rename to Server/src/main/java/core/game/interaction/object/GertrudeCatPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/GnomeSpiritTreePlugin.java b/Server/src/main/java/core/game/interaction/object/GnomeSpiritTreePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/GnomeSpiritTreePlugin.java
rename to Server/src/main/java/core/game/interaction/object/GnomeSpiritTreePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/GoblinVillagePopulationPlugin.java b/Server/src/main/java/core/game/interaction/object/GoblinVillagePopulationPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/GoblinVillagePopulationPlugin.java
rename to Server/src/main/java/core/game/interaction/object/GoblinVillagePopulationPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/GrandExchangePlugin.java b/Server/src/main/java/core/game/interaction/object/GrandExchangePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/GrandExchangePlugin.java
rename to Server/src/main/java/core/game/interaction/object/GrandExchangePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/GrandExchangeShortcut.java b/Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/GrandExchangeShortcut.java
rename to Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/GuidorDoorPlugin.java b/Server/src/main/java/core/game/interaction/object/GuidorDoorPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/GuidorDoorPlugin.java
rename to Server/src/main/java/core/game/interaction/object/GuidorDoorPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/HaystackPlugin.java b/Server/src/main/java/core/game/interaction/object/HaystackPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/HaystackPlugin.java
rename to Server/src/main/java/core/game/interaction/object/HaystackPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/JangerBerryPlugin.java b/Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/JangerBerryPlugin.java
rename to Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/KalphiteEntranceHandler.java b/Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/KalphiteEntranceHandler.java
rename to Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/KhardianInteractionPlugin.java b/Server/src/main/java/core/game/interaction/object/KhardianInteractionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/KhardianInteractionPlugin.java
rename to Server/src/main/java/core/game/interaction/object/KhardianInteractionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/LadderManagingPlugin.java b/Server/src/main/java/core/game/interaction/object/LadderManagingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/LadderManagingPlugin.java
rename to Server/src/main/java/core/game/interaction/object/LadderManagingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/LavaMazePlugin.java b/Server/src/main/java/core/game/interaction/object/LavaMazePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/LavaMazePlugin.java
rename to Server/src/main/java/core/game/interaction/object/LavaMazePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/LookAtOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/LookAtOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/LookAtOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/object/LookAtOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/LumberYardCratePlugin.java b/Server/src/main/java/core/game/interaction/object/LumberYardCratePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/LumberYardCratePlugin.java
rename to Server/src/main/java/core/game/interaction/object/LumberYardCratePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/LumbridgeBasementPlugin.java b/Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/LumbridgeBasementPlugin.java
rename to Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/LumbridgeSwampHolePlugin.java b/Server/src/main/java/core/game/interaction/object/LumbridgeSwampHolePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/LumbridgeSwampHolePlugin.java
rename to Server/src/main/java/core/game/interaction/object/LumbridgeSwampHolePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/ModeratorObject.java b/Server/src/main/java/core/game/interaction/object/ModeratorObject.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/ModeratorObject.java
rename to Server/src/main/java/core/game/interaction/object/ModeratorObject.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/MossGiantRopePlugin.java b/Server/src/main/java/core/game/interaction/object/MossGiantRopePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/MossGiantRopePlugin.java
rename to Server/src/main/java/core/game/interaction/object/MossGiantRopePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/MoyrtniaSwampPlugin.java b/Server/src/main/java/core/game/interaction/object/MoyrtniaSwampPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/MoyrtniaSwampPlugin.java
rename to Server/src/main/java/core/game/interaction/object/MoyrtniaSwampPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/MuseumGatePlugin.java b/Server/src/main/java/core/game/interaction/object/MuseumGatePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/MuseumGatePlugin.java
rename to Server/src/main/java/core/game/interaction/object/MuseumGatePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/PortsObjectPlugin.java b/Server/src/main/java/core/game/interaction/object/PortsObjectPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/PortsObjectPlugin.java
rename to Server/src/main/java/core/game/interaction/object/PortsObjectPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/PriestInPerilOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/PriestInPerilOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/PriestInPerilOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/object/PriestInPerilOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/ProspectOrePlugin.java b/Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/ProspectOrePlugin.java
rename to Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/PyreSitePlugin.java b/Server/src/main/java/core/game/interaction/object/PyreSitePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/PyreSitePlugin.java
rename to Server/src/main/java/core/game/interaction/object/PyreSitePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/ReadSignPostPlugin.java b/Server/src/main/java/core/game/interaction/object/ReadSignPostPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/ReadSignPostPlugin.java
rename to Server/src/main/java/core/game/interaction/object/ReadSignPostPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/RedberryBushPlugin.java b/Server/src/main/java/core/game/interaction/object/RedberryBushPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/RedberryBushPlugin.java
rename to Server/src/main/java/core/game/interaction/object/RedberryBushPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/RomeoQuestPlugin.java b/Server/src/main/java/core/game/interaction/object/RomeoQuestPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/RomeoQuestPlugin.java
rename to Server/src/main/java/core/game/interaction/object/RomeoQuestPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/RuneCraftingGuildObjects.java b/Server/src/main/java/core/game/interaction/object/RuneCraftingGuildObjects.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/RuneCraftingGuildObjects.java
rename to Server/src/main/java/core/game/interaction/object/RuneCraftingGuildObjects.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/SearchOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/SearchOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/SearchOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/object/SearchOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/SeersCageUnlockPlugin.java b/Server/src/main/java/core/game/interaction/object/SeersCageUnlockPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/SeersCageUnlockPlugin.java
rename to Server/src/main/java/core/game/interaction/object/SeersCageUnlockPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/ShantayPassPlugin.java b/Server/src/main/java/core/game/interaction/object/ShantayPassPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/ShantayPassPlugin.java
rename to Server/src/main/java/core/game/interaction/object/ShantayPassPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/SilverCastingInterfacePlugin.java b/Server/src/main/java/core/game/interaction/object/SilverCastingInterfacePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/SilverCastingInterfacePlugin.java
rename to Server/src/main/java/core/game/interaction/object/SilverCastingInterfacePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/SinclairFlourBarrelPlugin.java b/Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/SinclairFlourBarrelPlugin.java
rename to Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/SlashWebPlugin.java b/Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/SlashWebPlugin.java
rename to Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/SlayerDangerSignPlugin.java b/Server/src/main/java/core/game/interaction/object/SlayerDangerSignPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/SlayerDangerSignPlugin.java
rename to Server/src/main/java/core/game/interaction/object/SlayerDangerSignPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/SpinSpinningWheelPlugin.java b/Server/src/main/java/core/game/interaction/object/SpinSpinningWheelPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/SpinSpinningWheelPlugin.java
rename to Server/src/main/java/core/game/interaction/object/SpinSpinningWheelPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/ThievingGuidePlugin.java b/Server/src/main/java/core/game/interaction/object/ThievingGuidePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/ThievingGuidePlugin.java
rename to Server/src/main/java/core/game/interaction/object/ThievingGuidePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/TollGateOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/TollGateOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/VampireSlayerPlugin.java b/Server/src/main/java/core/game/interaction/object/VampireSlayerPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/VampireSlayerPlugin.java
rename to Server/src/main/java/core/game/interaction/object/VampireSlayerPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/WantedPoster.java b/Server/src/main/java/core/game/interaction/object/WantedPoster.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/WantedPoster.java
rename to Server/src/main/java/core/game/interaction/object/WantedPoster.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/WildernessLeverPlugin.java b/Server/src/main/java/core/game/interaction/object/WildernessLeverPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/WildernessLeverPlugin.java
rename to Server/src/main/java/core/game/interaction/object/WildernessLeverPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/WildernessObeliskPlugin.java b/Server/src/main/java/core/game/interaction/object/WildernessObeliskPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/WildernessObeliskPlugin.java
rename to Server/src/main/java/core/game/interaction/object/WildernessObeliskPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/WitchsPotionPlugin.java b/Server/src/main/java/core/game/interaction/object/WitchsPotionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/WitchsPotionPlugin.java
rename to Server/src/main/java/core/game/interaction/object/WitchsPotionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/WydinDoorPlugin.java b/Server/src/main/java/core/game/interaction/object/WydinDoorPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/WydinDoorPlugin.java
rename to Server/src/main/java/core/game/interaction/object/WydinDoorPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/dmc/DMCHandler.java b/Server/src/main/java/core/game/interaction/object/dmc/DMCHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/dmc/DMCHandler.java
rename to Server/src/main/java/core/game/interaction/object/dmc/DMCHandler.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/dmc/DMCRevolution.java b/Server/src/main/java/core/game/interaction/object/dmc/DMCRevolution.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/dmc/DMCRevolution.java
rename to Server/src/main/java/core/game/interaction/object/dmc/DMCRevolution.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/dmc/DMCZone.java b/Server/src/main/java/core/game/interaction/object/dmc/DMCZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/dmc/DMCZone.java
rename to Server/src/main/java/core/game/interaction/object/dmc/DMCZone.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/dmc/DwarfMultiCannonPlugin.java b/Server/src/main/java/core/game/interaction/object/dmc/DwarfMultiCannonPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/dmc/DwarfMultiCannonPlugin.java
rename to Server/src/main/java/core/game/interaction/object/dmc/DwarfMultiCannonPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/sorceress/GardenObjectsPlugin.java b/Server/src/main/java/core/game/interaction/object/sorceress/GardenObjectsPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/sorceress/GardenObjectsPlugin.java
rename to Server/src/main/java/core/game/interaction/object/sorceress/GardenObjectsPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/sorceress/SorceressGardenObject.java b/Server/src/main/java/core/game/interaction/object/sorceress/SorceressGardenObject.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/sorceress/SorceressGardenObject.java
rename to Server/src/main/java/core/game/interaction/object/sorceress/SorceressGardenObject.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/wildyditch/WildernessDitchPlugin.java b/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessDitchPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/wildyditch/WildernessDitchPlugin.java
rename to Server/src/main/java/core/game/interaction/object/wildyditch/WildernessDitchPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/object/wildyditch/WildernessInterfacePlugin.java b/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessInterfacePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/wildyditch/WildernessInterfacePlugin.java
rename to Server/src/main/java/core/game/interaction/object/wildyditch/WildernessInterfacePlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/player/AttackOptionPlugin.java b/Server/src/main/java/core/game/interaction/player/AttackOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/player/AttackOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/player/AttackOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/player/ExamineOptionPlugin.java b/Server/src/main/java/core/game/interaction/player/ExamineOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/player/ExamineOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/player/ExamineOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/player/FollowOptionPlugin.java b/Server/src/main/java/core/game/interaction/player/FollowOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/player/FollowOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/player/FollowOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/player/LoginValidationPlugin.java b/Server/src/main/java/core/game/interaction/player/LoginValidationPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/player/LoginValidationPlugin.java
rename to Server/src/main/java/core/game/interaction/player/LoginValidationPlugin.java
diff --git a/Server/src/main/java/Server/core/game/interaction/player/RequestOptionPlugin.java b/Server/src/main/java/core/game/interaction/player/RequestOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/player/RequestOptionPlugin.java
rename to Server/src/main/java/core/game/interaction/player/RequestOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/Node.java b/Server/src/main/java/core/game/node/Node.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/Node.java
rename to Server/src/main/java/core/game/node/Node.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/Entity.java b/Server/src/main/java/core/game/node/entity/Entity.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/Entity.java
rename to Server/src/main/java/core/game/node/entity/Entity.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/BattleState.java b/Server/src/main/java/core/game/node/entity/combat/BattleState.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/BattleState.java
rename to Server/src/main/java/core/game/node/entity/combat/BattleState.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/CombatSpell.java b/Server/src/main/java/core/game/node/entity/combat/CombatSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/CombatSpell.java
rename to Server/src/main/java/core/game/node/entity/combat/CombatSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/CombatStyle.java b/Server/src/main/java/core/game/node/entity/combat/CombatStyle.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/CombatStyle.java
rename to Server/src/main/java/core/game/node/entity/combat/CombatStyle.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/DeathTask.java b/Server/src/main/java/core/game/node/entity/combat/DeathTask.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/DeathTask.java
rename to Server/src/main/java/core/game/node/entity/combat/DeathTask.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/ImpactHandler.java b/Server/src/main/java/core/game/node/entity/combat/ImpactHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/ImpactHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/ImpactHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/InteractionType.java b/Server/src/main/java/core/game/node/entity/combat/InteractionType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/InteractionType.java
rename to Server/src/main/java/core/game/node/entity/combat/InteractionType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/equipment/Ammunition.java b/Server/src/main/java/core/game/node/entity/combat/equipment/Ammunition.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/equipment/Ammunition.java
rename to Server/src/main/java/core/game/node/entity/combat/equipment/Ammunition.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/equipment/ArmourSet.java b/Server/src/main/java/core/game/node/entity/combat/equipment/ArmourSet.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/equipment/ArmourSet.java
rename to Server/src/main/java/core/game/node/entity/combat/equipment/ArmourSet.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/equipment/BoltEffect.java b/Server/src/main/java/core/game/node/entity/combat/equipment/BoltEffect.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/equipment/BoltEffect.java
rename to Server/src/main/java/core/game/node/entity/combat/equipment/BoltEffect.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/equipment/DefaultCombatSpell.java b/Server/src/main/java/core/game/node/entity/combat/equipment/DefaultCombatSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/equipment/DefaultCombatSpell.java
rename to Server/src/main/java/core/game/node/entity/combat/equipment/DefaultCombatSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/equipment/DegradableEquipment.java b/Server/src/main/java/core/game/node/entity/combat/equipment/DegradableEquipment.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/equipment/DegradableEquipment.java
rename to Server/src/main/java/core/game/node/entity/combat/equipment/DegradableEquipment.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/equipment/FireType.java b/Server/src/main/java/core/game/node/entity/combat/equipment/FireType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/equipment/FireType.java
rename to Server/src/main/java/core/game/node/entity/combat/equipment/FireType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/equipment/RangeWeapon.java b/Server/src/main/java/core/game/node/entity/combat/equipment/RangeWeapon.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/equipment/RangeWeapon.java
rename to Server/src/main/java/core/game/node/entity/combat/equipment/RangeWeapon.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/equipment/SpellType.java b/Server/src/main/java/core/game/node/entity/combat/equipment/SpellType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/equipment/SpellType.java
rename to Server/src/main/java/core/game/node/entity/combat/equipment/SpellType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/equipment/SwitchAttack.java b/Server/src/main/java/core/game/node/entity/combat/equipment/SwitchAttack.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/equipment/SwitchAttack.java
rename to Server/src/main/java/core/game/node/entity/combat/equipment/SwitchAttack.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/equipment/Weapon.java b/Server/src/main/java/core/game/node/entity/combat/equipment/Weapon.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/equipment/Weapon.java
rename to Server/src/main/java/core/game/node/entity/combat/equipment/Weapon.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/equipment/WeaponInterface.java b/Server/src/main/java/core/game/node/entity/combat/equipment/WeaponInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/equipment/WeaponInterface.java
rename to Server/src/main/java/core/game/node/entity/combat/equipment/WeaponInterface.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/handlers/ChinchompaSwingHandler.java b/Server/src/main/java/core/game/node/entity/combat/handlers/ChinchompaSwingHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/handlers/ChinchompaSwingHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/handlers/ChinchompaSwingHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/handlers/DragonfireSwingHandler.java b/Server/src/main/java/core/game/node/entity/combat/handlers/DragonfireSwingHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/handlers/DragonfireSwingHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/handlers/DragonfireSwingHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/AncientMaceSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/AncientMaceSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/AncientMaceSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/AncientMaceSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/BackstabSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/BackstabSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/BackstabSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/BackstabSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/ChainhitSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/ChainhitSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/ChainhitSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/ChainhitSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/CleaveSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/CleaveSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/CleaveSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/CleaveSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/ClobberSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/ClobberSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/ClobberSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/ClobberSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/DescentOfDarknessSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/DescentOfDarknessSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/DescentOfDarknessSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/DescentOfDarknessSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/EnergyDrainSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/EnergyDrainSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/EnergyDrainSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/EnergyDrainSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/ExcaliburSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/ExcaliburSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/ExcaliburSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/ExcaliburSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/FeintSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/FeintSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/FeintSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/FeintSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/HealingBladeSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/HealingBladeSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/HealingBladeSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/HealingBladeSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/IceCleaveSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/IceCleaveSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/IceCleaveSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/IceCleaveSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/ImpaleSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/ImpaleSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/ImpaleSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/ImpaleSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/JudgementSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/JudgementSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/JudgementSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/JudgementSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/PowershotSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/PowershotSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/PowershotSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/PowershotSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/PowerstabSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/PowerstabSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/PowerstabSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/PowerstabSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/PunctureSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/PunctureSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/PunctureSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/PunctureSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/QuickSmashSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/QuickSmashSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/QuickSmashSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/QuickSmashSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/RampageSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/RampageSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/RampageSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/RampageSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/SaradominsLightningHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SaradominsLightningHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/SaradominsLightningHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/SaradominsLightningHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/SeverSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SeverSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/SeverSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/SeverSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/ShatterSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/ShatterSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/ShatterSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/ShatterSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/ShoveSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/ShoveSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/ShoveSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/ShoveSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/SliceAndDiceSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SliceAndDiceSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/SliceAndDiceSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/SliceAndDiceSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/SmashSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SmashSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/SmashSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/SmashSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/SnapshotSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SnapshotSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/SnapshotSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/SnapshotSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/SnipeSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SnipeSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/SnipeSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/SnipeSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/SpearWallSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SpearWallSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/SpearWallSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/SpearWallSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/SweepSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SweepSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/SweepSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/SweepSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/WarstrikeSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/WarstrikeSpecialHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/WarstrikeSpecialHandler.java
rename to Server/src/main/java/core/game/node/entity/combat/special/WarstrikeSpecialHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/AirSpell.java b/Server/src/main/java/core/game/node/entity/combat/spell/AirSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/AirSpell.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/AirSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/BindSpell.java b/Server/src/main/java/core/game/node/entity/combat/spell/BindSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/BindSpell.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/BindSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/BloodSpells.java b/Server/src/main/java/core/game/node/entity/combat/spell/BloodSpells.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/BloodSpells.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/BloodSpells.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/CrumbleUndead.java b/Server/src/main/java/core/game/node/entity/combat/spell/CrumbleUndead.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/CrumbleUndead.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/CrumbleUndead.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/CurseSpells.java b/Server/src/main/java/core/game/node/entity/combat/spell/CurseSpells.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/CurseSpells.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/CurseSpells.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/EarthSpell.java b/Server/src/main/java/core/game/node/entity/combat/spell/EarthSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/EarthSpell.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/EarthSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/FireSpell.java b/Server/src/main/java/core/game/node/entity/combat/spell/FireSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/FireSpell.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/FireSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/GodSpells.java b/Server/src/main/java/core/game/node/entity/combat/spell/GodSpells.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/GodSpells.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/GodSpells.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/IbanBlast.java b/Server/src/main/java/core/game/node/entity/combat/spell/IbanBlast.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/IbanBlast.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/IbanBlast.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/IceSpells.java b/Server/src/main/java/core/game/node/entity/combat/spell/IceSpells.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/IceSpells.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/IceSpells.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/MagicDart.java b/Server/src/main/java/core/game/node/entity/combat/spell/MagicDart.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/MagicDart.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/MagicDart.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/MiasmicSpells.java b/Server/src/main/java/core/game/node/entity/combat/spell/MiasmicSpells.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/MiasmicSpells.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/MiasmicSpells.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/ShadowSpells.java b/Server/src/main/java/core/game/node/entity/combat/spell/ShadowSpells.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/ShadowSpells.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/ShadowSpells.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/SmokeSpells.java b/Server/src/main/java/core/game/node/entity/combat/spell/SmokeSpells.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/SmokeSpells.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/SmokeSpells.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/SonicWaveSpell.java b/Server/src/main/java/core/game/node/entity/combat/spell/SonicWaveSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/SonicWaveSpell.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/SonicWaveSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/SpellBlocks.java b/Server/src/main/java/core/game/node/entity/combat/spell/SpellBlocks.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/SpellBlocks.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/SpellBlocks.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/spell/WaterSpell.java b/Server/src/main/java/core/game/node/entity/combat/spell/WaterSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/spell/WaterSpell.java
rename to Server/src/main/java/core/game/node/entity/combat/spell/WaterSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/impl/Animator.java b/Server/src/main/java/core/game/node/entity/impl/Animator.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/impl/Animator.java
rename to Server/src/main/java/core/game/node/entity/impl/Animator.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/impl/ForceMovement.java b/Server/src/main/java/core/game/node/entity/impl/ForceMovement.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/impl/ForceMovement.java
rename to Server/src/main/java/core/game/node/entity/impl/ForceMovement.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/impl/GameAttributes.java b/Server/src/main/java/core/game/node/entity/impl/GameAttributes.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/impl/GameAttributes.java
rename to Server/src/main/java/core/game/node/entity/impl/GameAttributes.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/impl/Projectile.java b/Server/src/main/java/core/game/node/entity/impl/Projectile.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/impl/Projectile.java
rename to Server/src/main/java/core/game/node/entity/impl/Projectile.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/impl/Properties.java b/Server/src/main/java/core/game/node/entity/impl/Properties.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/impl/Properties.java
rename to Server/src/main/java/core/game/node/entity/impl/Properties.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/impl/PulseManager.java b/Server/src/main/java/core/game/node/entity/impl/PulseManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/impl/PulseManager.java
rename to Server/src/main/java/core/game/node/entity/impl/PulseManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/impl/WalkingQueue.java b/Server/src/main/java/core/game/node/entity/impl/WalkingQueue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/impl/WalkingQueue.java
rename to Server/src/main/java/core/game/node/entity/impl/WalkingQueue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/lock/ActionLocks.java b/Server/src/main/java/core/game/node/entity/lock/ActionLocks.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/lock/ActionLocks.java
rename to Server/src/main/java/core/game/node/entity/lock/ActionLocks.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/lock/Lock.java b/Server/src/main/java/core/game/node/entity/lock/Lock.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/lock/Lock.java
rename to Server/src/main/java/core/game/node/entity/lock/Lock.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/lock/LockElapse.java b/Server/src/main/java/core/game/node/entity/lock/LockElapse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/lock/LockElapse.java
rename to Server/src/main/java/core/game/node/entity/lock/LockElapse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/AbstractNPC.java b/Server/src/main/java/core/game/node/entity/npc/AbstractNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/AbstractNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/AbstractNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/IdleAbstractNPC.java b/Server/src/main/java/core/game/node/entity/npc/IdleAbstractNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/IdleAbstractNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/IdleAbstractNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/Metamorphosis.java b/Server/src/main/java/core/game/node/entity/npc/Metamorphosis.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/Metamorphosis.java
rename to Server/src/main/java/core/game/node/entity/npc/Metamorphosis.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/NPC.java b/Server/src/main/java/core/game/node/entity/npc/NPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/NPC.java
rename to Server/src/main/java/core/game/node/entity/npc/NPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/agg/AggressiveBehavior.java b/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveBehavior.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/agg/AggressiveBehavior.java
rename to Server/src/main/java/core/game/node/entity/npc/agg/AggressiveBehavior.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/agg/AggressiveHandler.java b/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/agg/AggressiveHandler.java
rename to Server/src/main/java/core/game/node/entity/npc/agg/AggressiveHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/bosses/GiantMoleNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/GiantMoleNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/bosses/GiantMoleNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/bosses/GiantMoleNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/bosses/KalphiteQueenNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/KalphiteQueenNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/bosses/KalphiteQueenNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/bosses/KalphiteQueenNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/bosses/TormentedDemonNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/TormentedDemonNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/bosses/TormentedDemonNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/bosses/TormentedDemonNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/bosses/TzRekJadNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/TzRekJadNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/bosses/TzRekJadNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/bosses/TzRekJadNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/bosses/corp/CorporealBeastNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/corp/CorporealBeastNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/bosses/corp/CorporealBeastNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/bosses/corp/CorporealBeastNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/bosses/corp/DarkEnergyCoreNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/corp/DarkEnergyCoreNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/bosses/corp/DarkEnergyCoreNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/bosses/corp/DarkEnergyCoreNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/bosses/wilderness/ChaosElementalNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/wilderness/ChaosElementalNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/bosses/wilderness/ChaosElementalNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/bosses/wilderness/ChaosElementalNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/bosses/wilderness/KingBlackDragonNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/wilderness/KingBlackDragonNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/bosses/wilderness/KingBlackDragonNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/bosses/wilderness/KingBlackDragonNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AlKharidShopKeeperDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/alkharid/AlKharidShopKeeperDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AlKharidShopKeeperDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/alkharid/AlKharidShopKeeperDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AlTheCamelDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/alkharid/AlTheCamelDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AlTheCamelDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/alkharid/AlTheCamelDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AliMorrisaneDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/alkharid/AliMorrisaneDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AliMorrisaneDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/alkharid/AliMorrisaneDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AliTheLeafletDropper.java b/Server/src/main/java/core/game/node/entity/npc/city/alkharid/AliTheLeafletDropper.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AliTheLeafletDropper.java
rename to Server/src/main/java/core/game/node/entity/npc/city/alkharid/AliTheLeafletDropper.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/falador/gardensupplier.java b/Server/src/main/java/core/game/node/entity/npc/city/falador/gardensupplier.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/falador/gardensupplier.java
rename to Server/src/main/java/core/game/node/entity/npc/city/falador/gardensupplier.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/AliTheCarter.java b/Server/src/main/java/core/game/node/entity/npc/city/nardah/AliTheCarter.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/AliTheCarter.java
rename to Server/src/main/java/core/game/node/entity/npc/city/nardah/AliTheCarter.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/ArtimeusDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/nardah/ArtimeusDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/ArtimeusDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/nardah/ArtimeusDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/Awusah.java b/Server/src/main/java/core/game/node/entity/npc/city/nardah/Awusah.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/Awusah.java
rename to Server/src/main/java/core/game/node/entity/npc/city/nardah/Awusah.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/Ghaslor.java b/Server/src/main/java/core/game/node/entity/npc/city/nardah/Ghaslor.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/Ghaslor.java
rename to Server/src/main/java/core/game/node/entity/npc/city/nardah/Ghaslor.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/Kazemde.java b/Server/src/main/java/core/game/node/entity/npc/city/nardah/Kazemde.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/Kazemde.java
rename to Server/src/main/java/core/game/node/entity/npc/city/nardah/Kazemde.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/Rokuh.java b/Server/src/main/java/core/game/node/entity/npc/city/nardah/Rokuh.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/Rokuh.java
rename to Server/src/main/java/core/game/node/entity/npc/city/nardah/Rokuh.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/Seddu.java b/Server/src/main/java/core/game/node/entity/npc/city/nardah/Seddu.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/nardah/Seddu.java
rename to Server/src/main/java/core/game/node/entity/npc/city/nardah/Seddu.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/AliCamelMan.java b/Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/AliCamelMan.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/AliCamelMan.java
rename to Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/AliCamelMan.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/AliTheCamelHandler.java b/Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/AliTheCamelHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/AliTheCamelHandler.java
rename to Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/AliTheCamelHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/AliTheKebabSeller.java b/Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/AliTheKebabSeller.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/AliTheKebabSeller.java
rename to Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/AliTheKebabSeller.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/BlackJackSeller.java b/Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/BlackJackSeller.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/BlackJackSeller.java
rename to Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/BlackJackSeller.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/DesertBandit.java b/Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/DesertBandit.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/DesertBandit.java
rename to Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/DesertBandit.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/SnakeCharmerBasket.java b/Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/SnakeCharmerBasket.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/SnakeCharmerBasket.java
rename to Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/SnakeCharmerBasket.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/StreetUrchinDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/StreetUrchinDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/StreetUrchinDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/StreetUrchinDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/sophanem/KlenterNPC.java b/Server/src/main/java/core/game/node/entity/npc/city/sophanem/KlenterNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/sophanem/KlenterNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/city/sophanem/KlenterNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/sophanem/SphinxDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/sophanem/SphinxDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/sophanem/SphinxDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/sophanem/SphinxDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/sophanem/TarikDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/sophanem/TarikDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/sophanem/TarikDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/sophanem/TarikDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/sophanem/WallShortcut.java b/Server/src/main/java/core/game/node/entity/npc/city/sophanem/WallShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/sophanem/WallShortcut.java
rename to Server/src/main/java/core/game/node/entity/npc/city/sophanem/WallShortcut.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/tzhaar/TzHaarMejJah.java b/Server/src/main/java/core/game/node/entity/npc/city/tzhaar/TzHaarMejJah.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/tzhaar/TzHaarMejJah.java
rename to Server/src/main/java/core/game/node/entity/npc/city/tzhaar/TzHaarMejJah.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/tzhaar/TzHaarMejKah.java b/Server/src/main/java/core/game/node/entity/npc/city/tzhaar/TzHaarMejKah.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/tzhaar/TzHaarMejKah.java
rename to Server/src/main/java/core/game/node/entity/npc/city/tzhaar/TzHaarMejKah.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/MuseumGuardDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/MuseumGuardDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/MuseumGuardDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/varrock/MuseumGuardDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/MuseumGuardVarrockDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/MuseumGuardVarrockDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/MuseumGuardVarrockDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/varrock/MuseumGuardVarrockDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/MuseumHistorianDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/MuseumHistorianDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/MuseumHistorianDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/varrock/MuseumHistorianDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/SchoolchildMuseumDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/SchoolchildMuseumDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/SchoolchildMuseumDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/varrock/SchoolchildMuseumDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/TeacherandPupilMuseumDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/TeacherandPupilMuseumDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/TeacherandPupilMuseumDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/varrock/TeacherandPupilMuseumDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/TeacherandPupilMuseumMaleDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/TeacherandPupilMuseumMaleDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/TeacherandPupilMuseumMaleDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/varrock/TeacherandPupilMuseumMaleDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/VarrockBartenderDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockBartenderDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/VarrockBartenderDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockBartenderDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/VarrockBrokenCart.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockBrokenCart.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/VarrockBrokenCart.java
rename to Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockBrokenCart.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/VarrockCookDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockCookDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/VarrockCookDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockCookDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/VarrockEastBartenderDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockEastBartenderDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/VarrockEastBartenderDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockEastBartenderDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/VarrockGateGuardDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockGateGuardDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/VarrockGateGuardDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockGateGuardDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/VarrockSwordShopDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockSwordShopDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/varrock/VarrockSwordShopDialogue.java
rename to Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockSwordShopDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/drop/DropFrequency.java b/Server/src/main/java/core/game/node/entity/npc/drop/DropFrequency.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/drop/DropFrequency.java
rename to Server/src/main/java/core/game/node/entity/npc/drop/DropFrequency.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/drop/NPCDropTables.java b/Server/src/main/java/core/game/node/entity/npc/drop/NPCDropTables.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/drop/NPCDropTables.java
rename to Server/src/main/java/core/game/node/entity/npc/drop/NPCDropTables.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/drop/RareDropTable.java b/Server/src/main/java/core/game/node/entity/npc/drop/RareDropTable.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/drop/RareDropTable.java
rename to Server/src/main/java/core/game/node/entity/npc/drop/RareDropTable.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/drop/SharedTables.java b/Server/src/main/java/core/game/node/entity/npc/drop/SharedTables.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/drop/SharedTables.java
rename to Server/src/main/java/core/game/node/entity/npc/drop/SharedTables.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/AbyssalLurkerNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/AbyssalLurkerNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/AbyssalLurkerNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/AbyssalLurkerNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/AbyssalParasiteNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/AbyssalParasiteNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/AbyssalParasiteNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/AbyssalParasiteNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/AbyssalTitanNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/AbyssalTitanNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/AbyssalTitanNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/AbyssalTitanNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/AlbinoRatNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/AlbinoRatNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/AlbinoRatNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/AlbinoRatNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/ArcticBearNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/ArcticBearNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/ArcticBearNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/ArcticBearNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/BabyChinchompaNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/BabyChinchompaNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/BabyChinchompaNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/BabyChinchompaNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/BarkerToadNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/BarkerToadNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/BarkerToadNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/BarkerToadNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/BeaverNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/BeaverNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/BeaverNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/BeaverNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/BloatedLeechNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/BloatedLeechNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/BloatedLeechNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/BloatedLeechNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/BullAntNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/BullAntNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/BullAntNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/BullAntNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/BunyipNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/BunyipNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/BunyipNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/BunyipNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/CockatriceFamiliarNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/CockatriceFamiliarNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/CockatriceFamiliarNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/CockatriceFamiliarNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/CompostMoundNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/CompostMoundNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/CompostMoundNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/CompostMoundNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/DesertWyrmNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/DesertWyrmNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/DesertWyrmNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/DesertWyrmNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/DreadfowlNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/DreadfowlNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/DreadfowlNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/DreadfowlNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/EvilTurnipNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/EvilTurnipNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/EvilTurnipNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/EvilTurnipNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/FireTitanNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/FireTitanNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/FireTitanNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/FireTitanNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/ForgeRegentNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/ForgeRegentNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/ForgeRegentNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/ForgeRegentNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/FruitBatNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/FruitBatNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/FruitBatNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/FruitBatNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/GeyserTitanNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/GeyserTitanNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/GeyserTitanNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/GeyserTitanNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/GiantChinchompaNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/GiantChinchompaNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/GiantChinchompaNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/GiantChinchompaNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/GiantEntNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/GiantEntNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/GiantEntNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/GiantEntNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/GraniteCrabNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/GraniteCrabNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/GraniteCrabNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/GraniteCrabNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/GraniteLobsterNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/GraniteLobsterNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/GraniteLobsterNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/GraniteLobsterNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/HoneyBadgerNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/HoneyBadgerNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/HoneyBadgerNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/HoneyBadgerNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/HydraNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/HydraNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/HydraNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/HydraNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/IbisNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/IbisNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/IbisNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/IbisNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/IceTitanNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/IceTitanNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/IceTitanNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/IceTitanNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/IronTitanNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/IronTitanNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/IronTitanNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/IronTitanNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/KalphiteNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/KalphiteNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/KalphiteNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/KalphiteNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/KaramthulhuOverlordNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/KaramthulhuOverlordNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/KaramthulhuOverlordNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/KaramthulhuOverlordNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/LavaTitanNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/LavaTitanNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/LavaTitanNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/LavaTitanNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/MacawNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/MacawNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/MacawNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/MacawNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/MagpieNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/MagpieNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/MagpieNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/MagpieNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/MinotaurFamiliarNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/MinotaurFamiliarNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/MinotaurFamiliarNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/MinotaurFamiliarNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/MossTitanNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/MossTitanNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/MossTitanNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/MossTitanNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/ObsidianGolemNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/ObsidianGolemNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/ObsidianGolemNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/ObsidianGolemNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/PackYakNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/PackYakNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/PackYakNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/PackYakNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/PrayingMantisNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/PrayingMantisNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/PrayingMantisNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/PrayingMantisNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/PyreLordNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/PyreLordNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/PyreLordNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/PyreLordNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/RavenousLocustNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/RavenousLocustNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/RavenousLocustNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/RavenousLocustNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SmokeDevilNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SmokeDevilNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SmokeDevilNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SmokeDevilNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SnakelingNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SnakelingNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SnakelingNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SnakelingNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritCobraNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritCobraNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritCobraNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritCobraNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritDagannothNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritDagannothNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritDagannothNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritDagannothNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritGraahkNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritGraahkNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritGraahkNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritGraahkNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritJellyNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritJellyNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritJellyNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritJellyNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritKalphiteNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritKalphiteNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritKalphiteNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritKalphiteNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritKyattNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritKyattNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritKyattNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritKyattNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritLarupiaNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritLarupiaNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritLarupiaNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritLarupiaNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritMosquitoNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritMosquitoNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritMosquitoNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritMosquitoNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritPengatriceNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritPengatriceNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritPengatriceNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritPengatriceNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritScorpionNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritScorpionNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritScorpionNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritScorpionNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritSpiderNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritSpiderNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritSpiderNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritSpiderNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritTerrorbirdNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritTerrorbirdNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritTerrorbirdNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritTerrorbirdNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritTzKihNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritTzKihNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritTzKihNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritTzKihNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritWolfNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritWolfNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SpiritWolfNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SpiritWolfNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SteelTitanNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SteelTitanNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SteelTitanNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SteelTitanNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/StrangerPlantNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/StrangerPlantNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/StrangerPlantNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/StrangerPlantNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/SwampTitanNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SwampTitanNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/SwampTitanNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/SwampTitanNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/TalonBeastNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/TalonBeastNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/TalonBeastNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/TalonBeastNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/ThornySnailNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/ThornySnailNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/ThornySnailNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/ThornySnailNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/UnicornStallionNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/UnicornStallionNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/UnicornStallionNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/UnicornStallionNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/VampireBatNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/VampireBatNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/VampireBatNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/VampireBatNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/VetionNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/VetionNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/VetionNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/VetionNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/VoidFamiliarNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/VoidFamiliarNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/VoidFamiliarNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/VoidFamiliarNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/WarTortoiseNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/WarTortoiseNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/WarTortoiseNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/WarTortoiseNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/familiar/WolpertingerNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/WolpertingerNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/familiar/WolpertingerNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/familiar/WolpertingerNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/AntonNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/AntonNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/AntonNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/AntonNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/ArmourSuitNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/ArmourSuitNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/ArmourSuitNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/ArmourSuitNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/BarbarianNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/BarbarianNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/BarbarianNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/BarbarianNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/BennyNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/BennyNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/BennyNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/BennyNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/BlackKnightNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/BlackKnightNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/BlackKnightNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/BlackKnightNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/BorkNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/BorkNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/BorkNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/BorkNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/CatableponNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/CatableponNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/CatableponNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/CatableponNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/ChromaticDragonNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/ChromaticDragonNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/ChromaticDragonNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/ChromaticDragonNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/CitizenNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/CitizenNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/CitizenNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/CitizenNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/CowNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/CowNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/CowNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/CowNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/DarkWizardNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/DarkWizardNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/DarkWizardNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/DarkWizardNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/DraynorTreeNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/DraynorTreeNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/DraynorTreeNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/DraynorTreeNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/DuckNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/DuckNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/DuckNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/DuckNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/ElementalMonsterNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/ElementalMonsterNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/ElementalMonsterNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/ElementalMonsterNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/ElementalWizardNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/ElementalWizardNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/ElementalWizardNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/ElementalWizardNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/FishingNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/FishingNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/FishingNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/FishingNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/GoblinVillageNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/GoblinVillageNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/GoblinVillageNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/GoblinVillageNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/GraveStoneNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/GraveStoneNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/GraveStoneNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/GraveStoneNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/GuardNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/GuardNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/GuardNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/GuardNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/HansNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/HansNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/HansNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/HansNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/HighwayManNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/HighwayManNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/HighwayManNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/HighwayManNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/IceGiantNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/IceGiantNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/IceGiantNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/IceGiantNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/JogreNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/JogreNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/JogreNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/JogreNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/KamfreenaNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/KamfreenaNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/KamfreenaNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/KamfreenaNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/LumberKittenNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/LumberKittenNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/LumberKittenNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/LumberKittenNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/LumbridgeInstructorNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/LumbridgeInstructorNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/LumbridgeInstructorNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/LumbridgeInstructorNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/LumbridgeSwampGiantRatNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/LumbridgeSwampGiantRatNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/LumbridgeSwampGiantRatNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/LumbridgeSwampGiantRatNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/MetalDragonNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/MetalDragonNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/MetalDragonNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/MetalDragonNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/MonkNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/MonkNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/MonkNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/MonkNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/RasoloNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/RasoloNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/RasoloNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/RasoloNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/RatNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/RatNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/RatNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/RatNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/RatTutorialNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/RatTutorialNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/RatTutorialNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/RatTutorialNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/RockCrabNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/RockCrabNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/RockCrabNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/RockCrabNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/ShanomiNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/ShanomiNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/ShanomiNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/ShanomiNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/SheepNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/SheepNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/SheepNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/SheepNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/ShopNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/ShopNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/ShopNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/ShopNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/SkippyNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/SkippyNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/SkippyNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/SkippyNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/SorceressElementalNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/SorceressElementalNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/SorceressElementalNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/SorceressElementalNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/StrayDogNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/StrayDogNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/StrayDogNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/StrayDogNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/Student.java b/Server/src/main/java/core/game/node/entity/npc/other/Student.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/Student.java
rename to Server/src/main/java/core/game/node/entity/npc/other/Student.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/ThrowerTrollNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/ThrowerTrollNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/ThrowerTrollNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/ThrowerTrollNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/TribesmanNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/TribesmanNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/TribesmanNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/TribesmanNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/TutorialChickenNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/TutorialChickenNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/TutorialChickenNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/TutorialChickenNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/VampireSlayerNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/VampireSlayerNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/VampireSlayerNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/VampireSlayerNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/WerewolfNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/WerewolfNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/WerewolfNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/WerewolfNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/ZombieNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/ZombieNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/ZombieNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/other/ZombieNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/akharanu.java b/Server/src/main/java/core/game/node/entity/npc/other/akharanu.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/akharanu.java
rename to Server/src/main/java/core/game/node/entity/npc/other/akharanu.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/quest/gertrudes_cat/FluffNPC.java b/Server/src/main/java/core/game/node/entity/npc/quest/gertrudes_cat/FluffNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/quest/gertrudes_cat/FluffNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/quest/gertrudes_cat/FluffNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/quest/pirates_treasure/GardenerNPC.java b/Server/src/main/java/core/game/node/entity/npc/quest/pirates_treasure/GardenerNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/quest/pirates_treasure/GardenerNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/quest/pirates_treasure/GardenerNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/quest/priest_in_peril/MonkOfZamorakNPC.java b/Server/src/main/java/core/game/node/entity/npc/quest/priest_in_peril/MonkOfZamorakNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/quest/priest_in_peril/MonkOfZamorakNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/quest/priest_in_peril/MonkOfZamorakNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/quest/priest_in_peril/TempleGuardianNPC.java b/Server/src/main/java/core/game/node/entity/npc/quest/priest_in_peril/TempleGuardianNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/quest/priest_in_peril/TempleGuardianNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/quest/priest_in_peril/TempleGuardianNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/quest/romeo__juliet/JulietNPC.java b/Server/src/main/java/core/game/node/entity/npc/quest/romeo__juliet/JulietNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/quest/romeo__juliet/JulietNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/quest/romeo__juliet/JulietNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/quest/romeo__juliet/RomeoNPC.java b/Server/src/main/java/core/game/node/entity/npc/quest/romeo__juliet/RomeoNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/quest/romeo__juliet/RomeoNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/quest/romeo__juliet/RomeoNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/revenant/CorruptEquipment.java b/Server/src/main/java/core/game/node/entity/npc/revenant/CorruptEquipment.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/revenant/CorruptEquipment.java
rename to Server/src/main/java/core/game/node/entity/npc/revenant/CorruptEquipment.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/revenant/PVPEquipment.java b/Server/src/main/java/core/game/node/entity/npc/revenant/PVPEquipment.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/revenant/PVPEquipment.java
rename to Server/src/main/java/core/game/node/entity/npc/revenant/PVPEquipment.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/revenant/RevenantCombatHandler.java b/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantCombatHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/revenant/RevenantCombatHandler.java
rename to Server/src/main/java/core/game/node/entity/npc/revenant/RevenantCombatHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/revenant/RevenantNPC.java b/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/revenant/RevenantNPC.java
rename to Server/src/main/java/core/game/node/entity/npc/revenant/RevenantNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/revenant/RevenantPlugin.java b/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/revenant/RevenantPlugin.java
rename to Server/src/main/java/core/game/node/entity/npc/revenant/RevenantPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/revenant/RevenantType.java b/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/revenant/RevenantType.java
rename to Server/src/main/java/core/game/node/entity/npc/revenant/RevenantType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/Player.java b/Server/src/main/java/core/game/node/entity/player/Player.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/Player.java
rename to Server/src/main/java/core/game/node/entity/player/Player.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/ClientInfo.java b/Server/src/main/java/core/game/node/entity/player/info/ClientInfo.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/ClientInfo.java
rename to Server/src/main/java/core/game/node/entity/player/info/ClientInfo.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/PlayerDetails.java b/Server/src/main/java/core/game/node/entity/player/info/PlayerDetails.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/PlayerDetails.java
rename to Server/src/main/java/core/game/node/entity/player/info/PlayerDetails.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/RenderInfo.java b/Server/src/main/java/core/game/node/entity/player/info/RenderInfo.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/RenderInfo.java
rename to Server/src/main/java/core/game/node/entity/player/info/RenderInfo.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/Rights.java b/Server/src/main/java/core/game/node/entity/player/info/Rights.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/Rights.java
rename to Server/src/main/java/core/game/node/entity/player/info/Rights.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/UIDInfo.java b/Server/src/main/java/core/game/node/entity/player/info/UIDInfo.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/UIDInfo.java
rename to Server/src/main/java/core/game/node/entity/player/info/UIDInfo.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/login/LoginConfiguration.java b/Server/src/main/java/core/game/node/entity/player/info/login/LoginConfiguration.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/login/LoginConfiguration.java
rename to Server/src/main/java/core/game/node/entity/player/info/login/LoginConfiguration.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/login/LoginType.java b/Server/src/main/java/core/game/node/entity/player/info/login/LoginType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/login/LoginType.java
rename to Server/src/main/java/core/game/node/entity/player/info/login/LoginType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/login/PlayerParser.java b/Server/src/main/java/core/game/node/entity/player/info/login/PlayerParser.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/login/PlayerParser.java
rename to Server/src/main/java/core/game/node/entity/player/info/login/PlayerParser.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/login/Response.java b/Server/src/main/java/core/game/node/entity/player/info/login/Response.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/login/Response.java
rename to Server/src/main/java/core/game/node/entity/player/info/login/Response.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/portal/Icon.java b/Server/src/main/java/core/game/node/entity/player/info/portal/Icon.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/portal/Icon.java
rename to Server/src/main/java/core/game/node/entity/player/info/portal/Icon.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/portal/PlayerSQLManager.java b/Server/src/main/java/core/game/node/entity/player/info/portal/PlayerSQLManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/portal/PlayerSQLManager.java
rename to Server/src/main/java/core/game/node/entity/player/info/portal/PlayerSQLManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/ActivityData.java b/Server/src/main/java/core/game/node/entity/player/link/ActivityData.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/ActivityData.java
rename to Server/src/main/java/core/game/node/entity/player/link/ActivityData.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/BankPinManager.java b/Server/src/main/java/core/game/node/entity/player/link/BankPinManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/BankPinManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/BankPinManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/ConfigurationManager.java b/Server/src/main/java/core/game/node/entity/player/link/ConfigurationManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/ConfigurationManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/ConfigurationManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/GlobalData.java b/Server/src/main/java/core/game/node/entity/player/link/GlobalData.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/GlobalData.java
rename to Server/src/main/java/core/game/node/entity/player/link/GlobalData.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/HintIconManager.java b/Server/src/main/java/core/game/node/entity/player/link/HintIconManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/HintIconManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/HintIconManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/InterfaceManager.java b/Server/src/main/java/core/game/node/entity/player/link/InterfaceManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/InterfaceManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/InterfaceManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/IronmanManager.java b/Server/src/main/java/core/game/node/entity/player/link/IronmanManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/IronmanManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/IronmanManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/IronmanMode.java b/Server/src/main/java/core/game/node/entity/player/link/IronmanMode.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/IronmanMode.java
rename to Server/src/main/java/core/game/node/entity/player/link/IronmanMode.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/PacketDispatch.java b/Server/src/main/java/core/game/node/entity/player/link/PacketDispatch.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/PacketDispatch.java
rename to Server/src/main/java/core/game/node/entity/player/link/PacketDispatch.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/QuestData.java b/Server/src/main/java/core/game/node/entity/player/link/QuestData.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/QuestData.java
rename to Server/src/main/java/core/game/node/entity/player/link/QuestData.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/RunScript.java b/Server/src/main/java/core/game/node/entity/player/link/RunScript.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/RunScript.java
rename to Server/src/main/java/core/game/node/entity/player/link/RunScript.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/SavedData.java b/Server/src/main/java/core/game/node/entity/player/link/SavedData.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/SavedData.java
rename to Server/src/main/java/core/game/node/entity/player/link/SavedData.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/Settings.java b/Server/src/main/java/core/game/node/entity/player/link/Settings.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/Settings.java
rename to Server/src/main/java/core/game/node/entity/player/link/Settings.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/SkullManager.java b/Server/src/main/java/core/game/node/entity/player/link/SkullManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/SkullManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/SkullManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/SpellBookManager.java b/Server/src/main/java/core/game/node/entity/player/link/SpellBookManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/SpellBookManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/SpellBookManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/TeleportManager.java b/Server/src/main/java/core/game/node/entity/player/link/TeleportManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/TeleportManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/TeleportManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/WarningMessages.java b/Server/src/main/java/core/game/node/entity/player/link/WarningMessages.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/WarningMessages.java
rename to Server/src/main/java/core/game/node/entity/player/link/WarningMessages.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/appearance/Appearance.java b/Server/src/main/java/core/game/node/entity/player/link/appearance/Appearance.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/appearance/Appearance.java
rename to Server/src/main/java/core/game/node/entity/player/link/appearance/Appearance.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/appearance/BodyPart.java b/Server/src/main/java/core/game/node/entity/player/link/appearance/BodyPart.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/appearance/BodyPart.java
rename to Server/src/main/java/core/game/node/entity/player/link/appearance/BodyPart.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/appearance/Gender.java b/Server/src/main/java/core/game/node/entity/player/link/appearance/Gender.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/appearance/Gender.java
rename to Server/src/main/java/core/game/node/entity/player/link/appearance/Gender.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/audio/Audio.java b/Server/src/main/java/core/game/node/entity/player/link/audio/Audio.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/audio/Audio.java
rename to Server/src/main/java/core/game/node/entity/player/link/audio/Audio.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/audio/AudioManager.java b/Server/src/main/java/core/game/node/entity/player/link/audio/AudioManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/audio/AudioManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/audio/AudioManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/diary/AchievementDiary.java b/Server/src/main/java/core/game/node/entity/player/link/diary/AchievementDiary.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/diary/AchievementDiary.java
rename to Server/src/main/java/core/game/node/entity/player/link/diary/AchievementDiary.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/diary/AchievementDiaryManager.java b/Server/src/main/java/core/game/node/entity/player/link/diary/AchievementDiaryManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/diary/AchievementDiaryManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/diary/AchievementDiaryManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/diary/DiaryType.java b/Server/src/main/java/core/game/node/entity/player/link/diary/DiaryType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/diary/DiaryType.java
rename to Server/src/main/java/core/game/node/entity/player/link/diary/DiaryType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/diary/MysteriousStatueZone.java b/Server/src/main/java/core/game/node/entity/player/link/diary/MysteriousStatueZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/diary/MysteriousStatueZone.java
rename to Server/src/main/java/core/game/node/entity/player/link/diary/MysteriousStatueZone.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/emote/EmoteManager.java b/Server/src/main/java/core/game/node/entity/player/link/emote/EmoteManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/emote/EmoteManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/emote/EmoteManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/emote/Emotes.java b/Server/src/main/java/core/game/node/entity/player/link/emote/Emotes.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/emote/Emotes.java
rename to Server/src/main/java/core/game/node/entity/player/link/emote/Emotes.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/grave/GraveManager.java b/Server/src/main/java/core/game/node/entity/player/link/grave/GraveManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/grave/GraveManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/grave/GraveManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/grave/GraveType.java b/Server/src/main/java/core/game/node/entity/player/link/grave/GraveType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/grave/GraveType.java
rename to Server/src/main/java/core/game/node/entity/player/link/grave/GraveType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/music/MusicEntry.java b/Server/src/main/java/core/game/node/entity/player/link/music/MusicEntry.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/music/MusicEntry.java
rename to Server/src/main/java/core/game/node/entity/player/link/music/MusicEntry.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/music/MusicPlayer.java b/Server/src/main/java/core/game/node/entity/player/link/music/MusicPlayer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/music/MusicPlayer.java
rename to Server/src/main/java/core/game/node/entity/player/link/music/MusicPlayer.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/music/MusicZone.java b/Server/src/main/java/core/game/node/entity/player/link/music/MusicZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/music/MusicZone.java
rename to Server/src/main/java/core/game/node/entity/player/link/music/MusicZone.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/prayer/DrainTask.java b/Server/src/main/java/core/game/node/entity/player/link/prayer/DrainTask.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/prayer/DrainTask.java
rename to Server/src/main/java/core/game/node/entity/player/link/prayer/DrainTask.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/prayer/Prayer.java b/Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/prayer/Prayer.java
rename to Server/src/main/java/core/game/node/entity/player/link/prayer/Prayer.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/prayer/PrayerCategory.java b/Server/src/main/java/core/game/node/entity/player/link/prayer/PrayerCategory.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/prayer/PrayerCategory.java
rename to Server/src/main/java/core/game/node/entity/player/link/prayer/PrayerCategory.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/prayer/PrayerType.java b/Server/src/main/java/core/game/node/entity/player/link/prayer/PrayerType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/prayer/PrayerType.java
rename to Server/src/main/java/core/game/node/entity/player/link/prayer/PrayerType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/quest/Quest.java b/Server/src/main/java/core/game/node/entity/player/link/quest/Quest.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/quest/Quest.java
rename to Server/src/main/java/core/game/node/entity/player/link/quest/Quest.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/quest/QuestRepository.java b/Server/src/main/java/core/game/node/entity/player/link/quest/QuestRepository.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/quest/QuestRepository.java
rename to Server/src/main/java/core/game/node/entity/player/link/quest/QuestRepository.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/request/RequestManager.java b/Server/src/main/java/core/game/node/entity/player/link/request/RequestManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/request/RequestManager.java
rename to Server/src/main/java/core/game/node/entity/player/link/request/RequestManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/request/RequestModule.java b/Server/src/main/java/core/game/node/entity/player/link/request/RequestModule.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/request/RequestModule.java
rename to Server/src/main/java/core/game/node/entity/player/link/request/RequestModule.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/request/RequestType.java b/Server/src/main/java/core/game/node/entity/player/link/request/RequestType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/request/RequestType.java
rename to Server/src/main/java/core/game/node/entity/player/link/request/RequestType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/request/assist/AssistSession.java b/Server/src/main/java/core/game/node/entity/player/link/request/assist/AssistSession.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/request/assist/AssistSession.java
rename to Server/src/main/java/core/game/node/entity/player/link/request/assist/AssistSession.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/request/trade/TradeCloseEvent.java b/Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeCloseEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/request/trade/TradeCloseEvent.java
rename to Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeCloseEvent.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/request/trade/TradeContainer.java b/Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeContainer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/request/trade/TradeContainer.java
rename to Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeContainer.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/request/trade/TradeModule.java b/Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeModule.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/request/trade/TradeModule.java
rename to Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeModule.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/skillertasks/Difficulty.java b/Server/src/main/java/core/game/node/entity/player/link/skillertasks/Difficulty.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/skillertasks/Difficulty.java
rename to Server/src/main/java/core/game/node/entity/player/link/skillertasks/Difficulty.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/skillertasks/SkillTasks.java b/Server/src/main/java/core/game/node/entity/player/link/skillertasks/SkillTasks.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/skillertasks/SkillTasks.java
rename to Server/src/main/java/core/game/node/entity/player/link/skillertasks/SkillTasks.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/skillertasks/SkillerTasks.java b/Server/src/main/java/core/game/node/entity/player/link/skillertasks/SkillerTasks.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/skillertasks/SkillerTasks.java
rename to Server/src/main/java/core/game/node/entity/player/link/skillertasks/SkillerTasks.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/spawn/PKPackage.java b/Server/src/main/java/core/game/node/entity/player/link/spawn/PKPackage.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/spawn/PKPackage.java
rename to Server/src/main/java/core/game/node/entity/player/link/spawn/PKPackage.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/spawn/PKScoreBoard.java b/Server/src/main/java/core/game/node/entity/player/link/spawn/PKScoreBoard.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/spawn/PKScoreBoard.java
rename to Server/src/main/java/core/game/node/entity/player/link/spawn/PKScoreBoard.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/spawn/PKTitle.java b/Server/src/main/java/core/game/node/entity/player/link/spawn/PKTitle.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/spawn/PKTitle.java
rename to Server/src/main/java/core/game/node/entity/player/link/spawn/PKTitle.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/spawn/SpawnData.java b/Server/src/main/java/core/game/node/entity/player/link/spawn/SpawnData.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/spawn/SpawnData.java
rename to Server/src/main/java/core/game/node/entity/player/link/spawn/SpawnData.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/LevelUp.java b/Server/src/main/java/core/game/node/entity/skill/LevelUp.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/LevelUp.java
rename to Server/src/main/java/core/game/node/entity/skill/LevelUp.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/SkillBonus.java b/Server/src/main/java/core/game/node/entity/skill/SkillBonus.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/SkillBonus.java
rename to Server/src/main/java/core/game/node/entity/skill/SkillBonus.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/SkillPulse.java b/Server/src/main/java/core/game/node/entity/skill/SkillPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/SkillPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/SkillPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/SkillRestoration.java b/Server/src/main/java/core/game/node/entity/skill/SkillRestoration.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/SkillRestoration.java
rename to Server/src/main/java/core/game/node/entity/skill/SkillRestoration.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/Skills.java b/Server/src/main/java/core/game/node/entity/skill/Skills.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/Skills.java
rename to Server/src/main/java/core/game/node/entity/skill/Skills.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/AgilityCourse.java b/Server/src/main/java/core/game/node/entity/skill/agility/AgilityCourse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/AgilityCourse.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/AgilityCourse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/AgilityHandler.java b/Server/src/main/java/core/game/node/entity/skill/agility/AgilityHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/AgilityHandler.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/AgilityHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/AgilityShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/AgilityShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/AgilityShortcut.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/AgilityShortcut.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/BladeTrap.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BladeTrap.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/BladeTrap.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BladeTrap.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/BrimhavenArena.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenArena.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/BrimhavenArena.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenArena.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/BrimhavenCourse.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenCourse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/BrimhavenCourse.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenCourse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/DartTrap.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/DartTrap.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/DartTrap.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/DartTrap.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/FloorSpikes.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/FloorSpikes.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/FloorSpikes.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/FloorSpikes.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/PressurePad.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/PressurePad.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/PressurePad.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/PressurePad.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/SpinningBlades.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/SpinningBlades.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/brimhaven/SpinningBlades.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/SpinningBlades.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/pyramid/AgilityPyramidCourse.java b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/AgilityPyramidCourse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/pyramid/AgilityPyramidCourse.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/pyramid/AgilityPyramidCourse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/pyramid/AgilityPyramidZone.java b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/AgilityPyramidZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/pyramid/AgilityPyramidZone.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/pyramid/AgilityPyramidZone.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/pyramid/MovingBlockNPC.java b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/MovingBlockNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/pyramid/MovingBlockNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/pyramid/MovingBlockNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/pyramid/RollingBlock.java b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/RollingBlock.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/pyramid/RollingBlock.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/pyramid/RollingBlock.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/AlKharidPitShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/AlKharidPitShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/AlKharidPitShortcut.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/AlKharidPitShortcut.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/BarSqueezeShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/BarSqueezeShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/BarSqueezeShortcut.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/BarSqueezeShortcut.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/CrumblingWallShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/CrumblingWallShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/CrumblingWallShortcut.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/CrumblingWallShortcut.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/FenceJumpShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FenceJumpShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/FenceJumpShortcut.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FenceJumpShortcut.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/KaramjaGrapple.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/KaramjaGrapple.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/KaramjaGrapple.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/KaramjaGrapple.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/LogBalanceShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/LogBalanceShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/LogBalanceShortcut.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/LogBalanceShortcut.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/MonkeyBarShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/MonkeyBarShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/MonkeyBarShortcut.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/MonkeyBarShortcut.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/StileShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StileShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/StileShortcut.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StileShortcut.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/StrangeFloorShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StrangeFloorShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/StrangeFloorShortcut.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StrangeFloorShortcut.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/TunnelShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/TunnelShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/TunnelShortcut.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/TunnelShortcut.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/WaterOrbGrapple.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/WaterOrbGrapple.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/WaterOrbGrapple.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/WaterOrbGrapple.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/YanilleGrapple.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/YanilleGrapple.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/YanilleGrapple.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/YanilleGrapple.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/ZanarisSqueezeShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/ZanarisSqueezeShortcut.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/ZanarisSqueezeShortcut.java
rename to Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/ZanarisSqueezeShortcut.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/BuildHotspot.java b/Server/src/main/java/core/game/node/entity/skill/construction/BuildHotspot.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/BuildHotspot.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/BuildHotspot.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/BuildHotspotType.java b/Server/src/main/java/core/game/node/entity/skill/construction/BuildHotspotType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/BuildHotspotType.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/BuildHotspotType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/BuildOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/BuildOptionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/BuildRoomDialogue.java b/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/BuildRoomDialogue.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/BuildingUtils.java b/Server/src/main/java/core/game/node/entity/skill/construction/BuildingUtils.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/BuildingUtils.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/BuildingUtils.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/ConstructionGuideBook.java b/Server/src/main/java/core/game/node/entity/skill/construction/ConstructionGuideBook.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/ConstructionGuideBook.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/ConstructionGuideBook.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/ConstructionInterface.java b/Server/src/main/java/core/game/node/entity/skill/construction/ConstructionInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/ConstructionInterface.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/ConstructionInterface.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/CrestType.java b/Server/src/main/java/core/game/node/entity/skill/construction/CrestType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/CrestType.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/CrestType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/Decoration.java b/Server/src/main/java/core/game/node/entity/skill/construction/Decoration.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/Decoration.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/Decoration.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/HouseLocation.java b/Server/src/main/java/core/game/node/entity/skill/construction/HouseLocation.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/HouseLocation.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/HouseLocation.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/HouseManager.java b/Server/src/main/java/core/game/node/entity/skill/construction/HouseManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/HouseManager.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/HouseManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/HouseZone.java b/Server/src/main/java/core/game/node/entity/skill/construction/HouseZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/HouseZone.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/HouseZone.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/HousingStyle.java b/Server/src/main/java/core/game/node/entity/skill/construction/HousingStyle.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/HousingStyle.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/HousingStyle.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/NailType.java b/Server/src/main/java/core/game/node/entity/skill/construction/NailType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/NailType.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/NailType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/PortalOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/PortalOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/PortalOptionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/PortalOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/RemovalDialogue.java b/Server/src/main/java/core/game/node/entity/skill/construction/RemovalDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/RemovalDialogue.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/RemovalDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/Room.java b/Server/src/main/java/core/game/node/entity/skill/construction/Room.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/Room.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/Room.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/RoomBuilder.java b/Server/src/main/java/core/game/node/entity/skill/construction/RoomBuilder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/RoomBuilder.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/RoomBuilder.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/RoomProperties.java b/Server/src/main/java/core/game/node/entity/skill/construction/RoomProperties.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/RoomProperties.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/RoomProperties.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/Servant.java b/Server/src/main/java/core/game/node/entity/skill/construction/Servant.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/Servant.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/Servant.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/ServantType.java b/Server/src/main/java/core/game/node/entity/skill/construction/ServantType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/ServantType.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/ServantType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/BeerBarrelPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/BeerBarrelPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/BeerBarrelPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/BeerBarrelPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/ChairBenchPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/ChairBenchPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/ChairBenchPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/ChairBenchPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/FireplacePlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/FireplacePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/FireplacePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/FireplacePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/StaircasePlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/StaircasePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/StaircasePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/StaircasePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/bedroom/ClockPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/bedroom/ClockPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/bedroom/ClockPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/bedroom/ClockPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/chapel/BoneOfferPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/chapel/BoneOfferPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/chapel/BoneOfferPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/chapel/BoneOfferPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/chapel/TorchLightPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/chapel/TorchLightPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/chapel/TorchLightPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/chapel/TorchLightPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/combatroom/CombatRing.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/combatroom/CombatRing.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/combatroom/CombatRing.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/combatroom/CombatRing.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/costume/package-info.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/costume/package-info.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/costume/package-info.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/costume/package-info.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/kitchen/BeerBarrelPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/BeerBarrelPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/kitchen/BeerBarrelPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/BeerBarrelPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/kitchen/LarderPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/LarderPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/kitchen/LarderPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/LarderPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/kitchen/ShelfPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/ShelfPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/kitchen/ShelfPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/ShelfPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/questhall/MountedGloryPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/questhall/MountedGloryPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/questhall/MountedGloryPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/questhall/MountedGloryPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/workshop/ClockmakersBenchPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ClockmakersBenchPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/workshop/ClockmakersBenchPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ClockmakersBenchPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/workshop/ToolsPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ToolsPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/workshop/ToolsPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ToolsPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/npc/HouseServantDialogue.java b/Server/src/main/java/core/game/node/entity/skill/construction/npc/HouseServantDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/npc/HouseServantDialogue.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/npc/HouseServantDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/npc/HouseServantPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/npc/HouseServantPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/npc/HouseServantPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/npc/HouseServantPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/npc/StonemasonPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/npc/StonemasonPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/npc/StonemasonPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/construction/npc/StonemasonPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/CakeMakingPlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/CakeMakingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/CakeMakingPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/CakeMakingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/CoconutMakePlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/CoconutMakePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/CoconutMakePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/CoconutMakePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/CookableItems.java b/Server/src/main/java/core/game/node/entity/skill/cooking/CookableItems.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/CookableItems.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/CookableItems.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/CookingDialoguePlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/CookingDialoguePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/CookingDialoguePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/CookingDialoguePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/CookingPlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/CookingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/CookingPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/CookingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/CookingPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/CookingPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/CookingPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/CookingPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/CookingRecipePlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRecipePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/CookingRecipePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/CookingRecipePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/CookingRewrite.java b/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/CookingRewrite.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/FireOptionPotteryPlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/FireOptionPotteryPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/FireOptionPotteryPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/FireOptionPotteryPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/FoodCookingDialogue.java b/Server/src/main/java/core/game/node/entity/skill/cooking/FoodCookingDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/FoodCookingDialogue.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/FoodCookingDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/MakeDoughPlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/MakeDoughPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/MakeDoughPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/MakeDoughPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/MakeStewPlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/MakeStewPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/MakeStewPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/MakeStewPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/NettleTeaPlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/NettleTeaPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/NettleTeaPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/NettleTeaPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/NettleWaterPlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/NettleWaterPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/NettleWaterPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/NettleWaterPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/PieCookingPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/PieCookingPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/PieCookingPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/PieCookingPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/PieShellPlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/PieShellPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/PieShellPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/PieShellPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/PizzaCookingPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/PizzaCookingPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/PizzaCookingPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/PizzaCookingPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/SkeweredFoodPlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/SkeweredFoodPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/SkeweredFoodPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/SkeweredFoodPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/StandardCookingPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/StandardCookingPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/WatermelonSlicePlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/WatermelonSlicePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/WatermelonSlicePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/WatermelonSlicePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/WineFermentPlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/WineFermentPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/WineFermentPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/WineFermentPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/dairy/DairyChurnPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/dairy/DairyChurnPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/dairy/DairyChurnPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/dairy/DairyChurnPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/dairy/DairyProduct.java b/Server/src/main/java/core/game/node/entity/skill/cooking/dairy/DairyProduct.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/dairy/DairyProduct.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/dairy/DairyProduct.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/fermenting/WineFermentingPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/fermenting/WineFermentingPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/fermenting/WineFermentingPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/fermenting/WineFermentingPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/OomlieWrap.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/OomlieWrap.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/OomlieWrap.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/OomlieWrap.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/Recipe.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/Recipe.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/Recipe.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/Recipe.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/cake/ChocolateCake.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/cake/ChocolateCake.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/cake/ChocolateCake.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/cake/ChocolateCake.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/PieRecipe.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/PieRecipe.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/PieRecipe.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/PieRecipe.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/AdmiralPie.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/AdmiralPie.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/AdmiralPie.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/AdmiralPie.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/ApplePie.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/ApplePie.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/ApplePie.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/ApplePie.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/FishPie.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/FishPie.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/FishPie.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/FishPie.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/GardenPie.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/GardenPie.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/GardenPie.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/GardenPie.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/MeatPie.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/MeatPie.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/MeatPie.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/MeatPie.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/MudPie.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/MudPie.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/MudPie.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/MudPie.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/RedberryPie.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/RedberryPie.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/RedberryPie.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/RedberryPie.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/SummerPie.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/SummerPie.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/SummerPie.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/SummerPie.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/WildPie.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/WildPie.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pie/impl/WildPie.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pie/impl/WildPie.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pizza/PizzaRecipe.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pizza/PizzaRecipe.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pizza/PizzaRecipe.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pizza/PizzaRecipe.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pizza/impl/AnchovyPizza.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pizza/impl/AnchovyPizza.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pizza/impl/AnchovyPizza.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pizza/impl/AnchovyPizza.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pizza/impl/MeatPizza.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pizza/impl/MeatPizza.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pizza/impl/MeatPizza.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pizza/impl/MeatPizza.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pizza/impl/PineapplePizza.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pizza/impl/PineapplePizza.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pizza/impl/PineapplePizza.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pizza/impl/PineapplePizza.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pizza/impl/PlainPizza.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pizza/impl/PlainPizza.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/pizza/impl/PlainPizza.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/pizza/impl/PlainPizza.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/PotatoRecipe.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/PotatoRecipe.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/PotatoRecipe.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/PotatoRecipe.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/impl/ButterPotato.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/impl/ButterPotato.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/impl/ButterPotato.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/impl/ButterPotato.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/impl/CheesePotato.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/impl/CheesePotato.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/impl/CheesePotato.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/impl/CheesePotato.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/impl/ChilliPotato.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/impl/ChilliPotato.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/impl/ChilliPotato.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/impl/ChilliPotato.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/impl/EggPotato.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/impl/EggPotato.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/impl/EggPotato.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/impl/EggPotato.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/impl/MushroomPotato.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/impl/MushroomPotato.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/impl/MushroomPotato.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/impl/MushroomPotato.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/impl/TunaPotato.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/impl/TunaPotato.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/potato/impl/TunaPotato.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/potato/impl/TunaPotato.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/stew/CurryRecipe.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/stew/CurryRecipe.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/stew/CurryRecipe.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/stew/CurryRecipe.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/stew/StewRecipe.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/stew/StewRecipe.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/stew/StewRecipe.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/stew/StewRecipe.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/ToppingRecipe.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/ToppingRecipe.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/ToppingRecipe.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/ToppingRecipe.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/ChilliConCarne.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/ChilliConCarne.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/ChilliConCarne.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/ChilliConCarne.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/ChoppedOnion.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/ChoppedOnion.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/ChoppedOnion.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/ChoppedOnion.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/ChoppedTuna.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/ChoppedTuna.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/ChoppedTuna.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/ChoppedTuna.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/EggAndTomato.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/EggAndTomato.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/EggAndTomato.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/EggAndTomato.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/MushroomAndOnion.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/MushroomAndOnion.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/MushroomAndOnion.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/MushroomAndOnion.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/SlicedMushroom.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/SlicedMushroom.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/SlicedMushroom.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/SlicedMushroom.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/SpicySauce.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/SpicySauce.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/SpicySauce.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/SpicySauce.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/TunaAndCorn.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/TunaAndCorn.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/TunaAndCorn.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/TunaAndCorn.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/UncookedEgg.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/UncookedEgg.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/recipe/topping/impl/UncookedEgg.java
rename to Server/src/main/java/core/game/node/entity/skill/cooking/recipe/topping/impl/UncookedEgg.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/AmuletStringingPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/AmuletStringingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/AmuletStringingPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/AmuletStringingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/BattleStaves.java b/Server/src/main/java/core/game/node/entity/skill/crafting/BattleStaves.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/BattleStaves.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/BattleStaves.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/BattlestaveMakePlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/BattlestaveMakePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/BattlestaveMakePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/BattlestaveMakePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/ChiselLimestonePlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/ChiselLimestonePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/ChiselLimestonePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/ChiselLimestonePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/GemCutPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/GemCutPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/GemCutPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/GemCutPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/GlassProduct.java b/Server/src/main/java/core/game/node/entity/skill/crafting/GlassProduct.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/GlassProduct.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/GlassProduct.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/JewelleryCraftPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/JewelleryCraftPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/JewelleryCraftPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/JewelleryCraftPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/MoltenGlassMakePlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/MoltenGlassMakePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/MoltenGlassMakePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/MoltenGlassMakePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/PotteryPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/PotteryPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/PotteryPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/PotteryPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/SilverProduct.java b/Server/src/main/java/core/game/node/entity/skill/crafting/SilverProduct.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/SilverProduct.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/SilverProduct.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/SilverStringingPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/SilverStringingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/SilverStringingPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/SilverStringingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/SnakeSkinPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/SnakeSkinPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/SnakeSkinPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/SnakeSkinPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/SnelmCraftPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/SnelmCraftPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/SnelmCraftPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/SnelmCraftPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/StitchCraftPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/StitchCraftPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/StitchCraftPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/StitchCraftPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/StuddedArmourPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/StuddedArmourPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/StuddedArmourPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/StuddedArmourPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/TanningProduct.java b/Server/src/main/java/core/game/node/entity/skill/crafting/TanningProduct.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/TanningProduct.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/TanningProduct.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/WeaveOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/WeaveOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/WeaveOptionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/WeaveOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/armour/DragonCraftPulse.java b/Server/src/main/java/core/game/node/entity/skill/crafting/armour/DragonCraftPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/armour/DragonCraftPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/armour/DragonCraftPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/armour/HardCraftPulse.java b/Server/src/main/java/core/game/node/entity/skill/crafting/armour/HardCraftPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/armour/HardCraftPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/armour/HardCraftPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/armour/LeatherCrafting.java b/Server/src/main/java/core/game/node/entity/skill/crafting/armour/LeatherCrafting.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/armour/LeatherCrafting.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/armour/LeatherCrafting.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/armour/SnakeSkin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/armour/SnakeSkin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/armour/SnakeSkin.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/armour/SnakeSkin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/armour/SnakeSkinPulse.java b/Server/src/main/java/core/game/node/entity/skill/crafting/armour/SnakeSkinPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/armour/SnakeSkinPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/armour/SnakeSkinPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/armour/SoftCraftPulse.java b/Server/src/main/java/core/game/node/entity/skill/crafting/armour/SoftCraftPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/armour/SoftCraftPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/armour/SoftCraftPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/gem/GemCutPulse.java b/Server/src/main/java/core/game/node/entity/skill/crafting/gem/GemCutPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/gem/GemCutPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/gem/GemCutPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/gem/Gems.java b/Server/src/main/java/core/game/node/entity/skill/crafting/gem/Gems.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/gem/Gems.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/gem/Gems.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/jewellery/JewelleryCrafting.java b/Server/src/main/java/core/game/node/entity/skill/crafting/jewellery/JewelleryCrafting.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/jewellery/JewelleryCrafting.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/jewellery/JewelleryCrafting.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/jewellery/JewelleryPulse.java b/Server/src/main/java/core/game/node/entity/skill/crafting/jewellery/JewelleryPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/jewellery/JewelleryPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/jewellery/JewelleryPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/limestone/ChiselLimestonePulse.java b/Server/src/main/java/core/game/node/entity/skill/crafting/limestone/ChiselLimestonePulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/limestone/ChiselLimestonePulse.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/limestone/ChiselLimestonePulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/pottery/FirePotteryPulse.java b/Server/src/main/java/core/game/node/entity/skill/crafting/pottery/FirePotteryPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/pottery/FirePotteryPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/pottery/FirePotteryPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/pottery/PotteryItem.java b/Server/src/main/java/core/game/node/entity/skill/crafting/pottery/PotteryItem.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/pottery/PotteryItem.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/pottery/PotteryItem.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/pottery/PotteryPulse.java b/Server/src/main/java/core/game/node/entity/skill/crafting/pottery/PotteryPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/pottery/PotteryPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/pottery/PotteryPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/spinning/SpinningItem.java b/Server/src/main/java/core/game/node/entity/skill/crafting/spinning/SpinningItem.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/spinning/SpinningItem.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/spinning/SpinningItem.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/spinning/SpinningPulse.java b/Server/src/main/java/core/game/node/entity/skill/crafting/spinning/SpinningPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/spinning/SpinningPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/crafting/spinning/SpinningPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/firemaking/FireMakingOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/firemaking/FireMakingOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/firemaking/FireMakingOptionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/firemaking/FireMakingOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/firemaking/FireMakingPulse.java b/Server/src/main/java/core/game/node/entity/skill/firemaking/FireMakingPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/firemaking/FireMakingPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/firemaking/FireMakingPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/firemaking/LightLogPlugin.java b/Server/src/main/java/core/game/node/entity/skill/firemaking/LightLogPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/firemaking/LightLogPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/firemaking/LightLogPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/firemaking/Log.java b/Server/src/main/java/core/game/node/entity/skill/firemaking/Log.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/firemaking/Log.java
rename to Server/src/main/java/core/game/node/entity/skill/firemaking/Log.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fishing/Fish.java b/Server/src/main/java/core/game/node/entity/skill/fishing/Fish.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fishing/Fish.java
rename to Server/src/main/java/core/game/node/entity/skill/fishing/Fish.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fishing/FishSpots.java b/Server/src/main/java/core/game/node/entity/skill/fishing/FishSpots.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fishing/FishSpots.java
rename to Server/src/main/java/core/game/node/entity/skill/fishing/FishSpots.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fishing/FishingOption.java b/Server/src/main/java/core/game/node/entity/skill/fishing/FishingOption.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fishing/FishingOption.java
rename to Server/src/main/java/core/game/node/entity/skill/fishing/FishingOption.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fishing/FishingOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/fishing/FishingOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fishing/FishingOptionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/fishing/FishingOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fishing/FishingPulse.java b/Server/src/main/java/core/game/node/entity/skill/fishing/FishingPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fishing/FishingPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/fishing/FishingPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fishing/FishingSpot.java b/Server/src/main/java/core/game/node/entity/skill/fishing/FishingSpot.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fishing/FishingSpot.java
rename to Server/src/main/java/core/game/node/entity/skill/fishing/FishingSpot.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/ArrowCreatePlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/ArrowCreatePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/ArrowCreatePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/ArrowCreatePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/BoltCreatePlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/BoltCreatePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/BoltCreatePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/BoltCreatePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/BoltGemPlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/BoltGemPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/BoltGemPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/BoltGemPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/DartCreatePlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/DartCreatePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/DartCreatePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/DartCreatePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/FletchItem.java b/Server/src/main/java/core/game/node/entity/skill/fletching/FletchItem.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/FletchItem.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/FletchItem.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/FletchType.java b/Server/src/main/java/core/game/node/entity/skill/fletching/FletchType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/FletchType.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/FletchType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/Fletching.java b/Server/src/main/java/core/game/node/entity/skill/fletching/Fletching.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/Fletching.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/Fletching.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/FletchingPlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/FletchingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/FletchingPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/FletchingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/FletchingPulse.java b/Server/src/main/java/core/game/node/entity/skill/fletching/FletchingPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/FletchingPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/FletchingPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/GemBoltPlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/GemBoltPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/GemBoltPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/GemBoltPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/MakeCrossbowPlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/MakeCrossbowPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/MakeCrossbowPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/MakeCrossbowPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/MithGrapplePlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/MithGrapplePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/MithGrapplePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/MithGrapplePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/StringbowPlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/StringbowPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/StringbowPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/StringbowPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/arrow/ArrowHead.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/arrow/ArrowHead.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/arrow/ArrowHead.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/arrow/ArrowHead.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/arrow/ArrowHeadPulse.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/arrow/ArrowHeadPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/arrow/ArrowHeadPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/arrow/ArrowHeadPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/arrow/HeadlessArrowPulse.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/arrow/HeadlessArrowPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/arrow/HeadlessArrowPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/arrow/HeadlessArrowPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/bolts/Bolt.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/bolts/Bolt.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/bolts/Bolt.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/bolts/Bolt.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/bolts/BoltPulse.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/bolts/BoltPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/bolts/BoltPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/bolts/BoltPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/bow/StringBow.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/bow/StringBow.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/bow/StringBow.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/bow/StringBow.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/bow/StringPulse.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/bow/StringPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/bow/StringPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/bow/StringPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/crossbow/CrossbowPulse.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/crossbow/CrossbowPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/crossbow/CrossbowPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/crossbow/CrossbowPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/crossbow/Limb.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/crossbow/Limb.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/crossbow/Limb.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/crossbow/Limb.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/crossbow/LimbPulse.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/crossbow/LimbPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/crossbow/LimbPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/crossbow/LimbPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/crossbow/StringCross.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/crossbow/StringCross.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/crossbow/StringCross.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/crossbow/StringCross.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/darts/Dart.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/darts/Dart.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/darts/Dart.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/darts/Dart.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/darts/DartPulse.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/darts/DartPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/darts/DartPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/darts/DartPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/gem/Gem.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/gem/Gem.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/gem/Gem.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/gem/Gem.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/gem/GemBolt.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/gem/GemBolt.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/gem/GemBolt.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/gem/GemBolt.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/gem/GemBoltPulse.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/gem/GemBoltPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/gem/GemBoltPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/gem/GemBoltPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/grapple/GrapplePulse.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/grapple/GrapplePulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/grapple/GrapplePulse.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/grapple/GrapplePulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/package-info.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/package-info.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/package-info.java
rename to Server/src/main/java/core/game/node/entity/skill/fletching/items/package-info.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/gather/GatheringSkillOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/gather/GatheringSkillOptionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/gather/GatheringSkillPulse.java b/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/gather/GatheringSkillPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/gather/SkillingResource.java b/Server/src/main/java/core/game/node/entity/skill/gather/SkillingResource.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/gather/SkillingResource.java
rename to Server/src/main/java/core/game/node/entity/skill/gather/SkillingResource.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/gather/SkillingTool.java b/Server/src/main/java/core/game/node/entity/skill/gather/SkillingTool.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/gather/SkillingTool.java
rename to Server/src/main/java/core/game/node/entity/skill/gather/SkillingTool.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/gather/mining/MiningNode.java b/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/gather/mining/MiningNode.java
rename to Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/gather/woodcutting/WoodcuttingNode.java b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingNode.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/gather/woodcutting/WoodcuttingNode.java
rename to Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingNode.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/BarbarianMixPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/BarbarianMixPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/BarbarianMixPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/BarbarianMixPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/BarbarianPotion.java b/Server/src/main/java/core/game/node/entity/skill/herblore/BarbarianPotion.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/BarbarianPotion.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/BarbarianPotion.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/FinishedPotion.java b/Server/src/main/java/core/game/node/entity/skill/herblore/FinishedPotion.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/FinishedPotion.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/FinishedPotion.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/FinishedPotionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/FinishedPotionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/FinishedPotionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/FinishedPotionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/GenericPotion.java b/Server/src/main/java/core/game/node/entity/skill/herblore/GenericPotion.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/GenericPotion.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/GenericPotion.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/GrindingItem.java b/Server/src/main/java/core/game/node/entity/skill/herblore/GrindingItem.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/GrindingItem.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/GrindingItem.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/HerbCleanPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/HerbCleanPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/HerbCleanPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/HerbCleanPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/HerbTarPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/HerbTarPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/HerbTarPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/HerbTarPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/HerbTarPulse.java b/Server/src/main/java/core/game/node/entity/skill/herblore/HerbTarPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/HerbTarPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/HerbTarPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/HerblorePulse.java b/Server/src/main/java/core/game/node/entity/skill/herblore/HerblorePulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/HerblorePulse.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/HerblorePulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/Herbs.java b/Server/src/main/java/core/game/node/entity/skill/herblore/Herbs.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/Herbs.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/Herbs.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/MakeSuperCombatPotionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/MakeSuperCombatPotionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/MakeSuperCombatPotionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/MakeSuperCombatPotionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/MassDecantingPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/MassDecantingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/MassDecantingPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/MassDecantingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/PotionDecantingPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/PotionDecantingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/PotionDecantingPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/PotionDecantingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/SuperCombatPulse.java b/Server/src/main/java/core/game/node/entity/skill/herblore/SuperCombatPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/SuperCombatPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/SuperCombatPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/SwampToadPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/SwampToadPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/SwampToadPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/SwampToadPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/Tars.java b/Server/src/main/java/core/game/node/entity/skill/herblore/Tars.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/Tars.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/Tars.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/UnfinishedPotion.java b/Server/src/main/java/core/game/node/entity/skill/herblore/UnfinishedPotion.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/UnfinishedPotion.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/UnfinishedPotion.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/UnfinishedPotionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/UnfinishedPotionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/UnfinishedPotionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/herblore/UnfinishedPotionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/BoxTrapNode.java b/Server/src/main/java/core/game/node/entity/skill/hunter/BoxTrapNode.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/BoxTrapNode.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/BoxTrapNode.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/DeadfallSetting.java b/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/DeadfallSetting.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/FalconryActivityPlugin.java b/Server/src/main/java/core/game/node/entity/skill/hunter/FalconryActivityPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/FalconryActivityPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/FalconryActivityPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/HunterGear.java b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterGear.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/HunterGear.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/HunterGear.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/HunterManager.java b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/HunterManager.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/HunterNPC.java b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/HunterNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/HunterNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/HunterPlugin.java b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/HunterPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/HunterPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/ImpBoxPlugin.java b/Server/src/main/java/core/game/node/entity/skill/hunter/ImpBoxPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/ImpBoxPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/ImpBoxPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/ImpetuousImpulses.java b/Server/src/main/java/core/game/node/entity/skill/hunter/ImpetuousImpulses.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/ImpetuousImpulses.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/ImpetuousImpulses.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/ImplingNPC.java b/Server/src/main/java/core/game/node/entity/skill/hunter/ImplingNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/ImplingNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/ImplingNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/MagicBoxSetting.java b/Server/src/main/java/core/game/node/entity/skill/hunter/MagicBoxSetting.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/MagicBoxSetting.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/MagicBoxSetting.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/NetTrapSetting.java b/Server/src/main/java/core/game/node/entity/skill/hunter/NetTrapSetting.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/NetTrapSetting.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/NetTrapSetting.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/TrapCreatePulse.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapCreatePulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/TrapCreatePulse.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/TrapCreatePulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/TrapDismantlePulse.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapDismantlePulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/TrapDismantlePulse.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/TrapDismantlePulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/TrapHook.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapHook.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/TrapHook.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/TrapHook.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/TrapNode.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapNode.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/TrapNode.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/TrapNode.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/TrapSetting.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapSetting.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/TrapSetting.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/TrapSetting.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/TrapWrapper.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapWrapper.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/TrapWrapper.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/TrapWrapper.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/Traps.java b/Server/src/main/java/core/game/node/entity/skill/hunter/Traps.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/Traps.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/Traps.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/bnet/BNetNode.java b/Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetNode.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/bnet/BNetNode.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetNode.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/bnet/BNetPulse.java b/Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/bnet/BNetPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/bnet/BNetTypes.java b/Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetTypes.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/bnet/BNetTypes.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetTypes.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/bnet/ImplingNode.java b/Server/src/main/java/core/game/node/entity/skill/hunter/bnet/ImplingNode.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/bnet/ImplingNode.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/bnet/ImplingNode.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/falconry/FalconCatch.java b/Server/src/main/java/core/game/node/entity/skill/hunter/falconry/FalconCatch.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/falconry/FalconCatch.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/falconry/FalconCatch.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/falconry/FalconryCatchPulse.java b/Server/src/main/java/core/game/node/entity/skill/hunter/falconry/FalconryCatchPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/falconry/FalconryCatchPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/hunter/falconry/FalconryCatchPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/ChargeOrbSpells.java b/Server/src/main/java/core/game/node/entity/skill/magic/ChargeOrbSpells.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/ChargeOrbSpells.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/ChargeOrbSpells.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/ChargeSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/ChargeSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/ChargeSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/ChargeSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/CombinationRune.java b/Server/src/main/java/core/game/node/entity/skill/magic/CombinationRune.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/CombinationRune.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/CombinationRune.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/EnchantCrossbowSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/EnchantCrossbowSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/EnchantCrossbowSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/EnchantCrossbowSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/HouseTeleportPlugin.java b/Server/src/main/java/core/game/node/entity/skill/magic/HouseTeleportPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/HouseTeleportPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/HouseTeleportPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/MagicSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/MagicSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/MagicSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/MagicSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/MagicStaff.java b/Server/src/main/java/core/game/node/entity/skill/magic/MagicStaff.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/MagicStaff.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/MagicStaff.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/ModernTeleportPlugin.java b/Server/src/main/java/core/game/node/entity/skill/magic/ModernTeleportPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/ModernTeleportPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/ModernTeleportPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/Runes.java b/Server/src/main/java/core/game/node/entity/skill/magic/Runes.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/Runes.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/Runes.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/SuperheatSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/SuperheatSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/SuperheatSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/SuperheatSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/TeleblockSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/TeleblockSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/TeleblockSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/TeleblockSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/TeleotherSpells.java b/Server/src/main/java/core/game/node/entity/skill/magic/TeleotherSpells.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/TeleotherSpells.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/TeleotherSpells.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/ancient/AncientTeleportPlugin.java b/Server/src/main/java/core/game/node/entity/skill/magic/ancient/AncientTeleportPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/ancient/AncientTeleportPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/ancient/AncientTeleportPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/BakePieSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/BakePieSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/BakePieSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/BakePieSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/CureGroupSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/CureGroupSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/CureGroupSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/CureGroupSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/CureMeSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/CureMeSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/CureMeSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/CureMeSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/CureOtherSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/CureOtherSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/CureOtherSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/CureOtherSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/CurePlantSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/CurePlantSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/CurePlantSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/CurePlantSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/DreamSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/DreamSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/DreamSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/DreamSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/EnergyTransferSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/EnergyTransferSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/EnergyTransferSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/EnergyTransferSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/FertileSoilSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/FertileSoilSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/FertileSoilSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/FertileSoilSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/HealSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/HealSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/HealSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/HealSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/HumidifySpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/HumidifySpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/HumidifySpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/HumidifySpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/HunterKitSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/HunterKitSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/HunterKitSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/HunterKitSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/LunarTeleportPlugin.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/LunarTeleportPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/LunarTeleportPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/LunarTeleportPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/MagicImbueSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/MagicImbueSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/MagicImbueSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/MagicImbueSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/MonsterExamineSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/MonsterExamineSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/MonsterExamineSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/MonsterExamineSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/NPContactSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/NPContactSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/NPContactSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/NPContactSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/PlankMeSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/PlankMeSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/PlankMeSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/PlankMeSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/SpellbookSwapSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/SpellbookSwapSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/SpellbookSwapSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/SpellbookSwapSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/StatBoostSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatBoostSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/StatBoostSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatBoostSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/StatRestoreSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatRestoreSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/StatRestoreSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatRestoreSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/StatSpySpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatSpySpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/StatSpySpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatSpySpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/StringJewellerySpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/StringJewellerySpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/StringJewellerySpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/StringJewellerySpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/SuperglassMakeSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/SuperglassMakeSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/SuperglassMakeSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/SuperglassMakeSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/VengeanceSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/VengeanceSpell.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/magic/lunar/VengeanceSpell.java
rename to Server/src/main/java/core/game/node/entity/skill/magic/lunar/VengeanceSpell.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/package-info.java b/Server/src/main/java/core/game/node/entity/skill/package-info.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/package-info.java
rename to Server/src/main/java/core/game/node/entity/skill/package-info.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/prayer/BoneBuryingOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/prayer/BoneBuryingOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/prayer/BoneBuryingOptionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/prayer/BoneBuryingOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/prayer/PrayerAltarPlugin.java b/Server/src/main/java/core/game/node/entity/skill/prayer/PrayerAltarPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/prayer/PrayerAltarPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/prayer/PrayerAltarPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/Altar.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/Altar.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/Altar.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/Altar.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/CombinationRune.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/CombinationRune.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/CombinationRune.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/CombinationRune.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/CombinationRunePlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/CombinationRunePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/CombinationRunePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/CombinationRunePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/EnchantTiaraPlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/EnchantTiaraPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/EnchantTiaraPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/EnchantTiaraPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/EnchantTiaraPulse.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/EnchantTiaraPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/EnchantTiaraPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/EnchantTiaraPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/MysteriousRuin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/MysteriousRuin.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/MysteriousRuinPlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuinPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/MysteriousRuinPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuinPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/Rune.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/Rune.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/Rune.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/Rune.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/RuneCraftPulse.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/RuneCraftPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/RuneCraftPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/RuneCraftPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/RunePouch.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/RunePouch.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/RunePouch.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/RunePouch.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/RunecraftingPlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/RunecraftingPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/RunecraftingPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/RunecraftingPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/Talisman.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/Talisman.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/Talisman.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/Talisman.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/Tiara.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/Tiara.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/Tiara.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/Tiara.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/TiaraPlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/TiaraPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/TiaraPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/TiaraPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/abyss/AbyssalNPC.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/abyss/AbyssalNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/abyss/AbyssalNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/abyss/AbyssalNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/abyss/DarkMageDialogue.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/abyss/DarkMageDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/abyss/DarkMageDialogue.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/abyss/DarkMageDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/abyss/ZamorakMageDialogue.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/abyss/ZamorakMageDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/abyss/ZamorakMageDialogue.java
rename to Server/src/main/java/core/game/node/entity/skill/runecrafting/abyss/ZamorakMageDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/AberrantSpectreNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/AberrantSpectreNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/AberrantSpectreNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/AberrantSpectreNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/AbyssalDemonNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/AbyssalDemonNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/AbyssalDemonNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/AbyssalDemonNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/BansheeNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/BansheeNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/BansheeNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/BansheeNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/BasiliskNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/BasiliskNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/BasiliskNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/BasiliskNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/BrutalDragonNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/BrutalDragonNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/BrutalDragonNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/BrutalDragonNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/BugSwarmNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/BugSwarmNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/BugSwarmNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/BugSwarmNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/BuglanternPlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/BuglanternPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/BuglanternPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/BuglanternPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/CaveBugNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/CaveBugNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/CaveBugNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/CaveBugNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/CaveHorrorNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/CaveHorrorNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/CaveHorrorNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/CaveHorrorNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/CockatriceNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/CockatriceNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/CockatriceNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/CockatriceNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/DesertLizardPlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/DesertLizardPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/DesertLizardPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/DesertLizardPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/DustDevilNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/DustDevilNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/DustDevilNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/DustDevilNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/EnchantedGemDialogue.java b/Server/src/main/java/core/game/node/entity/skill/slayer/EnchantedGemDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/EnchantedGemDialogue.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/EnchantedGemDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/Equipment.java b/Server/src/main/java/core/game/node/entity/skill/slayer/Equipment.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/Equipment.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/Equipment.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/FishingExplosivePlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/FishingExplosivePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/FishingExplosivePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/FishingExplosivePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/GargoyleNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/GargoyleNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/GargoyleNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/GargoyleNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/InfernalMageNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/InfernalMageNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/InfernalMageNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/InfernalMageNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/KuraskNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/KuraskNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/KuraskNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/KuraskNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/Master.java b/Server/src/main/java/core/game/node/entity/skill/slayer/Master.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/Master.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/Master.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/MirrorShieldHandler.java b/Server/src/main/java/core/game/node/entity/skill/slayer/MirrorShieldHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/MirrorShieldHandler.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/MirrorShieldHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/MithrilDragonNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/MithrilDragonNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/MithrilDragonNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/MithrilDragonNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/NechryaelNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/NechryaelNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/NechryaelNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/NechryaelNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/RockSlugPlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/RockSlugPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/RockSlugPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/RockSlugPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/SkeletalWyvernNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SkeletalWyvernNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/SkeletalWyvernNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/SkeletalWyvernNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/SlayerManager.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/SlayerManager.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/SlayerManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/SlayerMasterDialogue.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerMasterDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/SlayerMasterDialogue.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/SlayerMasterDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/SlayerPlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/SlayerPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/SlayerPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/SlayerRewardPlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerRewardPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/SlayerRewardPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/SlayerRewardPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/SlayerTowerPlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/SlayerTowerPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/SlayerTowerZone.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/SlayerTowerZone.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerZone.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/Tasks.java b/Server/src/main/java/core/game/node/entity/skill/slayer/Tasks.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/Tasks.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/Tasks.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/TurothNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/TurothNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/TurothNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/TurothNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/WaterFiendNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/WaterFiendNPC.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/WaterFiendNPC.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/WaterFiendNPC.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/dungeon/AncientCavern.java b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/AncientCavern.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/dungeon/AncientCavern.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/AncientCavern.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/dungeon/FremennikDungeon.java b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/FremennikDungeon.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/dungeon/FremennikDungeon.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/FremennikDungeon.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/dungeon/LumbridgeDungeon.java b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/LumbridgeDungeon.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/dungeon/LumbridgeDungeon.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/LumbridgeDungeon.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/dungeon/StrongholdSlayerCave.java b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/StrongholdSlayerCave.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/dungeon/StrongholdSlayerCave.java
rename to Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/StrongholdSlayerCave.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/slayer/unused-tasks b/Server/src/main/java/core/game/node/entity/skill/slayer/unused-tasks
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/slayer/unused-tasks
rename to Server/src/main/java/core/game/node/entity/skill/slayer/unused-tasks
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/smithing/BarType.java b/Server/src/main/java/core/game/node/entity/skill/smithing/BarType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/smithing/BarType.java
rename to Server/src/main/java/core/game/node/entity/skill/smithing/BarType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/smithing/Bars.java b/Server/src/main/java/core/game/node/entity/skill/smithing/Bars.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/smithing/Bars.java
rename to Server/src/main/java/core/game/node/entity/skill/smithing/Bars.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/smithing/FurnaceOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/smithing/FurnaceOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/smithing/FurnaceOptionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/smithing/FurnaceOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/smithing/SmithingBuilder.java b/Server/src/main/java/core/game/node/entity/skill/smithing/SmithingBuilder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/smithing/SmithingBuilder.java
rename to Server/src/main/java/core/game/node/entity/skill/smithing/SmithingBuilder.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/smithing/SmithingPulse.java b/Server/src/main/java/core/game/node/entity/skill/smithing/SmithingPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/smithing/SmithingPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/smithing/SmithingPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/smithing/SmithingType.java b/Server/src/main/java/core/game/node/entity/skill/smithing/SmithingType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/smithing/SmithingType.java
rename to Server/src/main/java/core/game/node/entity/skill/smithing/SmithingType.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/smithing/smelting/Bar.java b/Server/src/main/java/core/game/node/entity/skill/smithing/smelting/Bar.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/smithing/smelting/Bar.java
rename to Server/src/main/java/core/game/node/entity/skill/smithing/smelting/Bar.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java b/Server/src/main/java/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/ObeliskOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/summoning/ObeliskOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/ObeliskOptionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/ObeliskOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/SummoningCreationPlugin.java b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreationPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/SummoningCreationPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreationPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/SummoningCreator.java b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreator.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/SummoningCreator.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreator.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/SummoningPouch.java b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningPouch.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/SummoningPouch.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/SummoningPouch.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/SummoningScroll.java b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningScroll.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/SummoningScroll.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/SummoningScroll.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/SummoningTabPlugin.java b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTabPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/SummoningTabPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTabPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/BurdenBeast.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/BurdenBeast.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/BurdenBeast.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/BurdenBeast.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/BurdenContainerListener.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/BurdenContainerListener.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/BurdenContainerListener.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/BurdenContainerListener.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/BurdenInterfacePlugin.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/BurdenInterfacePlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/BurdenInterfacePlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/BurdenInterfacePlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/Familiar.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Familiar.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/Familiar.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Familiar.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/FamiliarFeedPlugin.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarFeedPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/FamiliarFeedPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarFeedPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/FamiliarItemOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarItemOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/FamiliarItemOptionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarItemOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/FamiliarManager.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/FamiliarManager.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/FamiliarNPCOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarNPCOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/FamiliarNPCOptionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarNPCOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/FamiliarSpecial.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarSpecial.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/FamiliarSpecial.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarSpecial.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/Forager.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Forager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/Forager.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Forager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/RemoteViewDialogue.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/RemoteViewDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/RemoteViewDialogue.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/RemoteViewDialogue.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/RemoteViewer.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/RemoteViewer.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/RemoteViewer.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/RemoteViewer.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/SummonFamiliarPlugin.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/SummonFamiliarPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/familiar/SummonFamiliarPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/familiar/SummonFamiliarPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/pet/IncubatorEgg.java b/Server/src/main/java/core/game/node/entity/skill/summoning/pet/IncubatorEgg.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/pet/IncubatorEgg.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/pet/IncubatorEgg.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/pet/Pet.java b/Server/src/main/java/core/game/node/entity/skill/summoning/pet/Pet.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/pet/Pet.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/pet/Pet.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/pet/PetDetails.java b/Server/src/main/java/core/game/node/entity/skill/summoning/pet/PetDetails.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/pet/PetDetails.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/pet/PetDetails.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/summoning/pet/Pets.java b/Server/src/main/java/core/game/node/entity/skill/summoning/pet/Pets.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/summoning/pet/Pets.java
rename to Server/src/main/java/core/game/node/entity/skill/summoning/pet/Pets.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/thieving/PickableDoorHandler.java b/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/thieving/PickableDoorHandler.java
rename to Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/thieving/PickpocketPulse.java b/Server/src/main/java/core/game/node/entity/skill/thieving/PickpocketPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/thieving/PickpocketPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/thieving/PickpocketPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/thieving/Stall.java b/Server/src/main/java/core/game/node/entity/skill/thieving/Stall.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/thieving/Stall.java
rename to Server/src/main/java/core/game/node/entity/skill/thieving/Stall.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/thieving/StallThiefPulse.java b/Server/src/main/java/core/game/node/entity/skill/thieving/StallThiefPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/thieving/StallThiefPulse.java
rename to Server/src/main/java/core/game/node/entity/skill/thieving/StallThiefPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/thieving/ThievableChestPlugin.java b/Server/src/main/java/core/game/node/entity/skill/thieving/ThievableChestPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/thieving/ThievableChestPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/thieving/ThievableChestPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/thieving/ThievingOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/thieving/ThievingOptionPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/thieving/ThievingOptionPlugin.java
rename to Server/src/main/java/core/game/node/entity/skill/thieving/ThievingOptionPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/EntityState.java b/Server/src/main/java/core/game/node/entity/state/EntityState.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/EntityState.java
rename to Server/src/main/java/core/game/node/entity/state/EntityState.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/StateManager.java b/Server/src/main/java/core/game/node/entity/state/StateManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/StateManager.java
rename to Server/src/main/java/core/game/node/entity/state/StateManager.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/StatePulse.java b/Server/src/main/java/core/game/node/entity/state/StatePulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/StatePulse.java
rename to Server/src/main/java/core/game/node/entity/state/StatePulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/impl/FireResistantPulse.java b/Server/src/main/java/core/game/node/entity/state/impl/FireResistantPulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/impl/FireResistantPulse.java
rename to Server/src/main/java/core/game/node/entity/state/impl/FireResistantPulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/impl/FrozenStatePulse.java b/Server/src/main/java/core/game/node/entity/state/impl/FrozenStatePulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/impl/FrozenStatePulse.java
rename to Server/src/main/java/core/game/node/entity/state/impl/FrozenStatePulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/impl/MiasmicStatePulse.java b/Server/src/main/java/core/game/node/entity/state/impl/MiasmicStatePulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/impl/MiasmicStatePulse.java
rename to Server/src/main/java/core/game/node/entity/state/impl/MiasmicStatePulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/impl/PoisonStatePulse.java b/Server/src/main/java/core/game/node/entity/state/impl/PoisonStatePulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/impl/PoisonStatePulse.java
rename to Server/src/main/java/core/game/node/entity/state/impl/PoisonStatePulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/impl/SkullStatePulse.java b/Server/src/main/java/core/game/node/entity/state/impl/SkullStatePulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/impl/SkullStatePulse.java
rename to Server/src/main/java/core/game/node/entity/state/impl/SkullStatePulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/impl/StunStatePulse.java b/Server/src/main/java/core/game/node/entity/state/impl/StunStatePulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/impl/StunStatePulse.java
rename to Server/src/main/java/core/game/node/entity/state/impl/StunStatePulse.java
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/impl/TeleblockStatePulse.java b/Server/src/main/java/core/game/node/entity/state/impl/TeleblockStatePulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/impl/TeleblockStatePulse.java
rename to Server/src/main/java/core/game/node/entity/state/impl/TeleblockStatePulse.java
diff --git a/Server/src/main/java/Server/core/game/node/item/ChanceItem.java b/Server/src/main/java/core/game/node/item/ChanceItem.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/item/ChanceItem.java
rename to Server/src/main/java/core/game/node/item/ChanceItem.java
diff --git a/Server/src/main/java/Server/core/game/node/item/GroundItem.java b/Server/src/main/java/core/game/node/item/GroundItem.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/item/GroundItem.java
rename to Server/src/main/java/core/game/node/item/GroundItem.java
diff --git a/Server/src/main/java/Server/core/game/node/item/GroundItemManager.java b/Server/src/main/java/core/game/node/item/GroundItemManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/item/GroundItemManager.java
rename to Server/src/main/java/core/game/node/item/GroundItemManager.java
diff --git a/Server/src/main/java/Server/core/game/node/item/Item.java b/Server/src/main/java/core/game/node/item/Item.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/item/Item.java
rename to Server/src/main/java/core/game/node/item/Item.java
diff --git a/Server/src/main/java/Server/core/game/node/item/ItemPlugin.java b/Server/src/main/java/core/game/node/item/ItemPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/item/ItemPlugin.java
rename to Server/src/main/java/core/game/node/item/ItemPlugin.java
diff --git a/Server/src/main/java/Server/core/game/node/item/WeightedChanceItem.java b/Server/src/main/java/core/game/node/item/WeightedChanceItem.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/item/WeightedChanceItem.java
rename to Server/src/main/java/core/game/node/item/WeightedChanceItem.java
diff --git a/Server/src/main/java/Server/core/game/node/object/Constructed.java b/Server/src/main/java/core/game/node/object/Constructed.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/object/Constructed.java
rename to Server/src/main/java/core/game/node/object/Constructed.java
diff --git a/Server/src/main/java/Server/core/game/node/object/GameObject.java b/Server/src/main/java/core/game/node/object/GameObject.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/object/GameObject.java
rename to Server/src/main/java/core/game/node/object/GameObject.java
diff --git a/Server/src/main/java/Server/core/game/node/object/ObjectBuilder.java b/Server/src/main/java/core/game/node/object/ObjectBuilder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/object/ObjectBuilder.java
rename to Server/src/main/java/core/game/node/object/ObjectBuilder.java
diff --git a/Server/src/main/java/Server/core/game/package-info.java b/Server/src/main/java/core/game/package-info.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/package-info.java
rename to Server/src/main/java/core/game/package-info.java
diff --git a/Server/src/main/java/Server/core/game/system/SystemConfig.java b/Server/src/main/java/core/game/system/SystemConfig.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/SystemConfig.java
rename to Server/src/main/java/core/game/system/SystemConfig.java
diff --git a/Server/src/main/java/Server/core/game/system/SystemManager.java b/Server/src/main/java/core/game/system/SystemManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/SystemManager.java
rename to Server/src/main/java/core/game/system/SystemManager.java
diff --git a/Server/src/main/java/Server/core/game/system/SystemShutdownHook.java b/Server/src/main/java/core/game/system/SystemShutdownHook.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/SystemShutdownHook.java
rename to Server/src/main/java/core/game/system/SystemShutdownHook.java
diff --git a/Server/src/main/java/Server/core/game/system/SystemState.java b/Server/src/main/java/core/game/system/SystemState.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/SystemState.java
rename to Server/src/main/java/core/game/system/SystemState.java
diff --git a/Server/src/main/java/Server/core/game/system/SystemTermination.java b/Server/src/main/java/core/game/system/SystemTermination.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/SystemTermination.java
rename to Server/src/main/java/core/game/system/SystemTermination.java
diff --git a/Server/src/main/java/Server/core/game/system/SystemUpdate.java b/Server/src/main/java/core/game/system/SystemUpdate.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/SystemUpdate.java
rename to Server/src/main/java/core/game/system/SystemUpdate.java
diff --git a/Server/src/main/java/Server/core/game/system/command/CommandSet.java b/Server/src/main/java/core/game/system/command/CommandSet.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/CommandSet.java
rename to Server/src/main/java/core/game/system/command/CommandSet.java
diff --git a/Server/src/main/java/Server/core/game/system/communication/ClanEntry.java b/Server/src/main/java/core/game/system/communication/ClanEntry.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/communication/ClanEntry.java
rename to Server/src/main/java/core/game/system/communication/ClanEntry.java
diff --git a/Server/src/main/java/Server/core/game/system/communication/ClanMember.java b/Server/src/main/java/core/game/system/communication/ClanMember.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/communication/ClanMember.java
rename to Server/src/main/java/core/game/system/communication/ClanMember.java
diff --git a/Server/src/main/java/Server/core/game/system/communication/ClanRank.java b/Server/src/main/java/core/game/system/communication/ClanRank.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/communication/ClanRank.java
rename to Server/src/main/java/core/game/system/communication/ClanRank.java
diff --git a/Server/src/main/java/Server/core/game/system/communication/ClanRepository.java b/Server/src/main/java/core/game/system/communication/ClanRepository.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/communication/ClanRepository.java
rename to Server/src/main/java/core/game/system/communication/ClanRepository.java
diff --git a/Server/src/main/java/Server/core/game/system/communication/CommunicationInfo.java b/Server/src/main/java/core/game/system/communication/CommunicationInfo.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/communication/CommunicationInfo.java
rename to Server/src/main/java/core/game/system/communication/CommunicationInfo.java
diff --git a/Server/src/main/java/Server/core/game/system/communication/Contact.java b/Server/src/main/java/core/game/system/communication/Contact.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/communication/Contact.java
rename to Server/src/main/java/core/game/system/communication/Contact.java
diff --git a/Server/src/main/java/Server/core/game/system/monitor/DuplicationLog.java b/Server/src/main/java/core/game/system/monitor/DuplicationLog.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/monitor/DuplicationLog.java
rename to Server/src/main/java/core/game/system/monitor/DuplicationLog.java
diff --git a/Server/src/main/java/Server/core/game/system/monitor/ExceptionLog.java b/Server/src/main/java/core/game/system/monitor/ExceptionLog.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/monitor/ExceptionLog.java
rename to Server/src/main/java/core/game/system/monitor/ExceptionLog.java
diff --git a/Server/src/main/java/Server/core/game/system/monitor/MessageLog.java b/Server/src/main/java/core/game/system/monitor/MessageLog.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/monitor/MessageLog.java
rename to Server/src/main/java/core/game/system/monitor/MessageLog.java
diff --git a/Server/src/main/java/Server/core/game/system/monitor/PlayerMonitor.java b/Server/src/main/java/core/game/system/monitor/PlayerMonitor.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/monitor/PlayerMonitor.java
rename to Server/src/main/java/core/game/system/monitor/PlayerMonitor.java
diff --git a/Server/src/main/java/Server/core/game/system/mysql/SQLColumn.java b/Server/src/main/java/core/game/system/mysql/SQLColumn.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/mysql/SQLColumn.java
rename to Server/src/main/java/core/game/system/mysql/SQLColumn.java
diff --git a/Server/src/main/java/Server/core/game/system/mysql/SQLEntryHandler.java b/Server/src/main/java/core/game/system/mysql/SQLEntryHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/mysql/SQLEntryHandler.java
rename to Server/src/main/java/core/game/system/mysql/SQLEntryHandler.java
diff --git a/Server/src/main/java/Server/core/game/system/mysql/SQLManager.java b/Server/src/main/java/core/game/system/mysql/SQLManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/mysql/SQLManager.java
rename to Server/src/main/java/core/game/system/mysql/SQLManager.java
diff --git a/Server/src/main/java/Server/core/game/system/mysql/SQLTable.java b/Server/src/main/java/core/game/system/mysql/SQLTable.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/mysql/SQLTable.java
rename to Server/src/main/java/core/game/system/mysql/SQLTable.java
diff --git a/Server/src/main/java/Server/core/game/system/mysql/impl/HighscoreSQLHandler.java b/Server/src/main/java/core/game/system/mysql/impl/HighscoreSQLHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/mysql/impl/HighscoreSQLHandler.java
rename to Server/src/main/java/core/game/system/mysql/impl/HighscoreSQLHandler.java
diff --git a/Server/src/main/java/Server/core/game/system/mysql/impl/PlayerLogSQLHandler.java b/Server/src/main/java/core/game/system/mysql/impl/PlayerLogSQLHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/mysql/impl/PlayerLogSQLHandler.java
rename to Server/src/main/java/core/game/system/mysql/impl/PlayerLogSQLHandler.java
diff --git a/Server/src/main/java/Server/core/game/system/mysql/impl/PlayerSQLHandler.java b/Server/src/main/java/core/game/system/mysql/impl/PlayerSQLHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/mysql/impl/PlayerSQLHandler.java
rename to Server/src/main/java/core/game/system/mysql/impl/PlayerSQLHandler.java
diff --git a/Server/src/main/java/Server/core/game/system/script/InstructionType.java b/Server/src/main/java/core/game/system/script/InstructionType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/InstructionType.java
rename to Server/src/main/java/core/game/system/script/InstructionType.java
diff --git a/Server/src/main/java/Server/core/game/system/script/MethodCall.java b/Server/src/main/java/core/game/system/script/MethodCall.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/MethodCall.java
rename to Server/src/main/java/core/game/system/script/MethodCall.java
diff --git a/Server/src/main/java/Server/core/game/system/script/ParamCall.java b/Server/src/main/java/core/game/system/script/ParamCall.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/ParamCall.java
rename to Server/src/main/java/core/game/system/script/ParamCall.java
diff --git a/Server/src/main/java/Server/core/game/system/script/ScriptBuilder.java b/Server/src/main/java/core/game/system/script/ScriptBuilder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/ScriptBuilder.java
rename to Server/src/main/java/core/game/system/script/ScriptBuilder.java
diff --git a/Server/src/main/java/Server/core/game/system/script/ScriptCompiler.java b/Server/src/main/java/core/game/system/script/ScriptCompiler.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/ScriptCompiler.java
rename to Server/src/main/java/core/game/system/script/ScriptCompiler.java
diff --git a/Server/src/main/java/Server/core/game/system/script/ScriptContext.java b/Server/src/main/java/core/game/system/script/ScriptContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/ScriptContext.java
rename to Server/src/main/java/core/game/system/script/ScriptContext.java
diff --git a/Server/src/main/java/Server/core/game/system/script/ScriptEntry.java b/Server/src/main/java/core/game/system/script/ScriptEntry.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/ScriptEntry.java
rename to Server/src/main/java/core/game/system/script/ScriptEntry.java
diff --git a/Server/src/main/java/Server/core/game/system/script/ScriptManager.java b/Server/src/main/java/core/game/system/script/ScriptManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/ScriptManager.java
rename to Server/src/main/java/core/game/system/script/ScriptManager.java
diff --git a/Server/src/main/java/Server/core/game/system/script/ScriptType.java b/Server/src/main/java/core/game/system/script/ScriptType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/ScriptType.java
rename to Server/src/main/java/core/game/system/script/ScriptType.java
diff --git a/Server/src/main/java/Server/core/game/system/script/build/DialogueScriptBuilder.java b/Server/src/main/java/core/game/system/script/build/DialogueScriptBuilder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/build/DialogueScriptBuilder.java
rename to Server/src/main/java/core/game/system/script/build/DialogueScriptBuilder.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/AddItemInstruction.java b/Server/src/main/java/core/game/system/script/context/AddItemInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/AddItemInstruction.java
rename to Server/src/main/java/core/game/system/script/context/AddItemInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/CheckRandomCondition.java b/Server/src/main/java/core/game/system/script/context/CheckRandomCondition.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/CheckRandomCondition.java
rename to Server/src/main/java/core/game/system/script/context/CheckRandomCondition.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/InvItemCondition.java b/Server/src/main/java/core/game/system/script/context/InvItemCondition.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/InvItemCondition.java
rename to Server/src/main/java/core/game/system/script/context/InvItemCondition.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/ItemMessageInstruction.java b/Server/src/main/java/core/game/system/script/context/ItemMessageInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/ItemMessageInstruction.java
rename to Server/src/main/java/core/game/system/script/context/ItemMessageInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/NPCDialInstruction.java b/Server/src/main/java/core/game/system/script/context/NPCDialInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/NPCDialInstruction.java
rename to Server/src/main/java/core/game/system/script/context/NPCDialInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/OptionDialInstruction.java b/Server/src/main/java/core/game/system/script/context/OptionDialInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/OptionDialInstruction.java
rename to Server/src/main/java/core/game/system/script/context/OptionDialInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/PDialInstruction.java b/Server/src/main/java/core/game/system/script/context/PDialInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/PDialInstruction.java
rename to Server/src/main/java/core/game/system/script/context/PDialInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/PMessageInstruction.java b/Server/src/main/java/core/game/system/script/context/PMessageInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/PMessageInstruction.java
rename to Server/src/main/java/core/game/system/script/context/PMessageInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/PauseInstruction.java b/Server/src/main/java/core/game/system/script/context/PauseInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/PauseInstruction.java
rename to Server/src/main/java/core/game/system/script/context/PauseInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/PlainMessageInstruction.java b/Server/src/main/java/core/game/system/script/context/PlainMessageInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/PlainMessageInstruction.java
rename to Server/src/main/java/core/game/system/script/context/PlainMessageInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/RemoveItemInstruction.java b/Server/src/main/java/core/game/system/script/context/RemoveItemInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/RemoveItemInstruction.java
rename to Server/src/main/java/core/game/system/script/context/RemoveItemInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/SetAttributeInstruction.java b/Server/src/main/java/core/game/system/script/context/SetAttributeInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/SetAttributeInstruction.java
rename to Server/src/main/java/core/game/system/script/context/SetAttributeInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/SetRandomInstruction.java b/Server/src/main/java/core/game/system/script/context/SetRandomInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/SetRandomInstruction.java
rename to Server/src/main/java/core/game/system/script/context/SetRandomInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/ShopInstruction.java b/Server/src/main/java/core/game/system/script/context/ShopInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/ShopInstruction.java
rename to Server/src/main/java/core/game/system/script/context/ShopInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/StartActivityInstruction.java b/Server/src/main/java/core/game/system/script/context/StartActivityInstruction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/StartActivityInstruction.java
rename to Server/src/main/java/core/game/system/script/context/StartActivityInstruction.java
diff --git a/Server/src/main/java/Server/core/game/system/script/context/WGuildTokenCondition.java b/Server/src/main/java/core/game/system/script/context/WGuildTokenCondition.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/context/WGuildTokenCondition.java
rename to Server/src/main/java/core/game/system/script/context/WGuildTokenCondition.java
diff --git a/Server/src/main/java/Server/core/game/system/script/exc/InvalidGOTOException.java b/Server/src/main/java/core/game/system/script/exc/InvalidGOTOException.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/exc/InvalidGOTOException.java
rename to Server/src/main/java/core/game/system/script/exc/InvalidGOTOException.java
diff --git a/Server/src/main/java/Server/core/game/system/script/exc/InvalidInstructionException.java b/Server/src/main/java/core/game/system/script/exc/InvalidInstructionException.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/exc/InvalidInstructionException.java
rename to Server/src/main/java/core/game/system/script/exc/InvalidInstructionException.java
diff --git a/Server/src/main/java/Server/core/game/system/script/exc/InvalidInterpreterException.java b/Server/src/main/java/core/game/system/script/exc/InvalidInterpreterException.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/exc/InvalidInterpreterException.java
rename to Server/src/main/java/core/game/system/script/exc/InvalidInterpreterException.java
diff --git a/Server/src/main/java/Server/core/game/system/script/exc/ScriptException.java b/Server/src/main/java/core/game/system/script/exc/ScriptException.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/exc/ScriptException.java
rename to Server/src/main/java/core/game/system/script/exc/ScriptException.java
diff --git a/Server/src/main/java/Server/core/game/system/script/exc/UnknownScriptException.java b/Server/src/main/java/core/game/system/script/exc/UnknownScriptException.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/script/exc/UnknownScriptException.java
rename to Server/src/main/java/core/game/system/script/exc/UnknownScriptException.java
diff --git a/Server/src/main/java/Server/core/game/system/security/EncryptionManager.java b/Server/src/main/java/core/game/system/security/EncryptionManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/security/EncryptionManager.java
rename to Server/src/main/java/core/game/system/security/EncryptionManager.java
diff --git a/Server/src/main/java/Server/core/game/system/task/ItemLogoutTask.java b/Server/src/main/java/core/game/system/task/ItemLogoutTask.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/task/ItemLogoutTask.java
rename to Server/src/main/java/core/game/system/task/ItemLogoutTask.java
diff --git a/Server/src/main/java/Server/core/game/system/task/LocationLogoutTask.java b/Server/src/main/java/core/game/system/task/LocationLogoutTask.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/task/LocationLogoutTask.java
rename to Server/src/main/java/core/game/system/task/LocationLogoutTask.java
diff --git a/Server/src/main/java/Server/core/game/system/task/LogoutTask.java b/Server/src/main/java/core/game/system/task/LogoutTask.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/task/LogoutTask.java
rename to Server/src/main/java/core/game/system/task/LogoutTask.java
diff --git a/Server/src/main/java/Server/core/game/system/task/MovementHook.java b/Server/src/main/java/core/game/system/task/MovementHook.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/task/MovementHook.java
rename to Server/src/main/java/core/game/system/task/MovementHook.java
diff --git a/Server/src/main/java/Server/core/game/system/task/NodeTask.java b/Server/src/main/java/core/game/system/task/NodeTask.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/task/NodeTask.java
rename to Server/src/main/java/core/game/system/task/NodeTask.java
diff --git a/Server/src/main/java/Server/core/game/system/task/Pulse.java b/Server/src/main/java/core/game/system/task/Pulse.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/task/Pulse.java
rename to Server/src/main/java/core/game/system/task/Pulse.java
diff --git a/Server/src/main/java/Server/core/game/system/task/TaskExecutor.java b/Server/src/main/java/core/game/system/task/TaskExecutor.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/task/TaskExecutor.java
rename to Server/src/main/java/core/game/system/task/TaskExecutor.java
diff --git a/Server/src/main/java/Server/core/game/world/GameType.java b/Server/src/main/java/core/game/world/GameType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/GameType.java
rename to Server/src/main/java/core/game/world/GameType.java
diff --git a/Server/src/main/java/Server/core/game/world/callback/CallBack.java b/Server/src/main/java/core/game/world/callback/CallBack.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/callback/CallBack.java
rename to Server/src/main/java/core/game/world/callback/CallBack.java
diff --git a/Server/src/main/java/Server/core/game/world/map/BuildRegionChunk.java b/Server/src/main/java/core/game/world/map/BuildRegionChunk.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/BuildRegionChunk.java
rename to Server/src/main/java/core/game/world/map/BuildRegionChunk.java
diff --git a/Server/src/main/java/Server/core/game/world/map/Direction.java b/Server/src/main/java/core/game/world/map/Direction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/Direction.java
rename to Server/src/main/java/core/game/world/map/Direction.java
diff --git a/Server/src/main/java/Server/core/game/world/map/Location.java b/Server/src/main/java/core/game/world/map/Location.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/Location.java
rename to Server/src/main/java/core/game/world/map/Location.java
diff --git a/Server/src/main/java/Server/core/game/world/map/MapDistance.java b/Server/src/main/java/core/game/world/map/MapDistance.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/MapDistance.java
rename to Server/src/main/java/core/game/world/map/MapDistance.java
diff --git a/Server/src/main/java/Server/core/game/world/map/Point.java b/Server/src/main/java/core/game/world/map/Point.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/Point.java
rename to Server/src/main/java/core/game/world/map/Point.java
diff --git a/Server/src/main/java/Server/core/game/world/map/Region.java b/Server/src/main/java/core/game/world/map/Region.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/Region.java
rename to Server/src/main/java/core/game/world/map/Region.java
diff --git a/Server/src/main/java/Server/core/game/world/map/RegionChunk.java b/Server/src/main/java/core/game/world/map/RegionChunk.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/RegionChunk.java
rename to Server/src/main/java/core/game/world/map/RegionChunk.java
diff --git a/Server/src/main/java/Server/core/game/world/map/RegionManager.java b/Server/src/main/java/core/game/world/map/RegionManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/RegionManager.java
rename to Server/src/main/java/core/game/world/map/RegionManager.java
diff --git a/Server/src/main/java/Server/core/game/world/map/RegionPlane.java b/Server/src/main/java/core/game/world/map/RegionPlane.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/RegionPlane.java
rename to Server/src/main/java/core/game/world/map/RegionPlane.java
diff --git a/Server/src/main/java/Server/core/game/world/map/Viewport.java b/Server/src/main/java/core/game/world/map/Viewport.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/Viewport.java
rename to Server/src/main/java/core/game/world/map/Viewport.java
diff --git a/Server/src/main/java/Server/core/game/world/map/build/DynamicRegion.java b/Server/src/main/java/core/game/world/map/build/DynamicRegion.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/build/DynamicRegion.java
rename to Server/src/main/java/core/game/world/map/build/DynamicRegion.java
diff --git a/Server/src/main/java/Server/core/game/world/map/build/LandscapeParser.java b/Server/src/main/java/core/game/world/map/build/LandscapeParser.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/build/LandscapeParser.java
rename to Server/src/main/java/core/game/world/map/build/LandscapeParser.java
diff --git a/Server/src/main/java/Server/core/game/world/map/build/MapscapeParser.java b/Server/src/main/java/core/game/world/map/build/MapscapeParser.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/build/MapscapeParser.java
rename to Server/src/main/java/core/game/world/map/build/MapscapeParser.java
diff --git a/Server/src/main/java/Server/core/game/world/map/build/RegionFlags.java b/Server/src/main/java/core/game/world/map/build/RegionFlags.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/build/RegionFlags.java
rename to Server/src/main/java/core/game/world/map/build/RegionFlags.java
diff --git a/Server/src/main/java/Server/core/game/world/map/path/ClipMaskSupplier.java b/Server/src/main/java/core/game/world/map/path/ClipMaskSupplier.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/path/ClipMaskSupplier.java
rename to Server/src/main/java/core/game/world/map/path/ClipMaskSupplier.java
diff --git a/Server/src/main/java/Server/core/game/world/map/path/DumbPathfinder.java b/Server/src/main/java/core/game/world/map/path/DumbPathfinder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/path/DumbPathfinder.java
rename to Server/src/main/java/core/game/world/map/path/DumbPathfinder.java
diff --git a/Server/src/main/java/Server/core/game/world/map/path/Path.java b/Server/src/main/java/core/game/world/map/path/Path.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/path/Path.java
rename to Server/src/main/java/core/game/world/map/path/Path.java
diff --git a/Server/src/main/java/Server/core/game/world/map/path/Pathfinder.java b/Server/src/main/java/core/game/world/map/path/Pathfinder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/path/Pathfinder.java
rename to Server/src/main/java/core/game/world/map/path/Pathfinder.java
diff --git a/Server/src/main/java/Server/core/game/world/map/path/ProjectilePathfinder.java b/Server/src/main/java/core/game/world/map/path/ProjectilePathfinder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/path/ProjectilePathfinder.java
rename to Server/src/main/java/core/game/world/map/path/ProjectilePathfinder.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/MapZone.java b/Server/src/main/java/core/game/world/map/zone/MapZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/MapZone.java
rename to Server/src/main/java/core/game/world/map/zone/MapZone.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/RegionZone.java b/Server/src/main/java/core/game/world/map/zone/RegionZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/RegionZone.java
rename to Server/src/main/java/core/game/world/map/zone/RegionZone.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/Zone.java b/Server/src/main/java/core/game/world/map/zone/Zone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/Zone.java
rename to Server/src/main/java/core/game/world/map/zone/Zone.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/ZoneBorders.java b/Server/src/main/java/core/game/world/map/zone/ZoneBorders.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/ZoneBorders.java
rename to Server/src/main/java/core/game/world/map/zone/ZoneBorders.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/ZoneBuilder.java b/Server/src/main/java/core/game/world/map/zone/ZoneBuilder.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/ZoneBuilder.java
rename to Server/src/main/java/core/game/world/map/zone/ZoneBuilder.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/ZoneMonitor.java b/Server/src/main/java/core/game/world/map/zone/ZoneMonitor.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/ZoneMonitor.java
rename to Server/src/main/java/core/game/world/map/zone/ZoneMonitor.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/ZoneRestriction.java b/Server/src/main/java/core/game/world/map/zone/ZoneRestriction.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/ZoneRestriction.java
rename to Server/src/main/java/core/game/world/map/zone/ZoneRestriction.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/ZoneType.java b/Server/src/main/java/core/game/world/map/zone/ZoneType.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/ZoneType.java
rename to Server/src/main/java/core/game/world/map/zone/ZoneType.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/impl/BankZone.java b/Server/src/main/java/core/game/world/map/zone/impl/BankZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/impl/BankZone.java
rename to Server/src/main/java/core/game/world/map/zone/impl/BankZone.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/impl/DarkZone.java b/Server/src/main/java/core/game/world/map/zone/impl/DarkZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/impl/DarkZone.java
rename to Server/src/main/java/core/game/world/map/zone/impl/DarkZone.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/impl/KaramjaZone.java b/Server/src/main/java/core/game/world/map/zone/impl/KaramjaZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/impl/KaramjaZone.java
rename to Server/src/main/java/core/game/world/map/zone/impl/KaramjaZone.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/impl/ModeratorZone.java b/Server/src/main/java/core/game/world/map/zone/impl/ModeratorZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/impl/ModeratorZone.java
rename to Server/src/main/java/core/game/world/map/zone/impl/ModeratorZone.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/impl/MultiwayCombatZone.java b/Server/src/main/java/core/game/world/map/zone/impl/MultiwayCombatZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/impl/MultiwayCombatZone.java
rename to Server/src/main/java/core/game/world/map/zone/impl/MultiwayCombatZone.java
diff --git a/Server/src/main/java/Server/core/game/world/map/zone/impl/WildernessZone.java b/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/zone/impl/WildernessZone.java
rename to Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java
diff --git a/Server/src/main/java/Server/core/game/world/objectparser/ObjectParser.java b/Server/src/main/java/core/game/world/objectparser/ObjectParser.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/objectparser/ObjectParser.java
rename to Server/src/main/java/core/game/world/objectparser/ObjectParser.java
diff --git a/Server/src/main/java/Server/core/game/world/repository/InitializationEntry.java b/Server/src/main/java/core/game/world/repository/InitializationEntry.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/repository/InitializationEntry.java
rename to Server/src/main/java/core/game/world/repository/InitializationEntry.java
diff --git a/Server/src/main/java/Server/core/game/world/repository/InitializingNodeList.java b/Server/src/main/java/core/game/world/repository/InitializingNodeList.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/repository/InitializingNodeList.java
rename to Server/src/main/java/core/game/world/repository/InitializingNodeList.java
diff --git a/Server/src/main/java/Server/core/game/world/repository/NodeList.java b/Server/src/main/java/core/game/world/repository/NodeList.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/repository/NodeList.java
rename to Server/src/main/java/core/game/world/repository/NodeList.java
diff --git a/Server/src/main/java/Server/core/game/world/repository/NodeListIterator.java b/Server/src/main/java/core/game/world/repository/NodeListIterator.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/repository/NodeListIterator.java
rename to Server/src/main/java/core/game/world/repository/NodeListIterator.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/FlagContext.java b/Server/src/main/java/core/game/world/update/flag/FlagContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/FlagContext.java
rename to Server/src/main/java/core/game/world/update/flag/FlagContext.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/PlayerFlags.java b/Server/src/main/java/core/game/world/update/flag/PlayerFlags.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/PlayerFlags.java
rename to Server/src/main/java/core/game/world/update/flag/PlayerFlags.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/UpdateFlag.java b/Server/src/main/java/core/game/world/update/flag/UpdateFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/UpdateFlag.java
rename to Server/src/main/java/core/game/world/update/flag/UpdateFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/chunk/AnimateObjectUpdateFlag.java b/Server/src/main/java/core/game/world/update/flag/chunk/AnimateObjectUpdateFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/chunk/AnimateObjectUpdateFlag.java
rename to Server/src/main/java/core/game/world/update/flag/chunk/AnimateObjectUpdateFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/chunk/GraphicUpdateFlag.java b/Server/src/main/java/core/game/world/update/flag/chunk/GraphicUpdateFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/chunk/GraphicUpdateFlag.java
rename to Server/src/main/java/core/game/world/update/flag/chunk/GraphicUpdateFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/chunk/ItemUpdateFlag.java b/Server/src/main/java/core/game/world/update/flag/chunk/ItemUpdateFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/chunk/ItemUpdateFlag.java
rename to Server/src/main/java/core/game/world/update/flag/chunk/ItemUpdateFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/chunk/ObjectUpdateFlag.java b/Server/src/main/java/core/game/world/update/flag/chunk/ObjectUpdateFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/chunk/ObjectUpdateFlag.java
rename to Server/src/main/java/core/game/world/update/flag/chunk/ObjectUpdateFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/chunk/ProjectileUpdateFlag.java b/Server/src/main/java/core/game/world/update/flag/chunk/ProjectileUpdateFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/chunk/ProjectileUpdateFlag.java
rename to Server/src/main/java/core/game/world/update/flag/chunk/ProjectileUpdateFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/context/Animation.java b/Server/src/main/java/core/game/world/update/flag/context/Animation.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/context/Animation.java
rename to Server/src/main/java/core/game/world/update/flag/context/Animation.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/context/ChatMessage.java b/Server/src/main/java/core/game/world/update/flag/context/ChatMessage.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/context/ChatMessage.java
rename to Server/src/main/java/core/game/world/update/flag/context/ChatMessage.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/context/Graphics.java b/Server/src/main/java/core/game/world/update/flag/context/Graphics.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/context/Graphics.java
rename to Server/src/main/java/core/game/world/update/flag/context/Graphics.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/context/HitMark.java b/Server/src/main/java/core/game/world/update/flag/context/HitMark.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/context/HitMark.java
rename to Server/src/main/java/core/game/world/update/flag/context/HitMark.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/npc/NPCAnimation.java b/Server/src/main/java/core/game/world/update/flag/npc/NPCAnimation.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/npc/NPCAnimation.java
rename to Server/src/main/java/core/game/world/update/flag/npc/NPCAnimation.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/npc/NPCFaceEntity.java b/Server/src/main/java/core/game/world/update/flag/npc/NPCFaceEntity.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/npc/NPCFaceEntity.java
rename to Server/src/main/java/core/game/world/update/flag/npc/NPCFaceEntity.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/npc/NPCFaceLocation.java b/Server/src/main/java/core/game/world/update/flag/npc/NPCFaceLocation.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/npc/NPCFaceLocation.java
rename to Server/src/main/java/core/game/world/update/flag/npc/NPCFaceLocation.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/npc/NPCForceChat.java b/Server/src/main/java/core/game/world/update/flag/npc/NPCForceChat.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/npc/NPCForceChat.java
rename to Server/src/main/java/core/game/world/update/flag/npc/NPCForceChat.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/npc/NPCGraphic.java b/Server/src/main/java/core/game/world/update/flag/npc/NPCGraphic.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/npc/NPCGraphic.java
rename to Server/src/main/java/core/game/world/update/flag/npc/NPCGraphic.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/npc/NPCHitFlag.java b/Server/src/main/java/core/game/world/update/flag/npc/NPCHitFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/npc/NPCHitFlag.java
rename to Server/src/main/java/core/game/world/update/flag/npc/NPCHitFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/npc/NPCHitFlag1.java b/Server/src/main/java/core/game/world/update/flag/npc/NPCHitFlag1.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/npc/NPCHitFlag1.java
rename to Server/src/main/java/core/game/world/update/flag/npc/NPCHitFlag1.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/npc/NPCSwitchId.java b/Server/src/main/java/core/game/world/update/flag/npc/NPCSwitchId.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/npc/NPCSwitchId.java
rename to Server/src/main/java/core/game/world/update/flag/npc/NPCSwitchId.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/player/AnimationFlag.java b/Server/src/main/java/core/game/world/update/flag/player/AnimationFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/player/AnimationFlag.java
rename to Server/src/main/java/core/game/world/update/flag/player/AnimationFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/player/AppearanceFlag.java b/Server/src/main/java/core/game/world/update/flag/player/AppearanceFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/player/AppearanceFlag.java
rename to Server/src/main/java/core/game/world/update/flag/player/AppearanceFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/player/ChatFlag.java b/Server/src/main/java/core/game/world/update/flag/player/ChatFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/player/ChatFlag.java
rename to Server/src/main/java/core/game/world/update/flag/player/ChatFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/player/FaceEntityFlag.java b/Server/src/main/java/core/game/world/update/flag/player/FaceEntityFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/player/FaceEntityFlag.java
rename to Server/src/main/java/core/game/world/update/flag/player/FaceEntityFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/player/FaceLocationFlag.java b/Server/src/main/java/core/game/world/update/flag/player/FaceLocationFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/player/FaceLocationFlag.java
rename to Server/src/main/java/core/game/world/update/flag/player/FaceLocationFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/player/ForceChatFlag.java b/Server/src/main/java/core/game/world/update/flag/player/ForceChatFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/player/ForceChatFlag.java
rename to Server/src/main/java/core/game/world/update/flag/player/ForceChatFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/player/ForceMovementFlag.java b/Server/src/main/java/core/game/world/update/flag/player/ForceMovementFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/player/ForceMovementFlag.java
rename to Server/src/main/java/core/game/world/update/flag/player/ForceMovementFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/player/GraphicFlag.java b/Server/src/main/java/core/game/world/update/flag/player/GraphicFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/player/GraphicFlag.java
rename to Server/src/main/java/core/game/world/update/flag/player/GraphicFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/player/HitUpdateFlag.java b/Server/src/main/java/core/game/world/update/flag/player/HitUpdateFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/player/HitUpdateFlag.java
rename to Server/src/main/java/core/game/world/update/flag/player/HitUpdateFlag.java
diff --git a/Server/src/main/java/Server/core/game/world/update/flag/player/HitUpdateFlag1.java b/Server/src/main/java/core/game/world/update/flag/player/HitUpdateFlag1.java
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/flag/player/HitUpdateFlag1.java
rename to Server/src/main/java/core/game/world/update/flag/player/HitUpdateFlag1.java
diff --git a/Server/src/main/java/Server/core/gui/ConsoleFrame.java b/Server/src/main/java/core/gui/ConsoleFrame.java
similarity index 100%
rename from Server/src/main/java/Server/core/gui/ConsoleFrame.java
rename to Server/src/main/java/core/gui/ConsoleFrame.java
diff --git a/Server/src/main/java/Server/core/gui/ConsoleTab.java b/Server/src/main/java/core/gui/ConsoleTab.java
similarity index 100%
rename from Server/src/main/java/Server/core/gui/ConsoleTab.java
rename to Server/src/main/java/core/gui/ConsoleTab.java
diff --git a/Server/src/main/java/Server/core/gui/component/ConsoleLogger.java b/Server/src/main/java/core/gui/component/ConsoleLogger.java
similarity index 100%
rename from Server/src/main/java/Server/core/gui/component/ConsoleLogger.java
rename to Server/src/main/java/core/gui/component/ConsoleLogger.java
diff --git a/Server/src/main/java/Server/core/gui/component/PlayerViewer.java b/Server/src/main/java/core/gui/component/PlayerViewer.java
similarity index 100%
rename from Server/src/main/java/Server/core/gui/component/PlayerViewer.java
rename to Server/src/main/java/core/gui/component/PlayerViewer.java
diff --git a/Server/src/main/java/Server/core/gui/tab/GrandExchangeTab.java b/Server/src/main/java/core/gui/tab/GrandExchangeTab.java
similarity index 100%
rename from Server/src/main/java/Server/core/gui/tab/GrandExchangeTab.java
rename to Server/src/main/java/core/gui/tab/GrandExchangeTab.java
diff --git a/Server/src/main/java/Server/core/gui/tab/PlayerTab.java b/Server/src/main/java/core/gui/tab/PlayerTab.java
similarity index 100%
rename from Server/src/main/java/Server/core/gui/tab/PlayerTab.java
rename to Server/src/main/java/core/gui/tab/PlayerTab.java
diff --git a/Server/src/main/java/Server/core/gui/tab/StatisticsTab.java b/Server/src/main/java/core/gui/tab/StatisticsTab.java
similarity index 100%
rename from Server/src/main/java/Server/core/gui/tab/StatisticsTab.java
rename to Server/src/main/java/core/gui/tab/StatisticsTab.java
diff --git a/Server/src/main/java/Server/core/gui/tab/UtilityTab.java b/Server/src/main/java/core/gui/tab/UtilityTab.java
similarity index 100%
rename from Server/src/main/java/Server/core/gui/tab/UtilityTab.java
rename to Server/src/main/java/core/gui/tab/UtilityTab.java
diff --git a/Server/src/main/java/Server/core/net/Constants.java b/Server/src/main/java/core/net/Constants.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/Constants.java
rename to Server/src/main/java/core/net/Constants.java
diff --git a/Server/src/main/java/Server/core/net/EventProducer.java b/Server/src/main/java/core/net/EventProducer.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/EventProducer.java
rename to Server/src/main/java/core/net/EventProducer.java
diff --git a/Server/src/main/java/Server/core/net/IoEventHandler.java b/Server/src/main/java/core/net/IoEventHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/IoEventHandler.java
rename to Server/src/main/java/core/net/IoEventHandler.java
diff --git a/Server/src/main/java/Server/core/net/IoReadEvent.java b/Server/src/main/java/core/net/IoReadEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/IoReadEvent.java
rename to Server/src/main/java/core/net/IoReadEvent.java
diff --git a/Server/src/main/java/Server/core/net/IoSession.java b/Server/src/main/java/core/net/IoSession.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/IoSession.java
rename to Server/src/main/java/core/net/IoSession.java
diff --git a/Server/src/main/java/Server/core/net/IoWriteEvent.java b/Server/src/main/java/core/net/IoWriteEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/IoWriteEvent.java
rename to Server/src/main/java/core/net/IoWriteEvent.java
diff --git a/Server/src/main/java/Server/core/net/JS5Queue.java b/Server/src/main/java/core/net/JS5Queue.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/JS5Queue.java
rename to Server/src/main/java/core/net/JS5Queue.java
diff --git a/Server/src/main/java/Server/core/net/NioReactor.java b/Server/src/main/java/core/net/NioReactor.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/NioReactor.java
rename to Server/src/main/java/core/net/NioReactor.java
diff --git a/Server/src/main/java/Server/core/net/ServerSocketConnection.java b/Server/src/main/java/core/net/ServerSocketConnection.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/ServerSocketConnection.java
rename to Server/src/main/java/core/net/ServerSocketConnection.java
diff --git a/Server/src/main/java/Server/core/net/amsc/MSEventHandler.java b/Server/src/main/java/core/net/amsc/MSEventHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/amsc/MSEventHandler.java
rename to Server/src/main/java/core/net/amsc/MSEventHandler.java
diff --git a/Server/src/main/java/Server/core/net/amsc/MSPacketRepository.java b/Server/src/main/java/core/net/amsc/MSPacketRepository.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/amsc/MSPacketRepository.java
rename to Server/src/main/java/core/net/amsc/MSPacketRepository.java
diff --git a/Server/src/main/java/Server/core/net/amsc/ManagementServerState.java b/Server/src/main/java/core/net/amsc/ManagementServerState.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/amsc/ManagementServerState.java
rename to Server/src/main/java/core/net/amsc/ManagementServerState.java
diff --git a/Server/src/main/java/Server/core/net/amsc/WorldCommunicator.java b/Server/src/main/java/core/net/amsc/WorldCommunicator.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/amsc/WorldCommunicator.java
rename to Server/src/main/java/core/net/amsc/WorldCommunicator.java
diff --git a/Server/src/main/java/Server/core/net/amsc/WorldStatistics.java b/Server/src/main/java/core/net/amsc/WorldStatistics.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/amsc/WorldStatistics.java
rename to Server/src/main/java/core/net/amsc/WorldStatistics.java
diff --git a/Server/src/main/java/Server/core/net/event/GameReadEvent.java b/Server/src/main/java/core/net/event/GameReadEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/GameReadEvent.java
rename to Server/src/main/java/core/net/event/GameReadEvent.java
diff --git a/Server/src/main/java/Server/core/net/event/GameWriteEvent.java b/Server/src/main/java/core/net/event/GameWriteEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/GameWriteEvent.java
rename to Server/src/main/java/core/net/event/GameWriteEvent.java
diff --git a/Server/src/main/java/Server/core/net/event/HSReadEvent.java b/Server/src/main/java/core/net/event/HSReadEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/HSReadEvent.java
rename to Server/src/main/java/core/net/event/HSReadEvent.java
diff --git a/Server/src/main/java/Server/core/net/event/HSWriteEvent.java b/Server/src/main/java/core/net/event/HSWriteEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/HSWriteEvent.java
rename to Server/src/main/java/core/net/event/HSWriteEvent.java
diff --git a/Server/src/main/java/Server/core/net/event/JS5ReadEvent.java b/Server/src/main/java/core/net/event/JS5ReadEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/JS5ReadEvent.java
rename to Server/src/main/java/core/net/event/JS5ReadEvent.java
diff --git a/Server/src/main/java/Server/core/net/event/JS5WriteEvent.java b/Server/src/main/java/core/net/event/JS5WriteEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/JS5WriteEvent.java
rename to Server/src/main/java/core/net/event/JS5WriteEvent.java
diff --git a/Server/src/main/java/Server/core/net/event/LoginWriteEvent.java b/Server/src/main/java/core/net/event/LoginWriteEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/LoginWriteEvent.java
rename to Server/src/main/java/core/net/event/LoginWriteEvent.java
diff --git a/Server/src/main/java/Server/core/net/event/MSHSReadEvent.java b/Server/src/main/java/core/net/event/MSHSReadEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/MSHSReadEvent.java
rename to Server/src/main/java/core/net/event/MSHSReadEvent.java
diff --git a/Server/src/main/java/Server/core/net/event/MSHSWriteEvent.java b/Server/src/main/java/core/net/event/MSHSWriteEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/MSHSWriteEvent.java
rename to Server/src/main/java/core/net/event/MSHSWriteEvent.java
diff --git a/Server/src/main/java/Server/core/net/event/MSReadEvent.java b/Server/src/main/java/core/net/event/MSReadEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/MSReadEvent.java
rename to Server/src/main/java/core/net/event/MSReadEvent.java
diff --git a/Server/src/main/java/Server/core/net/event/MSWriteEvent.java b/Server/src/main/java/core/net/event/MSWriteEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/MSWriteEvent.java
rename to Server/src/main/java/core/net/event/MSWriteEvent.java
diff --git a/Server/src/main/java/Server/core/net/event/RegistryReadEvent.java b/Server/src/main/java/core/net/event/RegistryReadEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/RegistryReadEvent.java
rename to Server/src/main/java/core/net/event/RegistryReadEvent.java
diff --git a/Server/src/main/java/Server/core/net/event/RegistryWriteEvent.java b/Server/src/main/java/core/net/event/RegistryWriteEvent.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/RegistryWriteEvent.java
rename to Server/src/main/java/core/net/event/RegistryWriteEvent.java
diff --git a/Server/src/main/java/Server/core/net/lobby/WorldDefinition.java b/Server/src/main/java/core/net/lobby/WorldDefinition.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/lobby/WorldDefinition.java
rename to Server/src/main/java/core/net/lobby/WorldDefinition.java
diff --git a/Server/src/main/java/Server/core/net/lobby/WorldList.java b/Server/src/main/java/core/net/lobby/WorldList.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/lobby/WorldList.java
rename to Server/src/main/java/core/net/lobby/WorldList.java
diff --git a/Server/src/main/java/Server/core/net/packet/Context.java b/Server/src/main/java/core/net/packet/Context.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/Context.java
rename to Server/src/main/java/core/net/packet/Context.java
diff --git a/Server/src/main/java/Server/core/net/packet/IncomingPacket.java b/Server/src/main/java/core/net/packet/IncomingPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/IncomingPacket.java
rename to Server/src/main/java/core/net/packet/IncomingPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/IoBuffer.java b/Server/src/main/java/core/net/packet/IoBuffer.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/IoBuffer.java
rename to Server/src/main/java/core/net/packet/IoBuffer.java
diff --git a/Server/src/main/java/Server/core/net/packet/OutgoingPacket.java b/Server/src/main/java/core/net/packet/OutgoingPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/OutgoingPacket.java
rename to Server/src/main/java/core/net/packet/OutgoingPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/PacketHeader.java b/Server/src/main/java/core/net/packet/PacketHeader.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/PacketHeader.java
rename to Server/src/main/java/core/net/packet/PacketHeader.java
diff --git a/Server/src/main/java/Server/core/net/packet/PacketRepository.java b/Server/src/main/java/core/net/packet/PacketRepository.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/PacketRepository.java
rename to Server/src/main/java/core/net/packet/PacketRepository.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/AccessMaskContext.java b/Server/src/main/java/core/net/packet/context/AccessMaskContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/AccessMaskContext.java
rename to Server/src/main/java/core/net/packet/context/AccessMaskContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/AnimateInterfaceContext.java b/Server/src/main/java/core/net/packet/context/AnimateInterfaceContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/AnimateInterfaceContext.java
rename to Server/src/main/java/core/net/packet/context/AnimateInterfaceContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/AnimateObjectContext.java b/Server/src/main/java/core/net/packet/context/AnimateObjectContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/AnimateObjectContext.java
rename to Server/src/main/java/core/net/packet/context/AnimateObjectContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/AreaPositionContext.java b/Server/src/main/java/core/net/packet/context/AreaPositionContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/AreaPositionContext.java
rename to Server/src/main/java/core/net/packet/context/AreaPositionContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/BuildItemContext.java b/Server/src/main/java/core/net/packet/context/BuildItemContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/BuildItemContext.java
rename to Server/src/main/java/core/net/packet/context/BuildItemContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/BuildObjectContext.java b/Server/src/main/java/core/net/packet/context/BuildObjectContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/BuildObjectContext.java
rename to Server/src/main/java/core/net/packet/context/BuildObjectContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/CSConfigContext.java b/Server/src/main/java/core/net/packet/context/CSConfigContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/CSConfigContext.java
rename to Server/src/main/java/core/net/packet/context/CSConfigContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/CameraContext.java b/Server/src/main/java/core/net/packet/context/CameraContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/CameraContext.java
rename to Server/src/main/java/core/net/packet/context/CameraContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/ChildPositionContext.java b/Server/src/main/java/core/net/packet/context/ChildPositionContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/ChildPositionContext.java
rename to Server/src/main/java/core/net/packet/context/ChildPositionContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/ClanContext.java b/Server/src/main/java/core/net/packet/context/ClanContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/ClanContext.java
rename to Server/src/main/java/core/net/packet/context/ClanContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/ClearChunkContext.java b/Server/src/main/java/core/net/packet/context/ClearChunkContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/ClearChunkContext.java
rename to Server/src/main/java/core/net/packet/context/ClearChunkContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/ConfigContext.java b/Server/src/main/java/core/net/packet/context/ConfigContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/ConfigContext.java
rename to Server/src/main/java/core/net/packet/context/ConfigContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/ContactContext.java b/Server/src/main/java/core/net/packet/context/ContactContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/ContactContext.java
rename to Server/src/main/java/core/net/packet/context/ContactContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/ContainerContext.java b/Server/src/main/java/core/net/packet/context/ContainerContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/ContainerContext.java
rename to Server/src/main/java/core/net/packet/context/ContainerContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/DefaultContext.java b/Server/src/main/java/core/net/packet/context/DefaultContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/DefaultContext.java
rename to Server/src/main/java/core/net/packet/context/DefaultContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/DisplayModelContext.java b/Server/src/main/java/core/net/packet/context/DisplayModelContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/DisplayModelContext.java
rename to Server/src/main/java/core/net/packet/context/DisplayModelContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/DynamicSceneContext.java b/Server/src/main/java/core/net/packet/context/DynamicSceneContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/DynamicSceneContext.java
rename to Server/src/main/java/core/net/packet/context/DynamicSceneContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/GameMessageContext.java b/Server/src/main/java/core/net/packet/context/GameMessageContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/GameMessageContext.java
rename to Server/src/main/java/core/net/packet/context/GameMessageContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/GrandExchangeContext.java b/Server/src/main/java/core/net/packet/context/GrandExchangeContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/GrandExchangeContext.java
rename to Server/src/main/java/core/net/packet/context/GrandExchangeContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/HintIconContext.java b/Server/src/main/java/core/net/packet/context/HintIconContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/HintIconContext.java
rename to Server/src/main/java/core/net/packet/context/HintIconContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/IntegerContext.java b/Server/src/main/java/core/net/packet/context/IntegerContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/IntegerContext.java
rename to Server/src/main/java/core/net/packet/context/IntegerContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/InteractionOptionContext.java b/Server/src/main/java/core/net/packet/context/InteractionOptionContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/InteractionOptionContext.java
rename to Server/src/main/java/core/net/packet/context/InteractionOptionContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/InterfaceConfigContext.java b/Server/src/main/java/core/net/packet/context/InterfaceConfigContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/InterfaceConfigContext.java
rename to Server/src/main/java/core/net/packet/context/InterfaceConfigContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/InterfaceContext.java b/Server/src/main/java/core/net/packet/context/InterfaceContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/InterfaceContext.java
rename to Server/src/main/java/core/net/packet/context/InterfaceContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/LocationContext.java b/Server/src/main/java/core/net/packet/context/LocationContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/LocationContext.java
rename to Server/src/main/java/core/net/packet/context/LocationContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/MessageContext.java b/Server/src/main/java/core/net/packet/context/MessageContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/MessageContext.java
rename to Server/src/main/java/core/net/packet/context/MessageContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/MinimapStateContext.java b/Server/src/main/java/core/net/packet/context/MinimapStateContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/MinimapStateContext.java
rename to Server/src/main/java/core/net/packet/context/MinimapStateContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/MusicContext.java b/Server/src/main/java/core/net/packet/context/MusicContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/MusicContext.java
rename to Server/src/main/java/core/net/packet/context/MusicContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/PlayerContext.java b/Server/src/main/java/core/net/packet/context/PlayerContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/PlayerContext.java
rename to Server/src/main/java/core/net/packet/context/PlayerContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/PositionedGraphicContext.java b/Server/src/main/java/core/net/packet/context/PositionedGraphicContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/PositionedGraphicContext.java
rename to Server/src/main/java/core/net/packet/context/PositionedGraphicContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/RunScriptContext.java b/Server/src/main/java/core/net/packet/context/RunScriptContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/RunScriptContext.java
rename to Server/src/main/java/core/net/packet/context/RunScriptContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/SceneGraphContext.java b/Server/src/main/java/core/net/packet/context/SceneGraphContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/SceneGraphContext.java
rename to Server/src/main/java/core/net/packet/context/SceneGraphContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/SkillContext.java b/Server/src/main/java/core/net/packet/context/SkillContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/SkillContext.java
rename to Server/src/main/java/core/net/packet/context/SkillContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/StringContext.java b/Server/src/main/java/core/net/packet/context/StringContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/StringContext.java
rename to Server/src/main/java/core/net/packet/context/StringContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/SystemUpdateContext.java b/Server/src/main/java/core/net/packet/context/SystemUpdateContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/SystemUpdateContext.java
rename to Server/src/main/java/core/net/packet/context/SystemUpdateContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/WalkOptionContext.java b/Server/src/main/java/core/net/packet/context/WalkOptionContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/WalkOptionContext.java
rename to Server/src/main/java/core/net/packet/context/WalkOptionContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/context/WindowsPaneContext.java b/Server/src/main/java/core/net/packet/context/WindowsPaneContext.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/context/WindowsPaneContext.java
rename to Server/src/main/java/core/net/packet/context/WindowsPaneContext.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/ActionButtonPacket.java b/Server/src/main/java/core/net/packet/in/ActionButtonPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/ActionButtonPacket.java
rename to Server/src/main/java/core/net/packet/in/ActionButtonPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/CameraMovementPacket.java b/Server/src/main/java/core/net/packet/in/CameraMovementPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/CameraMovementPacket.java
rename to Server/src/main/java/core/net/packet/in/CameraMovementPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/ChatPacket.java b/Server/src/main/java/core/net/packet/in/ChatPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/ChatPacket.java
rename to Server/src/main/java/core/net/packet/in/ChatPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/ChatSettingsPacket.java b/Server/src/main/java/core/net/packet/in/ChatSettingsPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/ChatSettingsPacket.java
rename to Server/src/main/java/core/net/packet/in/ChatSettingsPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/ClanPacketHandler.java b/Server/src/main/java/core/net/packet/in/ClanPacketHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/ClanPacketHandler.java
rename to Server/src/main/java/core/net/packet/in/ClanPacketHandler.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/ClientFocusPacket.java b/Server/src/main/java/core/net/packet/in/ClientFocusPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/ClientFocusPacket.java
rename to Server/src/main/java/core/net/packet/in/ClientFocusPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/CommandPacket.java b/Server/src/main/java/core/net/packet/in/CommandPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/CommandPacket.java
rename to Server/src/main/java/core/net/packet/in/CommandPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/CommunicationPacket.java b/Server/src/main/java/core/net/packet/in/CommunicationPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/CommunicationPacket.java
rename to Server/src/main/java/core/net/packet/in/CommunicationPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/DisplayUpdatePacket.java b/Server/src/main/java/core/net/packet/in/DisplayUpdatePacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/DisplayUpdatePacket.java
rename to Server/src/main/java/core/net/packet/in/DisplayUpdatePacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/DummyPacket.java b/Server/src/main/java/core/net/packet/in/DummyPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/DummyPacket.java
rename to Server/src/main/java/core/net/packet/in/DummyPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/ExaminePacket.java b/Server/src/main/java/core/net/packet/in/ExaminePacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/ExaminePacket.java
rename to Server/src/main/java/core/net/packet/in/ExaminePacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/GrandExchangePacket.java b/Server/src/main/java/core/net/packet/in/GrandExchangePacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/GrandExchangePacket.java
rename to Server/src/main/java/core/net/packet/in/GrandExchangePacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/IdlePacketHandler.java b/Server/src/main/java/core/net/packet/in/IdlePacketHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/IdlePacketHandler.java
rename to Server/src/main/java/core/net/packet/in/IdlePacketHandler.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/InteractionPacket.java b/Server/src/main/java/core/net/packet/in/InteractionPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/InteractionPacket.java
rename to Server/src/main/java/core/net/packet/in/InteractionPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/InterfaceUseOnPacket.java b/Server/src/main/java/core/net/packet/in/InterfaceUseOnPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/InterfaceUseOnPacket.java
rename to Server/src/main/java/core/net/packet/in/InterfaceUseOnPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/ItemActionPacket.java b/Server/src/main/java/core/net/packet/in/ItemActionPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/ItemActionPacket.java
rename to Server/src/main/java/core/net/packet/in/ItemActionPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/MapClosedPacket.java b/Server/src/main/java/core/net/packet/in/MapClosedPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/MapClosedPacket.java
rename to Server/src/main/java/core/net/packet/in/MapClosedPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/MouseClickPacket.java b/Server/src/main/java/core/net/packet/in/MouseClickPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/MouseClickPacket.java
rename to Server/src/main/java/core/net/packet/in/MouseClickPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/MusicPacketHandler.java b/Server/src/main/java/core/net/packet/in/MusicPacketHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/MusicPacketHandler.java
rename to Server/src/main/java/core/net/packet/in/MusicPacketHandler.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/PingPacketHandler.java b/Server/src/main/java/core/net/packet/in/PingPacketHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/PingPacketHandler.java
rename to Server/src/main/java/core/net/packet/in/PingPacketHandler.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/RegionChangePacket.java b/Server/src/main/java/core/net/packet/in/RegionChangePacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/RegionChangePacket.java
rename to Server/src/main/java/core/net/packet/in/RegionChangePacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/ReportAbusePacket.java b/Server/src/main/java/core/net/packet/in/ReportAbusePacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/ReportAbusePacket.java
rename to Server/src/main/java/core/net/packet/in/ReportAbusePacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/RunScriptPacketHandler.java b/Server/src/main/java/core/net/packet/in/RunScriptPacketHandler.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/RunScriptPacketHandler.java
rename to Server/src/main/java/core/net/packet/in/RunScriptPacketHandler.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/SlotSwitchPacket.java b/Server/src/main/java/core/net/packet/in/SlotSwitchPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/SlotSwitchPacket.java
rename to Server/src/main/java/core/net/packet/in/SlotSwitchPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/UpdateInterfaceCounter.java b/Server/src/main/java/core/net/packet/in/UpdateInterfaceCounter.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/UpdateInterfaceCounter.java
rename to Server/src/main/java/core/net/packet/in/UpdateInterfaceCounter.java
diff --git a/Server/src/main/java/Server/core/net/packet/in/WalkPacket.java b/Server/src/main/java/core/net/packet/in/WalkPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/WalkPacket.java
rename to Server/src/main/java/core/net/packet/in/WalkPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/AccessMask.java b/Server/src/main/java/core/net/packet/out/AccessMask.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/AccessMask.java
rename to Server/src/main/java/core/net/packet/out/AccessMask.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/AnimateInterface.java b/Server/src/main/java/core/net/packet/out/AnimateInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/AnimateInterface.java
rename to Server/src/main/java/core/net/packet/out/AnimateInterface.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/AnimateObjectPacket.java b/Server/src/main/java/core/net/packet/out/AnimateObjectPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/AnimateObjectPacket.java
rename to Server/src/main/java/core/net/packet/out/AnimateObjectPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/AudioPacket.java b/Server/src/main/java/core/net/packet/out/AudioPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/AudioPacket.java
rename to Server/src/main/java/core/net/packet/out/AudioPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/BuildDynamicScene.java b/Server/src/main/java/core/net/packet/out/BuildDynamicScene.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/BuildDynamicScene.java
rename to Server/src/main/java/core/net/packet/out/BuildDynamicScene.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/CSConfigPacket.java b/Server/src/main/java/core/net/packet/out/CSConfigPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/CSConfigPacket.java
rename to Server/src/main/java/core/net/packet/out/CSConfigPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/CameraViewPacket.java b/Server/src/main/java/core/net/packet/out/CameraViewPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/CameraViewPacket.java
rename to Server/src/main/java/core/net/packet/out/CameraViewPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/ClearGroundItem.java b/Server/src/main/java/core/net/packet/out/ClearGroundItem.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/ClearGroundItem.java
rename to Server/src/main/java/core/net/packet/out/ClearGroundItem.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/ClearMinimapFlag.java b/Server/src/main/java/core/net/packet/out/ClearMinimapFlag.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/ClearMinimapFlag.java
rename to Server/src/main/java/core/net/packet/out/ClearMinimapFlag.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/ClearObject.java b/Server/src/main/java/core/net/packet/out/ClearObject.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/ClearObject.java
rename to Server/src/main/java/core/net/packet/out/ClearObject.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/ClearRegionChunk.java b/Server/src/main/java/core/net/packet/out/ClearRegionChunk.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/ClearRegionChunk.java
rename to Server/src/main/java/core/net/packet/out/ClearRegionChunk.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/CloseInterface.java b/Server/src/main/java/core/net/packet/out/CloseInterface.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/CloseInterface.java
rename to Server/src/main/java/core/net/packet/out/CloseInterface.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/CommunicationMessage.java b/Server/src/main/java/core/net/packet/out/CommunicationMessage.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/CommunicationMessage.java
rename to Server/src/main/java/core/net/packet/out/CommunicationMessage.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/Config.java b/Server/src/main/java/core/net/packet/out/Config.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/Config.java
rename to Server/src/main/java/core/net/packet/out/Config.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/ConstructGroundItem.java b/Server/src/main/java/core/net/packet/out/ConstructGroundItem.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/ConstructGroundItem.java
rename to Server/src/main/java/core/net/packet/out/ConstructGroundItem.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/ConstructObject.java b/Server/src/main/java/core/net/packet/out/ConstructObject.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/ConstructObject.java
rename to Server/src/main/java/core/net/packet/out/ConstructObject.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/ContactPackets.java b/Server/src/main/java/core/net/packet/out/ContactPackets.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/ContactPackets.java
rename to Server/src/main/java/core/net/packet/out/ContactPackets.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/ContainerPacket.java b/Server/src/main/java/core/net/packet/out/ContainerPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/ContainerPacket.java
rename to Server/src/main/java/core/net/packet/out/ContainerPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/DisplayModel.java b/Server/src/main/java/core/net/packet/out/DisplayModel.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/DisplayModel.java
rename to Server/src/main/java/core/net/packet/out/DisplayModel.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/GameMessage.java b/Server/src/main/java/core/net/packet/out/GameMessage.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/GameMessage.java
rename to Server/src/main/java/core/net/packet/out/GameMessage.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/GrandExchangePacket.java b/Server/src/main/java/core/net/packet/out/GrandExchangePacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/GrandExchangePacket.java
rename to Server/src/main/java/core/net/packet/out/GrandExchangePacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/HintIcon.java b/Server/src/main/java/core/net/packet/out/HintIcon.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/HintIcon.java
rename to Server/src/main/java/core/net/packet/out/HintIcon.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/InstancedLocationUpdate.java b/Server/src/main/java/core/net/packet/out/InstancedLocationUpdate.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/InstancedLocationUpdate.java
rename to Server/src/main/java/core/net/packet/out/InstancedLocationUpdate.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/InteractionOption.java b/Server/src/main/java/core/net/packet/out/InteractionOption.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/InteractionOption.java
rename to Server/src/main/java/core/net/packet/out/InteractionOption.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/Interface.java b/Server/src/main/java/core/net/packet/out/Interface.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/Interface.java
rename to Server/src/main/java/core/net/packet/out/Interface.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/InterfaceConfig.java b/Server/src/main/java/core/net/packet/out/InterfaceConfig.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/InterfaceConfig.java
rename to Server/src/main/java/core/net/packet/out/InterfaceConfig.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/LoginPacket.java b/Server/src/main/java/core/net/packet/out/LoginPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/LoginPacket.java
rename to Server/src/main/java/core/net/packet/out/LoginPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/Logout.java b/Server/src/main/java/core/net/packet/out/Logout.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/Logout.java
rename to Server/src/main/java/core/net/packet/out/Logout.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/MinimapState.java b/Server/src/main/java/core/net/packet/out/MinimapState.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/MinimapState.java
rename to Server/src/main/java/core/net/packet/out/MinimapState.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/MusicPacket.java b/Server/src/main/java/core/net/packet/out/MusicPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/MusicPacket.java
rename to Server/src/main/java/core/net/packet/out/MusicPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/PingPacket.java b/Server/src/main/java/core/net/packet/out/PingPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/PingPacket.java
rename to Server/src/main/java/core/net/packet/out/PingPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/PositionedGraphic.java b/Server/src/main/java/core/net/packet/out/PositionedGraphic.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/PositionedGraphic.java
rename to Server/src/main/java/core/net/packet/out/PositionedGraphic.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/RepositionChild.java b/Server/src/main/java/core/net/packet/out/RepositionChild.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/RepositionChild.java
rename to Server/src/main/java/core/net/packet/out/RepositionChild.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/RunEnergy.java b/Server/src/main/java/core/net/packet/out/RunEnergy.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/RunEnergy.java
rename to Server/src/main/java/core/net/packet/out/RunEnergy.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/RunScriptPacket.java b/Server/src/main/java/core/net/packet/out/RunScriptPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/RunScriptPacket.java
rename to Server/src/main/java/core/net/packet/out/RunScriptPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/SetWalkOption.java b/Server/src/main/java/core/net/packet/out/SetWalkOption.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/SetWalkOption.java
rename to Server/src/main/java/core/net/packet/out/SetWalkOption.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/SkillLevel.java b/Server/src/main/java/core/net/packet/out/SkillLevel.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/SkillLevel.java
rename to Server/src/main/java/core/net/packet/out/SkillLevel.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/StringPacket.java b/Server/src/main/java/core/net/packet/out/StringPacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/StringPacket.java
rename to Server/src/main/java/core/net/packet/out/StringPacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/SystemUpdatePacket.java b/Server/src/main/java/core/net/packet/out/SystemUpdatePacket.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/SystemUpdatePacket.java
rename to Server/src/main/java/core/net/packet/out/SystemUpdatePacket.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/UpdateAreaPosition.java b/Server/src/main/java/core/net/packet/out/UpdateAreaPosition.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/UpdateAreaPosition.java
rename to Server/src/main/java/core/net/packet/out/UpdateAreaPosition.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/UpdateClanChat.java b/Server/src/main/java/core/net/packet/out/UpdateClanChat.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/UpdateClanChat.java
rename to Server/src/main/java/core/net/packet/out/UpdateClanChat.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/UpdateGroundItemAmount.java b/Server/src/main/java/core/net/packet/out/UpdateGroundItemAmount.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/UpdateGroundItemAmount.java
rename to Server/src/main/java/core/net/packet/out/UpdateGroundItemAmount.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/UpdateRandomFile.java b/Server/src/main/java/core/net/packet/out/UpdateRandomFile.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/UpdateRandomFile.java
rename to Server/src/main/java/core/net/packet/out/UpdateRandomFile.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/UpdateSceneGraph.java b/Server/src/main/java/core/net/packet/out/UpdateSceneGraph.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/UpdateSceneGraph.java
rename to Server/src/main/java/core/net/packet/out/UpdateSceneGraph.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/WeightUpdate.java b/Server/src/main/java/core/net/packet/out/WeightUpdate.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/WeightUpdate.java
rename to Server/src/main/java/core/net/packet/out/WeightUpdate.java
diff --git a/Server/src/main/java/Server/core/net/packet/out/WindowsPane.java b/Server/src/main/java/core/net/packet/out/WindowsPane.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/out/WindowsPane.java
rename to Server/src/main/java/core/net/packet/out/WindowsPane.java
diff --git a/Server/src/main/java/Server/core/net/producer/GameEventProducer.java b/Server/src/main/java/core/net/producer/GameEventProducer.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/producer/GameEventProducer.java
rename to Server/src/main/java/core/net/producer/GameEventProducer.java
diff --git a/Server/src/main/java/Server/core/net/producer/HSEventProducer.java b/Server/src/main/java/core/net/producer/HSEventProducer.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/producer/HSEventProducer.java
rename to Server/src/main/java/core/net/producer/HSEventProducer.java
diff --git a/Server/src/main/java/Server/core/net/producer/JS5EventProducer.java b/Server/src/main/java/core/net/producer/JS5EventProducer.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/producer/JS5EventProducer.java
rename to Server/src/main/java/core/net/producer/JS5EventProducer.java
diff --git a/Server/src/main/java/Server/core/net/producer/LoginEventProducer.java b/Server/src/main/java/core/net/producer/LoginEventProducer.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/producer/LoginEventProducer.java
rename to Server/src/main/java/core/net/producer/LoginEventProducer.java
diff --git a/Server/src/main/java/Server/core/net/producer/MSEventProducer.java b/Server/src/main/java/core/net/producer/MSEventProducer.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/producer/MSEventProducer.java
rename to Server/src/main/java/core/net/producer/MSEventProducer.java
diff --git a/Server/src/main/java/Server/core/net/producer/MSHSEventProducer.java b/Server/src/main/java/core/net/producer/MSHSEventProducer.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/producer/MSHSEventProducer.java
rename to Server/src/main/java/core/net/producer/MSHSEventProducer.java
diff --git a/Server/src/main/java/Server/core/net/producer/RegistryEventProducer.java b/Server/src/main/java/core/net/producer/RegistryEventProducer.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/producer/RegistryEventProducer.java
rename to Server/src/main/java/core/net/producer/RegistryEventProducer.java
diff --git a/Server/src/main/java/Server/core/net/registry/AccountRegister.java b/Server/src/main/java/core/net/registry/AccountRegister.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/registry/AccountRegister.java
rename to Server/src/main/java/core/net/registry/AccountRegister.java
diff --git a/Server/src/main/java/Server/core/net/registry/RegistryDetails.java b/Server/src/main/java/core/net/registry/RegistryDetails.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/registry/RegistryDetails.java
rename to Server/src/main/java/core/net/registry/RegistryDetails.java
diff --git a/Server/src/main/java/Server/core/net/registry/RegistryResponse.java b/Server/src/main/java/core/net/registry/RegistryResponse.java
similarity index 100%
rename from Server/src/main/java/Server/core/net/registry/RegistryResponse.java
rename to Server/src/main/java/core/net/registry/RegistryResponse.java
diff --git a/Server/src/main/java/Server/core/plugin/CorePluginTypes/ManagerPlugin.java b/Server/src/main/java/core/plugin/CorePluginTypes/ManagerPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/plugin/CorePluginTypes/ManagerPlugin.java
rename to Server/src/main/java/core/plugin/CorePluginTypes/ManagerPlugin.java
diff --git a/Server/src/main/java/Server/core/plugin/CorePluginTypes/Managers.java b/Server/src/main/java/core/plugin/CorePluginTypes/Managers.java
similarity index 100%
rename from Server/src/main/java/Server/core/plugin/CorePluginTypes/Managers.java
rename to Server/src/main/java/core/plugin/CorePluginTypes/Managers.java
diff --git a/Server/src/main/java/Server/core/plugin/CorePluginTypes/StartupPlugin.java b/Server/src/main/java/core/plugin/CorePluginTypes/StartupPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/plugin/CorePluginTypes/StartupPlugin.java
rename to Server/src/main/java/core/plugin/CorePluginTypes/StartupPlugin.java
diff --git a/Server/src/main/java/Server/core/plugin/Initializable.java b/Server/src/main/java/core/plugin/Initializable.java
similarity index 100%
rename from Server/src/main/java/Server/core/plugin/Initializable.java
rename to Server/src/main/java/core/plugin/Initializable.java
diff --git a/Server/src/main/java/Server/core/plugin/Plugin.java b/Server/src/main/java/core/plugin/Plugin.java
similarity index 100%
rename from Server/src/main/java/Server/core/plugin/Plugin.java
rename to Server/src/main/java/core/plugin/Plugin.java
diff --git a/Server/src/main/java/Server/core/plugin/PluginManifest.java b/Server/src/main/java/core/plugin/PluginManifest.java
similarity index 100%
rename from Server/src/main/java/Server/core/plugin/PluginManifest.java
rename to Server/src/main/java/core/plugin/PluginManifest.java
diff --git a/Server/src/main/java/Server/core/plugin/PluginType.java b/Server/src/main/java/core/plugin/PluginType.java
similarity index 100%
rename from Server/src/main/java/Server/core/plugin/PluginType.java
rename to Server/src/main/java/core/plugin/PluginType.java
diff --git a/Server/src/main/java/Server/core/tools/PlayerLoader.java b/Server/src/main/java/core/tools/PlayerLoader.java
similarity index 100%
rename from Server/src/main/java/Server/core/tools/PlayerLoader.java
rename to Server/src/main/java/core/tools/PlayerLoader.java
diff --git a/Server/src/main/java/Server/core/tools/RSAKeyGen.java b/Server/src/main/java/core/tools/RSAKeyGen.java
similarity index 100%
rename from Server/src/main/java/Server/core/tools/RSAKeyGen.java
rename to Server/src/main/java/core/tools/RSAKeyGen.java
diff --git a/Server/src/main/java/Server/core/tools/RandomFunction.java b/Server/src/main/java/core/tools/RandomFunction.java
similarity index 100%
rename from Server/src/main/java/Server/core/tools/RandomFunction.java
rename to Server/src/main/java/core/tools/RandomFunction.java
diff --git a/Server/src/main/java/Server/core/tools/StringUtils.java b/Server/src/main/java/core/tools/StringUtils.java
similarity index 100%
rename from Server/src/main/java/Server/core/tools/StringUtils.java
rename to Server/src/main/java/core/tools/StringUtils.java
diff --git a/Server/src/main/java/Server/core/tools/TimeStamp.java b/Server/src/main/java/core/tools/TimeStamp.java
similarity index 100%
rename from Server/src/main/java/Server/core/tools/TimeStamp.java
rename to Server/src/main/java/core/tools/TimeStamp.java
diff --git a/Server/src/main/java/Server/core/tools/Vector3d.java b/Server/src/main/java/core/tools/Vector3d.java
similarity index 100%
rename from Server/src/main/java/Server/core/tools/Vector3d.java
rename to Server/src/main/java/core/tools/Vector3d.java
diff --git a/Server/src/main/java/Server/core/tools/mysql/Database.java b/Server/src/main/java/core/tools/mysql/Database.java
similarity index 100%
rename from Server/src/main/java/Server/core/tools/mysql/Database.java
rename to Server/src/main/java/core/tools/mysql/Database.java
diff --git a/Server/src/main/java/Server/core/tools/mysql/DatabaseManager.java b/Server/src/main/java/core/tools/mysql/DatabaseManager.java
similarity index 100%
rename from Server/src/main/java/Server/core/tools/mysql/DatabaseManager.java
rename to Server/src/main/java/core/tools/mysql/DatabaseManager.java
diff --git a/Server/src/main/java/Server/core/tools/mysql/Query.java b/Server/src/main/java/core/tools/mysql/Query.java
similarity index 100%
rename from Server/src/main/java/Server/core/tools/mysql/Query.java
rename to Server/src/main/java/core/tools/mysql/Query.java
diff --git a/Server/src/main/java/Server/core/tools/mysql/Results.java b/Server/src/main/java/core/tools/mysql/Results.java
similarity index 100%
rename from Server/src/main/java/Server/core/tools/mysql/Results.java
rename to Server/src/main/java/core/tools/mysql/Results.java
diff --git a/Server/src/main/java/Server/core/worker/MajorUpdateWorker.java b/Server/src/main/java/core/worker/MajorUpdateWorker.java
similarity index 100%
rename from Server/src/main/java/Server/core/worker/MajorUpdateWorker.java
rename to Server/src/main/java/core/worker/MajorUpdateWorker.java
diff --git a/Server/src/main/java/Server/plugin/ai/AIPBuilder.java b/Server/src/main/java/plugin/ai/AIPBuilder.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/AIPBuilder.java
rename to Server/src/main/java/plugin/ai/AIPBuilder.java
diff --git a/Server/src/main/java/Server/plugin/ai/AIPControlDialogue.java b/Server/src/main/java/plugin/ai/AIPControlDialogue.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/AIPControlDialogue.java
rename to Server/src/main/java/plugin/ai/AIPControlDialogue.java
diff --git a/Server/src/main/java/Server/plugin/ai/AIPlayer.java b/Server/src/main/java/plugin/ai/AIPlayer.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/AIPlayer.java
rename to Server/src/main/java/plugin/ai/AIPlayer.java
diff --git a/Server/src/main/java/Server/plugin/ai/ArtificialSession.java b/Server/src/main/java/plugin/ai/ArtificialSession.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/ArtificialSession.java
rename to Server/src/main/java/plugin/ai/ArtificialSession.java
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/Script.java b/Server/src/main/java/plugin/ai/general/scriptrepository/Script.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/Script.java
rename to Server/src/main/java/plugin/ai/general/scriptrepository/Script.java
diff --git a/Server/src/main/java/Server/plugin/ai/lumbridge/DeadIdler.java b/Server/src/main/java/plugin/ai/lumbridge/DeadIdler.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/lumbridge/DeadIdler.java
rename to Server/src/main/java/plugin/ai/lumbridge/DeadIdler.java
diff --git a/Server/src/main/java/Server/plugin/ai/lumbridge/LumbridgeBotHandler.java b/Server/src/main/java/plugin/ai/lumbridge/LumbridgeBotHandler.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/lumbridge/LumbridgeBotHandler.java
rename to Server/src/main/java/plugin/ai/lumbridge/LumbridgeBotHandler.java
diff --git a/Server/src/main/java/Server/plugin/ai/pvmbots/DragonKiller.java b/Server/src/main/java/plugin/ai/pvmbots/DragonKiller.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/pvmbots/DragonKiller.java
rename to Server/src/main/java/plugin/ai/pvmbots/DragonKiller.java
diff --git a/Server/src/main/java/Server/plugin/ai/pvmbots/GiantMoleBot.java b/Server/src/main/java/plugin/ai/pvmbots/GiantMoleBot.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/pvmbots/GiantMoleBot.java
rename to Server/src/main/java/plugin/ai/pvmbots/GiantMoleBot.java
diff --git a/Server/src/main/java/Server/plugin/ai/pvmbots/LowestBot.java b/Server/src/main/java/plugin/ai/pvmbots/LowestBot.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/pvmbots/LowestBot.java
rename to Server/src/main/java/plugin/ai/pvmbots/LowestBot.java
diff --git a/Server/src/main/java/Server/plugin/ai/pvmbots/NoobBot.java b/Server/src/main/java/plugin/ai/pvmbots/NoobBot.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/pvmbots/NoobBot.java
rename to Server/src/main/java/plugin/ai/pvmbots/NoobBot.java
diff --git a/Server/src/main/java/Server/plugin/ai/pvmbots/PvMBots.java b/Server/src/main/java/plugin/ai/pvmbots/PvMBots.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/pvmbots/PvMBots.java
rename to Server/src/main/java/plugin/ai/pvmbots/PvMBots.java
diff --git a/Server/src/main/java/Server/plugin/ai/pvp/PVPAIPActions.java b/Server/src/main/java/plugin/ai/pvp/PVPAIPActions.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/pvp/PVPAIPActions.java
rename to Server/src/main/java/plugin/ai/pvp/PVPAIPActions.java
diff --git a/Server/src/main/java/Server/plugin/ai/pvp/PVPAIPBuilderUtils.java b/Server/src/main/java/plugin/ai/pvp/PVPAIPBuilderUtils.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/pvp/PVPAIPBuilderUtils.java
rename to Server/src/main/java/plugin/ai/pvp/PVPAIPBuilderUtils.java
diff --git a/Server/src/main/java/Server/plugin/ai/resource/ResourceAIPActions.java b/Server/src/main/java/plugin/ai/resource/ResourceAIPActions.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/resource/ResourceAIPActions.java
rename to Server/src/main/java/plugin/ai/resource/ResourceAIPActions.java
diff --git a/Server/src/main/java/Server/plugin/ai/resource/ResourceAIPManager.java b/Server/src/main/java/plugin/ai/resource/ResourceAIPManager.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/resource/ResourceAIPManager.java
rename to Server/src/main/java/plugin/ai/resource/ResourceAIPManager.java
diff --git a/Server/src/main/java/Server/plugin/ai/resource/task/ResourceTask.java b/Server/src/main/java/plugin/ai/resource/task/ResourceTask.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/resource/task/ResourceTask.java
rename to Server/src/main/java/plugin/ai/resource/task/ResourceTask.java
diff --git a/Server/src/main/java/Server/plugin/ai/resource/task/ResourceTasks.java b/Server/src/main/java/plugin/ai/resource/task/ResourceTasks.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/resource/task/ResourceTasks.java
rename to Server/src/main/java/plugin/ai/resource/task/ResourceTasks.java
diff --git a/Server/src/main/java/Server/plugin/ai/skillingbot/SkillingBot.java b/Server/src/main/java/plugin/ai/skillingbot/SkillingBot.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/skillingbot/SkillingBot.java
rename to Server/src/main/java/plugin/ai/skillingbot/SkillingBot.java
diff --git a/Server/src/main/java/Server/plugin/ai/skillingbot/SkillingBotsBuilder.java b/Server/src/main/java/plugin/ai/skillingbot/SkillingBotsBuilder.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/skillingbot/SkillingBotsBuilder.java
rename to Server/src/main/java/plugin/ai/skillingbot/SkillingBotsBuilder.java
diff --git a/Server/src/main/java/Server/plugin/ai/system/GlobalAIManager.java b/Server/src/main/java/plugin/ai/system/GlobalAIManager.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/system/GlobalAIManager.java
rename to Server/src/main/java/plugin/ai/system/GlobalAIManager.java
diff --git a/Server/src/main/java/Server/plugin/ai/system/android/CombatDroid.java b/Server/src/main/java/plugin/ai/system/android/CombatDroid.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/system/android/CombatDroid.java
rename to Server/src/main/java/plugin/ai/system/android/CombatDroid.java
diff --git a/Server/src/main/java/Server/plugin/ai/system/android/GatheringDroid.java b/Server/src/main/java/plugin/ai/system/android/GatheringDroid.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/system/android/GatheringDroid.java
rename to Server/src/main/java/plugin/ai/system/android/GatheringDroid.java
diff --git a/Server/src/main/java/Server/plugin/ai/system/predicate/Predicate.java b/Server/src/main/java/plugin/ai/system/predicate/Predicate.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/system/predicate/Predicate.java
rename to Server/src/main/java/plugin/ai/system/predicate/Predicate.java
diff --git a/Server/src/main/java/Server/plugin/ai/system/predicate/PredicateType.java b/Server/src/main/java/plugin/ai/system/predicate/PredicateType.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/system/predicate/PredicateType.java
rename to Server/src/main/java/plugin/ai/system/predicate/PredicateType.java
diff --git a/Server/src/main/java/Server/plugin/ai/system/predicate/impl/AppearancePredicate.java b/Server/src/main/java/plugin/ai/system/predicate/impl/AppearancePredicate.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/system/predicate/impl/AppearancePredicate.java
rename to Server/src/main/java/plugin/ai/system/predicate/impl/AppearancePredicate.java
diff --git a/Server/src/main/java/Server/plugin/ai/wilderness/PvPBotsBuilder.java b/Server/src/main/java/plugin/ai/wilderness/PvPBotsBuilder.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/wilderness/PvPBotsBuilder.java
rename to Server/src/main/java/plugin/ai/wilderness/PvPBotsBuilder.java
diff --git a/Server/src/main/java/Server/plugin/ai/wilderness/WildernessBot.java b/Server/src/main/java/plugin/ai/wilderness/WildernessBot.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/wilderness/WildernessBot.java
rename to Server/src/main/java/plugin/ai/wilderness/WildernessBot.java
diff --git a/Server/src/main/java/Server/plugin/drops/DropPlugin.java b/Server/src/main/java/plugin/drops/DropPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/drops/DropPlugin.java
rename to Server/src/main/java/plugin/drops/DropPlugin.java
diff --git a/Server/src/main/java/Server/plugin/drops/DropPlugins.java b/Server/src/main/java/plugin/drops/DropPlugins.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/drops/DropPlugins.java
rename to Server/src/main/java/plugin/drops/DropPlugins.java
diff --git a/Server/src/main/java/Server/plugin/drops/mystery_box/MysteryBoxDropper.java b/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxDropper.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/drops/mystery_box/MysteryBoxDropper.java
rename to Server/src/main/java/plugin/drops/mystery_box/MysteryBoxDropper.java
diff --git a/Server/src/main/java/Server/plugin/drops/mystery_box/MysteryBoxPlugin.java b/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxPlugin.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/drops/mystery_box/MysteryBoxPlugin.java
rename to Server/src/main/java/plugin/drops/mystery_box/MysteryBoxPlugin.java
diff --git a/Server/src/main/java/Server/plugin/package-info.java b/Server/src/main/java/plugin/package-info.java
similarity index 100%
rename from Server/src/main/java/Server/plugin/package-info.java
rename to Server/src/main/java/plugin/package-info.java
diff --git a/Server/src/main/java/Server/core/JSONUtils.kt b/Server/src/main/kotlin/core/JSONUtils.kt
similarity index 100%
rename from Server/src/main/java/Server/core/JSONUtils.kt
rename to Server/src/main/kotlin/core/JSONUtils.kt
diff --git a/Server/src/main/java/Server/core/Server.kt b/Server/src/main/kotlin/core/Server.kt
similarity index 100%
rename from Server/src/main/java/Server/core/Server.kt
rename to Server/src/main/kotlin/core/Server.kt
diff --git a/Server/src/main/java/Server/core/ServerConstants.kt b/Server/src/main/kotlin/core/ServerConstants.kt
similarity index 100%
rename from Server/src/main/java/Server/core/ServerConstants.kt
rename to Server/src/main/kotlin/core/ServerConstants.kt
diff --git a/Server/src/main/java/Server/core/game/Varbit.kt b/Server/src/main/kotlin/core/game/Varbit.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/Varbit.kt
rename to Server/src/main/kotlin/core/game/Varbit.kt
diff --git a/Server/src/main/java/Server/core/game/Varp.kt b/Server/src/main/kotlin/core/game/Varp.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/Varp.kt
rename to Server/src/main/kotlin/core/game/Varp.kt
diff --git a/Server/src/main/java/Server/core/game/VarpManager.kt b/Server/src/main/kotlin/core/game/VarpManager.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/VarpManager.kt
rename to Server/src/main/kotlin/core/game/VarpManager.kt
diff --git a/Server/src/main/java/Server/core/game/camerautils/CameraUtils.kt b/Server/src/main/kotlin/core/game/camerautils/CameraUtils.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/camerautils/CameraUtils.kt
rename to Server/src/main/kotlin/core/game/camerautils/CameraUtils.kt
diff --git a/Server/src/main/java/Server/core/game/camerautils/PlayerCamera.kt b/Server/src/main/kotlin/core/game/camerautils/PlayerCamera.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/camerautils/PlayerCamera.kt
rename to Server/src/main/kotlin/core/game/camerautils/PlayerCamera.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/allfiredup/AFUBeacon.kt b/Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUBeacon.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/allfiredup/AFUBeacon.kt
rename to Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUBeacon.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/allfiredup/AFUBeaconHandler.kt b/Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUBeaconHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/allfiredup/AFUBeaconHandler.kt
rename to Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUBeaconHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/allfiredup/AFURepairClimbHandler.kt b/Server/src/main/kotlin/core/game/content/activity/allfiredup/AFURepairClimbHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/allfiredup/AFURepairClimbHandler.kt
rename to Server/src/main/kotlin/core/game/content/activity/allfiredup/AFURepairClimbHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/allfiredup/AFUSession.kt b/Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUSession.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/allfiredup/AFUSession.kt
rename to Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUSession.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/allfiredup/BeaconTenderDialogue.kt b/Server/src/main/kotlin/core/game/content/activity/allfiredup/BeaconTenderDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/allfiredup/BeaconTenderDialogue.kt
rename to Server/src/main/kotlin/core/game/content/activity/allfiredup/BeaconTenderDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/allfiredup/KingRoaldAFUMiniDialogue.kt b/Server/src/main/kotlin/core/game/content/activity/allfiredup/KingRoaldAFUMiniDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/allfiredup/KingRoaldAFUMiniDialogue.kt
rename to Server/src/main/kotlin/core/game/content/activity/allfiredup/KingRoaldAFUMiniDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/barrows/RewardChest.kt b/Server/src/main/kotlin/core/game/content/activity/barrows/RewardChest.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/barrows/RewardChest.kt
rename to Server/src/main/kotlin/core/game/content/activity/barrows/RewardChest.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/fishingtrawler/FishingTrawlerActivity.kt b/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerActivity.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/fishingtrawler/FishingTrawlerActivity.kt
rename to Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerActivity.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/fishingtrawler/FishingTrawlerOptionHandler.kt b/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerOptionHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/fishingtrawler/FishingTrawlerOptionHandler.kt
rename to Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerOptionHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/fishingtrawler/FishingTrawlerOverlay.kt b/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerOverlay.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/fishingtrawler/FishingTrawlerOverlay.kt
rename to Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerOverlay.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/fishingtrawler/FishingTrawlerRewardInterface.kt b/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerRewardInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/fishingtrawler/FishingTrawlerRewardInterface.kt
rename to Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerRewardInterface.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/fishingtrawler/FishingTrawlerSession.kt b/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerSession.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/fishingtrawler/FishingTrawlerSession.kt
rename to Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerSession.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/fishingtrawler/TrawlerLoot.kt b/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/TrawlerLoot.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/fishingtrawler/TrawlerLoot.kt
rename to Server/src/main/kotlin/core/game/content/activity/fishingtrawler/TrawlerLoot.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/fog/FogInteractionHandler.kt b/Server/src/main/kotlin/core/game/content/activity/fog/FogInteractionHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/fog/FogInteractionHandler.kt
rename to Server/src/main/kotlin/core/game/content/activity/fog/FogInteractionHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/fog/ReggieDialogue.kt b/Server/src/main/kotlin/core/game/content/activity/fog/ReggieDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/fog/ReggieDialogue.kt
rename to Server/src/main/kotlin/core/game/content/activity/fog/ReggieDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/DeliveryBoxHandler.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/DeliveryBoxHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/DeliveryBoxHandler.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/DeliveryBoxHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/GCRewardTokenHandler.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/GCRewardTokenHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/GCRewardTokenHandler.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/GCRewardTokenHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/GnomeCookingConstants.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeCookingConstants.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/GnomeCookingConstants.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeCookingConstants.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/GnomeCookingJob.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeCookingJob.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/GnomeCookingJob.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeCookingJob.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/GnomeTipper.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeTipper.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/GnomeTipper.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeTipper.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/battas/GnomeBattaCooker.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaCooker.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/battas/GnomeBattaCooker.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaCooker.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/battas/GnomeBattaDishFiller.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaDishFiller.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/battas/GnomeBattaDishFiller.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaDishFiller.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/battas/GnomeBattaGarnisher.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaGarnisher.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/battas/GnomeBattaGarnisher.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaGarnisher.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/battas/GnomeBattaInterface.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/battas/GnomeBattaInterface.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaInterface.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/battas/GnomeBattaPrepareHandler.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaPrepareHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/battas/GnomeBattaPrepareHandler.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaPrepareHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/bowls/GnomeBowlCooker.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlCooker.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/bowls/GnomeBowlCooker.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlCooker.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/bowls/GnomeBowlGarnisher.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlGarnisher.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/bowls/GnomeBowlGarnisher.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlGarnisher.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/bowls/GnomeBowlInterface.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/bowls/GnomeBowlInterface.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlInterface.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/bowls/GnomeBowlPrepareHandler.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlPrepareHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/bowls/GnomeBowlPrepareHandler.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlPrepareHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/bowls/GnomebowlMouldFiller.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomebowlMouldFiller.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/bowls/GnomebowlMouldFiller.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomebowlMouldFiller.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/cocktails/CocktailCooker.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailCooker.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/cocktails/CocktailCooker.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailCooker.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/cocktails/CocktailFinisher.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailFinisher.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/cocktails/CocktailFinisher.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailFinisher.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/cocktails/CocktailShakerHandler.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailShakerHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/cocktails/CocktailShakerHandler.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailShakerHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/cocktails/GnomeCocktailInterface.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/GnomeCocktailInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/cocktails/GnomeCocktailInterface.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/GnomeCocktailInterface.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/cocktails/PourMixerPlugin.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/PourMixerPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/cocktails/PourMixerPlugin.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/PourMixerPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyCooker.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyCooker.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyCooker.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyCooker.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyGarnisher.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyGarnisher.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyGarnisher.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyGarnisher.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyInterface.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyInterface.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyInterface.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyPrepareHandler.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyPrepareHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyPrepareHandler.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyPrepareHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyTrayFiller.kt b/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyTrayFiller.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyTrayFiller.kt
rename to Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyTrayFiller.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/mta/EnchantSpell.kt b/Server/src/main/kotlin/core/game/content/activity/mta/EnchantSpell.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/mta/EnchantSpell.kt
rename to Server/src/main/kotlin/core/game/content/activity/mta/EnchantSpell.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/pestcontrol/PestControlHelper.kt b/Server/src/main/kotlin/core/game/content/activity/pestcontrol/PestControlHelper.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pestcontrol/PestControlHelper.kt
rename to Server/src/main/kotlin/core/game/content/activity/pestcontrol/PestControlHelper.kt
diff --git a/Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PlunderSession.kt b/Server/src/main/kotlin/core/game/content/activity/pyramidplunder/PlunderSession.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/activity/pyramidplunder/PlunderSession.kt
rename to Server/src/main/kotlin/core/game/content/activity/pyramidplunder/PlunderSession.kt
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/SandwichLadyHandler.kt b/Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/SandwichLadyHandler.kt
rename to Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/SandwichLadyInterface.kt b/Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/SandwichLadyInterface.kt
rename to Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyInterface.kt
diff --git a/Server/src/main/java/Server/core/game/content/ame/events/SandwichLadyNPC.kt b/Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyNPC.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/ame/events/SandwichLadyNPC.kt
rename to Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyNPC.kt
diff --git a/Server/src/main/java/Server/core/game/content/consumable/effects/RestoreSummoning.kt b/Server/src/main/kotlin/core/game/content/consumable/effects/RestoreSummoning.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/consumable/effects/RestoreSummoning.kt
rename to Server/src/main/kotlin/core/game/content/consumable/effects/RestoreSummoning.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AberabDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/AberabDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AberabDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/AberabDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AchiettiesDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/AchiettiesDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AchiettiesDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/AchiettiesDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AfflictedDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/AfflictedDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AfflictedDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/AfflictedDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AfrahDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/AfrahDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AfrahDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/AfrahDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AgilityBossDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/AgilityBossDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AgilityBossDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/AgilityBossDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AgmundiDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/AgmundiDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AgmundiDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/AgmundiDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AluftGianneJrDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/AluftGianneJrDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AluftGianneJrDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/AluftGianneJrDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AluftGianneSnrDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/AluftGianneSnrDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AluftGianneSnrDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/AluftGianneSnrDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/AsyffDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/AsyffDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/AsyffDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/AsyffDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BlurberryDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/BlurberryDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BlurberryDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/BlurberryDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/BrotherBordissDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/BrotherBordissDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/BrotherBordissDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/BrotherBordissDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DialogueFile.kt b/Server/src/main/kotlin/core/game/content/dialogue/DialogueFile.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DialogueFile.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/DialogueFile.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/DukeHoracioDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/DukeHoracioDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/DukeHoracioDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/DukeHoracioDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ElsieDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/ElsieDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ElsieDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/ElsieDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/EmptyPlugin.kt b/Server/src/main/kotlin/core/game/content/dialogue/EmptyPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/EmptyPlugin.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/EmptyPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GabootyDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/GabootyDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GabootyDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/GabootyDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/GeoffreyDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/GeoffreyDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/GeoffreyDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/GeoffreyDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/IffieDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/IffieDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/IffieDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/IffieDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/KingRoaldDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/KingRoaldDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/KingRoaldDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/KingRoaldDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LegendsGuardDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/LegendsGuardDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LegendsGuardDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/LegendsGuardDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/LensaDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/LensaDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/LensaDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/LensaDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/MistagDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/MistagDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/MistagDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/MistagDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/OttoGodblessedDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/OttoGodblessedDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/OttoGodblessedDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/OttoGodblessedDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/SkillDialogueHandler.kt b/Server/src/main/kotlin/core/game/content/dialogue/SkillDialogueHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/SkillDialogueHandler.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/SkillDialogueHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/ThormacDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/ThormacDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/ThormacDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/ThormacDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/dialogue/WysonTheGardenerDialogue.kt b/Server/src/main/kotlin/core/game/content/dialogue/WysonTheGardenerDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/dialogue/WysonTheGardenerDialogue.kt
rename to Server/src/main/kotlin/core/game/content/dialogue/WysonTheGardenerDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/EnchantedJewelleryDialogueFile.kt b/Server/src/main/kotlin/core/game/content/global/EnchantedJewelleryDialogueFile.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/EnchantedJewelleryDialogueFile.kt
rename to Server/src/main/kotlin/core/game/content/global/EnchantedJewelleryDialogueFile.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/action/EquipHandler.kt b/Server/src/main/kotlin/core/game/content/global/action/EquipHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/action/EquipHandler.kt
rename to Server/src/main/kotlin/core/game/content/global/action/EquipHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/action/PickupHandler.kt b/Server/src/main/kotlin/core/game/content/global/action/PickupHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/action/PickupHandler.kt
rename to Server/src/main/kotlin/core/game/content/global/action/PickupHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/travel/EssenceTeleport.kt b/Server/src/main/kotlin/core/game/content/global/travel/EssenceTeleport.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/travel/EssenceTeleport.kt
rename to Server/src/main/kotlin/core/game/content/global/travel/EssenceTeleport.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/WorldEvent.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/WorldEvent.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/WorldEvent.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/WorldEvent.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/WorldEventInitializer.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/WorldEventInitializer.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/WorldEventInitializer.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/WorldEventInitializer.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/holiday/CandyRewardPlugin.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/holiday/CandyRewardPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/holiday/CandyRewardPlugin.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/holiday/CandyRewardPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/holiday/GrimDialogue.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/holiday/GrimDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/holiday/GrimDialogue.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/holiday/GrimDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/holiday/SimpleHalloweenEvent.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/holiday/SimpleHalloweenEvent.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/holiday/SimpleHalloweenEvent.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/holiday/SimpleHalloweenEvent.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/penguinhns/LarryHandler.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/LarryHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/penguinhns/LarryHandler.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/LarryHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/penguinhns/NotebookHandler.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/NotebookHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/penguinhns/NotebookHandler.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/NotebookHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/penguinhns/PenguinHNSEvent.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinHNSEvent.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/penguinhns/PenguinHNSEvent.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinHNSEvent.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/penguinhns/PenguinManager.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinManager.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/penguinhns/PenguinManager.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinManager.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/penguinhns/PenguinSpawner.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinSpawner.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/penguinhns/PenguinSpawner.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinSpawner.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/penguinhns/PenguinSpyingHandler.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinSpyingHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/penguinhns/PenguinSpyingHandler.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinSpyingHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStar.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStar.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStar.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStar.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStarCommands.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarCommands.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStarCommands.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarCommands.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStarEvent.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarEvent.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStarEvent.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarEvent.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStarLogin.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarLogin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStarLogin.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarLogin.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/StarSpriteDialogue.kt b/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/StarSpriteDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/global/worldevents/shootingstar/StarSpriteDialogue.kt
rename to Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/StarSpriteDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/jobs/CancelJobDialogueFile.kt b/Server/src/main/kotlin/core/game/content/jobs/CancelJobDialogueFile.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/jobs/CancelJobDialogueFile.kt
rename to Server/src/main/kotlin/core/game/content/jobs/CancelJobDialogueFile.kt
diff --git a/Server/src/main/java/Server/core/game/content/jobs/JobManager.kt b/Server/src/main/kotlin/core/game/content/jobs/JobManager.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/jobs/JobManager.kt
rename to Server/src/main/kotlin/core/game/content/jobs/JobManager.kt
diff --git a/Server/src/main/java/Server/core/game/content/jobs/WorkForOptionListener.kt b/Server/src/main/kotlin/core/game/content/jobs/WorkForOptionListener.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/jobs/WorkForOptionListener.kt
rename to Server/src/main/kotlin/core/game/content/jobs/WorkForOptionListener.kt
diff --git a/Server/src/main/java/Server/core/game/content/jobs/impl/GatheringJob.kt b/Server/src/main/kotlin/core/game/content/jobs/impl/GatheringJob.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/jobs/impl/GatheringJob.kt
rename to Server/src/main/kotlin/core/game/content/jobs/impl/GatheringJob.kt
diff --git a/Server/src/main/java/Server/core/game/content/jobs/impl/SlayingJob.kt b/Server/src/main/kotlin/core/game/content/jobs/impl/SlayingJob.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/jobs/impl/SlayingJob.kt
rename to Server/src/main/kotlin/core/game/content/jobs/impl/SlayingJob.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/cooksassistant/CooksAssistant.kt b/Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/CooksAssistant.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/cooksassistant/CooksAssistant.kt
rename to Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/CooksAssistant.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/cooksassistant/GillieGroatsDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/GillieGroatsDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/cooksassistant/GillieGroatsDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/GillieGroatsDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/cooksassistant/LumbridgeCookDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/LumbridgeCookDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/cooksassistant/LumbridgeCookDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/LumbridgeCookDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/cooksassistant/MillieMillerDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/MillieMillerDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/cooksassistant/MillieMillerDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/MillieMillerDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DukeHoracioDSDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/DukeHoracioDSDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/DukeHoracioDSDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/DukeHoracioDSDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/NedDSDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/NedDSDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/NedDSDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/NedDSDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/NedDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/NedDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/dragonslayer/NedDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/NedDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/princealirescue/NedPARDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/free/princealirescue/NedPARDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/princealirescue/NedPARDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/free/princealirescue/NedPARDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/runemysteries/DukeHoracioRMDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/free/runemysteries/DukeHoracioRMDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/runemysteries/DukeHoracioRMDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/free/runemysteries/DukeHoracioRMDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/KingRoaldArravDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/free/shieldofarrav/KingRoaldArravDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/free/shieldofarrav/KingRoaldArravDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/free/shieldofarrav/KingRoaldArravDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/allfiredup/AllFiredUp.kt b/Server/src/main/kotlin/core/game/content/quest/members/allfiredup/AllFiredUp.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/allfiredup/AllFiredUp.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/allfiredup/AllFiredUp.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/allfiredup/BlazeSharpeyeDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/allfiredup/BlazeSharpeyeDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/allfiredup/BlazeSharpeyeDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/allfiredup/BlazeSharpeyeDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/allfiredup/KingRoaldAFUDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/allfiredup/KingRoaldAFUDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/allfiredup/KingRoaldAFUDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/allfiredup/KingRoaldAFUDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/allfiredup/SquireFyreDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/allfiredup/SquireFyreDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/allfiredup/SquireFyreDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/allfiredup/SquireFyreDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/priestinperil/KingRoaldPIPDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/priestinperil/KingRoaldPIPDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/priestinperil/KingRoaldPIPDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/priestinperil/KingRoaldPIPDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/AskeladdenDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/AskeladdenDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/AskeladdenDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/AskeladdenDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/BeerOnCouncilWorker.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/BeerOnCouncilWorker.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/BeerOnCouncilWorker.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/BeerOnCouncilWorker.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/BranchFletcher.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/BranchFletcher.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/BranchFletcher.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/BranchFletcher.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/ChieftanBrundtDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/ChieftanBrundtDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/ChieftanBrundtDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/ChieftanBrundtDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/CouncilWorkerDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/CouncilWorkerDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/CouncilWorkerDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/CouncilWorkerDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/Draugen.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/Draugen.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/Draugen.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/Draugen.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/FishOnAltar.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/FishOnAltar.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/FishOnAltar.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/FishOnAltar.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/FremennikTrials.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/FremennikTrials.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/FremennikTrials.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/FremennikTrials.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/KegOnKegAction.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/KegOnKegAction.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/KegOnKegAction.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/KegOnKegAction.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/LalliDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/LalliDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/LalliDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/LalliDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/LyreOptionHandler.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/LyreOptionHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/LyreOptionHandler.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/LyreOptionHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/ManniDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/ManniDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/ManniDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/ManniDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/OlafTheBard.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/OlafTheBard.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/OlafTheBard.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/OlafTheBard.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/PipeInserter.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/PipeInserter.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/PipeInserter.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/PipeInserter.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/PoisonSalesman.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/PoisonSalesman.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/PoisonSalesman.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/PoisonSalesman.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/SigliTheHuntsman.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SigliTheHuntsman.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/SigliTheHuntsman.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SigliTheHuntsman.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/SwayingTreeHandler.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwayingTreeHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/SwayingTreeHandler.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwayingTreeHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/SwensenLadder.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenLadder.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/SwensenLadder.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenLadder.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/SwensenPortals.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenPortals.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/SwensenPortals.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenPortals.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/SwensenTheNavigator.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenTheNavigator.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/SwensenTheNavigator.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenTheNavigator.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/TalismanHandler.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/TalismanHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/TalismanHandler.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/TalismanHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/TinderboxOnBomb.kt b/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/TinderboxOnBomb.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thefremenniktrials/TinderboxOnBomb.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/TinderboxOnBomb.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/CaveGoblinMinerNPC.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveGoblinMinerNPC.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/CaveGoblinMinerNPC.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveGoblinMinerNPC.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/CaveRockHandler.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveRockHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/CaveRockHandler.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveRockHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/CaveZone.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveZone.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/CaveZone.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveZone.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/DorgCbowEquipPlugin.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/DorgCbowEquipPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/DorgCbowEquipPlugin.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/DorgCbowEquipPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/DukeHoracioTLTDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/DukeHoracioTLTDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/DukeHoracioTLTDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/DukeHoracioTLTDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/GoblinFollower.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/GoblinFollower.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/GoblinFollower.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/GoblinFollower.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/HistoryOfTheGoblinRace.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/HistoryOfTheGoblinRace.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/HistoryOfTheGoblinRace.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/HistoryOfTheGoblinRace.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/KazgarDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/KazgarDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/KazgarDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/KazgarDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/LostTribe.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribe.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/LostTribe.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribe.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/LostTribeCutscene.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribeCutscene.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/LostTribeCutscene.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribeCutscene.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/MistagLTDialogue.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/MistagLTDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/MistagLTDialogue.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/MistagLTDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/PickaxeOnRubble.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/PickaxeOnRubble.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/PickaxeOnRubble.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/PickaxeOnRubble.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/PickpocketSigmund.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/PickpocketSigmund.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/PickpocketSigmund.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/PickpocketSigmund.kt
diff --git a/Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/SigmundChestHandler.kt b/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/SigmundChestHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/quest/members/thelosttribe/SigmundChestHandler.kt
rename to Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/SigmundChestHandler.kt
diff --git a/Server/src/main/java/Server/core/game/content/zone/keldagrim/CartConductorDialogue.kt b/Server/src/main/kotlin/core/game/content/zone/keldagrim/CartConductorDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/keldagrim/CartConductorDialogue.kt
rename to Server/src/main/kotlin/core/game/content/zone/keldagrim/CartConductorDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/zone/keldagrim/DwarvenBoatmanDialogue.kt b/Server/src/main/kotlin/core/game/content/zone/keldagrim/DwarvenBoatmanDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/keldagrim/DwarvenBoatmanDialogue.kt
rename to Server/src/main/kotlin/core/game/content/zone/keldagrim/DwarvenBoatmanDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/content/zone/keldagrim/KeldagrimCartMethods.kt b/Server/src/main/kotlin/core/game/content/zone/keldagrim/KeldagrimCartMethods.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/keldagrim/KeldagrimCartMethods.kt
rename to Server/src/main/kotlin/core/game/content/zone/keldagrim/KeldagrimCartMethods.kt
diff --git a/Server/src/main/java/Server/core/game/content/zone/keldagrim/KeldagrimPlugin.kt b/Server/src/main/kotlin/core/game/content/zone/keldagrim/KeldagrimPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/keldagrim/KeldagrimPlugin.kt
rename to Server/src/main/kotlin/core/game/content/zone/keldagrim/KeldagrimPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/content/zone/keldagrim/Reinald.kt b/Server/src/main/kotlin/core/game/content/zone/keldagrim/Reinald.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/keldagrim/Reinald.kt
rename to Server/src/main/kotlin/core/game/content/zone/keldagrim/Reinald.kt
diff --git a/Server/src/main/java/Server/core/game/content/zone/keldagrim/ReinaldSmithingEmporiumInterface.kt b/Server/src/main/kotlin/core/game/content/zone/keldagrim/ReinaldSmithingEmporiumInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/keldagrim/ReinaldSmithingEmporiumInterface.kt
rename to Server/src/main/kotlin/core/game/content/zone/keldagrim/ReinaldSmithingEmporiumInterface.kt
diff --git a/Server/src/main/java/Server/core/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt b/Server/src/main/kotlin/core/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt
rename to Server/src/main/kotlin/core/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt
diff --git a/Server/src/main/java/Server/core/game/ge/BotPrices.kt b/Server/src/main/kotlin/core/game/ge/BotPrices.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/ge/BotPrices.kt
rename to Server/src/main/kotlin/core/game/ge/BotPrices.kt
diff --git a/Server/src/main/java/Server/core/game/ge/GEAutoStock.kt b/Server/src/main/kotlin/core/game/ge/GEAutoStock.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/ge/GEAutoStock.kt
rename to Server/src/main/kotlin/core/game/ge/GEAutoStock.kt
diff --git a/Server/src/main/java/Server/core/game/ge/GrandExchangeOffer.kt b/Server/src/main/kotlin/core/game/ge/GrandExchangeOffer.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/ge/GrandExchangeOffer.kt
rename to Server/src/main/kotlin/core/game/ge/GrandExchangeOffer.kt
diff --git a/Server/src/main/java/Server/core/game/ge/OfferManager.kt b/Server/src/main/kotlin/core/game/ge/OfferManager.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/ge/OfferManager.kt
rename to Server/src/main/kotlin/core/game/ge/OfferManager.kt
diff --git a/Server/src/main/java/Server/core/game/ge/PlayerGrandExchange.kt b/Server/src/main/kotlin/core/game/ge/PlayerGrandExchange.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/ge/PlayerGrandExchange.kt
rename to Server/src/main/kotlin/core/game/ge/PlayerGrandExchange.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/CorporealBeastWarningInterface.kt b/Server/src/main/kotlin/core/game/interaction/CorporealBeastWarningInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/CorporealBeastWarningInterface.kt
rename to Server/src/main/kotlin/core/game/interaction/CorporealBeastWarningInterface.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/FOGRewardsInterface.kt b/Server/src/main/kotlin/core/game/interaction/FOGRewardsInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/FOGRewardsInterface.kt
rename to Server/src/main/kotlin/core/game/interaction/FOGRewardsInterface.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/ItemOnBankBooth.kt b/Server/src/main/kotlin/core/game/interaction/ItemOnBankBooth.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/ItemOnBankBooth.kt
rename to Server/src/main/kotlin/core/game/interaction/ItemOnBankBooth.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/Listeners.kt b/Server/src/main/kotlin/core/game/interaction/Listeners.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/Listeners.kt
rename to Server/src/main/kotlin/core/game/interaction/Listeners.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/OptionListener.kt b/Server/src/main/kotlin/core/game/interaction/OptionListener.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/OptionListener.kt
rename to Server/src/main/kotlin/core/game/interaction/OptionListener.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/QCRepository.kt b/Server/src/main/kotlin/core/game/interaction/QCRepository.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/QCRepository.kt
rename to Server/src/main/kotlin/core/game/interaction/QCRepository.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/city/IsafdarPlugin.kt b/Server/src/main/kotlin/core/game/interaction/city/IsafdarPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/IsafdarPlugin.kt
rename to Server/src/main/kotlin/core/game/interaction/city/IsafdarPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/city/MorytaniaPlugin.kt b/Server/src/main/kotlin/core/game/interaction/city/MorytaniaPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/MorytaniaPlugin.kt
rename to Server/src/main/kotlin/core/game/interaction/city/MorytaniaPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/city/falador/MakeoverMageInterface.kt b/Server/src/main/kotlin/core/game/interaction/city/falador/MakeoverMageInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/city/falador/MakeoverMageInterface.kt
rename to Server/src/main/kotlin/core/game/interaction/city/falador/MakeoverMageInterface.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/ChocatriceIncubationInterface.kt b/Server/src/main/kotlin/core/game/interaction/inter/ChocatriceIncubationInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/ChocatriceIncubationInterface.kt
rename to Server/src/main/kotlin/core/game/interaction/inter/ChocatriceIncubationInterface.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/ExperienceInterface.kt b/Server/src/main/kotlin/core/game/interaction/inter/ExperienceInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/ExperienceInterface.kt
rename to Server/src/main/kotlin/core/game/interaction/inter/ExperienceInterface.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/FairyRingInterface.kt b/Server/src/main/kotlin/core/game/interaction/inter/FairyRingInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/FairyRingInterface.kt
rename to Server/src/main/kotlin/core/game/interaction/inter/FairyRingInterface.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/FurClothingInterface.kt b/Server/src/main/kotlin/core/game/interaction/inter/FurClothingInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/FurClothingInterface.kt
rename to Server/src/main/kotlin/core/game/interaction/inter/FurClothingInterface.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/HairDresserInterface.kt b/Server/src/main/kotlin/core/game/interaction/inter/HairDresserInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/HairDresserInterface.kt
rename to Server/src/main/kotlin/core/game/interaction/inter/HairDresserInterface.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/MakeOverInterface.kt b/Server/src/main/kotlin/core/game/interaction/inter/MakeOverInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/MakeOverInterface.kt
rename to Server/src/main/kotlin/core/game/interaction/inter/MakeOverInterface.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/PuppyInterfacePlugin.kt b/Server/src/main/kotlin/core/game/interaction/inter/PuppyInterfacePlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/PuppyInterfacePlugin.kt
rename to Server/src/main/kotlin/core/game/interaction/inter/PuppyInterfacePlugin.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/inter/ThessaliaInterface.kt b/Server/src/main/kotlin/core/game/interaction/inter/ThessaliaInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/inter/ThessaliaInterface.kt
rename to Server/src/main/kotlin/core/game/interaction/inter/ThessaliaInterface.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/item/BraceletOfClayPlugin.kt b/Server/src/main/kotlin/core/game/interaction/item/BraceletOfClayPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/BraceletOfClayPlugin.kt
rename to Server/src/main/kotlin/core/game/interaction/item/BraceletOfClayPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/item/EnchantJewelleryTabOption.kt b/Server/src/main/kotlin/core/game/interaction/item/EnchantJewelleryTabOption.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/EnchantJewelleryTabOption.kt
rename to Server/src/main/kotlin/core/game/interaction/item/EnchantJewelleryTabOption.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/item/EnchantedJewelleryListener.kt b/Server/src/main/kotlin/core/game/interaction/item/EnchantedJewelleryListener.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/EnchantedJewelleryListener.kt
rename to Server/src/main/kotlin/core/game/interaction/item/EnchantedJewelleryListener.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/item/GrandSeedPodHandler.kt b/Server/src/main/kotlin/core/game/interaction/item/GrandSeedPodHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/GrandSeedPodHandler.kt
rename to Server/src/main/kotlin/core/game/interaction/item/GrandSeedPodHandler.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withitem/CapeDyer.kt b/Server/src/main/kotlin/core/game/interaction/item/withitem/CapeDyer.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withitem/CapeDyer.kt
rename to Server/src/main/kotlin/core/game/interaction/item/withitem/CapeDyer.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/item/withobject/CoalTrucksHandler.kt b/Server/src/main/kotlin/core/game/interaction/item/withobject/CoalTrucksHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/item/withobject/CoalTrucksHandler.kt
rename to Server/src/main/kotlin/core/game/interaction/item/withobject/CoalTrucksHandler.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/npc/BogrogPouchSwapper.kt b/Server/src/main/kotlin/core/game/interaction/npc/BogrogPouchSwapper.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/npc/BogrogPouchSwapper.kt
rename to Server/src/main/kotlin/core/game/interaction/npc/BogrogPouchSwapper.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/object/DemonTauntHandler.kt b/Server/src/main/kotlin/core/game/interaction/object/DemonTauntHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/DemonTauntHandler.kt
rename to Server/src/main/kotlin/core/game/interaction/object/DemonTauntHandler.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/object/FairyRingPlugin.kt b/Server/src/main/kotlin/core/game/interaction/object/FairyRingPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/FairyRingPlugin.kt
rename to Server/src/main/kotlin/core/game/interaction/object/FairyRingPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/object/GutanothChestPlugin.kt b/Server/src/main/kotlin/core/game/interaction/object/GutanothChestPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/GutanothChestPlugin.kt
rename to Server/src/main/kotlin/core/game/interaction/object/GutanothChestPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/object/JungleBushHandler.kt b/Server/src/main/kotlin/core/game/interaction/object/JungleBushHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/JungleBushHandler.kt
rename to Server/src/main/kotlin/core/game/interaction/object/JungleBushHandler.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/object/MuddyChestHandler.kt b/Server/src/main/kotlin/core/game/interaction/object/MuddyChestHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/MuddyChestHandler.kt
rename to Server/src/main/kotlin/core/game/interaction/object/MuddyChestHandler.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/object/TarBarrelListener.kt b/Server/src/main/kotlin/core/game/interaction/object/TarBarrelListener.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/object/TarBarrelListener.kt
rename to Server/src/main/kotlin/core/game/interaction/object/TarBarrelListener.kt
diff --git a/Server/src/main/java/Server/core/game/interaction/player/PeltOptionPlugin.kt b/Server/src/main/kotlin/core/game/interaction/player/PeltOptionPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/interaction/player/PeltOptionPlugin.kt
rename to Server/src/main/kotlin/core/game/interaction/player/PeltOptionPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/CombatPulse.kt b/Server/src/main/kotlin/core/game/node/entity/combat/CombatPulse.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/CombatPulse.kt
rename to Server/src/main/kotlin/core/game/node/entity/combat/CombatPulse.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/CombatSwingHandler.kt b/Server/src/main/kotlin/core/game/node/entity/combat/CombatSwingHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/CombatSwingHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/combat/CombatSwingHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/equipment/EquipmentDegrader.kt b/Server/src/main/kotlin/core/game/node/entity/combat/equipment/EquipmentDegrader.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/equipment/EquipmentDegrader.kt
rename to Server/src/main/kotlin/core/game/node/entity/combat/equipment/EquipmentDegrader.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/handlers/MagicSwingHandler.kt b/Server/src/main/kotlin/core/game/node/entity/combat/handlers/MagicSwingHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/handlers/MagicSwingHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/combat/handlers/MagicSwingHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/handlers/MeleeSwingHandler.kt b/Server/src/main/kotlin/core/game/node/entity/combat/handlers/MeleeSwingHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/handlers/MeleeSwingHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/combat/handlers/MeleeSwingHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/handlers/MultiSwingHandler.kt b/Server/src/main/kotlin/core/game/node/entity/combat/handlers/MultiSwingHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/handlers/MultiSwingHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/combat/handlers/MultiSwingHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/handlers/RangeSwingHandler.kt b/Server/src/main/kotlin/core/game/node/entity/combat/handlers/RangeSwingHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/handlers/RangeSwingHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/combat/handlers/RangeSwingHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/handlers/SalamanderSwingHandler.kt b/Server/src/main/kotlin/core/game/node/entity/combat/handlers/SalamanderSwingHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/handlers/SalamanderSwingHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/combat/handlers/SalamanderSwingHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/combat/special/LiquefySpecialHandler.kt b/Server/src/main/kotlin/core/game/node/entity/combat/special/LiquefySpecialHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/combat/special/LiquefySpecialHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/combat/special/LiquefySpecialHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/equipment/BarrowsEquipmentRegister.kt b/Server/src/main/kotlin/core/game/node/entity/equipment/BarrowsEquipmentRegister.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/equipment/BarrowsEquipmentRegister.kt
rename to Server/src/main/kotlin/core/game/node/entity/equipment/BarrowsEquipmentRegister.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/equipment/PVPEquipmentRegister.kt b/Server/src/main/kotlin/core/game/node/entity/equipment/PVPEquipmentRegister.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/equipment/PVPEquipmentRegister.kt
rename to Server/src/main/kotlin/core/game/node/entity/equipment/PVPEquipmentRegister.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/equipment/SnowballEquipmentPlugin.kt b/Server/src/main/kotlin/core/game/node/entity/equipment/SnowballEquipmentPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/equipment/SnowballEquipmentPlugin.kt
rename to Server/src/main/kotlin/core/game/node/entity/equipment/SnowballEquipmentPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AliTheFarmerDialogue.kt b/Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheFarmerDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AliTheFarmerDialogue.kt
rename to Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheFarmerDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AliTheGuard.kt b/Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheGuard.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AliTheGuard.kt
rename to Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheGuard.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AliTheSmithDialogue.kt b/Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheSmithDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/alkharid/AliTheSmithDialogue.kt
rename to Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheSmithDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/AliTheHagDialogue.kt b/Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheHagDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/AliTheHagDialogue.kt
rename to Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheHagDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/AliTheMayorDialogue.kt b/Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheMayorDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/AliTheMayorDialogue.kt
rename to Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheMayorDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/AliTheOperator.kt b/Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheOperator.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/city/pollnivneach/AliTheOperator.kt
rename to Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheOperator.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/npc/other/AlKharidWarriorPlugin.kt b/Server/src/main/kotlin/core/game/node/entity/npc/other/AlKharidWarriorPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/npc/other/AlKharidWarriorPlugin.kt
rename to Server/src/main/kotlin/core/game/node/entity/npc/other/AlKharidWarriorPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/login/LoginParser.kt b/Server/src/main/kotlin/core/game/node/entity/player/info/login/LoginParser.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/login/LoginParser.kt
rename to Server/src/main/kotlin/core/game/node/entity/player/info/login/LoginParser.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/login/PlayerSaveParser.kt b/Server/src/main/kotlin/core/game/node/entity/player/info/login/PlayerSaveParser.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/login/PlayerSaveParser.kt
rename to Server/src/main/kotlin/core/game/node/entity/player/info/login/PlayerSaveParser.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/login/PlayerSaver.kt b/Server/src/main/kotlin/core/game/node/entity/player/info/login/PlayerSaver.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/login/PlayerSaver.kt
rename to Server/src/main/kotlin/core/game/node/entity/player/info/login/PlayerSaver.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/stats/StatAttributeKeys.kt b/Server/src/main/kotlin/core/game/node/entity/player/info/stats/StatAttributeKeys.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/stats/StatAttributeKeys.kt
rename to Server/src/main/kotlin/core/game/node/entity/player/info/stats/StatAttributeKeys.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/info/stats/StatsCommandSet.kt b/Server/src/main/kotlin/core/game/node/entity/player/info/stats/StatsCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/info/stats/StatsCommandSet.kt
rename to Server/src/main/kotlin/core/game/node/entity/player/info/stats/StatsCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/player/link/diary/DiaryLevel.kt b/Server/src/main/kotlin/core/game/node/entity/player/link/diary/DiaryLevel.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/player/link/diary/DiaryLevel.kt
rename to Server/src/main/kotlin/core/game/node/entity/player/link/diary/DiaryLevel.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/BarbarianOutpostCourse.kt b/Server/src/main/kotlin/core/game/node/entity/skill/agility/BarbarianOutpostCourse.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/BarbarianOutpostCourse.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/agility/BarbarianOutpostCourse.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/GnomeStrongholdCourse.kt b/Server/src/main/kotlin/core/game/node/entity/skill/agility/GnomeStrongholdCourse.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/GnomeStrongholdCourse.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/agility/GnomeStrongholdCourse.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/WildernessCourse.kt b/Server/src/main/kotlin/core/game/node/entity/skill/agility/WildernessCourse.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/WildernessCourse.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/agility/WildernessCourse.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt b/Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt b/Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt b/Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt b/Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/EstateAgentDialogue.kt b/Server/src/main/kotlin/core/game/node/entity/skill/construction/EstateAgentDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/EstateAgentDialogue.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/construction/EstateAgentDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/Hotspot.kt b/Server/src/main/kotlin/core/game/node/entity/skill/construction/Hotspot.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/Hotspot.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/construction/Hotspot.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt b/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt b/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt b/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/chapel/ShieldBlessingPlugin.kt b/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/chapel/ShieldBlessingPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/chapel/ShieldBlessingPlugin.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/chapel/ShieldBlessingPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt b/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberDialogue.kt b/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberDialogue.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt b/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt b/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/workshop/ArmourStand.kt b/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/workshop/ArmourStand.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/construction/decoration/workshop/ArmourStand.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/workshop/ArmourStand.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/cooking/ChocolateBarCutter.kt b/Server/src/main/kotlin/core/game/node/entity/skill/cooking/ChocolateBarCutter.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/cooking/ChocolateBarCutter.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/cooking/ChocolateBarCutter.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/lightsources/LanternCrafting.kt b/Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LanternCrafting.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/lightsources/LanternCrafting.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LanternCrafting.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/lightsources/LightSourceExtinguisher.kt b/Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSourceExtinguisher.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/lightsources/LightSourceExtinguisher.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSourceExtinguisher.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/lightsources/LightSourceLighter.kt b/Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSourceLighter.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/lightsources/LightSourceLighter.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSourceLighter.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/crafting/lightsources/LightSources.kt b/Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSources.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/crafting/lightsources/LightSources.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSources.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/BasketsAndSacks.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/BasketsAndSacks.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/BasketsAndSacks.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/BasketsAndSacks.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/CompostBin.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/CompostBin.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/CompostBinOptionHandler.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBinOptionHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/CompostBinOptionHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBinOptionHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/CompostBins.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBins.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/CompostBins.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBins.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/CompostType.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostType.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/CompostType.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostType.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/CropHarvester.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/CropHarvester.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/CropHarvester.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/CropHarvester.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/DigUpPatchDialogue.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/DigUpPatchDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/DigUpPatchDialogue.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/DigUpPatchDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/FarmerPayOptionHandler.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/FarmerPayOptionHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/FarmerPayOptionHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/FarmerPayOptionHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/Farmers.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/Farmers.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/Farmers.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/Farmers.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/FarmingPatch.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/FarmingPatch.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/FarmingPatch.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/FarmingPatch.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/FruitAndBerryPicker.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/FruitAndBerryPicker.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/FruitAndBerryPicker.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/FruitAndBerryPicker.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/HealthChecker.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/HealthChecker.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/HealthChecker.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/HealthChecker.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/InspectionHandler.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/InspectionHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/InspectionHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/InspectionHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/LeprechaunNoter.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/LeprechaunNoter.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/LeprechaunNoter.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/LeprechaunNoter.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/Patch.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/Patch.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/Patch.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/Patch.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/PatchRaker.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/PatchRaker.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/PatchRaker.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/PatchRaker.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/PatchType.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/PatchType.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/PatchType.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/PatchType.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/Plantable.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/Plantable.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/Plantable.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/Plantable.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/SackBasketOptionHandler.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/SackBasketOptionHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/SackBasketOptionHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/SackBasketOptionHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/SeedOnPlantPot.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/SeedOnPlantPot.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/SeedOnPlantPot.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/SeedOnPlantPot.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/Seedling.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/Seedling.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/Seedling.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/Seedling.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/SeedlingWaterer.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/SeedlingWaterer.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/SeedlingWaterer.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/SeedlingWaterer.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/ToolLeprechaunHandler.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/ToolLeprechaunHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/ToolLeprechaunHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/ToolLeprechaunHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/ToolLeprechaunInterface.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/ToolLeprechaunInterface.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/ToolLeprechaunInterface.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/ToolLeprechaunInterface.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/UseWithBinHandler.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/UseWithBinHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/UseWithBinHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/UseWithBinHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/UseWithPatchHandler.kt b/Server/src/main/kotlin/core/game/node/entity/skill/farming/UseWithPatchHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/farming/UseWithPatchHandler.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/farming/UseWithPatchHandler.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/gem/GemBoltCutPulse.kt b/Server/src/main/kotlin/core/game/node/entity/skill/fletching/items/gem/GemBoltCutPulse.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/fletching/items/gem/GemBoltCutPulse.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/fletching/items/gem/GemBoltCutPulse.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/gather/PickaxeRepairPlugin.kt b/Server/src/main/kotlin/core/game/node/entity/skill/gather/PickaxeRepairPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/gather/PickaxeRepairPlugin.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/gather/PickaxeRepairPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/gather/mining/MiningSkillPulse.kt b/Server/src/main/kotlin/core/game/node/entity/skill/gather/mining/MiningSkillPulse.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/gather/mining/MiningSkillPulse.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/gather/mining/MiningSkillPulse.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/herblore/GrindItemPlugin.kt b/Server/src/main/kotlin/core/game/node/entity/skill/herblore/GrindItemPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/herblore/GrindItemPlugin.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/herblore/GrindItemPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/PolarKebbitHunting.kt b/Server/src/main/kotlin/core/game/node/entity/skill/hunter/PolarKebbitHunting.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/PolarKebbitHunting.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/hunter/PolarKebbitHunting.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt b/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/tracking/CommonKebbitWest.kt b/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/CommonKebbitWest.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/tracking/CommonKebbitWest.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/CommonKebbitWest.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/tracking/HunterTracking.kt b/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/HunterTracking.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/tracking/HunterTracking.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/HunterTracking.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt b/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/hunter/tracking/TrailDefinition.kt b/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/TrailDefinition.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/hunter/tracking/TrailDefinition.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/TrailDefinition.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/PouchManager.kt b/Server/src/main/kotlin/core/game/node/entity/skill/runecrafting/PouchManager.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/PouchManager.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/runecrafting/PouchManager.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/RunePouchPlugin.kt b/Server/src/main/kotlin/core/game/node/entity/skill/runecrafting/RunePouchPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/runecrafting/RunePouchPlugin.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/runecrafting/RunePouchPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/skillcapeperks/Skillcape.kt b/Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/Skillcape.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/skillcapeperks/Skillcape.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/Skillcape.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/skillcapeperks/SkillcapeEquipmentPlugin.kt b/Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapeEquipmentPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/skillcapeperks/SkillcapeEquipmentPlugin.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapeEquipmentPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/skillcapeperks/SkillcapeOperatePlugin.kt b/Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapeOperatePlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/skillcapeperks/SkillcapeOperatePlugin.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapeOperatePlugin.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/skillcapeperks/SkillcapePerks.kt b/Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapePerks.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/skillcapeperks/SkillcapePerks.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapePerks.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/thieving/Pickpocket.kt b/Server/src/main/kotlin/core/game/node/entity/skill/thieving/Pickpocket.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/skill/thieving/Pickpocket.kt
rename to Server/src/main/kotlin/core/game/node/entity/skill/thieving/Pickpocket.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/newsys/PlayerState.kt b/Server/src/main/kotlin/core/game/node/entity/state/newsys/PlayerState.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/newsys/PlayerState.kt
rename to Server/src/main/kotlin/core/game/node/entity/state/newsys/PlayerState.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/newsys/State.kt b/Server/src/main/kotlin/core/game/node/entity/state/newsys/State.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/newsys/State.kt
rename to Server/src/main/kotlin/core/game/node/entity/state/newsys/State.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/newsys/StateRepository.kt b/Server/src/main/kotlin/core/game/node/entity/state/newsys/StateRepository.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/newsys/StateRepository.kt
rename to Server/src/main/kotlin/core/game/node/entity/state/newsys/StateRepository.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/newsys/states/AvaDeviceState.kt b/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/AvaDeviceState.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/newsys/states/AvaDeviceState.kt
rename to Server/src/main/kotlin/core/game/node/entity/state/newsys/states/AvaDeviceState.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/newsys/states/DiseasedState.kt b/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/DiseasedState.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/newsys/states/DiseasedState.kt
rename to Server/src/main/kotlin/core/game/node/entity/state/newsys/states/DiseasedState.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/newsys/states/FarmingState.kt b/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/FarmingState.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/newsys/states/FarmingState.kt
rename to Server/src/main/kotlin/core/game/node/entity/state/newsys/states/FarmingState.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/newsys/states/GodspellChargedState.kt b/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/GodspellChargedState.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/newsys/states/GodspellChargedState.kt
rename to Server/src/main/kotlin/core/game/node/entity/state/newsys/states/GodspellChargedState.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/newsys/states/IncubatorState.kt b/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/IncubatorState.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/newsys/states/IncubatorState.kt
rename to Server/src/main/kotlin/core/game/node/entity/state/newsys/states/IncubatorState.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/newsys/states/SeedlingState.kt b/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/SeedlingState.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/newsys/states/SeedlingState.kt
rename to Server/src/main/kotlin/core/game/node/entity/state/newsys/states/SeedlingState.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/newsys/states/ShootingStarState.kt b/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/ShootingStarState.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/newsys/states/ShootingStarState.kt
rename to Server/src/main/kotlin/core/game/node/entity/state/newsys/states/ShootingStarState.kt
diff --git a/Server/src/main/java/Server/core/game/node/entity/state/newsys/states/SkulledState.kt b/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/SkulledState.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/node/entity/state/newsys/states/SkulledState.kt
rename to Server/src/main/kotlin/core/game/node/entity/state/newsys/states/SkulledState.kt
diff --git a/Server/src/main/java/Server/core/game/system/SystemLogger.kt b/Server/src/main/kotlin/core/game/system/SystemLogger.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/SystemLogger.kt
rename to Server/src/main/kotlin/core/game/system/SystemLogger.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/Command.kt b/Server/src/main/kotlin/core/game/system/command/Command.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/Command.kt
rename to Server/src/main/kotlin/core/game/system/command/Command.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/CommandPlugin.kt b/Server/src/main/kotlin/core/game/system/command/CommandPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/CommandPlugin.kt
rename to Server/src/main/kotlin/core/game/system/command/CommandPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/CommandSystem.kt b/Server/src/main/kotlin/core/game/system/command/CommandSystem.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/CommandSystem.kt
rename to Server/src/main/kotlin/core/game/system/command/CommandSystem.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/MapDumpCommand.kt b/Server/src/main/kotlin/core/game/system/command/MapDumpCommand.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/MapDumpCommand.kt
rename to Server/src/main/kotlin/core/game/system/command/MapDumpCommand.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/oldsys/AIPCommandPlugin.kt b/Server/src/main/kotlin/core/game/system/command/oldsys/AIPCommandPlugin.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/oldsys/AIPCommandPlugin.kt
rename to Server/src/main/kotlin/core/game/system/command/oldsys/AIPCommandPlugin.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/oldsys/SimpleDumpingCommands.kt b/Server/src/main/kotlin/core/game/system/command/oldsys/SimpleDumpingCommands.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/oldsys/SimpleDumpingCommands.kt
rename to Server/src/main/kotlin/core/game/system/command/oldsys/SimpleDumpingCommands.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/oldsys/VisualCommand.kt b/Server/src/main/kotlin/core/game/system/command/oldsys/VisualCommand.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/oldsys/VisualCommand.kt
rename to Server/src/main/kotlin/core/game/system/command/oldsys/VisualCommand.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/rottenpotato/RPUseWithNPCDialogue.kt b/Server/src/main/kotlin/core/game/system/command/rottenpotato/RPUseWithNPCDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/rottenpotato/RPUseWithNPCDialogue.kt
rename to Server/src/main/kotlin/core/game/system/command/rottenpotato/RPUseWithNPCDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/rottenpotato/RPUseWithPlayerDialogue.kt b/Server/src/main/kotlin/core/game/system/command/rottenpotato/RPUseWithPlayerDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/rottenpotato/RPUseWithPlayerDialogue.kt
rename to Server/src/main/kotlin/core/game/system/command/rottenpotato/RPUseWithPlayerDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/rottenpotato/RottenPotatoExtraDialogue.kt b/Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoExtraDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/rottenpotato/RottenPotatoExtraDialogue.kt
rename to Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoExtraDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/rottenpotato/RottenPotatoOptionHandler.kt b/Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoOptionHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/rottenpotato/RottenPotatoOptionHandler.kt
rename to Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoOptionHandler.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/rottenpotato/RottenPotatoRSHDDialogue.kt b/Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoRSHDDialogue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/rottenpotato/RottenPotatoRSHDDialogue.kt
rename to Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoRSHDDialogue.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt b/Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt
rename to Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/AnimationCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/AnimationCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/AnimationCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/AnimationCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/BottingCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/BottingCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/BottingCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/BottingCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/CommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/CommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/CommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/CommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/ConfigCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/ConfigCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/ConfigCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/ConfigCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/DevelopmentCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/DevelopmentCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/DevelopmentCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/DevelopmentCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/FunCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/FunCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/FunCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/FunCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/MiscCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/MiscCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/MiscCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/MiscCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/ModerationCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/ModerationCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/ModerationCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/ModerationCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/MusicCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/MusicCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/MusicCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/MusicCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/QuestCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/QuestCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/QuestCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/QuestCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/SlayerCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/SlayerCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/SlayerCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/SlayerCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/SpawnCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/SpawnCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/SpawnCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/SpawnCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/SystemCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/SystemCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/SystemCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/SystemCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/command/sets/TeleportCommandSet.kt b/Server/src/main/kotlin/core/game/system/command/sets/TeleportCommandSet.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/command/sets/TeleportCommandSet.kt
rename to Server/src/main/kotlin/core/game/system/command/sets/TeleportCommandSet.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/ConfigParser.kt b/Server/src/main/kotlin/core/game/system/config/ConfigParser.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/ConfigParser.kt
rename to Server/src/main/kotlin/core/game/system/config/ConfigParser.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/DoorConfigLoader.kt b/Server/src/main/kotlin/core/game/system/config/DoorConfigLoader.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/DoorConfigLoader.kt
rename to Server/src/main/kotlin/core/game/system/config/DoorConfigLoader.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/DropTableParser.kt b/Server/src/main/kotlin/core/game/system/config/DropTableParser.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/DropTableParser.kt
rename to Server/src/main/kotlin/core/game/system/config/DropTableParser.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/GroundSpawnLoader.kt b/Server/src/main/kotlin/core/game/system/config/GroundSpawnLoader.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/GroundSpawnLoader.kt
rename to Server/src/main/kotlin/core/game/system/config/GroundSpawnLoader.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/InterfaceConfigParser.kt b/Server/src/main/kotlin/core/game/system/config/InterfaceConfigParser.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/InterfaceConfigParser.kt
rename to Server/src/main/kotlin/core/game/system/config/InterfaceConfigParser.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/ItemConfigParser.kt b/Server/src/main/kotlin/core/game/system/config/ItemConfigParser.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/ItemConfigParser.kt
rename to Server/src/main/kotlin/core/game/system/config/ItemConfigParser.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/MusicConfigLoader.kt b/Server/src/main/kotlin/core/game/system/config/MusicConfigLoader.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/MusicConfigLoader.kt
rename to Server/src/main/kotlin/core/game/system/config/MusicConfigLoader.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/NPCConfigParser.kt b/Server/src/main/kotlin/core/game/system/config/NPCConfigParser.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/NPCConfigParser.kt
rename to Server/src/main/kotlin/core/game/system/config/NPCConfigParser.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/NPCSpawner.kt b/Server/src/main/kotlin/core/game/system/config/NPCSpawner.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/NPCSpawner.kt
rename to Server/src/main/kotlin/core/game/system/config/NPCSpawner.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/ObjectConfigParser.kt b/Server/src/main/kotlin/core/game/system/config/ObjectConfigParser.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/ObjectConfigParser.kt
rename to Server/src/main/kotlin/core/game/system/config/ObjectConfigParser.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/RangedConfigLoader.kt b/Server/src/main/kotlin/core/game/system/config/RangedConfigLoader.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/RangedConfigLoader.kt
rename to Server/src/main/kotlin/core/game/system/config/RangedConfigLoader.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/ServerConfigParser.kt b/Server/src/main/kotlin/core/game/system/config/ServerConfigParser.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/ServerConfigParser.kt
rename to Server/src/main/kotlin/core/game/system/config/ServerConfigParser.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/ShopParser.kt b/Server/src/main/kotlin/core/game/system/config/ShopParser.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/ShopParser.kt
rename to Server/src/main/kotlin/core/game/system/config/ShopParser.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/TableDump.kt b/Server/src/main/kotlin/core/game/system/config/TableDump.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/TableDump.kt
rename to Server/src/main/kotlin/core/game/system/config/TableDump.kt
diff --git a/Server/src/main/java/Server/core/game/system/config/XteaParser.kt b/Server/src/main/kotlin/core/game/system/config/XteaParser.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/system/config/XteaParser.kt
rename to Server/src/main/kotlin/core/game/system/config/XteaParser.kt
diff --git a/Server/src/main/java/Server/core/game/world/DeadlockDetector.kt b/Server/src/main/kotlin/core/game/world/DeadlockDetector.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/DeadlockDetector.kt
rename to Server/src/main/kotlin/core/game/world/DeadlockDetector.kt
diff --git a/Server/src/main/java/Server/core/game/world/GameSettings.kt b/Server/src/main/kotlin/core/game/world/GameSettings.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/GameSettings.kt
rename to Server/src/main/kotlin/core/game/world/GameSettings.kt
diff --git a/Server/src/main/java/Server/core/game/world/GameWorld.kt b/Server/src/main/kotlin/core/game/world/GameWorld.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/GameWorld.kt
rename to Server/src/main/kotlin/core/game/world/GameWorld.kt
diff --git a/Server/src/main/java/Server/core/game/world/ImmerseWorld.kt b/Server/src/main/kotlin/core/game/world/ImmerseWorld.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/ImmerseWorld.kt
rename to Server/src/main/kotlin/core/game/world/ImmerseWorld.kt
diff --git a/Server/src/main/java/Server/core/game/world/PulseRunner.kt b/Server/src/main/kotlin/core/game/world/PulseRunner.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/PulseRunner.kt
rename to Server/src/main/kotlin/core/game/world/PulseRunner.kt
diff --git a/Server/src/main/java/Server/core/game/world/callback/CallbackHub.kt b/Server/src/main/kotlin/core/game/world/callback/CallbackHub.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/callback/CallbackHub.kt
rename to Server/src/main/kotlin/core/game/world/callback/CallbackHub.kt
diff --git a/Server/src/main/java/Server/core/game/world/map/path/SmartPathfinder.kt b/Server/src/main/kotlin/core/game/world/map/path/SmartPathfinder.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/map/path/SmartPathfinder.kt
rename to Server/src/main/kotlin/core/game/world/map/path/SmartPathfinder.kt
diff --git a/Server/src/main/java/Server/core/game/world/repository/DisconnectionQueue.kt b/Server/src/main/kotlin/core/game/world/repository/DisconnectionQueue.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/repository/DisconnectionQueue.kt
rename to Server/src/main/kotlin/core/game/world/repository/DisconnectionQueue.kt
diff --git a/Server/src/main/java/Server/core/game/world/repository/Repository.kt b/Server/src/main/kotlin/core/game/world/repository/Repository.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/repository/Repository.kt
rename to Server/src/main/kotlin/core/game/world/repository/Repository.kt
diff --git a/Server/src/main/java/Server/core/game/world/update/MapChunkRenderer.kt b/Server/src/main/kotlin/core/game/world/update/MapChunkRenderer.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/MapChunkRenderer.kt
rename to Server/src/main/kotlin/core/game/world/update/MapChunkRenderer.kt
diff --git a/Server/src/main/java/Server/core/game/world/update/NPCRenderer.kt b/Server/src/main/kotlin/core/game/world/update/NPCRenderer.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/NPCRenderer.kt
rename to Server/src/main/kotlin/core/game/world/update/NPCRenderer.kt
diff --git a/Server/src/main/java/Server/core/game/world/update/PlayerRenderer.kt b/Server/src/main/kotlin/core/game/world/update/PlayerRenderer.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/PlayerRenderer.kt
rename to Server/src/main/kotlin/core/game/world/update/PlayerRenderer.kt
diff --git a/Server/src/main/java/Server/core/game/world/update/UpdateMasks.kt b/Server/src/main/kotlin/core/game/world/update/UpdateMasks.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/UpdateMasks.kt
rename to Server/src/main/kotlin/core/game/world/update/UpdateMasks.kt
diff --git a/Server/src/main/java/Server/core/game/world/update/UpdateSequence.kt b/Server/src/main/kotlin/core/game/world/update/UpdateSequence.kt
similarity index 100%
rename from Server/src/main/java/Server/core/game/world/update/UpdateSequence.kt
rename to Server/src/main/kotlin/core/game/world/update/UpdateSequence.kt
diff --git a/Server/src/main/java/Server/core/net/event/LoginReadEvent.kt b/Server/src/main/kotlin/core/net/event/LoginReadEvent.kt
similarity index 100%
rename from Server/src/main/java/Server/core/net/event/LoginReadEvent.kt
rename to Server/src/main/kotlin/core/net/event/LoginReadEvent.kt
diff --git a/Server/src/main/java/Server/core/net/packet/in/ItemOnGroundItemPacket.kt b/Server/src/main/kotlin/core/net/packet/in/ItemOnGroundItemPacket.kt
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/ItemOnGroundItemPacket.kt
rename to Server/src/main/kotlin/core/net/packet/in/ItemOnGroundItemPacket.kt
diff --git a/Server/src/main/java/Server/core/net/packet/in/QuickChatPacketHandler.kt b/Server/src/main/kotlin/core/net/packet/in/QuickChatPacketHandler.kt
similarity index 100%
rename from Server/src/main/java/Server/core/net/packet/in/QuickChatPacketHandler.kt
rename to Server/src/main/kotlin/core/net/packet/in/QuickChatPacketHandler.kt
diff --git a/Server/src/main/java/Server/core/plugin/CorePluginTypes/XPGainPlugins.kt b/Server/src/main/kotlin/core/plugin/CorePluginTypes/XPGainPlugins.kt
similarity index 100%
rename from Server/src/main/java/Server/core/plugin/CorePluginTypes/XPGainPlugins.kt
rename to Server/src/main/kotlin/core/plugin/CorePluginTypes/XPGainPlugins.kt
diff --git a/Server/src/main/java/Server/core/plugin/PluginManager.kt b/Server/src/main/kotlin/core/plugin/PluginManager.kt
similarity index 100%
rename from Server/src/main/java/Server/core/plugin/PluginManager.kt
rename to Server/src/main/kotlin/core/plugin/PluginManager.kt
diff --git a/Server/src/main/java/Server/core/tools/Components.kt b/Server/src/main/kotlin/core/tools/Components.kt
similarity index 100%
rename from Server/src/main/java/Server/core/tools/Components.kt
rename to Server/src/main/kotlin/core/tools/Components.kt
diff --git a/Server/src/main/java/Server/core/tools/DialogueConst.kt b/Server/src/main/kotlin/core/tools/DialogueConst.kt
similarity index 100%
rename from Server/src/main/java/Server/core/tools/DialogueConst.kt
rename to Server/src/main/kotlin/core/tools/DialogueConst.kt
diff --git a/Server/src/main/java/Server/core/tools/Interfaces.kt b/Server/src/main/kotlin/core/tools/Interfaces.kt
similarity index 100%
rename from Server/src/main/java/Server/core/tools/Interfaces.kt
rename to Server/src/main/kotlin/core/tools/Interfaces.kt
diff --git a/Server/src/main/java/Server/core/tools/Items.kt b/Server/src/main/kotlin/core/tools/Items.kt
similarity index 100%
rename from Server/src/main/java/Server/core/tools/Items.kt
rename to Server/src/main/kotlin/core/tools/Items.kt
diff --git a/Server/src/main/java/Server/core/tools/NPCs.kt b/Server/src/main/kotlin/core/tools/NPCs.kt
similarity index 100%
rename from Server/src/main/java/Server/core/tools/NPCs.kt
rename to Server/src/main/kotlin/core/tools/NPCs.kt
diff --git a/Server/src/main/java/Server/core/tools/TickUtils.kt b/Server/src/main/kotlin/core/tools/TickUtils.kt
similarity index 100%
rename from Server/src/main/java/Server/core/tools/TickUtils.kt
rename to Server/src/main/kotlin/core/tools/TickUtils.kt
diff --git a/Server/src/main/java/Server/core/tools/stringtools/StringTools.kt b/Server/src/main/kotlin/core/tools/stringtools/StringTools.kt
similarity index 100%
rename from Server/src/main/java/Server/core/tools/stringtools/StringTools.kt
rename to Server/src/main/kotlin/core/tools/stringtools/StringTools.kt
diff --git a/Server/src/main/java/Server/core/worker/MajorUpdateWorker.kt b/Server/src/main/kotlin/core/worker/MajorUpdateWorker.kt
similarity index 100%
rename from Server/src/main/java/Server/core/worker/MajorUpdateWorker.kt
rename to Server/src/main/kotlin/core/worker/MajorUpdateWorker.kt
diff --git a/Server/src/main/java/Server/plugin/ai/AIRepository.kt b/Server/src/main/kotlin/plugin/ai/AIRepository.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/AIRepository.kt
rename to Server/src/main/kotlin/plugin/ai/AIRepository.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/GeneralBotCreator.kt b/Server/src/main/kotlin/plugin/ai/general/GeneralBotCreator.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/GeneralBotCreator.kt
rename to Server/src/main/kotlin/plugin/ai/general/GeneralBotCreator.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/ScriptAPI.kt b/Server/src/main/kotlin/plugin/ai/general/ScriptAPI.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/ScriptAPI.kt
rename to Server/src/main/kotlin/plugin/ai/general/ScriptAPI.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/Adventurer.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/Adventurer.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/Adventurer.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/Adventurer.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/ChickenKiller.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ChickenKiller.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/ChickenKiller.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/ChickenKiller.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/CoalMiner.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/CoalMiner.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/CoalMiner.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/CoalMiner.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/CowKiller.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/CowKiller.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/CowKiller.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/CowKiller.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/DraynorFisher.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/DraynorFisher.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/DraynorFisher.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/DraynorFisher.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/DraynorWillows.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/DraynorWillows.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/DraynorWillows.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/DraynorWillows.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/FarmerThiever.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/FarmerThiever.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/FarmerThiever.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/FarmerThiever.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/FletchingBankstander.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/FletchingBankstander.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/FletchingBankstander.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/FletchingBankstander.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/GenericSlayerBot.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/GenericSlayerBot.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/GenericSlayerBot.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/GenericSlayerBot.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/GlassBlowingBankstander.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/GlassBlowingBankstander.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/GlassBlowingBankstander.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/GlassBlowingBankstander.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/GreenDragonKiller.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/GreenDragonKiller.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/GreenDragonKiller.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/GreenDragonKiller.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/Idler.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/Idler.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/Idler.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/Idler.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/LobsterCatcher.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/LobsterCatcher.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/LobsterCatcher.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/LobsterCatcher.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/ManThiever.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ManThiever.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/ManThiever.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/ManThiever.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/NonBankingMiner.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/NonBankingMiner.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/NonBankingMiner.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/NonBankingMiner.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/PlayerCompatible.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/PlayerCompatible.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/PlayerCompatible.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/PlayerCompatible.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/PlayerScripts.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/PlayerScripts.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/PlayerScripts.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/PlayerScripts.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/ScriptDescription.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptDescription.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/ScriptDescription.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptDescription.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/ScriptIdentifier.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptIdentifier.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/ScriptIdentifier.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptIdentifier.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/ScriptName.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptName.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/ScriptName.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptName.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/SeersFlax.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/SeersFlax.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/SeersFlax.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/SeersFlax.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/SeersMagicTrees.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/SeersMagicTrees.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/SeersMagicTrees.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/SeersMagicTrees.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/SharkCatcher.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/SharkCatcher.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/SharkCatcher.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/SharkCatcher.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/VarrockEssenceMiner.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/VarrockEssenceMiner.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/VarrockEssenceMiner.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/VarrockEssenceMiner.kt
diff --git a/Server/src/main/java/Server/plugin/ai/general/scriptrepository/VarrockSmither.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/VarrockSmither.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/general/scriptrepository/VarrockSmither.kt
rename to Server/src/main/kotlin/plugin/ai/general/scriptrepository/VarrockSmither.kt
diff --git a/Server/src/main/java/Server/plugin/ai/minigamebots/pestcontrol/CombatState.kt b/Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/CombatState.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/minigamebots/pestcontrol/CombatState.kt
rename to Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/CombatState.kt
diff --git a/Server/src/main/java/Server/plugin/ai/minigamebots/pestcontrol/CombatStateIntermediate.kt b/Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/CombatStateIntermediate.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/minigamebots/pestcontrol/CombatStateIntermediate.kt
rename to Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/CombatStateIntermediate.kt
diff --git a/Server/src/main/java/Server/plugin/ai/minigamebots/pestcontrol/PestControlIntermediateBot.kt b/Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/PestControlIntermediateBot.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/minigamebots/pestcontrol/PestControlIntermediateBot.kt
rename to Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/PestControlIntermediateBot.kt
diff --git a/Server/src/main/java/Server/plugin/ai/minigamebots/pestcontrol/PestControlNoviceBot.kt b/Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/PestControlNoviceBot.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/minigamebots/pestcontrol/PestControlNoviceBot.kt
rename to Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/PestControlNoviceBot.kt
diff --git a/Server/src/main/java/Server/plugin/ai/pvmbots/CombatBot.kt b/Server/src/main/kotlin/plugin/ai/pvmbots/CombatBot.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/pvmbots/CombatBot.kt
rename to Server/src/main/kotlin/plugin/ai/pvmbots/CombatBot.kt
diff --git a/Server/src/main/java/Server/plugin/ai/pvmbots/CombatBotAssembler.kt b/Server/src/main/kotlin/plugin/ai/pvmbots/CombatBotAssembler.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/pvmbots/CombatBotAssembler.kt
rename to Server/src/main/kotlin/plugin/ai/pvmbots/CombatBotAssembler.kt
diff --git a/Server/src/main/java/Server/plugin/ai/pvmbots/PvMBotsBuilder.kt b/Server/src/main/kotlin/plugin/ai/pvmbots/PvMBotsBuilder.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/pvmbots/PvMBotsBuilder.kt
rename to Server/src/main/kotlin/plugin/ai/pvmbots/PvMBotsBuilder.kt
diff --git a/Server/src/main/java/Server/plugin/ai/skillingbot/SkillingBotAssembler.kt b/Server/src/main/kotlin/plugin/ai/skillingbot/SkillingBotAssembler.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/ai/skillingbot/SkillingBotAssembler.kt
rename to Server/src/main/kotlin/plugin/ai/skillingbot/SkillingBotAssembler.kt
diff --git a/Server/src/main/java/Server/plugin/barbtraining/fishing/BarbFishingPulse.kt b/Server/src/main/kotlin/plugin/barbtraining/fishing/BarbFishingPulse.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/barbtraining/fishing/BarbFishingPulse.kt
rename to Server/src/main/kotlin/plugin/barbtraining/fishing/BarbFishingPulse.kt
diff --git a/Server/src/main/java/Server/plugin/barbtraining/fishing/FishCuttingPulse.kt b/Server/src/main/kotlin/plugin/barbtraining/fishing/FishCuttingPulse.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/barbtraining/fishing/FishCuttingPulse.kt
rename to Server/src/main/kotlin/plugin/barbtraining/fishing/FishCuttingPulse.kt
diff --git a/Server/src/main/java/Server/plugin/barbtraining/fishing/KnifeWithFish.kt b/Server/src/main/kotlin/plugin/barbtraining/fishing/KnifeWithFish.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/barbtraining/fishing/KnifeWithFish.kt
rename to Server/src/main/kotlin/plugin/barbtraining/fishing/KnifeWithFish.kt
diff --git a/Server/src/main/java/Server/plugin/barbtraining/fishing/OptionHandlers.kt b/Server/src/main/kotlin/plugin/barbtraining/fishing/OptionHandlers.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/barbtraining/fishing/OptionHandlers.kt
rename to Server/src/main/kotlin/plugin/barbtraining/fishing/OptionHandlers.kt
diff --git a/Server/src/main/java/Server/plugin/barbtraining/fishing/SpotManager.kt b/Server/src/main/kotlin/plugin/barbtraining/fishing/SpotManager.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/barbtraining/fishing/SpotManager.kt
rename to Server/src/main/kotlin/plugin/barbtraining/fishing/SpotManager.kt
diff --git a/Server/src/main/java/Server/plugin/creditshop/CreditShop.kt b/Server/src/main/kotlin/plugin/creditshop/CreditShop.kt
similarity index 100%
rename from Server/src/main/java/Server/plugin/creditshop/CreditShop.kt
rename to Server/src/main/kotlin/plugin/creditshop/CreditShop.kt