Merge pull request #900 from vvvsrx/master

diff --git a/PokemonGo/RocketAPI/Helpers/Utils.cs b/PokemonGo/RocketAPI/Helpers/Utils.cs
deleted file mode 100644
index c7ed3e7..0000000
--- a/PokemonGo/RocketAPI/Helpers/Utils.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-namespace PokemonGo.RocketAPI.Helpers
-{
-    public class Utils
-    {
-        public static ulong FloatAsUlong(double value)
-        {
-            var bytes = BitConverter.GetBytes(value);
-            return BitConverter.ToUInt64(bytes, 0);
-        }
-    }
-}
\ No newline at end of file
diff --git a/RocketBot.sln b/RocketBot.sln
index d3f4080..fb912db 100644
--- a/RocketBot.sln
+++ b/RocketBot.sln
@@ -3,14 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PokemonGo.RocketBot", "PokemonGo\RocketAPI\Window\PokemonGo.RocketBot.csproj", "{C85B9D78-9CA3-4830-84CD-6B69090B987F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PokemonGo.RocketBot", "src\RocketBotGUI\PokemonGo.RocketBot.csproj", "{C85B9D78-9CA3-4830-84CD-6B69090B987F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB} = {A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PokemonGo.RocketAPI", "PokemonGo\RocketAPI\PokemonGo.RocketAPI.csproj", "{05D2DA44-1B8E-4CF7-94ED-4D52451CD095}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PokemonGo.RocketAPI", "src\RocketAPI\PokemonGo.RocketAPI.csproj", "{05D2DA44-1B8E-4CF7-94ED-4D52451CD095}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "POGOProtos", "PokemonGo\POGOProtos\POGOProtos.csproj", "{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "POGOProtos", "src\POGOProtos\POGOProtos.csproj", "{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/PokemonGo/POGOProtos/Data/AssetDigestEntry.cs b/src/POGOProtos/Data/AssetDigestEntry.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/AssetDigestEntry.cs
rename to src/POGOProtos/Data/AssetDigestEntry.cs
diff --git a/PokemonGo/POGOProtos/Data/Battle/BattleAction.cs b/src/POGOProtos/Data/Battle/BattleAction.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Battle/BattleAction.cs
rename to src/POGOProtos/Data/Battle/BattleAction.cs
diff --git a/PokemonGo/POGOProtos/Data/Battle/BattleActionType.cs b/src/POGOProtos/Data/Battle/BattleActionType.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Battle/BattleActionType.cs
rename to src/POGOProtos/Data/Battle/BattleActionType.cs
diff --git a/PokemonGo/POGOProtos/Data/Battle/BattleLog.cs b/src/POGOProtos/Data/Battle/BattleLog.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Battle/BattleLog.cs
rename to src/POGOProtos/Data/Battle/BattleLog.cs
diff --git a/PokemonGo/POGOProtos/Data/Battle/BattleParticipant.cs b/src/POGOProtos/Data/Battle/BattleParticipant.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Battle/BattleParticipant.cs
rename to src/POGOProtos/Data/Battle/BattleParticipant.cs
diff --git a/PokemonGo/POGOProtos/Data/Battle/BattlePokemonInfo.cs b/src/POGOProtos/Data/Battle/BattlePokemonInfo.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Battle/BattlePokemonInfo.cs
rename to src/POGOProtos/Data/Battle/BattlePokemonInfo.cs
diff --git a/PokemonGo/POGOProtos/Data/Battle/BattleResults.cs b/src/POGOProtos/Data/Battle/BattleResults.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Battle/BattleResults.cs
rename to src/POGOProtos/Data/Battle/BattleResults.cs
diff --git a/PokemonGo/POGOProtos/Data/Battle/BattleState.cs b/src/POGOProtos/Data/Battle/BattleState.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Battle/BattleState.cs
rename to src/POGOProtos/Data/Battle/BattleState.cs
diff --git a/PokemonGo/POGOProtos/Data/Battle/BattleType.cs b/src/POGOProtos/Data/Battle/BattleType.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Battle/BattleType.cs
rename to src/POGOProtos/Data/Battle/BattleType.cs
diff --git a/PokemonGo/POGOProtos/Data/Battle/POGOProtosDataBattle.cs b/src/POGOProtos/Data/Battle/POGOProtosDataBattle.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Battle/POGOProtosDataBattle.cs
rename to src/POGOProtos/Data/Battle/POGOProtosDataBattle.cs
diff --git a/PokemonGo/POGOProtos/Data/Capture/CaptureAward.cs b/src/POGOProtos/Data/Capture/CaptureAward.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Capture/CaptureAward.cs
rename to src/POGOProtos/Data/Capture/CaptureAward.cs
diff --git a/PokemonGo/POGOProtos/Data/Capture/CaptureProbability.cs b/src/POGOProtos/Data/Capture/CaptureProbability.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Capture/CaptureProbability.cs
rename to src/POGOProtos/Data/Capture/CaptureProbability.cs
diff --git a/PokemonGo/POGOProtos/Data/Capture/POGOProtosDataCapture.cs b/src/POGOProtos/Data/Capture/POGOProtosDataCapture.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Capture/POGOProtosDataCapture.cs
rename to src/POGOProtos/Data/Capture/POGOProtosDataCapture.cs
diff --git a/PokemonGo/POGOProtos/Data/DownloadUrlEntry.cs b/src/POGOProtos/Data/DownloadUrlEntry.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/DownloadUrlEntry.cs
rename to src/POGOProtos/Data/DownloadUrlEntry.cs
diff --git a/PokemonGo/POGOProtos/Data/Gym/GymMembership.cs b/src/POGOProtos/Data/Gym/GymMembership.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Gym/GymMembership.cs
rename to src/POGOProtos/Data/Gym/GymMembership.cs
diff --git a/PokemonGo/POGOProtos/Data/Gym/GymState.cs b/src/POGOProtos/Data/Gym/GymState.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Gym/GymState.cs
rename to src/POGOProtos/Data/Gym/GymState.cs
diff --git a/PokemonGo/POGOProtos/Data/Gym/POGOProtosDataGym.cs b/src/POGOProtos/Data/Gym/POGOProtosDataGym.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Gym/POGOProtosDataGym.cs
rename to src/POGOProtos/Data/Gym/POGOProtosDataGym.cs
diff --git a/PokemonGo/POGOProtos/Data/Logs/ActionLogEntry.cs b/src/POGOProtos/Data/Logs/ActionLogEntry.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Logs/ActionLogEntry.cs
rename to src/POGOProtos/Data/Logs/ActionLogEntry.cs
diff --git a/PokemonGo/POGOProtos/Data/Logs/CatchPokemonLogEntry.cs b/src/POGOProtos/Data/Logs/CatchPokemonLogEntry.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Logs/CatchPokemonLogEntry.cs
rename to src/POGOProtos/Data/Logs/CatchPokemonLogEntry.cs
diff --git a/PokemonGo/POGOProtos/Data/Logs/FortSearchLogEntry.cs b/src/POGOProtos/Data/Logs/FortSearchLogEntry.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Logs/FortSearchLogEntry.cs
rename to src/POGOProtos/Data/Logs/FortSearchLogEntry.cs
diff --git a/PokemonGo/POGOProtos/Data/Logs/POGOProtosDataLogs.cs b/src/POGOProtos/Data/Logs/POGOProtosDataLogs.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Logs/POGOProtosDataLogs.cs
rename to src/POGOProtos/Data/Logs/POGOProtosDataLogs.cs
diff --git a/PokemonGo/POGOProtos/Data/POGOProtosData.cs b/src/POGOProtos/Data/POGOProtosData.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/POGOProtosData.cs
rename to src/POGOProtos/Data/POGOProtosData.cs
diff --git a/PokemonGo/POGOProtos/Data/Player/ContactSettings.cs b/src/POGOProtos/Data/Player/ContactSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Player/ContactSettings.cs
rename to src/POGOProtos/Data/Player/ContactSettings.cs
diff --git a/PokemonGo/POGOProtos/Data/Player/Currency.cs b/src/POGOProtos/Data/Player/Currency.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Player/Currency.cs
rename to src/POGOProtos/Data/Player/Currency.cs
diff --git a/PokemonGo/POGOProtos/Data/Player/DailyBonus.cs b/src/POGOProtos/Data/Player/DailyBonus.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Player/DailyBonus.cs
rename to src/POGOProtos/Data/Player/DailyBonus.cs
diff --git a/PokemonGo/POGOProtos/Data/Player/EquippedBadge.cs b/src/POGOProtos/Data/Player/EquippedBadge.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Player/EquippedBadge.cs
rename to src/POGOProtos/Data/Player/EquippedBadge.cs
diff --git a/PokemonGo/POGOProtos/Data/Player/POGOProtosDataPlayer.cs b/src/POGOProtos/Data/Player/POGOProtosDataPlayer.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Player/POGOProtosDataPlayer.cs
rename to src/POGOProtos/Data/Player/POGOProtosDataPlayer.cs
diff --git a/PokemonGo/POGOProtos/Data/Player/PlayerAvatar.cs b/src/POGOProtos/Data/Player/PlayerAvatar.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Player/PlayerAvatar.cs
rename to src/POGOProtos/Data/Player/PlayerAvatar.cs
diff --git a/PokemonGo/POGOProtos/Data/Player/PlayerCamera.cs b/src/POGOProtos/Data/Player/PlayerCamera.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Player/PlayerCamera.cs
rename to src/POGOProtos/Data/Player/PlayerCamera.cs
diff --git a/PokemonGo/POGOProtos/Data/Player/PlayerCurrency.cs b/src/POGOProtos/Data/Player/PlayerCurrency.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Player/PlayerCurrency.cs
rename to src/POGOProtos/Data/Player/PlayerCurrency.cs
diff --git a/PokemonGo/POGOProtos/Data/Player/PlayerPublicProfile.cs b/src/POGOProtos/Data/Player/PlayerPublicProfile.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Player/PlayerPublicProfile.cs
rename to src/POGOProtos/Data/Player/PlayerPublicProfile.cs
diff --git a/PokemonGo/POGOProtos/Data/Player/PlayerStats.cs b/src/POGOProtos/Data/Player/PlayerStats.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/Player/PlayerStats.cs
rename to src/POGOProtos/Data/Player/PlayerStats.cs
diff --git a/PokemonGo/POGOProtos/Data/PlayerBadge.cs b/src/POGOProtos/Data/PlayerBadge.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/PlayerBadge.cs
rename to src/POGOProtos/Data/PlayerBadge.cs
diff --git a/PokemonGo/POGOProtos/Data/PlayerData.cs b/src/POGOProtos/Data/PlayerData.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/PlayerData.cs
rename to src/POGOProtos/Data/PlayerData.cs
diff --git a/PokemonGo/POGOProtos/Data/PokedexEntry.cs b/src/POGOProtos/Data/PokedexEntry.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/PokedexEntry.cs
rename to src/POGOProtos/Data/PokedexEntry.cs
diff --git a/PokemonGo/POGOProtos/Data/PokemonData.cs b/src/POGOProtos/Data/PokemonData.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Data/PokemonData.cs
rename to src/POGOProtos/Data/PokemonData.cs
diff --git a/PokemonGo/POGOProtos/Enums/ActivityType.cs b/src/POGOProtos/Enums/ActivityType.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/ActivityType.cs
rename to src/POGOProtos/Enums/ActivityType.cs
diff --git a/PokemonGo/POGOProtos/Enums/BadgeType.cs b/src/POGOProtos/Enums/BadgeType.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/BadgeType.cs
rename to src/POGOProtos/Enums/BadgeType.cs
diff --git a/PokemonGo/POGOProtos/Enums/CameraInterpolation.cs b/src/POGOProtos/Enums/CameraInterpolation.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/CameraInterpolation.cs
rename to src/POGOProtos/Enums/CameraInterpolation.cs
diff --git a/PokemonGo/POGOProtos/Enums/CameraTarget.cs b/src/POGOProtos/Enums/CameraTarget.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/CameraTarget.cs
rename to src/POGOProtos/Enums/CameraTarget.cs
diff --git a/PokemonGo/POGOProtos/Enums/Gender.cs b/src/POGOProtos/Enums/Gender.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/Gender.cs
rename to src/POGOProtos/Enums/Gender.cs
diff --git a/PokemonGo/POGOProtos/Enums/IapItemCategory.cs b/src/POGOProtos/Enums/IapItemCategory.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/IapItemCategory.cs
rename to src/POGOProtos/Enums/IapItemCategory.cs
diff --git a/PokemonGo/POGOProtos/Enums/ItemCategory.cs b/src/POGOProtos/Enums/ItemCategory.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/ItemCategory.cs
rename to src/POGOProtos/Enums/ItemCategory.cs
diff --git a/PokemonGo/POGOProtos/Enums/ItemEffect.cs b/src/POGOProtos/Enums/ItemEffect.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/ItemEffect.cs
rename to src/POGOProtos/Enums/ItemEffect.cs
diff --git a/PokemonGo/POGOProtos/Enums/POGOProtosEnums.cs b/src/POGOProtos/Enums/POGOProtosEnums.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/POGOProtosEnums.cs
rename to src/POGOProtos/Enums/POGOProtosEnums.cs
diff --git a/PokemonGo/POGOProtos/Enums/Platform.cs b/src/POGOProtos/Enums/Platform.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/Platform.cs
rename to src/POGOProtos/Enums/Platform.cs
diff --git a/PokemonGo/POGOProtos/Enums/PokemonFamilyId.cs b/src/POGOProtos/Enums/PokemonFamilyId.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/PokemonFamilyId.cs
rename to src/POGOProtos/Enums/PokemonFamilyId.cs
diff --git a/PokemonGo/POGOProtos/Enums/PokemonId.cs b/src/POGOProtos/Enums/PokemonId.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/PokemonId.cs
rename to src/POGOProtos/Enums/PokemonId.cs
diff --git a/PokemonGo/POGOProtos/Enums/PokemonMove.cs b/src/POGOProtos/Enums/PokemonMove.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/PokemonMove.cs
rename to src/POGOProtos/Enums/PokemonMove.cs
diff --git a/PokemonGo/POGOProtos/Enums/PokemonMovementType.cs b/src/POGOProtos/Enums/PokemonMovementType.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/PokemonMovementType.cs
rename to src/POGOProtos/Enums/PokemonMovementType.cs
diff --git a/PokemonGo/POGOProtos/Enums/PokemonRarity.cs b/src/POGOProtos/Enums/PokemonRarity.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/PokemonRarity.cs
rename to src/POGOProtos/Enums/PokemonRarity.cs
diff --git a/PokemonGo/POGOProtos/Enums/PokemonType.cs b/src/POGOProtos/Enums/PokemonType.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/PokemonType.cs
rename to src/POGOProtos/Enums/PokemonType.cs
diff --git a/PokemonGo/POGOProtos/Enums/TeamColor.cs b/src/POGOProtos/Enums/TeamColor.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/TeamColor.cs
rename to src/POGOProtos/Enums/TeamColor.cs
diff --git a/PokemonGo/POGOProtos/Enums/TutorialState.cs b/src/POGOProtos/Enums/TutorialState.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Enums/TutorialState.cs
rename to src/POGOProtos/Enums/TutorialState.cs
diff --git a/PokemonGo/POGOProtos/Inventory/AppliedItem.cs b/src/POGOProtos/Inventory/AppliedItem.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/AppliedItem.cs
rename to src/POGOProtos/Inventory/AppliedItem.cs
diff --git a/PokemonGo/POGOProtos/Inventory/AppliedItems.cs b/src/POGOProtos/Inventory/AppliedItems.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/AppliedItems.cs
rename to src/POGOProtos/Inventory/AppliedItems.cs
diff --git a/PokemonGo/POGOProtos/Inventory/Candy.cs b/src/POGOProtos/Inventory/Candy.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/Candy.cs
rename to src/POGOProtos/Inventory/Candy.cs
diff --git a/PokemonGo/POGOProtos/Inventory/EggIncubator.cs b/src/POGOProtos/Inventory/EggIncubator.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/EggIncubator.cs
rename to src/POGOProtos/Inventory/EggIncubator.cs
diff --git a/PokemonGo/POGOProtos/Inventory/EggIncubatorType.cs b/src/POGOProtos/Inventory/EggIncubatorType.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/EggIncubatorType.cs
rename to src/POGOProtos/Inventory/EggIncubatorType.cs
diff --git a/PokemonGo/POGOProtos/Inventory/EggIncubators.cs b/src/POGOProtos/Inventory/EggIncubators.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/EggIncubators.cs
rename to src/POGOProtos/Inventory/EggIncubators.cs
diff --git a/PokemonGo/POGOProtos/Inventory/InventoryDelta.cs b/src/POGOProtos/Inventory/InventoryDelta.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/InventoryDelta.cs
rename to src/POGOProtos/Inventory/InventoryDelta.cs
diff --git a/PokemonGo/POGOProtos/Inventory/InventoryItem.cs b/src/POGOProtos/Inventory/InventoryItem.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/InventoryItem.cs
rename to src/POGOProtos/Inventory/InventoryItem.cs
diff --git a/PokemonGo/POGOProtos/Inventory/InventoryItemData.cs b/src/POGOProtos/Inventory/InventoryItemData.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/InventoryItemData.cs
rename to src/POGOProtos/Inventory/InventoryItemData.cs
diff --git a/PokemonGo/POGOProtos/Inventory/InventoryUpgrade.cs b/src/POGOProtos/Inventory/InventoryUpgrade.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/InventoryUpgrade.cs
rename to src/POGOProtos/Inventory/InventoryUpgrade.cs
diff --git a/PokemonGo/POGOProtos/Inventory/InventoryUpgradeType.cs b/src/POGOProtos/Inventory/InventoryUpgradeType.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/InventoryUpgradeType.cs
rename to src/POGOProtos/Inventory/InventoryUpgradeType.cs
diff --git a/PokemonGo/POGOProtos/Inventory/InventoryUpgrades.cs b/src/POGOProtos/Inventory/InventoryUpgrades.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/InventoryUpgrades.cs
rename to src/POGOProtos/Inventory/InventoryUpgrades.cs
diff --git a/PokemonGo/POGOProtos/Inventory/Item/ItemAward.cs b/src/POGOProtos/Inventory/Item/ItemAward.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/Item/ItemAward.cs
rename to src/POGOProtos/Inventory/Item/ItemAward.cs
diff --git a/PokemonGo/POGOProtos/Inventory/Item/ItemData.cs b/src/POGOProtos/Inventory/Item/ItemData.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/Item/ItemData.cs
rename to src/POGOProtos/Inventory/Item/ItemData.cs
diff --git a/PokemonGo/POGOProtos/Inventory/Item/ItemId.cs b/src/POGOProtos/Inventory/Item/ItemId.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/Item/ItemId.cs
rename to src/POGOProtos/Inventory/Item/ItemId.cs
diff --git a/PokemonGo/POGOProtos/Inventory/Item/ItemType.cs b/src/POGOProtos/Inventory/Item/ItemType.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/Item/ItemType.cs
rename to src/POGOProtos/Inventory/Item/ItemType.cs
diff --git a/PokemonGo/POGOProtos/Inventory/Item/POGOProtosInventoryItem.cs b/src/POGOProtos/Inventory/Item/POGOProtosInventoryItem.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/Item/POGOProtosInventoryItem.cs
rename to src/POGOProtos/Inventory/Item/POGOProtosInventoryItem.cs
diff --git a/PokemonGo/POGOProtos/Inventory/POGOProtosInventory.cs b/src/POGOProtos/Inventory/POGOProtosInventory.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Inventory/POGOProtosInventory.cs
rename to src/POGOProtos/Inventory/POGOProtosInventory.cs
diff --git a/PokemonGo/POGOProtos/Map/Fort/FortData.cs b/src/POGOProtos/Map/Fort/FortData.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/Fort/FortData.cs
rename to src/POGOProtos/Map/Fort/FortData.cs
diff --git a/PokemonGo/POGOProtos/Map/Fort/FortLureInfo.cs b/src/POGOProtos/Map/Fort/FortLureInfo.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/Fort/FortLureInfo.cs
rename to src/POGOProtos/Map/Fort/FortLureInfo.cs
diff --git a/PokemonGo/POGOProtos/Map/Fort/FortModifier.cs b/src/POGOProtos/Map/Fort/FortModifier.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/Fort/FortModifier.cs
rename to src/POGOProtos/Map/Fort/FortModifier.cs
diff --git a/PokemonGo/POGOProtos/Map/Fort/FortRenderingType.cs b/src/POGOProtos/Map/Fort/FortRenderingType.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/Fort/FortRenderingType.cs
rename to src/POGOProtos/Map/Fort/FortRenderingType.cs
diff --git a/PokemonGo/POGOProtos/Map/Fort/FortSponsor.cs b/src/POGOProtos/Map/Fort/FortSponsor.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/Fort/FortSponsor.cs
rename to src/POGOProtos/Map/Fort/FortSponsor.cs
diff --git a/PokemonGo/POGOProtos/Map/Fort/FortSummary.cs b/src/POGOProtos/Map/Fort/FortSummary.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/Fort/FortSummary.cs
rename to src/POGOProtos/Map/Fort/FortSummary.cs
diff --git a/PokemonGo/POGOProtos/Map/Fort/FortType.cs b/src/POGOProtos/Map/Fort/FortType.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/Fort/FortType.cs
rename to src/POGOProtos/Map/Fort/FortType.cs
diff --git a/PokemonGo/POGOProtos/Map/Fort/POGOProtosMapFort.cs b/src/POGOProtos/Map/Fort/POGOProtosMapFort.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/Fort/POGOProtosMapFort.cs
rename to src/POGOProtos/Map/Fort/POGOProtosMapFort.cs
diff --git a/PokemonGo/POGOProtos/Map/MapCell.cs b/src/POGOProtos/Map/MapCell.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/MapCell.cs
rename to src/POGOProtos/Map/MapCell.cs
diff --git a/PokemonGo/POGOProtos/Map/MapObjectsStatus.cs b/src/POGOProtos/Map/MapObjectsStatus.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/MapObjectsStatus.cs
rename to src/POGOProtos/Map/MapObjectsStatus.cs
diff --git a/PokemonGo/POGOProtos/Map/POGOProtosMap.cs b/src/POGOProtos/Map/POGOProtosMap.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/POGOProtosMap.cs
rename to src/POGOProtos/Map/POGOProtosMap.cs
diff --git a/PokemonGo/POGOProtos/Map/Pokemon/MapPokemon.cs b/src/POGOProtos/Map/Pokemon/MapPokemon.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/Pokemon/MapPokemon.cs
rename to src/POGOProtos/Map/Pokemon/MapPokemon.cs
diff --git a/PokemonGo/POGOProtos/Map/Pokemon/NearbyPokemon.cs b/src/POGOProtos/Map/Pokemon/NearbyPokemon.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/Pokemon/NearbyPokemon.cs
rename to src/POGOProtos/Map/Pokemon/NearbyPokemon.cs
diff --git a/PokemonGo/POGOProtos/Map/Pokemon/POGOProtosMapPokemon.cs b/src/POGOProtos/Map/Pokemon/POGOProtosMapPokemon.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/Pokemon/POGOProtosMapPokemon.cs
rename to src/POGOProtos/Map/Pokemon/POGOProtosMapPokemon.cs
diff --git a/PokemonGo/POGOProtos/Map/Pokemon/WildPokemon.cs b/src/POGOProtos/Map/Pokemon/WildPokemon.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/Pokemon/WildPokemon.cs
rename to src/POGOProtos/Map/Pokemon/WildPokemon.cs
diff --git a/PokemonGo/POGOProtos/Map/SpawnPoint.cs b/src/POGOProtos/Map/SpawnPoint.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Map/SpawnPoint.cs
rename to src/POGOProtos/Map/SpawnPoint.cs
diff --git a/PokemonGo/POGOProtos/Networking/Envelopes/AuthTicket.cs b/src/POGOProtos/Networking/Envelopes/AuthTicket.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Envelopes/AuthTicket.cs
rename to src/POGOProtos/Networking/Envelopes/AuthTicket.cs
diff --git a/PokemonGo/POGOProtos/Networking/Envelopes/POGOProtosNetworkingEnvelopes.cs b/src/POGOProtos/Networking/Envelopes/POGOProtosNetworkingEnvelopes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Envelopes/POGOProtosNetworkingEnvelopes.cs
rename to src/POGOProtos/Networking/Envelopes/POGOProtosNetworkingEnvelopes.cs
diff --git a/PokemonGo/POGOProtos/Networking/Envelopes/RequestEnvelope.cs b/src/POGOProtos/Networking/Envelopes/RequestEnvelope.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Envelopes/RequestEnvelope.cs
rename to src/POGOProtos/Networking/Envelopes/RequestEnvelope.cs
diff --git a/PokemonGo/POGOProtos/Networking/Envelopes/ResponseEnvelope.cs b/src/POGOProtos/Networking/Envelopes/ResponseEnvelope.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Envelopes/ResponseEnvelope.cs
rename to src/POGOProtos/Networking/Envelopes/ResponseEnvelope.cs
diff --git a/PokemonGo/POGOProtos/Networking/Envelopes/Unknown6.cs b/src/POGOProtos/Networking/Envelopes/Unknown6.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Envelopes/Unknown6.cs
rename to src/POGOProtos/Networking/Envelopes/Unknown6.cs
diff --git a/PokemonGo/POGOProtos/Networking/Envelopes/Unknown6Response.cs b/src/POGOProtos/Networking/Envelopes/Unknown6Response.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Envelopes/Unknown6Response.cs
rename to src/POGOProtos/Networking/Envelopes/Unknown6Response.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/AddFortModifierMessage.cs b/src/POGOProtos/Networking/Requests/Messages/AddFortModifierMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/AddFortModifierMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/AddFortModifierMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/AttackGymMessage.cs b/src/POGOProtos/Networking/Requests/Messages/AttackGymMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/AttackGymMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/AttackGymMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/CatchPokemonMessage.cs b/src/POGOProtos/Networking/Requests/Messages/CatchPokemonMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/CatchPokemonMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/CatchPokemonMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/CheckAwardedBadgesMessage.cs b/src/POGOProtos/Networking/Requests/Messages/CheckAwardedBadgesMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/CheckAwardedBadgesMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/CheckAwardedBadgesMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/CheckCodenameAvailableMessage.cs b/src/POGOProtos/Networking/Requests/Messages/CheckCodenameAvailableMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/CheckCodenameAvailableMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/CheckCodenameAvailableMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/ClaimCodenameMessage.cs b/src/POGOProtos/Networking/Requests/Messages/ClaimCodenameMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/ClaimCodenameMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/ClaimCodenameMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/CollectDailyBonusMessage.cs b/src/POGOProtos/Networking/Requests/Messages/CollectDailyBonusMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/CollectDailyBonusMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/CollectDailyBonusMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/CollectDailyDefenderBonusMessage.cs b/src/POGOProtos/Networking/Requests/Messages/CollectDailyDefenderBonusMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/CollectDailyDefenderBonusMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/CollectDailyDefenderBonusMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/DiskEncounterMessage.cs b/src/POGOProtos/Networking/Requests/Messages/DiskEncounterMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/DiskEncounterMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/DiskEncounterMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/DownloadItemTemplatesMessage.cs b/src/POGOProtos/Networking/Requests/Messages/DownloadItemTemplatesMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/DownloadItemTemplatesMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/DownloadItemTemplatesMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/DownloadRemoteConfigVersionMessage.cs b/src/POGOProtos/Networking/Requests/Messages/DownloadRemoteConfigVersionMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/DownloadRemoteConfigVersionMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/DownloadRemoteConfigVersionMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/DownloadSettingsMessage.cs b/src/POGOProtos/Networking/Requests/Messages/DownloadSettingsMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/DownloadSettingsMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/DownloadSettingsMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/EchoMessage.cs b/src/POGOProtos/Networking/Requests/Messages/EchoMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/EchoMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/EchoMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/EncounterMessage.cs b/src/POGOProtos/Networking/Requests/Messages/EncounterMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/EncounterMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/EncounterMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/EncounterTutorialCompleteMessage.cs b/src/POGOProtos/Networking/Requests/Messages/EncounterTutorialCompleteMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/EncounterTutorialCompleteMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/EncounterTutorialCompleteMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/EquipBadgeMessage.cs b/src/POGOProtos/Networking/Requests/Messages/EquipBadgeMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/EquipBadgeMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/EquipBadgeMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/EvolvePokemonMessage.cs b/src/POGOProtos/Networking/Requests/Messages/EvolvePokemonMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/EvolvePokemonMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/EvolvePokemonMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/FortDeployPokemonMessage.cs b/src/POGOProtos/Networking/Requests/Messages/FortDeployPokemonMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/FortDeployPokemonMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/FortDeployPokemonMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/FortDetailsMessage.cs b/src/POGOProtos/Networking/Requests/Messages/FortDetailsMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/FortDetailsMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/FortDetailsMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/FortRecallPokemonMessage.cs b/src/POGOProtos/Networking/Requests/Messages/FortRecallPokemonMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/FortRecallPokemonMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/FortRecallPokemonMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/FortSearchMessage.cs b/src/POGOProtos/Networking/Requests/Messages/FortSearchMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/FortSearchMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/FortSearchMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/GetAssetDigestMessage.cs b/src/POGOProtos/Networking/Requests/Messages/GetAssetDigestMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/GetAssetDigestMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/GetAssetDigestMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/GetDownloadUrlsMessage.cs b/src/POGOProtos/Networking/Requests/Messages/GetDownloadUrlsMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/GetDownloadUrlsMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/GetDownloadUrlsMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/GetGymDetailsMessage.cs b/src/POGOProtos/Networking/Requests/Messages/GetGymDetailsMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/GetGymDetailsMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/GetGymDetailsMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/GetHatchedEggsMessage.cs b/src/POGOProtos/Networking/Requests/Messages/GetHatchedEggsMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/GetHatchedEggsMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/GetHatchedEggsMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/GetIncensePokemonMessage.cs b/src/POGOProtos/Networking/Requests/Messages/GetIncensePokemonMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/GetIncensePokemonMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/GetIncensePokemonMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/GetInventoryMessage.cs b/src/POGOProtos/Networking/Requests/Messages/GetInventoryMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/GetInventoryMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/GetInventoryMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/GetMapObjectsMessage.cs b/src/POGOProtos/Networking/Requests/Messages/GetMapObjectsMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/GetMapObjectsMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/GetMapObjectsMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/GetPlayerMessage.cs b/src/POGOProtos/Networking/Requests/Messages/GetPlayerMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/GetPlayerMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/GetPlayerMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/GetPlayerProfileMessage.cs b/src/POGOProtos/Networking/Requests/Messages/GetPlayerProfileMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/GetPlayerProfileMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/GetPlayerProfileMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/GetSuggestedCodenamesMessage.cs b/src/POGOProtos/Networking/Requests/Messages/GetSuggestedCodenamesMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/GetSuggestedCodenamesMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/GetSuggestedCodenamesMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/IncenseEncounterMessage.cs b/src/POGOProtos/Networking/Requests/Messages/IncenseEncounterMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/IncenseEncounterMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/IncenseEncounterMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/LevelUpRewardsMessage.cs b/src/POGOProtos/Networking/Requests/Messages/LevelUpRewardsMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/LevelUpRewardsMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/LevelUpRewardsMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/MarkTutorialCompleteMessage.cs b/src/POGOProtos/Networking/Requests/Messages/MarkTutorialCompleteMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/MarkTutorialCompleteMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/MarkTutorialCompleteMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/NicknamePokemonMessage.cs b/src/POGOProtos/Networking/Requests/Messages/NicknamePokemonMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/NicknamePokemonMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/NicknamePokemonMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/POGOProtosNetworkingRequestsMessages.cs b/src/POGOProtos/Networking/Requests/Messages/POGOProtosNetworkingRequestsMessages.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/POGOProtosNetworkingRequestsMessages.cs
rename to src/POGOProtos/Networking/Requests/Messages/POGOProtosNetworkingRequestsMessages.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/PlayerUpdateMessage.cs b/src/POGOProtos/Networking/Requests/Messages/PlayerUpdateMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/PlayerUpdateMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/PlayerUpdateMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/RecycleInventoryItemMessage.cs b/src/POGOProtos/Networking/Requests/Messages/RecycleInventoryItemMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/RecycleInventoryItemMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/RecycleInventoryItemMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/ReleasePokemonMessage.cs b/src/POGOProtos/Networking/Requests/Messages/ReleasePokemonMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/ReleasePokemonMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/ReleasePokemonMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/SetAvatarMessage.cs b/src/POGOProtos/Networking/Requests/Messages/SetAvatarMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/SetAvatarMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/SetAvatarMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/SetContactSettingsMessage.cs b/src/POGOProtos/Networking/Requests/Messages/SetContactSettingsMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/SetContactSettingsMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/SetContactSettingsMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/SetFavoritePokemonMessage.cs b/src/POGOProtos/Networking/Requests/Messages/SetFavoritePokemonMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/SetFavoritePokemonMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/SetFavoritePokemonMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/SetPlayerTeamMessage.cs b/src/POGOProtos/Networking/Requests/Messages/SetPlayerTeamMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/SetPlayerTeamMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/SetPlayerTeamMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/SfidaActionLogMessage.cs b/src/POGOProtos/Networking/Requests/Messages/SfidaActionLogMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/SfidaActionLogMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/SfidaActionLogMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/StartGymBattleMessage.cs b/src/POGOProtos/Networking/Requests/Messages/StartGymBattleMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/StartGymBattleMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/StartGymBattleMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/UpgradePokemonMessage.cs b/src/POGOProtos/Networking/Requests/Messages/UpgradePokemonMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/UpgradePokemonMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/UpgradePokemonMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/UseIncenseMessage.cs b/src/POGOProtos/Networking/Requests/Messages/UseIncenseMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/UseIncenseMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/UseIncenseMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/UseItemCaptureMessage.cs b/src/POGOProtos/Networking/Requests/Messages/UseItemCaptureMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/UseItemCaptureMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/UseItemCaptureMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/UseItemEggIncubatorMessage.cs b/src/POGOProtos/Networking/Requests/Messages/UseItemEggIncubatorMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/UseItemEggIncubatorMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/UseItemEggIncubatorMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/UseItemGymMessage.cs b/src/POGOProtos/Networking/Requests/Messages/UseItemGymMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/UseItemGymMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/UseItemGymMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/UseItemPotionMessage.cs b/src/POGOProtos/Networking/Requests/Messages/UseItemPotionMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/UseItemPotionMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/UseItemPotionMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/UseItemReviveMessage.cs b/src/POGOProtos/Networking/Requests/Messages/UseItemReviveMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/UseItemReviveMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/UseItemReviveMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Messages/UseItemXpBoostMessage.cs b/src/POGOProtos/Networking/Requests/Messages/UseItemXpBoostMessage.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Messages/UseItemXpBoostMessage.cs
rename to src/POGOProtos/Networking/Requests/Messages/UseItemXpBoostMessage.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/POGOProtosNetworkingRequests.cs b/src/POGOProtos/Networking/Requests/POGOProtosNetworkingRequests.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/POGOProtosNetworkingRequests.cs
rename to src/POGOProtos/Networking/Requests/POGOProtosNetworkingRequests.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/Request.cs b/src/POGOProtos/Networking/Requests/Request.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/Request.cs
rename to src/POGOProtos/Networking/Requests/Request.cs
diff --git a/PokemonGo/POGOProtos/Networking/Requests/RequestType.cs b/src/POGOProtos/Networking/Requests/RequestType.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Requests/RequestType.cs
rename to src/POGOProtos/Networking/Requests/RequestType.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/AddFortModifierResponse.cs b/src/POGOProtos/Networking/Responses/AddFortModifierResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/AddFortModifierResponse.cs
rename to src/POGOProtos/Networking/Responses/AddFortModifierResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/AttackGymResponse.cs b/src/POGOProtos/Networking/Responses/AttackGymResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/AttackGymResponse.cs
rename to src/POGOProtos/Networking/Responses/AttackGymResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/CatchPokemonResponse.cs b/src/POGOProtos/Networking/Responses/CatchPokemonResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/CatchPokemonResponse.cs
rename to src/POGOProtos/Networking/Responses/CatchPokemonResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/CheckAwardedBadgesResponse.cs b/src/POGOProtos/Networking/Responses/CheckAwardedBadgesResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/CheckAwardedBadgesResponse.cs
rename to src/POGOProtos/Networking/Responses/CheckAwardedBadgesResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/CheckCodenameAvailableResponse.cs b/src/POGOProtos/Networking/Responses/CheckCodenameAvailableResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/CheckCodenameAvailableResponse.cs
rename to src/POGOProtos/Networking/Responses/CheckCodenameAvailableResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/ClaimCodenameResponse.cs b/src/POGOProtos/Networking/Responses/ClaimCodenameResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/ClaimCodenameResponse.cs
rename to src/POGOProtos/Networking/Responses/ClaimCodenameResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/CollectDailyBonusResponse.cs b/src/POGOProtos/Networking/Responses/CollectDailyBonusResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/CollectDailyBonusResponse.cs
rename to src/POGOProtos/Networking/Responses/CollectDailyBonusResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/CollectDailyDefenderBonusResponse.cs b/src/POGOProtos/Networking/Responses/CollectDailyDefenderBonusResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/CollectDailyDefenderBonusResponse.cs
rename to src/POGOProtos/Networking/Responses/CollectDailyDefenderBonusResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/DiskEncounterResponse.cs b/src/POGOProtos/Networking/Responses/DiskEncounterResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/DiskEncounterResponse.cs
rename to src/POGOProtos/Networking/Responses/DiskEncounterResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/DownloadItemTemplatesResponse.cs b/src/POGOProtos/Networking/Responses/DownloadItemTemplatesResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/DownloadItemTemplatesResponse.cs
rename to src/POGOProtos/Networking/Responses/DownloadItemTemplatesResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/DownloadRemoteConfigVersionResponse.cs b/src/POGOProtos/Networking/Responses/DownloadRemoteConfigVersionResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/DownloadRemoteConfigVersionResponse.cs
rename to src/POGOProtos/Networking/Responses/DownloadRemoteConfigVersionResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/DownloadSettingsResponse.cs b/src/POGOProtos/Networking/Responses/DownloadSettingsResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/DownloadSettingsResponse.cs
rename to src/POGOProtos/Networking/Responses/DownloadSettingsResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/EchoResponse.cs b/src/POGOProtos/Networking/Responses/EchoResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/EchoResponse.cs
rename to src/POGOProtos/Networking/Responses/EchoResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/EncounterResponse.cs b/src/POGOProtos/Networking/Responses/EncounterResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/EncounterResponse.cs
rename to src/POGOProtos/Networking/Responses/EncounterResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/EncounterTutorialCompleteResponse.cs b/src/POGOProtos/Networking/Responses/EncounterTutorialCompleteResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/EncounterTutorialCompleteResponse.cs
rename to src/POGOProtos/Networking/Responses/EncounterTutorialCompleteResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/EquipBadgeResponse.cs b/src/POGOProtos/Networking/Responses/EquipBadgeResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/EquipBadgeResponse.cs
rename to src/POGOProtos/Networking/Responses/EquipBadgeResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/EvolvePokemonResponse.cs b/src/POGOProtos/Networking/Responses/EvolvePokemonResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/EvolvePokemonResponse.cs
rename to src/POGOProtos/Networking/Responses/EvolvePokemonResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/FortDeployPokemonResponse.cs b/src/POGOProtos/Networking/Responses/FortDeployPokemonResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/FortDeployPokemonResponse.cs
rename to src/POGOProtos/Networking/Responses/FortDeployPokemonResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/FortDetailsResponse.cs b/src/POGOProtos/Networking/Responses/FortDetailsResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/FortDetailsResponse.cs
rename to src/POGOProtos/Networking/Responses/FortDetailsResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/FortRecallPokemonResponse.cs b/src/POGOProtos/Networking/Responses/FortRecallPokemonResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/FortRecallPokemonResponse.cs
rename to src/POGOProtos/Networking/Responses/FortRecallPokemonResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/FortSearchResponse.cs b/src/POGOProtos/Networking/Responses/FortSearchResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/FortSearchResponse.cs
rename to src/POGOProtos/Networking/Responses/FortSearchResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/GetAssetDigestResponse.cs b/src/POGOProtos/Networking/Responses/GetAssetDigestResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/GetAssetDigestResponse.cs
rename to src/POGOProtos/Networking/Responses/GetAssetDigestResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/GetDownloadUrlsResponse.cs b/src/POGOProtos/Networking/Responses/GetDownloadUrlsResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/GetDownloadUrlsResponse.cs
rename to src/POGOProtos/Networking/Responses/GetDownloadUrlsResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/GetGymDetailsResponse.cs b/src/POGOProtos/Networking/Responses/GetGymDetailsResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/GetGymDetailsResponse.cs
rename to src/POGOProtos/Networking/Responses/GetGymDetailsResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/GetHatchedEggsResponse.cs b/src/POGOProtos/Networking/Responses/GetHatchedEggsResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/GetHatchedEggsResponse.cs
rename to src/POGOProtos/Networking/Responses/GetHatchedEggsResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/GetIncensePokemonResponse.cs b/src/POGOProtos/Networking/Responses/GetIncensePokemonResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/GetIncensePokemonResponse.cs
rename to src/POGOProtos/Networking/Responses/GetIncensePokemonResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/GetInventoryResponse.cs b/src/POGOProtos/Networking/Responses/GetInventoryResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/GetInventoryResponse.cs
rename to src/POGOProtos/Networking/Responses/GetInventoryResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/GetMapObjectsResponse.cs b/src/POGOProtos/Networking/Responses/GetMapObjectsResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/GetMapObjectsResponse.cs
rename to src/POGOProtos/Networking/Responses/GetMapObjectsResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/GetPlayerProfileResponse.cs b/src/POGOProtos/Networking/Responses/GetPlayerProfileResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/GetPlayerProfileResponse.cs
rename to src/POGOProtos/Networking/Responses/GetPlayerProfileResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/GetPlayerResponse.cs b/src/POGOProtos/Networking/Responses/GetPlayerResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/GetPlayerResponse.cs
rename to src/POGOProtos/Networking/Responses/GetPlayerResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/GetSuggestedCodenamesResponse.cs b/src/POGOProtos/Networking/Responses/GetSuggestedCodenamesResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/GetSuggestedCodenamesResponse.cs
rename to src/POGOProtos/Networking/Responses/GetSuggestedCodenamesResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/IncenseEncounterResponse.cs b/src/POGOProtos/Networking/Responses/IncenseEncounterResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/IncenseEncounterResponse.cs
rename to src/POGOProtos/Networking/Responses/IncenseEncounterResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/LevelUpRewardsResponse.cs b/src/POGOProtos/Networking/Responses/LevelUpRewardsResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/LevelUpRewardsResponse.cs
rename to src/POGOProtos/Networking/Responses/LevelUpRewardsResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/MarkTutorialCompleteResponse.cs b/src/POGOProtos/Networking/Responses/MarkTutorialCompleteResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/MarkTutorialCompleteResponse.cs
rename to src/POGOProtos/Networking/Responses/MarkTutorialCompleteResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/NicknamePokemonResponse.cs b/src/POGOProtos/Networking/Responses/NicknamePokemonResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/NicknamePokemonResponse.cs
rename to src/POGOProtos/Networking/Responses/NicknamePokemonResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/POGOProtosNetworkingResponses.cs b/src/POGOProtos/Networking/Responses/POGOProtosNetworkingResponses.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/POGOProtosNetworkingResponses.cs
rename to src/POGOProtos/Networking/Responses/POGOProtosNetworkingResponses.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/PlayerUpdateResponse.cs b/src/POGOProtos/Networking/Responses/PlayerUpdateResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/PlayerUpdateResponse.cs
rename to src/POGOProtos/Networking/Responses/PlayerUpdateResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/RecycleInventoryItemResponse.cs b/src/POGOProtos/Networking/Responses/RecycleInventoryItemResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/RecycleInventoryItemResponse.cs
rename to src/POGOProtos/Networking/Responses/RecycleInventoryItemResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/ReleasePokemonResponse.cs b/src/POGOProtos/Networking/Responses/ReleasePokemonResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/ReleasePokemonResponse.cs
rename to src/POGOProtos/Networking/Responses/ReleasePokemonResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/SetAvatarResponse.cs b/src/POGOProtos/Networking/Responses/SetAvatarResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/SetAvatarResponse.cs
rename to src/POGOProtos/Networking/Responses/SetAvatarResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/SetContactSettingsResponse.cs b/src/POGOProtos/Networking/Responses/SetContactSettingsResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/SetContactSettingsResponse.cs
rename to src/POGOProtos/Networking/Responses/SetContactSettingsResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/SetFavoritePokemonResponse.cs b/src/POGOProtos/Networking/Responses/SetFavoritePokemonResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/SetFavoritePokemonResponse.cs
rename to src/POGOProtos/Networking/Responses/SetFavoritePokemonResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/SetPlayerTeamResponse.cs b/src/POGOProtos/Networking/Responses/SetPlayerTeamResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/SetPlayerTeamResponse.cs
rename to src/POGOProtos/Networking/Responses/SetPlayerTeamResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/SfidaActionLogResponse.cs b/src/POGOProtos/Networking/Responses/SfidaActionLogResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/SfidaActionLogResponse.cs
rename to src/POGOProtos/Networking/Responses/SfidaActionLogResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/StartGymBattleResponse.cs b/src/POGOProtos/Networking/Responses/StartGymBattleResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/StartGymBattleResponse.cs
rename to src/POGOProtos/Networking/Responses/StartGymBattleResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/UpgradePokemonResponse.cs b/src/POGOProtos/Networking/Responses/UpgradePokemonResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/UpgradePokemonResponse.cs
rename to src/POGOProtos/Networking/Responses/UpgradePokemonResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/UseIncenseResponse.cs b/src/POGOProtos/Networking/Responses/UseIncenseResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/UseIncenseResponse.cs
rename to src/POGOProtos/Networking/Responses/UseIncenseResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/UseItemCaptureResponse.cs b/src/POGOProtos/Networking/Responses/UseItemCaptureResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/UseItemCaptureResponse.cs
rename to src/POGOProtos/Networking/Responses/UseItemCaptureResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/UseItemEggIncubatorResponse.cs b/src/POGOProtos/Networking/Responses/UseItemEggIncubatorResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/UseItemEggIncubatorResponse.cs
rename to src/POGOProtos/Networking/Responses/UseItemEggIncubatorResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/UseItemGymResponse.cs b/src/POGOProtos/Networking/Responses/UseItemGymResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/UseItemGymResponse.cs
rename to src/POGOProtos/Networking/Responses/UseItemGymResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/UseItemPotionResponse.cs b/src/POGOProtos/Networking/Responses/UseItemPotionResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/UseItemPotionResponse.cs
rename to src/POGOProtos/Networking/Responses/UseItemPotionResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/UseItemReviveResponse.cs b/src/POGOProtos/Networking/Responses/UseItemReviveResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/UseItemReviveResponse.cs
rename to src/POGOProtos/Networking/Responses/UseItemReviveResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Responses/UseItemXpBoostResponse.cs b/src/POGOProtos/Networking/Responses/UseItemXpBoostResponse.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Responses/UseItemXpBoostResponse.cs
rename to src/POGOProtos/Networking/Responses/UseItemXpBoostResponse.cs
diff --git a/PokemonGo/POGOProtos/Networking/Signature.cs b/src/POGOProtos/Networking/Signature.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Signature.cs
rename to src/POGOProtos/Networking/Signature.cs
diff --git a/PokemonGo/POGOProtos/Networking/Signature/POGOProtosNetworkingSignature.cs b/src/POGOProtos/Networking/Signature/POGOProtosNetworkingSignature.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Networking/Signature/POGOProtosNetworkingSignature.cs
rename to src/POGOProtos/Networking/Signature/POGOProtosNetworkingSignature.cs
diff --git a/PokemonGo/POGOProtos/POGOProtos.csproj b/src/POGOProtos/POGOProtos.csproj
similarity index 100%
rename from PokemonGo/POGOProtos/POGOProtos.csproj
rename to src/POGOProtos/POGOProtos.csproj
diff --git a/PokemonGo/POGOProtos/Properties/AssemblyInfo.cs b/src/POGOProtos/Properties/AssemblyInfo.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Properties/AssemblyInfo.cs
rename to src/POGOProtos/Properties/AssemblyInfo.cs
diff --git a/PokemonGo/POGOProtos/Settings/DownloadSettingsAction.cs b/src/POGOProtos/Settings/DownloadSettingsAction.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/DownloadSettingsAction.cs
rename to src/POGOProtos/Settings/DownloadSettingsAction.cs
diff --git a/PokemonGo/POGOProtos/Settings/FortSettings.cs b/src/POGOProtos/Settings/FortSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/FortSettings.cs
rename to src/POGOProtos/Settings/FortSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/GlobalSettings.cs b/src/POGOProtos/Settings/GlobalSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/GlobalSettings.cs
rename to src/POGOProtos/Settings/GlobalSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/InventorySettings.cs b/src/POGOProtos/Settings/InventorySettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/InventorySettings.cs
rename to src/POGOProtos/Settings/InventorySettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/LevelSettings.cs b/src/POGOProtos/Settings/LevelSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/LevelSettings.cs
rename to src/POGOProtos/Settings/LevelSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/MapSettings.cs b/src/POGOProtos/Settings/MapSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/MapSettings.cs
rename to src/POGOProtos/Settings/MapSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/BadgeSettings.cs b/src/POGOProtos/Settings/Master/BadgeSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/BadgeSettings.cs
rename to src/POGOProtos/Settings/Master/BadgeSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/CameraSettings.cs b/src/POGOProtos/Settings/Master/CameraSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/CameraSettings.cs
rename to src/POGOProtos/Settings/Master/CameraSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/EncounterSettings.cs b/src/POGOProtos/Settings/Master/EncounterSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/EncounterSettings.cs
rename to src/POGOProtos/Settings/Master/EncounterSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/EquippedBadgeSettings.cs b/src/POGOProtos/Settings/Master/EquippedBadgeSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/EquippedBadgeSettings.cs
rename to src/POGOProtos/Settings/Master/EquippedBadgeSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/GymBattleSettings.cs b/src/POGOProtos/Settings/Master/GymBattleSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/GymBattleSettings.cs
rename to src/POGOProtos/Settings/Master/GymBattleSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/GymLevelSettings.cs b/src/POGOProtos/Settings/Master/GymLevelSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/GymLevelSettings.cs
rename to src/POGOProtos/Settings/Master/GymLevelSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/IapItemDisplay.cs b/src/POGOProtos/Settings/Master/IapItemDisplay.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/IapItemDisplay.cs
rename to src/POGOProtos/Settings/Master/IapItemDisplay.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/IapSettings.cs b/src/POGOProtos/Settings/Master/IapSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/IapSettings.cs
rename to src/POGOProtos/Settings/Master/IapSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Item/BattleAttributes.cs b/src/POGOProtos/Settings/Master/Item/BattleAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Item/BattleAttributes.cs
rename to src/POGOProtos/Settings/Master/Item/BattleAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Item/EggIncubatorAttributes.cs b/src/POGOProtos/Settings/Master/Item/EggIncubatorAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Item/EggIncubatorAttributes.cs
rename to src/POGOProtos/Settings/Master/Item/EggIncubatorAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Item/ExperienceBoostAttributes.cs b/src/POGOProtos/Settings/Master/Item/ExperienceBoostAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Item/ExperienceBoostAttributes.cs
rename to src/POGOProtos/Settings/Master/Item/ExperienceBoostAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Item/FoodAttributes.cs b/src/POGOProtos/Settings/Master/Item/FoodAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Item/FoodAttributes.cs
rename to src/POGOProtos/Settings/Master/Item/FoodAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Item/FortModifierAttributes.cs b/src/POGOProtos/Settings/Master/Item/FortModifierAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Item/FortModifierAttributes.cs
rename to src/POGOProtos/Settings/Master/Item/FortModifierAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Item/IncenseAttributes.cs b/src/POGOProtos/Settings/Master/Item/IncenseAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Item/IncenseAttributes.cs
rename to src/POGOProtos/Settings/Master/Item/IncenseAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Item/InventoryUpgradeAttributes.cs b/src/POGOProtos/Settings/Master/Item/InventoryUpgradeAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Item/InventoryUpgradeAttributes.cs
rename to src/POGOProtos/Settings/Master/Item/InventoryUpgradeAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Item/POGOProtosSettingsMasterItem.cs b/src/POGOProtos/Settings/Master/Item/POGOProtosSettingsMasterItem.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Item/POGOProtosSettingsMasterItem.cs
rename to src/POGOProtos/Settings/Master/Item/POGOProtosSettingsMasterItem.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Item/PokeballAttributes.cs b/src/POGOProtos/Settings/Master/Item/PokeballAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Item/PokeballAttributes.cs
rename to src/POGOProtos/Settings/Master/Item/PokeballAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Item/PotionAttributes.cs b/src/POGOProtos/Settings/Master/Item/PotionAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Item/PotionAttributes.cs
rename to src/POGOProtos/Settings/Master/Item/PotionAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Item/ReviveAttributes.cs b/src/POGOProtos/Settings/Master/Item/ReviveAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Item/ReviveAttributes.cs
rename to src/POGOProtos/Settings/Master/Item/ReviveAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/ItemSettings.cs b/src/POGOProtos/Settings/Master/ItemSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/ItemSettings.cs
rename to src/POGOProtos/Settings/Master/ItemSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/MoveSequenceSettings.cs b/src/POGOProtos/Settings/Master/MoveSequenceSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/MoveSequenceSettings.cs
rename to src/POGOProtos/Settings/Master/MoveSequenceSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/MoveSettings.cs b/src/POGOProtos/Settings/Master/MoveSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/MoveSettings.cs
rename to src/POGOProtos/Settings/Master/MoveSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/POGOProtosSettingsMaster.cs b/src/POGOProtos/Settings/Master/POGOProtosSettingsMaster.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/POGOProtosSettingsMaster.cs
rename to src/POGOProtos/Settings/Master/POGOProtosSettingsMaster.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/PlayerLevelSettings.cs b/src/POGOProtos/Settings/Master/PlayerLevelSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/PlayerLevelSettings.cs
rename to src/POGOProtos/Settings/Master/PlayerLevelSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Pokemon/CameraAttributes.cs b/src/POGOProtos/Settings/Master/Pokemon/CameraAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Pokemon/CameraAttributes.cs
rename to src/POGOProtos/Settings/Master/Pokemon/CameraAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Pokemon/EncounterAttributes.cs b/src/POGOProtos/Settings/Master/Pokemon/EncounterAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Pokemon/EncounterAttributes.cs
rename to src/POGOProtos/Settings/Master/Pokemon/EncounterAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Pokemon/POGOProtosSettingsMasterPokemon.cs b/src/POGOProtos/Settings/Master/Pokemon/POGOProtosSettingsMasterPokemon.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Pokemon/POGOProtosSettingsMasterPokemon.cs
rename to src/POGOProtos/Settings/Master/Pokemon/POGOProtosSettingsMasterPokemon.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/Pokemon/StatsAttributes.cs b/src/POGOProtos/Settings/Master/Pokemon/StatsAttributes.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/Pokemon/StatsAttributes.cs
rename to src/POGOProtos/Settings/Master/Pokemon/StatsAttributes.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/PokemonSettings.cs b/src/POGOProtos/Settings/Master/PokemonSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/PokemonSettings.cs
rename to src/POGOProtos/Settings/Master/PokemonSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/PokemonUpgradeSettings.cs b/src/POGOProtos/Settings/Master/PokemonUpgradeSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/PokemonUpgradeSettings.cs
rename to src/POGOProtos/Settings/Master/PokemonUpgradeSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/Master/TypeEffectiveSettings.cs b/src/POGOProtos/Settings/Master/TypeEffectiveSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/Master/TypeEffectiveSettings.cs
rename to src/POGOProtos/Settings/Master/TypeEffectiveSettings.cs
diff --git a/PokemonGo/POGOProtos/Settings/POGOProtosSettings.cs b/src/POGOProtos/Settings/POGOProtosSettings.cs
similarity index 100%
rename from PokemonGo/POGOProtos/Settings/POGOProtosSettings.cs
rename to src/POGOProtos/Settings/POGOProtosSettings.cs
diff --git a/PokemonGo/RocketAPI/.gitattributes b/src/RocketAPI/.gitattributes
similarity index 100%
rename from PokemonGo/RocketAPI/.gitattributes
rename to src/RocketAPI/.gitattributes
diff --git a/PokemonGo/RocketAPI/.gitignore b/src/RocketAPI/.gitignore
similarity index 100%
rename from PokemonGo/RocketAPI/.gitignore
rename to src/RocketAPI/.gitignore
diff --git a/PokemonGo/RocketAPI/ClassDiagram1.cd b/src/RocketAPI/ClassDiagram1.cd
similarity index 100%
rename from PokemonGo/RocketAPI/ClassDiagram1.cd
rename to src/RocketAPI/ClassDiagram1.cd
diff --git a/PokemonGo/RocketAPI/Client.cs b/src/RocketAPI/Client.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Client.cs
rename to src/RocketAPI/Client.cs
diff --git a/PokemonGo/RocketAPI/Enums/AuthType.cs b/src/RocketAPI/Enums/AuthType.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Enums/AuthType.cs
rename to src/RocketAPI/Enums/AuthType.cs
diff --git a/PokemonGo/RocketAPI/Enums/MiscEnums.cs b/src/RocketAPI/Enums/MiscEnums.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Enums/MiscEnums.cs
rename to src/RocketAPI/Enums/MiscEnums.cs
diff --git a/PokemonGo/RocketAPI/Enums/RequestType.cs b/src/RocketAPI/Enums/RequestType.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Enums/RequestType.cs
rename to src/RocketAPI/Enums/RequestType.cs
diff --git a/PokemonGo/RocketAPI/Exceptions/AccessTokenExpiredException.cs b/src/RocketAPI/Exceptions/AccessTokenExpiredException.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Exceptions/AccessTokenExpiredException.cs
rename to src/RocketAPI/Exceptions/AccessTokenExpiredException.cs
diff --git a/PokemonGo/RocketAPI/Exceptions/AccountNotVerifiedException.cs b/src/RocketAPI/Exceptions/AccountNotVerifiedException.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Exceptions/AccountNotVerifiedException.cs
rename to src/RocketAPI/Exceptions/AccountNotVerifiedException.cs
diff --git a/PokemonGo/RocketAPI/Exceptions/GoogleException.cs b/src/RocketAPI/Exceptions/GoogleException.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Exceptions/GoogleException.cs
rename to src/RocketAPI/Exceptions/GoogleException.cs
diff --git a/PokemonGo/RocketAPI/Exceptions/GoogleOfflineException.cs b/src/RocketAPI/Exceptions/GoogleOfflineException.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Exceptions/GoogleOfflineException.cs
rename to src/RocketAPI/Exceptions/GoogleOfflineException.cs
diff --git a/PokemonGo/RocketAPI/Exceptions/InvalidResponseException.cs b/src/RocketAPI/Exceptions/InvalidResponseException.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Exceptions/InvalidResponseException.cs
rename to src/RocketAPI/Exceptions/InvalidResponseException.cs
diff --git a/PokemonGo/RocketAPI/Exceptions/LoginFailedException.cs b/src/RocketAPI/Exceptions/LoginFailedException.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Exceptions/LoginFailedException.cs
rename to src/RocketAPI/Exceptions/LoginFailedException.cs
diff --git a/PokemonGo/RocketAPI/Exceptions/PTCOfflineException.cs b/src/RocketAPI/Exceptions/PTCOfflineException.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Exceptions/PTCOfflineException.cs
rename to src/RocketAPI/Exceptions/PTCOfflineException.cs
diff --git a/PokemonGo/RocketAPI/Extensions/DateTimeExtensions.cs b/src/RocketAPI/Extensions/DateTimeExtensions.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Extensions/DateTimeExtensions.cs
rename to src/RocketAPI/Extensions/DateTimeExtensions.cs
diff --git a/PokemonGo/RocketAPI/Extensions/HttpClientExtensions.cs b/src/RocketAPI/Extensions/HttpClientExtensions.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Extensions/HttpClientExtensions.cs
rename to src/RocketAPI/Extensions/HttpClientExtensions.cs
diff --git a/PokemonGo/RocketAPI/Extensions/LatLongExtensions.cs b/src/RocketAPI/Extensions/LatLongExtensions.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Extensions/LatLongExtensions.cs
rename to src/RocketAPI/Extensions/LatLongExtensions.cs
diff --git a/PokemonGo/RocketAPI/Helpers/HttpClientHelper.cs b/src/RocketAPI/Helpers/HttpClientHelper.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Helpers/HttpClientHelper.cs
rename to src/RocketAPI/Helpers/HttpClientHelper.cs
diff --git a/PokemonGo/RocketAPI/Helpers/JsonHelper.cs b/src/RocketAPI/Helpers/JsonHelper.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Helpers/JsonHelper.cs
rename to src/RocketAPI/Helpers/JsonHelper.cs
diff --git a/PokemonGo/RocketAPI/Helpers/ProtoHelper.cs b/src/RocketAPI/Helpers/ProtoHelper.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Helpers/ProtoHelper.cs
rename to src/RocketAPI/Helpers/ProtoHelper.cs
diff --git a/PokemonGo/RocketAPI/Helpers/RandomHelper.cs b/src/RocketAPI/Helpers/RandomHelper.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Helpers/RandomHelper.cs
rename to src/RocketAPI/Helpers/RandomHelper.cs
diff --git a/PokemonGo/RocketAPI/Helpers/RequestBuilder.cs b/src/RocketAPI/Helpers/RequestBuilder.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Helpers/RequestBuilder.cs
rename to src/RocketAPI/Helpers/RequestBuilder.cs
diff --git a/PokemonGo/RocketAPI/Helpers/RetryHandler.cs b/src/RocketAPI/Helpers/RetryHandler.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Helpers/RetryHandler.cs
rename to src/RocketAPI/Helpers/RetryHandler.cs
diff --git a/PokemonGo/RocketAPI/Helpers/S2Helper.cs b/src/RocketAPI/Helpers/S2Helper.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Helpers/S2Helper.cs
rename to src/RocketAPI/Helpers/S2Helper.cs
diff --git a/src/RocketAPI/Helpers/Utils.cs b/src/RocketAPI/Helpers/Utils.cs
new file mode 100644
index 0000000..81d0f7e
--- /dev/null
+++ b/src/RocketAPI/Helpers/Utils.cs
@@ -0,0 +1,610 @@
+using System;
+using System.Linq;
+using POGOProtos.Data;
+using POGOProtos.Enums;
+using POGOProtos.Inventory;
+using POGOProtos.Settings.Master;
+using System.Collections.Generic;
+
+namespace PokemonGo.RocketAPI.Helpers
+{
+    public class Utils
+    {
+        public static ulong FloatAsUlong(double value)
+        {
+            var bytes = BitConverter.GetBytes(value);
+            return BitConverter.ToUInt64(bytes, 0);
+        }
+    }
+
+    /// <summary>
+    /// by https://github.com/NECROBOTIO/NecroBot
+    /// </summary>
+    public struct BaseStats
+    {
+        public int BaseAttack, BaseDefense, BaseStamina;
+
+        public BaseStats(int baseStamina, int baseAttack, int baseDefense)
+        {
+            BaseAttack = baseAttack;
+            BaseDefense = baseDefense;
+            BaseStamina = baseStamina;
+        }
+
+        public override string ToString()
+        {
+            return $"({BaseAttack} atk,{BaseDefense} def,{BaseStamina} sta)";
+        }
+    }
+
+    /// <summary>
+    /// by https://github.com/NECROBOTIO/NecroBot
+    /// </summary>
+    public static class PokemonInfo
+    {
+        public static int CalculateCp(PokemonData poke)
+        {
+            return
+                Math.Max(
+                    (int)
+                        Math.Floor(0.1 * CalculateCpMultiplier(poke) *
+                                   Math.Pow(poke.CpMultiplier + poke.AdditionalCpMultiplier, 2)), 10);
+        }
+
+        public static double CalculateCpMultiplier(PokemonData poke)
+        {
+            var baseStats = GetBaseStats(poke.PokemonId);
+            return (baseStats.BaseAttack + poke.IndividualAttack) *
+                   Math.Sqrt(baseStats.BaseDefense + poke.IndividualDefense) *
+                   Math.Sqrt(baseStats.BaseStamina + poke.IndividualStamina);
+        }
+
+        public static int CalculateMaxCp(PokemonData poke)
+        {
+            return
+                Math.Max(
+                    (int)
+                        Math.Floor(0.1 * CalculateMaxCpMultiplier(poke.PokemonId) *
+                                   Math.Pow(poke.CpMultiplier + poke.AdditionalCpMultiplier, 2)), 10);
+        }
+
+        public static double CalculateMaxCpMultiplier(PokemonId pokemonId)
+        {
+            var baseStats = GetBaseStats(pokemonId);
+            return (baseStats.BaseAttack + 15) * Math.Sqrt(baseStats.BaseDefense + 15) *
+                   Math.Sqrt(baseStats.BaseStamina + 15);
+        }
+
+        public static int CalculateMinCp(PokemonData poke)
+        {
+            return
+                Math.Max(
+                    (int)
+                        Math.Floor(0.1 * CalculateMinCpMultiplier(poke) *
+                                   Math.Pow(poke.CpMultiplier + poke.AdditionalCpMultiplier, 2)), 10);
+        }
+
+        public static double CalculateMinCpMultiplier(PokemonData poke)
+        {
+            var baseStats = GetBaseStats(poke.PokemonId);
+            return baseStats.BaseAttack * Math.Sqrt(baseStats.BaseDefense) * Math.Sqrt(baseStats.BaseStamina);
+        }
+
+        public static double CalculatePokemonPerfection(PokemonData poke)
+        {
+            if (Math.Abs(poke.CpMultiplier + poke.AdditionalCpMultiplier) <= 0)
+                return (poke.IndividualAttack + poke.IndividualDefense + poke.IndividualStamina) / 45.0 * 100.0;
+
+            //GetBaseStats(poke.PokemonId);
+            var maxCp = CalculateMaxCpMultiplier(poke.PokemonId);
+            var minCp = CalculateMinCpMultiplier(poke);
+            var curCp = CalculateCpMultiplier(poke);
+
+            return (curCp - minCp) / (maxCp - minCp) * 100.0;
+        }
+
+        public static BaseStats GetBaseStats(PokemonId id)
+        {
+            switch ((int)id)
+            {
+                case 1:
+                    return new BaseStats(90, 126, 126);
+                case 2:
+                    return new BaseStats(120, 156, 158);
+                case 3:
+                    return new BaseStats(160, 198, 200);
+                case 4:
+                    return new BaseStats(78, 128, 108);
+                case 5:
+                    return new BaseStats(116, 160, 140);
+                case 6:
+                    return new BaseStats(156, 212, 182);
+                case 7:
+                    return new BaseStats(88, 112, 142);
+                case 8:
+                    return new BaseStats(118, 144, 176);
+                case 9:
+                    return new BaseStats(158, 186, 222);
+                case 10:
+                    return new BaseStats(90, 62, 66);
+                case 11:
+                    return new BaseStats(100, 56, 86);
+                case 12:
+                    return new BaseStats(120, 144, 144);
+                case 13:
+                    return new BaseStats(80, 68, 64);
+                case 14:
+                    return new BaseStats(90, 62, 82);
+                case 15:
+                    return new BaseStats(130, 144, 130);
+                case 16:
+                    return new BaseStats(80, 94, 90);
+                case 17:
+                    return new BaseStats(126, 126, 122);
+                case 18:
+                    return new BaseStats(166, 170, 166);
+                case 19:
+                    return new BaseStats(60, 92, 86);
+                case 20:
+                    return new BaseStats(110, 146, 150);
+                case 21:
+                    return new BaseStats(80, 102, 78);
+                case 22:
+                    return new BaseStats(130, 168, 146);
+                case 23:
+                    return new BaseStats(70, 112, 112);
+                case 24:
+                    return new BaseStats(120, 166, 166);
+                case 25:
+                    return new BaseStats(70, 124, 108);
+                case 26:
+                    return new BaseStats(120, 200, 154);
+                case 27:
+                    return new BaseStats(100, 90, 114);
+                case 28:
+                    return new BaseStats(150, 150, 172);
+                case 29:
+                    return new BaseStats(110, 100, 104);
+                case 30:
+                    return new BaseStats(140, 132, 136);
+                case 31:
+                    return new BaseStats(180, 184, 190);
+                case 32:
+                    return new BaseStats(92, 110, 94);
+                case 33:
+                    return new BaseStats(122, 142, 128);
+                case 34:
+                    return new BaseStats(162, 204, 170);
+                case 35:
+                    return new BaseStats(140, 116, 124);
+                case 36:
+                    return new BaseStats(190, 178, 178);
+                case 37:
+                    return new BaseStats(76, 106, 118);
+                case 38:
+                    return new BaseStats(146, 176, 194);
+                case 39:
+                    return new BaseStats(230, 98, 54);
+                case 40:
+                    return new BaseStats(280, 168, 108);
+                case 41:
+                    return new BaseStats(80, 88, 90);
+                case 42:
+                    return new BaseStats(150, 164, 164);
+                case 43:
+                    return new BaseStats(90, 134, 130);
+                case 44:
+                    return new BaseStats(120, 162, 158);
+                case 45:
+                    return new BaseStats(150, 202, 190);
+                case 46:
+                    return new BaseStats(70, 122, 120);
+                case 47:
+                    return new BaseStats(120, 162, 170);
+                case 48:
+                    return new BaseStats(120, 108, 118);
+                case 49:
+                    return new BaseStats(140, 172, 154);
+                case 50:
+                    return new BaseStats(20, 108, 86);
+                case 51:
+                    return new BaseStats(70, 148, 140);
+                case 52:
+                    return new BaseStats(80, 104, 94);
+                case 53:
+                    return new BaseStats(130, 156, 146);
+                case 54:
+                    return new BaseStats(100, 132, 112);
+                case 55:
+                    return new BaseStats(160, 194, 176);
+                case 56:
+                    return new BaseStats(80, 122, 96);
+                case 57:
+                    return new BaseStats(130, 178, 150);
+                case 58:
+                    return new BaseStats(110, 156, 110);
+                case 59:
+                    return new BaseStats(180, 230, 180);
+                case 60:
+                    return new BaseStats(80, 108, 98);
+                case 61:
+                    return new BaseStats(130, 132, 132);
+                case 62:
+                    return new BaseStats(180, 180, 202);
+                case 63:
+                    return new BaseStats(50, 110, 76);
+                case 64:
+                    return new BaseStats(80, 150, 112);
+                case 65:
+                    return new BaseStats(110, 186, 152);
+                case 66:
+                    return new BaseStats(140, 118, 96);
+                case 67:
+                    return new BaseStats(160, 154, 144);
+                case 68:
+                    return new BaseStats(180, 198, 180);
+                case 69:
+                    return new BaseStats(100, 158, 78);
+                case 70:
+                    return new BaseStats(130, 190, 110);
+                case 71:
+                    return new BaseStats(160, 222, 152);
+                case 72:
+                    return new BaseStats(80, 106, 136);
+                case 73:
+                    return new BaseStats(160, 170, 196);
+                case 74:
+                    return new BaseStats(80, 106, 118);
+                case 75:
+                    return new BaseStats(110, 142, 156);
+                case 76:
+                    return new BaseStats(160, 176, 198);
+                case 77:
+                    return new BaseStats(100, 168, 138);
+                case 78:
+                    return new BaseStats(130, 200, 170);
+                case 79:
+                    return new BaseStats(180, 110, 110);
+                case 80:
+                    return new BaseStats(190, 184, 198);
+                case 81:
+                    return new BaseStats(50, 128, 138);
+                case 82:
+                    return new BaseStats(100, 186, 180);
+                case 83:
+                    return new BaseStats(104, 138, 132);
+                case 84:
+                    return new BaseStats(70, 126, 96);
+                case 85:
+                    return new BaseStats(120, 182, 150);
+                case 86:
+                    return new BaseStats(130, 104, 138);
+                case 87:
+                    return new BaseStats(180, 156, 192);
+                case 88:
+                    return new BaseStats(160, 124, 110);
+                case 89:
+                    return new BaseStats(210, 180, 188);
+                case 90:
+                    return new BaseStats(60, 120, 112);
+                case 91:
+                    return new BaseStats(100, 196, 196);
+                case 92:
+                    return new BaseStats(60, 136, 82);
+                case 93:
+                    return new BaseStats(90, 172, 118);
+                case 94:
+                    return new BaseStats(120, 204, 156);
+                case 95:
+                    return new BaseStats(70, 90, 186);
+                case 96:
+                    return new BaseStats(120, 104, 140);
+                case 97:
+                    return new BaseStats(170, 162, 196);
+                case 98:
+                    return new BaseStats(60, 116, 110);
+                case 99:
+                    return new BaseStats(110, 178, 168);
+                case 100:
+                    return new BaseStats(80, 102, 124);
+                case 101:
+                    return new BaseStats(120, 150, 174);
+                case 102:
+                    return new BaseStats(120, 110, 132);
+                case 103:
+                    return new BaseStats(190, 232, 164);
+                case 104:
+                    return new BaseStats(100, 102, 150);
+                case 105:
+                    return new BaseStats(120, 140, 202);
+                case 106:
+                    return new BaseStats(100, 148, 172);
+                case 107:
+                    return new BaseStats(100, 138, 204);
+                case 108:
+                    return new BaseStats(180, 126, 160);
+                case 109:
+                    return new BaseStats(80, 136, 142);
+                case 110:
+                    return new BaseStats(130, 190, 198);
+                case 111:
+                    return new BaseStats(160, 110, 116);
+                case 112:
+                    return new BaseStats(210, 166, 160);
+                case 113:
+                    return new BaseStats(500, 40, 60);
+                case 114:
+                    return new BaseStats(130, 164, 152);
+                case 115:
+                    return new BaseStats(210, 142, 178);
+                case 116:
+                    return new BaseStats(60, 122, 100);
+                case 117:
+                    return new BaseStats(110, 176, 150);
+                case 118:
+                    return new BaseStats(90, 112, 126);
+                case 119:
+                    return new BaseStats(160, 172, 160);
+                case 120:
+                    return new BaseStats(60, 130, 128);
+                case 121:
+                    return new BaseStats(120, 194, 192);
+                case 122:
+                    return new BaseStats(80, 154, 196);
+                case 123:
+                    return new BaseStats(140, 176, 180);
+                case 124:
+                    return new BaseStats(130, 172, 134);
+                case 125:
+                    return new BaseStats(130, 198, 160);
+                case 126:
+                    return new BaseStats(130, 214, 158);
+                case 127:
+                    return new BaseStats(130, 184, 186);
+                case 128:
+                    return new BaseStats(150, 148, 184);
+                case 129:
+                    return new BaseStats(40, 42, 84);
+                case 130:
+                    return new BaseStats(190, 192, 196);
+                case 131:
+                    return new BaseStats(260, 186, 190);
+                case 132:
+                    return new BaseStats(96, 110, 110);
+                case 133:
+                    return new BaseStats(110, 114, 128);
+                case 134:
+                    return new BaseStats(260, 186, 168);
+                case 135:
+                    return new BaseStats(130, 192, 174);
+                case 136:
+                    return new BaseStats(130, 238, 178);
+                case 137:
+                    return new BaseStats(130, 156, 158);
+                case 138:
+                    return new BaseStats(70, 132, 160);
+                case 139:
+                    return new BaseStats(140, 180, 202);
+                case 140:
+                    return new BaseStats(60, 148, 142);
+                case 141:
+                    return new BaseStats(120, 190, 190);
+                case 142:
+                    return new BaseStats(160, 182, 162);
+                case 143:
+                    return new BaseStats(320, 180, 180);
+                case 144:
+                    return new BaseStats(180, 198, 242);
+                case 145:
+                    return new BaseStats(180, 232, 194);
+                case 146:
+                    return new BaseStats(180, 242, 194);
+                case 147:
+                    return new BaseStats(82, 128, 110);
+                case 148:
+                    return new BaseStats(122, 170, 152);
+                case 149:
+                    return new BaseStats(182, 250, 212);
+                case 150:
+                    return new BaseStats(212, 284, 202);
+                case 151:
+                    return new BaseStats(200, 220, 220);
+                default:
+                    return new BaseStats();
+            }
+        }
+
+        public static double GetLevel(PokemonData poke)
+        {
+            switch ((int)((poke.CpMultiplier + poke.AdditionalCpMultiplier) * 1000.0))
+            {
+                case 93: // 0.094 * 1000 = 93.99999678134
+                case 94:
+                    return 1;
+                case 135:
+                    return 1.5;
+                case 166:
+                    return 2;
+                case 192:
+                    return 2.5;
+                case 215:
+                    return 3;
+                case 236:
+                    return 3.5;
+                case 255:
+                    return 4;
+                case 273:
+                    return 4.5;
+                case 290:
+                    return 5;
+                case 306:
+                    return 5.5;
+                case 321:
+                    return 6;
+                case 335:
+                    return 6.5;
+                case 349:
+                    return 7;
+                case 362:
+                    return 7.5;
+                case 375:
+                    return 8;
+                case 387:
+                    return 8.5;
+                case 399:
+                    return 9;
+                case 411:
+                    return 9.5;
+                case 422:
+                    return 10;
+                case 432:
+                    return 10.5;
+                case 443:
+                    return 11;
+                case 453:
+                    return 11.5;
+                case 462:
+                    return 12;
+                case 472:
+                    return 12.5;
+                case 481:
+                    return 13;
+                case 490:
+                    return 13.5;
+                case 499:
+                    return 14;
+                case 508:
+                    return 14.5;
+                case 517:
+                    return 15;
+                case 525:
+                    return 15.5;
+                case 534:
+                    return 16;
+                case 542:
+                    return 16.5;
+                case 550:
+                    return 17;
+                case 558:
+                    return 17.5;
+                case 566:
+                    return 18;
+                case 574:
+                    return 18.5;
+                case 582:
+                    return 19;
+                case 589:
+                    return 19.5;
+                case 597:
+                    return 20;
+                case 604:
+                    return 20.5;
+                case 612:
+                    return 21;
+                case 619:
+                    return 21.5;
+                case 626:
+                    return 22;
+                case 633:
+                    return 22.5;
+                case 640:
+                    return 23;
+                case 647:
+                    return 23.5;
+                case 654:
+                    return 24;
+                case 661:
+                    return 24.5;
+                case 667:
+                    return 25;
+                case 674:
+                    return 25.5;
+                case 681:
+                    return 26;
+                case 687:
+                    return 26.5;
+                case 694:
+                    return 27;
+                case 700:
+                    return 27.5;
+                case 706:
+                    return 28;
+                case 713:
+                    return 28.5;
+                case 719:
+                    return 29;
+                case 725:
+                    return 29.5;
+                case 731:
+                    return 30;
+                case 734:
+                    return 30.5;
+                case 737:
+                    return 31;
+                case 740:
+                    return 31.5;
+                case 743:
+                    return 32;
+                case 746:
+                    return 32.5;
+                case 749:
+                    return 33;
+                case 752:
+                    return 33.5;
+                case 755:
+                    return 34;
+                case 758:
+                    return 34.5;
+                case 761:
+                    return 35;
+                case 764:
+                    return 35.5;
+                case 767:
+                    return 36;
+                case 770:
+                    return 36.5;
+                case 773:
+                    return 37;
+                case 776:
+                    return 37.5;
+                case 778:
+                    return 38;
+                case 781:
+                    return 38.5;
+                case 784:
+                    return 39;
+                case 787:
+                    return 39.5;
+                case 790:
+                    return 40;
+                default:
+                    return 0;
+            }
+        }
+
+        public static PokemonMove GetPokemonMove1(PokemonData poke)
+        {
+            var move1 = poke.Move1;
+            return move1;
+        }
+
+        public static PokemonMove GetPokemonMove2(PokemonData poke)
+        {
+            var move2 = poke.Move2;
+            return move2;
+        }
+
+        public static int GetCandy(PokemonData pokemon, List<Candy> PokemonFamilies, IEnumerable<PokemonSettings> PokemonSettings)
+        {
+            var setting = PokemonSettings.FirstOrDefault(q => pokemon != null && q.PokemonId.Equals(pokemon.PokemonId));
+            var family = PokemonFamilies.FirstOrDefault(q => setting != null && q.FamilyId.Equals(setting.FamilyId));
+
+            return family.Candy_;
+        }
+
+        public static int GetPowerUpLevel(PokemonData poke)
+        {
+            return (int)(GetLevel(poke) * 2.0);
+        }
+    }
+}
\ No newline at end of file
diff --git a/PokemonGo/RocketAPI/HttpClient/PokemonClient.cs b/src/RocketAPI/HttpClient/PokemonClient.cs
similarity index 100%
rename from PokemonGo/RocketAPI/HttpClient/PokemonClient.cs
rename to src/RocketAPI/HttpClient/PokemonClient.cs
diff --git a/PokemonGo/RocketAPI/ILatLong.cs b/src/RocketAPI/ILatLong.cs
similarity index 100%
rename from PokemonGo/RocketAPI/ILatLong.cs
rename to src/RocketAPI/ILatLong.cs
diff --git a/PokemonGo/RocketAPI/ISettings.cs b/src/RocketAPI/ISettings.cs
similarity index 100%
rename from PokemonGo/RocketAPI/ISettings.cs
rename to src/RocketAPI/ISettings.cs
diff --git a/PokemonGo/RocketAPI/Login/GoogleLogin.cs b/src/RocketAPI/Login/GoogleLogin.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Login/GoogleLogin.cs
rename to src/RocketAPI/Login/GoogleLogin.cs
diff --git a/PokemonGo/RocketAPI/Login/ILoginType.cs b/src/RocketAPI/Login/ILoginType.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Login/ILoginType.cs
rename to src/RocketAPI/Login/ILoginType.cs
diff --git a/PokemonGo/RocketAPI/Login/PtcLogin.cs b/src/RocketAPI/Login/PtcLogin.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Login/PtcLogin.cs
rename to src/RocketAPI/Login/PtcLogin.cs
diff --git a/PokemonGo/RocketAPI/PokemonGo.RocketAPI.csproj b/src/RocketAPI/PokemonGo.RocketAPI.csproj
similarity index 92%
rename from PokemonGo/RocketAPI/PokemonGo.RocketAPI.csproj
rename to src/RocketAPI/PokemonGo.RocketAPI.csproj
index 6f1c16f..71f8e5e 100644
--- a/PokemonGo/RocketAPI/PokemonGo.RocketAPI.csproj
+++ b/src/RocketAPI/PokemonGo.RocketAPI.csproj
@@ -57,7 +57,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="GPSOAuthSharp, Version=0.0.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\GPSOAuthSharp.0.0.5\lib\GPSOAuthSharp.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\GPSOAuthSharp.0.0.5\lib\GPSOAuthSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -72,10 +72,6 @@
       <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="POGOProtos, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\POGOProtos\bin\Debug\POGOProtos.dll</HintPath>
-    </Reference>
     <Reference Include="S2Geometry, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\S2Geometry.1.0.1\lib\portable-net45+wp8+win8\S2Geometry.dll</HintPath>
       <Private>True</Private>
@@ -84,15 +80,15 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.HashFunction.Core, Version=1.8.2.2, Culture=neutral, PublicKeyToken=80c9288e394c1322, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Data.HashFunction.Core.1.8.2.2\lib\net45\System.Data.HashFunction.Core.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\System.Data.HashFunction.Core.1.8.2.2\lib\net45\System.Data.HashFunction.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.HashFunction.Interfaces, Version=1.0.0.2, Culture=neutral, PublicKeyToken=80c9288e394c1322, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Data.HashFunction.Interfaces.1.0.0.2\lib\net45\System.Data.HashFunction.Interfaces.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\System.Data.HashFunction.Interfaces.1.0.0.2\lib\net45\System.Data.HashFunction.Interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.HashFunction.xxHash, Version=1.8.2.2, Culture=neutral, PublicKeyToken=80c9288e394c1322, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Data.HashFunction.xxHash.1.8.2.2\lib\net45\System.Data.HashFunction.xxHash.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\System.Data.HashFunction.xxHash.1.8.2.2\lib\net45\System.Data.HashFunction.xxHash.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -151,6 +147,12 @@
     <Compile Include="Resources.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\POGOProtos\POGOProtos.csproj">
+      <Project>{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}</Project>
+      <Name>POGOProtos</Name>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
diff --git a/PokemonGo/RocketAPI/Properties/AssemblyInfo.cs b/src/RocketAPI/Properties/AssemblyInfo.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Properties/AssemblyInfo.cs
rename to src/RocketAPI/Properties/AssemblyInfo.cs
diff --git a/PokemonGo/RocketAPI/ProtoAdditions.cs b/src/RocketAPI/ProtoAdditions.cs
similarity index 100%
rename from PokemonGo/RocketAPI/ProtoAdditions.cs
rename to src/RocketAPI/ProtoAdditions.cs
diff --git a/PokemonGo/RocketAPI/README.md b/src/RocketAPI/README.md
similarity index 100%
rename from PokemonGo/RocketAPI/README.md
rename to src/RocketAPI/README.md
diff --git a/PokemonGo/RocketAPI/Resources.cs b/src/RocketAPI/Resources.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Resources.cs
rename to src/RocketAPI/Resources.cs
diff --git a/PokemonGo/RocketAPI/Rpc/BaseRpc.cs b/src/RocketAPI/Rpc/BaseRpc.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Rpc/BaseRpc.cs
rename to src/RocketAPI/Rpc/BaseRpc.cs
diff --git a/PokemonGo/RocketAPI/Rpc/Download.cs b/src/RocketAPI/Rpc/Download.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Rpc/Download.cs
rename to src/RocketAPI/Rpc/Download.cs
diff --git a/PokemonGo/RocketAPI/Rpc/Encounter.cs b/src/RocketAPI/Rpc/Encounter.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Rpc/Encounter.cs
rename to src/RocketAPI/Rpc/Encounter.cs
diff --git a/PokemonGo/RocketAPI/Rpc/Fort.cs b/src/RocketAPI/Rpc/Fort.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Rpc/Fort.cs
rename to src/RocketAPI/Rpc/Fort.cs
diff --git a/PokemonGo/RocketAPI/Rpc/Inventory.cs b/src/RocketAPI/Rpc/Inventory.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Rpc/Inventory.cs
rename to src/RocketAPI/Rpc/Inventory.cs
diff --git a/PokemonGo/RocketAPI/Rpc/Login.cs b/src/RocketAPI/Rpc/Login.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Rpc/Login.cs
rename to src/RocketAPI/Rpc/Login.cs
diff --git a/PokemonGo/RocketAPI/Rpc/Map.cs b/src/RocketAPI/Rpc/Map.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Rpc/Map.cs
rename to src/RocketAPI/Rpc/Map.cs
diff --git a/PokemonGo/RocketAPI/Rpc/Misc.cs b/src/RocketAPI/Rpc/Misc.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Rpc/Misc.cs
rename to src/RocketAPI/Rpc/Misc.cs
diff --git a/PokemonGo/RocketAPI/Rpc/Player.cs b/src/RocketAPI/Rpc/Player.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Rpc/Player.cs
rename to src/RocketAPI/Rpc/Player.cs
diff --git a/PokemonGo/RocketAPI/app.config b/src/RocketAPI/app.config
similarity index 100%
rename from PokemonGo/RocketAPI/app.config
rename to src/RocketAPI/app.config
diff --git a/PokemonGo/RocketAPI/packages.config b/src/RocketAPI/packages.config
similarity index 100%
rename from PokemonGo/RocketAPI/packages.config
rename to src/RocketAPI/packages.config
diff --git a/PokemonGo/RocketAPI/Window/ApiFailureStrategy.cs b/src/RocketBotGUI/ApiFailureStrategy.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/ApiFailureStrategy.cs
rename to src/RocketBotGUI/ApiFailureStrategy.cs
diff --git a/PokemonGo/RocketAPI/Window/App.config b/src/RocketBotGUI/App.config
similarity index 100%
rename from PokemonGo/RocketAPI/Window/App.config
rename to src/RocketBotGUI/App.config
diff --git a/PokemonGo/RocketAPI/Window/Extensions.cs b/src/RocketBotGUI/Extensions.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Extensions.cs
rename to src/RocketBotGUI/Extensions.cs
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemBlukBerry.png b/src/RocketBotGUI/Images/Items/ItemBlukBerry.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemBlukBerry.png
rename to src/RocketBotGUI/Images/Items/ItemBlukBerry.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemGreatBall.png b/src/RocketBotGUI/Images/Items/ItemGreatBall.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemGreatBall.png
rename to src/RocketBotGUI/Images/Items/ItemGreatBall.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemHyperPotion.png b/src/RocketBotGUI/Images/Items/ItemHyperPotion.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemHyperPotion.png
rename to src/RocketBotGUI/Images/Items/ItemHyperPotion.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemIncenseOrdinary.png b/src/RocketBotGUI/Images/Items/ItemIncenseOrdinary.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemIncenseOrdinary.png
rename to src/RocketBotGUI/Images/Items/ItemIncenseOrdinary.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemIncubatorBasic.png b/src/RocketBotGUI/Images/Items/ItemIncubatorBasic.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemIncubatorBasic.png
rename to src/RocketBotGUI/Images/Items/ItemIncubatorBasic.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemIncubatorBasicUnlimited.png b/src/RocketBotGUI/Images/Items/ItemIncubatorBasicUnlimited.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemIncubatorBasicUnlimited.png
rename to src/RocketBotGUI/Images/Items/ItemIncubatorBasicUnlimited.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemItemStorageUpgrade.png b/src/RocketBotGUI/Images/Items/ItemItemStorageUpgrade.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemItemStorageUpgrade.png
rename to src/RocketBotGUI/Images/Items/ItemItemStorageUpgrade.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemLuckyEgg.png b/src/RocketBotGUI/Images/Items/ItemLuckyEgg.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemLuckyEgg.png
rename to src/RocketBotGUI/Images/Items/ItemLuckyEgg.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemMasterBall.png b/src/RocketBotGUI/Images/Items/ItemMasterBall.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemMasterBall.png
rename to src/RocketBotGUI/Images/Items/ItemMasterBall.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemMaxPotion.png b/src/RocketBotGUI/Images/Items/ItemMaxPotion.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemMaxPotion.png
rename to src/RocketBotGUI/Images/Items/ItemMaxPotion.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemMaxRevive.png b/src/RocketBotGUI/Images/Items/ItemMaxRevive.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemMaxRevive.png
rename to src/RocketBotGUI/Images/Items/ItemMaxRevive.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemNanabBerry.png b/src/RocketBotGUI/Images/Items/ItemNanabBerry.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemNanabBerry.png
rename to src/RocketBotGUI/Images/Items/ItemNanabBerry.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemPinapBerry.png b/src/RocketBotGUI/Images/Items/ItemPinapBerry.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemPinapBerry.png
rename to src/RocketBotGUI/Images/Items/ItemPinapBerry.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemPokeBall.png b/src/RocketBotGUI/Images/Items/ItemPokeBall.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemPokeBall.png
rename to src/RocketBotGUI/Images/Items/ItemPokeBall.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemPokemonStorageUpgrade.png b/src/RocketBotGUI/Images/Items/ItemPokemonStorageUpgrade.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemPokemonStorageUpgrade.png
rename to src/RocketBotGUI/Images/Items/ItemPokemonStorageUpgrade.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemPotion.png b/src/RocketBotGUI/Images/Items/ItemPotion.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemPotion.png
rename to src/RocketBotGUI/Images/Items/ItemPotion.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemRazzBerry.png b/src/RocketBotGUI/Images/Items/ItemRazzBerry.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemRazzBerry.png
rename to src/RocketBotGUI/Images/Items/ItemRazzBerry.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemRevive.png b/src/RocketBotGUI/Images/Items/ItemRevive.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemRevive.png
rename to src/RocketBotGUI/Images/Items/ItemRevive.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemSpecialCamera.png b/src/RocketBotGUI/Images/Items/ItemSpecialCamera.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemSpecialCamera.png
rename to src/RocketBotGUI/Images/Items/ItemSpecialCamera.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemSuperPotion.png b/src/RocketBotGUI/Images/Items/ItemSuperPotion.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemSuperPotion.png
rename to src/RocketBotGUI/Images/Items/ItemSuperPotion.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemTroyDisk.png b/src/RocketBotGUI/Images/Items/ItemTroyDisk.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemTroyDisk.png
rename to src/RocketBotGUI/Images/Items/ItemTroyDisk.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemUltraBall.png b/src/RocketBotGUI/Images/Items/ItemUltraBall.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemUltraBall.png
rename to src/RocketBotGUI/Images/Items/ItemUltraBall.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Items/ItemWeparBerry.png b/src/RocketBotGUI/Images/Items/ItemWeparBerry.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Items/ItemWeparBerry.png
rename to src/RocketBotGUI/Images/Items/ItemWeparBerry.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_1.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_1.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_1.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_1.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_10.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_10.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_10.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_10.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_100.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_100.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_100.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_100.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_101.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_101.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_101.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_101.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_102.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_102.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_102.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_102.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_103.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_103.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_103.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_103.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_104.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_104.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_104.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_104.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_105.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_105.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_105.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_105.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_106.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_106.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_106.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_106.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_107.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_107.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_107.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_107.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_108.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_108.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_108.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_108.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_109.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_109.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_109.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_109.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_11.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_11.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_11.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_11.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_110.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_110.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_110.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_110.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_111.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_111.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_111.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_111.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_112.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_112.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_112.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_112.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_113.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_113.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_113.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_113.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_114.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_114.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_114.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_114.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_115.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_115.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_115.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_115.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_116.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_116.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_116.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_116.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_117.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_117.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_117.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_117.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_118.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_118.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_118.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_118.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_119.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_119.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_119.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_119.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_12.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_12.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_12.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_12.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_120.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_120.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_120.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_120.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_121.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_121.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_121.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_121.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_122.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_122.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_122.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_122.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_123.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_123.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_123.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_123.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_124.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_124.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_124.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_124.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_125.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_125.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_125.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_125.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_126.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_126.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_126.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_126.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_127.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_127.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_127.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_127.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_128.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_128.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_128.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_128.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_129.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_129.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_129.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_129.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_13.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_13.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_13.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_13.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_130.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_130.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_130.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_130.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_131.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_131.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_131.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_131.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_132.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_132.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_132.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_132.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_133.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_133.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_133.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_133.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_134.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_134.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_134.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_134.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_135.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_135.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_135.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_135.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_136.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_136.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_136.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_136.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_137.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_137.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_137.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_137.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_138.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_138.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_138.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_138.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_139.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_139.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_139.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_139.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_14.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_14.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_14.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_14.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_140.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_140.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_140.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_140.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_141.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_141.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_141.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_141.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_142.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_142.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_142.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_142.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_143.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_143.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_143.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_143.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_144.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_144.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_144.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_144.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_145.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_145.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_145.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_145.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_146.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_146.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_146.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_146.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_147.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_147.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_147.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_147.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_148.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_148.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_148.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_148.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_149.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_149.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_149.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_149.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_15.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_15.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_15.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_15.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_150.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_150.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_150.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_150.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_151.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_151.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_151.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_151.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_16.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_16.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_16.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_16.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_17.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_17.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_17.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_17.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_18.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_18.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_18.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_18.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_19.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_19.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_19.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_19.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_2.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_2.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_2.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_2.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_20.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_20.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_20.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_20.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_21.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_21.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_21.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_21.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_22.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_22.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_22.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_22.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_23.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_23.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_23.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_23.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_24.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_24.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_24.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_24.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_25.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_25.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_25.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_25.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_26.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_26.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_26.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_26.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_27.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_27.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_27.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_27.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_28.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_28.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_28.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_28.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_29.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_29.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_29.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_29.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_3.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_3.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_3.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_3.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_30.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_30.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_30.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_30.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_31.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_31.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_31.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_31.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_32.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_32.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_32.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_32.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_33.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_33.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_33.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_33.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_34.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_34.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_34.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_34.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_35.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_35.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_35.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_35.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_36.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_36.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_36.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_36.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_37.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_37.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_37.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_37.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_38.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_38.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_38.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_38.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_39.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_39.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_39.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_39.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_4.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_4.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_4.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_4.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_40.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_40.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_40.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_40.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_41.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_41.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_41.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_41.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_42.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_42.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_42.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_42.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_43.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_43.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_43.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_43.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_44.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_44.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_44.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_44.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_45.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_45.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_45.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_45.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_46.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_46.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_46.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_46.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_47.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_47.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_47.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_47.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_48.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_48.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_48.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_48.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_49.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_49.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_49.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_49.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_5.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_5.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_5.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_5.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_50.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_50.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_50.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_50.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_51.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_51.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_51.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_51.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_52.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_52.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_52.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_52.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_53.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_53.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_53.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_53.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_54.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_54.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_54.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_54.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_55.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_55.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_55.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_55.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_56.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_56.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_56.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_56.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_57.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_57.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_57.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_57.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_58.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_58.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_58.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_58.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_59.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_59.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_59.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_59.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_6.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_6.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_6.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_6.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_60.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_60.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_60.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_60.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_61.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_61.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_61.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_61.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_62.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_62.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_62.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_62.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_63.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_63.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_63.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_63.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_64.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_64.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_64.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_64.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_65.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_65.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_65.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_65.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_66.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_66.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_66.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_66.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_67.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_67.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_67.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_67.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_68.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_68.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_68.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_68.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_69.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_69.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_69.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_69.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_7.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_7.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_7.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_7.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_70.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_70.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_70.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_70.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_71.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_71.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_71.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_71.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_72.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_72.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_72.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_72.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_73.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_73.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_73.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_73.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_74.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_74.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_74.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_74.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_75.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_75.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_75.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_75.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_76.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_76.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_76.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_76.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_77.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_77.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_77.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_77.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_78.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_78.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_78.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_78.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_79.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_79.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_79.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_79.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_8.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_8.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_8.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_8.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_80.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_80.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_80.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_80.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_81.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_81.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_81.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_81.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_82.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_82.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_82.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_82.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_83.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_83.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_83.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_83.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_84.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_84.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_84.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_84.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_85.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_85.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_85.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_85.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_86.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_86.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_86.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_86.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_87.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_87.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_87.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_87.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_88.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_88.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_88.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_88.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_89.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_89.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_89.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_89.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_9.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_9.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_9.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_9.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_90.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_90.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_90.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_90.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_91.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_91.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_91.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_91.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_92.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_92.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_92.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_92.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_93.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_93.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_93.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_93.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_94.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_94.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_94.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_94.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_95.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_95.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_95.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_95.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_96.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_96.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_96.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_96.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_97.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_97.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_97.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_97.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_98.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_98.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_98.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_98.png
diff --git a/PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_99.png b/src/RocketBotGUI/Images/Pokemon/Pokemon_99.png
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Images/Pokemon/Pokemon_99.png
rename to src/RocketBotGUI/Images/Pokemon/Pokemon_99.png
diff --git a/PokemonGo/RocketAPI/Window/ItemBox.Designer.cs b/src/RocketBotGUI/ItemBox.Designer.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/ItemBox.Designer.cs
rename to src/RocketBotGUI/ItemBox.Designer.cs
diff --git a/PokemonGo/RocketAPI/Window/ItemBox.cs b/src/RocketBotGUI/ItemBox.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/ItemBox.cs
rename to src/RocketBotGUI/ItemBox.cs
diff --git a/PokemonGo/RocketAPI/Window/ItemForm.Designer.cs b/src/RocketBotGUI/ItemForm.Designer.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/ItemForm.Designer.cs
rename to src/RocketBotGUI/ItemForm.Designer.cs
diff --git a/PokemonGo/RocketAPI/Window/ItemForm.cs b/src/RocketBotGUI/ItemForm.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/ItemForm.cs
rename to src/RocketBotGUI/ItemForm.cs
diff --git a/PokemonGo/RocketAPI/Window/LocationManager.cs b/src/RocketBotGUI/LocationManager.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/LocationManager.cs
rename to src/RocketBotGUI/LocationManager.cs
diff --git a/PokemonGo/RocketAPI/Window/MainForm.Designer.cs b/src/RocketBotGUI/MainForm.Designer.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/MainForm.Designer.cs
rename to src/RocketBotGUI/MainForm.Designer.cs
diff --git a/PokemonGo/RocketAPI/Window/MainForm.cs b/src/RocketBotGUI/MainForm.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/MainForm.cs
rename to src/RocketBotGUI/MainForm.cs
diff --git a/PokemonGo/RocketAPI/Window/MainForm.resx b/src/RocketBotGUI/MainForm.resx
similarity index 100%
rename from PokemonGo/RocketAPI/Window/MainForm.resx
rename to src/RocketBotGUI/MainForm.resx
diff --git a/PokemonGo/RocketAPI/Window/NicknamePokemonForm.Designer.cs b/src/RocketBotGUI/NicknamePokemonForm.Designer.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/NicknamePokemonForm.Designer.cs
rename to src/RocketBotGUI/NicknamePokemonForm.Designer.cs
diff --git a/PokemonGo/RocketAPI/Window/NicknamePokemonForm.cs b/src/RocketBotGUI/NicknamePokemonForm.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/NicknamePokemonForm.cs
rename to src/RocketBotGUI/NicknamePokemonForm.cs
diff --git a/PokemonGo/RocketAPI/Window/PokemonGo.RocketBot.csproj b/src/RocketBotGUI/PokemonGo.RocketBot.csproj
similarity index 96%
rename from PokemonGo/RocketAPI/Window/PokemonGo.RocketBot.csproj
rename to src/RocketBotGUI/PokemonGo.RocketBot.csproj
index aa7d8e1..a273e66 100644
--- a/PokemonGo/RocketAPI/Window/PokemonGo.RocketBot.csproj
+++ b/src/RocketBotGUI/PokemonGo.RocketBot.csproj
@@ -51,17 +51,14 @@
       <HintPath>lib\GMap.NET.WindowsForms.dll</HintPath>
     </Reference>
     <Reference Include="Google.Protobuf">
-      <HintPath>..\..\..\packages\Google.Protobuf.3.0.0-beta4\lib\net45\Google.Protobuf.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Google.Protobuf.3.0.0-beta4\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
     <Reference Include="ObjectListView, Version=2.9.1.1072, Culture=neutral, PublicKeyToken=b1c5bf581481bcd4, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\ObjectListView.Official.2.9.1\lib\net20\ObjectListView.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\ObjectListView.Official.2.9.1\lib\net20\ObjectListView.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="POGOProtos">
-      <HintPath>..\..\POGOProtos\bin\Debug\POGOProtos.dll</HintPath>
-    </Reference>
     <Reference Include="S2Geometry, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\S2Geometry.1.0.3\lib\portable-net45+wp8+win8\S2Geometry.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\S2Geometry.1.0.3\lib\portable-net45+wp8+win8\S2Geometry.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -153,10 +150,14 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PokemonGo.RocketAPI.csproj">
+    <ProjectReference Include="..\RocketAPI\PokemonGo.RocketAPI.csproj">
       <Project>{05d2da44-1b8e-4cf7-94ed-4d52451cd095}</Project>
       <Name>PokemonGo.RocketAPI</Name>
     </ProjectReference>
+    <ProjectReference Include="..\POGOProtos\POGOProtos.csproj">
+      <Project>{A03A7BB2-4F0B-467B-84B2-9A76E6AAE6FB}</Project>
+      <Name>POGOProtos</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="Images\Pokemon\Pokemon_1.png" />
diff --git a/PokemonGo/RocketAPI/Window/PokemonObject.cs b/src/RocketBotGUI/PokemonObject.cs
similarity index 94%
rename from PokemonGo/RocketAPI/Window/PokemonObject.cs
rename to src/RocketBotGUI/PokemonObject.cs
index c913f95..65fe380 100644
--- a/PokemonGo/RocketAPI/Window/PokemonObject.cs
+++ b/src/RocketBotGUI/PokemonObject.cs
@@ -1,6 +1,7 @@
 using POGOProtos.Data;
 using POGOProtos.Enums;
 using POGOProtos.Networking.Responses;
+using PokemonGo.RocketAPI.Helpers;
 using System.Collections.Generic;

 namespace PokemonGo.RocketAPI.Window
@@ -47,9 +48,9 @@ namespace PokemonGo.RocketAPI.Window
             get { return PokemonData.IndividualStamina; }
         }

-        public float GetIV
+        public double GetIV
         {
-            get { return (IndividualAttack + IndividualDefense + IndividualStamina) / 45f; }
+            get { return PokemonInfo.CalculatePokemonPerfection(PokemonData); }
         }

         public string Nickname {
diff --git a/PokemonGo/RocketAPI/Window/Program.cs b/src/RocketBotGUI/Program.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Program.cs
rename to src/RocketBotGUI/Program.cs
diff --git a/PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs b/src/RocketBotGUI/Properties/AssemblyInfo.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Properties/AssemblyInfo.cs
rename to src/RocketBotGUI/Properties/AssemblyInfo.cs
diff --git a/PokemonGo/RocketAPI/Window/Properties/Resources.Designer.cs b/src/RocketBotGUI/Properties/Resources.Designer.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Properties/Resources.Designer.cs
rename to src/RocketBotGUI/Properties/Resources.Designer.cs
diff --git a/PokemonGo/RocketAPI/Window/Properties/Resources.resx b/src/RocketBotGUI/Properties/Resources.resx
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Properties/Resources.resx
rename to src/RocketBotGUI/Properties/Resources.resx
diff --git a/PokemonGo/RocketAPI/Window/Properties/Settings.Designer.cs b/src/RocketBotGUI/Properties/Settings.Designer.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Properties/Settings.Designer.cs
rename to src/RocketBotGUI/Properties/Settings.Designer.cs
diff --git a/PokemonGo/RocketAPI/Window/Properties/Settings.settings b/src/RocketBotGUI/Properties/Settings.settings
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Properties/Settings.settings
rename to src/RocketBotGUI/Properties/Settings.settings
diff --git a/PokemonGo/RocketAPI/Window/Resources/encrypt.dll b/src/RocketBotGUI/Resources/encrypt.dll
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Resources/encrypt.dll
rename to src/RocketBotGUI/Resources/encrypt.dll
diff --git a/PokemonGo/RocketAPI/Window/RouteOptimizer.cs b/src/RocketBotGUI/RouteOptimizer.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/RouteOptimizer.cs
rename to src/RocketBotGUI/RouteOptimizer.cs
diff --git a/PokemonGo/RocketAPI/Window/S2GMapDrawer.cs b/src/RocketBotGUI/S2GMapDrawer.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/S2GMapDrawer.cs
rename to src/RocketBotGUI/S2GMapDrawer.cs
diff --git a/PokemonGo/RocketAPI/Window/Settings.cs b/src/RocketBotGUI/Settings.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/Settings.cs
rename to src/RocketBotGUI/Settings.cs
diff --git a/PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs b/src/RocketBotGUI/SettingsForm.Designer.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/SettingsForm.Designer.cs
rename to src/RocketBotGUI/SettingsForm.Designer.cs
diff --git a/PokemonGo/RocketAPI/Window/SettingsForm.cs b/src/RocketBotGUI/SettingsForm.cs
similarity index 100%
rename from PokemonGo/RocketAPI/Window/SettingsForm.cs
rename to src/RocketBotGUI/SettingsForm.cs
diff --git a/PokemonGo/RocketAPI/Window/SettingsForm.resx b/src/RocketBotGUI/SettingsForm.resx
similarity index 100%
rename from PokemonGo/RocketAPI/Window/SettingsForm.resx
rename to src/RocketBotGUI/SettingsForm.resx
diff --git a/PokemonGo/RocketAPI/Window/lib/GMap.NET.Core.dll b/src/RocketBotGUI/lib/GMap.NET.Core.dll
similarity index 100%
rename from PokemonGo/RocketAPI/Window/lib/GMap.NET.Core.dll
rename to src/RocketBotGUI/lib/GMap.NET.Core.dll
diff --git a/PokemonGo/RocketAPI/Window/lib/GMap.NET.Core.xml b/src/RocketBotGUI/lib/GMap.NET.Core.xml
similarity index 100%
rename from PokemonGo/RocketAPI/Window/lib/GMap.NET.Core.xml
rename to src/RocketBotGUI/lib/GMap.NET.Core.xml
diff --git a/PokemonGo/RocketAPI/Window/lib/GMap.NET.WindowsForms.dll b/src/RocketBotGUI/lib/GMap.NET.WindowsForms.dll
similarity index 100%
rename from PokemonGo/RocketAPI/Window/lib/GMap.NET.WindowsForms.dll
rename to src/RocketBotGUI/lib/GMap.NET.WindowsForms.dll
diff --git a/PokemonGo/RocketAPI/Window/lib/GMap.NET.WindowsForms.xml b/src/RocketBotGUI/lib/GMap.NET.WindowsForms.xml
similarity index 100%
rename from PokemonGo/RocketAPI/Window/lib/GMap.NET.WindowsForms.xml
rename to src/RocketBotGUI/lib/GMap.NET.WindowsForms.xml
diff --git a/PokemonGo/RocketAPI/Window/lib/License.txt b/src/RocketBotGUI/lib/License.txt
similarity index 100%
rename from PokemonGo/RocketAPI/Window/lib/License.txt
rename to src/RocketBotGUI/lib/License.txt
diff --git a/PokemonGo/RocketAPI/Window/packages.config b/src/RocketBotGUI/packages.config
similarity index 100%
rename from PokemonGo/RocketAPI/Window/packages.config
rename to src/RocketBotGUI/packages.config
diff --git a/PokemonGo/RocketAPI/Window/pokemonGo.ico b/src/RocketBotGUI/pokemonGo.ico
similarity index 100%
rename from PokemonGo/RocketAPI/Window/pokemonGo.ico
rename to src/RocketBotGUI/pokemonGo.ico