diff --git a/aiopogo/__init__.py b/aiopogo/__init__.py index 89b00031..00fa8040 100755 --- a/aiopogo/__init__.py +++ b/aiopogo/__init__.py @@ -15,6 +15,10 @@ if int(protobuf_version[:1]) < 3: raise PleaseInstallProtobufVersion3('Protobuf 3 needed, you have {}'.format(protobuf_version)) +from os import path +import sys +sys.path.append(path.dirname(path.realpath(__file__))) + from functools import partial as _partial try: diff --git a/aiopogo/pgoapi.py b/aiopogo/pgoapi.py index 76c2c021..cbbe9530 100755 --- a/aiopogo/pgoapi.py +++ b/aiopogo/pgoapi.py @@ -16,7 +16,7 @@ def __init__(*args, **kwargs): from .auth_google import AuthGoogle from .hash_server import HashServer from .exceptions import AuthTokenExpiredException, InvalidCredentialsException, NoPlayerPositionSetException, ServerApiEndpointRedirectException -from .protos.pogoprotos.networking.requests.request_type_pb2 import RequestType +from .pogoprotos.networking.requests.request_type_pb2 import RequestType class PGoApi: diff --git a/aiopogo/protos/pogoprotos/data/__init__.py b/aiopogo/pogoprotos/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/__init__.py rename to aiopogo/pogoprotos/__init__.py diff --git a/aiopogo/protos/pogoprotos/data/avatar/__init__.py b/aiopogo/pogoprotos/data/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/avatar/__init__.py rename to aiopogo/pogoprotos/data/__init__.py diff --git a/aiopogo/protos/pogoprotos/data/asset_digest_entry_pb2.py b/aiopogo/pogoprotos/data/asset_digest_entry_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/asset_digest_entry_pb2.py rename to aiopogo/pogoprotos/data/asset_digest_entry_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/badge/__init__.py b/aiopogo/pogoprotos/data/avatar/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/badge/__init__.py rename to aiopogo/pogoprotos/data/avatar/__init__.py diff --git a/aiopogo/protos/pogoprotos/data/avatar/avatar_customization_pb2.py b/aiopogo/pogoprotos/data/avatar/avatar_customization_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/avatar/avatar_customization_pb2.py rename to aiopogo/pogoprotos/data/avatar/avatar_customization_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/avatar/avatar_item_pb2.py b/aiopogo/pogoprotos/data/avatar/avatar_item_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/avatar/avatar_item_pb2.py rename to aiopogo/pogoprotos/data/avatar/avatar_item_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/background_token_pb2.py b/aiopogo/pogoprotos/data/background_token_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/background_token_pb2.py rename to aiopogo/pogoprotos/data/background_token_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/battle/__init__.py b/aiopogo/pogoprotos/data/badge/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/battle/__init__.py rename to aiopogo/pogoprotos/data/badge/__init__.py diff --git a/aiopogo/protos/pogoprotos/data/badge/badge_capture_reward_pb2.py b/aiopogo/pogoprotos/data/badge/badge_capture_reward_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/badge/badge_capture_reward_pb2.py rename to aiopogo/pogoprotos/data/badge/badge_capture_reward_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/capture/__init__.py b/aiopogo/pogoprotos/data/battle/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/capture/__init__.py rename to aiopogo/pogoprotos/data/battle/__init__.py diff --git a/aiopogo/protos/pogoprotos/data/battle/battle_action_pb2.py b/aiopogo/pogoprotos/data/battle/battle_action_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/battle/battle_action_pb2.py rename to aiopogo/pogoprotos/data/battle/battle_action_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/battle/battle_action_type_pb2.py b/aiopogo/pogoprotos/data/battle/battle_action_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/battle/battle_action_type_pb2.py rename to aiopogo/pogoprotos/data/battle/battle_action_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/battle/battle_log_pb2.py b/aiopogo/pogoprotos/data/battle/battle_log_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/battle/battle_log_pb2.py rename to aiopogo/pogoprotos/data/battle/battle_log_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/battle/battle_participant_pb2.py b/aiopogo/pogoprotos/data/battle/battle_participant_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/battle/battle_participant_pb2.py rename to aiopogo/pogoprotos/data/battle/battle_participant_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/battle/battle_pokemon_info_pb2.py b/aiopogo/pogoprotos/data/battle/battle_pokemon_info_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/battle/battle_pokemon_info_pb2.py rename to aiopogo/pogoprotos/data/battle/battle_pokemon_info_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/battle/battle_results_pb2.py b/aiopogo/pogoprotos/data/battle/battle_results_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/battle/battle_results_pb2.py rename to aiopogo/pogoprotos/data/battle/battle_results_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/battle/battle_state_pb2.py b/aiopogo/pogoprotos/data/battle/battle_state_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/battle/battle_state_pb2.py rename to aiopogo/pogoprotos/data/battle/battle_state_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/battle/battle_type_pb2.py b/aiopogo/pogoprotos/data/battle/battle_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/battle/battle_type_pb2.py rename to aiopogo/pogoprotos/data/battle/battle_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/buddy_pokemon_pb2.py b/aiopogo/pogoprotos/data/buddy_pokemon_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/buddy_pokemon_pb2.py rename to aiopogo/pogoprotos/data/buddy_pokemon_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/gym/__init__.py b/aiopogo/pogoprotos/data/capture/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/gym/__init__.py rename to aiopogo/pogoprotos/data/capture/__init__.py diff --git a/aiopogo/protos/pogoprotos/data/capture/capture_award_pb2.py b/aiopogo/pogoprotos/data/capture/capture_award_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/capture/capture_award_pb2.py rename to aiopogo/pogoprotos/data/capture/capture_award_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/capture/capture_probability_pb2.py b/aiopogo/pogoprotos/data/capture/capture_probability_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/capture/capture_probability_pb2.py rename to aiopogo/pogoprotos/data/capture/capture_probability_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/client_version_pb2.py b/aiopogo/pogoprotos/data/client_version_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/client_version_pb2.py rename to aiopogo/pogoprotos/data/client_version_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/download_url_entry_pb2.py b/aiopogo/pogoprotos/data/download_url_entry_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/download_url_entry_pb2.py rename to aiopogo/pogoprotos/data/download_url_entry_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/logs/__init__.py b/aiopogo/pogoprotos/data/gym/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/logs/__init__.py rename to aiopogo/pogoprotos/data/gym/__init__.py diff --git a/aiopogo/protos/pogoprotos/data/gym/gym_membership_pb2.py b/aiopogo/pogoprotos/data/gym/gym_membership_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/gym/gym_membership_pb2.py rename to aiopogo/pogoprotos/data/gym/gym_membership_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/gym/gym_state_pb2.py b/aiopogo/pogoprotos/data/gym/gym_state_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/gym/gym_state_pb2.py rename to aiopogo/pogoprotos/data/gym/gym_state_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/player/__init__.py b/aiopogo/pogoprotos/data/logs/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player/__init__.py rename to aiopogo/pogoprotos/data/logs/__init__.py diff --git a/aiopogo/protos/pogoprotos/data/logs/action_log_entry_pb2.py b/aiopogo/pogoprotos/data/logs/action_log_entry_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/logs/action_log_entry_pb2.py rename to aiopogo/pogoprotos/data/logs/action_log_entry_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/logs/buddy_pokemon_log_entry_pb2.py b/aiopogo/pogoprotos/data/logs/buddy_pokemon_log_entry_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/logs/buddy_pokemon_log_entry_pb2.py rename to aiopogo/pogoprotos/data/logs/buddy_pokemon_log_entry_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/logs/catch_pokemon_log_entry_pb2.py b/aiopogo/pogoprotos/data/logs/catch_pokemon_log_entry_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/logs/catch_pokemon_log_entry_pb2.py rename to aiopogo/pogoprotos/data/logs/catch_pokemon_log_entry_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/logs/fort_search_log_entry_pb2.py b/aiopogo/pogoprotos/data/logs/fort_search_log_entry_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/logs/fort_search_log_entry_pb2.py rename to aiopogo/pogoprotos/data/logs/fort_search_log_entry_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/quests/__init__.py b/aiopogo/pogoprotos/data/player/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/quests/__init__.py rename to aiopogo/pogoprotos/data/player/__init__.py diff --git a/aiopogo/protos/pogoprotos/data/player/contact_settings_pb2.py b/aiopogo/pogoprotos/data/player/contact_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player/contact_settings_pb2.py rename to aiopogo/pogoprotos/data/player/contact_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/player/currency_pb2.py b/aiopogo/pogoprotos/data/player/currency_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player/currency_pb2.py rename to aiopogo/pogoprotos/data/player/currency_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/player/daily_bonus_pb2.py b/aiopogo/pogoprotos/data/player/daily_bonus_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player/daily_bonus_pb2.py rename to aiopogo/pogoprotos/data/player/daily_bonus_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/player/equipped_badge_pb2.py b/aiopogo/pogoprotos/data/player/equipped_badge_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player/equipped_badge_pb2.py rename to aiopogo/pogoprotos/data/player/equipped_badge_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/player/player_avatar_pb2.py b/aiopogo/pogoprotos/data/player/player_avatar_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player/player_avatar_pb2.py rename to aiopogo/pogoprotos/data/player/player_avatar_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/player/player_avatar_type_pb2.py b/aiopogo/pogoprotos/data/player/player_avatar_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player/player_avatar_type_pb2.py rename to aiopogo/pogoprotos/data/player/player_avatar_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/player/player_camera_pb2.py b/aiopogo/pogoprotos/data/player/player_camera_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player/player_camera_pb2.py rename to aiopogo/pogoprotos/data/player/player_camera_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/player/player_currency_pb2.py b/aiopogo/pogoprotos/data/player/player_currency_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player/player_currency_pb2.py rename to aiopogo/pogoprotos/data/player/player_currency_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/player/player_public_profile_pb2.py b/aiopogo/pogoprotos/data/player/player_public_profile_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player/player_public_profile_pb2.py rename to aiopogo/pogoprotos/data/player/player_public_profile_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/player/player_stats_pb2.py b/aiopogo/pogoprotos/data/player/player_stats_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player/player_stats_pb2.py rename to aiopogo/pogoprotos/data/player/player_stats_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/player_badge_pb2.py b/aiopogo/pogoprotos/data/player_badge_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player_badge_pb2.py rename to aiopogo/pogoprotos/data/player_badge_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/player_data_pb2.py b/aiopogo/pogoprotos/data/player_data_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/player_data_pb2.py rename to aiopogo/pogoprotos/data/player_data_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/pokedex_entry_pb2.py b/aiopogo/pogoprotos/data/pokedex_entry_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/pokedex_entry_pb2.py rename to aiopogo/pogoprotos/data/pokedex_entry_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/pokemon_data_pb2.py b/aiopogo/pogoprotos/data/pokemon_data_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/pokemon_data_pb2.py rename to aiopogo/pogoprotos/data/pokemon_data_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/pokemon_display_pb2.py b/aiopogo/pogoprotos/data/pokemon_display_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/pokemon_display_pb2.py rename to aiopogo/pogoprotos/data/pokemon_display_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/redeem/__init__.py b/aiopogo/pogoprotos/data/quests/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/redeem/__init__.py rename to aiopogo/pogoprotos/data/quests/__init__.py diff --git a/aiopogo/protos/pogoprotos/data/quests/daily_quest_pb2.py b/aiopogo/pogoprotos/data/quests/daily_quest_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/quests/daily_quest_pb2.py rename to aiopogo/pogoprotos/data/quests/daily_quest_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/quests/quest_pb2.py b/aiopogo/pogoprotos/data/quests/quest_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/quests/quest_pb2.py rename to aiopogo/pogoprotos/data/quests/quest_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/__init__.py b/aiopogo/pogoprotos/data/redeem/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/__init__.py rename to aiopogo/pogoprotos/data/redeem/__init__.py diff --git a/aiopogo/protos/pogoprotos/data/redeem/poke_candy_pb2.py b/aiopogo/pogoprotos/data/redeem/poke_candy_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/redeem/poke_candy_pb2.py rename to aiopogo/pogoprotos/data/redeem/poke_candy_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/redeem/redeemed_avatar_item_pb2.py b/aiopogo/pogoprotos/data/redeem/redeemed_avatar_item_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/redeem/redeemed_avatar_item_pb2.py rename to aiopogo/pogoprotos/data/redeem/redeemed_avatar_item_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/redeem/redeemed_item_pb2.py b/aiopogo/pogoprotos/data/redeem/redeemed_item_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/redeem/redeemed_item_pb2.py rename to aiopogo/pogoprotos/data/redeem/redeemed_item_pb2.py diff --git a/aiopogo/protos/pogoprotos/data/redeem_passcode_reward_pb2.py b/aiopogo/pogoprotos/data/redeem_passcode_reward_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/data/redeem_passcode_reward_pb2.py rename to aiopogo/pogoprotos/data/redeem_passcode_reward_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/__init__.py b/aiopogo/pogoprotos/enums/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/__init__.py rename to aiopogo/pogoprotos/enums/__init__.py diff --git a/aiopogo/protos/pogoprotos/enums/activity_type_pb2.py b/aiopogo/pogoprotos/enums/activity_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/activity_type_pb2.py rename to aiopogo/pogoprotos/enums/activity_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/badge_type_pb2.py b/aiopogo/pogoprotos/enums/badge_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/badge_type_pb2.py rename to aiopogo/pogoprotos/enums/badge_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/camera_interpolation_pb2.py b/aiopogo/pogoprotos/enums/camera_interpolation_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/camera_interpolation_pb2.py rename to aiopogo/pogoprotos/enums/camera_interpolation_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/camera_target_pb2.py b/aiopogo/pogoprotos/enums/camera_target_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/camera_target_pb2.py rename to aiopogo/pogoprotos/enums/camera_target_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/costume_pb2.py b/aiopogo/pogoprotos/enums/costume_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/costume_pb2.py rename to aiopogo/pogoprotos/enums/costume_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/encounter_type_pb2.py b/aiopogo/pogoprotos/enums/encounter_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/encounter_type_pb2.py rename to aiopogo/pogoprotos/enums/encounter_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/filter_pb2.py b/aiopogo/pogoprotos/enums/filter_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/filter_pb2.py rename to aiopogo/pogoprotos/enums/filter_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/form_pb2.py b/aiopogo/pogoprotos/enums/form_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/form_pb2.py rename to aiopogo/pogoprotos/enums/form_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/gender_pb2.py b/aiopogo/pogoprotos/enums/gender_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/gender_pb2.py rename to aiopogo/pogoprotos/enums/gender_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/iap_item_category_pb2.py b/aiopogo/pogoprotos/enums/iap_item_category_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/iap_item_category_pb2.py rename to aiopogo/pogoprotos/enums/iap_item_category_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/item_category_pb2.py b/aiopogo/pogoprotos/enums/item_category_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/item_category_pb2.py rename to aiopogo/pogoprotos/enums/item_category_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/item_effect_pb2.py b/aiopogo/pogoprotos/enums/item_effect_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/item_effect_pb2.py rename to aiopogo/pogoprotos/enums/item_effect_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/notification_state_pb2.py b/aiopogo/pogoprotos/enums/notification_state_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/notification_state_pb2.py rename to aiopogo/pogoprotos/enums/notification_state_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/platform_pb2.py b/aiopogo/pogoprotos/enums/platform_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/platform_pb2.py rename to aiopogo/pogoprotos/enums/platform_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/pokemon_family_id_pb2.py b/aiopogo/pogoprotos/enums/pokemon_family_id_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/pokemon_family_id_pb2.py rename to aiopogo/pogoprotos/enums/pokemon_family_id_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/pokemon_id_pb2.py b/aiopogo/pogoprotos/enums/pokemon_id_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/pokemon_id_pb2.py rename to aiopogo/pogoprotos/enums/pokemon_id_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/pokemon_move_pb2.py b/aiopogo/pogoprotos/enums/pokemon_move_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/pokemon_move_pb2.py rename to aiopogo/pogoprotos/enums/pokemon_move_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/pokemon_movement_type_pb2.py b/aiopogo/pogoprotos/enums/pokemon_movement_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/pokemon_movement_type_pb2.py rename to aiopogo/pogoprotos/enums/pokemon_movement_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/pokemon_rarity_pb2.py b/aiopogo/pogoprotos/enums/pokemon_rarity_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/pokemon_rarity_pb2.py rename to aiopogo/pogoprotos/enums/pokemon_rarity_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/pokemon_type_pb2.py b/aiopogo/pogoprotos/enums/pokemon_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/pokemon_type_pb2.py rename to aiopogo/pogoprotos/enums/pokemon_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/quest_type_pb2.py b/aiopogo/pogoprotos/enums/quest_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/quest_type_pb2.py rename to aiopogo/pogoprotos/enums/quest_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/slot_pb2.py b/aiopogo/pogoprotos/enums/slot_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/slot_pb2.py rename to aiopogo/pogoprotos/enums/slot_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/team_color_pb2.py b/aiopogo/pogoprotos/enums/team_color_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/team_color_pb2.py rename to aiopogo/pogoprotos/enums/team_color_pb2.py diff --git a/aiopogo/protos/pogoprotos/enums/tutorial_state_pb2.py b/aiopogo/pogoprotos/enums/tutorial_state_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/enums/tutorial_state_pb2.py rename to aiopogo/pogoprotos/enums/tutorial_state_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/item/__init__.py b/aiopogo/pogoprotos/inventory/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/item/__init__.py rename to aiopogo/pogoprotos/inventory/__init__.py diff --git a/aiopogo/protos/pogoprotos/inventory/applied_item_pb2.py b/aiopogo/pogoprotos/inventory/applied_item_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/applied_item_pb2.py rename to aiopogo/pogoprotos/inventory/applied_item_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/applied_items_pb2.py b/aiopogo/pogoprotos/inventory/applied_items_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/applied_items_pb2.py rename to aiopogo/pogoprotos/inventory/applied_items_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/candy_pb2.py b/aiopogo/pogoprotos/inventory/candy_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/candy_pb2.py rename to aiopogo/pogoprotos/inventory/candy_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/egg_incubator_pb2.py b/aiopogo/pogoprotos/inventory/egg_incubator_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/egg_incubator_pb2.py rename to aiopogo/pogoprotos/inventory/egg_incubator_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/egg_incubator_type_pb2.py b/aiopogo/pogoprotos/inventory/egg_incubator_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/egg_incubator_type_pb2.py rename to aiopogo/pogoprotos/inventory/egg_incubator_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/egg_incubators_pb2.py b/aiopogo/pogoprotos/inventory/egg_incubators_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/egg_incubators_pb2.py rename to aiopogo/pogoprotos/inventory/egg_incubators_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/inventory_delta_pb2.py b/aiopogo/pogoprotos/inventory/inventory_delta_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/inventory_delta_pb2.py rename to aiopogo/pogoprotos/inventory/inventory_delta_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/inventory_item_data_pb2.py b/aiopogo/pogoprotos/inventory/inventory_item_data_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/inventory_item_data_pb2.py rename to aiopogo/pogoprotos/inventory/inventory_item_data_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/inventory_item_pb2.py b/aiopogo/pogoprotos/inventory/inventory_item_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/inventory_item_pb2.py rename to aiopogo/pogoprotos/inventory/inventory_item_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/inventory_key_pb2.py b/aiopogo/pogoprotos/inventory/inventory_key_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/inventory_key_pb2.py rename to aiopogo/pogoprotos/inventory/inventory_key_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/inventory_upgrade_pb2.py b/aiopogo/pogoprotos/inventory/inventory_upgrade_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/inventory_upgrade_pb2.py rename to aiopogo/pogoprotos/inventory/inventory_upgrade_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/inventory_upgrade_type_pb2.py b/aiopogo/pogoprotos/inventory/inventory_upgrade_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/inventory_upgrade_type_pb2.py rename to aiopogo/pogoprotos/inventory/inventory_upgrade_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/inventory_upgrades_pb2.py b/aiopogo/pogoprotos/inventory/inventory_upgrades_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/inventory_upgrades_pb2.py rename to aiopogo/pogoprotos/inventory/inventory_upgrades_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/__init__.py b/aiopogo/pogoprotos/inventory/item/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/__init__.py rename to aiopogo/pogoprotos/inventory/item/__init__.py diff --git a/aiopogo/protos/pogoprotos/inventory/item/item_award_pb2.py b/aiopogo/pogoprotos/inventory/item/item_award_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/item/item_award_pb2.py rename to aiopogo/pogoprotos/inventory/item/item_award_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/item/item_data_pb2.py b/aiopogo/pogoprotos/inventory/item/item_data_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/item/item_data_pb2.py rename to aiopogo/pogoprotos/inventory/item/item_data_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/item/item_id_pb2.py b/aiopogo/pogoprotos/inventory/item/item_id_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/item/item_id_pb2.py rename to aiopogo/pogoprotos/inventory/item/item_id_pb2.py diff --git a/aiopogo/protos/pogoprotos/inventory/item/item_type_pb2.py b/aiopogo/pogoprotos/inventory/item/item_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/inventory/item/item_type_pb2.py rename to aiopogo/pogoprotos/inventory/item/item_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/fort/__init__.py b/aiopogo/pogoprotos/map/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/fort/__init__.py rename to aiopogo/pogoprotos/map/__init__.py diff --git a/aiopogo/protos/pogoprotos/map/pokemon/__init__.py b/aiopogo/pogoprotos/map/fort/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/pokemon/__init__.py rename to aiopogo/pogoprotos/map/fort/__init__.py diff --git a/aiopogo/protos/pogoprotos/map/fort/fort_data_pb2.py b/aiopogo/pogoprotos/map/fort/fort_data_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/fort/fort_data_pb2.py rename to aiopogo/pogoprotos/map/fort/fort_data_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/fort/fort_lure_info_pb2.py b/aiopogo/pogoprotos/map/fort/fort_lure_info_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/fort/fort_lure_info_pb2.py rename to aiopogo/pogoprotos/map/fort/fort_lure_info_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/fort/fort_modifier_pb2.py b/aiopogo/pogoprotos/map/fort/fort_modifier_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/fort/fort_modifier_pb2.py rename to aiopogo/pogoprotos/map/fort/fort_modifier_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/fort/fort_rendering_type_pb2.py b/aiopogo/pogoprotos/map/fort/fort_rendering_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/fort/fort_rendering_type_pb2.py rename to aiopogo/pogoprotos/map/fort/fort_rendering_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/fort/fort_sponsor_pb2.py b/aiopogo/pogoprotos/map/fort/fort_sponsor_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/fort/fort_sponsor_pb2.py rename to aiopogo/pogoprotos/map/fort/fort_sponsor_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/fort/fort_summary_pb2.py b/aiopogo/pogoprotos/map/fort/fort_summary_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/fort/fort_summary_pb2.py rename to aiopogo/pogoprotos/map/fort/fort_summary_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/fort/fort_type_pb2.py b/aiopogo/pogoprotos/map/fort/fort_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/fort/fort_type_pb2.py rename to aiopogo/pogoprotos/map/fort/fort_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/map_cell_pb2.py b/aiopogo/pogoprotos/map/map_cell_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/map_cell_pb2.py rename to aiopogo/pogoprotos/map/map_cell_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/map_objects_status_pb2.py b/aiopogo/pogoprotos/map/map_objects_status_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/map_objects_status_pb2.py rename to aiopogo/pogoprotos/map/map_objects_status_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/__init__.py b/aiopogo/pogoprotos/map/pokemon/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/__init__.py rename to aiopogo/pogoprotos/map/pokemon/__init__.py diff --git a/aiopogo/protos/pogoprotos/map/pokemon/map_pokemon_pb2.py b/aiopogo/pogoprotos/map/pokemon/map_pokemon_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/pokemon/map_pokemon_pb2.py rename to aiopogo/pogoprotos/map/pokemon/map_pokemon_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/pokemon/nearby_pokemon_pb2.py b/aiopogo/pogoprotos/map/pokemon/nearby_pokemon_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/pokemon/nearby_pokemon_pb2.py rename to aiopogo/pogoprotos/map/pokemon/nearby_pokemon_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/pokemon/wild_pokemon_pb2.py b/aiopogo/pogoprotos/map/pokemon/wild_pokemon_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/pokemon/wild_pokemon_pb2.py rename to aiopogo/pogoprotos/map/pokemon/wild_pokemon_pb2.py diff --git a/aiopogo/protos/pogoprotos/map/spawn_point_pb2.py b/aiopogo/pogoprotos/map/spawn_point_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/map/spawn_point_pb2.py rename to aiopogo/pogoprotos/map/spawn_point_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/envelopes/__init__.py b/aiopogo/pogoprotos/networking/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/envelopes/__init__.py rename to aiopogo/pogoprotos/networking/__init__.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/__init__.py b/aiopogo/pogoprotos/networking/envelopes/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/__init__.py rename to aiopogo/pogoprotos/networking/envelopes/__init__.py diff --git a/aiopogo/protos/pogoprotos/networking/envelopes/auth_ticket_pb2.py b/aiopogo/pogoprotos/networking/envelopes/auth_ticket_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/envelopes/auth_ticket_pb2.py rename to aiopogo/pogoprotos/networking/envelopes/auth_ticket_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/envelopes/request_envelope_pb2.py b/aiopogo/pogoprotos/networking/envelopes/request_envelope_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/envelopes/request_envelope_pb2.py rename to aiopogo/pogoprotos/networking/envelopes/request_envelope_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/envelopes/response_envelope_pb2.py b/aiopogo/pogoprotos/networking/envelopes/response_envelope_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/envelopes/response_envelope_pb2.py rename to aiopogo/pogoprotos/networking/envelopes/response_envelope_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/envelopes/signal_log_pb2.py b/aiopogo/pogoprotos/networking/envelopes/signal_log_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/envelopes/signal_log_pb2.py rename to aiopogo/pogoprotos/networking/envelopes/signal_log_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/requests/__init__.py b/aiopogo/pogoprotos/networking/platform/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/requests/__init__.py rename to aiopogo/pogoprotos/networking/platform/__init__.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/platform_request_type_pb2.py b/aiopogo/pogoprotos/networking/platform/platform_request_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/platform_request_type_pb2.py rename to aiopogo/pogoprotos/networking/platform/platform_request_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/responses/__init__.py b/aiopogo/pogoprotos/networking/platform/requests/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/responses/__init__.py rename to aiopogo/pogoprotos/networking/platform/requests/__init__.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/requests/buy_item_android_request_pb2.py b/aiopogo/pogoprotos/networking/platform/requests/buy_item_android_request_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/requests/buy_item_android_request_pb2.py rename to aiopogo/pogoprotos/networking/platform/requests/buy_item_android_request_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/requests/buy_item_poke_coins_request_pb2.py b/aiopogo/pogoprotos/networking/platform/requests/buy_item_poke_coins_request_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/requests/buy_item_poke_coins_request_pb2.py rename to aiopogo/pogoprotos/networking/platform/requests/buy_item_poke_coins_request_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/requests/plat_eight_request_pb2.py b/aiopogo/pogoprotos/networking/platform/requests/plat_eight_request_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/requests/plat_eight_request_pb2.py rename to aiopogo/pogoprotos/networking/platform/requests/plat_eight_request_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/requests/send_encrypted_signature_request_pb2.py b/aiopogo/pogoprotos/networking/platform/requests/send_encrypted_signature_request_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/requests/send_encrypted_signature_request_pb2.py rename to aiopogo/pogoprotos/networking/platform/requests/send_encrypted_signature_request_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/__init__.py b/aiopogo/pogoprotos/networking/platform/responses/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/__init__.py rename to aiopogo/pogoprotos/networking/platform/responses/__init__.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/responses/buy_item_android_response_pb2.py b/aiopogo/pogoprotos/networking/platform/responses/buy_item_android_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/responses/buy_item_android_response_pb2.py rename to aiopogo/pogoprotos/networking/platform/responses/buy_item_android_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/responses/buy_item_poke_coins_response_pb2.py b/aiopogo/pogoprotos/networking/platform/responses/buy_item_poke_coins_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/responses/buy_item_poke_coins_response_pb2.py rename to aiopogo/pogoprotos/networking/platform/responses/buy_item_poke_coins_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/responses/get_store_items_response_pb2.py b/aiopogo/pogoprotos/networking/platform/responses/get_store_items_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/responses/get_store_items_response_pb2.py rename to aiopogo/pogoprotos/networking/platform/responses/get_store_items_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/responses/plat_eight_response_pb2.py b/aiopogo/pogoprotos/networking/platform/responses/plat_eight_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/responses/plat_eight_response_pb2.py rename to aiopogo/pogoprotos/networking/platform/responses/plat_eight_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/platform/responses/send_encrypted_signature_response_pb2.py b/aiopogo/pogoprotos/networking/platform/responses/send_encrypted_signature_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/platform/responses/send_encrypted_signature_response_pb2.py rename to aiopogo/pogoprotos/networking/platform/responses/send_encrypted_signature_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/__init__.py b/aiopogo/pogoprotos/networking/requests/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/__init__.py rename to aiopogo/pogoprotos/networking/requests/__init__.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/__init__.py b/aiopogo/pogoprotos/networking/requests/messages/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/__init__.py rename to aiopogo/pogoprotos/networking/requests/messages/__init__.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/add_fort_modifier_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/add_fort_modifier_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/add_fort_modifier_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/add_fort_modifier_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/attack_gym_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/attack_gym_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/attack_gym_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/attack_gym_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/catch_pokemon_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/catch_pokemon_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/catch_pokemon_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/catch_pokemon_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/check_awarded_badges_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/check_awarded_badges_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/check_awarded_badges_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/check_awarded_badges_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/check_challenge_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/check_challenge_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/check_challenge_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/check_challenge_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/claim_codename_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/claim_codename_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/claim_codename_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/claim_codename_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/collect_daily_bonus_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/collect_daily_bonus_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/collect_daily_bonus_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/collect_daily_bonus_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/collect_daily_defender_bonus_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/collect_daily_defender_bonus_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/collect_daily_defender_bonus_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/collect_daily_defender_bonus_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/disk_encounter_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/disk_encounter_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/disk_encounter_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/disk_encounter_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/download_item_templates_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/download_item_templates_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/download_item_templates_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/download_item_templates_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/download_remote_config_version_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/download_remote_config_version_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/download_remote_config_version_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/download_remote_config_version_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/download_settings_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/download_settings_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/download_settings_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/download_settings_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/echo_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/echo_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/echo_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/echo_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/encounter_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/encounter_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/encounter_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/encounter_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/encounter_tutorial_complete_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/encounter_tutorial_complete_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/encounter_tutorial_complete_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/encounter_tutorial_complete_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/equip_badge_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/equip_badge_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/equip_badge_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/equip_badge_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/evolve_pokemon_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/evolve_pokemon_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/evolve_pokemon_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/evolve_pokemon_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/fort_deploy_pokemon_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/fort_deploy_pokemon_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/fort_deploy_pokemon_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/fort_deploy_pokemon_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/fort_details_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/fort_details_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/fort_details_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/fort_details_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/fort_recall_pokemon_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/fort_recall_pokemon_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/fort_recall_pokemon_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/fort_recall_pokemon_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/fort_search_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/fort_search_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/fort_search_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/fort_search_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/get_asset_digest_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/get_asset_digest_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/get_asset_digest_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/get_asset_digest_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/get_buddy_walked_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/get_buddy_walked_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/get_buddy_walked_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/get_buddy_walked_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/get_download_urls_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/get_download_urls_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/get_download_urls_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/get_download_urls_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/get_gym_details_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/get_gym_details_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/get_gym_details_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/get_gym_details_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/get_hatched_eggs_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/get_hatched_eggs_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/get_hatched_eggs_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/get_hatched_eggs_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/get_inbox_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/get_inbox_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/get_inbox_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/get_inbox_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/get_incense_pokemon_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/get_incense_pokemon_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/get_incense_pokemon_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/get_incense_pokemon_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/get_inventory_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/get_inventory_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/get_inventory_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/get_inventory_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/get_map_objects_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/get_map_objects_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/get_map_objects_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/get_map_objects_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/get_player_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/get_player_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/get_player_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/get_player_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/get_player_profile_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/get_player_profile_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/get_player_profile_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/get_player_profile_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/incense_encounter_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/incense_encounter_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/incense_encounter_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/incense_encounter_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/level_up_rewards_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/level_up_rewards_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/level_up_rewards_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/level_up_rewards_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/list_avatar_customizations_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/list_avatar_customizations_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/list_avatar_customizations_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/list_avatar_customizations_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/mark_tutorial_complete_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/mark_tutorial_complete_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/mark_tutorial_complete_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/mark_tutorial_complete_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/nickname_pokemon_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/nickname_pokemon_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/nickname_pokemon_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/nickname_pokemon_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/push_notification_registry_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/push_notification_registry_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/push_notification_registry_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/push_notification_registry_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/recycle_inventory_item_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/recycle_inventory_item_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/recycle_inventory_item_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/recycle_inventory_item_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/register_background_device_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/register_background_device_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/register_background_device_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/register_background_device_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/release_pokemon_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/release_pokemon_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/release_pokemon_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/release_pokemon_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/set_avatar_item_as_viewed_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/set_avatar_item_as_viewed_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/set_avatar_item_as_viewed_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/set_avatar_item_as_viewed_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/set_avatar_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/set_avatar_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/set_avatar_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/set_avatar_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/set_buddy_pokemon_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/set_buddy_pokemon_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/set_buddy_pokemon_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/set_buddy_pokemon_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/set_contact_settings_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/set_contact_settings_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/set_contact_settings_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/set_contact_settings_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/set_favorite_pokemon_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/set_favorite_pokemon_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/set_favorite_pokemon_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/set_favorite_pokemon_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/set_player_team_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/set_player_team_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/set_player_team_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/set_player_team_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/sfida_action_log_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/sfida_action_log_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/sfida_action_log_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/sfida_action_log_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/start_gym_battle_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/start_gym_battle_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/start_gym_battle_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/start_gym_battle_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/update_notification_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/update_notification_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/update_notification_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/update_notification_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/upgrade_pokemon_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/upgrade_pokemon_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/upgrade_pokemon_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/upgrade_pokemon_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/use_incense_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/use_incense_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/use_incense_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/use_incense_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/use_item_capture_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/use_item_capture_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/use_item_capture_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/use_item_capture_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/use_item_egg_incubator_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/use_item_egg_incubator_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/use_item_egg_incubator_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/use_item_egg_incubator_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/use_item_encounter_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/use_item_encounter_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/use_item_encounter_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/use_item_encounter_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/use_item_gym_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/use_item_gym_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/use_item_gym_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/use_item_gym_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/use_item_potion_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/use_item_potion_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/use_item_potion_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/use_item_potion_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/use_item_revive_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/use_item_revive_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/use_item_revive_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/use_item_revive_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/use_item_xp_boost_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/use_item_xp_boost_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/use_item_xp_boost_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/use_item_xp_boost_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/messages/verify_challenge_message_pb2.py b/aiopogo/pogoprotos/networking/requests/messages/verify_challenge_message_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/messages/verify_challenge_message_pb2.py rename to aiopogo/pogoprotos/networking/requests/messages/verify_challenge_message_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/request_pb2.py b/aiopogo/pogoprotos/networking/requests/request_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/request_pb2.py rename to aiopogo/pogoprotos/networking/requests/request_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/requests/request_type_pb2.py b/aiopogo/pogoprotos/networking/requests/request_type_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/requests/request_type_pb2.py rename to aiopogo/pogoprotos/networking/requests/request_type_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/__init__.py b/aiopogo/pogoprotos/networking/responses/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/__init__.py rename to aiopogo/pogoprotos/networking/responses/__init__.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/add_fort_modifier_response_pb2.py b/aiopogo/pogoprotos/networking/responses/add_fort_modifier_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/add_fort_modifier_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/add_fort_modifier_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/attack_gym_response_pb2.py b/aiopogo/pogoprotos/networking/responses/attack_gym_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/attack_gym_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/attack_gym_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/catch_pokemon_response_pb2.py b/aiopogo/pogoprotos/networking/responses/catch_pokemon_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/catch_pokemon_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/catch_pokemon_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/check_awarded_badges_response_pb2.py b/aiopogo/pogoprotos/networking/responses/check_awarded_badges_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/check_awarded_badges_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/check_awarded_badges_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/check_challenge_response_pb2.py b/aiopogo/pogoprotos/networking/responses/check_challenge_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/check_challenge_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/check_challenge_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/check_codename_available_response_pb2.py b/aiopogo/pogoprotos/networking/responses/check_codename_available_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/check_codename_available_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/check_codename_available_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/claim_codename_response_pb2.py b/aiopogo/pogoprotos/networking/responses/claim_codename_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/claim_codename_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/claim_codename_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/collect_daily_bonus_response_pb2.py b/aiopogo/pogoprotos/networking/responses/collect_daily_bonus_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/collect_daily_bonus_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/collect_daily_bonus_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/collect_daily_defender_bonus_response_pb2.py b/aiopogo/pogoprotos/networking/responses/collect_daily_defender_bonus_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/collect_daily_defender_bonus_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/collect_daily_defender_bonus_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/disk_encounter_response_pb2.py b/aiopogo/pogoprotos/networking/responses/disk_encounter_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/disk_encounter_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/disk_encounter_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/download_item_templates_response_pb2.py b/aiopogo/pogoprotos/networking/responses/download_item_templates_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/download_item_templates_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/download_item_templates_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/download_remote_config_version_response_pb2.py b/aiopogo/pogoprotos/networking/responses/download_remote_config_version_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/download_remote_config_version_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/download_remote_config_version_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/download_settings_response_pb2.py b/aiopogo/pogoprotos/networking/responses/download_settings_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/download_settings_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/download_settings_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/echo_response_pb2.py b/aiopogo/pogoprotos/networking/responses/echo_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/echo_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/echo_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/encounter_response_pb2.py b/aiopogo/pogoprotos/networking/responses/encounter_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/encounter_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/encounter_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/encounter_tutorial_complete_response_pb2.py b/aiopogo/pogoprotos/networking/responses/encounter_tutorial_complete_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/encounter_tutorial_complete_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/encounter_tutorial_complete_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/equip_badge_response_pb2.py b/aiopogo/pogoprotos/networking/responses/equip_badge_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/equip_badge_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/equip_badge_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/evolve_pokemon_response_pb2.py b/aiopogo/pogoprotos/networking/responses/evolve_pokemon_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/evolve_pokemon_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/evolve_pokemon_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/fort_deploy_pokemon_response_pb2.py b/aiopogo/pogoprotos/networking/responses/fort_deploy_pokemon_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/fort_deploy_pokemon_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/fort_deploy_pokemon_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/fort_details_response_pb2.py b/aiopogo/pogoprotos/networking/responses/fort_details_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/fort_details_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/fort_details_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/fort_recall_pokemon_response_pb2.py b/aiopogo/pogoprotos/networking/responses/fort_recall_pokemon_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/fort_recall_pokemon_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/fort_recall_pokemon_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/fort_search_response_pb2.py b/aiopogo/pogoprotos/networking/responses/fort_search_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/fort_search_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/fort_search_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/get_asset_digest_response_pb2.py b/aiopogo/pogoprotos/networking/responses/get_asset_digest_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/get_asset_digest_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/get_asset_digest_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/get_buddy_walked_response_pb2.py b/aiopogo/pogoprotos/networking/responses/get_buddy_walked_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/get_buddy_walked_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/get_buddy_walked_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/get_download_urls_response_pb2.py b/aiopogo/pogoprotos/networking/responses/get_download_urls_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/get_download_urls_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/get_download_urls_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/get_gym_details_response_pb2.py b/aiopogo/pogoprotos/networking/responses/get_gym_details_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/get_gym_details_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/get_gym_details_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/get_hatched_eggs_response_pb2.py b/aiopogo/pogoprotos/networking/responses/get_hatched_eggs_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/get_hatched_eggs_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/get_hatched_eggs_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/get_inbox_response_pb2.py b/aiopogo/pogoprotos/networking/responses/get_inbox_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/get_inbox_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/get_inbox_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/get_incense_pokemon_response_pb2.py b/aiopogo/pogoprotos/networking/responses/get_incense_pokemon_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/get_incense_pokemon_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/get_incense_pokemon_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/get_inventory_response_pb2.py b/aiopogo/pogoprotos/networking/responses/get_inventory_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/get_inventory_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/get_inventory_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/get_map_objects_response_pb2.py b/aiopogo/pogoprotos/networking/responses/get_map_objects_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/get_map_objects_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/get_map_objects_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/get_player_profile_response_pb2.py b/aiopogo/pogoprotos/networking/responses/get_player_profile_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/get_player_profile_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/get_player_profile_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/get_player_response_pb2.py b/aiopogo/pogoprotos/networking/responses/get_player_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/get_player_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/get_player_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/incense_encounter_response_pb2.py b/aiopogo/pogoprotos/networking/responses/incense_encounter_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/incense_encounter_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/incense_encounter_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/level_up_rewards_response_pb2.py b/aiopogo/pogoprotos/networking/responses/level_up_rewards_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/level_up_rewards_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/level_up_rewards_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/list_avatar_customizations_response_pb2.py b/aiopogo/pogoprotos/networking/responses/list_avatar_customizations_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/list_avatar_customizations_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/list_avatar_customizations_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/mark_tutorial_complete_response_pb2.py b/aiopogo/pogoprotos/networking/responses/mark_tutorial_complete_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/mark_tutorial_complete_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/mark_tutorial_complete_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/nickname_pokemon_response_pb2.py b/aiopogo/pogoprotos/networking/responses/nickname_pokemon_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/nickname_pokemon_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/nickname_pokemon_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/push_notification_registry_response_pb2.py b/aiopogo/pogoprotos/networking/responses/push_notification_registry_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/push_notification_registry_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/push_notification_registry_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/recycle_inventory_item_response_pb2.py b/aiopogo/pogoprotos/networking/responses/recycle_inventory_item_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/recycle_inventory_item_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/recycle_inventory_item_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/register_background_device_response_pb2.py b/aiopogo/pogoprotos/networking/responses/register_background_device_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/register_background_device_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/register_background_device_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/release_pokemon_response_pb2.py b/aiopogo/pogoprotos/networking/responses/release_pokemon_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/release_pokemon_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/release_pokemon_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/set_avatar_item_as_viewed_response_pb2.py b/aiopogo/pogoprotos/networking/responses/set_avatar_item_as_viewed_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/set_avatar_item_as_viewed_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/set_avatar_item_as_viewed_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/set_avatar_response_pb2.py b/aiopogo/pogoprotos/networking/responses/set_avatar_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/set_avatar_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/set_avatar_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/set_buddy_pokemon_response_pb2.py b/aiopogo/pogoprotos/networking/responses/set_buddy_pokemon_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/set_buddy_pokemon_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/set_buddy_pokemon_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/set_contact_settings_response_pb2.py b/aiopogo/pogoprotos/networking/responses/set_contact_settings_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/set_contact_settings_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/set_contact_settings_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/set_favorite_pokemon_response_pb2.py b/aiopogo/pogoprotos/networking/responses/set_favorite_pokemon_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/set_favorite_pokemon_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/set_favorite_pokemon_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/set_player_team_response_pb2.py b/aiopogo/pogoprotos/networking/responses/set_player_team_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/set_player_team_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/set_player_team_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/sfida_action_log_response_pb2.py b/aiopogo/pogoprotos/networking/responses/sfida_action_log_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/sfida_action_log_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/sfida_action_log_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/start_gym_battle_response_pb2.py b/aiopogo/pogoprotos/networking/responses/start_gym_battle_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/start_gym_battle_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/start_gym_battle_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/update_notification_response_pb2.py b/aiopogo/pogoprotos/networking/responses/update_notification_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/update_notification_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/update_notification_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/upgrade_pokemon_response_pb2.py b/aiopogo/pogoprotos/networking/responses/upgrade_pokemon_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/upgrade_pokemon_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/upgrade_pokemon_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/use_incense_response_pb2.py b/aiopogo/pogoprotos/networking/responses/use_incense_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/use_incense_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/use_incense_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/use_item_capture_response_pb2.py b/aiopogo/pogoprotos/networking/responses/use_item_capture_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/use_item_capture_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/use_item_capture_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/use_item_egg_incubator_response_pb2.py b/aiopogo/pogoprotos/networking/responses/use_item_egg_incubator_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/use_item_egg_incubator_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/use_item_egg_incubator_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/use_item_encounter_response_pb2.py b/aiopogo/pogoprotos/networking/responses/use_item_encounter_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/use_item_encounter_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/use_item_encounter_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/use_item_gym_response_pb2.py b/aiopogo/pogoprotos/networking/responses/use_item_gym_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/use_item_gym_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/use_item_gym_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/use_item_potion_response_pb2.py b/aiopogo/pogoprotos/networking/responses/use_item_potion_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/use_item_potion_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/use_item_potion_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/use_item_revive_response_pb2.py b/aiopogo/pogoprotos/networking/responses/use_item_revive_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/use_item_revive_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/use_item_revive_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/use_item_xp_boost_response_pb2.py b/aiopogo/pogoprotos/networking/responses/use_item_xp_boost_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/use_item_xp_boost_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/use_item_xp_boost_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/networking/responses/verify_challenge_response_pb2.py b/aiopogo/pogoprotos/networking/responses/verify_challenge_response_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/networking/responses/verify_challenge_response_pb2.py rename to aiopogo/pogoprotos/networking/responses/verify_challenge_response_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/__init__.py b/aiopogo/pogoprotos/settings/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/__init__.py rename to aiopogo/pogoprotos/settings/__init__.py diff --git a/aiopogo/protos/pogoprotos/settings/download_settings_action_pb2.py b/aiopogo/pogoprotos/settings/download_settings_action_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/download_settings_action_pb2.py rename to aiopogo/pogoprotos/settings/download_settings_action_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/event_settings_pb2.py b/aiopogo/pogoprotos/settings/event_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/event_settings_pb2.py rename to aiopogo/pogoprotos/settings/event_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/festival_settings_pb2.py b/aiopogo/pogoprotos/settings/festival_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/festival_settings_pb2.py rename to aiopogo/pogoprotos/settings/festival_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/fort_settings_pb2.py b/aiopogo/pogoprotos/settings/fort_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/fort_settings_pb2.py rename to aiopogo/pogoprotos/settings/fort_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/global_settings_pb2.py b/aiopogo/pogoprotos/settings/global_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/global_settings_pb2.py rename to aiopogo/pogoprotos/settings/global_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/gps_settings_pb2.py b/aiopogo/pogoprotos/settings/gps_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/gps_settings_pb2.py rename to aiopogo/pogoprotos/settings/gps_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/inventory_settings_pb2.py b/aiopogo/pogoprotos/settings/inventory_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/inventory_settings_pb2.py rename to aiopogo/pogoprotos/settings/inventory_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/level_settings_pb2.py b/aiopogo/pogoprotos/settings/level_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/level_settings_pb2.py rename to aiopogo/pogoprotos/settings/level_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/map_settings_pb2.py b/aiopogo/pogoprotos/settings/map_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/map_settings_pb2.py rename to aiopogo/pogoprotos/settings/map_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/item/__init__.py b/aiopogo/pogoprotos/settings/master/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/item/__init__.py rename to aiopogo/pogoprotos/settings/master/__init__.py diff --git a/aiopogo/protos/pogoprotos/settings/master/avatar_customization_settings_pb2.py b/aiopogo/pogoprotos/settings/master/avatar_customization_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/avatar_customization_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/avatar_customization_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/badge_settings_pb2.py b/aiopogo/pogoprotos/settings/master/badge_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/badge_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/badge_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/camera_settings_pb2.py b/aiopogo/pogoprotos/settings/master/camera_settings_pb2.py similarity index 98% rename from aiopogo/protos/pogoprotos/settings/master/camera_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/camera_settings_pb2.py index 52f9b30c..0bcf5801 100644 --- a/aiopogo/protos/pogoprotos/settings/master/camera_settings_pb2.py +++ b/aiopogo/pogoprotos/settings/master/camera_settings_pb2.py @@ -21,7 +21,7 @@ name='pogoprotos/settings/master/camera_settings.proto', package='pogoprotos.settings.master', syntax='proto3', - serialized_pb=_b('\n0pogoprotos/settings/master/camera_settings.proto\x12\x1apogoprotos.settings.master\x1a$pogoprotos/enums/camera_target.proto\x1a+pogoprotos/enums/camera_interpolation.proto\"\xd7\x03\n\x0e\x43\x61meraSettings\x12\x13\n\x0bnext_camera\x18\x01 \x01(\t\x12<\n\rinterpolation\x18\x02 \x03(\x0e\x32%.pogoprotos.enums.CameraInterpolation\x12\x33\n\x0btarget_type\x18\x03 \x03(\x0e\x32\x1e.pogoprotos.enums.CameraTarget\x12\x15\n\rease_in_speed\x18\x04 \x03(\x02\x12\x16\n\x0e\x65\x61st_out_speed\x18\x05 \x03(\x02\x12\x18\n\x10\x64uration_seconds\x18\x06 \x03(\x02\x12\x14\n\x0cwait_seconds\x18\x07 \x03(\x02\x12\x1a\n\x12transition_seconds\x18\x08 \x03(\x02\x12\x14\n\x0c\x61ngle_degree\x18\t \x03(\x02\x12\x1b\n\x13\x61ngle_offset_degree\x18\n \x03(\x02\x12\x14\n\x0cpitch_degree\x18\x0b \x03(\x02\x12\x1b\n\x13pitch_offset_degree\x18\x0c \x03(\x02\x12\x13\n\x0broll_degree\x18\r \x03(\x02\x12\x17\n\x0f\x64istance_meters\x18\x0e \x03(\x02\x12\x16\n\x0eheight_percent\x18\x0f \x03(\x02\x12\x16\n\x0evert_ctr_ratio\x18\x10 \x03(\x02\x62\x06proto3') + serialized_pb=_b('\n0pogoprotos/settings/master/camera_settings.proto\x12\x1apogoprotos.settings.master\x1a$pogoprotos/enums/camera_target.proto\x1a+pogoprotos/enums/camera_interpolation.proto\"\xd7\x03\n\x0e\x43\x61meraSettings\x12\x13\n\x0bnext_camera\x18\x01 \x01(\t\x12<\n\rinterpolation\x18\x02 \x03(\x0e\x32%.pogoprotos.enums.CameraInterpolation\x12\x33\n\x0btarget_type\x18\x03 \x03(\x0e\x32\x1e.pogoprotos.enums.CameraTarget\x12\x15\n\rease_in_speed\x18\x04 \x03(\x02\x12\x16\n\x0e\x65\x61se_out_speed\x18\x05 \x03(\x02\x12\x18\n\x10\x64uration_seconds\x18\x06 \x03(\x02\x12\x14\n\x0cwait_seconds\x18\x07 \x03(\x02\x12\x1a\n\x12transition_seconds\x18\x08 \x03(\x02\x12\x14\n\x0c\x61ngle_degree\x18\t \x03(\x02\x12\x1b\n\x13\x61ngle_offset_degree\x18\n \x03(\x02\x12\x14\n\x0cpitch_degree\x18\x0b \x03(\x02\x12\x1b\n\x13pitch_offset_degree\x18\x0c \x03(\x02\x12\x13\n\x0broll_degree\x18\r \x03(\x02\x12\x17\n\x0f\x64istance_meters\x18\x0e \x03(\x02\x12\x16\n\x0eheight_percent\x18\x0f \x03(\x02\x12\x16\n\x0evert_ctr_ratio\x18\x10 \x03(\x02\x62\x06proto3') , dependencies=[pogoprotos_dot_enums_dot_camera__target__pb2.DESCRIPTOR,pogoprotos_dot_enums_dot_camera__interpolation__pb2.DESCRIPTOR,]) @@ -64,7 +64,7 @@ is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='east_out_speed', full_name='pogoprotos.settings.master.CameraSettings.east_out_speed', index=4, + name='ease_out_speed', full_name='pogoprotos.settings.master.CameraSettings.ease_out_speed', index=4, number=5, type=2, cpp_type=6, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, diff --git a/aiopogo/protos/pogoprotos/settings/master/encounter_settings_pb2.py b/aiopogo/pogoprotos/settings/master/encounter_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/encounter_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/encounter_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/equipped_badge_settings_pb2.py b/aiopogo/pogoprotos/settings/master/equipped_badge_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/equipped_badge_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/equipped_badge_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/form_settings_pb2.py b/aiopogo/pogoprotos/settings/master/form_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/form_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/form_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/gender_settings_pb2.py b/aiopogo/pogoprotos/settings/master/gender_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/gender_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/gender_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/gym_battle_settings_pb2.py b/aiopogo/pogoprotos/settings/master/gym_battle_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/gym_battle_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/gym_battle_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/gym_level_settings_pb2.py b/aiopogo/pogoprotos/settings/master/gym_level_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/gym_level_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/gym_level_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/iap_item_display_pb2.py b/aiopogo/pogoprotos/settings/master/iap_item_display_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/iap_item_display_pb2.py rename to aiopogo/pogoprotos/settings/master/iap_item_display_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/iap_settings_pb2.py b/aiopogo/pogoprotos/settings/master/iap_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/iap_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/iap_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/pokemon/__init__.py b/aiopogo/pogoprotos/settings/master/item/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/pokemon/__init__.py rename to aiopogo/pogoprotos/settings/master/item/__init__.py diff --git a/aiopogo/protos/pogoprotos/settings/master/item/battle_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/item/battle_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/item/battle_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/item/battle_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/item/egg_incubator_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/item/egg_incubator_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/item/egg_incubator_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/item/egg_incubator_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/item/experience_boost_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/item/experience_boost_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/item/experience_boost_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/item/experience_boost_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/item/food_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/item/food_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/item/food_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/item/food_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/item/fort_modifier_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/item/fort_modifier_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/item/fort_modifier_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/item/fort_modifier_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/item/incense_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/item/incense_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/item/incense_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/item/incense_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/item/inventory_upgrade_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/item/inventory_upgrade_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/item/inventory_upgrade_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/item/inventory_upgrade_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/item/pokeball_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/item/pokeball_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/item/pokeball_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/item/pokeball_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/item/potion_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/item/potion_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/item/potion_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/item/potion_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/item/revive_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/item/revive_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/item/revive_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/item/revive_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/item_settings_pb2.py b/aiopogo/pogoprotos/settings/master/item_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/item_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/item_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/move_sequence_settings_pb2.py b/aiopogo/pogoprotos/settings/master/move_sequence_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/move_sequence_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/move_sequence_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/move_settings_pb2.py b/aiopogo/pogoprotos/settings/master/move_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/move_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/move_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/player_level_settings_pb2.py b/aiopogo/pogoprotos/settings/master/player_level_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/player_level_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/player_level_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/quest/__init__.py b/aiopogo/pogoprotos/settings/master/pokemon/__init__.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/quest/__init__.py rename to aiopogo/pogoprotos/settings/master/pokemon/__init__.py diff --git a/aiopogo/protos/pogoprotos/settings/master/pokemon/camera_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/pokemon/camera_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/pokemon/camera_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/pokemon/camera_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/pokemon/encounter_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/pokemon/encounter_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/pokemon/encounter_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/pokemon/encounter_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/pokemon/evolution_branch_pb2.py b/aiopogo/pogoprotos/settings/master/pokemon/evolution_branch_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/pokemon/evolution_branch_pb2.py rename to aiopogo/pogoprotos/settings/master/pokemon/evolution_branch_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/pokemon/pokemon_gender_settings_pb2.py b/aiopogo/pogoprotos/settings/master/pokemon/pokemon_gender_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/pokemon/pokemon_gender_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/pokemon/pokemon_gender_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/pokemon/stats_attributes_pb2.py b/aiopogo/pogoprotos/settings/master/pokemon/stats_attributes_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/pokemon/stats_attributes_pb2.py rename to aiopogo/pogoprotos/settings/master/pokemon/stats_attributes_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/pokemon_settings_pb2.py b/aiopogo/pogoprotos/settings/master/pokemon_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/pokemon_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/pokemon_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/pokemon_upgrade_settings_pb2.py b/aiopogo/pogoprotos/settings/master/pokemon_upgrade_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/pokemon_upgrade_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/pokemon_upgrade_settings_pb2.py diff --git a/aiopogo/pogoprotos/settings/master/quest/__init__.py b/aiopogo/pogoprotos/settings/master/quest/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/aiopogo/protos/pogoprotos/settings/master/quest/daily_quest_settings_pb2.py b/aiopogo/pogoprotos/settings/master/quest/daily_quest_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/quest/daily_quest_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/quest/daily_quest_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/quest_settings_pb2.py b/aiopogo/pogoprotos/settings/master/quest_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/quest_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/quest_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/master/type_effective_settings_pb2.py b/aiopogo/pogoprotos/settings/master/type_effective_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/master/type_effective_settings_pb2.py rename to aiopogo/pogoprotos/settings/master/type_effective_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/news_settings_pb2.py b/aiopogo/pogoprotos/settings/news_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/news_settings_pb2.py rename to aiopogo/pogoprotos/settings/news_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/notification_settings_pb2.py b/aiopogo/pogoprotos/settings/notification_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/notification_settings_pb2.py rename to aiopogo/pogoprotos/settings/notification_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/passcode_settings_pb2.py b/aiopogo/pogoprotos/settings/passcode_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/passcode_settings_pb2.py rename to aiopogo/pogoprotos/settings/passcode_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/sfida_settings_pb2.py b/aiopogo/pogoprotos/settings/sfida_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/sfida_settings_pb2.py rename to aiopogo/pogoprotos/settings/sfida_settings_pb2.py diff --git a/aiopogo/protos/pogoprotos/settings/translation_settings_pb2.py b/aiopogo/pogoprotos/settings/translation_settings_pb2.py similarity index 100% rename from aiopogo/protos/pogoprotos/settings/translation_settings_pb2.py rename to aiopogo/pogoprotos/settings/translation_settings_pb2.py diff --git a/aiopogo/protos/__init__.py b/aiopogo/protos/__init__.py deleted file mode 100644 index c7f3e684..00000000 --- a/aiopogo/protos/__init__.py +++ /dev/null @@ -1 +0,0 @@ -'Generated'; import os; import sys; sys.path.append(os.path.dirname(os.path.realpath(__file__))) \ No newline at end of file diff --git a/aiopogo/protos/pogoprotos/__init__.py b/aiopogo/protos/pogoprotos/__init__.py deleted file mode 100644 index c7f3e684..00000000 --- a/aiopogo/protos/pogoprotos/__init__.py +++ /dev/null @@ -1 +0,0 @@ -'Generated'; import os; import sys; sys.path.append(os.path.dirname(os.path.realpath(__file__))) \ No newline at end of file diff --git a/aiopogo/rpc_api.py b/aiopogo/rpc_api.py index 2488bb62..438a42f5 100755 --- a/aiopogo/rpc_api.py +++ b/aiopogo/rpc_api.py @@ -1,29 +1,27 @@ -from importlib import import_module -from asyncio import TimeoutError from array import array -from os import urandom -from logging import getLogger -from struct import Struct +from asyncio import TimeoutError from enum import Enum +from importlib import import_module +from logging import getLogger +from os import urandom -from google.protobuf import message from aiohttp import ClientError, ClientHttpProxyError, ClientProxyConnectionError, ClientResponseError, ServerTimeoutError -from pycrypt import pycrypt from cyrandom import choose_weighted, randint, random, triangular, triangular_int, uniform +from google.protobuf.message import DecodeError +from pycrypt import pycrypt from .exceptions import * -from .utilities import to_camel_case, get_time_ms, IdGenerator from .hash_server import HashServer from .session import SESSIONS +from .utilities import to_camel_case, get_time_ms, IdGenerator -from .protos.pogoprotos import networking -from networking.envelopes.request_envelope_pb2 import RequestEnvelope -from networking.envelopes.response_envelope_pb2 import ResponseEnvelope -from networking.envelopes.signal_log_pb2 import SignalLog -from networking.platform.requests.send_encrypted_signature_request_pb2 import SendEncryptedSignatureRequest -from networking.platform.requests.plat_eight_request_pb2 import PlatEightRequest -from networking.platform.responses.plat_eight_response_pb2 import PlatEightResponse -from networking.requests.request_type_pb2 import RequestType +from .pogoprotos.networking.envelopes.request_envelope_pb2 import RequestEnvelope +from .pogoprotos.networking.envelopes.response_envelope_pb2 import ResponseEnvelope +from .pogoprotos.networking.envelopes.signal_log_pb2 import SignalLog +from .pogoprotos.networking.platform.requests.send_encrypted_signature_request_pb2 import SendEncryptedSignatureRequest +from .pogoprotos.networking.platform.requests.plat_eight_request_pb2 import PlatEightRequest +from .pogoprotos.networking.platform.responses.plat_eight_response_pb2 import PlatEightResponse +from .pogoprotos.networking.requests.request_type_pb2 import RequestType class RpcApi: @@ -281,7 +279,7 @@ def _parse_response(self, response_raw, subrequests): response_proto = ResponseEnvelope() try: response_proto.ParseFromString(response_raw) - except message.DecodeError as e: + except DecodeError as e: raise MalformedNianticResponseException('Could not parse response.') from e self.log.debug('Protobuf structure of rpc response:\n\r%s', response_proto)