From fdba1b264fb3689764c5baf1efa71a0327f9ad7b Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 8 Jan 2017 11:22:50 +0000
Subject: [PATCH] Network related classes path organization.

---
 .../scripts/handlers/EffectMasterHandler.java |  2 +-
 .../admincommandhandlers/AdminEditChar.java   |  2 +-
 .../admincommandhandlers/AdminLogin.java      |  2 +-
 .../punishmenthandlers/BanHandler.java        |  2 +-
 .../punishmenthandlers/ChatBanHandler.java    |  2 +-
 .../punishmenthandlers/JailHandler.java       |  2 +-
 .../com/l2jmobius/gameserver/GameServer.java  |  2 +-
 .../gameserver/LoginServerThread.java         | 42 +++++++++----------
 .../com/l2jmobius/gameserver/Shutdown.java    |  6 +--
 .../data/sql/impl/OfflineTradersTable.java    |  2 +-
 .../data/xml/impl/SkillTreesData.java         |  2 +-
 .../instancemanager/AntiFeedManager.java      |  2 +-
 .../model/actor/instance/L2PcInstance.java    |  2 +-
 .../tasks/player/GameGuardCheckTask.java      |  2 +-
 .../impl/character/player/OnPlayerCreate.java |  2 +-
 .../impl/character/player/OnPlayerDelete.java |  2 +-
 .../character/player/OnPlayerRestore.java     |  2 +-
 .../impl/character/player/OnPlayerSelect.java |  2 +-
 .../events/impl/server/OnPacketReceived.java  |  2 +-
 .../events/impl/server/OnPacketSent.java      |  2 +-
 .../network/{client => }/BlowFishKeygen.java  |  2 +-
 .../{client => }/ClientInitializer.java       |  2 +-
 .../{client => }/ClientNetworkManager.java    |  3 +-
 .../network/{client => }/ConnectionState.java |  2 +-
 .../network/{client => }/Crypt.java           |  2 +-
 .../{client => }/ExIncomingPackets.java       |  2 +-
 .../network/{client => }/IncomingPackets.java |  2 +-
 .../network/{client => }/L2GameClient.java    |  3 +-
 .../network/{client => }/OutgoingPackets.java |  2 +-
 .../network/clientpackets/Action.java         |  2 +-
 .../network/clientpackets/AddTradeItem.java   |  2 +-
 .../network/clientpackets/AllyDismiss.java    |  2 +-
 .../network/clientpackets/AllyLeave.java      |  2 +-
 .../clientpackets/AnswerCoupleAction.java     |  2 +-
 .../clientpackets/AnswerJoinPartyRoom.java    |  2 +-
 .../AnswerPartyLootModification.java          |  2 +-
 .../clientpackets/AnswerTradeRequest.java     |  2 +-
 .../network/clientpackets/Appearing.java      |  2 +-
 .../network/clientpackets/Attack.java         |  2 +-
 .../network/clientpackets/AttackRequest.java  |  2 +-
 .../network/clientpackets/AuthLogin.java      |  2 +-
 .../clientpackets/BrEventRankerList.java      |  2 +-
 .../network/clientpackets/BypassUserCmd.java  |  2 +-
 .../clientpackets/CannotMoveAnymore.java      |  2 +-
 .../CannotMoveAnymoreInVehicle.java           |  2 +-
 .../clientpackets/CharacterCreate.java        |  2 +-
 .../clientpackets/CharacterDelete.java        |  2 +-
 .../clientpackets/CharacterRestore.java       |  2 +-
 .../clientpackets/CharacterSelect.java        |  4 +-
 .../network/clientpackets/DlgAnswer.java      |  2 +-
 .../network/clientpackets/DummyPacket.java    |  2 +-
 .../network/clientpackets/EndScenePlayer.java |  2 +-
 .../network/clientpackets/EnterWorld.java     |  2 +-
 .../clientpackets/ExBookmarkPacket.java       |  2 +-
 .../network/clientpackets/ExGetOnAirShip.java |  2 +-
 .../ExPCCafeRequestOpenWindowWithoutNPC.java  |  2 +-
 .../network/clientpackets/ExPacket.java       |  4 +-
 .../clientpackets/ExRequestAutoFish.java      |  2 +-
 .../ExSendSelectedQuestZoneID.java            |  2 +-
 .../network/clientpackets/FinishRotating.java |  2 +-
 .../network/clientpackets/GameGuardReply.java |  2 +-
 .../clientpackets/IClientIncomingPacket.java  |  2 +-
 .../network/clientpackets/Logout.java         |  2 +-
 .../clientpackets/MoveBackwardToLocation.java |  2 +-
 .../clientpackets/MoveToLocationAirShip.java  |  2 +-
 .../MoveToLocationInAirShip.java              |  2 +-
 .../network/clientpackets/MoveWithDelta.java  |  2 +-
 .../clientpackets/MultiSellChoose.java        |  2 +-
 .../network/clientpackets/NewCharacter.java   |  2 +-
 .../clientpackets/NotifyExitBeautyShop.java   |  2 +-
 .../network/clientpackets/ObserverReturn.java |  2 +-
 .../clientpackets/ProtocolVersion.java        |  2 +-
 .../clientpackets/RequestAcquireSkill.java    |  2 +-
 .../RequestAcquireSkillInfo.java              |  2 +-
 .../clientpackets/RequestActionUse.java       |  2 +-
 .../RequestAddExpandQuestAlarm.java           |  2 +-
 .../RequestAlchemySkillList.java              |  2 +-
 .../clientpackets/RequestAllAgitInfo.java     |  2 +-
 .../clientpackets/RequestAllCastleInfo.java   |  2 +-
 .../clientpackets/RequestAllFortressInfo.java |  2 +-
 .../clientpackets/RequestAllyCrest.java       |  2 +-
 .../clientpackets/RequestAllyInfo.java        |  2 +-
 .../clientpackets/RequestAnswerJoinAlly.java  |  2 +-
 .../clientpackets/RequestAnswerJoinParty.java |  2 +-
 .../RequestAnswerJoinPledge.java              |  2 +-
 .../RequestAskJoinPartyRoom.java              |  2 +-
 .../clientpackets/RequestAutoSoulShot.java    |  2 +-
 .../clientpackets/RequestBBSwrite.java        |  2 +-
 .../clientpackets/RequestBidItemAuction.java  |  2 +-
 .../network/clientpackets/RequestBlock.java   |  2 +-
 .../RequestBookMarkSlotInfo.java              |  2 +-
 .../network/clientpackets/RequestBuyItem.java |  2 +-
 .../network/clientpackets/RequestBuySeed.java |  2 +-
 .../clientpackets/RequestBuySellUIClose.java  |  2 +-
 .../clientpackets/RequestBypassToServer.java  |  2 +-
 .../RequestCancelPostAttachment.java          |  2 +-
 .../RequestChangeBookMarkSlot.java            |  2 +-
 .../RequestChangeNicknameColor.java           |  2 +-
 .../RequestChangePartyLeader.java             |  2 +-
 .../clientpackets/RequestChangePetName.java   |  2 +-
 .../RequestChangeToAwakenedClass.java         |  2 +-
 .../RequestCharacterNameCreatable.java        |  2 +-
 .../RequestConfirmCancelItem.java             |  2 +-
 .../clientpackets/RequestConfirmGemStone.java |  2 +-
 .../RequestConfirmRefinerItem.java            |  2 +-
 .../RequestConfirmSiegeWaitingList.java       |  2 +-
 .../RequestConfirmTargetItem.java             |  2 +-
 .../clientpackets/RequestCrystallizeItem.java |  2 +-
 .../RequestCursedWeaponList.java              |  2 +-
 .../RequestCursedWeaponLocation.java          |  2 +-
 .../RequestDeleteBookMarkSlot.java            |  2 +-
 .../clientpackets/RequestDeleteMacro.java     |  2 +-
 .../RequestDeleteReceivedPost.java            |  2 +-
 .../clientpackets/RequestDeleteSentPost.java  |  2 +-
 .../clientpackets/RequestDestroyItem.java     |  2 +-
 .../clientpackets/RequestDismissAlly.java     |  2 +-
 .../RequestDismissPartyRoom.java              |  2 +-
 .../network/clientpackets/RequestDispel.java  |  2 +-
 .../clientpackets/RequestDropItem.java        |  2 +-
 .../clientpackets/RequestDuelAnswerStart.java |  2 +-
 .../clientpackets/RequestDuelStart.java       |  2 +-
 .../clientpackets/RequestDuelSurrender.java   |  2 +-
 .../clientpackets/RequestEnchantItem.java     |  2 +-
 .../RequestEx2ndPasswordCheck.java            |  2 +-
 .../RequestEx2ndPasswordReq.java              |  2 +-
 .../RequestEx2ndPasswordVerify.java           |  2 +-
 .../RequestExAcceptJoinMPCC.java              |  2 +-
 .../RequestExAddContactToContactList.java     |  2 +-
 .../RequestExAddEnchantScrollItem.java        |  2 +-
 .../clientpackets/RequestExAskJoinMPCC.java   |  2 +-
 .../RequestExCancelEnchantItem.java           |  2 +-
 .../clientpackets/RequestExChangeName.java    |  2 +-
 .../RequestExCubeGameChangeTeam.java          |  2 +-
 .../RequestExCubeGameReadyAnswer.java         |  2 +-
 ...RequestExDeleteContactFromContactList.java |  2 +-
 .../RequestExDismissMpccRoom.java             |  2 +-
 .../RequestExEnchantItemAttribute.java        |  2 +-
 .../clientpackets/RequestExEnchantSkill.java  |  2 +-
 .../RequestExEnchantSkillInfo.java            |  2 +-
 .../RequestExEnchantSkillInfoDetail.java      |  2 +-
 .../clientpackets/RequestExEscapeScene.java   |  2 +-
 .../clientpackets/RequestExFishRanking.java   |  2 +-
 .../RequestExFriendListExtended.java          |  2 +-
 .../clientpackets/RequestExJoinMpccRoom.java  |  2 +-
 .../RequestExListMpccWaiting.java             |  2 +-
 .../RequestExMPCCShowPartyMembersInfo.java    |  2 +-
 .../RequestExMagicSkillUseGround.java         |  2 +-
 .../RequestExManageMpccRoom.java              |  2 +-
 .../RequestExMpccPartymasterList.java         |  2 +-
 .../RequestExOlympiadMatchListRefresh.java    |  2 +-
 .../clientpackets/RequestExOustFromMPCC.java  |  2 +-
 .../RequestExOustFromMpccRoom.java            |  2 +-
 .../RequestExPledgeCrestLarge.java            |  2 +-
 .../RequestExRemoveEnchantSupportItem.java    |  2 +-
 .../RequestExRemoveItemAttribute.java         |  2 +-
 .../clientpackets/RequestExRqItemLink.java    |  2 +-
 .../RequestExSetPledgeCrestLarge.java         |  2 +-
 .../RequestExShowContactList.java             |  2 +-
 .../RequestExTryToPutEnchantSupportItem.java  |  2 +-
 .../RequestExTryToPutEnchantTargetItem.java   |  2 +-
 .../RequestExWithdrawMpccRoom.java            |  2 +-
 .../RequestExitPartyMatchingWaitingRoom.java  |  2 +-
 .../clientpackets/RequestFortressMapInfo.java |  2 +-
 .../RequestFortressSiegeInfo.java             |  2 +-
 .../clientpackets/RequestFriendInvite.java    |  2 +-
 .../clientpackets/RequestGMCommand.java       |  2 +-
 .../clientpackets/RequestGetBossRecord.java   |  2 +-
 .../clientpackets/RequestGetItemFromPet.java  |  2 +-
 .../clientpackets/RequestGetOffVehicle.java   |  2 +-
 .../clientpackets/RequestGetOnVehicle.java    |  2 +-
 .../clientpackets/RequestGiveItemToPet.java   |  2 +-
 .../clientpackets/RequestGiveNickName.java    |  2 +-
 .../network/clientpackets/RequestGmList.java  |  2 +-
 .../clientpackets/RequestGotoLobby.java       |  2 +-
 .../clientpackets/RequestHardWareInfo.java    |  2 +-
 .../clientpackets/RequestHennaEquip.java      |  2 +-
 .../clientpackets/RequestHennaItemInfo.java   |  2 +-
 .../clientpackets/RequestHennaItemList.java   |  2 +-
 .../RequestHennaItemRemoveInfo.java           |  2 +-
 .../clientpackets/RequestHennaRemove.java     |  2 +-
 .../clientpackets/RequestHennaRemoveList.java |  2 +-
 .../clientpackets/RequestInfoItemAuction.java |  2 +-
 .../RequestInzoneWaitingTime.java             |  2 +-
 .../clientpackets/RequestItemList.java        |  2 +-
 .../clientpackets/RequestJoinAlly.java        |  2 +-
 .../clientpackets/RequestJoinParty.java       |  2 +-
 .../clientpackets/RequestJoinPledge.java      |  2 +-
 .../clientpackets/RequestJoinSiege.java       |  2 +-
 .../clientpackets/RequestKeyMapping.java      |  2 +-
 .../clientpackets/RequestLinkHtml.java        |  2 +-
 .../RequestListPartyMatchingWaitingRoom.java  |  2 +-
 .../clientpackets/RequestMagicSkillList.java  |  2 +-
 .../clientpackets/RequestMagicSkillUse.java   |  2 +-
 .../clientpackets/RequestMakeMacro.java       |  2 +-
 .../clientpackets/RequestManorList.java       |  2 +-
 .../RequestModifyBookMarkSlot.java            |  2 +-
 .../RequestMoveToLocationInVehicle.java       |  2 +-
 .../RequestOlympiadMatchList.java             |  2 +-
 .../RequestOlympiadObserverEnd.java           |  2 +-
 .../RequestOustFromPartyRoom.java             |  2 +-
 .../clientpackets/RequestOustPartyMember.java |  2 +-
 .../RequestOustPledgeMember.java              |  2 +-
 .../clientpackets/RequestPCCafeCouponUse.java |  2 +-
 .../clientpackets/RequestPVPMatchRecord.java  |  2 +-
 .../clientpackets/RequestPackageSend.java     |  2 +-
 .../RequestPackageSendableItemList.java       |  2 +-
 .../RequestPartyLootModification.java         |  2 +-
 .../RequestPartyMatchConfig.java              |  2 +-
 .../RequestPartyMatchDetail.java              |  2 +-
 .../clientpackets/RequestPartyMatchList.java  |  2 +-
 .../clientpackets/RequestPetGetItem.java      |  2 +-
 .../clientpackets/RequestPetUseItem.java      |  2 +-
 .../clientpackets/RequestPetition.java        |  2 +-
 .../clientpackets/RequestPetitionCancel.java  |  2 +-
 .../RequestPetitionFeedback.java              |  2 +-
 .../clientpackets/RequestPledgeCrest.java     |  2 +-
 .../RequestPledgeDraftListApply.java          |  2 +-
 .../RequestPledgeDraftListSearch.java         |  2 +-
 .../RequestPledgeExtendedInfo.java            |  2 +-
 .../clientpackets/RequestPledgeInfo.java      |  2 +-
 .../RequestPledgeMemberInfo.java              |  2 +-
 .../RequestPledgeMemberList.java              |  2 +-
 .../RequestPledgeMemberPowerInfo.java         |  2 +-
 .../clientpackets/RequestPledgePower.java     |  2 +-
 .../RequestPledgePowerGradeList.java          |  2 +-
 .../RequestPledgeRecruitApplyInfo.java        |  2 +-
 .../RequestPledgeRecruitBoardAccess.java      |  2 +-
 .../RequestPledgeRecruitBoardDetail.java      |  2 +-
 .../RequestPledgeRecruitBoardSearch.java      |  2 +-
 .../RequestPledgeRecruitInfo.java             |  2 +-
 .../RequestPledgeReorganizeMember.java        |  2 +-
 .../RequestPledgeSetAcademyMaster.java        |  2 +-
 .../RequestPledgeSetMemberPowerGrade.java     |  2 +-
 .../RequestPledgeWaitingApplied.java          |  2 +-
 .../RequestPledgeWaitingApply.java            |  2 +-
 .../RequestPledgeWaitingList.java             |  2 +-
 .../RequestPledgeWaitingUser.java             |  2 +-
 .../RequestPledgeWaitingUserAccept.java       |  2 +-
 .../clientpackets/RequestPledgeWarList.java   |  2 +-
 .../clientpackets/RequestPostAttachment.java  |  2 +-
 .../clientpackets/RequestPostItemList.java    |  2 +-
 .../clientpackets/RequestPreviewItem.java     |  2 +-
 .../clientpackets/RequestPrivateStoreBuy.java |  2 +-
 .../RequestPrivateStoreManageBuy.java         |  2 +-
 .../RequestPrivateStoreManageSell.java        |  2 +-
 .../RequestPrivateStoreQuitBuy.java           |  2 +-
 .../RequestPrivateStoreQuitSell.java          |  2 +-
 .../RequestPrivateStoreSell.java              |  2 +-
 .../clientpackets/RequestProcureCropList.java |  2 +-
 .../clientpackets/RequestQuestAbort.java      |  2 +-
 .../clientpackets/RequestQuestList.java       |  2 +-
 .../clientpackets/RequestReceivedPost.java    |  2 +-
 .../RequestReceivedPostList.java              |  2 +-
 .../RequestRecipeBookDestroy.java             |  2 +-
 .../clientpackets/RequestRecipeBookOpen.java  |  2 +-
 .../RequestRecipeItemMakeInfo.java            |  2 +-
 .../RequestRecipeItemMakeSelf.java            |  2 +-
 .../RequestRecipeShopListSet.java             |  2 +-
 .../RequestRecipeShopMakeInfo.java            |  2 +-
 .../RequestRecipeShopMakeItem.java            |  2 +-
 .../RequestRecipeShopManageList.java          |  2 +-
 .../RequestRecipeShopManagePrev.java          |  2 +-
 .../RequestRecipeShopManageQuit.java          |  2 +-
 .../RequestRecipeShopMessageSet.java          |  2 +-
 .../clientpackets/RequestRecordInfo.java      |  2 +-
 .../network/clientpackets/RequestRefine.java  |  2 +-
 .../clientpackets/RequestRefineCancel.java    |  2 +-
 .../clientpackets/RequestRefundItem.java      |  2 +-
 .../clientpackets/RequestRegistBeauty.java    |  2 +-
 .../RequestRejectPostAttachment.java          |  2 +-
 .../RequestReplyStartPledgeWar.java           |  2 +-
 .../RequestReplyStopPledgeWar.java            |  2 +-
 .../RequestReplySurrenderPledgeWar.java       |  2 +-
 .../clientpackets/RequestResetNickname.java   |  2 +-
 .../network/clientpackets/RequestRestart.java |  4 +-
 .../clientpackets/RequestRestartPoint.java    |  2 +-
 .../RequestSaveBookMarkSlot.java              |  2 +-
 .../RequestSaveInventoryOrder.java            |  2 +-
 .../clientpackets/RequestSaveKeyMapping.java  |  4 +-
 .../clientpackets/RequestSeedPhase.java       |  2 +-
 .../clientpackets/RequestSellItem.java        |  2 +-
 .../clientpackets/RequestSendPost.java        |  2 +-
 .../clientpackets/RequestSentPost.java        |  2 +-
 .../clientpackets/RequestSentPostList.java    |  2 +-
 .../clientpackets/RequestSetAllyCrest.java    |  2 +-
 .../RequestSetCastleSiegeTime.java            |  2 +-
 .../network/clientpackets/RequestSetCrop.java |  2 +-
 .../clientpackets/RequestSetPledgeCrest.java  |  2 +-
 .../network/clientpackets/RequestSetSeed.java |  2 +-
 .../clientpackets/RequestShortCutDel.java     |  2 +-
 .../clientpackets/RequestShortCutReg.java     |  2 +-
 .../clientpackets/RequestShowBeautyList.java  |  2 +-
 .../clientpackets/RequestShowBoard.java       |  2 +-
 .../clientpackets/RequestShowMiniMap.java     |  2 +-
 .../RequestShowResetShopList.java             |  2 +-
 .../RequestSiegeAttackerList.java             |  2 +-
 .../RequestSiegeDefenderList.java             |  2 +-
 .../clientpackets/RequestSiegeInfo.java       |  2 +-
 .../clientpackets/RequestSkillList.java       |  2 +-
 .../clientpackets/RequestStartPledgeWar.java  |  2 +-
 .../clientpackets/RequestStopPledgeWar.java   |  2 +-
 .../RequestSurrenderPledgeWar.java            |  2 +-
 .../clientpackets/RequestTargetCanceld.java   |  2 +-
 .../RequestTeleportBookMark.java              |  2 +-
 .../RequestTutorialClientEvent.java           |  2 +-
 .../RequestTutorialLinkHtml.java              |  2 +-
 .../RequestTutorialPassCmdToServer.java       |  2 +-
 .../RequestTutorialQuestionMark.java          |  2 +-
 .../clientpackets/RequestUnEquipItem.java     |  2 +-
 .../network/clientpackets/RequestVoteNew.java |  2 +-
 .../RequestWithDrawPremiumItem.java           |  2 +-
 .../clientpackets/RequestWithDrawalParty.java |  2 +-
 .../RequestWithdrawPartyRoom.java             |  2 +-
 .../RequestWithdrawalPledge.java              |  2 +-
 .../clientpackets/RequestWriteHeroWords.java  |  2 +-
 .../network/clientpackets/Say2.java           |  2 +-
 .../clientpackets/SendBypassBuildCmd.java     |  2 +-
 .../SendWareHouseDepositList.java             |  2 +-
 .../SendWareHouseWithDrawList.java            |  2 +-
 .../clientpackets/SetPrivateStoreListBuy.java |  2 +-
 .../SetPrivateStoreListSell.java              |  2 +-
 .../clientpackets/SetPrivateStoreMsgBuy.java  |  2 +-
 .../clientpackets/SetPrivateStoreMsgSell.java |  2 +-
 .../SetPrivateStoreWholeMsg.java              |  2 +-
 .../network/clientpackets/SnoopQuit.java      |  2 +-
 .../network/clientpackets/StartRotating.java  |  2 +-
 .../network/clientpackets/TradeDone.java      |  2 +-
 .../network/clientpackets/TradeRequest.java   |  2 +-
 .../network/clientpackets/UseItem.java        |  2 +-
 .../clientpackets/ValidatePosition.java       |  2 +-
 .../ability/RequestAbilityList.java           |  2 +-
 .../ability/RequestAbilityWndClose.java       |  2 +-
 .../ability/RequestAbilityWndOpen.java        |  2 +-
 .../ability/RequestAcquireAbilityList.java    |  2 +-
 .../ability/RequestChangeAbilityPoint.java    |  2 +-
 .../ability/RequestResetAbilityPoint.java     |  2 +-
 .../adenadistribution/RequestDivideAdena.java |  2 +-
 .../RequestDivideAdenaCancel.java             |  2 +-
 .../RequestDivideAdenaStart.java              |  2 +-
 .../alchemy/RequestAlchemyConversion.java     |  2 +-
 .../alchemy/RequestAlchemyTryMixCube.java     |  2 +-
 .../RequestExCancelShape_Shifting_Item.java   |  2 +-
 ...yToPutShapeShiftingEnchantSupportItem.java |  2 +-
 ...uestExTryToPutShapeShiftingTargetItem.java |  2 +-
 .../appearance/RequestShapeShiftingItem.java  |  2 +-
 .../awakening/RequestCallToChangeClass.java   |  2 +-
 .../RequestCancelCuriousHouse.java            |  2 +-
 .../RequestCuriousHouseHtml.java              |  2 +-
 .../RequestJoinCuriousHouse.java              |  2 +-
 .../commission/RequestCommissionBuyInfo.java  |  2 +-
 .../commission/RequestCommissionBuyItem.java  |  2 +-
 .../commission/RequestCommissionCancel.java   |  2 +-
 .../commission/RequestCommissionDelete.java   |  2 +-
 .../commission/RequestCommissionInfo.java     |  2 +-
 .../commission/RequestCommissionList.java     |  2 +-
 .../commission/RequestCommissionRegister.java |  2 +-
 .../RequestCommissionRegisteredItem.java      |  2 +-
 .../RequestCommissionRegistrableItemList.java |  2 +-
 .../compound/RequestNewEnchantClose.java      |  2 +-
 .../compound/RequestNewEnchantPushOne.java    |  2 +-
 .../compound/RequestNewEnchantPushTwo.java    |  2 +-
 .../compound/RequestNewEnchantRemoveOne.java  |  2 +-
 .../compound/RequestNewEnchantRemoveTwo.java  |  2 +-
 .../compound/RequestNewEnchantTry.java        |  2 +-
 .../RequestCrystallizeEstimate.java           |  2 +-
 .../RequestCrystallizeItemCancel.java         |  2 +-
 .../RequestOneDayRewardReceive.java           |  2 +-
 .../dailymission/RequestTodoList.java         |  2 +-
 .../dailymission/RequestTodoListHTML.java     |  2 +-
 .../ensoul/RequestItemEnsoul.java             |  2 +-
 .../friend/RequestAnswerFriendInvite.java     |  2 +-
 .../friend/RequestFriendDel.java              |  2 +-
 .../friend/RequestFriendDetailInfo.java       |  2 +-
 .../friend/RequestFriendInvite.java           |  2 +-
 .../friend/RequestFriendList.java             |  2 +-
 .../friend/RequestSendFriendMsg.java          |  2 +-
 .../luckygame/RequestLuckyGamePlay.java       |  2 +-
 .../mentoring/ConfirmMenteeAdd.java           |  2 +-
 .../mentoring/RequestMenteeAdd.java           |  2 +-
 .../mentoring/RequestMenteeWaitingList.java   |  2 +-
 .../mentoring/RequestMentorCancel.java        |  2 +-
 .../mentoring/RequestMentorList.java          |  2 +-
 .../pledgebonus/RequestPledgeBonusOpen.java   |  2 +-
 .../pledgebonus/RequestPledgeBonusReward.java |  2 +-
 .../RequestPledgeBonusRewardList.java         |  2 +-
 .../primeshop/RequestBRBuyProduct.java        |  2 +-
 .../primeshop/RequestBRGamePoint.java         |  2 +-
 .../primeshop/RequestBRProductInfo.java       |  2 +-
 .../primeshop/RequestBRProductList.java       |  2 +-
 .../primeshop/RequestBRRecentProductList.java |  2 +-
 .../clientpackets/sayune/RequestFlyMove.java  |  2 +-
 .../sayune/RequestFlyMoveStart.java           |  2 +-
 .../shuttle/CannotMoveAnymoreInShuttle.java   |  2 +-
 .../shuttle/MoveToLocationInShuttle.java      |  2 +-
 .../shuttle/RequestShuttleGetOff.java         |  2 +-
 .../shuttle/RequestShuttleGetOn.java          |  2 +-
 .../gameserverpackets/AuthRequest.java        |  2 +-
 .../gameserverpackets/BlowFishKey.java        |  2 +-
 .../gameserverpackets/ChangeAccessLevel.java  |  2 +-
 .../gameserverpackets/ChangePassword.java     |  2 +-
 .../gameserverpackets/PlayerAuthRequest.java  |  2 +-
 .../gameserverpackets/PlayerInGame.java       |  2 +-
 .../gameserverpackets/PlayerLogout.java       |  2 +-
 .../gameserverpackets/PlayerTracert.java      |  2 +-
 .../gameserverpackets/ReplyCharacters.java    |  2 +-
 .../gameserverpackets/SendMail.java           |  2 +-
 .../gameserverpackets/ServerStatus.java       |  2 +-
 .../gameserverpackets/TempBan.java            |  2 +-
 .../loginserverpackets/AuthResponse.java      |  2 +-
 .../ChangePasswordResponse.java               |  2 +-
 .../loginserverpackets/InitLS.java            |  2 +-
 .../loginserverpackets/KickPlayer.java        |  2 +-
 .../loginserverpackets/LoginServerFail.java   |  2 +-
 .../PlayerAuthResponse.java                   |  2 +-
 .../loginserverpackets/RequestCharacters.java |  2 +-
 .../serverpackets/AbnormalStatusUpdate.java   |  2 +-
 .../serverpackets/AbstractNpcInfo.java        |  2 +-
 .../serverpackets/AcquireSkillDone.java       |  2 +-
 .../serverpackets/AcquireSkillInfo.java       |  2 +-
 .../serverpackets/AcquireSkillList.java       |  2 +-
 .../network/serverpackets/ActionFailed.java   |  2 +-
 .../network/serverpackets/AgitDecoInfo.java   |  2 +-
 .../network/serverpackets/AllianceInfo.java   |  2 +-
 .../network/serverpackets/AllyCrest.java      |  2 +-
 .../network/serverpackets/AskJoinAlly.java    |  2 +-
 .../network/serverpackets/AskJoinParty.java   |  2 +-
 .../network/serverpackets/AskJoinPledge.java  |  2 +-
 .../network/serverpackets/Attack.java         |  2 +-
 .../serverpackets/AutoAttackStart.java        |  2 +-
 .../network/serverpackets/AutoAttackStop.java |  2 +-
 .../serverpackets/BlockListPacket.java        |  2 +-
 .../network/serverpackets/BuyList.java        |  2 +-
 .../network/serverpackets/BuyListSeed.java    |  2 +-
 .../network/serverpackets/CSShowComBoard.java |  2 +-
 .../network/serverpackets/CameraMode.java     |  2 +-
 .../network/serverpackets/ChairSit.java       |  2 +-
 .../network/serverpackets/ChangeMoveType.java |  2 +-
 .../network/serverpackets/ChangeWaitType.java |  2 +-
 .../network/serverpackets/CharCreateFail.java |  2 +-
 .../network/serverpackets/CharCreateOk.java   |  2 +-
 .../network/serverpackets/CharDeleteFail.java |  2 +-
 .../serverpackets/CharDeleteSuccess.java      |  2 +-
 .../network/serverpackets/CharInfo.java       |  2 +-
 .../network/serverpackets/CharSelected.java   |  2 +-
 .../serverpackets/CharSelectionInfo.java      |  4 +-
 .../serverpackets/ChooseInventoryItem.java    |  2 +-
 .../network/serverpackets/ClientSetTime.java  |  2 +-
 .../network/serverpackets/ConfirmDlg.java     |  2 +-
 .../network/serverpackets/CreatureSay.java    |  2 +-
 .../network/serverpackets/DeleteObject.java   |  2 +-
 .../network/serverpackets/Dice.java           |  2 +-
 .../gameserver/network/serverpackets/Die.java |  2 +-
 .../network/serverpackets/DoorInfo.java       |  2 +-
 .../serverpackets/DoorStatusUpdate.java       |  2 +-
 .../network/serverpackets/DropItem.java       |  2 +-
 .../network/serverpackets/Earthquake.java     |  2 +-
 .../network/serverpackets/EnchantResult.java  |  2 +-
 .../serverpackets/EtcStatusUpdate.java        |  2 +-
 .../serverpackets/Ex2ndPasswordAck.java       |  2 +-
 .../serverpackets/Ex2ndPasswordCheck.java     |  2 +-
 .../serverpackets/Ex2ndPasswordVerify.java    |  2 +-
 .../ExAbnormalStatusUpdateFromTarget.java     |  2 +-
 .../ExAcquirableSkillListByClass.java         |  2 +-
 .../serverpackets/ExAcquireSkillInfo.java     |  2 +-
 .../serverpackets/ExAdenaInvenCount.java      |  2 +-
 .../network/serverpackets/ExAirShipInfo.java  |  2 +-
 .../serverpackets/ExAirShipStopMove.java      |  2 +-
 .../serverpackets/ExAirShipTeleportList.java  |  2 +-
 .../serverpackets/ExAlchemySkillList.java     |  2 +-
 .../serverpackets/ExAlterSkillRequest.java    |  2 +-
 .../serverpackets/ExAskCoupleAction.java      |  2 +-
 .../network/serverpackets/ExAskJoinMPCC.java  |  2 +-
 .../serverpackets/ExAskJoinPartyRoom.java     |  2 +-
 .../ExAskModifyPartyLooting.java              |  2 +-
 .../ExAttributeEnchantResult.java             |  2 +-
 .../network/serverpackets/ExAutoSoulShot.java |  2 +-
 .../ExBaseAttributeCancelResult.java          |  2 +-
 .../serverpackets/ExBasicActionList.java      |  2 +-
 .../serverpackets/ExBeautyItemList.java       |  2 +-
 .../serverpackets/ExBirthdayPopup.java        |  2 +-
 .../ExBrBroadcastEventState.java              |  2 +-
 .../serverpackets/ExBrBuffEventState.java     |  2 +-
 .../ExBrLoadEventTopRankers.java              |  2 +-
 .../serverpackets/ExBrPremiumState.java       |  2 +-
 .../network/serverpackets/ExBuySellList.java  |  2 +-
 .../network/serverpackets/ExCastleState.java  |  2 +-
 .../ExChangeClientEffectInfo.java             |  2 +-
 .../serverpackets/ExChangeNpcState.java       |  2 +-
 .../serverpackets/ExChangePostState.java      |  2 +-
 .../ExChangeToAwakenedClass.java              |  2 +-
 .../ExChooseInventoryAttributeItem.java       |  2 +-
 .../network/serverpackets/ExCloseMPCC.java    |  2 +-
 .../serverpackets/ExClosePartyRoom.java       |  2 +-
 .../serverpackets/ExConfirmAddingContact.java |  2 +-
 .../ExConnectedTimeAndGettableReward.java     |  2 +-
 .../serverpackets/ExCubeGameAddPlayer.java    |  2 +-
 .../serverpackets/ExCubeGameChangePoints.java |  2 +-
 .../serverpackets/ExCubeGameChangeTeam.java   |  2 +-
 .../ExCubeGameChangeTimeToStart.java          |  2 +-
 .../serverpackets/ExCubeGameCloseUI.java      |  2 +-
 .../network/serverpackets/ExCubeGameEnd.java  |  2 +-
 .../ExCubeGameExtendedChangePoints.java       |  2 +-
 .../serverpackets/ExCubeGameRemovePlayer.java |  2 +-
 .../serverpackets/ExCubeGameRequestReady.java |  2 +-
 .../serverpackets/ExCubeGameTeamList.java     |  2 +-
 .../serverpackets/ExCursedWeaponList.java     |  2 +-
 .../serverpackets/ExCursedWeaponLocation.java |  2 +-
 .../serverpackets/ExDissmissMPCCRoom.java     |  2 +-
 .../network/serverpackets/ExDuelAskStart.java |  2 +-
 .../network/serverpackets/ExDuelEnd.java      |  2 +-
 .../network/serverpackets/ExDuelReady.java    |  2 +-
 .../network/serverpackets/ExDuelStart.java    |  2 +-
 .../serverpackets/ExDuelUpdateUserInfo.java   |  2 +-
 .../serverpackets/ExEnchantSkillInfo.java     |  2 +-
 .../ExEnchantSkillInfoDetail.java             |  2 +-
 .../serverpackets/ExEnchantSkillList.java     |  2 +-
 .../serverpackets/ExEnchantSkillResult.java   |  2 +-
 .../serverpackets/ExEventMatchMessage.java    |  2 +-
 .../ExGetBookMarkInfoPacket.java              |  2 +-
 .../serverpackets/ExGetBossRecord.java        |  2 +-
 .../serverpackets/ExGetOffAirShip.java        |  2 +-
 .../network/serverpackets/ExGetOnAirShip.java |  2 +-
 .../serverpackets/ExGetPremiumItemList.java   |  2 +-
 .../network/serverpackets/ExHeroList.java     |  2 +-
 .../serverpackets/ExInzoneWaiting.java        |  2 +-
 .../serverpackets/ExIsCharNameCreatable.java  |  2 +-
 .../ExItemAuctionInfoPacket.java              |  2 +-
 .../serverpackets/ExListMpccWaiting.java      |  2 +-
 .../ExListPartyMatchingWaitingRoom.java       |  2 +-
 .../serverpackets/ExMPCCPartyInfoUpdate.java  |  2 +-
 .../serverpackets/ExMPCCPartymasterList.java  |  2 +-
 .../network/serverpackets/ExMPCCRoomInfo.java |  2 +-
 .../serverpackets/ExMPCCRoomMember.java       |  2 +-
 .../ExMPCCShowPartyMemberInfo.java            |  2 +-
 .../serverpackets/ExMagicAttackInfo.java      |  2 +-
 .../network/serverpackets/ExMailArrived.java  |  2 +-
 .../serverpackets/ExManageMpccRoomMember.java |  2 +-
 .../ExMoveToLocationAirShip.java              |  2 +-
 .../ExMoveToLocationInAirShip.java            |  2 +-
 .../ExMultiPartyCommandChannelInfo.java       |  2 +-
 .../serverpackets/ExNeedToChangeName.java     |  2 +-
 .../serverpackets/ExNevitAdventEffect.java    |  2 +-
 .../ExNevitAdventPointInfoPacket.java         |  2 +-
 .../ExNevitAdventTimeChange.java              |  2 +-
 .../ExNewSkillToLearnByLevelUp.java           |  2 +-
 .../serverpackets/ExNoticePostArrived.java    |  2 +-
 .../serverpackets/ExNoticePostSent.java       |  2 +-
 .../serverpackets/ExNotifyPremiumItem.java    |  2 +-
 .../serverpackets/ExOlympiadMatchEnd.java     |  2 +-
 .../serverpackets/ExOlympiadMatchList.java    |  2 +-
 .../serverpackets/ExOlympiadMatchResult.java  |  2 +-
 .../network/serverpackets/ExOlympiadMode.java |  2 +-
 .../serverpackets/ExOlympiadSpelledInfo.java  |  2 +-
 .../serverpackets/ExOlympiadUserInfo.java     |  2 +-
 .../network/serverpackets/ExOpenMPCC.java     |  2 +-
 .../serverpackets/ExPCCafePointInfo.java      |  2 +-
 .../serverpackets/ExPartyPetWindowAdd.java    |  2 +-
 .../serverpackets/ExPartyPetWindowDelete.java |  2 +-
 .../serverpackets/ExPartyPetWindowUpdate.java |  2 +-
 .../serverpackets/ExPartyRoomMember.java      |  2 +-
 .../network/serverpackets/ExPetInfo.java      |  2 +-
 .../network/serverpackets/ExPlayScene.java    |  2 +-
 .../network/serverpackets/ExPledgeCount.java  |  2 +-
 .../ExPledgeDraftListSearch.java              |  2 +-
 .../network/serverpackets/ExPledgeEmblem.java |  2 +-
 .../ExPledgeRecruitApplyInfo.java             |  2 +-
 .../ExPledgeRecruitBoardDetail.java           |  2 +-
 .../ExPledgeRecruitBoardSearch.java           |  2 +-
 .../serverpackets/ExPledgeRecruitInfo.java    |  2 +-
 .../serverpackets/ExPledgeWaitingList.java    |  2 +-
 .../ExPledgeWaitingListAlarm.java             |  2 +-
 .../ExPledgeWaitingListApplied.java           |  2 +-
 .../serverpackets/ExPledgeWaitingUser.java    |  2 +-
 .../ExPrivateStoreSetWholeMsg.java            |  2 +-
 ...ExPutCommissionResultForVariationMake.java |  2 +-
 .../ExPutEnchantScrollItemResult.java         |  2 +-
 .../ExPutEnchantSupportItemResult.java        |  2 +-
 .../ExPutEnchantTargetItemResult.java         |  2 +-
 .../ExPutIntensiveResultForVariationMake.java |  2 +-
 .../ExPutItemResultForVariationCancel.java    |  2 +-
 .../ExPutItemResultForVariationMake.java      |  2 +-
 .../serverpackets/ExQuestItemList.java        |  2 +-
 .../serverpackets/ExQuestNpcLogList.java      |  2 +-
 .../network/serverpackets/ExRedSky.java       |  2 +-
 .../network/serverpackets/ExRegenMax.java     |  2 +-
 .../ExRemoveEnchantSupportItemResult.java     |  2 +-
 .../serverpackets/ExReplyPostItemList.java    |  2 +-
 .../serverpackets/ExReplyReceivedPost.java    |  2 +-
 .../serverpackets/ExReplySentPost.java        |  2 +-
 .../ExRequestChangeNicknameColor.java         |  2 +-
 .../serverpackets/ExRequestHackShield.java    |  2 +-
 .../serverpackets/ExResponseBeautyList.java   |  2 +-
 .../ExResponseBeautyRegistReset.java          |  2 +-
 .../serverpackets/ExResponseResetList.java    |  2 +-
 .../serverpackets/ExRestartClient.java        |  2 +-
 .../network/serverpackets/ExRotation.java     |  2 +-
 .../network/serverpackets/ExRpItemLink.java   |  2 +-
 .../network/serverpackets/ExSearchOrc.java    |  2 +-
 .../serverpackets/ExSendManorList.java        |  2 +-
 .../network/serverpackets/ExSendUIEvent.java  |  2 +-
 .../serverpackets/ExServerPrimitive.java      |  2 +-
 .../serverpackets/ExSetCompassZoneCode.java   |  2 +-
 .../serverpackets/ExSetPartyLooting.java      |  2 +-
 .../ExShowAdventurerGuideBook.java            |  2 +-
 .../network/serverpackets/ExShowAgitInfo.java |  2 +-
 .../ExShowBaseAttributeCancelWindow.java      |  2 +-
 .../serverpackets/ExShowBeautyMenu.java       |  2 +-
 .../serverpackets/ExShowCastleInfo.java       |  2 +-
 .../serverpackets/ExShowChannelingEffect.java |  2 +-
 .../serverpackets/ExShowContactList.java      |  2 +-
 .../network/serverpackets/ExShowCropInfo.java |  2 +-
 .../serverpackets/ExShowCropSetting.java      |  2 +-
 .../serverpackets/ExShowFortressInfo.java     |  2 +-
 .../serverpackets/ExShowFortressMapInfo.java  |  2 +-
 .../ExShowFortressSiegeInfo.java              |  2 +-
 .../serverpackets/ExShowManorDefaultInfo.java |  2 +-
 .../ExShowProcureCropDetail.java              |  2 +-
 .../serverpackets/ExShowQuestInfo.java        |  2 +-
 .../serverpackets/ExShowQuestMark.java        |  2 +-
 .../serverpackets/ExShowReceivedPostList.java |  2 +-
 .../serverpackets/ExShowScreenMessage.java    |  2 +-
 .../network/serverpackets/ExShowSeedInfo.java |  2 +-
 .../serverpackets/ExShowSeedMapInfo.java      |  2 +-
 .../serverpackets/ExShowSeedSetting.java      |  2 +-
 .../serverpackets/ExShowSellCropList.java     |  2 +-
 .../serverpackets/ExShowSentPostList.java     |  2 +-
 .../serverpackets/ExShowTerritory.java        |  2 +-
 .../network/serverpackets/ExShowTrace.java    |  2 +-
 .../network/serverpackets/ExShowUsm.java      |  2 +-
 .../ExShowVariationCancelWindow.java          |  2 +-
 .../ExShowVariationMakeWindow.java            |  2 +-
 .../network/serverpackets/ExSpawnEmitter.java |  2 +-
 .../serverpackets/ExStartScenePlayer.java     |  2 +-
 .../serverpackets/ExStopMoveAirShip.java      |  2 +-
 .../serverpackets/ExStopMoveInAirShip.java    |  2 +-
 .../serverpackets/ExStopScenePlayer.java      |  2 +-
 .../serverpackets/ExStorageMaxCount.java      |  2 +-
 .../serverpackets/ExSubPledgeSkillAdd.java    |  2 +-
 .../network/serverpackets/ExSubjobInfo.java   |  2 +-
 .../network/serverpackets/ExTacticalSign.java |  2 +-
 .../ExTeleportToLocationActivate.java         |  2 +-
 .../network/serverpackets/ExUISetting.java    |  2 +-
 .../serverpackets/ExUnReadMailCount.java      |  2 +-
 .../serverpackets/ExUseSharedGroupItem.java   |  2 +-
 .../ExUserInfoAbnormalVisualEffect.java       |  2 +-
 .../serverpackets/ExUserInfoCubic.java        |  2 +-
 .../serverpackets/ExUserInfoEquipSlot.java    |  2 +-
 .../serverpackets/ExUserInfoInvenWeight.java  |  2 +-
 .../ExValidateLocationInAirShip.java          |  2 +-
 .../ExVariationCancelResult.java              |  2 +-
 .../serverpackets/ExVariationResult.java      |  2 +-
 .../serverpackets/ExVitalityEffectInfo.java   |  2 +-
 .../serverpackets/ExVitalityPointInfo.java    |  2 +-
 .../serverpackets/ExVoteSystemInfo.java       |  2 +-
 .../network/serverpackets/ExWorldChatCnt.java |  2 +-
 .../network/serverpackets/FlyToLocation.java  |  2 +-
 .../serverpackets/FriendAddRequest.java       |  2 +-
 .../network/serverpackets/GMHennaInfo.java    |  2 +-
 .../network/serverpackets/GMHide.java         |  2 +-
 .../serverpackets/GMViewCharacterInfo.java    |  2 +-
 .../network/serverpackets/GMViewItemList.java |  2 +-
 .../serverpackets/GMViewPledgeInfo.java       |  2 +-
 .../serverpackets/GMViewSkillInfo.java        |  2 +-
 .../GMViewWarehouseWithdrawList.java          |  2 +-
 .../network/serverpackets/GameGuardQuery.java |  2 +-
 .../network/serverpackets/GetItem.java        |  2 +-
 .../network/serverpackets/GetOffVehicle.java  |  2 +-
 .../network/serverpackets/GetOnVehicle.java   |  2 +-
 .../serverpackets/GmViewQuestInfo.java        |  2 +-
 .../network/serverpackets/HennaEquipList.java |  2 +-
 .../network/serverpackets/HennaInfo.java      |  2 +-
 .../serverpackets/HennaItemDrawInfo.java      |  2 +-
 .../serverpackets/HennaItemRemoveInfo.java    |  2 +-
 .../serverpackets/HennaRemoveList.java        |  2 +-
 .../serverpackets/InventoryUpdate.java        |  2 +-
 .../network/serverpackets/ItemList.java       |  2 +-
 .../network/serverpackets/JoinParty.java      |  2 +-
 .../network/serverpackets/JoinPledge.java     |  2 +-
 .../network/serverpackets/KeyPacket.java      |  2 +-
 .../network/serverpackets/L2FriendSay.java    |  2 +-
 .../network/serverpackets/LeaveWorld.java     |  2 +-
 .../serverpackets/ListPartyWaiting.java       |  2 +-
 .../network/serverpackets/LoginFail.java      |  2 +-
 .../serverpackets/MagicSkillCanceld.java      |  2 +-
 .../serverpackets/MagicSkillLaunched.java     |  2 +-
 .../network/serverpackets/MagicSkillUse.java  |  2 +-
 .../serverpackets/ManagePledgePower.java      |  2 +-
 .../network/serverpackets/MonRaceInfo.java    |  2 +-
 .../network/serverpackets/MoveToLocation.java |  2 +-
 .../MoveToLocationInVehicle.java              |  2 +-
 .../network/serverpackets/MoveToPawn.java     |  2 +-
 .../network/serverpackets/MultiSellList.java  |  2 +-
 .../serverpackets/MyTargetSelected.java       |  2 +-
 .../serverpackets/NewCharacterSuccess.java    |  2 +-
 .../serverpackets/NicknameChanged.java        |  2 +-
 .../network/serverpackets/NormalCamera.java   |  2 +-
 .../network/serverpackets/NpcHtmlMessage.java |  2 +-
 .../network/serverpackets/NpcInfo.java        |  2 +-
 .../NpcInfoAbnormalVisualEffect.java          |  2 +-
 .../serverpackets/NpcQuestHtmlMessage.java    |  2 +-
 .../network/serverpackets/NpcSay.java         |  2 +-
 .../serverpackets/ObservationMode.java        |  2 +-
 .../serverpackets/ObservationReturn.java      |  2 +-
 .../network/serverpackets/OnEventTrigger.java |  2 +-
 .../serverpackets/PackageSendableList.java    |  2 +-
 .../network/serverpackets/PackageToList.java  |  2 +-
 .../serverpackets/PartyMemberPosition.java    |  2 +-
 .../network/serverpackets/PartyRoomInfo.java  |  2 +-
 .../serverpackets/PartySmallWindowAdd.java    |  2 +-
 .../serverpackets/PartySmallWindowAll.java    |  2 +-
 .../serverpackets/PartySmallWindowDelete.java |  2 +-
 .../PartySmallWindowDeleteAll.java            |  2 +-
 .../serverpackets/PartySmallWindowUpdate.java |  2 +-
 .../network/serverpackets/PartySpelled.java   |  2 +-
 .../network/serverpackets/PetDelete.java      |  2 +-
 .../network/serverpackets/PetInfo.java        |  2 +-
 .../serverpackets/PetInventoryUpdate.java     |  2 +-
 .../network/serverpackets/PetItemList.java    |  2 +-
 .../network/serverpackets/PetStatusShow.java  |  2 +-
 .../serverpackets/PetStatusUpdate.java        |  2 +-
 .../serverpackets/PetitionVotePacket.java     |  2 +-
 .../network/serverpackets/PlaySound.java      |  2 +-
 .../network/serverpackets/PledgeCrest.java    |  2 +-
 .../network/serverpackets/PledgeInfo.java     |  2 +-
 .../serverpackets/PledgePowerGradeList.java   |  2 +-
 .../PledgeReceiveMemberInfo.java              |  2 +-
 .../serverpackets/PledgeReceivePowerInfo.java |  2 +-
 .../PledgeReceiveSubPledgeCreated.java        |  2 +-
 .../serverpackets/PledgeReceiveWarList.java   |  2 +-
 .../serverpackets/PledgeShowInfoUpdate.java   |  2 +-
 .../PledgeShowMemberListAdd.java              |  2 +-
 .../PledgeShowMemberListAll.java              |  2 +-
 .../PledgeShowMemberListDelete.java           |  2 +-
 .../PledgeShowMemberListDeleteAll.java        |  2 +-
 .../PledgeShowMemberListUpdate.java           |  2 +-
 .../serverpackets/PledgeSkillList.java        |  2 +-
 .../serverpackets/PledgeSkillListAdd.java     |  2 +-
 .../serverpackets/PledgeStatusChanged.java    |  2 +-
 .../serverpackets/PrivateStoreListBuy.java    |  2 +-
 .../serverpackets/PrivateStoreListSell.java   |  2 +-
 .../PrivateStoreManageListBuy.java            |  2 +-
 .../PrivateStoreManageListSell.java           |  2 +-
 .../serverpackets/PrivateStoreMsgBuy.java     |  2 +-
 .../serverpackets/PrivateStoreMsgSell.java    |  2 +-
 .../network/serverpackets/QuestList.java      |  2 +-
 .../network/serverpackets/RadarControl.java   |  2 +-
 .../serverpackets/RecipeBookItemList.java     |  2 +-
 .../serverpackets/RecipeItemMakeInfo.java     |  2 +-
 .../serverpackets/RecipeShopItemInfo.java     |  2 +-
 .../serverpackets/RecipeShopManageList.java   |  2 +-
 .../network/serverpackets/RecipeShopMsg.java  |  2 +-
 .../serverpackets/RecipeShopSellList.java     |  2 +-
 .../serverpackets/RelationChanged.java        |  2 +-
 .../network/serverpackets/RequestEnchant.java |  2 +-
 .../serverpackets/RestartResponse.java        |  2 +-
 .../network/serverpackets/Revive.java         |  2 +-
 .../network/serverpackets/Ride.java           |  2 +-
 .../network/serverpackets/SellList.java       |  2 +-
 .../serverpackets/SellListProcure.java        |  2 +-
 .../network/serverpackets/SendMacroList.java  |  2 +-
 .../serverpackets/SendTradeRequest.java       |  2 +-
 .../network/serverpackets/ServerClose.java    |  2 +-
 .../serverpackets/ServerObjectInfo.java       |  2 +-
 .../serverpackets/SetSummonRemainTime.java    |  2 +-
 .../network/serverpackets/SetupGauge.java     |  2 +-
 .../serverpackets/ShopPreviewInfo.java        |  2 +-
 .../serverpackets/ShopPreviewList.java        |  2 +-
 .../serverpackets/ShortBuffStatusUpdate.java  |  2 +-
 .../network/serverpackets/ShortCutInit.java   |  2 +-
 .../serverpackets/ShortCutRegister.java       |  2 +-
 .../network/serverpackets/ShowBoard.java      |  2 +-
 .../network/serverpackets/ShowCalculator.java |  2 +-
 .../network/serverpackets/ShowMiniMap.java    |  2 +-
 .../serverpackets/ShowPCCafeCouponShowUI.java |  2 +-
 .../network/serverpackets/ShowTownMap.java    |  2 +-
 .../network/serverpackets/ShowXMasSeal.java   |  2 +-
 .../serverpackets/SiegeAttackerList.java      |  2 +-
 .../serverpackets/SiegeDefenderList.java      |  2 +-
 .../network/serverpackets/SiegeInfo.java      |  2 +-
 .../network/serverpackets/SkillCoolTime.java  |  2 +-
 .../network/serverpackets/SkillList.java      |  2 +-
 .../network/serverpackets/Snoop.java          |  2 +-
 .../network/serverpackets/SocialAction.java   |  2 +-
 .../network/serverpackets/SpawnItem.java      |  2 +-
 .../network/serverpackets/SpecialCamera.java  |  2 +-
 .../network/serverpackets/StartPledgeWar.java |  2 +-
 .../network/serverpackets/StartRotation.java  |  2 +-
 .../network/serverpackets/StaticObject.java   |  2 +-
 .../network/serverpackets/StatusUpdate.java   |  2 +-
 .../network/serverpackets/StopMove.java       |  2 +-
 .../serverpackets/StopMoveInVehicle.java      |  2 +-
 .../network/serverpackets/StopPledgeWar.java  |  2 +-
 .../network/serverpackets/StopRotation.java   |  2 +-
 .../network/serverpackets/SummonInfo.java     |  2 +-
 .../network/serverpackets/SunRise.java        |  2 +-
 .../network/serverpackets/SunSet.java         |  2 +-
 .../serverpackets/SurrenderPledgeWar.java     |  2 +-
 .../network/serverpackets/SystemMessage.java  |  2 +-
 .../network/serverpackets/TargetSelected.java |  2 +-
 .../serverpackets/TargetUnselected.java       |  2 +-
 .../serverpackets/TeleportToLocation.java     |  2 +-
 .../network/serverpackets/TradeDone.java      |  2 +-
 .../network/serverpackets/TradeOtherAdd.java  |  2 +-
 .../network/serverpackets/TradeOtherDone.java |  2 +-
 .../network/serverpackets/TradeOwnAdd.java    |  2 +-
 .../network/serverpackets/TradeStart.java     |  2 +-
 .../network/serverpackets/TradeUpdate.java    |  2 +-
 .../serverpackets/TutorialCloseHtml.java      |  2 +-
 .../TutorialEnableClientEvent.java            |  2 +-
 .../serverpackets/TutorialShowHtml.java       |  2 +-
 .../TutorialShowQuestionMark.java             |  2 +-
 .../network/serverpackets/UserInfo.java       |  2 +-
 .../serverpackets/ValidateLocation.java       |  2 +-
 .../ValidateLocationInVehicle.java            |  2 +-
 .../serverpackets/VehicleCheckLocation.java   |  2 +-
 .../serverpackets/VehicleDeparture.java       |  2 +-
 .../network/serverpackets/VehicleInfo.java    |  2 +-
 .../network/serverpackets/VehicleStarted.java |  2 +-
 .../serverpackets/WareHouseDepositList.java   |  2 +-
 .../WareHouseWithdrawalList.java              |  2 +-
 .../ability/ExAcquireAPSkillList.java         |  2 +-
 .../ability/ExCloseAPListWnd.java             |  2 +-
 .../ability/ExShowAPListWnd.java              |  2 +-
 .../ExDivideAdenaCancel.java                  |  2 +-
 .../adenadistribution/ExDivideAdenaDone.java  |  2 +-
 .../adenadistribution/ExDivideAdenaStart.java |  2 +-
 .../alchemy/ExAlchemyConversion.java          |  2 +-
 .../serverpackets/alchemy/ExTryMixCube.java   |  2 +-
 .../appearance/ExChooseShapeShiftingItem.java |  2 +-
 .../ExCuriousHouseMemberUpdate.java           |  2 +-
 ...xPutShapeShiftingExtractionItemResult.java |  2 +-
 .../ExPutShapeShiftingTargetItemResult.java   |  2 +-
 .../appearance/ExShapeShiftingResult.java     |  2 +-
 .../awakening/ExCallToChangeClass.java        |  2 +-
 .../ceremonyofchaos/ExCuriousHouseEnter.java  |  2 +-
 .../ceremonyofchaos/ExCuriousHouseLeave.java  |  2 +-
 .../ExCuriousHouseMemberList.java             |  2 +-
 .../ExCuriousHouseObserveMode.java            |  2 +-
 .../ExCuriousHouseRemainTime.java             |  2 +-
 .../ceremonyofchaos/ExCuriousHouseResult.java |  2 +-
 .../ceremonyofchaos/ExCuriousHouseState.java  |  2 +-
 .../commission/ExCloseCommission.java         |  2 +-
 .../ExResponseCommissionBuyInfo.java          |  2 +-
 .../ExResponseCommissionBuyItem.java          |  2 +-
 .../ExResponseCommissionDelete.java           |  2 +-
 .../commission/ExResponseCommissionInfo.java  |  2 +-
 .../ExResponseCommissionItemList.java         |  2 +-
 .../commission/ExResponseCommissionList.java  |  2 +-
 .../ExResponseCommissionRegister.java         |  2 +-
 .../commission/ExShowCommission.java          |  2 +-
 .../serverpackets/compound/ExEnchantFail.java |  2 +-
 .../compound/ExEnchantOneFail.java            |  2 +-
 .../compound/ExEnchantOneOK.java              |  2 +-
 .../compound/ExEnchantOneRemoveFail.java      |  2 +-
 .../compound/ExEnchantOneRemoveOK.java        |  2 +-
 .../compound/ExEnchantSucess.java             |  2 +-
 .../compound/ExEnchantTwoFail.java            |  2 +-
 .../compound/ExEnchantTwoOK.java              |  2 +-
 .../compound/ExEnchantTwoRemoveFail.java      |  2 +-
 .../compound/ExEnchantTwoRemoveOK.java        |  2 +-
 .../ExGetCrystalizingEstimation.java          |  2 +-
 .../ExOneDayReceiveRewardList.java            |  2 +-
 .../serverpackets/ensoul/ExEnsoulResult.java  |  2 +-
 .../ensoul/ExShowEnsoulWindow.java            |  2 +-
 .../fishing/ExAutoFishAvailable.java          |  2 +-
 .../serverpackets/fishing/ExFishingEnd.java   |  2 +-
 .../serverpackets/fishing/ExFishingStart.java |  2 +-
 .../fishing/ExUserInfoFishing.java            |  2 +-
 .../friend/ExFriendDetailInfo.java            |  2 +-
 .../friend/FriendAddRequest.java              |  2 +-
 .../friend/FriendAddRequestResult.java        |  2 +-
 .../serverpackets/friend/FriendList.java      |  2 +-
 .../serverpackets/friend/FriendRemove.java    |  2 +-
 .../serverpackets/friend/L2Friend.java        |  2 +-
 .../serverpackets/friend/L2FriendList.java    |  2 +-
 .../serverpackets/friend/L2FriendStatus.java  |  2 +-
 .../luckygame/ExBettingLuckyGameResult.java   |  2 +-
 .../luckygame/ExStartLuckyGame.java           |  2 +-
 .../serverpackets/mentoring/ExMentorAdd.java  |  2 +-
 .../serverpackets/mentoring/ExMentorList.java |  2 +-
 .../mentoring/ListMenteeWaiting.java          |  2 +-
 .../pledgebonus/ExPledgeBonusList.java        |  2 +-
 .../pledgebonus/ExPledgeBonusMarkReset.java   |  2 +-
 .../pledgebonus/ExPledgeBonusOpen.java        |  2 +-
 .../pledgebonus/ExPledgeBonusUpdate.java      |  2 +-
 .../primeshop/ExBRBuyProduct.java             |  2 +-
 .../primeshop/ExBRGamePoint.java              |  2 +-
 .../primeshop/ExBRProductInfo.java            |  2 +-
 .../primeshop/ExBRProductList.java            |  2 +-
 .../serverpackets/sayune/ExFlyMove.java       |  2 +-
 .../sayune/ExFlyMoveBroadcast.java            |  2 +-
 .../sayune/ExNotifyFlyMoveStart.java          |  2 +-
 .../shuttle/ExMoveToLocationInShuttle.java    |  2 +-
 .../shuttle/ExShuttleGetOff.java              |  2 +-
 .../serverpackets/shuttle/ExShuttleGetOn.java |  2 +-
 .../serverpackets/shuttle/ExShuttleInfo.java  |  2 +-
 .../serverpackets/shuttle/ExShuttleMove.java  |  2 +-
 .../shuttle/ExStopMoveInShuttle.java          |  2 +-
 .../shuttle/ExValidateLocationInShuttle.java  |  2 +-
 .../security/SecondaryPasswordAuth.java       |  2 +-
 .../gameserver/util/FloodProtectorAction.java |  4 +-
 .../gameserver/util/FloodProtectors.java      |  2 +-
 .../log/formatter/AccountingFormatter.java    |  4 +-
 903 files changed, 932 insertions(+), 934 deletions(-)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{client => }/BlowFishKeygen.java (97%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{client => }/ClientInitializer.java (97%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{client => }/ClientNetworkManager.java (92%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{client => }/ConnectionState.java (94%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{client => }/Crypt.java (98%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{client => }/ExIncomingPackets.java (99%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{client => }/IncomingPackets.java (99%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{client => }/L2GameClient.java (99%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{client => }/OutgoingPackets.java (99%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/gameserverpackets/AuthRequest.java (96%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/gameserverpackets/BlowFishKey.java (95%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/gameserverpackets/ChangeAccessLevel.java (93%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/gameserverpackets/ChangePassword.java (94%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/gameserverpackets/PlayerAuthRequest.java (94%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/gameserverpackets/PlayerInGame.java (94%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/gameserverpackets/PlayerLogout.java (93%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/gameserverpackets/PlayerTracert.java (94%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/gameserverpackets/ReplyCharacters.java (94%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/gameserverpackets/SendMail.java (93%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/gameserverpackets/ServerStatus.java (97%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/gameserverpackets/TempBan.java (94%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/loginserverpackets/AuthResponse.java (94%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/loginserverpackets/ChangePasswordResponse.java (94%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/loginserverpackets/InitLS.java (93%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/loginserverpackets/KickPlayer.java (93%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/loginserverpackets/LoginServerFail.java (94%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/loginserverpackets/PlayerAuthResponse.java (94%)
 rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/{ => loginserver}/loginserverpackets/RequestCharacters.java (93%)

diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 96fdcf01ee..936b940a01 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -264,7 +264,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Resurrection", Resurrection::new);
 		EffectHandler.getInstance().registerHandler("ResurrectionSpecial", ResurrectionSpecial::new);
 		EffectHandler.getInstance().registerHandler("Reuse", Reuse::new);
-		EffectHandler.getInstance().registerHandler("RewardItemOnExit",RewardItemOnExit::new);
+		EffectHandler.getInstance().registerHandler("RewardItemOnExit", RewardItemOnExit::new);
 		EffectHandler.getInstance().registerHandler("Root", Root::new);
 		EffectHandler.getInstance().registerHandler("SafeFallHeight", SafeFallHeight::new);
 		EffectHandler.getInstance().registerHandler("SendSystemMessageToClan", SendSystemMessageToClan::new);
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index b833c8c07f..2ce31ddc33 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -50,8 +50,8 @@ import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.html.PageBuilder;
 import com.l2jmobius.gameserver.model.html.PageResult;
 import com.l2jmobius.gameserver.model.stats.Stats;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
 import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
 import com.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo;
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java
index 7606b784f8..7ac4680ae1 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminLogin.java
@@ -22,7 +22,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.gameserver.LoginServerThread;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.gameserverpackets.ServerStatus;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.ServerStatus;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 
 /**
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java
index 5de24a1ebe..80d6df69e3 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.punishment.PunishmentTask;
 import com.l2jmobius.gameserver.model.punishment.PunishmentType;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class handles ban punishment.
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java
index cad580a4ee..8f819f1cd4 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.punishment.PunishmentTask;
 import com.l2jmobius.gameserver.model.punishment.PunishmentType;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
 
 /**
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java
index 8f16089ed9..ad753cf33d 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentTask;
 import com.l2jmobius.gameserver.model.punishment.PunishmentType;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 import com.l2jmobius.gameserver.model.zone.type.L2JailZone;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/GameServer.java
index 7b87fa47b2..92485a5949 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/GameServer.java
@@ -141,7 +141,7 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
-import com.l2jmobius.gameserver.network.client.ClientNetworkManager;
+import com.l2jmobius.gameserver.network.ClientNetworkManager;
 import com.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager;
 import com.l2jmobius.gameserver.network.telnet.TelnetServer;
 import com.l2jmobius.gameserver.pathfinding.PathFinding;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/LoginServerThread.java
index a976fec193..c83a261fde 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/LoginServerThread.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/LoginServerThread.java
@@ -48,28 +48,28 @@ import com.l2jmobius.commons.util.crypt.NewCrypt;
 import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.ConnectionState;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.ConnectionState;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
-import com.l2jmobius.gameserver.network.gameserverpackets.AuthRequest;
-import com.l2jmobius.gameserver.network.gameserverpackets.BlowFishKey;
-import com.l2jmobius.gameserver.network.gameserverpackets.ChangeAccessLevel;
-import com.l2jmobius.gameserver.network.gameserverpackets.ChangePassword;
-import com.l2jmobius.gameserver.network.gameserverpackets.PlayerAuthRequest;
-import com.l2jmobius.gameserver.network.gameserverpackets.PlayerInGame;
-import com.l2jmobius.gameserver.network.gameserverpackets.PlayerLogout;
-import com.l2jmobius.gameserver.network.gameserverpackets.PlayerTracert;
-import com.l2jmobius.gameserver.network.gameserverpackets.ReplyCharacters;
-import com.l2jmobius.gameserver.network.gameserverpackets.SendMail;
-import com.l2jmobius.gameserver.network.gameserverpackets.ServerStatus;
-import com.l2jmobius.gameserver.network.gameserverpackets.TempBan;
-import com.l2jmobius.gameserver.network.loginserverpackets.AuthResponse;
-import com.l2jmobius.gameserver.network.loginserverpackets.ChangePasswordResponse;
-import com.l2jmobius.gameserver.network.loginserverpackets.InitLS;
-import com.l2jmobius.gameserver.network.loginserverpackets.KickPlayer;
-import com.l2jmobius.gameserver.network.loginserverpackets.LoginServerFail;
-import com.l2jmobius.gameserver.network.loginserverpackets.PlayerAuthResponse;
-import com.l2jmobius.gameserver.network.loginserverpackets.RequestCharacters;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.AuthRequest;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.BlowFishKey;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.ChangeAccessLevel;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.ChangePassword;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.PlayerAuthRequest;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.PlayerInGame;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.PlayerLogout;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.PlayerTracert;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.ReplyCharacters;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.SendMail;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.ServerStatus;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.TempBan;
+import com.l2jmobius.gameserver.network.loginserver.loginserverpackets.AuthResponse;
+import com.l2jmobius.gameserver.network.loginserver.loginserverpackets.ChangePasswordResponse;
+import com.l2jmobius.gameserver.network.loginserver.loginserverpackets.InitLS;
+import com.l2jmobius.gameserver.network.loginserver.loginserverpackets.KickPlayer;
+import com.l2jmobius.gameserver.network.loginserver.loginserverpackets.LoginServerFail;
+import com.l2jmobius.gameserver.network.loginserver.loginserverpackets.PlayerAuthResponse;
+import com.l2jmobius.gameserver.network.loginserver.loginserverpackets.RequestCharacters;
 import com.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
 import com.l2jmobius.gameserver.network.serverpackets.LoginFail;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/Shutdown.java
index 33d2bce021..1e160ae778 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/Shutdown.java
@@ -37,11 +37,11 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
+import com.l2jmobius.gameserver.network.ClientNetworkManager;
 import com.l2jmobius.gameserver.network.EventLoopGroupManager;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.ClientNetworkManager;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
-import com.l2jmobius.gameserver.network.gameserverpackets.ServerStatus;
+import com.l2jmobius.gameserver.network.loginserver.gameserverpackets.ServerStatus;
 import com.l2jmobius.gameserver.network.serverpackets.ServerClose;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.telnet.TelnetServer;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
index 9d342f1749..3ab43da479 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.TradeItem;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.SellBuffHolder;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 public class OfflineTradersTable
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
index b6c85032c8..b216513971 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
@@ -1171,7 +1171,7 @@ public final class SkillTreesData implements IGameXmlReader
 		switch (skillType)
 		{
 			case CLASS:
-				sl = getClassSkill(id, lvl, player.getClassId()); 
+				sl = getClassSkill(id, lvl, player.getClassId());
 				break;
 			case TRANSFORM:
 				sl = getTransformSkill(id, lvl);
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/instancemanager/AntiFeedManager.java
index 1896ab3765..e0bd9578c5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/instancemanager/AntiFeedManager.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/instancemanager/AntiFeedManager.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import com.l2jmobius.Config;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 public final class AntiFeedManager
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 07a3a60646..b5dd267815 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -258,8 +258,8 @@ import com.l2jmobius.gameserver.model.variables.AccountVariables;
 import com.l2jmobius.gameserver.model.variables.PlayerVariables;
 import com.l2jmobius.gameserver.model.zone.L2ZoneType;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.AbstractHtmlPacket;
 import com.l2jmobius.gameserver.network.serverpackets.AcquireSkillList;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java
index 3a3956062b..1801510a6b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/tasks/player/GameGuardCheckTask.java
@@ -20,7 +20,7 @@ import java.util.logging.Logger;
 
 import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.LeaveWorld;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerCreate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerCreate.java
index 6c2bd34305..5f70b710a8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerCreate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerCreate.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.model.events.impl.character.player;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventType;
 import com.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerDelete.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerDelete.java
index aa6e836063..ae734b40d8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerDelete.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerDelete.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.model.events.impl.character.player;
 
 import com.l2jmobius.gameserver.model.events.EventType;
 import com.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerRestore.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerRestore.java
index 3f06043fe7..720bac44c4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerRestore.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerRestore.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.model.events.impl.character.player;
 
 import com.l2jmobius.gameserver.model.events.EventType;
 import com.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerSelect.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerSelect.java
index bce13838c5..2867d5dbaf 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerSelect.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerSelect.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.model.events.impl.character.player;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventType;
 import com.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/server/OnPacketReceived.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/server/OnPacketReceived.java
index 7dc92dccc7..e58c5cd19b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/server/OnPacketReceived.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/server/OnPacketReceived.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.model.events.impl.server;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventType;
 import com.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/server/OnPacketSent.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/server/OnPacketSent.java
index 144f5316e7..2f091cac8a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/server/OnPacketSent.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/events/impl/server/OnPacketSent.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.model.events.impl.server;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventType;
 import com.l2jmobius.gameserver.model.events.impl.IBaseEvent;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/BlowFishKeygen.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/BlowFishKeygen.java
similarity index 97%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/BlowFishKeygen.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/BlowFishKeygen.java
index 2058b81b54..e63f1883f1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/BlowFishKeygen.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/BlowFishKeygen.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.client;
+package com.l2jmobius.gameserver.network;
 
 import com.l2jmobius.commons.util.Rnd;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/ClientInitializer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/ClientInitializer.java
similarity index 97%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/ClientInitializer.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/ClientInitializer.java
index 75fb08c757..4249eafaec 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/ClientInitializer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/ClientInitializer.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.client;
+package com.l2jmobius.gameserver.network;
 
 import java.nio.ByteOrder;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/ClientNetworkManager.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/ClientNetworkManager.java
similarity index 92%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/ClientNetworkManager.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/ClientNetworkManager.java
index 9fe90ad3ee..f6ce7e6bd0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/ClientNetworkManager.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/ClientNetworkManager.java
@@ -14,11 +14,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.client;
+package com.l2jmobius.gameserver.network;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.NetworkManager;
-import com.l2jmobius.gameserver.network.EventLoopGroupManager;
 
 /**
  * @author Nos
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/ConnectionState.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/ConnectionState.java
similarity index 94%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/ConnectionState.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/ConnectionState.java
index 7c87bf59f5..60246917c2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/ConnectionState.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/ConnectionState.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.client;
+package com.l2jmobius.gameserver.network;
 
 import com.l2jmobius.commons.network.IConnectionState;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/Crypt.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/Crypt.java
similarity index 98%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/Crypt.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/Crypt.java
index 47a78679b3..2c0393f795 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/Crypt.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/Crypt.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.client;
+package com.l2jmobius.gameserver.network;
 
 import com.l2jmobius.commons.network.ICrypt;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/ExIncomingPackets.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/ExIncomingPackets.java
similarity index 99%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/ExIncomingPackets.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/ExIncomingPackets.java
index 6c3f5c7dee..c7b610ed0c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/ExIncomingPackets.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/ExIncomingPackets.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.client;
+package com.l2jmobius.gameserver.network;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/IncomingPackets.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/IncomingPackets.java
similarity index 99%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/IncomingPackets.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/IncomingPackets.java
index a3ac1e295e..c8387d170c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/IncomingPackets.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/IncomingPackets.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.client;
+package com.l2jmobius.gameserver.network;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/L2GameClient.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/L2GameClient.java
similarity index 99%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/L2GameClient.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/L2GameClient.java
index 192a9d63cc..624fc87ddb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/L2GameClient.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/L2GameClient.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.client;
+package com.l2jmobius.gameserver.network;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -56,7 +56,6 @@ import com.l2jmobius.gameserver.model.entity.L2Event;
 import com.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadManager;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
-import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.ServerClose;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/OutgoingPackets.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/OutgoingPackets.java
similarity index 99%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/OutgoingPackets.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/OutgoingPackets.java
index 6c29862484..b069b811a2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/client/OutgoingPackets.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/OutgoingPackets.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.client;
+package com.l2jmobius.gameserver.network;
 
 import com.l2jmobius.commons.network.PacketWriter;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Action.java
index 5ac618aea1..ba91e61305 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Action.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Action.java
@@ -25,8 +25,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.skills.AbnormalType;
 import com.l2jmobius.gameserver.model.skills.BuffInfo;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 
 public final class Action implements IClientIncomingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
index 1281c4e6d8..3159a555e3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
@@ -21,8 +21,8 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.TradeItem;
 import com.l2jmobius.gameserver.model.TradeList;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd;
 import com.l2jmobius.gameserver.network.serverpackets.TradeOwnAdd;
 import com.l2jmobius.gameserver.network.serverpackets.TradeUpdate;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java
index 0782872321..2121e9b313 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java
@@ -21,8 +21,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 public final class AllyDismiss implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AllyLeave.java
index 5c5d41c4ae..abd350800b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AllyLeave.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AllyLeave.java
@@ -20,8 +20,8 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 public final class AllyLeave implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
index 6da9e6df31..619e5746a3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExRotation;
 import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
index 548e667897..1e54d0a9ed 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 /**
  * Format: (ch) d
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerPartyLootModification.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerPartyLootModification.java
index 6df750ceff..7a0ff7e4d3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerPartyLootModification.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerPartyLootModification.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
index e3c4e1edea..54f522aa9d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.TradeDone;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Appearing.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Appearing.java
index ca775d7611..c0780142ca 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Appearing.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Appearing.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Attack.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Attack.java
index 0ce2d3b54f..05986952aa 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Attack.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Attack.java
@@ -25,8 +25,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.skills.AbnormalType;
 import com.l2jmobius.gameserver.model.skills.BuffInfo;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AttackRequest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
index f3dc36381d..797722dc7e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AttackRequest.java
@@ -25,8 +25,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.skills.AbnormalType;
 import com.l2jmobius.gameserver.model.skills.BuffInfo;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 
 public final class AttackRequest implements IClientIncomingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
index 8bf9b2e134..8890047012 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
@@ -20,7 +20,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.LoginServerThread;
 import com.l2jmobius.gameserver.LoginServerThread.SessionKey;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/BrEventRankerList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/BrEventRankerList.java
index dc6f43d028..3e42669e13 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/BrEventRankerList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/BrEventRankerList.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExBrLoadEventTopRankers;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
index 2f870b8c48..ff05d074b7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/BypassUserCmd.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.handler.IUserCommandHandler;
 import com.l2jmobius.gameserver.handler.UserCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
index 54abc3ad9e..7f9cb857c7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -21,7 +21,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.ai.CtrlEvent;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
index 46b4a3db10..08e930eafc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.StopMoveInVehicle;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
index 9b3683a71d..876c53c093 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
@@ -40,7 +40,7 @@ import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerCreate;
 import com.l2jmobius.gameserver.model.items.PcItemTemplate;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.CharCreateFail;
 import com.l2jmobius.gameserver.network.serverpackets.CharCreateOk;
 import com.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java
index 942e5948e0..d24c043f23 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterDelete.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.CharSelectInfoPackage;
 import com.l2jmobius.gameserver.model.events.Containers;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerDelete;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.CharDeleteFail;
 import com.l2jmobius.gameserver.network.serverpackets.CharDeleteSuccess;
 import com.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java
index 967a1a5de9..88fcec95d0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterRestore.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.CharSelectInfoPackage;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerRestore;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
index 0ec3609350..c191b11412 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java
@@ -33,8 +33,8 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSelec
 import com.l2jmobius.gameserver.model.events.returns.TerminateReturn;
 import com.l2jmobius.gameserver.model.punishment.PunishmentAffect;
 import com.l2jmobius.gameserver.model.punishment.PunishmentType;
-import com.l2jmobius.gameserver.network.client.ConnectionState;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.ConnectionState;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.CharSelected;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jmobius.gameserver.network.serverpackets.ServerClose;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
index 15aee52611..850e018a13 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
@@ -28,8 +28,8 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerDlgAn
 import com.l2jmobius.gameserver.model.events.returns.TerminateReturn;
 import com.l2jmobius.gameserver.model.holders.DoorRequestHolder;
 import com.l2jmobius.gameserver.model.holders.SummonRequestHolder;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DummyPacket.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DummyPacket.java
index bc5ab1a549..e3833918b1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DummyPacket.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DummyPacket.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author zabbix Lets drink to code!
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java
index 3a02a8d99d..5c18755798 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EndScenePlayer.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.MovieHolder;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index e35d319691..f4a678670e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -57,8 +57,8 @@ import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
 import com.l2jmobius.gameserver.model.variables.PlayerVariables;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 import com.l2jmobius.gameserver.network.serverpackets.Die;
 import com.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExBookmarkPacket.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExBookmarkPacket.java
index 91d0337ec8..644337d66c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExBookmarkPacket.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExBookmarkPacket.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.IIncomingPacket;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java
index 69864813b0..29a07243b9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExGetOnAirShip.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: (c) dddd d: dx d: dy d: dz d: AirShip id ??
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExPCCafeRequestOpenWindowWithoutNPC.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExPCCafeRequestOpenWindowWithoutNPC.java
index 08a86c8e29..bb5bfcca9d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExPCCafeRequestOpenWindowWithoutNPC.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExPCCafeRequestOpenWindowWithoutNPC.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExPacket.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExPacket.java
index 362793cd48..40de65a1f2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExPacket.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExPacket.java
@@ -18,8 +18,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.IIncomingPacket;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.ExIncomingPackets;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.ExIncomingPackets;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Nos
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExRequestAutoFish.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExRequestAutoFish.java
index c20728a606..1f25eb49ac 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExRequestAutoFish.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExRequestAutoFish.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author St3eT
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExSendSelectedQuestZoneID.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExSendSelectedQuestZoneID.java
index 0dffc878be..d0c3e19d00 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExSendSelectedQuestZoneID.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ExSendSelectedQuestZoneID.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author St3eT
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/FinishRotating.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/FinishRotating.java
index ea7e13f250..9840c999e8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/FinishRotating.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/FinishRotating.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.StopRotation;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java
index 4aa73fe199..4f62846be3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/GameGuardReply.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
 import java.util.logging.Level;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: c dddd
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
index d55e840518..472f1051b3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/IClientIncomingPacket.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import java.util.logging.Logger;
 
 import com.l2jmobius.commons.network.IIncomingPacket;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Packets received by the game server from clients
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java
index 770242b012..3f98b0bb06 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Logout.java
@@ -22,8 +22,8 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.L2Event;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 6affb1b673..b9f7204d84 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -29,8 +29,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerMoveRequest;
 import com.l2jmobius.gameserver.model.events.returns.TerminateReturn;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.FlyToLocation;
 import com.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java
index 2f33765ab3..03f82be21d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveToLocationAirShip.java
@@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
 import com.l2jmobius.gameserver.model.actor.instance.L2AirShipInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 public class MoveToLocationAirShip implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java
index 791de3dbbf..f6740ced91 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2AirShipInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.type.WeaponType;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip;
 import com.l2jmobius.gameserver.network.serverpackets.StopMoveInVehicle;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveWithDelta.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveWithDelta.java
index 44f5d5f934..2204f1b49c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveWithDelta.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MoveWithDelta.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: (c) ddd d: dx d: dy d: dz
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index f54e973849..d4d88cd715 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -38,8 +38,8 @@ import com.l2jmobius.gameserver.model.multisell.Ingredient;
 import com.l2jmobius.gameserver.model.multisell.ItemInfo;
 import com.l2jmobius.gameserver.model.multisell.PreparedListContainer;
 import com.l2jmobius.gameserver.model.variables.ItemVariables;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java
index bed27e3ab2..64ead4d05d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/NewCharacter.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.PlayerTemplateData;
 import com.l2jmobius.gameserver.model.base.ClassId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.NewCharacterSuccess;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/NotifyExitBeautyShop.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/NotifyExitBeautyShop.java
index c2d9acbae0..dd35abc223 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/NotifyExitBeautyShop.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/NotifyExitBeautyShop.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.UserInfoType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ObserverReturn.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ObserverReturn.java
index 2163e531df..69d836355f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ObserverReturn.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ObserverReturn.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java
index f576eda36b..f4aeb72ea3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java
@@ -20,7 +20,7 @@ import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.KeyPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
index 485590c89d..5533d14129 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -44,8 +44,8 @@ import com.l2jmobius.gameserver.model.quest.QuestState;
 import com.l2jmobius.gameserver.model.skills.CommonSkill;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.model.variables.PlayerVariables;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.AcquireSkillDone;
 import com.l2jmobius.gameserver.network.serverpackets.ExAcquirableSkillListByClass;
 import com.l2jmobius.gameserver.network.serverpackets.ExAlchemySkillList;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
index bc31ef3aea..642b423b4b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.base.AcquireSkillType;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.AcquireSkillInfo;
 import com.l2jmobius.gameserver.network.serverpackets.ExAcquireSkillInfo;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index e1ba080e6f..caaa9f4faf 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -29,8 +29,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.skills.AbnormalType;
 import com.l2jmobius.gameserver.model.skills.BuffInfo;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.ExBasicActionList;
 import com.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAddExpandQuestAlarm.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAddExpandQuestAlarm.java
index df92cf40a2..5157f48f46 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAddExpandQuestAlarm.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAddExpandQuestAlarm.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.QuestManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.quest.Quest;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
index 61d9dd6cbe..0885123f5e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAlchemySkillList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExAlchemySkillList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
index ac8629156f..9781ac0853 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExShowAgitInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
index 5242fd6173..cc5763826e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExShowCastleInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
index 0296b260d1..15b9b343d5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExShowFortressInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index cdfb0d885a..9e21fc32c2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.AllyCrest;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
index c43cceba15..d06d69a2e0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.ClanInfo;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.AllianceInfo;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinAlly.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinAlly.java
index 307d1a0533..bc30705b82 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinAlly.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinAlly.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 public final class RequestAnswerJoinAlly implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java
index 2e3621c40f..5f087301c9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinParty.java
@@ -23,8 +23,8 @@ import com.l2jmobius.gameserver.model.L2Party.MessageType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.PartyRequest;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.JoinParty;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index b5b4d29eea..b7d00c6333 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -21,8 +21,8 @@ import com.l2jmobius.gameserver.instancemanager.CastleManager;
 import com.l2jmobius.gameserver.instancemanager.FortManager;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
 import com.l2jmobius.gameserver.network.serverpackets.JoinPledge;
 import com.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java
index b1cd8ad06e..99ce7ce51f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExAskJoinPartyRoom;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
index b92f3098a3..e32cce9e1f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -23,8 +23,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.ActionType;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
index 17468c007e..c6487e9bd8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.handler.CommunityBoardHandler;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * RequestBBSwrite client packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBidItemAuction.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBidItemAuction.java
index 527897b797..b54b9c4216 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBidItemAuction.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBidItemAuction.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuction;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
 import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Forsaiken
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java
index cc5b1be133..95fd1aa66c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBlock.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.BlockList;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 public final class RequestBlock implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java
index b89ddcf690..fd88f2e83f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index 60dee0a783..876bf753b3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -32,8 +32,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.buylist.L2BuyList;
 import com.l2jmobius.gameserver.model.buylist.Product;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.ExBuySellList;
 import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
index 7a95d39b54..5e8efd112f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java
@@ -35,8 +35,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Castle;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
 import com.l2jmobius.gameserver.model.items.L2Item;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.util.Util;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java
index 447523b496..2fd469d368 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySellUIClose.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 public class RequestBuySellUIClose implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index 3390eec424..3f95262f76 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -38,7 +38,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcMenuSelect;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerBypass;
 import com.l2jmobius.gameserver.model.events.returns.TerminateReturn;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jmobius.gameserver.util.Util;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java
index 9105e1b7b8..9a84b31ae4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java
@@ -27,8 +27,8 @@ import com.l2jmobius.gameserver.model.entity.Message;
 import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExChangePostState;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java
index af2bc05078..2997786a31 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author ShanSoft Packets Structure: chddd
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java
index e621442e33..41467f418b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author KenM, Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangePartyLeader.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangePartyLeader.java
index 205b5f27e7..a98b15dd60 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangePartyLeader.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangePartyLeader.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This packet is received from client when a party leader requests to change the leadership to another player in his party.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java
index d57856183d..9eb09b6dd9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.sql.impl.PetNameTable;
 import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeToAwakenedClass.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeToAwakenedClass.java
index a27d277454..1a8bb99e3d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeToAwakenedClass.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeToAwakenedClass.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerChangeToAwakenedClass;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCharacterNameCreatable.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCharacterNameCreatable.java
index 0765bde703..ceb67b0f5f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCharacterNameCreatable.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCharacterNameCreatable.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExIsCharNameCreatable;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
index 311186cf69..43711c33f5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -20,8 +20,8 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
index fdcdc5cc65..d5229dbf76 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPutCommissionResultForVariationMake;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
index 29e88c8c59..15cf903d75 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPutIntensiveResultForVariationMake;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
index b17c053948..19c9dcd37a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.instancemanager.CastleManager;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Castle;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
index 2c6cb5af8b..51a8d6f055 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
index c50cdf6b6c..43f0a06f7c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -33,8 +33,8 @@ import com.l2jmobius.gameserver.model.itemcontainer.PcInventory;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
 import com.l2jmobius.gameserver.model.skills.CommonSkill;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
index 9688a2441f..40582a3b39 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExCursedWeaponList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
index acc003cc75..6bf70f0083 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jmobius.gameserver.model.CursedWeapon;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExCursedWeaponLocation;
 import com.l2jmobius.gameserver.network.serverpackets.ExCursedWeaponLocation.CursedWeaponInfo;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java
index a06d8a70dd..ad26231d90 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author ShanSoft
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
index 7e461d5306..b81b04e2fc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteMacro.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 public final class RequestDeleteMacro implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
index 6f447d9992..c39dfc8e73 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.instancemanager.MailManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Message;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExChangePostState;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
index e3f4a816bb..ddfd8a7721 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.instancemanager.MailManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Message;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExChangePostState;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index e1719cf68e..c6e20c8de4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -31,8 +31,8 @@ import com.l2jmobius.gameserver.model.PcCondOverride;
 import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.util.Util;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
index 6248e77665..41f8ceba8a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -18,8 +18,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java
index 918e3c6244..e208da7957 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDismissPartyRoom.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.MatchingRoomType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDispel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDispel.java
index fbaa6090f5..8f549915a5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDispel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDispel.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.AbnormalType;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
index 7873e01c7c..ef58975edc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
@@ -27,8 +27,8 @@ import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.EtcItemType;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.util.GMAudit;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java
index de6c759e8c..fb0908ab9f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.DuelManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java
index 2d2f5ac976..b0ace828dc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java
@@ -21,8 +21,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExDuelAskStart;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
index 2059b0f4cb..11de768273 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.DuelManager;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format:(ch) just a trigger
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
index 2bb718a32a..9f9e2cc7fe 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -33,8 +33,8 @@ import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.CommonSkill;
 import com.l2jmobius.gameserver.model.skills.Skill;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.EnchantResult;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java
index 83f8560b9c..6868d9c213 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
index 968913abfe..e94d792ec9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck;
 import com.l2jmobius.gameserver.security.SecondaryPasswordAuth;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java
index 0eb7cdfef0..3d67b1b00d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: (ch)S S: numerical password
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java
index 89c3e742fb..9d6ec01b3f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2CommandChannel;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAddContactToContactList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAddContactToContactList.java
index b88a89a5d6..83dc9b1501 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAddContactToContactList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAddContactToContactList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExConfirmAddingContact;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java
index b6f0c8a570..97e3e93a81 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
index 11378f821f..a9838743e9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExAskJoinMPCC;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
index 6423ed2d70..178d8e7f3a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.EnchantResult;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java
index 97e698665d..ac44a0a77b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExChangeName.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExNeedToChangeName;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java
index fdd1013c72..68f3ac2c1c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: chdd d: Arena d: Team
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
index 654a5bd278..0c7271d8a5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.HandysBlockCheckerManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: chddd d: Arena d: Answer
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java
index e54c4b0f2f..a8b5b2a420 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: (ch)S S: Character Name
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExDismissMpccRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExDismissMpccRoom.java
index 7df98758db..675b81047c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExDismissMpccRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExDismissMpccRoom.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.MatchingRoomType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
index 23e74bd2bd..d66d6376c8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest;
 import com.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
index 71c571b77f..69d688bf34 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
@@ -31,8 +31,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
 import com.l2jmobius.gameserver.model.skills.Skill;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfo;
 import com.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
 import com.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillResult;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
index bcee11d95f..596bc37bae 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
index a56dcf922f..693b077a8e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEscapeScene.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEscapeScene.java
index c946c7950e..65cf80e07a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEscapeScene.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEscapeScene.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.MovieHolder;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author St3eT
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java
index cbb38ce40d..2aac09d8a2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFishRanking.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: (ch) just a trigger
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
index 42f6cf24de..3d3dcf50dd 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.friend.FriendList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExJoinMpccRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExJoinMpccRoom.java
index 09915306fe..a8971d5fc5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExJoinMpccRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExJoinMpccRoom.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExListMpccWaiting.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExListMpccWaiting.java
index a8465a95aa..1aa95b9daf 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExListMpccWaiting.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExListMpccWaiting.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExListMpccWaiting;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
index e393ffccf4..9407fadcc3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExMPCCShowPartyMemberInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
index c5cd142276..1690c6d2f0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 import com.l2jmobius.gameserver.util.Broadcast;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExManageMpccRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExManageMpccRoom.java
index 024b4ef13f..b6c5605d36 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExManageMpccRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExManageMpccRoom.java
@@ -21,8 +21,8 @@ import com.l2jmobius.gameserver.enums.MatchingRoomType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.CommandChannelMatchingRoom;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExMPCCRoomInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMpccPartymasterList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMpccPartymasterList.java
index 7377b4ccdb..6f9414d1c9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMpccPartymasterList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExMpccPartymasterList.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.enums.MatchingRoomType;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExMPCCPartymasterList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java
index 902d41b3de..8a0bda80ad 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExOlympiadMatchList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMPCC.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMPCC.java
index 718d1b1492..39590076a9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMPCC.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMPCC.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMpccRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMpccRoom.java
index d5f81c1837..96ed2e18c1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMpccRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExOustFromMpccRoom.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.enums.MatchingRoomType;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author jeremy
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index b048866fb5..38dd4f12af 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.sql.impl.CrestTable;
 import com.l2jmobius.gameserver.model.L2Crest;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeEmblem;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java
index 36229d5cce..0afbf62bcc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
index 17c2fcfcea..d30fe2d72d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -21,8 +21,8 @@ import com.l2jmobius.gameserver.enums.AttributeType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2Weapon;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
index cf39cbcfae..41c6a7e328 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExRpItemLink;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
index 6772f78652..58d564de15 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -23,8 +23,8 @@ import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2Crest;
 import com.l2jmobius.gameserver.model.L2Crest.CrestType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 /**
  * Format : chdb c (id) 0xD0 h (subid) 0x11 d data size b raw data (picture i think ;) )
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
index 8df0bd9ac2..2c2ae431eb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExShowContactList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
index 5b59c8550b..7285212b39 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
@@ -23,8 +23,8 @@ import com.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
index a5198ab16c..31e55b54f3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.EnchantItemRequest;
 import com.l2jmobius.gameserver.model.items.enchant.EnchantScroll;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExWithdrawMpccRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExWithdrawMpccRoom.java
index 0441b92469..1b4a06c0b9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExWithdrawMpccRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExWithdrawMpccRoom.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.MatchingRoomType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
index 89a6d1fc84..443760218a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
index 362d42caba..352bc99c12 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.FortManager;
 import com.l2jmobius.gameserver.model.entity.Fort;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.ExShowFortressMapInfo;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
index 032144a45a..262b0fd7c1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.FortManager;
 import com.l2jmobius.gameserver.model.entity.Fort;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExShowFortressSiegeInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFriendInvite.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFriendInvite.java
index b958659049..b1fcd73bef 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFriendInvite.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestFriendInvite.java
@@ -21,8 +21,8 @@ import com.l2jmobius.gameserver.model.BlockList;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.FriendAddRequest;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java
index 255df1abb3..3c7f86b7de 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGMCommand.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.GMHennaInfo;
 import com.l2jmobius.gameserver.network.serverpackets.GMViewCharacterInfo;
 import com.l2jmobius.gameserver.network.serverpackets.GMViewItemList;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java
index d8d9363364..8c3b8157b7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetBossRecord.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: (ch) d
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java
index 2a76344452..ffc9040acd 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java
@@ -21,7 +21,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index ca8c733024..64c4ac5088 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.GetOffVehicle;
 import com.l2jmobius.gameserver.network.serverpackets.StopMoveInVehicle;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index c3fd88b7ee..b142606007 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2BoatInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java
index f702c113ae..ca156d99ba 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.enums.PrivateStoreType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
index 44ff8170b4..ca5edd5824 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.ClanPrivilege;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 public class RequestGiveNickName implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGmList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
index 561ac4000b..0a319e9fcf 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGmList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class handles RequestGmLista packet triggered by /gmlist command
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGotoLobby.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGotoLobby.java
index d396fe5365..43f6122b4f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGotoLobby.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestGotoLobby.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java
index 40d8d0ed6b..5a9fc6b97c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java
@@ -21,7 +21,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Mobius
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
index 3122f7bc2a..07f79b8511 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.data.xml.impl.HennaData;
 import com.l2jmobius.gameserver.model.PcCondOverride;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2Henna;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.HennaEquipList;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
index 7328c6671b..4055e9b188 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.HennaData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2Henna;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemList.java
index d4721c451a..f8706a533e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.HennaEquipList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
index 9d659eb56e..6950da9b0c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.HennaData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2Henna;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
index 0da6d3e2b0..2d53b32472 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2Henna;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
index d0338ecbef..9af58fc5c0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.HennaRemoveList;
 
 public final class RequestHennaRemoveList implements IClientIncomingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
index f8e850660b..3a0d8d5e62 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.instancemanager.ItemAuctionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuction;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExItemAuctionInfoPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
index fe4e51ef71..42bdbbdcdd 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestInzoneWaitingTime.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExInzoneWaiting;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
index 9304b28b70..419dcb9ac9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java
index 91fc132536..aa2478bb5f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinAlly.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.AskJoinAlly;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
index fee5733532..a541c0b116 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
@@ -25,8 +25,8 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.PartyRequest;
 import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.AskJoinParty;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
index 00098150ec..4b8ea6a868 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.AskJoinPledge;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
index 494a51af21..a5721a7fb7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.model.ClanPrivilege;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Castle;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
index da71cca5d8..b20d9d21b1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExUISetting;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
index 5fa405fde6..4f25b1bbf4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
index df148397a4..a46e3809e9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -22,7 +22,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.base.ClassId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExListPartyMatchingWaitingRoom;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java
index fe5e5d93f7..3d797b889a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index c6002f8121..2d6ce2da28 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.CommonSkill;
 import com.l2jmobius.gameserver.model.skills.Skill;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 
 public final class RequestMagicSkillUse implements IClientIncomingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java
index 5d7a1de937..ab4361c35d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java
@@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.enums.MacroType;
 import com.l2jmobius.gameserver.model.Macro;
 import com.l2jmobius.gameserver.model.MacroCmd;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 public final class RequestMakeMacro implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestManorList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
index 76d686e70b..4e8496ea1c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestManorList.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExSendManorList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java
index d31978edff..8eab4e759d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author ShanSoft
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index e574b9d8bd..46f599d6c2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -23,8 +23,8 @@ import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2BoatInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.type.WeaponType;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.MoveToLocationInVehicle;
 import com.l2jmobius.gameserver.network.serverpackets.StopMoveInVehicle;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOlympiadMatchList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOlympiadMatchList.java
index 3014129a6e..6845cb92bc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOlympiadMatchList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOlympiadMatchList.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * format ch c: (id) 0xD0 h: (subid) 0x13
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java
index 3fb12c682f..4a07e80298 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * format ch c: (id) 0xD0 h: (subid) 0x12
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
index bf3154dafe..f9c3fa8881 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 /**
  * format (ch) d
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java
index 63bd91e45c..9aa88e47a3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPartyMember.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Party.MessageType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index c24d43c3f0..0ab61c25b8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.model.ClanPrivilege;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
 import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java
index 40650f350c..b703480e20 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPCCafeCouponUse.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: (ch) S
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPVPMatchRecord.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPVPMatchRecord.java
index a2f4f6d70e..2515c16d38 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPVPMatchRecord.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPVPMatchRecord.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
index 43fd5ef190..aa71b73eb6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java
@@ -25,8 +25,8 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jmobius.gameserver.model.itemcontainer.PcFreight;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
index 88dabe24ea..f56d98c65b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.PackageSendableList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyLootModification.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyLootModification.java
index 2d54039824..a630c5c596 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyLootModification.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyLootModification.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.PartyDistributionType;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java
index 5755b50e93..366e0137e2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.model.L2CommandChannel;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.CommandChannelMatchingRoom;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ListPartyWaiting;
 
 public final class RequestPartyMatchConfig implements IClientIncomingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java
index 247fe7436d..e53f260788 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchDetail.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
index 0656d96d8d..7f2953596e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.enums.MatchingRoomType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
 import com.l2jmobius.gameserver.model.matching.PartyMatchingRoom;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.PartyRoomInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
index 87389c5bac..953e288aca 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -25,8 +25,8 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jmobius.gameserver.model.entity.Castle;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 
 public final class RequestPetGetItem implements IClientIncomingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java
index 62d817f832..9ef482c27c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.PetItemList;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetition.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
index 3c66586c72..792ce9b523 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetition.java
@@ -21,8 +21,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.instancemanager.PetitionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java
index f11526c04e..1e1e878a08 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.instancemanager.PetitionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java
index b5c7d81c06..deef71c1ba 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java
@@ -23,7 +23,7 @@ import java.sql.SQLException;
 import com.l2jmobius.commons.database.DatabaseFactory;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Plim
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index bbd105b60a..a01a2b98dd 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.PledgeCrest;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
index 26ec20b70d..98e050af9b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListApply.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
index 6bcb836420..e6a03bec8b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeDraftListSearch.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeDraftListSearch;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java
index 5e93c65cd2..ad6cb2338b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: (c) S S: pledge name?
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 5c8e060ff0..2da3b56c0b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -21,7 +21,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.PledgeInfo;
 
 public final class RequestPledgeInfo implements IClientIncomingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
index 68cdefa8b4..bdf094fe6c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.PledgeReceiveMemberInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java
index 4850bc83bf..d3634e858c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java
index aef7a4547c..7b60c37143 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.PledgeReceivePowerInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
index 8330c24421..c7f45bb798 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgePower.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.ClanPrivilege;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ManagePledgePower;
 
 public final class RequestPledgePower implements IClientIncomingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java
index 6d40bcf335..4f1e18cba6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2Clan.RankPrivs;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java
index c4b6ffcf3d..2fab1b0b95 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.ClanEntryStatus;
 import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeRecruitApplyInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java
index e4d762f3df..876ed4402d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardAccess.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.model.ClanPrivilege;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
index a06bbde863..79fa3f6077 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardDetail.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeRecruitBoardDetail;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java
index c3e92fe92f..47d5059048 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeRecruitBoardSearch;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java
index 655f996d27..d60c38bee0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeRecruitInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java
index bdd883cc89..4cc9577dbb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.ClanPrivilege;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: (ch) dSdS
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
index 75838ff61f..a8b3a25903 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
@@ -21,8 +21,8 @@ import com.l2jmobius.gameserver.model.ClanPrivilege;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java
index d7aa3296e3..e9a3a2cfa3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.ClanPrivilege;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: (ch) Sd
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApplied.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApplied.java
index fbe0c2faa4..ff490bec36 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApplied.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApplied.java
@@ -21,7 +21,7 @@ import java.util.OptionalInt;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeWaitingListApplied;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
index d226f5a9c6..c18021b700 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java
@@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeRecruitApplyInfo;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeWaitingListAlarm;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
index 8f0cbfd24a..d67c9175b8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeWaitingList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
index 398080774c..77c3f03c23 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeWaitingList;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeWaitingUser;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
index fd0b096377..765c5da92a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.JoinPledge;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java
index 92854a60a3..e98edffa67 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWarList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.PledgeReceiveWarList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
index aa2dfca6d2..10f2f8906d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -30,8 +30,8 @@ import com.l2jmobius.gameserver.model.entity.Message;
 import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExChangePostState;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
index f1f750601f..aa475e131d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostItemList.java
@@ -20,8 +20,8 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExReplyPostItemList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
index 681e964a59..a6900f0102 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -37,8 +37,8 @@ import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.L2Weapon;
 import com.l2jmobius.gameserver.model.items.type.ArmorType;
 import com.l2jmobius.gameserver.model.items.type.WeaponType;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot;
 import com.l2jmobius.gameserver.network.serverpackets.ShopPreviewInfo;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
index dbf0aabe28..947e75977d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -31,8 +31,8 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.TradeList;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java
index a41db5f798..839752b793 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
index 924c455631..bab8a48958 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java
index 3c8aacc343..d460058809 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java
index 1f98d28d9e..7824fe3f54 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
index 361ac10c52..85acf6c99e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -27,8 +27,8 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.TradeList;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
index 293d2e47e5..7b2b11f7c4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -30,8 +30,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.UniqueItemHolder;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java
index b9ed817b99..43c90dec13 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestAbort;
 import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.quest.QuestState;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.QuestList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
index 1bbf79c698..c5dd0e8947 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestList.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.QuestList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
index a7aaadbf3c..ff683ba732 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.instancemanager.MailManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Message;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExChangePostState;
 import com.l2jmobius.gameserver.network.serverpackets.ExReplyReceivedPost;
 import com.l2jmobius.gameserver.util.Util;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
index 264e1ee017..9d1fa1ac5c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExShowReceivedPostList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
index f634bf4d47..c84bf256a2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.RecipeData;
 import com.l2jmobius.gameserver.model.L2RecipeList;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList;
 
 public final class RequestRecipeBookDestroy implements IClientIncomingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
index 81d158efbe..26a453d3ff 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.RecipeController;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 public final class RequestRecipeBookOpen implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
index cdae7d86c5..64f44c07f2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.RecipeItemMakeInfo;
 
 public final class RequestRecipeItemMakeInfo implements IClientIncomingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java
index 5263872d84..8aa642c02a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.RecipeController;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Administrator
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
index 7be8af02cf..2c7aaa9a84 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -29,8 +29,8 @@ import com.l2jmobius.gameserver.model.L2ManufactureItem;
 import com.l2jmobius.gameserver.model.L2RecipeList;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.RecipeShopMsg;
 import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
index 3387c6cfdb..12f915819f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.RecipeShopItemInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java
index 5a234ff0b9..ba40366a3e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.RecipeController;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
index a5090e36de..59b5957d8e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
index 5d31834270..8b59287b33 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.RecipeShopSellList;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java
index e28d198c5a..118ec10b61 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ... cd(dd)
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java
index 661a764a0a..185f5ccf05 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 74d3630683..e82ff33af3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SpawnItem;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
index 76625c27ed..a30ac40863 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
@@ -21,8 +21,8 @@ import com.l2jmobius.gameserver.datatables.AugmentationData;
 import com.l2jmobius.gameserver.model.L2Augmentation;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExVariationResult;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
index e38cdeaed9..aaef2d69a4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -20,8 +20,8 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.util.Util;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
index c85a6a6670..dedd9545d3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java
@@ -28,8 +28,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.buylist.L2BuyList;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.ExBuySellList;
 import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRegistBeauty.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRegistBeauty.java
index f4341af5bc..ce9284e398 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRegistBeauty.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRegistBeauty.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.data.xml.impl.BeautyShopData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.beautyshop.BeautyData;
 import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExResponseBeautyList;
 import com.l2jmobius.gameserver.network.serverpackets.ExResponseBeautyRegistReset;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
index 0926328ede..566b570b58 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Message;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExChangePostState;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.util.Util;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
index 69c11206ec..78fa8c62d7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.model.ClanWar;
 import com.l2jmobius.gameserver.model.ClanWar.ClanWarState;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
index d2db7e30df..f4d810985b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
index 5a598e931d..8b253257c5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 public final class RequestReplySurrenderPledgeWar implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestResetNickname.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestResetNickname.java
index 6d8beaa2dc..1f927e912f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestResetNickname.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestResetNickname.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
index 42933abff9..de928603c2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
@@ -22,9 +22,9 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.AntiFeedManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.ConnectionState;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.ConnectionState;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.CharSelectionInfo;
 import com.l2jmobius.gameserver.network.serverpackets.RestartResponse;
 import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
index 1e02a81986..ea56ec08fe 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java
@@ -32,7 +32,7 @@ import com.l2jmobius.gameserver.model.entity.Fort;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
 import com.l2jmobius.gameserver.model.residences.AbstractResidence;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionType;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java
index f5cc986dfb..6115d4cf72 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author ShanSoft
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java
index 6fa45f3d9a..186c3e6707 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.enums.ItemLocation;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format:(ch) d[dd]
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveKeyMapping.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveKeyMapping.java
index e0788de035..52c83997ac 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveKeyMapping.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveKeyMapping.java
@@ -25,8 +25,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.UIData;
 import com.l2jmobius.gameserver.model.ActionKey;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.ConnectionState;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.ConnectionState;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Request Save Key Mapping client packet.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSeedPhase.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSeedPhase.java
index 93983c7ec0..9bceb58d44 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSeedPhase.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSeedPhase.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExShowSeedMapInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
index 460119266f..731410f7d7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.buylist.L2BuyList;
 import com.l2jmobius.gameserver.model.holders.UniqueItemHolder;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.ExBuySellList;
 import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java
index 818b59fca1..3d5bcaeca5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java
@@ -32,8 +32,8 @@ import com.l2jmobius.gameserver.model.entity.Message;
 import com.l2jmobius.gameserver.model.itemcontainer.Mail;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExNoticePostSent;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
index f30d7dfc53..5e4e0a88c3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSentPost.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.instancemanager.MailManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Message;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExReplySentPost;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
index e2b22a632a..9b21f2790c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSentPostList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExShowSentPostList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetAllyCrest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetAllyCrest.java
index a59fafa646..8819a0d3d7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetAllyCrest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetAllyCrest.java
@@ -23,8 +23,8 @@ import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2Crest;
 import com.l2jmobius.gameserver.model.L2Crest.CrestType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 /**
  * Client packet for setting ally crest.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java
index 40428aa585..092a91fe40 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java
@@ -24,8 +24,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.CastleManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Castle;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SiegeInfo;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.util.Broadcast;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
index f25aa2fd79..19f3b0135f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetCrop.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.ClanPrivilege;
 import com.l2jmobius.gameserver.model.CropProcure;
 import com.l2jmobius.gameserver.model.L2Seed;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java
index 06c8d52002..9b3557e325 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java
@@ -23,8 +23,8 @@ import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2Crest;
 import com.l2jmobius.gameserver.model.L2Crest.CrestType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 /**
  * Client packet for setting/deleting clan crest.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
index aace691acc..562cd08bbf 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetSeed.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.ClanPrivilege;
 import com.l2jmobius.gameserver.model.L2Seed;
 import com.l2jmobius.gameserver.model.SeedProduction;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
index 3b68347568..60765c5ce7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShortCutDel.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
index 4a8d8d0f25..73511fee7b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.ShortcutType;
 import com.l2jmobius.gameserver.model.Shortcut;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
 public final class RequestShortCutReg implements IClientIncomingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
index 33f9fd2cd4..a423197793 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowBeautyList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExResponseBeautyList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
index 2078c24039..fa7b210017 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowBoard.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.handler.CommunityBoardHandler;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * RequestShowBoard client packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
index 5c28b951b4..22556e8415 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ShowMiniMap;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowResetShopList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowResetShopList.java
index d7a321456f..6803188029 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowResetShopList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestShowResetShopList.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.data.xml.impl.BeautyShopData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.beautyshop.BeautyData;
 import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExResponseBeautyRegistReset;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
index c09ae3c7ce..f5377fcf7c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.CastleManager;
 import com.l2jmobius.gameserver.model.entity.Castle;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SiegeAttackerList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
index 5928908671..adc042c01d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.CastleManager;
 import com.l2jmobius.gameserver.model.entity.Castle;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.SiegeDefenderList;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSiegeInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSiegeInfo.java
index 79b2c4ac72..41d302231d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSiegeInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSiegeInfo.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format: (c) (no data, trigger)
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
index dce438b831..c3d43ddbc6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @version 1.4
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
index 467a5c579e..164458432d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -28,8 +28,8 @@ import com.l2jmobius.gameserver.model.ClanWar.ClanWarState;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
index 429bd2361e..e9f26c9b11 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.model.ClanPrivilege;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
index 37f13a5b37..b24f042d48 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.ClanWar.ClanWarState;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index 3ef83c511f..a1234ca2ea 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -18,8 +18,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTeleportBookMark.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTeleportBookMark.java
index f8e2129ee7..490c8f99a8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTeleportBookMark.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTeleportBookMark.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author ShanSoft Packets Structure: chdd
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialClientEvent.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialClientEvent.java
index 27f201531b..978371dfb0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialClientEvent.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialClientEvent.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.quest.QuestState;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 public class RequestTutorialClientEvent implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
index bb5ba12337..e230c6ec10 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 public class RequestTutorialLinkHtml implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
index 8b2d33f921..3b9d386e05 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerBypass;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 public class RequestTutorialPassCmdToServer implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialQuestionMark.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialQuestionMark.java
index f916986d82..815546a500 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialQuestionMark.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialQuestionMark.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerPressTutorialMark;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 public class RequestTutorialQuestionMark implements IClientIncomingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index 455341cccf..bbbdb16169 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2EtcItem;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
index 6c6b1e3949..8156905e94 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
index f26125b4ab..e7dbd247e1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -20,8 +20,8 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2PremiumItem;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExGetPremiumItemList;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java
index 03788827cb..6f3c9aa9cd 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawalParty.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.L2Party.MessageType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java
index 4d22ed3231..f57a898e4e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.MatchingRoomType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
index 5844036b4a..5878cc5544 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -20,8 +20,8 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
 import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListDelete;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java
index 669f3fb79d..bda15c0d1c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestWriteHeroWords.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Hero;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Format chS c (id) 0xD0 h (subid) 0x0C S the hero's words :)
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java
index 986659f07e..d339c1d241 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java
@@ -32,8 +32,8 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerChat;
 import com.l2jmobius.gameserver.model.events.returns.ChatFilterReturn;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadManager;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
index 8144f5666d..84eccf9f7a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
index bcb9ec8f67..60c0402b18 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -29,8 +29,8 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jmobius.gameserver.model.itemcontainer.PcWarehouse;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
index 899d7dad12..9c76eb1086 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
@@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse;
 import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jmobius.gameserver.model.itemcontainer.PcWarehouse;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
index 175fc7849f..fad73d56d2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
@@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.enums.PrivateStoreType;
 import com.l2jmobius.gameserver.model.TradeList;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.PrivateStoreManageListBuy;
 import com.l2jmobius.gameserver.network.serverpackets.PrivateStoreMsgBuy;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java
index b2ddcaffea..3929a77565 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java
@@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.enums.PrivateStoreType;
 import com.l2jmobius.gameserver.model.TradeList;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSetWholeMsg;
 import com.l2jmobius.gameserver.network.serverpackets.PrivateStoreManageListSell;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
index 7e8fec091d..f621997945 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.PrivateStoreMsgBuy;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
index ef908c6e68..e3a762df8e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.PrivateStoreMsgSell;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
index 836064cfba..a481bc0025 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSetWholeMsg;
 import com.l2jmobius.gameserver.util.Util;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SnoopQuit.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SnoopQuit.java
index 3ed10ec980..bca137fffa 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SnoopQuit.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SnoopQuit.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/StartRotating.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/StartRotating.java
index 1db350d3f3..f8f85742e7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/StartRotating.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/StartRotating.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.StartRotation;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java
index 9b9e205e17..c4fad94c0e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java
@@ -21,8 +21,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.TradeList;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 
 /**
  * This packet manages the trade response.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index c51b93bada..3b54bb50bb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -27,8 +27,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.skills.AbnormalType;
 import com.l2jmobius.gameserver.model.skills.BuffInfo;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.SendTradeRequest;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
index b9371e4034..99914f44fc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -37,8 +37,8 @@ import com.l2jmobius.gameserver.model.holders.ItemSkillHolder;
 import com.l2jmobius.gameserver.model.items.L2EtcItem;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
index 06a2805d74..4dbabe7528 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
@@ -21,7 +21,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
 import com.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityList.java
index b908b8ee9d..d83cfc8b0d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityList.java
@@ -18,8 +18,8 @@ package com.l2jmobius.gameserver.network.clientpackets.ability;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.ability.ExAcquireAPSkillList;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityWndClose.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityWndClose.java
index c48cf8c422..24accfb7f5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityWndClose.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityWndClose.java
@@ -18,8 +18,8 @@ package com.l2jmobius.gameserver.network.clientpackets.ability;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.ability.ExAcquireAPSkillList;
 import com.l2jmobius.gameserver.network.serverpackets.ability.ExCloseAPListWnd;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityWndOpen.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityWndOpen.java
index c7f797ad2c..3d5dea3364 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityWndOpen.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityWndOpen.java
@@ -18,8 +18,8 @@ package com.l2jmobius.gameserver.network.clientpackets.ability;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.ability.ExAcquireAPSkillList;
 import com.l2jmobius.gameserver.network.serverpackets.ability.ExShowAPListWnd;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
index 46a5c4e7bb..8b27f71061 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
@@ -30,8 +30,8 @@ import com.l2jmobius.gameserver.model.L2SkillLearn;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 import com.l2jmobius.gameserver.model.skills.Skill;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.ability.ExAcquireAPSkillList;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestChangeAbilityPoint.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestChangeAbilityPoint.java
index 0dfa0920aa..b2697ae326 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestChangeAbilityPoint.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestChangeAbilityPoint.java
@@ -22,8 +22,8 @@ import com.l2jmobius.gameserver.data.xml.impl.AbilityPointsData;
 import com.l2jmobius.gameserver.enums.UserInfoType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
index 45ea1ee32d..2550a84f2b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
@@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.model.L2SkillLearn;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent;
 import com.l2jmobius.gameserver.model.skills.Skill;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.ability.ExAcquireAPSkillList;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java
index 5a6853a1fe..3e24b337b5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java
@@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.model.L2CommandChannel;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.AdenaDistributionRequest;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.adenadistribution.ExDivideAdenaCancel;
 import com.l2jmobius.gameserver.network.serverpackets.adenadistribution.ExDivideAdenaDone;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaCancel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaCancel.java
index bd5e067877..ad62bcdb9b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaCancel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaCancel.java
@@ -21,8 +21,8 @@ import java.util.Objects;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.AdenaDistributionRequest;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.adenadistribution.ExDivideAdenaCancel;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java
index 673bbd1d32..70a3f4ac53 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdenaStart.java
@@ -23,8 +23,8 @@ import com.l2jmobius.gameserver.model.L2CommandChannel;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.AdenaDistributionRequest;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.adenadistribution.ExDivideAdenaStart;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java
index 8dfdecaeeb..414e817ffe 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java
@@ -28,8 +28,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.alchemy.AlchemyCraftData;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.alchemy.ExAlchemyConversion;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java
index 611829c114..dad7c7aefa 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java
@@ -32,8 +32,8 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
 import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.CommonSkill;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
index e71310cc25..1292310530 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExCancelShape_Shifting_Item.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets.appearance;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.appearance.ExShapeShiftingResult;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
index ace7358a2d..57062be3e6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java
@@ -28,8 +28,8 @@ import com.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.ArmorType;
 import com.l2jmobius.gameserver.model.items.type.WeaponType;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.appearance.ExPutShapeShiftingExtractionItemResult;
 import com.l2jmobius.gameserver.network.serverpackets.appearance.ExShapeShiftingResult;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
index 1471a0e731..a504a61d23 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java
@@ -29,8 +29,8 @@ import com.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.ArmorType;
 import com.l2jmobius.gameserver.model.items.type.WeaponType;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.appearance.ExPutShapeShiftingTargetItemResult;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
index 2075c7e6cd..e39eb6b752 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java
@@ -31,8 +31,8 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.ArmorType;
 import com.l2jmobius.gameserver.model.items.type.WeaponType;
 import com.l2jmobius.gameserver.model.variables.ItemVariables;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount;
 import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/awakening/RequestCallToChangeClass.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/awakening/RequestCallToChangeClass.java
index a46fb4b75a..6d12134ef4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/awakening/RequestCallToChangeClass.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/awakening/RequestCallToChangeClass.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerCallToChangeClass;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestCancelCuriousHouse.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestCancelCuriousHouse.java
index 83d33d1ed0..d97d3e7342 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestCancelCuriousHouse.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestCancelCuriousHouse.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.CeremonyOfChaosState;
 import com.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.ceremonyofchaos.ExCuriousHouseState;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestCuriousHouseHtml.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestCuriousHouseHtml.java
index 907546a629..35f2dfac42 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestCuriousHouseHtml.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestCuriousHouseHtml.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.CeremonyOfChaosState;
 import com.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestJoinCuriousHouse.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestJoinCuriousHouse.java
index d480d3a219..133a5cd55f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestJoinCuriousHouse.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ceremonyofchaos/RequestJoinCuriousHouse.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.CeremonyOfChaosState;
 import com.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.ceremonyofchaos.ExCuriousHouseState;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
index 65a7a49e25..5529ae6a95 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyInfo.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.CommissionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.commission.CommissionItem;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
 import com.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyInfo;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
index 901bb92c3d..1456b0e535 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionBuyItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets.commission;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.CommissionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionCancel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionCancel.java
index dd1dcb1e69..779714555b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionCancel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionCancel.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets.commission;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
index 2f35e51b9d..d766c205d7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionDelete.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets.commission;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.CommissionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
index 3a7e0f0fae..c2660c17d8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.CommissionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
 import com.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionInfo;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
index 322290470d..b651077122 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.commission.CommissionItemType;
 import com.l2jmobius.gameserver.model.commission.CommissionTreeType;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
index 8af29ce248..8cf9b2f3b5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegister.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets.commission;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.CommissionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
index 7921a2b8f8..6e0a58e1df 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegisteredItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets.commission;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.CommissionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
index edafc763cc..2443a06b05 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionRegistrableItemList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets.commission;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.instancemanager.CommissionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission;
 import com.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionItemList;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantClose.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantClose.java
index 566c6fb9d8..584ee24910 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantClose.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantClose.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets.compound;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.CompoundRequest;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
index 80103f1c3f..198dcb3bc5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.CompoundRequest;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
 import com.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneOK;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 9b68cc1357..9bb1e53e8c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.CompoundRequest;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
 import com.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantTwoFail;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index cc04434c82..ff8f8f6d0f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.CompoundRequest;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
 import com.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneRemoveFail;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 67110e0494..4dc693ce07 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.CompoundRequest;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
 import com.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantTwoRemoveFail;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index ffdb5b3c83..2143d745d5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -21,8 +21,8 @@ import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.CompoundRequest;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantFail;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
index 6c7d05f40f..313f80f00a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java
@@ -29,8 +29,8 @@ import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
 import com.l2jmobius.gameserver.model.skills.CommonSkill;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.crystalization.ExGetCrystalizingEstimation;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeItemCancel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeItemCancel.java
index 1cb8150d3a..4f9a14a746 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeItemCancel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeItemCancel.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets.crystalization;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java
index ab94981a40..bc5977368e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.DailyMissionData;
 import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoList.java
index 30f343eee4..11a8e5e05a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets.dailymission;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoListHTML.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoListHTML.java
index 08c0042f01..baca1e62a2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoListHTML.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoListHTML.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets.dailymission;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java
index ae74b0fb95..f6719c9593 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java
@@ -27,8 +27,8 @@ import com.l2jmobius.gameserver.model.ensoul.EnsoulStone;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.AbnormalType;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.ensoul.ExEnsoulResult;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java
index 8795994416..7dc7faf77a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java
@@ -23,8 +23,8 @@ import java.util.logging.Level;
 import com.l2jmobius.commons.database.DatabaseFactory;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.friend.FriendAddRequestResult;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java
index 9c0d478e54..faeca65fce 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDel.java
@@ -25,8 +25,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.friend.FriendRemove;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
index 7b3fc542c9..61de79e8d1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendDetailInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets.friend;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.friend.ExFriendDetailInfo;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java
index 851d3ad99c..4fa25283a7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java
@@ -21,8 +21,8 @@ import com.l2jmobius.gameserver.model.BlockList;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.friend.FriendAddRequest;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendList.java
index d288755af8..889105af7b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendList.java
@@ -20,8 +20,8 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestSendFriendMsg.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestSendFriendMsg.java
index 74f28360e4..efbaba2244 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestSendFriendMsg.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestSendFriendMsg.java
@@ -22,8 +22,8 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.L2FriendSay;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java
index 510552bded..72f40dcba6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets.luckygame;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.luckygame.ExBettingLuckyGameResult;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
index 3313e3ba9a..ec5e7516a8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java
@@ -28,8 +28,8 @@ import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerMenteeAdd;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.mentoring.ExMentorList;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java
index 6b3592badb..9e3aecbff4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java
@@ -19,8 +19,8 @@ package com.l2jmobius.gameserver.network.clientpackets.mentoring;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.mentoring.ExMentorAdd;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
index e4e433e983..fe294d1cdd 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeWaitingList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets.mentoring;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.mentoring.ListMenteeWaiting;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java
index c9a6911863..3470d994ed 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorCancel.java
@@ -25,8 +25,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerMenteeLeft;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerMenteeRemove;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
index 430ea02718..25ef98531e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMentorList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets.mentoring;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.mentoring.ExMentorList;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java
index 094181de1b..191278ff3b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusOpen.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets.pledgebonus;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.pledgebonus.ExPledgeBonusOpen;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java
index 4880d6a4fb..c51d4f158a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusReward.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 import com.l2jmobius.gameserver.model.pledge.ClanRewardBonus;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusRewardList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusRewardList.java
index 32addadc31..004ba3dc05 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusRewardList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/pledgebonus/RequestPledgeBonusRewardList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets.pledgebonus;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.pledgebonus.ExPledgeBonusList;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java
index bc2060e2d7..b1bc12cefd 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.request.PrimeShopRequest;
 import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import com.l2jmobius.gameserver.model.primeshop.PrimeShopGroup;
 import com.l2jmobius.gameserver.model.primeshop.PrimeShopItem;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRBuyProduct;
 import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRBuyProduct.ExBrProductReplyType;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
index 2ecc681886..8ac27a74b5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRGamePoint.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets.primeshop;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRGamePoint;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductInfo.java
index 9f3fe092de..4dd1225bb8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductInfo.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets.primeshop;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.PrimeShopData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java
index 034ef91cd6..a7553a343f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRProductList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets.primeshop;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.data.xml.impl.PrimeShopData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductList;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
index ab68161fa4..8695b02533 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRRecentProductList.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets.primeshop;
 
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMove.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMove.java
index 953d1ef6b5..2860f8a83a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMove.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMove.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets.sayune;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.SayuneRequest;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
index 9c9233f179..4ddb30ba78 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/sayune/RequestFlyMoveStart.java
@@ -25,8 +25,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.request.SayuneRequest;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 import com.l2jmobius.gameserver.model.zone.type.L2SayuneZone;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/CannotMoveAnymoreInShuttle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/CannotMoveAnymoreInShuttle.java
index df6850913e..d0df1130cd 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/CannotMoveAnymoreInShuttle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/CannotMoveAnymoreInShuttle.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets.shuttle;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.shuttle.ExStopMoveInShuttle;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java
index d8bcf542a4..6618604c29 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.type.WeaponType;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import com.l2jmobius.gameserver.network.serverpackets.shuttle.ExMoveToLocationInShuttle;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOff.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOff.java
index f1ad241376..d067ce01ae 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOff.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOff.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.clientpackets.shuttle;
 
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java
index 26146bc27a..4c9c106a52 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2ShuttleInstance;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/AuthRequest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/AuthRequest.java
similarity index 96%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/AuthRequest.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/AuthRequest.java
index 915e8b2de4..19a02c43f2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/AuthRequest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/AuthRequest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.gameserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.gameserverpackets;
 
 import java.util.List;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/BlowFishKey.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/BlowFishKey.java
similarity index 95%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/BlowFishKey.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/BlowFishKey.java
index 102f47a1bc..86d62d842b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/BlowFishKey.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/BlowFishKey.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.gameserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.gameserverpackets;
 
 import java.security.interfaces.RSAPublicKey;
 import java.util.logging.Level;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangeAccessLevel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/ChangeAccessLevel.java
similarity index 93%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangeAccessLevel.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/ChangeAccessLevel.java
index 7d4b00ca84..7be706615e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangeAccessLevel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/ChangeAccessLevel.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.gameserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.gameserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseSendablePacket;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangePassword.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/ChangePassword.java
similarity index 94%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangePassword.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/ChangePassword.java
index 20dd738c0e..49b72425ba 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/ChangePassword.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/ChangePassword.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.gameserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.gameserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseSendablePacket;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerAuthRequest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/PlayerAuthRequest.java
similarity index 94%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerAuthRequest.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/PlayerAuthRequest.java
index 49a6bc79bd..ab5762b530 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerAuthRequest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/PlayerAuthRequest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.gameserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.gameserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseSendablePacket;
 import com.l2jmobius.gameserver.LoginServerThread.SessionKey;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerInGame.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/PlayerInGame.java
similarity index 94%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerInGame.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/PlayerInGame.java
index 4fc1ca9b90..1e83a03ad5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerInGame.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/PlayerInGame.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.gameserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.gameserverpackets;
 
 import java.util.List;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerLogout.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/PlayerLogout.java
similarity index 93%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerLogout.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/PlayerLogout.java
index 8766ce9093..28ea007c73 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerLogout.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/PlayerLogout.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.gameserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.gameserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseSendablePacket;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerTracert.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/PlayerTracert.java
similarity index 94%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerTracert.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/PlayerTracert.java
index 78238e5058..d53d863ed8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/PlayerTracert.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/PlayerTracert.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.gameserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.gameserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseSendablePacket;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/ReplyCharacters.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/ReplyCharacters.java
similarity index 94%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/ReplyCharacters.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/ReplyCharacters.java
index 5f99428094..2fa9caf055 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/ReplyCharacters.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/ReplyCharacters.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.gameserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.gameserverpackets;
 
 import java.util.List;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/SendMail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/SendMail.java
similarity index 93%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/SendMail.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/SendMail.java
index e41ae65499..5208205578 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/SendMail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/SendMail.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.gameserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.gameserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseSendablePacket;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/ServerStatus.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/ServerStatus.java
similarity index 97%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/ServerStatus.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/ServerStatus.java
index 48a6ec2d61..cc9482b58c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/ServerStatus.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/ServerStatus.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.gameserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.gameserverpackets;
 
 import java.util.ArrayList;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/TempBan.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/TempBan.java
similarity index 94%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/TempBan.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/TempBan.java
index 605b3c0f83..c1a2d6ad5f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/gameserverpackets/TempBan.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/gameserverpackets/TempBan.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.gameserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.gameserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseSendablePacket;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/AuthResponse.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/AuthResponse.java
similarity index 94%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/AuthResponse.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/AuthResponse.java
index c072cda24b..45f76310ed 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/AuthResponse.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/AuthResponse.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.loginserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.loginserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseRecievePacket;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/ChangePasswordResponse.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/ChangePasswordResponse.java
similarity index 94%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/ChangePasswordResponse.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/ChangePasswordResponse.java
index 915c60f532..9c9740a359 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/ChangePasswordResponse.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/ChangePasswordResponse.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.loginserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.loginserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseRecievePacket;
 import com.l2jmobius.gameserver.model.L2World;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/InitLS.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/InitLS.java
similarity index 93%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/InitLS.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/InitLS.java
index 0818b71199..698eaeaa30 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/InitLS.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/InitLS.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.loginserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.loginserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseRecievePacket;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/KickPlayer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/KickPlayer.java
similarity index 93%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/KickPlayer.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/KickPlayer.java
index ea2e2a10ef..586795ecbb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/KickPlayer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/KickPlayer.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.loginserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.loginserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseRecievePacket;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/LoginServerFail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/LoginServerFail.java
similarity index 94%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/LoginServerFail.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/LoginServerFail.java
index 236db3e567..14208b2231 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/LoginServerFail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/LoginServerFail.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.loginserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.loginserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseRecievePacket;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/PlayerAuthResponse.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/PlayerAuthResponse.java
similarity index 94%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/PlayerAuthResponse.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/PlayerAuthResponse.java
index 32c4e12a47..6426471763 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/PlayerAuthResponse.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/PlayerAuthResponse.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.loginserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.loginserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseRecievePacket;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/RequestCharacters.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/RequestCharacters.java
similarity index 93%
rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/RequestCharacters.java
rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/RequestCharacters.java
index 636475e979..5d28bf9187 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserverpackets/RequestCharacters.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/loginserver/loginserverpackets/RequestCharacters.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jmobius.gameserver.network.loginserverpackets;
+package com.l2jmobius.gameserver.network.loginserver.loginserverpackets;
 
 import com.l2jmobius.commons.util.network.BaseRecievePacket;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java
index 126d5a9a3a..266cd79d89 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java
@@ -22,7 +22,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.skills.BuffInfo;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class AbnormalStatusUpdate implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java
index fce31567c6..49afb56b1d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2TrapInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public abstract class AbstractNpcInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillDone.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillDone.java
index 9a3ba64535..2223f886be 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillDone.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillDone.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Kerberos
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
index 7927411c02..d1d4d6158d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.L2SkillLearn;
 import com.l2jmobius.gameserver.model.base.AcquireSkillType;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
 import com.l2jmobius.gameserver.model.skills.CommonSkill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Acquire Skill Info server packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
index 291294514c..fd5b816610 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.L2SkillLearn;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ActionFailed.java
index 5dd0aec4ae..5da84d0142 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ActionFailed.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ActionFailed.java
@@ -21,7 +21,7 @@ import java.util.Map;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.skills.SkillCastingType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class ActionFailed implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java
index b5b6334156..b28f54fc31 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.residences.AbstractResidence;
 import com.l2jmobius.gameserver.model.residences.ResidenceFunctionType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Steuf, UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java
index 695315b250..aca4d1dd6a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.model.ClanInfo;
 import com.l2jmobius.gameserver.model.L2Clan;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.clientpackets.RequestAllyInfo;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AllyCrest.java
index 7ba8fb110e..ce65da985e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AllyCrest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AllyCrest.java
@@ -20,7 +20,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.sql.impl.CrestTable;
 import com.l2jmobius.gameserver.model.L2Crest;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class AllyCrest implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java
index be00859ad1..12db3acd75 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class AskJoinAlly implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java
index 06674260ab..32f8419075 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.PartyDistributionType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class AskJoinParty implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
index 6dc414e53e..76395bdf2c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class AskJoinPledge implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Attack.java
index 710f0a2960..3555a8af01 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Attack.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Attack.java
@@ -24,7 +24,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Hit;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class Attack implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java
index 2ac4d9d1f4..ea29bdb450 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class AutoAttackStart implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java
index ab9d253200..4ede1846f8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class AutoAttackStop implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java
index 3a4418e19e..1a3ea7541b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/BuyList.java
index a421294f40..7102d9ae4e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/BuyList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/BuyList.java
@@ -22,7 +22,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.buylist.L2BuyList;
 import com.l2jmobius.gameserver.model.buylist.Product;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class BuyList extends AbstractItemPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java
index ef9bc9144e..d71f2258ec 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java
@@ -22,7 +22,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.CastleManorManager;
 import com.l2jmobius.gameserver.model.SeedProduction;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author l3x
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java
index f5ef6f65cf..8b91cc7e9a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class CSShowComBoard implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CameraMode.java
index a8890aec95..78fa039b72 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CameraMode.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CameraMode.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class CameraMode implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChairSit.java
index 54cb153c75..589cfcde1a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChairSit.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChairSit.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ChairSit implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java
index 5f01179f5e..4f6577f6f9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ChangeMoveType implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java
index 92dba78cb8..bc775a54c1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ChangeWaitType implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java
index 55b837b615..58cc0025ef 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class CharCreateFail implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java
index d3a0900350..3e46ba4b9a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class CharCreateOk implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java
index 896ffe0f56..ea02729615 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class CharDeleteFail implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharDeleteSuccess.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharDeleteSuccess.java
index 6c98cdf7a3..fee446f4ea 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharDeleteSuccess.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharDeleteSuccess.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class CharDeleteSuccess implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharInfo.java
index 9a71afd295..7c52b162b6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharInfo.java
@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.interfaces.ILocational;
 import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class CharInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharSelected.java
index b68b70df65..b678a87264 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharSelected.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharSelected.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class CharSelected implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java
index 01b4417470..e2a93df13a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java
@@ -33,8 +33,8 @@ import com.l2jmobius.gameserver.model.CharSelectInfoPackage;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.L2GameClient;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class CharSelectionInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java
index 629b6799cc..6d2f5188ae 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class ChooseInventoryItem implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java
index d010f50162..f85e2a24c0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.GameTimeController;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ClientSetTime implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java
index 0881eec8e1..4be9299d28 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java
@@ -17,8 +17,8 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
 
 /**
  * ConfirmDlg server packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
index e777e518c5..2170ef2e94 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
@@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.instancemanager.MentorManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.NpcStringId;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
 
 public final class CreatureSay implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DeleteObject.java
index 1649ba7f5e..68f8bb73db 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DeleteObject.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DeleteObject.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class DeleteObject implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Dice.java
index 2d65cdcd31..fc69b65627 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Dice.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Dice.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class Dice implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Die.java
index d9c2fa1e57..065cbbe471 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Die.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Die.java
@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.L2SiegeClan;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.entity.Castle;
 import com.l2jmobius.gameserver.model.entity.Fort;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid, Nos
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DoorInfo.java
index d0acc620a4..9042d893b2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DoorInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DoorInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class DoorInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java
index 15a72606f5..57d0ab8704 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class DoorStatusUpdate implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
index db69aee6fc..e71b29cd3f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/DropItem.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class DropItem implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Earthquake.java
index b83fcfe4ef..21fd7c2eb1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Earthquake.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Earthquake.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.interfaces.ILocational;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class Earthquake implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/EnchantResult.java
index e298f80bb9..0a964248dc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/EnchantResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/EnchantResult.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class EnchantResult implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java
index 09b900c8ad..6b54fbb5a3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Luca Baldi
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java
index cdddadd7dc..81e8370506 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java
index 04ba522a4e..60e2fc58c1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java
index 1d42ba10e4..bdb629ffb7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java
index 41404799d9..940282a8ca 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.skills.BuffInfo;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java
index 383bf14e2b..0df9e15c5c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java
@@ -21,7 +21,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2SkillLearn;
 import com.l2jmobius.gameserver.model.base.AcquireSkillType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
index bc76861fe7..73c7b5c762 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.L2SkillLearn;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java
index 7b72ce7354..10d2a003d0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java
index d863581af4..479a18b273 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2AirShipInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExAirShipInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java
index 96a3ec84b5..5992f29a31 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2AirShipInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExAirShipStopMove implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java
index 3147431326..b9391cebe4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.VehiclePathPoint;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExAirShipTeleportList implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java
index 73407a08e3..3ed754c1b6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.CommonSkill;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java
index f56f6ccc32..e973bd9962 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java
index e9328a11ed..16e681f959 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java
index 8313577f46..dbc6be230d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Asks the player to join a CC
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java
index a6fbcf36ff..7657850be1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java
index eeab02ef1c..4d19a62388 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.PartyDistributionType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java
index c1fd2abf06..659b1bffe7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.AttributeType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExAttributeEnchantResult implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java
index a820b7b70d..743c750b80 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExAutoSoulShot implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java
index bb791bfb49..0343c5707c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
index b044f30070..5ad4281020 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java
index 9b7976d63d..cb22523147 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.data.xml.impl.BeautyShopData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.beautyshop.BeautyData;
 import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java
index 380605b897..e7324e6f55 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java
index 06d4f21ccb..8e8f578b20 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Special event info packet.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java
index d09487798e..7caeb86871 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Eva's Inferno event packet. info params: <br>
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java
index 668e168a76..5cd8d6538f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Halloween rank list server packet.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java
index d727fd688e..18077c2a02 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author GodKratos
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java
index 6f31f95203..ba31f33703 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author ShanSoft
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCastleState.java
index 42d4eafa92..4eb3677066 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCastleState.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCastleState.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.CastleSide;
 import com.l2jmobius.gameserver.model.entity.Castle;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java
index 5705831cf1..54c1ad041b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java
index 47c208e615..f26c01d3f3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java
index 4f08a3b8d5..aded859dbc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Migi
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java
index a5aec58a1a..f57435ce44 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
index 1f5944110a..d787762401 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.enums.AttributeType;
 import com.l2jmobius.gameserver.model.Elementals;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Kerberos
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java
index 5966c4db3a..06b0ba8c25 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Close the CommandChannel Information window
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java
index d63674286d..8f1093d5b8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java
index 9df66369d3..74b0c65fd4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO & UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java
index 579882635f..3cacc39dc1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExConnectedTimeAndGettableReward.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java
index 9d9937be57..4d02d86f77 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java
index 191d87adfb..bf396cf542 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java
index 0241dee4d9..648d6a880a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java
index 760ee42184..76cca43238 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java
index b136754fed..1ef7c99ea4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Close Minigame Waiting List
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java
index 8b160e1d15..5fb5ca9659 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * *
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java
index a59c9b2e80..55451f2647 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java
index 1fe0487ce9..d0c77791ea 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java
index f9a8ec0586..ef83945d0e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Show Confirm Dialog for 10 seconds
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java
index f8ecdd5551..bc19578f6f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java
index bfcbf6f2e7..3ffc18c39f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java
@@ -20,7 +20,7 @@ import java.util.Set;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java
index ac9749ecfc..a5f6edcbda 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Format: (ch) d[ddddd]
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java
index 09eb6094ae..7cbaa35b75 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java
index 77d00f0abe..6e2e174067 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java
index 2305cd36dc..23c29a32d7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java
index c1884edbd2..18c0640433 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java
index 1e9a33ccea..6c51950a25 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java
index 36660c9a65..c0a5b09832 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java
index 971be8090b..392aad3470 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java
@@ -20,7 +20,7 @@ import java.util.Set;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.xml.impl.EnchantSkillGroupsData;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class ExEnchantSkillInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java
index 2dff1f3b06..16c8a6e1e4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.EnchantSkillHolder;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java
index 8f94a26995..aa243d1d2b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java
@@ -22,7 +22,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.SkillEnchantType;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExEnchantSkillList implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java
index 0be0470780..fab71bb0c1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java
index e4cdc2ad10..c63284ff09 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author janiii
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java
index 44a9a0a600..9f3b2485bc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.TeleportBookmark;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author ShanSoft
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java
index 31135ae485..817548dc24 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java
index 271fcb5fbe..22c3b9a2aa 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExGetOffAirShip implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java
index 68f2346c72..0e733d30d3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExGetOnAirShip implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java
index 16a5abfd4f..22054e5bff 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java
@@ -22,7 +22,7 @@ import java.util.Map.Entry;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2PremiumItem;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExHeroList.java
index 7337071694..3db62f7478 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExHeroList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExHeroList.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-, KenM, godson
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
index 3a92a065d9..236eacb7ef 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java
@@ -24,7 +24,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java
index ee77cf0a75..745741a587 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
index da251ce7cd..3b4750cac9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuction;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionBid;
 import com.l2jmobius.gameserver.model.itemauction.ItemAuctionState;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Forsaiken
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java
index ae8d15ef96..62034a58c9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java
@@ -22,7 +22,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java
index 2431afdf66..c62ebea0ba 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java
@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.instancezone.Instance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java
index c7e5a32911..32678622e8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Party;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author chris_00
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java
index 7b4fe40dfd..57a26269e5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import java.util.Set;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java
index 3600ab6401..221ba0c511 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.matching.CommandChannelMatchingRoom;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java
index 276b62b123..28f3e4f581 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.enums.MatchingMemberType;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.CommandChannelMatchingRoom;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java
index 607c10acdd..48ca6e8fbb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author chris_00
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java
index cd0207167a..b99a57431f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java
index a9de97f96d..c5b046b829 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * (just a trigger)
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java
index 7e4e312167..e3eecc3830 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.enums.MatchingMemberType;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.CommandChannelMatchingRoom;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java
index 4a4b1714a9..e3644729ee 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExMoveToLocationAirShip implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java
index e6d3c724dc..1fdaab1ff0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExMoveToLocationInAirShip implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java
index 3346bdc088..0c93d76469 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java
@@ -21,7 +21,7 @@ import java.util.Objects;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2CommandChannel;
 import com.l2jmobius.gameserver.model.L2Party;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author chris_00
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java
index 8f829eb730..65f27bc1cc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Dialog with input field<br>
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java
index e65f0bd84f..a3eed022d7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mochitto
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java
index 0387e1da84..bbbba611ff 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mochitto
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java
index a42792cb65..7389856aca 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mochitto
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java
index 3fc70df036..fca19d4b34 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java
index 4ba8160c12..5cc919610d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Migi
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java
index 5fc61de543..9828774880 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Migi
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java
index 2d9d0e0fce..92ab238d5d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java
index 72adf358a3..e20dde9079 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author GodKratos
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java
index 6016a32b17..1033d30bda 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.olympiad.OlympiadGameClassed;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameNonClassed;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameTask;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java
index f5795893b4..3b91a673cc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadInfo;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java
index b5232e4597..281d52c939 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author godson
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java
index 2eb65e5819..cb53954424 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.BuffInfo;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author godson
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java
index 1a49be6831..eb005e50b3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.olympiad.Participant;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author godson
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java
index 7432befe4f..3c73d97ea3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Opens the CommandChannel Information window
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java
index 436cc8f1da..e3ebe2a755 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java
index cb0be6a4b3..5d1c6da5bb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Summon;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java
index 94a96d4c63..00afbb85db 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Summon;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java
index 5a3bd7c8fb..9bead09ba6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Summon;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java
index 087b455ca4..861d2ad9a5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.instancemanager.MapRegionManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.PartyMatchingRoom;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
index 05dc405f2f..e722c29595 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java
index e96c20491c..ac0a36706a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author devScarlet, mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java
index ac7b5b42f8..8d9eb3817b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Clan;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java
index a81ce61dcf..d826fb8783 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java
index 7f5f6518a1..944c9e7510 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-, Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java
index f15aae4b12..21d4c49669 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.ClanEntryStatus;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java
index 625cc8bfa2..647730765f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java
index 24d99e1bf2..cdec29a9ef 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java
@@ -21,7 +21,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java
index 69279ec7a9..905e3be7f2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java
index f2052b67bb..b10e617caf 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java
index 0b5bee846b..0417f0c4c4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java
index 549c5ccd0e..aaf9434224 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java
index 7f39a21c3f..195e22f2af 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java
index e30f840b88..6463dc39f6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java
index 7b338e4f8c..ddde3ddb06 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExPutCommissionResultForVariationMake implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java
index 45d2c57852..7ee6462c96 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java
index 75bcabeb29..87d1bfaef4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author nBd
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java
index 5820b0daff..c4e3fe3f4f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author nBd
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
index eb0e0c7dd6..d200f17e71 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java
index de9ca50200..362df12b76 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java
index 4eda11d08f..14e5b96f9a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExPutItemResultForVariationMake implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java
index 4a0f423d95..1d7471ea96 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java
index 68783d6cf1..b0adb055f8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java
@@ -22,7 +22,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.holders.NpcLogListHolder;
 import com.l2jmobius.gameserver.network.NpcStringId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRedSky.java
index da73dc75cc..10247a5590 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRedSky.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRedSky.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java
index e10f512697..3f7532ecd0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExRegenMax implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java
index 58bb664470..4e52283f99 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java
index 87aa7a7ffa..b3dc06f6fb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Migi, DS
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java
index 184bbdac3f..36ef7cd289 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java
@@ -23,8 +23,8 @@ import com.l2jmobius.gameserver.enums.MailType;
 import com.l2jmobius.gameserver.model.entity.Message;
 import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
 
 /**
  * @author Migi, DS
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java
index 262073caf7..03c64d3f83 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.entity.Message;
 import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Migi, DS
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java
index 6788a20427..e7705ec147 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java
index bfca335a27..1ab017b2ba 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Trigger packet
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java
index a74e0a49d7..e00284aeb8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.xml.impl.BeautyShopData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.beautyshop.BeautyItem;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java
index b26c7dd7d0..6f7f0b6f68 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java
index a70f764035..97b2b38df2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
index d6c541d4c8..6b1544026d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRestartClient.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRotation.java
index 4ae9f0d19b..24910c1213 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRotation.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRotation.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java
index f59aa368fd..518534cf0c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java
index c32738b3e0..a6631ee9d6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java
index ba9893e723..f2191332ff 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.CastleManager;
 import com.l2jmobius.gameserver.model.entity.Castle;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author l3x
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java
index aa32de35e7..91b8d28cb2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java
@@ -22,7 +22,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.NpcStringId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExSendUIEvent implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
index f16221c3b8..814f720fff 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.interfaces.ILocational;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * A packet used to draw points and lines on client.<br/>
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java
index e50458d017..3bb79c33fa 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java
index a1e12201de..5933b0d8d1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.PartyDistributionType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java
index 312d6d80c4..2549e9b453 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java
index 24f676c607..75f57ff4bc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
 import com.l2jmobius.gameserver.model.entity.ClanHall;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java
index a2a62d0edd..1225d7fb53 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java
index 9bee4263be..fb63807bff 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java
index 5b1b4e6756..0616962b58 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.enums.TaxType;
 import com.l2jmobius.gameserver.instancemanager.CastleManager;
 import com.l2jmobius.gameserver.model.entity.Castle;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowChannelingEffect.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowChannelingEffect.java
index 888b858d6d..072167e67f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowChannelingEffect.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowChannelingEffect.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java
index ad9fbf6a2b..f7ecbcdd25 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java
@@ -20,7 +20,7 @@ import java.util.Set;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid, mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java
index c5be6e96a2..75b535a18e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.CastleManorManager;
 import com.l2jmobius.gameserver.model.CropProcure;
 import com.l2jmobius.gameserver.model.L2Seed;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author l3x
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java
index 729fbcebf9..8be8b98259 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java
@@ -24,7 +24,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.CastleManorManager;
 import com.l2jmobius.gameserver.model.CropProcure;
 import com.l2jmobius.gameserver.model.L2Seed;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author l3x
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java
index 4b0d8d0058..1751d72580 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.FortManager;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.entity.Fort;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java
index b4a169969a..c61f5cac27 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
 import com.l2jmobius.gameserver.model.FortSiegeSpawn;
 import com.l2jmobius.gameserver.model.L2Spawn;
 import com.l2jmobius.gameserver.model.entity.Fort;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * TODO: Rewrite!!!!!!
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java
index 82cb6a6165..53693bd214 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
 import com.l2jmobius.gameserver.model.FortSiegeSpawn;
 import com.l2jmobius.gameserver.model.entity.Fort;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * TODO: Rewrite!!!
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java
index 250d02bf9c..8516330479 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java
@@ -21,7 +21,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.CastleManorManager;
 import com.l2jmobius.gameserver.model.L2Seed;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author l3x
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java
index bf4254f50d..a03d9d6548 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.CastleManager;
 import com.l2jmobius.gameserver.instancemanager.CastleManorManager;
 import com.l2jmobius.gameserver.model.CropProcure;
 import com.l2jmobius.gameserver.model.entity.Castle;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author l3x
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java
index e12eb6af14..2573f34234 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Luca Baldi
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java
index 1b54a86794..c0e2a2ec8a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Luca Baldi
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java
index 50ecd960ec..f3c7ea361c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java
@@ -22,8 +22,8 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.MailType;
 import com.l2jmobius.gameserver.instancemanager.MailManager;
 import com.l2jmobius.gameserver.model.entity.Message;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
 
 /**
  * @author Migi, DS
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java
index 07b494ff0c..6ef0a5c34f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java
@@ -21,8 +21,8 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.network.NpcStringId;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
 
 /**
  * ExShowScreenMessage server packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java
index 0a913a3d5a..2b5b4acaad 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.CastleManorManager;
 import com.l2jmobius.gameserver.model.L2Seed;
 import com.l2jmobius.gameserver.model.SeedProduction;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author l3x
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java
index 232a30af1a..19fdbdaf4c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.GraciaSeedsManager;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExShowSeedMapInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java
index 711d3b1498..40c0360538 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java
@@ -24,7 +24,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.CastleManorManager;
 import com.l2jmobius.gameserver.model.L2Seed;
 import com.l2jmobius.gameserver.model.SeedProduction;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author l3x
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java
index f2ccac37a9..bd480631fb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.CropProcure;
 import com.l2jmobius.gameserver.model.L2Seed;
 import com.l2jmobius.gameserver.model.itemcontainer.PcInventory;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author l3x
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java
index 4414fe3464..2846408856 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java
@@ -21,7 +21,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.MailManager;
 import com.l2jmobius.gameserver.model.entity.Message;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Migi, DS
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java
index 356d838c53..0cb6b352d9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.interfaces.ILocational;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Note: <b>There is known issue with this packet, it cannot be removed unless game client is restarted!</b>
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java
index 8aceb15d4d..1e1675a448 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java
@@ -22,7 +22,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.interfaces.ILocational;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * This packet shows the mouse click particle for 30 seconds on every location.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java
index 90380f315c..3e08694a2c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java
index 9807d1e8fa..11725ab6a5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java
index d0fbc18a46..d4c110edc5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Trigger packet
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java
index 777e81a842..c2a68a8af0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java
index 39dc298e52..f1ecde5ff1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.Movie;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author JIV
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java
index 11d10de8e0..041b1f08f0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author kerberos
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java
index 082fb29bde..0255e85243 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * update 27.8.10
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java
index 687a89dae0..c7ca529d80 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.Movie;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author St3eT
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java
index d21aff53d4..1553cec46f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java
@@ -20,7 +20,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.stats.Stats;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-, KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java
index 1268301e9b..3631fb3334 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author VISTALL
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java
index 0fc0ff91b6..25fadff675 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.enums.SubclassInfoType;
 import com.l2jmobius.gameserver.enums.SubclassType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.base.SubClass;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java
index 21772ded32..ba5bcf8f2a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java
index 683036be09..c0b8089de7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUISetting.java
index 48fa6ee09b..cddfde583e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUISetting.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUISetting.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.ActionKey;
 import com.l2jmobius.gameserver.model.UIKeysSettings;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java
index 571621cf70..8accbd3627 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.MailManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java
index 7b12d386b8..3e3c3f715f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java
index 7bf29f94b8..ffaba85dda 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java
@@ -21,7 +21,7 @@ import java.util.Set;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java
index e32b1d2d4b..8ebc3a20c3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java
index 8951460464..45193eda4d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.InventorySlot;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.itemcontainer.PcInventory;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java
index 01fac5302f..2d690bc59c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java
index d5260a4d5e..b5cba413de 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * update 27.8.10
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java
index 9639b0a0e5..cf4d401555 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ExVariationCancelResult implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java
index 953fbdb45a..6321f41f79 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Format: (ch)ddd
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
index e26406e28d..0c65021560 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java
index 7b4fa58939..fc84b472ee 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author GodKratos
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java
index 3b5a1cedaf..c8e9533f63 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * ExVoteSystemInfo packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java
index 0a2e45b3f5..dffcf4df97 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java
index a056e9e0e2..b594a852b3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.interfaces.ILocational;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java
index b22e31ae8e..fedd67f5f0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class FriendAddRequest implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java
index a9d66ccf07..8627f9f930 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2Henna;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * This server packet sends the player's henna information using the Game Master's UI.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMHide.java
index 94124d958c..d098712edc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMHide.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMHide.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Kerberos
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
index a687398cb5..fa4191961a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.xml.impl.ExperienceData;
 import com.l2jmobius.gameserver.enums.AttributeType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class GMViewCharacterInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java
index 024080cd1e..323f5b91eb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class GMViewItemList extends AbstractItemPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java
index 8666f281fb..5bb92c1f67 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class GMViewPledgeInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java
index b7cfbb7a7d..56b85ff361 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class GMViewSkillInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java
index 6908e5d2a9..022dd9b1a0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class GMViewWarehouseWithdrawList extends AbstractItemPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java
index 0a05dcb82e..93588c387a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Lets drink to code!
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GetItem.java
index 11127810ba..185c1f8ede 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GetItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GetItem.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class GetItem implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java
index 78e458d7d0..9c62f951ed 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Maktakien
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java
index 621a6fdd2d..b3c01c164a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Maktakien
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java
index f9d259317f..d0380ca744 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.quest.QuestState;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Tempy
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
index d8c920fa2c..dd10c1edb5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.xml.impl.HennaData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2Henna;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Zoey76
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
index d640378fa0..7b71b43058 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2Henna;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * This server packet sends the player's henna information.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
index e067128c58..f1962a3fe8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2Henna;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Zoey76
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java
index 736500df43..7e8b67111c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2Henna;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Zoey76
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
index 36783f9dee..9d7a59b79d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.L2Henna;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Zoey76
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java
index 5e7209392a..8241d6a730 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java
@@ -21,7 +21,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.ItemInfo;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Advi, UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java
index 3ef5e70308..1db42fec5c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ItemList.java
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class ItemList extends AbstractItemPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/JoinParty.java
index 848563bac3..662cf13b19 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/JoinParty.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/JoinParty.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class JoinParty implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/JoinPledge.java
index 17bdf2cb73..0388d251ef 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/JoinPledge.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/JoinPledge.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class JoinPledge implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/KeyPacket.java
index e3c452115d..0173635d19 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/KeyPacket.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/KeyPacket.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class KeyPacket implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java
index ec76ba49d4..9f19ffe92f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Send Private (Friend) Message
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java
index df9fb55012..2a1e9759be 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/LeaveWorld.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class LeaveWorld implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java
index a4f927630a..f38beb7f99 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.MatchingRoomManager;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.matching.MatchingRoom;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/LoginFail.java
index 57e4852e56..79bc6eeaf2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/LoginFail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/LoginFail.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class LoginFail implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java
index 195b0c0f83..548b6eddb8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class MagicSkillCanceld implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 33495fd915..b433738c85 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -24,7 +24,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.skills.SkillCastingType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * MagicSkillLaunched server packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
index acfff1ed80..068575459b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
@@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.interfaces.IPositionable;
 import com.l2jmobius.gameserver.model.skills.SkillCastingType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * MagicSkillUse server packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java
index 8e4625d624..170a801c07 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Clan;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ManagePledgePower implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java
index 8c8c9329e7..d914a93df1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class MonRaceInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java
index 29f941d2e1..36177bd897 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class MoveToLocation implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
index 9e9dd18bbf..ed1cf8e894 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Maktakien
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
index be55784390..87027a8c60 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class MoveToPawn implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
index f3e5788121..680635eab4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.multisell.Entry;
 import com.l2jmobius.gameserver.model.multisell.Ingredient;
 import com.l2jmobius.gameserver.model.multisell.ItemInfo;
 import com.l2jmobius.gameserver.model.multisell.ListContainer;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class MultiSellList implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java
index 19b3228591..e31f5d0654 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2ControllableAirShipInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * MyTargetSelected server packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java
index a34b9c62ac..cbe2029f74 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.templates.L2PcTemplate;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class NewCharacterSuccess implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java
index 9472a1459f..2afaad8bb9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author devScarlet
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NormalCamera.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NormalCamera.java
index 8f08b826d4..3129ba42d0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NormalCamera.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NormalCamera.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class NormalCamera implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java
index 75c21ff660..6bff4234ba 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.HtmlActionScope;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * NpcHtmlMessage server packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
index d3bf66b8e2..1b5dbd9e4e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2GuardInstance;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
 import com.l2jmobius.gameserver.network.NpcStringId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java
index 83ab401847..861650da77 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java
@@ -21,7 +21,7 @@ import java.util.Set;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java
index 96d637db66..3c82e796b5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.HtmlActionScope;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * NpcQuestHtmlMessage server packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcSay.java
index 6edd7d819d..b72858e0bd 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcSay.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/NpcSay.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.network.NpcStringId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Kerberos
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ObservationMode.java
index 9f681e8ede..d14ccd07ac 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ObservationMode.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ObservationMode.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ObservationMode implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java
index dc901337b7..541abe32d0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ObservationReturn implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java
index 74abbab53c..cb19183999 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Gnacik, UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java
index a104f3efab..2820aba8f3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PackageToList.java
index 0304c9f6a9..a64ad8002f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PackageToList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PackageToList.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java
index 56f1679d0d..196ea3cdc3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author zabbix
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java
index d6ae21b9c6..41f597e61a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.matching.PartyMatchingRoom;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java
index e72f51b12a..f4989bfc72 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class PartySmallWindowAdd implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java
index db0b6cd2c1..9deef88e05 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class PartySmallWindowAll implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java
index 019327356b..356f96edc9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class PartySmallWindowDelete implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java
index e21104ed4a..ee09c9376c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class PartySmallWindowDeleteAll implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java
index 0fac6e1c6b..9e2a6e7e33 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.PartySmallWindowUpdateType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class PartySmallWindowUpdate extends AbstractMaskPacket<PartySmallWindowUpdateType>
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySpelled.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySpelled.java
index ebf048b5c3..cec10e15d6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySpelled.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PartySpelled.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.skills.BuffInfo;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PartySpelled implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetDelete.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetDelete.java
index 2f0bb5abb5..e290d8a24e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetDelete.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetDelete.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PetDelete implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetInfo.java
index 50f6cd8cfa..6b7c8085b2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetInfo.java
@@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 
 public class PetInfo implements IClientOutgoingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java
index f515a1fbbb..7fadc65c51 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java
@@ -21,7 +21,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.ItemInfo;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Yme, Advi, UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetItemList.java
index 833024d17c..b1c4141693 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetItemList.java
@@ -20,7 +20,7 @@ import java.util.Collection;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PetItemList extends AbstractItemPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java
index 4c6d90900c..f6e39cfee1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Summon;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Yme
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
index a9c639c46b..7094c60a19 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetitionVotePacket.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetitionVotePacket.java
index 61ed655f79..e2a22877f0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetitionVotePacket.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetitionVotePacket.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Plim
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PlaySound.java
index bc3727cd4d..9d6008477c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PlaySound.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PlaySound.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PlaySound implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java
index d3f45915d4..337bd848b3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java
@@ -20,7 +20,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.sql.impl.CrestTable;
 import com.l2jmobius.gameserver.model.L2Crest;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class PledgeCrest implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java
index e85a191371..ec49d356ce 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Clan;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PledgeInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
index be90a64bdb..6c75a2573c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Clan.RankPrivs;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PledgePowerGradeList implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
index ef9a92fb8d..a5f1cc702a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2ClanMember;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
index 276c350362..59885c6845 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2ClanMember;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
index 1515c3d878..f21611bb50 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2Clan.SubPledge;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java
index b5c6f85896..c1cfb3e917 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.ClanWar;
 import com.l2jmobius.gameserver.model.L2Clan;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
index d61c70f6e1..cd7edacf32 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Clan;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PledgeShowInfoUpdate implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
index 0ad24bf13d..9bb59f3a3d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class PledgeShowMemberListAdd implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
index 43f83c223d..5a8be32419 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2Clan.SubPledge;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PledgeShowMemberListAll implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
index 91ae341ff7..487cacae43 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PledgeShowMemberListDelete implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
index df7ad487d4..c5060749e7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PledgeShowMemberListDeleteAll implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
index 3b9f5de842..6632294bc4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2ClanMember;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
index 3ccc8136e5..9ef7d8e02d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java
index 20a8da3d91..5994789cd5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java
index 3b810bb107..299e50388e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Clan;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class PledgeStatusChanged implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java
index 09448aa40d..a8eda8659b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.TradeItem;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * This class ...
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java
index 0b9fc8a35a..9d13297acc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.instancemanager.SellBuffsManager;
 import com.l2jmobius.gameserver.model.TradeItem;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PrivateStoreListSell extends AbstractItemPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
index 42db03a6f8..73d1518278 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.TradeItem;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PrivateStoreManageListBuy extends AbstractItemPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
index 05c1b53814..ab8716c6ba 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.TradeItem;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PrivateStoreManageListSell extends AbstractItemPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java
index 7d7c45f808..26a10a9601 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PrivateStoreMsgBuy implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java
index 3d9d1963b2..5cb3991708 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class PrivateStoreMsgSell implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/QuestList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/QuestList.java
index fe6a4c1a44..b1051dff01 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/QuestList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/QuestList.java
@@ -22,7 +22,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.quest.QuestState;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class QuestList implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RadarControl.java
index 13de26ec14..43dd709dac 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RadarControl.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RadarControl.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class RadarControl implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java
index f2c1d9088c..e972857e29 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2RecipeList;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class RecipeBookItemList implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
index b4bbc5a36b..6397e049ac 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.xml.impl.RecipeData;
 import com.l2jmobius.gameserver.model.L2RecipeList;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class RecipeItemMakeInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java
index d1d5b3711f..95090c8f30 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class RecipeShopItemInfo implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java
index 129ceb58dc..3aa7b5c70c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2ManufactureItem;
 import com.l2jmobius.gameserver.model.L2RecipeList;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class RecipeShopManageList implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java
index 7285d70082..578df41b17 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class RecipeShopMsg implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
index accfe98cc8..8a6638e153 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2ManufactureItem;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class RecipeShopSellList implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
index de75e50fdc..617120ae6a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Playable;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Luca Baldi
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java
index 086aeed675..80a9cc4a15 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author nBd
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
index 1513cf8f08..14217018b3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class RestartResponse implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Revive.java
index 94c3b61074..81594fa7bc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Revive.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Revive.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class Revive implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ride.java
index 8c1165fac0..8862cfdce9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ride.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Ride.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class Ride implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SellList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SellList.java
index 80c5021b88..5415e5e497 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SellList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SellList.java
@@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2MerchantInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class SellList implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SellListProcure.java
index 30928d6df1..2f66f16ceb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SellListProcure.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SellListProcure.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.CastleManorManager;
 import com.l2jmobius.gameserver.model.CropProcure;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class SellListProcure implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SendMacroList.java
index 5f8a60d0a6..a8efb26487 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SendMacroList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SendMacroList.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.MacroUpdateType;
 import com.l2jmobius.gameserver.model.Macro;
 import com.l2jmobius.gameserver.model.MacroCmd;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class SendMacroList implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java
index 2b20d69290..7c7b393db1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class SendTradeRequest implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ServerClose.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ServerClose.java
index 240742ac41..b6f73f4232 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ServerClose.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ServerClose.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author devScarlet, mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java
index ac17343631..7a8b4a4efd 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author devScarlet, mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java
index eb4a131f8d..98f80edfa3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SetSummonRemainTime implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SetupGauge.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SetupGauge.java
index ec4acc8e00..48d9fff876 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SetupGauge.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SetupGauge.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SetupGauge implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java
index a0da2e0135..5dfdf1d932 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java
@@ -20,7 +20,7 @@ import java.util.Map;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  ** @author Gnacik
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java
index 1be33f1c0a..438e259df2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.buylist.L2BuyList;
 import com.l2jmobius.gameserver.model.buylist.Product;
 import com.l2jmobius.gameserver.model.items.L2Item;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ShopPreviewList implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
index 0308c35462..5ee6a26f25 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ShortBuffStatusUpdate implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
index 0717c71445..8cb2a88d5a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Shortcut;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class ShortCutInit implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
index 670dc87d94..c6149dcdab 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Shortcut;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class ShortCutRegister implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowBoard.java
index 605e31b5c2..2a2cc3b83c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowBoard.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowBoard.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ShowBoard implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java
index 25b4812aaf..67c45f63c1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ShowCalculator implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java
index 48a17299b1..4eb7eb6023 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ShowMiniMap implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java
index 95d2a2e857..89d89d6730 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author -Wooden-
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java
index e5d155ee19..ec64e716fb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowTownMap.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ShowTownMap implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java
index 4bae619b38..7bfec21b86 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author devScarlet, mrTJO
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java
index b7c10bd4e2..fba3b7ef5b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java
@@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2SiegeClan;
 import com.l2jmobius.gameserver.model.entity.Castle;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Populates the Siege Attacker List in the SiegeInfo Window<BR>
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
index 5b6c46099b..f9d7c3e16d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.enums.SiegeClanType;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2SiegeClan;
 import com.l2jmobius.gameserver.model.entity.Castle;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Populates the Siege Defender List in the SiegeInfo Window<BR>
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
index 7bf76eeb49..44a9997fb2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Castle;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Shows the Siege Info<BR>
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java
index 3122a542ea..b20c745be6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.model.TimeStamp;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Skill Cool Time server packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SkillList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SkillList.java
index 8c4707591f..44dab81e7c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SkillList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SkillList.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SkillList implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Snoop.java
index 3b62ee7b16..502d9bd136 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Snoop.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Snoop.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.ChatType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class Snoop implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SocialAction.java
index 03fd031531..6f65c02ddc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SocialAction.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SocialAction.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class SocialAction implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
index e5b6677e4c..8b2215fbf1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SpawnItem implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java
index 61edcb005c..ad1403a2b8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * Special Camera server packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java
index fe03e193de..96d9447d62 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class StartPledgeWar implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StartRotation.java
index 2963dd3c5f..ca2ee70f16 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StartRotation.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StartRotation.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class StartRotation implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StaticObject.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StaticObject.java
index ca5fa31d87..051f6d9893 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StaticObject.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StaticObject.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2StaticObjectInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author KenM
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
index 87adc88b44..e960415366 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
@@ -23,7 +23,7 @@ import java.util.Map.Entry;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.StatusUpdateType;
 import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class StatusUpdate implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopMove.java
index bfe3ef84b4..e3b51a777a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopMove.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopMove.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class StopMove implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java
index cd74910b83..0d76219b41 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Maktakien
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java
index 4b39ea130b..a5f58d9a81 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class StopPledgeWar implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopRotation.java
index ec7a830ba0..d747345234 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopRotation.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StopRotation.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class StopRotation implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
index 82f939d4c7..95130543c6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SummonInfo.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SunRise.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SunRise.java
index 99ab8ad5da..ae009ecff1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SunRise.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SunRise.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class SunRise implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SunSet.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SunSet.java
index ce6fccd76d..df649aeca8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SunSet.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SunSet.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class SunSet implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java
index 5744c27576..037a1ccba6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class SurrenderPledgeWar implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 51683d81f7..6b73fa7448 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -17,8 +17,8 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
 
 /**
  * @author Forsaiken, UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TargetSelected.java
index 83f7394601..0bdfd09bc5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TargetSelected.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TargetSelected.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class TargetSelected implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java
index 3675f8b814..8bb4582404 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class TargetUnselected implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java
index 89b139cc06..818512da3b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class TeleportToLocation implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeDone.java
index dd60f4fa7b..1def1fa893 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeDone.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeDone.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class TradeDone implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
index e98c58b54a..2c0e8de7fc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.TradeItem;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Yme
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeOtherDone.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeOtherDone.java
index 868d17a3f4..7455136d18 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeOtherDone.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeOtherDone.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class TradeOtherDone implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
index 61eae822cf..a36c067c1b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.TradeItem;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Yme
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeStart.java
index ccbe4c112f..8e320891d3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeStart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeStart.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.MentorManager;
 import com.l2jmobius.gameserver.model.PcCondOverride;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class TradeStart extends AbstractItemPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
index b5bc031065..caca53b0f5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.TradeItem;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author daemon
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java
index c78eb7f583..59d0c75f5d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialCloseHtml.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * TutorialCloseHtml server packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java
index 621a712796..3a8a7b3e67 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class TutorialEnableClientEvent implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java
index 1ef7b7f804..300f789024 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.HtmlActionScope;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * TutorialShowHtml server packet implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java
index ca49b12cbc..0e9a337f68 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class TutorialShowQuestionMark implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java
index 275d949b36..bf3e9cd2a2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.L2Party;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.zone.ZoneId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Sdw, UnAfraid
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java
index 26b6c100fc..b583cca73d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ValidateLocation implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java
index dfa384ba3c..1546bea3cb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public class ValidateLocationInVehicle implements IClientOutgoingPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java
index bcc48f12aa..67cbeb159c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Maktakien
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java
index 1c79cd9376..724155d981 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2BoatInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Maktakien
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java
index 676314aa6c..e1ab46dfbe 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2BoatInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Maktakien
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java
index e9a0964c37..23f0479f81 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 /**
  * @author Kerberos
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
index 1ec902d1f9..fafcf09f0c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
@@ -22,7 +22,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class WareHouseDepositList extends AbstractItemPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
index 065471ec05..1082f31974 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
@@ -23,7 +23,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class WareHouseWithdrawalList extends AbstractItemPacket
 {
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java
index 7e5e7fe693..5cb12538ab 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java
@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
 import com.l2jmobius.gameserver.model.L2SkillLearn;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java
index 8021e7cb83..e2096f5d7c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.ability;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java
index 3c6d11bf64..084611f2e0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.ability;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java
index c33bdc1d35..1c94f14ed7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.adenadistribution;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java
index 8b27238e1d..9f86ad60a2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.adenadistribution;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaStart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaStart.java
index 2c88bb91a5..a3728b75a7 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaStart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaStart.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.adenadistribution;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java
index 5ee2a2d752..c55f50ffdc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.alchemy;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java
index ba8f75dcd6..8f5b29a172 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java
@@ -22,7 +22,7 @@ import java.util.List;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.TryMixCubeType;
 import com.l2jmobius.gameserver.model.holders.AlchemyResult;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java
index 1e6752947f..0054e5c0be 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import com.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType;
 import com.l2jmobius.gameserver.model.items.appearance.AppearanceType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java
index 070486bd05..a7bdec3643 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets.appearance;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java
index 935404bb90..bce288a771 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.appearance;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java
index b732c19cfc..431555b4a2 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.appearance;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java
index d99f5b59d5..66c2d83f24 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.appearance;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/awakening/ExCallToChangeClass.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/awakening/ExCallToChangeClass.java
index e6d483cff2..0a5789042f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/awakening/ExCallToChangeClass.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/awakening/ExCallToChangeClass.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.awakening;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseEnter.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseEnter.java
index 1ec29b49df..3e08ac696c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseEnter.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseEnter.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.ceremonyofchaos;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseLeave.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseLeave.java
index 631101f44a..46b33d8a17 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseLeave.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseLeave.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.ceremonyofchaos;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java
index 48af9fa4e7..0a7e4c27fa 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseObserveMode.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseObserveMode.java
index 9812bf1da9..869413d011 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseObserveMode.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseObserveMode.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.ceremonyofchaos;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java
index 44c5412d2f..c1c5fa6976 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.ceremonyofchaos;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseResult.java
index 3c5933130a..1e152ad938 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseResult.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.CeremonyOfChaosResult;
 import com.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
 import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseState.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseState.java
index 7a7fc3f3f8..1cfbc300f3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseState.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseState.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.ceremonyofchaos;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExCloseCommission.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExCloseCommission.java
index 1baef2ee23..e7fcec13a9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExCloseCommission.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExCloseCommission.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.commission;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java
index 77c73624ab..e9c50bbbd3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets.commission;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.commission.CommissionItem;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java
index 84988e7435..24d153ef95 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets.commission;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.ItemInfo;
 import com.l2jmobius.gameserver.model.commission.CommissionItem;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java
index 4c4dbfbf7e..9aae0f4016 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.commission;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java
index f981a4a72f..5621c911a8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.commission;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java
index 984a2e16d9..8bce1ea62a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java
@@ -20,7 +20,7 @@ import java.util.Collection;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java
index b64b08a297..13388e73eb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.commission.CommissionItem;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java
index 096297bdf3..19ab54be2b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.commission;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java
index 4712d52a7c..149e7475f9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.commission;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java
index f68a36d8ef..806cf933ab 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.compound;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneFail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneFail.java
index ef2a00dc34..a40910c3c8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneFail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneFail.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.compound;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
index ff7bf7878c..f853c7d197 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.compound;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveFail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveFail.java
index 29c5ab7819..3ca4469e4e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveFail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveFail.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.compound;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveOK.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveOK.java
index c202e17b54..6d76b2a8a3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveOK.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneRemoveOK.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.compound;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java
index aec0302b49..eecc509b9f 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.compound;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoFail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoFail.java
index c3e44f0131..c06337ba7a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoFail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoFail.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.compound;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoOK.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoOK.java
index 44c928f4b5..d7537ea8e4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoOK.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoOK.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.compound;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveFail.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveFail.java
index be13102787..0cb75a5f76 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveFail.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveFail.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.compound;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveOK.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveOK.java
index 24390400af..6e98355c09 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveOK.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantTwoRemoveOK.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.compound;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java
index 780bbed0c6..959a6ccb06 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java
index e53fb466bc..2b3d7425c4 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.xml.impl.DailyMissionData;
 import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java
index b55898e3a7..c599a401d1 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets.ensoul;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.ensoul.EnsoulOption;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ensoul/ExShowEnsoulWindow.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ensoul/ExShowEnsoulWindow.java
index cb4de3d413..846fc2c804 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ensoul/ExShowEnsoulWindow.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ensoul/ExShowEnsoulWindow.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.ensoul;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExAutoFishAvailable.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExAutoFishAvailable.java
index 164f49ba31..9bcb198b8b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExAutoFishAvailable.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExAutoFishAvailable.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.fishing;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingEnd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingEnd.java
index 9605826d46..0af8fff4da 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingEnd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingEnd.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets.fishing;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java
index 42a9b6bd42..dea11bad61 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets.fishing;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.interfaces.ILocational;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java
index d66a8a3e8e..e5e987db13 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets.fishing;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.interfaces.ILocational;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java
index cd1f9bcce8..aba45073ae 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java
@@ -21,7 +21,7 @@ import java.util.Calendar;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java
index e26d373359..db44aaafc0 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.friend;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 public class FriendAddRequest implements IClientOutgoingPacket
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java
index 9082ab9c45..62f4f68ab3 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets.friend;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java
index d2f2e6b095..14cd41a31e 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java
@@ -27,7 +27,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java
index 34e21fadc6..b9e621854d 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.friend;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java
index 0291c0a0de..f5758f2431 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets.friend;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.L2World;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java
index 47757fa736..c741ace018 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/L2FriendStatus.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/L2FriendStatus.java
index c0cb50dba1..3ff51e4b3a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/L2FriendStatus.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/friend/L2FriendStatus.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets.friend;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java
index bb3611541b..32d7ebc372 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java
@@ -25,8 +25,8 @@ import com.l2jmobius.gameserver.data.xml.impl.LuckyGameData;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/luckygame/ExStartLuckyGame.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/luckygame/ExStartLuckyGame.java
index 72f2f7f2e5..4d58f5d294 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/luckygame/ExStartLuckyGame.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/luckygame/ExStartLuckyGame.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets.luckygame;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java
index fbe879c7cd..ef0a105011 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets.mentoring;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
index 2cc16675f5..81e7216e87 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java
@@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.instancemanager.MentorManager;
 import com.l2jmobius.gameserver.model.L2Mentee;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
index c636a3addf..97226c02a6 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java
index 3f3571f916..9088340e1b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java
@@ -23,7 +23,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.data.xml.impl.ClanRewardData;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.pledge.ClanRewardBonus;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusMarkReset.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusMarkReset.java
index 114db83633..7807c1b6c9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusMarkReset.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusMarkReset.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.pledgebonus;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java
index 4ff25e5ea4..62441b5b10 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java
@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.enums.ClanRewardType;
 import com.l2jmobius.gameserver.model.L2Clan;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.pledge.ClanRewardBonus;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusUpdate.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusUpdate.java
index ef1612eaea..49c1296cf5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusUpdate.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusUpdate.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets.pledgebonus;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.ClanRewardType;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java
index b9e742c3fb..2e8da3e7a9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets.primeshop;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.interfaces.IIdentifiable;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java
index 836861fd38..281d5740c8 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets.primeshop;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java
index d134cacf62..a84d693c70 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.primeshop.PrimeShopGroup;
 import com.l2jmobius.gameserver.model.primeshop.PrimeShopItem;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java
index d1f5b8013d..94f7f74fbb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.primeshop.PrimeShopGroup;
 import com.l2jmobius.gameserver.model.primeshop.PrimeShopItem;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java
index 44fe23899e..8c505ed158 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.SayuneType;
 import com.l2jmobius.gameserver.model.SayuneEntry;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java
index 81ec416f8a..0a200e0069 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.enums.SayuneType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.interfaces.ILocational;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java
index 5a397418e2..68b4e9945b 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.network.serverpackets.sayune;
 
 import com.l2jmobius.commons.network.PacketWriter;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java
index 5d86bc06ab..5c52b4ffeb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets.shuttle;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java
index 80ba43d3c4..42032b930a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets.shuttle;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2ShuttleInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java
index 11d4d4a74e..ba05c5ab97 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java
@@ -20,7 +20,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2ShuttleInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java
index 5f432ae9b6..e965771379 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java
@@ -22,7 +22,7 @@ import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2ShuttleInstance;
 import com.l2jmobius.gameserver.model.shuttle.L2ShuttleStop;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java
index 124ae432db..e2ec32d007 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java
@@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.network.serverpackets.shuttle;
 
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.actor.instance.L2ShuttleInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java
index f93e51dd1d..18fc7fdfbb 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets.shuttle;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java
index 7eb2c640f3..ee457fd6cc 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java
@@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.network.serverpackets.shuttle;
 import com.l2jmobius.commons.network.PacketWriter;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.OutgoingPackets;
+import com.l2jmobius.gameserver.network.OutgoingPackets;
 import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 7fb83817f7..60019030ed 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -29,7 +29,7 @@ import java.util.logging.Logger;
 import com.l2jmobius.commons.database.DatabaseFactory;
 import com.l2jmobius.gameserver.LoginServerThread;
 import com.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordAck;
 import com.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordCheck;
 import com.l2jmobius.gameserver.network.serverpackets.Ex2ndPasswordVerify;
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java
index 3ed556ae15..1f1a0a81ac 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java
@@ -27,8 +27,8 @@ import com.l2jmobius.gameserver.model.PcCondOverride;
 import com.l2jmobius.gameserver.model.punishment.PunishmentAffect;
 import com.l2jmobius.gameserver.model.punishment.PunishmentTask;
 import com.l2jmobius.gameserver.model.punishment.PunishmentType;
-import com.l2jmobius.gameserver.network.client.ConnectionState;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.ConnectionState;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Flood protector implementation.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/FloodProtectors.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/FloodProtectors.java
index 26d124eac0..aaff778510 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/FloodProtectors.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/FloodProtectors.java
@@ -17,7 +17,7 @@
 package com.l2jmobius.gameserver.util;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 /**
  * Collection of flood protectors for single player.
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/log/formatter/AccountingFormatter.java b/L2J_Mobius_Underground/java/com/l2jmobius/log/formatter/AccountingFormatter.java
index 3740d5fca8..c574fba105 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/log/formatter/AccountingFormatter.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/log/formatter/AccountingFormatter.java
@@ -24,8 +24,8 @@ import java.util.logging.LogRecord;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.util.StringUtil;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.network.client.ConnectionState;
-import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.ConnectionState;
+import com.l2jmobius.gameserver.network.L2GameClient;
 
 public class AccountingFormatter extends Formatter
 {