From 4f2e7a5b55dd7155c02ebf1ab9ec5fbf4b14723c Mon Sep 17 00:00:00 2001
From: Alex <40795980+AlexProgrammerDE@users.noreply.github.com>
Date: Thu, 11 Jan 2024 18:21:23 +0100
Subject: [PATCH] Move package/license to GeyserMC, gradle conventions and
 submodules (#782)

* Change packages

* Move everything to a protocol submodule

* gradle conventions, update license

---------

Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
---
 .github/workflows/deploy.yml                  |   4 +-
 LICENSE.txt                                   |   1 +
 README.md                                     |  52 ++-
 build.gradle.kts                              | 112 +----
 buildSrc/build.gradle.kts                     |  13 +
 buildSrc/settings.gradle.kts                  |   7 +
 .../mcprotocollib.base-conventions.gradle.kts |  41 ++
 ...protocollib.publish-conventions.gradle.kts |  18 +
 example/build.gradle.kts                      |   4 +-
 .../example}/ClientSessionListener.java       |  14 +-
 .../network/example}/PingPacket.java          |   6 +-
 .../network/example}/PingServerTest.java      |  10 +-
 .../network/example}/ServerListener.java      |  14 +-
 .../example}/ServerSessionListener.java       |  14 +-
 .../network/example}/TestProtocol.java        |  24 +-
 .../example}/MinecraftProtocolTest.java       |  58 +--
 gradle/libs.versions.toml                     |  18 +-
 protocol/build.gradle.kts                     |  30 ++
 .../network}/AbstractServer.java              |   6 +-
 .../mcprotocollib/network}/BuiltinFlags.java  |   2 +-
 .../mcprotocollib/network}/ProxyInfo.java     |   2 +-
 .../mcprotocollib/network}/Server.java        |   6 +-
 .../mcprotocollib/network}/Session.java       |  14 +-
 .../network}/codec/BasePacketCodecHelper.java |   2 +-
 .../network}/codec/PacketCodecHelper.java     |   2 +-
 .../network}/codec/PacketDefinition.java      |   4 +-
 .../network}/codec/PacketSerializer.java      |   4 +-
 .../network}/crypt/AESEncryption.java         |   2 +-
 .../network}/crypt/PacketEncryption.java      |   2 +-
 .../network}/event/server/ServerAdapter.java  |   2 +-
 .../event/server/ServerBoundEvent.java        |   4 +-
 .../event/server/ServerClosedEvent.java       |   4 +-
 .../event/server/ServerClosingEvent.java      |   4 +-
 .../network}/event/server/ServerEvent.java    |   2 +-
 .../network}/event/server/ServerListener.java |   2 +-
 .../event/server/SessionAddedEvent.java       |   6 +-
 .../event/server/SessionRemovedEvent.java     |   6 +-
 .../event/session/ConnectedEvent.java         |   4 +-
 .../event/session/DisconnectedEvent.java      |   4 +-
 .../event/session/DisconnectingEvent.java     |   4 +-
 .../event/session/PacketErrorEvent.java       |   4 +-
 .../event/session/PacketSendingEvent.java     |   6 +-
 .../event/session/SessionAdapter.java         |   6 +-
 .../network}/event/session/SessionEvent.java  |   2 +-
 .../event/session/SessionListener.java        |   6 +-
 .../network}/helper/TransportHelper.java      |   2 +-
 .../network}/packet/BufferedPacket.java       |  76 ++--
 .../network}/packet/DefaultPacketHeader.java  |   4 +-
 .../mcprotocollib/network}/packet/Packet.java |   2 +-
 .../network}/packet/PacketHeader.java         |   4 +-
 .../network}/packet/PacketProtocol.java       |  12 +-
 .../network}/tcp/TcpBundlerUnpacker.java      |   8 +-
 .../network}/tcp/TcpClientSession.java        |  12 +-
 .../network}/tcp/TcpPacketCodec.java          |  16 +-
 .../network}/tcp/TcpPacketCompression.java    |   4 +-
 .../network}/tcp/TcpPacketEncryptor.java      |   4 +-
 .../network}/tcp/TcpPacketSizer.java          |   4 +-
 .../mcprotocollib/network}/tcp/TcpServer.java |  10 +-
 .../network}/tcp/TcpServerSession.java        |   6 +-
 .../network}/tcp/TcpSession.java              |  22 +-
 .../protocol/CheckedBiConsumer.java           |   2 +-
 .../protocol/CheckedFunction.java             |   2 +-
 .../protocol/ClientListener.java              |  60 +--
 .../protocol/MinecraftConstants.java          |   6 +-
 .../protocol/MinecraftProtocol.java           |  30 +-
 .../protocol/ServerListener.java              |  60 +--
 .../protocol/ServerLoginHandler.java          |   6 +-
 .../protocol/codec/MinecraftCodec.java        | 384 +++++++++---------
 .../protocol/codec/MinecraftCodecHelper.java  | 124 +++---
 .../protocol/codec/MinecraftPacket.java       |   4 +-
 .../codec/MinecraftPacketSerializer.java      |   6 +-
 .../codec/NbtComponentSerializer.java         |   2 +-
 .../protocol/codec/PacketCodec.java           |   4 +-
 .../protocol/codec/PacketFactory.java         |   6 +-
 .../protocol/codec/PacketStateCodec.java      |  19 +-
 .../data/DefaultComponentSerializer.java      |   2 +-
 .../protocol/data/ProtocolState.java          |   2 +-
 .../data/UnexpectedEncryptionException.java   |   2 +-
 .../protocol/data/game/ArgumentSignature.java |   2 +-
 .../protocol/data/game/BossBarAction.java     |   2 +-
 .../protocol/data/game/BossBarColor.java      |   2 +-
 .../protocol/data/game/BossBarDivision.java   |   2 +-
 .../protocol/data/game/ClientCommand.java     |   2 +-
 .../protocol/data/game/Identifier.java        |   2 +-
 .../protocol/data/game/PlayerListEntry.java   |   4 +-
 .../data/game/PlayerListEntryAction.java      |   2 +-
 .../data/game/ResourcePackStatus.java         |   2 +-
 .../data/game/UnlockRecipesAction.java        |   2 +-
 .../data/game/advancement/Advancement.java    |   4 +-
 .../data/game/chat/BuiltinChatType.java       |   4 +-
 .../data/game/chat/ChatCompletionAction.java  |   2 +-
 .../data/game/chat/ChatFilterType.java        |   2 +-
 .../data/game/chat/MessageSignature.java      |   4 +-
 .../data/game/chat/numbers/BlankFormat.java   |   2 +-
 .../data/game/chat/numbers/FixedFormat.java   |   2 +-
 .../data/game/chat/numbers/NumberFormat.java  |   4 +
 .../data/game/chat/numbers/StyledFormat.java  |   2 +-
 .../protocol/data/game/chunk/BitStorage.java  |   2 +-
 .../data/game/chunk/ChunkBiomeData.java       |  24 +-
 .../data/game/chunk/ChunkSection.java         |   2 +-
 .../protocol/data/game/chunk/DataPalette.java |   4 +-
 .../data/game/chunk/NibbleArray3d.java        |   2 +-
 .../game/chunk/palette/GlobalPalette.java     |   2 +-
 .../data/game/chunk/palette/ListPalette.java  |   4 +-
 .../data/game/chunk/palette/MapPalette.java   |   4 +-
 .../data/game/chunk/palette/Palette.java      |   2 +-
 .../data/game/chunk/palette/PaletteType.java  |   2 +-
 .../game/chunk/palette/SingletonPalette.java  |   2 +-
 .../data/game/command/CommandNode.java        |   4 +-
 .../data/game/command/CommandParser.java      |   2 +-
 .../data/game/command/CommandType.java        |   2 +-
 .../data/game/command/SuggestionType.java     |   4 +-
 .../command/properties/CommandProperties.java |   4 +
 .../command/properties/DoubleProperties.java  |   2 +-
 .../command/properties/EntityProperties.java  |   2 +-
 .../command/properties/FloatProperties.java   |   2 +-
 .../command/properties/IntegerProperties.java |   2 +-
 .../command/properties/LongProperties.java    |   2 +-
 .../command/properties/RangeProperties.java   |   2 +-
 .../properties/ResourceProperties.java        |   4 +-
 .../properties/ScoreHolderProperties.java     |   2 +-
 .../command/properties/StringProperties.java  |   2 +-
 .../command/properties/TimeProperties.java    |   2 +-
 .../protocol/data/game/entity/Effect.java     |   2 +-
 .../data/game/entity/EntityEvent.java         |   2 +-
 .../data/game/entity/EquipmentSlot.java       |   2 +-
 .../data/game/entity/RotationOrigin.java      |   2 +-
 .../data/game/entity/attribute/Attribute.java |   2 +-
 .../entity/attribute/AttributeModifier.java   |   2 +-
 .../game/entity/attribute/AttributeType.java  |   2 +-
 .../entity/attribute/ModifierOperation.java   |   2 +-
 .../game/entity/attribute/ModifierType.java   |   2 +-
 .../entity/metadata/BooleanMetadataType.java  |   6 +-
 .../entity/metadata/ByteMetadataType.java     |   6 +-
 .../game/entity/metadata/EntityMetadata.java  |   6 +-
 .../data/game/entity/metadata/Equipment.java  |   4 +-
 .../entity/metadata/FloatMetadataType.java    |   6 +-
 .../data/game/entity/metadata/GlobalPos.java  |   2 +-
 .../game/entity/metadata/IntMetadataType.java |   6 +-
 .../data/game/entity/metadata/ItemStack.java  |   2 +-
 .../entity/metadata/LongMetadataType.java     |   6 +-
 .../game/entity/metadata/MetadataType.java    |  22 +-
 .../metadata/OptionalIntMetadataType.java     |   4 +-
 .../data/game/entity/metadata/Pose.java       |   2 +-
 .../game/entity/metadata/SnifferState.java    |  34 +-
 .../game/entity/metadata/VillagerData.java    |   2 +-
 .../metadata/type/BooleanEntityMetadata.java  |   8 +-
 .../metadata/type/ByteEntityMetadata.java     |   8 +-
 .../metadata/type/FloatEntityMetadata.java    |   8 +-
 .../metadata/type/IntEntityMetadata.java      |   8 +-
 .../metadata/type/LongEntityMetadata.java     |   8 +-
 .../metadata/type/ObjectEntityMetadata.java   |   6 +-
 .../data/game/entity/object/Direction.java    |   2 +-
 .../game/entity/object/FallingBlockData.java  |   2 +-
 .../game/entity/object/GenericObjectData.java |   2 +-
 .../data/game/entity/object/MinecartType.java |   2 +-
 .../data/game/entity/object/ObjectData.java   |   4 +
 .../game/entity/object/ProjectileData.java    |   2 +-
 .../game/entity/object/SplashPotionData.java  |   2 +-
 .../data/game/entity/object/WardenData.java   |   2 +-
 .../data/game/entity/player/Animation.java    |   2 +-
 .../game/entity/player/BlockBreakStage.java   |   2 +-
 .../data/game/entity/player/GameMode.java     |   4 +-
 .../data/game/entity/player/Hand.java         |   2 +-
 .../game/entity/player/HandPreference.java    |   2 +-
 .../game/entity/player/InteractAction.java    |   2 +-
 .../data/game/entity/player/PlayerAction.java |   2 +-
 .../game/entity/player/PlayerSpawnInfo.java   |   4 +-
 .../data/game/entity/player/PlayerState.java  |   2 +-
 .../game/entity/player/PositionElement.java   |   2 +-
 .../data/game/entity/type/EntityType.java     |   2 +-
 .../data/game/entity/type/PaintingType.java   |   2 +-
 .../game/inventory/AdvancementTabAction.java  |   2 +-
 .../data/game/inventory/ClickItemAction.java  |   2 +-
 .../data/game/inventory/ContainerAction.java  |   5 +
 .../game/inventory/ContainerActionType.java   |   2 +-
 .../data/game/inventory/ContainerType.java    |   2 +-
 .../game/inventory/CraftingBookStateType.java |   2 +-
 .../game/inventory/CreativeGrabAction.java    |   2 +-
 .../data/game/inventory/DropItemAction.java   |   2 +-
 .../data/game/inventory/FillStackAction.java  |   2 +-
 .../game/inventory/MoveToHotbarAction.java    |   2 +-
 .../game/inventory/ShiftClickItemAction.java  |   2 +-
 .../data/game/inventory/SpreadItemAction.java |   2 +-
 .../inventory/UpdateStructureBlockAction.java |   2 +-
 .../inventory/UpdateStructureBlockMode.java   |   2 +-
 .../data/game/inventory/VillagerTrade.java    |   4 +-
 .../inventory/property/AnvilProperty.java     |   2 +-
 .../property/BrewingStandProperty.java        |   2 +-
 .../inventory/property/ContainerProperty.java |   5 +
 .../property/EnchantmentTableProperty.java    |   2 +-
 .../inventory/property/FurnaceProperty.java   |   2 +-
 .../data/game/level/LightUpdateData.java      |   4 +-
 .../game/level/block/BlockChangeEntry.java    |   2 +-
 .../game/level/block/BlockEntityInfo.java     |   2 +-
 .../game/level/block/BlockEntityType.java     |   2 +-
 .../game/level/block/CommandBlockMode.java    |   2 +-
 .../level/block/ExplosionInteraction.java     |   2 +-
 .../game/level/block/StructureMirror.java     |   2 +-
 .../game/level/block/StructureRotation.java   |   2 +-
 .../data/game/level/block/WobbleStyle.java    |   2 +-
 .../level/block/value/BeaconValueType.java    |   2 +-
 .../game/level/block/value/BellValue.java     |   4 +-
 .../game/level/block/value/BellValueType.java |   2 +-
 .../game/level/block/value/BlockValue.java    |   4 +
 .../level/block/value/BlockValueType.java     |   4 +
 .../game/level/block/value/ChestValue.java    |   2 +-
 .../level/block/value/ChestValueType.java     |   2 +-
 .../level/block/value/DecoratedPotValue.java  |   4 +-
 .../block/value/DecoratedPotValueType.java    |   2 +-
 .../level/block/value/EndGatewayValue.java    |   4 +
 .../block/value/EndGatewayValueType.java      |   2 +-
 .../level/block/value/GenericBlockValue.java  |   2 +-
 .../block/value/GenericBlockValueType.java    |   2 +-
 .../level/block/value/MobSpawnerValue.java    |   4 +
 .../block/value/MobSpawnerValueType.java      |   2 +-
 .../level/block/value/NoteBlockValue.java     |   4 +
 .../level/block/value/NoteBlockValueType.java |   2 +-
 .../game/level/block/value/PistonValue.java   |   4 +-
 .../level/block/value/PistonValueType.java    |   2 +-
 .../level/event/BonemealGrowEventData.java    |   2 +-
 .../game/level/event/BreakBlockEventData.java |   2 +-
 .../level/event/BreakPotionEventData.java     |   2 +-
 .../game/level/event/ComposterEventData.java  |   2 +-
 .../level/event/DragonFireballEventData.java  |   2 +-
 .../game/level/event/ElectricSparkData.java   |   4 +-
 .../game/level/event/FireExtinguishData.java  |   2 +-
 .../data/game/level/event/LevelEvent.java     |   5 +
 .../data/game/level/event/LevelEventData.java |   4 +
 .../data/game/level/event/LevelEventType.java |   2 +-
 .../game/level/event/RecordEventData.java     |   2 +-
 .../event/SculkBlockChargeEventData.java      |   4 +-
 .../data/game/level/event/SmokeEventData.java |   4 +-
 .../event/TrialSpawnerDetectEventData.java    |   2 +-
 .../game/level/event/UnknownLevelEvent.java   |   2 +-
 .../level/event/UnknownLevelEventData.java    |   2 +-
 .../protocol/data/game/level/map/MapData.java |   2 +-
 .../protocol/data/game/level/map/MapIcon.java |   2 +-
 .../data/game/level/map/MapIconType.java      |   2 +-
 .../game/level/notify/DemoMessageValue.java   |   2 +-
 .../notify/ElderGuardianEffectValue.java      |   2 +-
 .../game/level/notify/EnterCreditsValue.java  |   2 +-
 .../data/game/level/notify/GameEvent.java     |   2 +-
 .../game/level/notify/GameEventValue.java     |   4 +
 .../level/notify/LimitedCraftingValue.java    |   2 +-
 .../game/level/notify/RainStrengthValue.java  |   2 +-
 .../game/level/notify/RespawnScreenValue.java |   2 +-
 .../level/notify/ThunderStrengthValue.java    |   2 +-
 .../level/particle/BlockParticleData.java     |   2 +-
 .../DustColorTransitionParticleData.java      |   2 +-
 .../game/level/particle/DustParticleData.java |   2 +-
 .../particle/FallingDustParticleData.java     |   2 +-
 .../game/level/particle/ItemParticleData.java |   4 +-
 .../data/game/level/particle/Particle.java    |   2 +-
 .../game/level/particle/ParticleData.java     |   4 +
 .../game/level/particle/ParticleType.java     |   2 +-
 .../particle/SculkChargeParticleData.java     |   2 +-
 .../level/particle/ShriekParticleData.java    |   2 +-
 .../level/particle/VibrationParticleData.java |   4 +-
 .../positionsource/BlockPositionSource.java   |   2 +-
 .../positionsource/EntityPositionSource.java  |   2 +-
 .../positionsource/PositionSource.java        |   6 +
 .../positionsource/PositionSourceType.java    |   2 +-
 .../data/game/level/sound/BuiltinSound.java   |   2 +-
 .../data/game/level/sound/CustomSound.java    |   2 +-
 .../protocol/data/game/level/sound/Sound.java |   2 +-
 .../data/game/level/sound/SoundCategory.java  |   2 +-
 .../game/recipe/CraftingBookCategory.java     |   2 +-
 .../protocol/data/game/recipe/Ingredient.java |   4 +-
 .../protocol/data/game/recipe/Recipe.java     |   4 +-
 .../protocol/data/game/recipe/RecipeType.java |   4 +-
 .../game/recipe/data/CookedRecipeData.java    |   8 +-
 .../data/game/recipe/data/RecipeData.java     |   4 +
 .../game/recipe/data/ShapedRecipeData.java    |   8 +-
 .../game/recipe/data/ShapelessRecipeData.java |   8 +-
 .../recipe/data/SimpleCraftingRecipeData.java |   4 +-
 .../data/SmithingTransformRecipeData.java     |   6 +-
 .../recipe/data/SmithingTrimRecipeData.java   |   4 +-
 .../recipe/data/StoneCuttingRecipeData.java   |   6 +-
 .../data/game/scoreboard/CollisionRule.java   |   2 +-
 .../game/scoreboard/NameTagVisibility.java    |   2 +-
 .../data/game/scoreboard/ObjectiveAction.java |   2 +-
 .../data/game/scoreboard/ScoreType.java       |   2 +-
 .../game/scoreboard/ScoreboardPosition.java   |   2 +-
 .../data/game/scoreboard/TeamAction.java      |   2 +-
 .../data/game/scoreboard/TeamColor.java       |   2 +-
 .../data/game/setting/ChatVisibility.java     |   2 +-
 .../data/game/setting/Difficulty.java         |   2 +-
 .../protocol/data/game/setting/SkinPart.java  |   2 +-
 .../game/statistic/BreakBlockStatistic.java   |   2 +-
 .../game/statistic/BreakItemStatistic.java    |   2 +-
 .../game/statistic/CraftItemStatistic.java    |   2 +-
 .../data/game/statistic/CustomStatistic.java  |   2 +-
 .../game/statistic/DropItemStatistic.java     |   2 +-
 .../game/statistic/KillEntityStatistic.java   |   4 +-
 .../statistic/KilledByEntityStatistic.java    |   4 +-
 .../game/statistic/PickupItemStatistic.java   |   2 +-
 .../data/game/statistic/Statistic.java        |   4 +
 .../game/statistic/StatisticCategory.java     |   2 +-
 .../data/game/statistic/StatisticFormat.java  |   2 +-
 .../data/game/statistic/UseItemStatistic.java |   2 +-
 .../data/handshake/HandshakeIntent.java       |   2 +-
 .../protocol/data/status/PlayerInfo.java      |   2 +-
 .../data/status/ServerStatusInfo.java         |   2 +-
 .../protocol/data/status/VersionInfo.java     |   2 +-
 .../status/handler/ServerInfoBuilder.java     |   8 +
 .../status/handler/ServerInfoHandler.java     |   8 +
 .../status/handler/ServerPingTimeHandler.java |   7 +
 .../ClientboundCustomPayloadPacket.java       |   6 +-
 .../ClientboundDisconnectPacket.java          |   8 +-
 .../ClientboundKeepAlivePacket.java           |   6 +-
 .../clientbound/ClientboundPingPacket.java    |   6 +-
 .../ClientboundResourcePackPopPacket.java     |   6 +-
 .../ClientboundResourcePackPushPacket.java    |   6 +-
 .../ClientboundUpdateTagsPacket.java          |   6 +-
 .../ServerboundClientInformationPacket.java   |  12 +-
 .../ServerboundCustomPayloadPacket.java       |   6 +-
 .../ServerboundKeepAlivePacket.java           |   6 +-
 .../serverbound/ServerboundPongPacket.java    |   6 +-
 .../ServerboundResourcePackPacket.java        |   8 +-
 .../ClientboundFinishConfigurationPacket.java |   6 +-
 .../ClientboundRegistryDataPacket.java        |   6 +-
 ...lientboundUpdateEnabledFeaturesPacket.java |   6 +-
 .../ServerboundFinishConfigurationPacket.java |   6 +-
 .../serverbound/ClientIntentionPacket.java    |   8 +-
 .../ClientboundAwardStatsPacket.java          |  10 +-
 .../ClientboundBossEventPacket.java           |  12 +-
 .../clientbound/ClientboundBundlePacket.java  |   6 +-
 .../ClientboundChangeDifficultyPacket.java    |   8 +-
 .../ClientboundCommandSuggestionsPacket.java  |   6 +-
 .../ClientboundCommandsPacket.java            |  14 +-
 .../ClientboundCooldownPacket.java            |   6 +-
 ...lientboundCustomChatCompletionsPacket.java |   8 +-
 .../ClientboundDeleteChatPacket.java          |   8 +-
 .../ClientboundDelimiterPacket.java           |  28 +-
 .../ClientboundDisguisedChatPacket.java       |   8 +-
 .../clientbound/ClientboundLoginPacket.java   |   8 +-
 .../ClientboundPlayerChatPacket.java          |  12 +-
 .../ClientboundPlayerInfoRemovePacket.java    |   6 +-
 .../ClientboundPlayerInfoUpdatePacket.java    |  12 +-
 .../clientbound/ClientboundRecipePacket.java  |   8 +-
 .../clientbound/ClientboundRespawnPacket.java |   8 +-
 ...lientboundSelectAdvancementsTabPacket.java |   6 +-
 .../ClientboundServerDataPacket.java          |   6 +-
 .../ClientboundSetCameraPacket.java           |   6 +-
 .../ClientboundSoundEntityPacket.java         |  14 +-
 .../ClientboundStartConfigurationPacket.java  |   6 +-
 .../ClientboundStopSoundPacket.java           |   8 +-
 .../ClientboundSystemChatPacket.java          |   6 +-
 .../clientbound/ClientboundTabListPacket.java |   6 +-
 .../ClientboundTickingStatePacket.java        |   6 +-
 .../ClientboundTickingStepPacket.java         |   6 +-
 .../ClientboundUpdateAdvancementsPacket.java  |  14 +-
 .../ClientboundUpdateRecipesPacket.java       |  18 +-
 .../entity/ClientboundAnimatePacket.java      |   8 +-
 .../entity/ClientboundDamageEventPacket.java  |  88 ++--
 .../entity/ClientboundEntityEventPacket.java  |   8 +-
 .../ClientboundHurtAnimationPacket.java       |  54 +--
 .../ClientboundMoveEntityPosPacket.java       |   6 +-
 .../ClientboundMoveEntityPosRotPacket.java    |   6 +-
 .../ClientboundMoveEntityRotPacket.java       |   6 +-
 .../entity/ClientboundMoveVehiclePacket.java  |   6 +-
 .../ClientboundRemoveEntitiesPacket.java      |   6 +-
 .../ClientboundRemoveMobEffectPacket.java     |   8 +-
 .../entity/ClientboundRotateHeadPacket.java   |   6 +-
 .../ClientboundSetEntityDataPacket.java       |   8 +-
 .../ClientboundSetEntityLinkPacket.java       |   6 +-
 .../ClientboundSetEntityMotionPacket.java     |   6 +-
 .../entity/ClientboundSetEquipmentPacket.java |  12 +-
 .../ClientboundSetPassengersPacket.java       |   6 +-
 .../ClientboundTakeItemEntityPacket.java      |   6 +-
 .../ClientboundTeleportEntityPacket.java      |   6 +-
 .../ClientboundUpdateAttributesPacket.java    |  14 +-
 .../ClientboundUpdateMobEffectPacket.java     |   8 +-
 .../ClientboundBlockChangedAckPacket.java     |   6 +-
 .../ClientboundPlayerAbilitiesPacket.java     |   6 +-
 .../ClientboundPlayerCombatEndPacket.java     |   6 +-
 .../ClientboundPlayerCombatEnterPacket.java   |   6 +-
 .../ClientboundPlayerCombatKillPacket.java    |   6 +-
 .../player/ClientboundPlayerLookAtPacket.java |   8 +-
 .../ClientboundPlayerPositionPacket.java      |   8 +-
 .../ClientboundSetCarriedItemPacket.java      |   6 +-
 .../ClientboundSetExperiencePacket.java       |   6 +-
 .../player/ClientboundSetHealthPacket.java    |   6 +-
 .../spawn/ClientboundAddEntityPacket.java     |  10 +-
 .../ClientboundAddExperienceOrbPacket.java    |   6 +-
 .../ClientboundContainerClosePacket.java      |   6 +-
 .../ClientboundContainerSetContentPacket.java |   8 +-
 .../ClientboundContainerSetDataPacket.java    |   8 +-
 .../ClientboundContainerSetSlotPacket.java    |   8 +-
 .../ClientboundHorseScreenOpenPacket.java     |   6 +-
 .../ClientboundMerchantOffersPacket.java      |  10 +-
 .../inventory/ClientboundOpenBookPacket.java  |   8 +-
 .../ClientboundOpenScreenPacket.java          |  10 +-
 .../ClientboundPlaceGhostRecipePacket.java    |   6 +-
 .../ClientboundBlockDestructionPacket.java    |   8 +-
 .../ClientboundBlockEntityDataPacket.java     |   8 +-
 .../level/ClientboundBlockEventPacket.java    |  12 +-
 .../level/ClientboundBlockUpdatePacket.java   |   8 +-
 .../ClientboundChunkBatchFinishedPacket.java  |   6 +-
 .../ClientboundChunkBatchStartPacket.java     |   6 +-
 .../level/ClientboundChunksBiomesPacket.java  |  74 ++--
 .../level/ClientboundExplodePacket.java       |  12 +-
 .../ClientboundForgetLevelChunkPacket.java    |   6 +-
 .../level/ClientboundGameEventPacket.java     |  10 +-
 .../ClientboundLevelChunkWithLightPacket.java |  14 +-
 .../level/ClientboundLevelEventPacket.java    |  10 +-
 .../ClientboundLevelParticlesPacket.java      |  10 +-
 .../level/ClientboundLightUpdatePacket.java   |   8 +-
 .../level/ClientboundMapItemDataPacket.java   |  12 +-
 .../ClientboundOpenSignEditorPacket.java      |   6 +-
 .../ClientboundSectionBlocksUpdatePacket.java |   8 +-
 .../ClientboundSetChunkCacheCenterPacket.java |   6 +-
 .../ClientboundSetChunkCacheRadiusPacket.java |   6 +-
 ...entboundSetDefaultSpawnPositionPacket.java |   6 +-
 ...lientboundSetSimulationDistancePacket.java |   6 +-
 .../level/ClientboundSetTimePacket.java       |   6 +-
 .../level/ClientboundSoundPacket.java         |  14 +-
 .../level/ClientboundTagQueryPacket.java      |   6 +-
 .../ClientboundInitializeBorderPacket.java    |   6 +-
 .../ClientboundSetBorderCenterPacket.java     |   6 +-
 .../ClientboundSetBorderLerpSizePacket.java   |   6 +-
 .../ClientboundSetBorderSizePacket.java       |   6 +-
 ...lientboundSetBorderWarningDelayPacket.java |   6 +-
 ...ntboundSetBorderWarningDistancePacket.java |   6 +-
 .../ClientboundResetScorePacket.java          |   6 +-
 .../ClientboundSetDisplayObjectivePacket.java |   8 +-
 .../ClientboundSetObjectivePacket.java        |  12 +-
 .../ClientboundSetPlayerTeamPacket.java       |  14 +-
 .../scoreboard/ClientboundSetScorePacket.java |   8 +-
 .../title/ClientboundClearTitlesPacket.java   |   6 +-
 .../ClientboundSetActionBarTextPacket.java    |   6 +-
 .../ClientboundSetSubtitleTextPacket.java     |   6 +-
 .../title/ClientboundSetTitleTextPacket.java  |   8 +-
 .../ClientboundSetTitlesAnimationPacket.java  |   6 +-
 .../ServerboundChangeDifficultyPacket.java    |   8 +-
 .../serverbound/ServerboundChatAckPacket.java |   6 +-
 .../ServerboundChatCommandPacket.java         |   8 +-
 .../serverbound/ServerboundChatPacket.java    |   6 +-
 .../ServerboundChatSessionUpdatePacket.java   |   6 +-
 .../ServerboundClientCommandPacket.java       |   8 +-
 .../ServerboundCommandSuggestionPacket.java   |   6 +-
 ...rboundConfigurationAcknowledgedPacket.java |   6 +-
 .../ServerboundLockDifficultyPacket.java      |   6 +-
 ...ServerboundContainerButtonClickPacket.java |   6 +-
 .../ServerboundContainerClickPacket.java      |  26 +-
 .../ServerboundContainerClosePacket.java      |   6 +-
 ...rboundContainerSlotStateChangedPacket.java |   6 +-
 .../inventory/ServerboundEditBookPacket.java  |   6 +-
 .../inventory/ServerboundPickItemPacket.java  |   6 +-
 .../ServerboundPlaceRecipePacket.java         |   6 +-
 ...erboundRecipeBookChangeSettingsPacket.java |   8 +-
 ...ServerboundRecipeBookSeenRecipePacket.java |   6 +-
 .../ServerboundRenameItemPacket.java          |   6 +-
 .../ServerboundSeenAdvancementsPacket.java    |   8 +-
 .../ServerboundSelectTradePacket.java         |   6 +-
 .../inventory/ServerboundSetBeaconPacket.java |   6 +-
 .../ServerboundSetCommandBlockPacket.java     |   8 +-
 .../ServerboundSetCommandMinecartPacket.java  |   6 +-
 .../ServerboundSetCreativeModeSlotPacket.java |   8 +-
 .../ServerboundSetJigsawBlockPacket.java      |   6 +-
 .../ServerboundSetStructureBlockPacket.java   |  14 +-
 .../ServerboundAcceptTeleportationPacket.java |   6 +-
 .../level/ServerboundBlockEntityTagQuery.java |   6 +-
 .../ServerboundChunkBatchReceivedPacket.java  |   6 +-
 .../level/ServerboundEntityTagQuery.java      |   6 +-
 .../ServerboundJigsawGeneratePacket.java      |   6 +-
 .../level/ServerboundMoveVehiclePacket.java   |   6 +-
 .../level/ServerboundPaddleBoatPacket.java    |   6 +-
 .../level/ServerboundPlayerInputPacket.java   |   6 +-
 .../level/ServerboundSignUpdatePacket.java    |   6 +-
 .../ServerboundTeleportToEntityPacket.java    |   6 +-
 .../player/ServerboundInteractPacket.java     |  10 +-
 .../ServerboundMovePlayerPosPacket.java       |   6 +-
 .../ServerboundMovePlayerPosRotPacket.java    |   6 +-
 .../ServerboundMovePlayerRotPacket.java       |   6 +-
 ...ServerboundMovePlayerStatusOnlyPacket.java |   6 +-
 .../ServerboundPlayerAbilitiesPacket.java     |   6 +-
 .../player/ServerboundPlayerActionPacket.java |  10 +-
 .../ServerboundPlayerCommandPacket.java       |   8 +-
 .../ServerboundSetCarriedItemPacket.java      |   6 +-
 .../player/ServerboundSwingPacket.java        |   8 +-
 .../player/ServerboundUseItemOnPacket.java    |  10 +-
 .../player/ServerboundUseItemPacket.java      |   8 +-
 .../ClientboundCustomQueryPacket.java         |   6 +-
 .../ClientboundGameProfilePacket.java         |   6 +-
 .../clientbound/ClientboundHelloPacket.java   |   6 +-
 .../ClientboundLoginCompressionPacket.java    |   6 +-
 .../ClientboundLoginDisconnectPacket.java     |   8 +-
 .../ServerboundCustomQueryAnswerPacket.java   |   6 +-
 .../serverbound/ServerboundHelloPacket.java   |   6 +-
 .../serverbound/ServerboundKeyPacket.java     |   6 +-
 .../ServerboundLoginAcknowledgedPacket.java   |   6 +-
 .../ClientboundPongResponsePacket.java        |   6 +-
 .../ClientboundStatusResponsePacket.java      |  14 +-
 .../ServerboundPingRequestPacket.java         |   6 +-
 .../ServerboundStatusRequestPacket.java       |   6 +-
 .../src}/main/resources/networkCodec.nbt      | Bin
 .../mc/protocol/MinecraftProtocolTest.java    |  44 +-
 .../geysermc}/mc/protocol/data/ChunkTest.java |  12 +-
 .../mc/protocol/data/NetworkDataTests.java    |   6 +-
 .../mc/protocol/packet/PacketTest.java        |   8 +-
 .../ClientIntentionPacketTest.java            |  10 +-
 .../ClientboundCommandsPacketTest.java        |  16 +-
 .../clientbound/ServerDeclareRecipesTest.java |  16 +-
 .../ClientboundBlockUpdatePacketTest.java     |   6 +-
 ...entboundLevelChunkWithLightPacketTest.java |  10 +-
 ...entboundSectionBlocksUpdatePacketTest.java |   6 +-
 .../ClientboundSetEntityDataPacketTest.java   |  24 +-
 .../ClientboundSetEquipmentPacketTest.java    |  12 +-
 .../ClientboundSetPlayerTeamPacketTest.java   |  12 +-
 .../ClientboundCustomQueryPacketTest.java     |   4 +-
 .../ClientboundGameProfilePacketTest.java     |   4 +-
 .../ClientboundHelloPacketTest.java           |   4 +-
 ...ClientboundLoginCompressionPacketTest.java |   4 +-
 .../ClientboundLoginDisconnectPacketTest.java |   4 +-
 ...erverboundCustomQueryAnswerPacketTest.java |   4 +-
 .../ServerboundHelloPacketTest.java           |   4 +-
 .../serverbound/ServerboundKeyPacketTest.java |   4 +-
 .../ClientboundPongResponsePacketTest.java    |   4 +-
 .../ClientboundStatusResponsePacketTest.java  |  12 +-
 .../ServerboundPingRequestPacketTest.java     |   4 +-
 .../ServerboundStatusRequestPacketTest.java   |   4 +-
 settings.gradle.kts                           |   4 +-
 .../data/game/chat/numbers/NumberFormat.java  |   4 -
 .../command/properties/CommandProperties.java |   4 -
 .../data/game/entity/object/ObjectData.java   |   4 -
 .../data/game/inventory/ContainerAction.java  |   5 -
 .../inventory/property/ContainerProperty.java |   5 -
 .../game/level/block/value/BlockValue.java    |   4 -
 .../level/block/value/BlockValueType.java     |   4 -
 .../level/block/value/EndGatewayValue.java    |   4 -
 .../level/block/value/MobSpawnerValue.java    |   4 -
 .../level/block/value/NoteBlockValue.java     |   4 -
 .../data/game/level/event/LevelEvent.java     |   5 -
 .../data/game/level/event/LevelEventData.java |   4 -
 .../game/level/notify/GameEventValue.java     |   4 -
 .../game/level/particle/ParticleData.java     |   4 -
 .../positionsource/PositionSource.java        |   6 -
 .../data/game/recipe/data/RecipeData.java     |   4 -
 .../data/game/statistic/Statistic.java        |   4 -
 .../status/handler/ServerInfoBuilder.java     |   8 -
 .../status/handler/ServerInfoHandler.java     |   8 -
 .../status/handler/ServerPingTimeHandler.java |   7 -
 544 files changed, 2101 insertions(+), 2066 deletions(-)
 create mode 100644 buildSrc/build.gradle.kts
 create mode 100644 buildSrc/settings.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/mcprotocollib.base-conventions.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/mcprotocollib.publish-conventions.gradle.kts
 rename example/src/main/java/{com/github/steveice10/packetlib/test => org/geysermc/mcprotocollib/network/example}/ClientSessionListener.java (75%)
 rename example/src/main/java/{com/github/steveice10/packetlib/test => org/geysermc/mcprotocollib/network/example}/PingPacket.java (67%)
 rename example/src/main/java/{com/github/steveice10/packetlib/test => org/geysermc/mcprotocollib/network/example}/PingServerTest.java (74%)
 rename example/src/main/java/{com/github/steveice10/packetlib/test => org/geysermc/mcprotocollib/network/example}/ServerListener.java (72%)
 rename example/src/main/java/{com/github/steveice10/packetlib/test => org/geysermc/mcprotocollib/network/example}/ServerSessionListener.java (68%)
 rename example/src/main/java/{com/github/steveice10/packetlib/test => org/geysermc/mcprotocollib/network/example}/TestProtocol.java (70%)
 rename example/src/main/java/{com/github/steveice10/mc/protocol/test => org/geysermc/mcprotocollib/protocol/example}/MinecraftProtocolTest.java (81%)
 create mode 100644 protocol/build.gradle.kts
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/AbstractServer.java (96%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/BuiltinFlags.java (93%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/ProxyInfo.java (98%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/Server.java (95%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/Session.java (93%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/codec/BasePacketCodecHelper.java (99%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/codec/PacketCodecHelper.java (88%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/codec/PacketDefinition.java (92%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/codec/PacketSerializer.java (74%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/crypt/AESEncryption.java (97%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/crypt/PacketEncryption.java (97%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/server/ServerAdapter.java (89%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/server/ServerBoundEvent.java (85%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/server/ServerClosedEvent.java (85%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/server/ServerClosingEvent.java (85%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/server/ServerEvent.java (79%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/server/ServerListener.java (94%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/server/SessionAddedEvent.java (85%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/server/SessionRemovedEvent.java (86%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/session/ConnectedEvent.java (85%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/session/DisconnectedEvent.java (92%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/session/DisconnectingEvent.java (92%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/session/PacketErrorEvent.java (94%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/session/PacketSendingEvent.java (92%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/session/SessionAdapter.java (80%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/session/SessionEvent.java (79%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/event/session/SessionListener.java (88%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/helper/TransportHelper.java (95%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/packet/BufferedPacket.java (78%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/packet/DefaultPacketHeader.java (91%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/packet/Packet.java (89%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/packet/PacketHeader.java (94%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/packet/PacketProtocol.java (96%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/tcp/TcpBundlerUnpacker.java (74%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/tcp/TcpClientSession.java (97%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/tcp/TcpPacketCodec.java (87%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/tcp/TcpPacketCompression.java (96%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/tcp/TcpPacketEncryptor.java (93%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/tcp/TcpPacketSizer.java (95%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/tcp/TcpServer.java (95%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/tcp/TcpServerSession.java (89%)
 rename {src/main/java/com/github/steveice10/packetlib => protocol/src/main/java/org/geysermc/mcprotocollib/network}/tcp/TcpSession.java (94%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/CheckedBiConsumer.java (73%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/CheckedFunction.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/ClientListener.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/MinecraftConstants.java (93%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/MinecraftProtocol.java (89%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/ServerListener.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/ServerLoginHandler.java (67%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/codec/MinecraftCodec.java (56%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/codec/MinecraftCodecHelper.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/codec/MinecraftPacket.java (64%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/codec/MinecraftPacketSerializer.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/codec/NbtComponentSerializer.java (99%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/codec/PacketCodec.java (94%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/codec/PacketFactory.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/codec/PacketStateCodec.java (86%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/DefaultComponentSerializer.java (93%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/ProtocolState.java (66%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/UnexpectedEncryptionException.java (90%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/ArgumentSignature.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/BossBarAction.java (82%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/BossBarColor.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/BossBarDivision.java (82%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/ClientCommand.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/Identifier.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/PlayerListEntry.java (86%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/PlayerListEntryAction.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/ResourcePackStatus.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/UnlockRecipesAction.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/advancement/Advancement.java (93%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chat/BuiltinChatType.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chat/ChatCompletionAction.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chat/ChatFilterType.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chat/MessageSignature.java (84%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chat/numbers/BlankFormat.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chat/numbers/FixedFormat.java (78%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/NumberFormat.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chat/numbers/StyledFormat.java (84%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chunk/BitStorage.java (98%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chunk/ChunkBiomeData.java (73%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chunk/ChunkSection.java (94%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chunk/DataPalette.java (97%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chunk/NibbleArray3d.java (95%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chunk/palette/GlobalPalette.java (88%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chunk/palette/ListPalette.java (92%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chunk/palette/MapPalette.java (93%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chunk/palette/Palette.java (93%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chunk/palette/PaletteType.java (86%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/chunk/palette/SingletonPalette.java (89%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/CommandNode.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/CommandParser.java (93%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/CommandType.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/SuggestionType.java (88%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/CommandProperties.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/properties/DoubleProperties.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/properties/EntityProperties.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/properties/FloatProperties.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/properties/IntegerProperties.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/properties/LongProperties.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/properties/RangeProperties.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/properties/ResourceProperties.java (64%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/properties/ScoreHolderProperties.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/properties/StringProperties.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/command/properties/TimeProperties.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/Effect.java (91%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/EntityEvent.java (96%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/EquipmentSlot.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/RotationOrigin.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/attribute/Attribute.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/attribute/AttributeModifier.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/attribute/AttributeType.java (97%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/attribute/ModifierOperation.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/attribute/ModifierType.java (97%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/BooleanMetadataType.java (89%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/ByteMetadataType.java (89%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/EntityMetadata.java (84%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/Equipment.java (64%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/FloatMetadataType.java (89%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/GlobalPos.java (89%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/IntMetadataType.java (90%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/ItemStack.java (86%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/LongMetadataType.java (90%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/MetadataType.java (90%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/OptionalIntMetadataType.java (89%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/Pose.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/SnifferState.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/VillagerData.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/type/BooleanEntityMetadata.java (68%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/type/ByteEntityMetadata.java (67%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/type/FloatEntityMetadata.java (68%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/type/IntEntityMetadata.java (67%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/type/LongEntityMetadata.java (67%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/metadata/type/ObjectEntityMetadata.java (58%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/object/Direction.java (90%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/object/FallingBlockData.java (73%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/object/GenericObjectData.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/object/MinecartType.java (80%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/ObjectData.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/object/ProjectileData.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/object/SplashPotionData.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/object/WardenData.java (73%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/player/Animation.java (91%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/player/BlockBreakStage.java (86%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/player/GameMode.java (84%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/player/Hand.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/player/HandPreference.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/player/InteractAction.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/player/PlayerAction.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/player/PlayerSpawnInfo.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/player/PlayerState.java (83%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/player/PositionElement.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/type/EntityType.java (96%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/entity/type/PaintingType.java (88%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/AdvancementTabAction.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/ClickItemAction.java (82%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ContainerAction.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/ContainerActionType.java (83%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/ContainerType.java (89%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/CraftingBookStateType.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/CreativeGrabAction.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/DropItemAction.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/FillStackAction.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/MoveToHotbarAction.java (92%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/ShiftClickItemAction.java (82%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/SpreadItemAction.java (93%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/UpdateStructureBlockAction.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/UpdateStructureBlockMode.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/VillagerTrade.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/property/AnvilProperty.java (82%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/property/BrewingStandProperty.java (85%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/ContainerProperty.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/property/EnchantmentTableProperty.java (96%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/inventory/property/FurnaceProperty.java (89%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/LightUpdateData.java (94%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/BlockChangeEntry.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/BlockEntityInfo.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/BlockEntityType.java (93%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/CommandBlockMode.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/ExplosionInteraction.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/StructureMirror.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/StructureRotation.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/WobbleStyle.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/BeaconValueType.java (52%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/BellValue.java (52%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/BellValueType.java (75%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BlockValue.java
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BlockValueType.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/ChestValue.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/ChestValueType.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/DecoratedPotValue.java (59%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/DecoratedPotValueType.java (76%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/EndGatewayValue.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/EndGatewayValueType.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/GenericBlockValue.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/GenericBlockValueType.java (77%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/MobSpawnerValue.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/MobSpawnerValueType.java (76%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/NoteBlockValue.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/NoteBlockValueType.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/PistonValue.java (53%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/block/value/PistonValueType.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/BonemealGrowEventData.java (73%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/BreakBlockEventData.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/BreakPotionEventData.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/ComposterEventData.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/DragonFireballEventData.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/ElectricSparkData.java (55%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/FireExtinguishData.java (79%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEvent.java
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEventData.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/LevelEventType.java (97%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/RecordEventData.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/SculkBlockChargeEventData.java (86%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/SmokeEventData.java (55%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/TrialSpawnerDetectEventData.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/UnknownLevelEvent.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/event/UnknownLevelEventData.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/map/MapData.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/map/MapIcon.java (84%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/map/MapIconType.java (92%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/notify/DemoMessageValue.java (91%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/notify/ElderGuardianEffectValue.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/notify/EnterCreditsValue.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/notify/GameEvent.java (87%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/GameEventValue.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/notify/LimitedCraftingValue.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/notify/RainStrengthValue.java (83%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/notify/RespawnScreenValue.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/notify/ThunderStrengthValue.java (83%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/BlockParticleData.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/DustColorTransitionParticleData.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/DustParticleData.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/FallingDustParticleData.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/ItemParticleData.java (62%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/Particle.java (75%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ParticleData.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/ParticleType.java (96%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/SculkChargeParticleData.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/ShriekParticleData.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/VibrationParticleData.java (54%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/positionsource/BlockPositionSource.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/positionsource/EntityPositionSource.java (73%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/PositionSource.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/particle/positionsource/PositionSourceType.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/sound/BuiltinSound.java (99%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/sound/CustomSound.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/sound/Sound.java (60%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/level/sound/SoundCategory.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/recipe/CraftingBookCategory.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/recipe/Ingredient.java (63%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/recipe/Recipe.java (64%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/recipe/RecipeType.java (91%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/recipe/data/CookedRecipeData.java (61%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/RecipeData.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/recipe/data/ShapedRecipeData.java (63%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/recipe/data/ShapelessRecipeData.java (58%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/recipe/data/SimpleCraftingRecipeData.java (60%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/recipe/data/SmithingTransformRecipeData.java (65%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/recipe/data/SmithingTrimRecipeData.java (68%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/recipe/data/StoneCuttingRecipeData.java (62%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/scoreboard/CollisionRule.java (90%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/scoreboard/NameTagVisibility.java (91%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/scoreboard/ObjectiveAction.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/scoreboard/ScoreType.java (73%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/scoreboard/ScoreboardPosition.java (90%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/scoreboard/TeamAction.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/scoreboard/TeamColor.java (84%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/setting/ChatVisibility.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/setting/Difficulty.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/setting/SkinPart.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/statistic/BreakBlockStatistic.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/statistic/BreakItemStatistic.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/statistic/CraftItemStatistic.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/statistic/CustomStatistic.java (97%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/statistic/DropItemStatistic.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/statistic/KillEntityStatistic.java (55%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/statistic/KilledByEntityStatistic.java (56%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/statistic/PickupItemStatistic.java (71%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/Statistic.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/statistic/StatisticCategory.java (83%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/statistic/StatisticFormat.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/game/statistic/UseItemStatistic.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/handshake/HandshakeIntent.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/status/PlayerInfo.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/status/ServerStatusInfo.java (88%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/data/status/VersionInfo.java (83%)
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/handler/ServerInfoBuilder.java
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/handler/ServerInfoHandler.java
 create mode 100644 protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/handler/ServerPingTimeHandler.java
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/common/clientbound/ClientboundCustomPayloadPacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/common/clientbound/ClientboundDisconnectPacket.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/common/clientbound/ClientboundKeepAlivePacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/common/clientbound/ClientboundPingPacket.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/common/clientbound/ClientboundResourcePackPopPacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/common/clientbound/ClientboundResourcePackPushPacket.java (86%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/common/clientbound/ClientboundUpdateTagsPacket.java (90%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/common/serverbound/ServerboundClientInformationPacket.java (82%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/common/serverbound/ServerboundCustomPayloadPacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/common/serverbound/ServerboundKeepAlivePacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/common/serverbound/ServerboundPongPacket.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/common/serverbound/ServerboundResourcePackPacket.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/configuration/clientbound/ClientboundFinishConfigurationPacket.java (63%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/configuration/clientbound/ClientboundRegistryDataPacket.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/configuration/clientbound/ClientboundUpdateEnabledFeaturesPacket.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/configuration/serverbound/ServerboundFinishConfigurationPacket.java (63%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/handshake/serverbound/ClientIntentionPacket.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundAwardStatsPacket.java (91%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundBossEventPacket.java (91%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundBundlePacket.java (62%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundChangeDifficultyPacket.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundCommandSuggestionsPacket.java (91%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundCommandsPacket.java (95%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundCooldownPacket.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundCustomChatCompletionsPacket.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundDeleteChatPacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundDelimiterPacket.java (56%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundDisguisedChatPacket.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundLoginPacket.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundPlayerChatPacket.java (88%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundPlayerInfoRemovePacket.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundPlayerInfoUpdatePacket.java (92%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundRecipePacket.java (95%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundRespawnPacket.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundSelectAdvancementsTabPacket.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundServerDataPacket.java (83%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundSetCameraPacket.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundSoundEntityPacket.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundStartConfigurationPacket.java (63%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundStopSoundPacket.java (83%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundSystemChatPacket.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundTabListPacket.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundTickingStatePacket.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundTickingStepPacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundUpdateAdvancementsPacket.java (92%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/ClientboundUpdateRecipesPacket.java (92%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundAnimatePacket.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundDamageEventPacket.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundEntityEventPacket.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundHurtAnimationPacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosPacket.java (82%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosRotPacket.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityRotPacket.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundMoveVehiclePacket.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundRemoveEntitiesPacket.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundRemoveMobEffectPacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundRotateHeadPacket.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityDataPacket.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityLinkPacket.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityMotionPacket.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundSetEquipmentPacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundSetPassengersPacket.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundTakeItemEntityPacket.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundTeleportEntityPacket.java (84%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundUpdateAttributesPacket.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/ClientboundUpdateMobEffectPacket.java (88%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/player/ClientboundBlockChangedAckPacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerAbilitiesPacket.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEndPacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEnterPacket.java (66%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatKillPacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerLookAtPacket.java (84%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerPositionPacket.java (86%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/player/ClientboundSetCarriedItemPacket.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/player/ClientboundSetExperiencePacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/player/ClientboundSetHealthPacket.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddEntityPacket.java (93%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddExperienceOrbPacket.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/inventory/ClientboundContainerClosePacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetContentPacket.java (82%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetDataPacket.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetSlotPacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/inventory/ClientboundHorseScreenOpenPacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/inventory/ClientboundMerchantOffersPacket.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/inventory/ClientboundOpenBookPacket.java (65%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/inventory/ClientboundOpenScreenPacket.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/inventory/ClientboundPlaceGhostRecipePacket.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundBlockDestructionPacket.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundBlockEntityDataPacket.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundBlockEventPacket.java (90%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacket.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchFinishedPacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchStartPacket.java (62%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundChunksBiomesPacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundExplodePacket.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundForgetLevelChunkPacket.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundGameEventPacket.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacket.java (83%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundLevelEventPacket.java (92%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundLevelParticlesPacket.java (82%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundLightUpdatePacket.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundMapItemDataPacket.java (88%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundOpenSignEditorPacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacket.java (89%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheCenterPacket.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheRadiusPacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundSetDefaultSpawnPositionPacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundSetSimulationDistancePacket.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundSetTimePacket.java (73%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundSoundPacket.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/ClientboundTagQueryPacket.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/border/ClientboundInitializeBorderPacket.java (86%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderCenterPacket.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderLerpSizePacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderSizePacket.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDelayPacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDistancePacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/scoreboard/ClientboundResetScorePacket.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetDisplayObjectivePacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetObjectivePacket.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetPlayerTeamPacket.java (92%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetScorePacket.java (84%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/title/ClientboundClearTitlesPacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/title/ClientboundSetActionBarTextPacket.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/title/ClientboundSetSubtitleTextPacket.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/title/ClientboundSetTitleTextPacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/clientbound/title/ClientboundSetTitlesAnimationPacket.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/ServerboundChangeDifficultyPacket.java (68%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/ServerboundChatAckPacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/ServerboundChatCommandPacket.java (86%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/ServerboundChatPacket.java (88%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/ServerboundChatSessionUpdatePacket.java (88%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/ServerboundClientCommandPacket.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/ServerboundCommandSuggestionPacket.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/ServerboundConfigurationAcknowledgedPacket.java (65%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/ServerboundLockDifficultyPacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundContainerButtonClickPacket.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClickPacket.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClosePacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundContainerSlotStateChangedPacket.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundEditBookPacket.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundPickItemPacket.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundPlaceRecipePacket.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookChangeSettingsPacket.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookSeenRecipePacket.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundRenameItemPacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundSeenAdvancementsPacket.java (86%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundSelectTradePacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundSetBeaconPacket.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandBlockPacket.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandMinecartPacket.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundSetCreativeModeSlotPacket.java (73%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundSetJigsawBlockPacket.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/inventory/ServerboundSetStructureBlockPacket.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/level/ServerboundAcceptTeleportationPacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/level/ServerboundBlockEntityTagQuery.java (77%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/level/ServerboundChunkBatchReceivedPacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/level/ServerboundEntityTagQuery.java (75%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/level/ServerboundJigsawGeneratePacket.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/level/ServerboundMoveVehiclePacket.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/level/ServerboundPaddleBoatPacket.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/level/ServerboundPlayerInputPacket.java (84%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/level/ServerboundSignUpdatePacket.java (86%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/level/ServerboundTeleportToEntityPacket.java (72%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/player/ServerboundInteractPacket.java (85%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosPacket.java (78%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosRotPacket.java (82%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerRotPacket.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerStatusOnlyPacket.java (71%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/player/ServerboundPlayerAbilitiesPacket.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/player/ServerboundPlayerActionPacket.java (73%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/player/ServerboundPlayerCommandPacket.java (76%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/player/ServerboundSetCarriedItemPacket.java (69%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/player/ServerboundSwingPacket.java (65%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/player/ServerboundUseItemOnPacket.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/ingame/serverbound/player/ServerboundUseItemPacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/login/clientbound/ClientboundCustomQueryPacket.java (80%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/login/clientbound/ClientboundGameProfilePacket.java (90%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/login/clientbound/ClientboundHelloPacket.java (87%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/login/clientbound/ClientboundLoginCompressionPacket.java (74%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacket.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacket.java (81%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/login/serverbound/ServerboundHelloPacket.java (79%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/login/serverbound/ServerboundKeyPacket.java (90%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/login/serverbound/ServerboundLoginAcknowledgedPacket.java (64%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/status/clientbound/ClientboundPongResponsePacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/status/clientbound/ClientboundStatusResponsePacket.java (89%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/status/serverbound/ServerboundPingRequestPacket.java (70%)
 rename {src/main/java/com/github/steveice10/mc => protocol/src/main/java/org/geysermc/mcprotocollib}/protocol/packet/status/serverbound/ServerboundStatusRequestPacket.java (64%)
 rename {src => protocol/src}/main/resources/networkCodec.nbt (100%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/MinecraftProtocolTest.java (74%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/data/ChunkTest.java (84%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/data/NetworkDataTests.java (79%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/PacketTest.java (86%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/handshake/serverbound/ClientIntentionPacketTest.java (60%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/ingame/clientbound/ClientboundCommandsPacketTest.java (83%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/ingame/clientbound/ServerDeclareRecipesTest.java (91%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacketTest.java (63%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacketTest.java (73%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacketTest.java (62%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEntityDataPacketTest.java (62%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEquipmentPacketTest.java (55%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/ingame/clientbound/level/ClientboundSetPlayerTeamPacketTest.java (61%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/login/clientbound/ClientboundCustomQueryPacketTest.java (72%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/login/clientbound/ClientboundGameProfilePacketTest.java (72%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/login/clientbound/ClientboundHelloPacketTest.java (86%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/login/clientbound/ClientboundLoginCompressionPacketTest.java (63%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacketTest.java (73%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacketTest.java (75%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/login/serverbound/ServerboundHelloPacketTest.java (66%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/login/serverbound/ServerboundKeyPacketTest.java (92%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/status/clientbound/ClientboundPongResponsePacketTest.java (65%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/status/clientbound/ClientboundStatusResponsePacketTest.java (69%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/status/serverbound/ServerboundPingRequestPacketTest.java (65%)
 rename {src/test/java/com/github/steveice10 => protocol/src/test/java/org/geysermc}/mc/protocol/packet/status/serverbound/ServerboundStatusRequestPacketTest.java (62%)
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/NumberFormat.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/CommandProperties.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/ObjectData.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ContainerAction.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/ContainerProperty.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BlockValue.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BlockValueType.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/EndGatewayValue.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/MobSpawnerValue.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/NoteBlockValue.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/LevelEvent.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/LevelEventData.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/GameEventValue.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ParticleData.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/PositionSource.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/RecipeData.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/Statistic.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/status/handler/ServerInfoBuilder.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/status/handler/ServerInfoHandler.java
 delete mode 100644 src/main/java/com/github/steveice10/mc/protocol/data/status/handler/ServerPingTimeHandler.java

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 222183f5..3f610595 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -30,7 +30,7 @@ jobs:
         if: ${{ success() && github.repository == 'GeyserMC/MCProtocolLib' && github.ref_name == 'master' }}
         uses: gradle/gradle-build-action@3bfe3a46584a206fb8361cdedd0647b0c4204232
         env:
-          OPENCOLLAB_USERNAME: ${{ vars.DEPLOY_USER }}
-          OPENCOLLAB_PASSWORD: ${{ secrets.DEPLOY_PASS }}
+          ORG_GRADLE_PROJECT_geysermcUsername: ${{ vars.DEPLOY_USER }}
+          ORG_GRADLE_PROJECT_geysermcPassword: ${{ secrets.DEPLOY_PASS }}
         with:
           arguments: publish
diff --git a/LICENSE.txt b/LICENSE.txt
index 8710b0b8..121ca8cd 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,5 @@
 Copyright (C) 2013-2021 Steveice10
+Copyright (C) 2021-2024 GeyserMC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/README.md b/README.md
index d130e395..59de2f31 100644
--- a/README.md
+++ b/README.md
@@ -4,14 +4,17 @@ MCProtocolLib is a simple library for communicating with Minecraft clients and s
 
 ## Example Code
 
-See the [example](https://github.com/GeyserMC/MCProtocolLib/tree/master/example/src/main/java/com/github/steveice10/mc/protocol/test) folder for sample usage.
+See the [example](https://github.com/GeyserMC/MCProtocolLib/tree/master/example/src/main/java/org/geysermc/mcprotocollib) folder for sample usage.
 
 ## Adding as a Dependency
 
-MCProtocolLib builds are published to the [Open Collaboration repository](https://repo.opencollab.dev/ui/packages/gav:%2F%2Fcom.github.steveice10:mcprotocollib). Follow the below steps to add MCProtocolLib as a dependency to your project.
+MCProtocolLib builds are published to the [Open Collaboration repository](https://repo.opencollab.dev/ui/packages/gav:%2F%2Forg.geysermc:mcprotocollib).
+Follow the below steps to add MCProtocolLib as a dependency to your project.
 
 ### Maven
 
+#### Add the Repository
+
 ```xml
 <repositories>
     <repository>
@@ -19,25 +22,56 @@ MCProtocolLib builds are published to the [Open Collaboration repository](https:
         <url>https://repo.opencollab.dev/maven-releases/</url>
     </repository>
 </repositories>
+```
 
+#### Add the Dependency
+
+```xml
 <dependency>
-    <groupId>com.github.steveice10</groupId>
-    <artifactId>mcprotocollib</artifactId>
+    <groupId>org.geysermc.mcprotocollib</groupId>
+    <artifactId>protocol</artifactId>
     <version>(version here)</version>
 </dependency>
 ```
 
-### Gradle
+### Gradle (Groovy DSL)
+
+#### Add the Repository
 
 ```groovy
-allprojects {
-    repositories {
-        maven { url 'https://repo.opencollab.dev/maven-releases/' }
+repositories {
+    maven { 
+        name 'opencollab'
+        url 'https://repo.opencollab.dev/maven-releases/'
     }
 }
+```
 
+#### Add the Dependency
+
+```groovy
 dependencies {
-    implementation 'com.github.steveice10:mcprotocollib:(version here)'
+    implementation 'org.geysermc.mcprotocollib:protocol:(version here)'
+}
+```
+
+### Gradle (Kotlin DSL)
+
+#### Add the Repository
+
+```kotlin
+repositories {
+    maven("https://repo.opencollab.dev/maven-releases/") {
+        name = "opencollab"
+    }
+}
+```
+
+#### Add the Dependency
+
+```kotlin
+dependencies {
+    implementation("org.geysermc.mcprotocollib:protocol:(version here)")
 }
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
index c4b3a703..1c9e77cf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,115 +1,7 @@
 plugins {
     idea
-    `java-library`
-    `maven-publish`
-    alias(libs.plugins.indra)
-    alias(libs.plugins.indra.git)
-    alias(libs.plugins.indra.publishing)
-    alias(libs.plugins.lombok)
 }
 
-indra {
-    github("GeyserMC", "MCProtocolLib")
-
-    mitLicense()
-    publishReleasesTo("opencollab-release-repo", "https://repo.opencollab.dev/maven-releases/")
-    publishSnapshotsTo("opencollab-snapshot-repo", "https://repo.opencollab.dev/maven-snapshots/")
-
-    configurePublications {
-        pom {
-            name = "MCProtocolLib"
-            url = "https://github.com/GeyserMC/MCProtocolLib/"
-            organization {
-                name = "GeyserMC"
-                url = "https://github.com/GeyserMC"
-            }
-            developers {
-                developer {
-                    id = "steveice10"
-                    name = "Steveice10"
-                    email = "Steveice10@gmail.com"
-                }
-                developer {
-                    id = "GeyserMC"
-                    name = "GeyserMC"
-                    url = "https://geysermc.org/"
-                }
-            }
-        }
-
-        versionMapping {
-            usage(Usage.JAVA_API) { fromResolutionOf(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME) }
-            usage(Usage.JAVA_RUNTIME) { fromResolutionResult() }
-        }
-    }
-
-    javaVersions {
-        target(17)
-        strictVersions()
-        testWith(17)
-        minimumToolchain(17)
-    }
+allprojects {
+    group = "org.geysermc.mcprotocollib"
 }
-
-val repoName = if (version.toString().endsWith("SNAPSHOT")) "maven-snapshots" else "maven-releases"
-publishing {
-    repositories {
-        maven("https://repo.opencollab.dev/${repoName}/") {
-            credentials.username = System.getenv("OPENCOLLAB_USERNAME")
-            credentials.password = System.getenv("OPENCOLLAB_PASSWORD")
-            name = "opencollab"
-        }
-    }
-}
-
-dependencies {
-    // Minecraft related libraries
-    api(libs.opennbt)
-    api(libs.mcauthlib)
-
-    // Kyori adventure
-    api(libs.bundles.adventure)
-
-    // Math utilities
-    api(libs.bundles.math)
-
-    // Stripped down fastutil
-    api(libs.bundles.fastutil)
-
-    // Netty
-    api(libs.bundles.netty)
-
-    // Checker Framework
-    api(libs.checkerframework.qual)
-
-    // Test dependencies
-    testImplementation(libs.junit.jupiter)
-}
-
-lombok {
-    version = libs.versions.lombok.version.get()
-}
-
-group = "com.github.steveice10"
-version = "1.20.4-2-SNAPSHOT"
-description = "MCProtocolLib is a simple library for communicating with Minecraft clients and servers."
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-    withSourcesJar()
-    withJavadocJar()
-}
-
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-    options.compilerArgs.add("-Xlint:all,-processing")
-}
-
-tasks.withType<Javadoc> {
-    title = "MCProtocolLib Javadocs"
-    val options = options as StandardJavadocDocletOptions
-    options.encoding = "UTF-8"
-    options.addStringOption("Xdoclint:all,-missing", "-quiet")
-}
-
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 00000000..b63637b7
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation(libs.indra.common)
+    implementation(libs.indra.git)
+    implementation(libs.lombok)
+}
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
new file mode 100644
index 00000000..b5a0fabf
--- /dev/null
+++ b/buildSrc/settings.gradle.kts
@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/mcprotocollib.base-conventions.gradle.kts b/buildSrc/src/main/kotlin/mcprotocollib.base-conventions.gradle.kts
new file mode 100644
index 00000000..171a4fdb
--- /dev/null
+++ b/buildSrc/src/main/kotlin/mcprotocollib.base-conventions.gradle.kts
@@ -0,0 +1,41 @@
+plugins {
+    `java-library`
+    id("net.kyori.indra")
+    id("net.kyori.indra.git")
+    id("io.freefair.lombok")
+}
+
+indra {
+    github("GeyserMC", "MCProtocolLib") {
+        ci(true)
+        issues(true)
+        scm(true)
+    }
+    mitLicense()
+
+    javaVersions {
+        target(17)
+    }
+}
+
+lombok {
+    // ugh https://discuss.gradle.org/t/precompiled-script-plugin-accessing-another-precompiled-script-plugin-extension/46177/4
+    version = project.rootProject
+        .extensions
+        .getByType(VersionCatalogsExtension::class.java)
+        .named("libs")
+        .findVersion("lombok")
+        .get()
+        .displayName
+}
+
+tasks.withType<JavaCompile> {
+    options.compilerArgs.add("-Xlint:all,-processing")
+}
+
+tasks.withType<Javadoc> {
+    title = "MCProtocolLib Javadocs"
+    val options = options as StandardJavadocDocletOptions
+    options.encoding = "UTF-8"
+    options.addStringOption("Xdoclint:all,-missing", "-quiet")
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/mcprotocollib.publish-conventions.gradle.kts b/buildSrc/src/main/kotlin/mcprotocollib.publish-conventions.gradle.kts
new file mode 100644
index 00000000..1263ddf7
--- /dev/null
+++ b/buildSrc/src/main/kotlin/mcprotocollib.publish-conventions.gradle.kts
@@ -0,0 +1,18 @@
+plugins {
+    id("mcprotocollib.base-conventions")
+    id("net.kyori.indra.publishing")
+}
+
+indra {
+    publishSnapshotsTo("geysermc", "https://repo.opencollab.dev/maven-snapshots")
+    publishReleasesTo("geysermc", "https://repo.opencollab.dev/maven-releases")
+
+    configurePublications {
+        pom {
+            organization {
+                name = "GeyserMC"
+                url = "https://github.com/GeyserMC"
+            }
+        }
+    }
+}
diff --git a/example/build.gradle.kts b/example/build.gradle.kts
index 9af6c3cc..b67a1e71 100644
--- a/example/build.gradle.kts
+++ b/example/build.gradle.kts
@@ -3,9 +3,9 @@ plugins {
 }
 
 dependencies {
-    implementation(rootProject)
+    implementation(projects.protocol)
 }
 
 tasks.javadoc {
-    onlyIf { false }
+    enabled = false
 }
diff --git a/example/src/main/java/com/github/steveice10/packetlib/test/ClientSessionListener.java b/example/src/main/java/org/geysermc/mcprotocollib/network/example/ClientSessionListener.java
similarity index 75%
rename from example/src/main/java/com/github/steveice10/packetlib/test/ClientSessionListener.java
rename to example/src/main/java/org/geysermc/mcprotocollib/network/example/ClientSessionListener.java
index 39ef0b38..b10b482b 100644
--- a/example/src/main/java/com/github/steveice10/packetlib/test/ClientSessionListener.java
+++ b/example/src/main/java/org/geysermc/mcprotocollib/network/example/ClientSessionListener.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.packetlib.test;
+package org.geysermc.mcprotocollib.network.example;
 
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.event.session.ConnectedEvent;
-import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
-import com.github.steveice10.packetlib.event.session.DisconnectingEvent;
-import com.github.steveice10.packetlib.event.session.SessionAdapter;
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.event.session.ConnectedEvent;
+import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
+import org.geysermc.mcprotocollib.network.event.session.DisconnectingEvent;
+import org.geysermc.mcprotocollib.network.event.session.SessionAdapter;
+import org.geysermc.mcprotocollib.network.packet.Packet;
 
 public class ClientSessionListener extends SessionAdapter {
     @Override
diff --git a/example/src/main/java/com/github/steveice10/packetlib/test/PingPacket.java b/example/src/main/java/org/geysermc/mcprotocollib/network/example/PingPacket.java
similarity index 67%
rename from example/src/main/java/com/github/steveice10/packetlib/test/PingPacket.java
rename to example/src/main/java/org/geysermc/mcprotocollib/network/example/PingPacket.java
index a91e5a75..5a928b08 100644
--- a/example/src/main/java/com/github/steveice10/packetlib/test/PingPacket.java
+++ b/example/src/main/java/org/geysermc/mcprotocollib/network/example/PingPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.packetlib.test;
+package org.geysermc.mcprotocollib.network.example;
 
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.packet.Packet;
 import io.netty.buffer.ByteBuf;
 
 public class PingPacket implements Packet {
diff --git a/example/src/main/java/com/github/steveice10/packetlib/test/PingServerTest.java b/example/src/main/java/org/geysermc/mcprotocollib/network/example/PingServerTest.java
similarity index 74%
rename from example/src/main/java/com/github/steveice10/packetlib/test/PingServerTest.java
rename to example/src/main/java/org/geysermc/mcprotocollib/network/example/PingServerTest.java
index 6ee4f0c3..b8941880 100644
--- a/example/src/main/java/com/github/steveice10/packetlib/test/PingServerTest.java
+++ b/example/src/main/java/org/geysermc/mcprotocollib/network/example/PingServerTest.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.packetlib.test;
+package org.geysermc.mcprotocollib.network.example;
 
-import com.github.steveice10.packetlib.Server;
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.tcp.TcpClientSession;
-import com.github.steveice10.packetlib.tcp.TcpServer;
+import org.geysermc.mcprotocollib.network.Server;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.tcp.TcpClientSession;
+import org.geysermc.mcprotocollib.network.tcp.TcpServer;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
diff --git a/example/src/main/java/com/github/steveice10/packetlib/test/ServerListener.java b/example/src/main/java/org/geysermc/mcprotocollib/network/example/ServerListener.java
similarity index 72%
rename from example/src/main/java/com/github/steveice10/packetlib/test/ServerListener.java
rename to example/src/main/java/org/geysermc/mcprotocollib/network/example/ServerListener.java
index afd39752..2d18e920 100644
--- a/example/src/main/java/com/github/steveice10/packetlib/test/ServerListener.java
+++ b/example/src/main/java/org/geysermc/mcprotocollib/network/example/ServerListener.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.packetlib.test;
+package org.geysermc.mcprotocollib.network.example;
 
-import com.github.steveice10.packetlib.event.server.ServerAdapter;
-import com.github.steveice10.packetlib.event.server.ServerBoundEvent;
-import com.github.steveice10.packetlib.event.server.ServerClosedEvent;
-import com.github.steveice10.packetlib.event.server.ServerClosingEvent;
-import com.github.steveice10.packetlib.event.server.SessionAddedEvent;
-import com.github.steveice10.packetlib.event.server.SessionRemovedEvent;
+import org.geysermc.mcprotocollib.network.event.server.ServerAdapter;
+import org.geysermc.mcprotocollib.network.event.server.ServerBoundEvent;
+import org.geysermc.mcprotocollib.network.event.server.ServerClosedEvent;
+import org.geysermc.mcprotocollib.network.event.server.ServerClosingEvent;
+import org.geysermc.mcprotocollib.network.event.server.SessionAddedEvent;
+import org.geysermc.mcprotocollib.network.event.server.SessionRemovedEvent;
 
 import javax.crypto.SecretKey;
 
diff --git a/example/src/main/java/com/github/steveice10/packetlib/test/ServerSessionListener.java b/example/src/main/java/org/geysermc/mcprotocollib/network/example/ServerSessionListener.java
similarity index 68%
rename from example/src/main/java/com/github/steveice10/packetlib/test/ServerSessionListener.java
rename to example/src/main/java/org/geysermc/mcprotocollib/network/example/ServerSessionListener.java
index 81a44cde..6eee4b66 100644
--- a/example/src/main/java/com/github/steveice10/packetlib/test/ServerSessionListener.java
+++ b/example/src/main/java/org/geysermc/mcprotocollib/network/example/ServerSessionListener.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.packetlib.test;
+package org.geysermc.mcprotocollib.network.example;
 
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.event.session.ConnectedEvent;
-import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
-import com.github.steveice10.packetlib.event.session.DisconnectingEvent;
-import com.github.steveice10.packetlib.event.session.SessionAdapter;
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.event.session.ConnectedEvent;
+import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
+import org.geysermc.mcprotocollib.network.event.session.DisconnectingEvent;
+import org.geysermc.mcprotocollib.network.event.session.SessionAdapter;
+import org.geysermc.mcprotocollib.network.packet.Packet;
 
 public class ServerSessionListener extends SessionAdapter {
     @Override
diff --git a/example/src/main/java/com/github/steveice10/packetlib/test/TestProtocol.java b/example/src/main/java/org/geysermc/mcprotocollib/network/example/TestProtocol.java
similarity index 70%
rename from example/src/main/java/com/github/steveice10/packetlib/test/TestProtocol.java
rename to example/src/main/java/org/geysermc/mcprotocollib/network/example/TestProtocol.java
index e59fae53..012af0ab 100644
--- a/example/src/main/java/com/github/steveice10/packetlib/test/TestProtocol.java
+++ b/example/src/main/java/org/geysermc/mcprotocollib/network/example/TestProtocol.java
@@ -1,16 +1,16 @@
-package com.github.steveice10.packetlib.test;
+package org.geysermc.mcprotocollib.network.example;
 
-import com.github.steveice10.packetlib.Server;
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.codec.BasePacketCodecHelper;
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
-import com.github.steveice10.packetlib.codec.PacketDefinition;
-import com.github.steveice10.packetlib.codec.PacketSerializer;
-import com.github.steveice10.packetlib.crypt.AESEncryption;
-import com.github.steveice10.packetlib.crypt.PacketEncryption;
-import com.github.steveice10.packetlib.packet.DefaultPacketHeader;
-import com.github.steveice10.packetlib.packet.PacketHeader;
-import com.github.steveice10.packetlib.packet.PacketProtocol;
+import org.geysermc.mcprotocollib.network.Server;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.codec.BasePacketCodecHelper;
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.codec.PacketDefinition;
+import org.geysermc.mcprotocollib.network.codec.PacketSerializer;
+import org.geysermc.mcprotocollib.network.crypt.AESEncryption;
+import org.geysermc.mcprotocollib.network.crypt.PacketEncryption;
+import org.geysermc.mcprotocollib.network.packet.DefaultPacketHeader;
+import org.geysermc.mcprotocollib.network.packet.PacketHeader;
+import org.geysermc.mcprotocollib.network.packet.PacketProtocol;
 import io.netty.buffer.ByteBuf;
 
 import javax.crypto.SecretKey;
diff --git a/example/src/main/java/com/github/steveice10/mc/protocol/test/MinecraftProtocolTest.java b/example/src/main/java/org/geysermc/mcprotocollib/protocol/example/MinecraftProtocolTest.java
similarity index 81%
rename from example/src/main/java/com/github/steveice10/mc/protocol/test/MinecraftProtocolTest.java
rename to example/src/main/java/org/geysermc/mcprotocollib/protocol/example/MinecraftProtocolTest.java
index efa2d1a0..47963100 100644
--- a/example/src/main/java/com/github/steveice10/mc/protocol/test/MinecraftProtocolTest.java
+++ b/example/src/main/java/org/geysermc/mcprotocollib/protocol/example/MinecraftProtocolTest.java
@@ -1,38 +1,38 @@
-package com.github.steveice10.mc.protocol.test;
+package org.geysermc.mcprotocollib.protocol.example;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
 import com.github.steveice10.mc.auth.exception.request.RequestException;
 import com.github.steveice10.mc.auth.service.AuthenticationService;
 import com.github.steveice10.mc.auth.service.MojangAuthenticationService;
 import com.github.steveice10.mc.auth.service.SessionService;
-import com.github.steveice10.mc.protocol.MinecraftConstants;
-import com.github.steveice10.mc.protocol.MinecraftProtocol;
-import com.github.steveice10.mc.protocol.ServerLoginHandler;
-import com.github.steveice10.mc.protocol.codec.MinecraftCodec;
-import com.github.steveice10.mc.protocol.data.ProtocolState;
-import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
-import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerSpawnInfo;
-import com.github.steveice10.mc.protocol.data.status.PlayerInfo;
-import com.github.steveice10.mc.protocol.data.status.ServerStatusInfo;
-import com.github.steveice10.mc.protocol.data.status.VersionInfo;
-import com.github.steveice10.mc.protocol.data.status.handler.ServerInfoBuilder;
-import com.github.steveice10.mc.protocol.data.status.handler.ServerInfoHandler;
-import com.github.steveice10.mc.protocol.data.status.handler.ServerPingTimeHandler;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundLoginPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundSystemChatPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundChatPacket;
-import com.github.steveice10.packetlib.ProxyInfo;
-import com.github.steveice10.packetlib.Server;
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.event.server.ServerAdapter;
-import com.github.steveice10.packetlib.event.server.ServerClosedEvent;
-import com.github.steveice10.packetlib.event.server.SessionAddedEvent;
-import com.github.steveice10.packetlib.event.server.SessionRemovedEvent;
-import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
-import com.github.steveice10.packetlib.event.session.SessionAdapter;
-import com.github.steveice10.packetlib.packet.Packet;
-import com.github.steveice10.packetlib.tcp.TcpClientSession;
-import com.github.steveice10.packetlib.tcp.TcpServer;
+import org.geysermc.mcprotocollib.protocol.MinecraftConstants;
+import org.geysermc.mcprotocollib.protocol.MinecraftProtocol;
+import org.geysermc.mcprotocollib.protocol.ServerLoginHandler;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodec;
+import org.geysermc.mcprotocollib.protocol.data.ProtocolState;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.PlayerSpawnInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.PlayerInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.ServerStatusInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.VersionInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.handler.ServerInfoBuilder;
+import org.geysermc.mcprotocollib.protocol.data.status.handler.ServerInfoHandler;
+import org.geysermc.mcprotocollib.protocol.data.status.handler.ServerPingTimeHandler;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundLoginPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundSystemChatPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundChatPacket;
+import org.geysermc.mcprotocollib.network.ProxyInfo;
+import org.geysermc.mcprotocollib.network.Server;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.event.server.ServerAdapter;
+import org.geysermc.mcprotocollib.network.event.server.ServerClosedEvent;
+import org.geysermc.mcprotocollib.network.event.server.SessionAddedEvent;
+import org.geysermc.mcprotocollib.network.event.server.SessionRemovedEvent;
+import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
+import org.geysermc.mcprotocollib.network.event.session.SessionAdapter;
+import org.geysermc.mcprotocollib.network.packet.Packet;
+import org.geysermc.mcprotocollib.network.tcp.TcpClientSession;
+import org.geysermc.mcprotocollib.network.tcp.TcpServer;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 80c8234b..5701777a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,9 +2,6 @@ metadata.format.version = "1.1"
 
 [versions]
 
-indra = "3.1.3"
-lombok-version = "1.18.30"
-lombok-plugin = "8.4"
 adventure = "4.15.0"
 opennbt = "1.6"
 mcauthlib = "6621fd0"
@@ -15,6 +12,11 @@ netty-io_uring = "0.0.24.Final"
 checkerframework = "3.42.0"
 junit = "5.8.2"
 
+# buildSrc
+indra = "3.1.3"
+lombok = "1.18.30"
+lombok-plugin = "8.4"
+
 [libraries]
 
 adventure-text-serializer-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "adventure" }
@@ -37,12 +39,10 @@ checkerframework-qual = { module = "org.checkerframework:checker-qual", version.
 
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
 
-[plugins]
-
-indra = { id = "net.kyori.indra", version.ref = "indra" }
-indra-git = { id = "net.kyori.indra.git", version.ref = "indra" }
-indra-publishing = { id = "net.kyori.indra.publishing", version.ref = "indra" }
-lombok = { id = "io.freefair.lombok", version.ref = "lombok-plugin" }
+# buildSrc
+indra-common = { module = "net.kyori:indra-common", version.ref = "indra" }
+indra-git = { module = "net.kyori:indra-git", version.ref = "indra" }
+lombok = { module = "io.freefair.gradle:lombok-plugin", version.ref = "lombok-plugin" }
 
 [bundles]
 
diff --git a/protocol/build.gradle.kts b/protocol/build.gradle.kts
new file mode 100644
index 00000000..afd8247b
--- /dev/null
+++ b/protocol/build.gradle.kts
@@ -0,0 +1,30 @@
+plugins {
+    id("mcprotocollib.publish-conventions")
+}
+
+version = "1.20.4-2-SNAPSHOT"
+description = "MCProtocolLib is a simple library for communicating with Minecraft clients and servers."
+
+dependencies {
+    // Minecraft related libraries
+    api(libs.opennbt)
+    api(libs.mcauthlib)
+
+    // Kyori adventure
+    api(libs.bundles.adventure)
+
+    // Math utilities
+    api(libs.bundles.math)
+
+    // Stripped down fastutil
+    api(libs.bundles.fastutil)
+
+    // Netty
+    api(libs.bundles.netty)
+
+    // Checker Framework
+    api(libs.checkerframework.qual)
+
+    // Test dependencies
+    testImplementation(libs.junit.jupiter)
+}
diff --git a/src/main/java/com/github/steveice10/packetlib/AbstractServer.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/AbstractServer.java
similarity index 96%
rename from src/main/java/com/github/steveice10/packetlib/AbstractServer.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/AbstractServer.java
index 781b9517..5a5c2a46 100644
--- a/src/main/java/com/github/steveice10/packetlib/AbstractServer.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/AbstractServer.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.packetlib;
+package org.geysermc.mcprotocollib.network;
 
-import com.github.steveice10.packetlib.event.server.*;
-import com.github.steveice10.packetlib.packet.PacketProtocol;
+import org.geysermc.mcprotocollib.network.event.server.*;
+import org.geysermc.mcprotocollib.network.packet.PacketProtocol;
 
 import java.util.*;
 import java.util.function.Supplier;
diff --git a/src/main/java/com/github/steveice10/packetlib/BuiltinFlags.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/BuiltinFlags.java
similarity index 93%
rename from src/main/java/com/github/steveice10/packetlib/BuiltinFlags.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/BuiltinFlags.java
index 0080943f..279baa81 100644
--- a/src/main/java/com/github/steveice10/packetlib/BuiltinFlags.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/BuiltinFlags.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.packetlib;
+package org.geysermc.mcprotocollib.network;
 
 /**
  * Built-in PacketLib session flags.
diff --git a/src/main/java/com/github/steveice10/packetlib/ProxyInfo.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/ProxyInfo.java
similarity index 98%
rename from src/main/java/com/github/steveice10/packetlib/ProxyInfo.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/ProxyInfo.java
index 44288827..33844a58 100644
--- a/src/main/java/com/github/steveice10/packetlib/ProxyInfo.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/ProxyInfo.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.packetlib;
+package org.geysermc.mcprotocollib.network;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/com/github/steveice10/packetlib/Server.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/Server.java
similarity index 95%
rename from src/main/java/com/github/steveice10/packetlib/Server.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/Server.java
index d0311ae5..aab5189d 100644
--- a/src/main/java/com/github/steveice10/packetlib/Server.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/Server.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.packetlib;
+package org.geysermc.mcprotocollib.network;
 
-import com.github.steveice10.packetlib.event.server.ServerListener;
-import com.github.steveice10.packetlib.packet.PacketProtocol;
+import org.geysermc.mcprotocollib.network.event.server.ServerListener;
+import org.geysermc.mcprotocollib.network.packet.PacketProtocol;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/github/steveice10/packetlib/Session.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/Session.java
similarity index 93%
rename from src/main/java/com/github/steveice10/packetlib/Session.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/Session.java
index 2822ef05..1565b6a0 100644
--- a/src/main/java/com/github/steveice10/packetlib/Session.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/Session.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.packetlib;
+package org.geysermc.mcprotocollib.network;
 
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
-import com.github.steveice10.packetlib.crypt.PacketEncryption;
-import com.github.steveice10.packetlib.event.session.SessionEvent;
-import com.github.steveice10.packetlib.event.session.SessionListener;
-import com.github.steveice10.packetlib.packet.Packet;
-import com.github.steveice10.packetlib.packet.PacketProtocol;
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.crypt.PacketEncryption;
+import org.geysermc.mcprotocollib.network.event.session.SessionEvent;
+import org.geysermc.mcprotocollib.network.event.session.SessionListener;
+import org.geysermc.mcprotocollib.network.packet.Packet;
+import org.geysermc.mcprotocollib.network.packet.PacketProtocol;
 import net.kyori.adventure.text.Component;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
diff --git a/src/main/java/com/github/steveice10/packetlib/codec/BasePacketCodecHelper.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/codec/BasePacketCodecHelper.java
similarity index 99%
rename from src/main/java/com/github/steveice10/packetlib/codec/BasePacketCodecHelper.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/codec/BasePacketCodecHelper.java
index 544e098c..4d93a227 100644
--- a/src/main/java/com/github/steveice10/packetlib/codec/BasePacketCodecHelper.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/codec/BasePacketCodecHelper.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.packetlib.codec;
+package org.geysermc.mcprotocollib.network.codec;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
diff --git a/src/main/java/com/github/steveice10/packetlib/codec/PacketCodecHelper.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/codec/PacketCodecHelper.java
similarity index 88%
rename from src/main/java/com/github/steveice10/packetlib/codec/PacketCodecHelper.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/codec/PacketCodecHelper.java
index 2fdc67c0..88140e91 100644
--- a/src/main/java/com/github/steveice10/packetlib/codec/PacketCodecHelper.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/codec/PacketCodecHelper.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.packetlib.codec;
+package org.geysermc.mcprotocollib.network.codec;
 
 import io.netty.buffer.ByteBuf;
 
diff --git a/src/main/java/com/github/steveice10/packetlib/codec/PacketDefinition.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/codec/PacketDefinition.java
similarity index 92%
rename from src/main/java/com/github/steveice10/packetlib/codec/PacketDefinition.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/codec/PacketDefinition.java
index fccc0b48..3f446574 100644
--- a/src/main/java/com/github/steveice10/packetlib/codec/PacketDefinition.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/codec/PacketDefinition.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.codec;
+package org.geysermc.mcprotocollib.network.codec;
 
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.network.packet.Packet;
 import io.netty.buffer.ByteBuf;
 
 import java.io.IOException;
diff --git a/src/main/java/com/github/steveice10/packetlib/codec/PacketSerializer.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/codec/PacketSerializer.java
similarity index 74%
rename from src/main/java/com/github/steveice10/packetlib/codec/PacketSerializer.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/codec/PacketSerializer.java
index 5d70e73d..206db388 100644
--- a/src/main/java/com/github/steveice10/packetlib/codec/PacketSerializer.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/codec/PacketSerializer.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.codec;
+package org.geysermc.mcprotocollib.network.codec;
 
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.network.packet.Packet;
 import io.netty.buffer.ByteBuf;
 
 import java.io.IOException;
diff --git a/src/main/java/com/github/steveice10/packetlib/crypt/AESEncryption.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/crypt/AESEncryption.java
similarity index 97%
rename from src/main/java/com/github/steveice10/packetlib/crypt/AESEncryption.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/crypt/AESEncryption.java
index 75361fd3..298feddf 100644
--- a/src/main/java/com/github/steveice10/packetlib/crypt/AESEncryption.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/crypt/AESEncryption.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.packetlib.crypt;
+package org.geysermc.mcprotocollib.network.crypt;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
diff --git a/src/main/java/com/github/steveice10/packetlib/crypt/PacketEncryption.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/crypt/PacketEncryption.java
similarity index 97%
rename from src/main/java/com/github/steveice10/packetlib/crypt/PacketEncryption.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/crypt/PacketEncryption.java
index f185c34c..a68e5bfa 100644
--- a/src/main/java/com/github/steveice10/packetlib/crypt/PacketEncryption.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/crypt/PacketEncryption.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.packetlib.crypt;
+package org.geysermc.mcprotocollib.network.crypt;
 
 /**
  * An interface for encrypting packets.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/server/ServerAdapter.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerAdapter.java
similarity index 89%
rename from src/main/java/com/github/steveice10/packetlib/event/server/ServerAdapter.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerAdapter.java
index 64c99bc3..c2fd5c7c 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/server/ServerAdapter.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerAdapter.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.packetlib.event.server;
+package org.geysermc.mcprotocollib.network.event.server;
 
 /**
  * An adapter for picking server events to listen for.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/server/ServerBoundEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerBoundEvent.java
similarity index 85%
rename from src/main/java/com/github/steveice10/packetlib/event/server/ServerBoundEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerBoundEvent.java
index 52736e67..8eb9c9f3 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/server/ServerBoundEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerBoundEvent.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.event.server;
+package org.geysermc.mcprotocollib.network.event.server;
 
-import com.github.steveice10.packetlib.Server;
+import org.geysermc.mcprotocollib.network.Server;
 
 /**
  * Called when the server is bound to its host and port.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/server/ServerClosedEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerClosedEvent.java
similarity index 85%
rename from src/main/java/com/github/steveice10/packetlib/event/server/ServerClosedEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerClosedEvent.java
index 65f7037f..649e4840 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/server/ServerClosedEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerClosedEvent.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.event.server;
+package org.geysermc.mcprotocollib.network.event.server;
 
-import com.github.steveice10.packetlib.Server;
+import org.geysermc.mcprotocollib.network.Server;
 
 /**
  * Called when the server is closed.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/server/ServerClosingEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerClosingEvent.java
similarity index 85%
rename from src/main/java/com/github/steveice10/packetlib/event/server/ServerClosingEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerClosingEvent.java
index 3e44ad46..bf34ba34 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/server/ServerClosingEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerClosingEvent.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.event.server;
+package org.geysermc.mcprotocollib.network.event.server;
 
-import com.github.steveice10.packetlib.Server;
+import org.geysermc.mcprotocollib.network.Server;
 
 /**
  * Called when the server is about to close.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/server/ServerEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerEvent.java
similarity index 79%
rename from src/main/java/com/github/steveice10/packetlib/event/server/ServerEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerEvent.java
index 5387d86c..3319fdba 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/server/ServerEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerEvent.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.packetlib.event.server;
+package org.geysermc.mcprotocollib.network.event.server;
 
 /**
  * An event relating to servers.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/server/ServerListener.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerListener.java
similarity index 94%
rename from src/main/java/com/github/steveice10/packetlib/event/server/ServerListener.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerListener.java
index dbe1ac25..3b88c48f 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/server/ServerListener.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/ServerListener.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.packetlib.event.server;
+package org.geysermc.mcprotocollib.network.event.server;
 
 /**
  * A listener for listening to server events.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/server/SessionAddedEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/SessionAddedEvent.java
similarity index 85%
rename from src/main/java/com/github/steveice10/packetlib/event/server/SessionAddedEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/SessionAddedEvent.java
index a328c173..b5ecef57 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/server/SessionAddedEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/SessionAddedEvent.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.packetlib.event.server;
+package org.geysermc.mcprotocollib.network.event.server;
 
-import com.github.steveice10.packetlib.Server;
-import com.github.steveice10.packetlib.Session;
+import org.geysermc.mcprotocollib.network.Server;
+import org.geysermc.mcprotocollib.network.Session;
 
 /**
  * Called when a session is added to the server.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/server/SessionRemovedEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/SessionRemovedEvent.java
similarity index 86%
rename from src/main/java/com/github/steveice10/packetlib/event/server/SessionRemovedEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/SessionRemovedEvent.java
index ae80c572..6a594918 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/server/SessionRemovedEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/server/SessionRemovedEvent.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.packetlib.event.server;
+package org.geysermc.mcprotocollib.network.event.server;
 
-import com.github.steveice10.packetlib.Server;
-import com.github.steveice10.packetlib.Session;
+import org.geysermc.mcprotocollib.network.Server;
+import org.geysermc.mcprotocollib.network.Session;
 
 /**
  * Called when a session is removed and disconnected from the server.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/session/ConnectedEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/ConnectedEvent.java
similarity index 85%
rename from src/main/java/com/github/steveice10/packetlib/event/session/ConnectedEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/ConnectedEvent.java
index 37933357..2d0c2c0b 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/session/ConnectedEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/ConnectedEvent.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.event.session;
+package org.geysermc.mcprotocollib.network.event.session;
 
-import com.github.steveice10.packetlib.Session;
+import org.geysermc.mcprotocollib.network.Session;
 
 /**
  * Called when the session connects.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/session/DisconnectedEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/DisconnectedEvent.java
similarity index 92%
rename from src/main/java/com/github/steveice10/packetlib/event/session/DisconnectedEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/DisconnectedEvent.java
index 35aacba9..493b78d0 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/session/DisconnectedEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/DisconnectedEvent.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.event.session;
+package org.geysermc.mcprotocollib.network.event.session;
 
-import com.github.steveice10.packetlib.Session;
+import org.geysermc.mcprotocollib.network.Session;
 import net.kyori.adventure.text.Component;
 
 /**
diff --git a/src/main/java/com/github/steveice10/packetlib/event/session/DisconnectingEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/DisconnectingEvent.java
similarity index 92%
rename from src/main/java/com/github/steveice10/packetlib/event/session/DisconnectingEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/DisconnectingEvent.java
index 267959e9..936f449e 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/session/DisconnectingEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/DisconnectingEvent.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.event.session;
+package org.geysermc.mcprotocollib.network.event.session;
 
-import com.github.steveice10.packetlib.Session;
+import org.geysermc.mcprotocollib.network.Session;
 import net.kyori.adventure.text.Component;
 
 /**
diff --git a/src/main/java/com/github/steveice10/packetlib/event/session/PacketErrorEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/PacketErrorEvent.java
similarity index 94%
rename from src/main/java/com/github/steveice10/packetlib/event/session/PacketErrorEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/PacketErrorEvent.java
index e5f5cecc..9eb0e009 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/session/PacketErrorEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/PacketErrorEvent.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.event.session;
+package org.geysermc.mcprotocollib.network.event.session;
 
-import com.github.steveice10.packetlib.Session;
+import org.geysermc.mcprotocollib.network.Session;
 
 /**
  * Called when a session encounters an error while reading or writing packet data.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/session/PacketSendingEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/PacketSendingEvent.java
similarity index 92%
rename from src/main/java/com/github/steveice10/packetlib/event/session/PacketSendingEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/PacketSendingEvent.java
index 469352ca..5b658d6a 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/session/PacketSendingEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/PacketSendingEvent.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.packetlib.event.session;
+package org.geysermc.mcprotocollib.network.event.session;
 
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.packet.Packet;
 
 /**
  * Called when the session is sending a packet.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/session/SessionAdapter.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/SessionAdapter.java
similarity index 80%
rename from src/main/java/com/github/steveice10/packetlib/event/session/SessionAdapter.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/SessionAdapter.java
index 83de67b3..4da5fc50 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/session/SessionAdapter.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/SessionAdapter.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.packetlib.event.session;
+package org.geysermc.mcprotocollib.network.event.session;
 
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.network.packet.Packet;
+import org.geysermc.mcprotocollib.network.Session;
 
 /**
  * An adapter for picking session events to listen for.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/session/SessionEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/SessionEvent.java
similarity index 79%
rename from src/main/java/com/github/steveice10/packetlib/event/session/SessionEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/SessionEvent.java
index 584e30da..b0350538 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/session/SessionEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/SessionEvent.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.packetlib.event.session;
+package org.geysermc.mcprotocollib.network.event.session;
 
 /**
  * An event relating to sessions.
diff --git a/src/main/java/com/github/steveice10/packetlib/event/session/SessionListener.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/SessionListener.java
similarity index 88%
rename from src/main/java/com/github/steveice10/packetlib/event/session/SessionListener.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/SessionListener.java
index 2e522e52..ec5a4421 100644
--- a/src/main/java/com/github/steveice10/packetlib/event/session/SessionListener.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/event/session/SessionListener.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.packetlib.event.session;
+package org.geysermc.mcprotocollib.network.event.session;
 
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.packet.Packet;
 
 /**
  * A listener for listening to session events.
diff --git a/src/main/java/com/github/steveice10/packetlib/helper/TransportHelper.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/helper/TransportHelper.java
similarity index 95%
rename from src/main/java/com/github/steveice10/packetlib/helper/TransportHelper.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/helper/TransportHelper.java
index 87a75bfa..906fd44d 100644
--- a/src/main/java/com/github/steveice10/packetlib/helper/TransportHelper.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/helper/TransportHelper.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.packetlib.helper;
+package org.geysermc.mcprotocollib.network.helper;
 
 import io.netty.channel.epoll.Epoll;
 import io.netty.channel.kqueue.KQueue;
diff --git a/src/main/java/com/github/steveice10/packetlib/packet/BufferedPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/BufferedPacket.java
similarity index 78%
rename from src/main/java/com/github/steveice10/packetlib/packet/BufferedPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/BufferedPacket.java
index 9aea7ee3..8dd21560 100644
--- a/src/main/java/com/github/steveice10/packetlib/packet/BufferedPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/BufferedPacket.java
@@ -1,38 +1,38 @@
-package com.github.steveice10.packetlib.packet;
-
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
-import com.github.steveice10.packetlib.codec.PacketDefinition;
-import com.github.steveice10.packetlib.codec.PacketSerializer;
-import io.netty.buffer.ByteBuf;
-
-public class BufferedPacket implements Packet, PacketSerializer<BufferedPacket, PacketCodecHelper> {
-    private final Class<? extends Packet> packetClass;
-    private final byte[] buf;
-
-    public BufferedPacket(Class<? extends Packet> packetClass, byte[] buf) {
-        this.packetClass = packetClass;
-        this.buf = buf;
-    }
-
-    public Class<? extends Packet> getPacketClass() {
-        return packetClass;
-    }
-
-    @Override
-    public boolean isPriority() {
-        return true;
-    }
-
-    @Override
-    public void serialize(ByteBuf buf, PacketCodecHelper helper, BufferedPacket packet) {
-        buf.writeBytes(this.buf);
-    }
-
-    @Override
-    public BufferedPacket deserialize(ByteBuf buf, PacketCodecHelper helper, PacketDefinition<BufferedPacket, PacketCodecHelper> definition) {
-        byte[] array = new byte[buf.readableBytes()];
-        buf.readBytes(array);
-
-        return new BufferedPacket(definition.getPacketClass(), array);
-    }
-}
+package org.geysermc.mcprotocollib.network.packet;
+
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.codec.PacketDefinition;
+import org.geysermc.mcprotocollib.network.codec.PacketSerializer;
+import io.netty.buffer.ByteBuf;
+
+public class BufferedPacket implements Packet, PacketSerializer<BufferedPacket, PacketCodecHelper> {
+    private final Class<? extends Packet> packetClass;
+    private final byte[] buf;
+
+    public BufferedPacket(Class<? extends Packet> packetClass, byte[] buf) {
+        this.packetClass = packetClass;
+        this.buf = buf;
+    }
+
+    public Class<? extends Packet> getPacketClass() {
+        return packetClass;
+    }
+
+    @Override
+    public boolean isPriority() {
+        return true;
+    }
+
+    @Override
+    public void serialize(ByteBuf buf, PacketCodecHelper helper, BufferedPacket packet) {
+        buf.writeBytes(this.buf);
+    }
+
+    @Override
+    public BufferedPacket deserialize(ByteBuf buf, PacketCodecHelper helper, PacketDefinition<BufferedPacket, PacketCodecHelper> definition) {
+        byte[] array = new byte[buf.readableBytes()];
+        buf.readBytes(array);
+
+        return new BufferedPacket(definition.getPacketClass(), array);
+    }
+}
diff --git a/src/main/java/com/github/steveice10/packetlib/packet/DefaultPacketHeader.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/DefaultPacketHeader.java
similarity index 91%
rename from src/main/java/com/github/steveice10/packetlib/packet/DefaultPacketHeader.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/DefaultPacketHeader.java
index b918d209..9cd20b7f 100644
--- a/src/main/java/com/github/steveice10/packetlib/packet/DefaultPacketHeader.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/DefaultPacketHeader.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.packet;
+package org.geysermc.mcprotocollib.network.packet;
 
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
 import io.netty.buffer.ByteBuf;
 
 /**
diff --git a/src/main/java/com/github/steveice10/packetlib/packet/Packet.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/Packet.java
similarity index 89%
rename from src/main/java/com/github/steveice10/packetlib/packet/Packet.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/Packet.java
index 0850f291..56cd2db7 100644
--- a/src/main/java/com/github/steveice10/packetlib/packet/Packet.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/Packet.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.packetlib.packet;
+package org.geysermc.mcprotocollib.network.packet;
 
 import io.netty.buffer.ByteBuf;
 
diff --git a/src/main/java/com/github/steveice10/packetlib/packet/PacketHeader.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/PacketHeader.java
similarity index 94%
rename from src/main/java/com/github/steveice10/packetlib/packet/PacketHeader.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/PacketHeader.java
index 99eeb266..38a1bd74 100644
--- a/src/main/java/com/github/steveice10/packetlib/packet/PacketHeader.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/PacketHeader.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.packet;
+package org.geysermc.mcprotocollib.network.packet;
 
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
 import io.netty.buffer.ByteBuf;
 
 /**
diff --git a/src/main/java/com/github/steveice10/packetlib/packet/PacketProtocol.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/PacketProtocol.java
similarity index 96%
rename from src/main/java/com/github/steveice10/packetlib/packet/PacketProtocol.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/PacketProtocol.java
index a17db1a0..ce85ce1c 100644
--- a/src/main/java/com/github/steveice10/packetlib/packet/PacketProtocol.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/packet/PacketProtocol.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.packetlib.packet;
+package org.geysermc.mcprotocollib.network.packet;
 
-import com.github.steveice10.packetlib.Server;
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
-import com.github.steveice10.packetlib.codec.PacketDefinition;
-import com.github.steveice10.packetlib.codec.PacketSerializer;
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.codec.PacketDefinition;
+import org.geysermc.mcprotocollib.network.codec.PacketSerializer;
+import org.geysermc.mcprotocollib.network.Server;
+import org.geysermc.mcprotocollib.network.Session;
 import io.netty.buffer.ByteBuf;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
diff --git a/src/main/java/com/github/steveice10/packetlib/tcp/TcpBundlerUnpacker.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpBundlerUnpacker.java
similarity index 74%
rename from src/main/java/com/github/steveice10/packetlib/tcp/TcpBundlerUnpacker.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpBundlerUnpacker.java
index 8420e981..e632b033 100644
--- a/src/main/java/com/github/steveice10/packetlib/tcp/TcpBundlerUnpacker.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpBundlerUnpacker.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.packetlib.tcp;
+package org.geysermc.mcprotocollib.network.tcp;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundBundlePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundDelimiterPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundBundlePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundDelimiterPacket;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageDecoder;
 
diff --git a/src/main/java/com/github/steveice10/packetlib/tcp/TcpClientSession.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpClientSession.java
similarity index 97%
rename from src/main/java/com/github/steveice10/packetlib/tcp/TcpClientSession.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpClientSession.java
index 6044761b..8f290ddd 100644
--- a/src/main/java/com/github/steveice10/packetlib/tcp/TcpClientSession.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpClientSession.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.packetlib.tcp;
+package org.geysermc.mcprotocollib.network.tcp;
 
-import com.github.steveice10.packetlib.BuiltinFlags;
-import com.github.steveice10.packetlib.ProxyInfo;
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
-import com.github.steveice10.packetlib.helper.TransportHelper;
-import com.github.steveice10.packetlib.packet.PacketProtocol;
+import org.geysermc.mcprotocollib.network.BuiltinFlags;
+import org.geysermc.mcprotocollib.network.ProxyInfo;
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.helper.TransportHelper;
+import org.geysermc.mcprotocollib.network.packet.PacketProtocol;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.epoll.EpollDatagramChannel;
diff --git a/src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketCodec.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpPacketCodec.java
similarity index 87%
rename from src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketCodec.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpPacketCodec.java
index 4384e94f..fe936ed9 100644
--- a/src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketCodec.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpPacketCodec.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.packetlib.tcp;
+package org.geysermc.mcprotocollib.network.tcp;
 
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
-import com.github.steveice10.packetlib.codec.PacketDefinition;
-import com.github.steveice10.packetlib.event.session.PacketErrorEvent;
-import com.github.steveice10.packetlib.packet.Packet;
-import com.github.steveice10.packetlib.packet.PacketProtocol;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.codec.PacketDefinition;
+import org.geysermc.mcprotocollib.network.event.session.PacketErrorEvent;
+import org.geysermc.mcprotocollib.network.packet.Packet;
+import org.geysermc.mcprotocollib.network.packet.PacketProtocol;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageCodec;
@@ -31,7 +31,7 @@ public class TcpPacketCodec extends ByteToMessageCodec<Packet> {
         try {
             int packetId = this.client ? packetProtocol.getServerboundId(packet) : packetProtocol.getClientboundId(packet);
             PacketDefinition definition = this.client ? packetProtocol.getServerboundDefinition(packetId) : packetProtocol.getClientboundDefinition(packetId);
-            
+
             packetProtocol.getPacketHeader().writePacketId(buf, codecHelper, packetId);
             definition.getSerializer().serialize(buf, codecHelper, packet);
         } catch (Throwable t) {
diff --git a/src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketCompression.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpPacketCompression.java
similarity index 96%
rename from src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketCompression.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpPacketCompression.java
index d8b46419..e5e980a0 100644
--- a/src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketCompression.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpPacketCompression.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.tcp;
+package org.geysermc.mcprotocollib.network.tcp;
 
-import com.github.steveice10.packetlib.Session;
+import org.geysermc.mcprotocollib.network.Session;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketEncryptor.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpPacketEncryptor.java
similarity index 93%
rename from src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketEncryptor.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpPacketEncryptor.java
index 8f5e7d59..09088711 100644
--- a/src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketEncryptor.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpPacketEncryptor.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.tcp;
+package org.geysermc.mcprotocollib.network.tcp;
 
-import com.github.steveice10.packetlib.crypt.PacketEncryption;
+import org.geysermc.mcprotocollib.network.crypt.PacketEncryption;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageCodec;
diff --git a/src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketSizer.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpPacketSizer.java
similarity index 95%
rename from src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketSizer.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpPacketSizer.java
index 8b43482d..4480aa19 100644
--- a/src/main/java/com/github/steveice10/packetlib/tcp/TcpPacketSizer.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpPacketSizer.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.packetlib.tcp;
+package org.geysermc.mcprotocollib.network.tcp;
 
-import com.github.steveice10.packetlib.Session;
+import org.geysermc.mcprotocollib.network.Session;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/src/main/java/com/github/steveice10/packetlib/tcp/TcpServer.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpServer.java
similarity index 95%
rename from src/main/java/com/github/steveice10/packetlib/tcp/TcpServer.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpServer.java
index 538e4547..3dcef301 100644
--- a/src/main/java/com/github/steveice10/packetlib/tcp/TcpServer.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpServer.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.packetlib.tcp;
+package org.geysermc.mcprotocollib.network.tcp;
 
-import com.github.steveice10.packetlib.AbstractServer;
-import com.github.steveice10.packetlib.BuiltinFlags;
-import com.github.steveice10.packetlib.helper.TransportHelper;
-import com.github.steveice10.packetlib.packet.PacketProtocol;
+import org.geysermc.mcprotocollib.network.AbstractServer;
+import org.geysermc.mcprotocollib.network.BuiltinFlags;
+import org.geysermc.mcprotocollib.network.helper.TransportHelper;
+import org.geysermc.mcprotocollib.network.packet.PacketProtocol;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.epoll.EpollEventLoopGroup;
 import io.netty.channel.epoll.EpollServerSocketChannel;
diff --git a/src/main/java/com/github/steveice10/packetlib/tcp/TcpServerSession.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpServerSession.java
similarity index 89%
rename from src/main/java/com/github/steveice10/packetlib/tcp/TcpServerSession.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpServerSession.java
index 26c88a53..121ea961 100644
--- a/src/main/java/com/github/steveice10/packetlib/tcp/TcpServerSession.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpServerSession.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.packetlib.tcp;
+package org.geysermc.mcprotocollib.network.tcp;
 
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
-import com.github.steveice10.packetlib.packet.PacketProtocol;
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.packet.PacketProtocol;
 import io.netty.channel.ChannelHandlerContext;
 
 import java.util.HashMap;
diff --git a/src/main/java/com/github/steveice10/packetlib/tcp/TcpSession.java b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpSession.java
similarity index 94%
rename from src/main/java/com/github/steveice10/packetlib/tcp/TcpSession.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpSession.java
index 4045b065..f3c014a1 100644
--- a/src/main/java/com/github/steveice10/packetlib/tcp/TcpSession.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/network/tcp/TcpSession.java
@@ -1,15 +1,15 @@
-package com.github.steveice10.packetlib.tcp;
+package org.geysermc.mcprotocollib.network.tcp;
 
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.crypt.PacketEncryption;
-import com.github.steveice10.packetlib.event.session.ConnectedEvent;
-import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
-import com.github.steveice10.packetlib.event.session.DisconnectingEvent;
-import com.github.steveice10.packetlib.event.session.PacketSendingEvent;
-import com.github.steveice10.packetlib.event.session.SessionEvent;
-import com.github.steveice10.packetlib.event.session.SessionListener;
-import com.github.steveice10.packetlib.packet.Packet;
-import com.github.steveice10.packetlib.packet.PacketProtocol;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.crypt.PacketEncryption;
+import org.geysermc.mcprotocollib.network.event.session.ConnectedEvent;
+import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
+import org.geysermc.mcprotocollib.network.event.session.DisconnectingEvent;
+import org.geysermc.mcprotocollib.network.event.session.PacketSendingEvent;
+import org.geysermc.mcprotocollib.network.event.session.SessionEvent;
+import org.geysermc.mcprotocollib.network.event.session.SessionListener;
+import org.geysermc.mcprotocollib.network.packet.Packet;
+import org.geysermc.mcprotocollib.network.packet.PacketProtocol;
 import io.netty.channel.*;
 import io.netty.handler.timeout.ReadTimeoutException;
 import io.netty.handler.timeout.ReadTimeoutHandler;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/CheckedBiConsumer.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/CheckedBiConsumer.java
similarity index 73%
rename from src/main/java/com/github/steveice10/mc/protocol/CheckedBiConsumer.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/CheckedBiConsumer.java
index da80521c..361e9b3c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/CheckedBiConsumer.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/CheckedBiConsumer.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol;
+package org.geysermc.mcprotocollib.protocol;
 
 @FunctionalInterface
 public interface CheckedBiConsumer<T, U, E extends Throwable> {
diff --git a/src/main/java/com/github/steveice10/mc/protocol/CheckedFunction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/CheckedFunction.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/CheckedFunction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/CheckedFunction.java
index c710368f..546fd96d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/CheckedFunction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/CheckedFunction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol;
+package org.geysermc.mcprotocollib.protocol;
 
 @FunctionalInterface
 public interface CheckedFunction<T, R, E extends Throwable> {
diff --git a/src/main/java/com/github/steveice10/mc/protocol/ClientListener.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ClientListener.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/ClientListener.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ClientListener.java
index 2e3711dc..8fddaa1c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/ClientListener.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ClientListener.java
@@ -1,39 +1,39 @@
-package com.github.steveice10.mc.protocol;
+package org.geysermc.mcprotocollib.protocol;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
 import com.github.steveice10.mc.auth.exception.request.InvalidCredentialsException;
 import com.github.steveice10.mc.auth.exception.request.RequestException;
 import com.github.steveice10.mc.auth.exception.request.ServiceUnavailableException;
 import com.github.steveice10.mc.auth.service.SessionService;
-import com.github.steveice10.mc.protocol.data.ProtocolState;
-import com.github.steveice10.mc.protocol.data.UnexpectedEncryptionException;
-import com.github.steveice10.mc.protocol.data.handshake.HandshakeIntent;
-import com.github.steveice10.mc.protocol.data.status.ServerStatusInfo;
-import com.github.steveice10.mc.protocol.data.status.handler.ServerInfoHandler;
-import com.github.steveice10.mc.protocol.data.status.handler.ServerPingTimeHandler;
-import com.github.steveice10.mc.protocol.packet.configuration.clientbound.ClientboundFinishConfigurationPacket;
-import com.github.steveice10.mc.protocol.packet.configuration.serverbound.ServerboundFinishConfigurationPacket;
-import com.github.steveice10.mc.protocol.packet.handshake.serverbound.ClientIntentionPacket;
-import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundDisconnectPacket;
-import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundKeepAlivePacket;
-import com.github.steveice10.mc.protocol.packet.common.serverbound.ServerboundKeepAlivePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundStartConfigurationPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundConfigurationAcknowledgedPacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundGameProfilePacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundHelloPacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundLoginCompressionPacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundLoginDisconnectPacket;
-import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundHelloPacket;
-import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundKeyPacket;
-import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundLoginAcknowledgedPacket;
-import com.github.steveice10.mc.protocol.packet.status.clientbound.ClientboundPongResponsePacket;
-import com.github.steveice10.mc.protocol.packet.status.clientbound.ClientboundStatusResponsePacket;
-import com.github.steveice10.mc.protocol.packet.status.serverbound.ServerboundPingRequestPacket;
-import com.github.steveice10.mc.protocol.packet.status.serverbound.ServerboundStatusRequestPacket;
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.event.session.ConnectedEvent;
-import com.github.steveice10.packetlib.event.session.SessionAdapter;
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.protocol.data.ProtocolState;
+import org.geysermc.mcprotocollib.protocol.data.UnexpectedEncryptionException;
+import org.geysermc.mcprotocollib.protocol.data.handshake.HandshakeIntent;
+import org.geysermc.mcprotocollib.protocol.data.status.ServerStatusInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.handler.ServerInfoHandler;
+import org.geysermc.mcprotocollib.protocol.data.status.handler.ServerPingTimeHandler;
+import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundFinishConfigurationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.configuration.serverbound.ServerboundFinishConfigurationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.handshake.serverbound.ClientIntentionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundDisconnectPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundKeepAlivePacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundKeepAlivePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundStartConfigurationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundConfigurationAcknowledgedPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundGameProfilePacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundHelloPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginCompressionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginDisconnectPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.serverbound.ServerboundHelloPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.serverbound.ServerboundKeyPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.serverbound.ServerboundLoginAcknowledgedPacket;
+import org.geysermc.mcprotocollib.protocol.packet.status.clientbound.ClientboundPongResponsePacket;
+import org.geysermc.mcprotocollib.protocol.packet.status.clientbound.ClientboundStatusResponsePacket;
+import org.geysermc.mcprotocollib.protocol.packet.status.serverbound.ServerboundPingRequestPacket;
+import org.geysermc.mcprotocollib.protocol.packet.status.serverbound.ServerboundStatusRequestPacket;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.event.session.ConnectedEvent;
+import org.geysermc.mcprotocollib.network.event.session.SessionAdapter;
+import org.geysermc.mcprotocollib.network.packet.Packet;
 import lombok.AllArgsConstructor;
 import lombok.NonNull;
 import lombok.SneakyThrows;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/MinecraftConstants.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/MinecraftConstants.java
similarity index 93%
rename from src/main/java/com/github/steveice10/mc/protocol/MinecraftConstants.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/MinecraftConstants.java
index 4e3f923d..fbb11b0a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/MinecraftConstants.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/MinecraftConstants.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol;
+package org.geysermc.mcprotocollib.protocol;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
 import com.github.steveice10.mc.auth.service.SessionService;
-import com.github.steveice10.packetlib.packet.DefaultPacketHeader;
-import com.github.steveice10.packetlib.packet.PacketHeader;
+import org.geysermc.mcprotocollib.network.packet.DefaultPacketHeader;
+import org.geysermc.mcprotocollib.network.packet.PacketHeader;
 
 /**
  * Class containing various constants for Minecraft sessions.
diff --git a/src/main/java/com/github/steveice10/mc/protocol/MinecraftProtocol.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/MinecraftProtocol.java
similarity index 89%
rename from src/main/java/com/github/steveice10/mc/protocol/MinecraftProtocol.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/MinecraftProtocol.java
index 9768fcf1..b2543a5a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/MinecraftProtocol.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/MinecraftProtocol.java
@@ -1,22 +1,22 @@
-package com.github.steveice10.mc.protocol;
+package org.geysermc.mcprotocollib.protocol;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
-import com.github.steveice10.mc.protocol.codec.MinecraftCodec;
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.PacketCodec;
-import com.github.steveice10.mc.protocol.codec.PacketStateCodec;
-import com.github.steveice10.mc.protocol.data.ProtocolState;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodec;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.PacketCodec;
+import org.geysermc.mcprotocollib.protocol.codec.PacketStateCodec;
+import org.geysermc.mcprotocollib.protocol.data.ProtocolState;
 import com.github.steveice10.opennbt.NBTIO;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.github.steveice10.packetlib.Server;
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
-import com.github.steveice10.packetlib.codec.PacketDefinition;
-import com.github.steveice10.packetlib.crypt.AESEncryption;
-import com.github.steveice10.packetlib.crypt.PacketEncryption;
-import com.github.steveice10.packetlib.packet.Packet;
-import com.github.steveice10.packetlib.packet.PacketHeader;
-import com.github.steveice10.packetlib.packet.PacketProtocol;
+import org.geysermc.mcprotocollib.network.Server;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.codec.PacketDefinition;
+import org.geysermc.mcprotocollib.network.crypt.AESEncryption;
+import org.geysermc.mcprotocollib.network.crypt.PacketEncryption;
+import org.geysermc.mcprotocollib.network.packet.Packet;
+import org.geysermc.mcprotocollib.network.packet.PacketHeader;
+import org.geysermc.mcprotocollib.network.packet.PacketProtocol;
 import io.netty.buffer.ByteBuf;
 import lombok.Getter;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/ServerListener.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ServerListener.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/ServerListener.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ServerListener.java
index 59e4ef82..36465b73 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/ServerListener.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ServerListener.java
@@ -1,38 +1,38 @@
-package com.github.steveice10.mc.protocol;
+package org.geysermc.mcprotocollib.protocol;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
 import com.github.steveice10.mc.auth.exception.request.RequestException;
 import com.github.steveice10.mc.auth.service.SessionService;
-import com.github.steveice10.mc.protocol.data.ProtocolState;
-import com.github.steveice10.mc.protocol.data.status.PlayerInfo;
-import com.github.steveice10.mc.protocol.data.status.ServerStatusInfo;
-import com.github.steveice10.mc.protocol.data.status.VersionInfo;
-import com.github.steveice10.mc.protocol.data.status.handler.ServerInfoBuilder;
-import com.github.steveice10.mc.protocol.packet.configuration.clientbound.ClientboundFinishConfigurationPacket;
-import com.github.steveice10.mc.protocol.packet.configuration.clientbound.ClientboundRegistryDataPacket;
-import com.github.steveice10.mc.protocol.packet.configuration.serverbound.ServerboundFinishConfigurationPacket;
-import com.github.steveice10.mc.protocol.packet.handshake.serverbound.ClientIntentionPacket;
-import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundDisconnectPacket;
-import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundKeepAlivePacket;
-import com.github.steveice10.mc.protocol.packet.common.serverbound.ServerboundKeepAlivePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundConfigurationAcknowledgedPacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundGameProfilePacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundHelloPacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundLoginCompressionPacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundLoginDisconnectPacket;
-import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundHelloPacket;
-import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundKeyPacket;
-import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundLoginAcknowledgedPacket;
-import com.github.steveice10.mc.protocol.packet.status.clientbound.ClientboundPongResponsePacket;
-import com.github.steveice10.mc.protocol.packet.status.clientbound.ClientboundStatusResponsePacket;
-import com.github.steveice10.mc.protocol.packet.status.serverbound.ServerboundPingRequestPacket;
-import com.github.steveice10.mc.protocol.packet.status.serverbound.ServerboundStatusRequestPacket;
+import org.geysermc.mcprotocollib.protocol.data.ProtocolState;
+import org.geysermc.mcprotocollib.protocol.data.status.PlayerInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.ServerStatusInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.VersionInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.handler.ServerInfoBuilder;
+import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundFinishConfigurationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundRegistryDataPacket;
+import org.geysermc.mcprotocollib.protocol.packet.configuration.serverbound.ServerboundFinishConfigurationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.handshake.serverbound.ClientIntentionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundDisconnectPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundKeepAlivePacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundKeepAlivePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundConfigurationAcknowledgedPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundGameProfilePacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundHelloPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginCompressionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginDisconnectPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.serverbound.ServerboundHelloPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.serverbound.ServerboundKeyPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.serverbound.ServerboundLoginAcknowledgedPacket;
+import org.geysermc.mcprotocollib.protocol.packet.status.clientbound.ClientboundPongResponsePacket;
+import org.geysermc.mcprotocollib.protocol.packet.status.clientbound.ClientboundStatusResponsePacket;
+import org.geysermc.mcprotocollib.protocol.packet.status.serverbound.ServerboundPingRequestPacket;
+import org.geysermc.mcprotocollib.protocol.packet.status.serverbound.ServerboundStatusRequestPacket;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.event.session.ConnectedEvent;
-import com.github.steveice10.packetlib.event.session.DisconnectingEvent;
-import com.github.steveice10.packetlib.event.session.SessionAdapter;
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.event.session.ConnectedEvent;
+import org.geysermc.mcprotocollib.network.event.session.DisconnectingEvent;
+import org.geysermc.mcprotocollib.network.event.session.SessionAdapter;
+import org.geysermc.mcprotocollib.network.packet.Packet;
 import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.text.Component;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/ServerLoginHandler.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ServerLoginHandler.java
similarity index 67%
rename from src/main/java/com/github/steveice10/mc/protocol/ServerLoginHandler.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ServerLoginHandler.java
index 08abd8c8..ca29dd04 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/ServerLoginHandler.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ServerLoginHandler.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol;
+package org.geysermc.mcprotocollib.protocol;
 
-import com.github.steveice10.mc.protocol.data.ProtocolState;
-import com.github.steveice10.packetlib.Session;
+import org.geysermc.mcprotocollib.protocol.data.ProtocolState;
+import org.geysermc.mcprotocollib.network.Session;
 
 /**
  * Interface for handling a session logging in to a server.
diff --git a/src/main/java/com/github/steveice10/mc/protocol/codec/MinecraftCodec.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java
similarity index 56%
rename from src/main/java/com/github/steveice10/mc/protocol/codec/MinecraftCodec.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java
index 1145f01f..6f30de9b 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/codec/MinecraftCodec.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java
@@ -1,196 +1,196 @@
-package com.github.steveice10.mc.protocol.codec;
+package org.geysermc.mcprotocollib.protocol.codec;
 
-import com.github.steveice10.mc.protocol.data.ProtocolState;
-import com.github.steveice10.mc.protocol.data.game.level.event.LevelEventType;
-import com.github.steveice10.mc.protocol.data.game.level.sound.BuiltinSound;
-import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundCustomPayloadPacket;
-import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundDisconnectPacket;
-import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundKeepAlivePacket;
-import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundPingPacket;
-import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundResourcePackPopPacket;
-import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundResourcePackPushPacket;
-import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundUpdateTagsPacket;
-import com.github.steveice10.mc.protocol.packet.common.serverbound.ServerboundClientInformationPacket;
-import com.github.steveice10.mc.protocol.packet.common.serverbound.ServerboundCustomPayloadPacket;
-import com.github.steveice10.mc.protocol.packet.common.serverbound.ServerboundKeepAlivePacket;
-import com.github.steveice10.mc.protocol.packet.common.serverbound.ServerboundPongPacket;
-import com.github.steveice10.mc.protocol.packet.common.serverbound.ServerboundResourcePackPacket;
-import com.github.steveice10.mc.protocol.packet.configuration.clientbound.ClientboundFinishConfigurationPacket;
-import com.github.steveice10.mc.protocol.packet.configuration.clientbound.ClientboundRegistryDataPacket;
-import com.github.steveice10.mc.protocol.packet.configuration.clientbound.ClientboundUpdateEnabledFeaturesPacket;
-import com.github.steveice10.mc.protocol.packet.configuration.serverbound.ServerboundFinishConfigurationPacket;
-import com.github.steveice10.mc.protocol.packet.handshake.serverbound.ClientIntentionPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundAwardStatsPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundBossEventPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundChangeDifficultyPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundCommandSuggestionsPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundCommandsPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundCooldownPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundCustomChatCompletionsPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundDeleteChatPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundDelimiterPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundDisguisedChatPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundLoginPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundPlayerChatPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundPlayerInfoRemovePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundPlayerInfoUpdatePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundRecipePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundRespawnPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundSelectAdvancementsTabPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundServerDataPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundSetCameraPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundSoundEntityPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundStartConfigurationPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundStopSoundPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundSystemChatPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundTabListPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundTickingStatePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundTickingStepPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundUpdateAdvancementsPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundUpdateRecipesPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundAnimatePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundDamageEventPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundEntityEventPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundHurtAnimationPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityPosPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityPosRotPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityRotPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundMoveVehiclePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundRemoveEntitiesPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundRemoveMobEffectPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundRotateHeadPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityDataPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityLinkPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityMotionPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEquipmentPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetPassengersPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundTakeItemEntityPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundTeleportEntityPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundUpdateAttributesPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundUpdateMobEffectPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundBlockChangedAckPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerAbilitiesPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerCombatEndPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerCombatEnterPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerCombatKillPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerLookAtPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerPositionPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundSetCarriedItemPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundSetExperiencePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundSetHealthPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddEntityPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddExperienceOrbPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundContainerClosePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetContentPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetDataPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetSlotPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundHorseScreenOpenPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundMerchantOffersPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundOpenBookPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundOpenScreenPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory.ClientboundPlaceGhostRecipePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundBlockDestructionPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundBlockEntityDataPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundBlockEventPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundBlockUpdatePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundChunkBatchFinishedPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundChunkBatchStartPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundChunksBiomesPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundExplodePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundForgetLevelChunkPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundGameEventPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLevelChunkWithLightPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLevelEventPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLevelParticlesPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundLightUpdatePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundMapItemDataPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundOpenSignEditorPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSectionBlocksUpdatePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetChunkCacheCenterPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetChunkCacheRadiusPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetDefaultSpawnPositionPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetSimulationDistancePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSetTimePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundSoundPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundTagQueryPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundInitializeBorderPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderCenterPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderLerpSizePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderSizePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderWarningDelayPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderWarningDistancePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundResetScorePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetDisplayObjectivePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetObjectivePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetPlayerTeamPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetScorePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundClearTitlesPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetActionBarTextPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetSubtitleTextPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetTitleTextPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.title.ClientboundSetTitlesAnimationPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundChangeDifficultyPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundChatAckPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundChatCommandPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundChatPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundChatSessionUpdatePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundClientCommandPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundCommandSuggestionPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundConfigurationAcknowledgedPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundLockDifficultyPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerButtonClickPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerClickPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerClosePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundContainerSlotStateChangedPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundEditBookPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundPickItemPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundPlaceRecipePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundRecipeBookChangeSettingsPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundRecipeBookSeenRecipePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundRenameItemPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSeenAdvancementsPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSelectTradePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetBeaconPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetCommandBlockPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetCommandMinecartPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetCreativeModeSlotPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetJigsawBlockPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSetStructureBlockPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundAcceptTeleportationPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundBlockEntityTagQuery;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundChunkBatchReceivedPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundEntityTagQuery;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundJigsawGeneratePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundMoveVehiclePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundPaddleBoatPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundPlayerInputPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundSignUpdatePacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.level.ServerboundTeleportToEntityPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundInteractPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosRotPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerRotPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerStatusOnlyPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerAbilitiesPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerActionPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundPlayerCommandPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundSetCarriedItemPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundSwingPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundUseItemOnPacket;
-import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.ServerboundUseItemPacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundCustomQueryPacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundGameProfilePacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundHelloPacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundLoginCompressionPacket;
-import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundLoginDisconnectPacket;
-import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundCustomQueryAnswerPacket;
-import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundHelloPacket;
-import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundKeyPacket;
-import com.github.steveice10.mc.protocol.packet.login.serverbound.ServerboundLoginAcknowledgedPacket;
-import com.github.steveice10.mc.protocol.packet.status.clientbound.ClientboundPongResponsePacket;
-import com.github.steveice10.mc.protocol.packet.status.clientbound.ClientboundStatusResponsePacket;
-import com.github.steveice10.mc.protocol.packet.status.serverbound.ServerboundPingRequestPacket;
-import com.github.steveice10.mc.protocol.packet.status.serverbound.ServerboundStatusRequestPacket;
+import org.geysermc.mcprotocollib.protocol.data.ProtocolState;
+import org.geysermc.mcprotocollib.protocol.data.game.level.event.LevelEventType;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.BuiltinSound;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundCustomPayloadPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundDisconnectPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundKeepAlivePacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundPingPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundResourcePackPopPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundResourcePackPushPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundUpdateTagsPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundClientInformationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundCustomPayloadPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundKeepAlivePacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundPongPacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundResourcePackPacket;
+import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundFinishConfigurationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundRegistryDataPacket;
+import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundUpdateEnabledFeaturesPacket;
+import org.geysermc.mcprotocollib.protocol.packet.configuration.serverbound.ServerboundFinishConfigurationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.handshake.serverbound.ClientIntentionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundAwardStatsPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundBossEventPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundChangeDifficultyPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundCommandSuggestionsPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundCommandsPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundCooldownPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundCustomChatCompletionsPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundDeleteChatPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundDelimiterPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundDisguisedChatPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundLoginPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundPlayerChatPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundPlayerInfoRemovePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundPlayerInfoUpdatePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundRecipePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundRespawnPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundSelectAdvancementsTabPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundServerDataPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundSetCameraPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundSoundEntityPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundStartConfigurationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundStopSoundPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundSystemChatPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundTabListPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundTickingStatePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundTickingStepPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundUpdateAdvancementsPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundUpdateRecipesPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundAnimatePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundDamageEventPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundEntityEventPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundHurtAnimationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityPosPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityPosRotPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundMoveEntityRotPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundMoveVehiclePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundRemoveEntitiesPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundRemoveMobEffectPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundRotateHeadPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityDataPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityLinkPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityMotionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundSetEquipmentPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundSetPassengersPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundTakeItemEntityPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundTeleportEntityPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundUpdateAttributesPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundUpdateMobEffectPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundBlockChangedAckPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerAbilitiesPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerCombatEndPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerCombatEnterPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerCombatKillPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerLookAtPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundPlayerPositionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundSetCarriedItemPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundSetExperiencePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player.ClientboundSetHealthPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddEntityPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddExperienceOrbPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundContainerClosePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetContentPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetDataPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetSlotPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundHorseScreenOpenPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundMerchantOffersPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundOpenBookPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundOpenScreenPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundPlaceGhostRecipePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundBlockDestructionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundBlockEntityDataPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundBlockEventPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundBlockUpdatePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundChunkBatchFinishedPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundChunkBatchStartPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundChunksBiomesPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundExplodePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundForgetLevelChunkPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundGameEventPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundLevelChunkWithLightPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundLevelEventPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundLevelParticlesPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundLightUpdatePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundMapItemDataPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundOpenSignEditorPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundSectionBlocksUpdatePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundSetChunkCacheCenterPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundSetChunkCacheRadiusPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundSetDefaultSpawnPositionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundSetSimulationDistancePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundSetTimePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundSoundPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.ClientboundTagQueryPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border.ClientboundInitializeBorderPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderCenterPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderLerpSizePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderSizePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderWarningDelayPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border.ClientboundSetBorderWarningDistancePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard.ClientboundResetScorePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetDisplayObjectivePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetObjectivePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetPlayerTeamPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetScorePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.title.ClientboundClearTitlesPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.title.ClientboundSetActionBarTextPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.title.ClientboundSetSubtitleTextPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.title.ClientboundSetTitleTextPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.title.ClientboundSetTitlesAnimationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundChangeDifficultyPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundChatAckPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundChatCommandPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundChatPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundChatSessionUpdatePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundClientCommandPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundCommandSuggestionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundConfigurationAcknowledgedPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundLockDifficultyPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundContainerButtonClickPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundContainerClickPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundContainerClosePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundContainerSlotStateChangedPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundEditBookPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundPickItemPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundPlaceRecipePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundRecipeBookChangeSettingsPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundRecipeBookSeenRecipePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundRenameItemPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundSeenAdvancementsPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundSelectTradePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundSetBeaconPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundSetCommandBlockPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundSetCommandMinecartPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundSetCreativeModeSlotPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundSetJigsawBlockPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundSetStructureBlockPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundAcceptTeleportationPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundBlockEntityTagQuery;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundChunkBatchReceivedPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundEntityTagQuery;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundJigsawGeneratePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundMoveVehiclePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundPaddleBoatPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundPlayerInputPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundSignUpdatePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundTeleportToEntityPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundInteractPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosRotPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerRotPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerStatusOnlyPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundPlayerAbilitiesPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundPlayerActionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundPlayerCommandPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundSetCarriedItemPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundSwingPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundUseItemOnPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundUseItemPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundCustomQueryPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundGameProfilePacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundHelloPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginCompressionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginDisconnectPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.serverbound.ServerboundCustomQueryAnswerPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.serverbound.ServerboundHelloPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.serverbound.ServerboundKeyPacket;
+import org.geysermc.mcprotocollib.protocol.packet.login.serverbound.ServerboundLoginAcknowledgedPacket;
+import org.geysermc.mcprotocollib.protocol.packet.status.clientbound.ClientboundPongResponsePacket;
+import org.geysermc.mcprotocollib.protocol.packet.status.clientbound.ClientboundStatusResponsePacket;
+import org.geysermc.mcprotocollib.protocol.packet.status.serverbound.ServerboundPingRequestPacket;
+import org.geysermc.mcprotocollib.protocol.packet.status.serverbound.ServerboundStatusRequestPacket;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/codec/MinecraftCodecHelper.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodecHelper.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/codec/MinecraftCodecHelper.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodecHelper.java
index e4caa67c..d84a8c5b 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/codec/MinecraftCodecHelper.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodecHelper.java
@@ -1,70 +1,70 @@
-package com.github.steveice10.mc.protocol.codec;
+package org.geysermc.mcprotocollib.protocol.codec;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
-import com.github.steveice10.mc.protocol.CheckedBiConsumer;
-import com.github.steveice10.mc.protocol.CheckedFunction;
-import com.github.steveice10.mc.protocol.data.DefaultComponentSerializer;
-import com.github.steveice10.mc.protocol.data.game.Identifier;
-import com.github.steveice10.mc.protocol.data.game.chat.numbers.BlankFormat;
-import com.github.steveice10.mc.protocol.data.game.chat.numbers.FixedFormat;
-import com.github.steveice10.mc.protocol.data.game.chat.numbers.NumberFormat;
-import com.github.steveice10.mc.protocol.data.game.chat.numbers.StyledFormat;
-import com.github.steveice10.mc.protocol.data.game.chunk.BitStorage;
-import com.github.steveice10.mc.protocol.data.game.chunk.ChunkSection;
-import com.github.steveice10.mc.protocol.data.game.chunk.DataPalette;
-import com.github.steveice10.mc.protocol.data.game.chunk.NibbleArray3d;
-import com.github.steveice10.mc.protocol.data.game.chunk.palette.GlobalPalette;
-import com.github.steveice10.mc.protocol.data.game.chunk.palette.ListPalette;
-import com.github.steveice10.mc.protocol.data.game.chunk.palette.MapPalette;
-import com.github.steveice10.mc.protocol.data.game.chunk.palette.Palette;
-import com.github.steveice10.mc.protocol.data.game.chunk.palette.PaletteType;
-import com.github.steveice10.mc.protocol.data.game.chunk.palette.SingletonPalette;
-import com.github.steveice10.mc.protocol.data.game.entity.Effect;
-import com.github.steveice10.mc.protocol.data.game.entity.EntityEvent;
-import com.github.steveice10.mc.protocol.data.game.entity.attribute.ModifierOperation;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.GlobalPos;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.Pose;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.SnifferState;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.VillagerData;
-import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
-import com.github.steveice10.mc.protocol.data.game.entity.player.BlockBreakStage;
-import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
-import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerSpawnInfo;
-import com.github.steveice10.mc.protocol.data.game.entity.type.PaintingType;
-import com.github.steveice10.mc.protocol.data.game.level.LightUpdateData;
-import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
-import com.github.steveice10.mc.protocol.data.game.level.event.LevelEvent;
-import com.github.steveice10.mc.protocol.data.game.level.event.LevelEventType;
-import com.github.steveice10.mc.protocol.data.game.level.event.UnknownLevelEvent;
-import com.github.steveice10.mc.protocol.data.game.level.particle.BlockParticleData;
-import com.github.steveice10.mc.protocol.data.game.level.particle.DustColorTransitionParticleData;
-import com.github.steveice10.mc.protocol.data.game.level.particle.DustParticleData;
-import com.github.steveice10.mc.protocol.data.game.level.particle.FallingDustParticleData;
-import com.github.steveice10.mc.protocol.data.game.level.particle.ItemParticleData;
-import com.github.steveice10.mc.protocol.data.game.level.particle.Particle;
-import com.github.steveice10.mc.protocol.data.game.level.particle.ParticleData;
-import com.github.steveice10.mc.protocol.data.game.level.particle.ParticleType;
-import com.github.steveice10.mc.protocol.data.game.level.particle.SculkChargeParticleData;
-import com.github.steveice10.mc.protocol.data.game.level.particle.ShriekParticleData;
-import com.github.steveice10.mc.protocol.data.game.level.particle.VibrationParticleData;
-import com.github.steveice10.mc.protocol.data.game.level.particle.positionsource.BlockPositionSource;
-import com.github.steveice10.mc.protocol.data.game.level.particle.positionsource.EntityPositionSource;
-import com.github.steveice10.mc.protocol.data.game.level.particle.positionsource.PositionSource;
-import com.github.steveice10.mc.protocol.data.game.level.particle.positionsource.PositionSourceType;
-import com.github.steveice10.mc.protocol.data.game.level.sound.BuiltinSound;
-import com.github.steveice10.mc.protocol.data.game.level.sound.CustomSound;
-import com.github.steveice10.mc.protocol.data.game.level.sound.Sound;
-import com.github.steveice10.mc.protocol.data.game.level.sound.SoundCategory;
-import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient;
-import com.github.steveice10.mc.protocol.data.game.statistic.StatisticCategory;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundLoginPacket;
+import org.geysermc.mcprotocollib.protocol.CheckedBiConsumer;
+import org.geysermc.mcprotocollib.protocol.CheckedFunction;
+import org.geysermc.mcprotocollib.protocol.data.DefaultComponentSerializer;
+import org.geysermc.mcprotocollib.protocol.data.game.Identifier;
+import org.geysermc.mcprotocollib.protocol.data.game.chat.numbers.BlankFormat;
+import org.geysermc.mcprotocollib.protocol.data.game.chat.numbers.FixedFormat;
+import org.geysermc.mcprotocollib.protocol.data.game.chat.numbers.NumberFormat;
+import org.geysermc.mcprotocollib.protocol.data.game.chat.numbers.StyledFormat;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.BitStorage;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.ChunkSection;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.DataPalette;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.NibbleArray3d;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.palette.GlobalPalette;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.palette.ListPalette;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.palette.MapPalette;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.palette.Palette;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.palette.PaletteType;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.palette.SingletonPalette;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.Effect;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.EntityEvent;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.attribute.ModifierOperation;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.GlobalPos;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.MetadataType;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.Pose;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.SnifferState;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.VillagerData;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.BlockBreakStage;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.PlayerSpawnInfo;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.type.PaintingType;
+import org.geysermc.mcprotocollib.protocol.data.game.level.LightUpdateData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityType;
+import org.geysermc.mcprotocollib.protocol.data.game.level.event.LevelEvent;
+import org.geysermc.mcprotocollib.protocol.data.game.level.event.LevelEventType;
+import org.geysermc.mcprotocollib.protocol.data.game.level.event.UnknownLevelEvent;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.BlockParticleData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.DustColorTransitionParticleData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.DustParticleData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.FallingDustParticleData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.ItemParticleData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.Particle;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.ParticleData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.ParticleType;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.SculkChargeParticleData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.ShriekParticleData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.VibrationParticleData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.positionsource.BlockPositionSource;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.positionsource.EntityPositionSource;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.positionsource.PositionSource;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.positionsource.PositionSourceType;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.BuiltinSound;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.CustomSound;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.Sound;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.SoundCategory;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.Ingredient;
+import org.geysermc.mcprotocollib.protocol.data.game.statistic.StatisticCategory;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundLoginPacket;
 import com.github.steveice10.opennbt.NBTIO;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
-import com.github.steveice10.packetlib.codec.BasePacketCodecHelper;
+import org.geysermc.mcprotocollib.network.codec.BasePacketCodecHelper;
 import com.google.gson.JsonElement;
 import io.netty.buffer.ByteBuf;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/codec/MinecraftPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftPacket.java
similarity index 64%
rename from src/main/java/com/github/steveice10/mc/protocol/codec/MinecraftPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftPacket.java
index 9fbea889..a7c022da 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/codec/MinecraftPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftPacket.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.codec;
+package org.geysermc.mcprotocollib.protocol.codec;
 
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.network.packet.Packet;
 import io.netty.buffer.ByteBuf;
 
 import java.io.IOException;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/codec/MinecraftPacketSerializer.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftPacketSerializer.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/codec/MinecraftPacketSerializer.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftPacketSerializer.java
index 1026e411..b97863a2 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/codec/MinecraftPacketSerializer.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftPacketSerializer.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.codec;
+package org.geysermc.mcprotocollib.protocol.codec;
 
-import com.github.steveice10.packetlib.codec.PacketDefinition;
-import com.github.steveice10.packetlib.codec.PacketSerializer;
+import org.geysermc.mcprotocollib.network.codec.PacketDefinition;
+import org.geysermc.mcprotocollib.network.codec.PacketSerializer;
 import io.netty.buffer.ByteBuf;
 import lombok.RequiredArgsConstructor;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/codec/NbtComponentSerializer.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/NbtComponentSerializer.java
similarity index 99%
rename from src/main/java/com/github/steveice10/mc/protocol/codec/NbtComponentSerializer.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/NbtComponentSerializer.java
index 123e75c8..70deb8c1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/codec/NbtComponentSerializer.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/NbtComponentSerializer.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.codec;
+package org.geysermc.mcprotocollib.protocol.codec;
 
 import com.github.steveice10.opennbt.tag.builtin.ByteArrayTag;
 import com.github.steveice10.opennbt.tag.builtin.ByteTag;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/codec/PacketCodec.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/PacketCodec.java
similarity index 94%
rename from src/main/java/com/github/steveice10/mc/protocol/codec/PacketCodec.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/PacketCodec.java
index 4bb454b3..e7082664 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/codec/PacketCodec.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/PacketCodec.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.codec;
+package org.geysermc.mcprotocollib.protocol.codec;
 
-import com.github.steveice10.mc.protocol.data.ProtocolState;
+import org.geysermc.mcprotocollib.protocol.data.ProtocolState;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/codec/PacketFactory.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/PacketFactory.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/codec/PacketFactory.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/PacketFactory.java
index 78aaf245..ca40d2b1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/codec/PacketFactory.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/PacketFactory.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.codec;
+package org.geysermc.mcprotocollib.protocol.codec;
 
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.packet.Packet;
 import io.netty.buffer.ByteBuf;
 
 import java.io.IOException;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/codec/PacketStateCodec.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/PacketStateCodec.java
similarity index 86%
rename from src/main/java/com/github/steveice10/mc/protocol/codec/PacketStateCodec.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/PacketStateCodec.java
index 624b3a8b..3e097787 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/codec/PacketStateCodec.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/PacketStateCodec.java
@@ -1,18 +1,15 @@
-package com.github.steveice10.mc.protocol.codec;
+package org.geysermc.mcprotocollib.protocol.codec;
 
-import com.github.steveice10.mc.protocol.MinecraftConstants;
-import com.github.steveice10.packetlib.Server;
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.codec.PacketCodecHelper;
-import com.github.steveice10.packetlib.codec.PacketDefinition;
-import com.github.steveice10.packetlib.packet.PacketHeader;
-import com.github.steveice10.packetlib.packet.PacketProtocol;
+import org.geysermc.mcprotocollib.protocol.MinecraftConstants;
+import org.geysermc.mcprotocollib.network.Server;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.codec.PacketCodecHelper;
+import org.geysermc.mcprotocollib.network.codec.PacketDefinition;
+import org.geysermc.mcprotocollib.network.packet.PacketHeader;
+import org.geysermc.mcprotocollib.network.packet.PacketProtocol;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class PacketStateCodec extends PacketProtocol {
 
     public static Builder builder() {
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/DefaultComponentSerializer.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/DefaultComponentSerializer.java
similarity index 93%
rename from src/main/java/com/github/steveice10/mc/protocol/data/DefaultComponentSerializer.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/DefaultComponentSerializer.java
index 42426275..d3974d81 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/DefaultComponentSerializer.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/DefaultComponentSerializer.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data;
+package org.geysermc.mcprotocollib.protocol.data;
 
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.kyori.adventure.text.serializer.json.legacyimpl.NBTLegacyHoverEventSerializer;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/ProtocolState.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/ProtocolState.java
similarity index 66%
rename from src/main/java/com/github/steveice10/mc/protocol/data/ProtocolState.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/ProtocolState.java
index e31e1385..d4f1479c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/ProtocolState.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/ProtocolState.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data;
+package org.geysermc.mcprotocollib.protocol.data;
 
 public enum ProtocolState {
     HANDSHAKE,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/UnexpectedEncryptionException.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/UnexpectedEncryptionException.java
similarity index 90%
rename from src/main/java/com/github/steveice10/mc/protocol/data/UnexpectedEncryptionException.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/UnexpectedEncryptionException.java
index 9a190d16..8963b1dc 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/UnexpectedEncryptionException.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/UnexpectedEncryptionException.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data;
+package org.geysermc.mcprotocollib.protocol.data;
 
 import java.io.Serial;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/ArgumentSignature.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/ArgumentSignature.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/ArgumentSignature.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/ArgumentSignature.java
index c0ade508..4c28b786 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/ArgumentSignature.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/ArgumentSignature.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game;
+package org.geysermc.mcprotocollib.protocol.data.game;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/BossBarAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/BossBarAction.java
similarity index 82%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/BossBarAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/BossBarAction.java
index 96e1d823..d95c8a49 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/BossBarAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/BossBarAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game;
+package org.geysermc.mcprotocollib.protocol.data.game;
 
 public enum BossBarAction {
     ADD,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/BossBarColor.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/BossBarColor.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/BossBarColor.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/BossBarColor.java
index 8c91dbf3..083c24e2 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/BossBarColor.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/BossBarColor.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game;
+package org.geysermc.mcprotocollib.protocol.data.game;
 
 public enum BossBarColor {
     PINK,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/BossBarDivision.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/BossBarDivision.java
similarity index 82%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/BossBarDivision.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/BossBarDivision.java
index 069a5b90..f663d95c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/BossBarDivision.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/BossBarDivision.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game;
+package org.geysermc.mcprotocollib.protocol.data.game;
 
 public enum BossBarDivision {
     NONE,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/ClientCommand.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/ClientCommand.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/ClientCommand.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/ClientCommand.java
index 0f0bc0ad..d45eb8fc 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/ClientCommand.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/ClientCommand.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game;
+package org.geysermc.mcprotocollib.protocol.data.game;
 
 public enum ClientCommand {
     RESPAWN,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/Identifier.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/Identifier.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/Identifier.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/Identifier.java
index 93f1168b..7044f116 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/Identifier.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/Identifier.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game;
+package org.geysermc.mcprotocollib.protocol.data.game;
 
 public final class Identifier {
     private Identifier() {
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/PlayerListEntry.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/PlayerListEntry.java
similarity index 86%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/PlayerListEntry.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/PlayerListEntry.java
index a99ebf60..138f10d1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/PlayerListEntry.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/PlayerListEntry.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.data.game;
+package org.geysermc.mcprotocollib.protocol.data.game;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
-import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/PlayerListEntryAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/PlayerListEntryAction.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/PlayerListEntryAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/PlayerListEntryAction.java
index a2f489c3..0a944954 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/PlayerListEntryAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/PlayerListEntryAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game;
+package org.geysermc.mcprotocollib.protocol.data.game;
 
 public enum PlayerListEntryAction {
     ADD_PLAYER,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/ResourcePackStatus.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/ResourcePackStatus.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/ResourcePackStatus.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/ResourcePackStatus.java
index 4f1437fb..ddcb0613 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/ResourcePackStatus.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/ResourcePackStatus.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game;
+package org.geysermc.mcprotocollib.protocol.data.game;
 
 public enum ResourcePackStatus {
     SUCCESSFULLY_LOADED,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/UnlockRecipesAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/UnlockRecipesAction.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/UnlockRecipesAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/UnlockRecipesAction.java
index 7f12a936..a44db22b 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/UnlockRecipesAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/UnlockRecipesAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game;
+package org.geysermc.mcprotocollib.protocol.data.game;
 
 public enum UnlockRecipesAction {
     INIT,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/advancement/Advancement.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/advancement/Advancement.java
similarity index 93%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/advancement/Advancement.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/advancement/Advancement.java
index 59b6a108..a312252c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/advancement/Advancement.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/advancement/Advancement.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.advancement;
+package org.geysermc.mcprotocollib.protocol.data.game.advancement;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/BuiltinChatType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/BuiltinChatType.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chat/BuiltinChatType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/BuiltinChatType.java
index 2862a008..9edddbee 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/BuiltinChatType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/BuiltinChatType.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.chat;
+package org.geysermc.mcprotocollib.protocol.data.game.chat;
 
-import com.github.steveice10.mc.protocol.data.game.Identifier;
+import org.geysermc.mcprotocollib.protocol.data.game.Identifier;
 
 import java.util.HashMap;
 import java.util.Locale;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/ChatCompletionAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/ChatCompletionAction.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chat/ChatCompletionAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/ChatCompletionAction.java
index 0294c9ea..12ed90f3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/ChatCompletionAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/ChatCompletionAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.chat;
+package org.geysermc.mcprotocollib.protocol.data.game.chat;
 
 public enum ChatCompletionAction {
     ADD,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/ChatFilterType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/ChatFilterType.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chat/ChatFilterType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/ChatFilterType.java
index a4f59383..b0a88812 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/ChatFilterType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/ChatFilterType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.chat;
+package org.geysermc.mcprotocollib.protocol.data.game.chat;
 
 public enum ChatFilterType {
     PASS_THROUGH,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/MessageSignature.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/MessageSignature.java
similarity index 84%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chat/MessageSignature.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/MessageSignature.java
index a67191c5..cb690e80 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/MessageSignature.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/MessageSignature.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.chat;
+package org.geysermc.mcprotocollib.protocol.data.game.chat;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/BlankFormat.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/BlankFormat.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/BlankFormat.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/BlankFormat.java
index 4e97f4b8..d744a202 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/BlankFormat.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/BlankFormat.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.chat.numbers;
+package org.geysermc.mcprotocollib.protocol.data.game.chat.numbers;
 
 public class BlankFormat implements NumberFormat {
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/FixedFormat.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/FixedFormat.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/FixedFormat.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/FixedFormat.java
index f9bc35d3..af0643b2 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/FixedFormat.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/FixedFormat.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.chat.numbers;
+package org.geysermc.mcprotocollib.protocol.data.game.chat.numbers;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/NumberFormat.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/NumberFormat.java
new file mode 100644
index 00000000..0dd11557
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/NumberFormat.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.chat.numbers;
+
+public interface NumberFormat {
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/StyledFormat.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/StyledFormat.java
similarity index 84%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/StyledFormat.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/StyledFormat.java
index cac97d91..1e979748 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/StyledFormat.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chat/numbers/StyledFormat.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.chat.numbers;
+package org.geysermc.mcprotocollib.protocol.data.game.chat.numbers;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/BitStorage.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/BitStorage.java
similarity index 98%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/BitStorage.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/BitStorage.java
index 0b60468d..7cc7b4c4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/BitStorage.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/BitStorage.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.chunk;
+package org.geysermc.mcprotocollib.protocol.data.game.chunk;
 
 import lombok.*;
 import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/ChunkBiomeData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/ChunkBiomeData.java
similarity index 73%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/ChunkBiomeData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/ChunkBiomeData.java
index 8d440db1..836309a0 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/ChunkBiomeData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/ChunkBiomeData.java
@@ -1,12 +1,12 @@
-package com.github.steveice10.mc.protocol.data.game.chunk;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class ChunkBiomeData {
-    private final int x;
-    private final int z;
-    private final byte[] buffer;
-}
+package org.geysermc.mcprotocollib.protocol.data.game.chunk;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class ChunkBiomeData {
+    private final int x;
+    private final int z;
+    private final byte[] buffer;
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/ChunkSection.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/ChunkSection.java
similarity index 94%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/ChunkSection.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/ChunkSection.java
index bbdcae3e..d1d449b6 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/ChunkSection.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/ChunkSection.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.chunk;
+package org.geysermc.mcprotocollib.protocol.data.game.chunk;
 
 import lombok.*;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/DataPalette.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/DataPalette.java
similarity index 97%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/DataPalette.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/DataPalette.java
index d0858c8c..e12b90be 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/DataPalette.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/DataPalette.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.chunk;
+package org.geysermc.mcprotocollib.protocol.data.game.chunk;
 
-import com.github.steveice10.mc.protocol.data.game.chunk.palette.*;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.palette.*;
 import lombok.*;
 
 @Getter
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/NibbleArray3d.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/NibbleArray3d.java
similarity index 95%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/NibbleArray3d.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/NibbleArray3d.java
index f53a79ab..4c6a4a12 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/NibbleArray3d.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/NibbleArray3d.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.chunk;
+package org.geysermc.mcprotocollib.protocol.data.game.chunk;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/GlobalPalette.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/GlobalPalette.java
similarity index 88%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/GlobalPalette.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/GlobalPalette.java
index 65fb8f7b..2778bc59 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/GlobalPalette.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/GlobalPalette.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.chunk.palette;
+package org.geysermc.mcprotocollib.protocol.data.game.chunk.palette;
 
 import lombok.EqualsAndHashCode;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/ListPalette.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/ListPalette.java
similarity index 92%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/ListPalette.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/ListPalette.java
index 73cb2f66..663362b9 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/ListPalette.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/ListPalette.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.chunk.palette;
+package org.geysermc.mcprotocollib.protocol.data.game.chunk.palette;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
 import io.netty.buffer.ByteBuf;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/MapPalette.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/MapPalette.java
similarity index 93%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/MapPalette.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/MapPalette.java
index 5936e1a8..41d0cdb7 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/MapPalette.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/MapPalette.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.chunk.palette;
+package org.geysermc.mcprotocollib.protocol.data.game.chunk.palette;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
 import io.netty.buffer.ByteBuf;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/Palette.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/Palette.java
similarity index 93%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/Palette.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/Palette.java
index 8fe6ffc2..339dfa1f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/Palette.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/Palette.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.chunk.palette;
+package org.geysermc.mcprotocollib.protocol.data.game.chunk.palette;
 
 /**
  * A palette for mapping block states to storage IDs.
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/PaletteType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/PaletteType.java
similarity index 86%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/PaletteType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/PaletteType.java
index 639bf49c..7cd90327 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/PaletteType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/PaletteType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.chunk.palette;
+package org.geysermc.mcprotocollib.protocol.data.game.chunk.palette;
 
 import lombok.Getter;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/SingletonPalette.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/SingletonPalette.java
similarity index 89%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/SingletonPalette.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/SingletonPalette.java
index 7a650759..60727161 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chunk/palette/SingletonPalette.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/palette/SingletonPalette.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.chunk.palette;
+package org.geysermc.mcprotocollib.protocol.data.game.chunk.palette;
 
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/CommandNode.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandNode.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/CommandNode.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandNode.java
index 5eeb8de4..eebd56f9 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/CommandNode.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandNode.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.command;
+package org.geysermc.mcprotocollib.protocol.data.game.command;
 
-import com.github.steveice10.mc.protocol.data.game.command.properties.CommandProperties;
+import org.geysermc.mcprotocollib.protocol.data.game.command.properties.CommandProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/CommandParser.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandParser.java
similarity index 93%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/CommandParser.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandParser.java
index 3fc7ddab..c173e07e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/CommandParser.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandParser.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.command;
+package org.geysermc.mcprotocollib.protocol.data.game.command;
 
 public enum CommandParser {
     BOOL,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/CommandType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandType.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/CommandType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandType.java
index 00e5ef30..2afb4ece 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/CommandType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.command;
+package org.geysermc.mcprotocollib.protocol.data.game.command;
 
 public enum CommandType {
     ROOT,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/SuggestionType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/SuggestionType.java
similarity index 88%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/SuggestionType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/SuggestionType.java
index bde7aefe..40512ecb 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/SuggestionType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/SuggestionType.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.command;
+package org.geysermc.mcprotocollib.protocol.data.game.command;
 
-import com.github.steveice10.mc.protocol.data.game.Identifier;
+import org.geysermc.mcprotocollib.protocol.data.game.Identifier;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.HashMap;
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/CommandProperties.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/CommandProperties.java
new file mode 100644
index 00000000..2054b9df
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/CommandProperties.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.command.properties;
+
+public interface CommandProperties {
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/DoubleProperties.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/DoubleProperties.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/DoubleProperties.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/DoubleProperties.java
index c6fe4bd9..3c7d55cf 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/DoubleProperties.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/DoubleProperties.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.command.properties;
+package org.geysermc.mcprotocollib.protocol.data.game.command.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/EntityProperties.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/EntityProperties.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/EntityProperties.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/EntityProperties.java
index d4fbbfef..c506f6a2 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/EntityProperties.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/EntityProperties.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.command.properties;
+package org.geysermc.mcprotocollib.protocol.data.game.command.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/FloatProperties.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/FloatProperties.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/FloatProperties.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/FloatProperties.java
index d46aac34..86df0694 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/FloatProperties.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/FloatProperties.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.command.properties;
+package org.geysermc.mcprotocollib.protocol.data.game.command.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/IntegerProperties.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/IntegerProperties.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/IntegerProperties.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/IntegerProperties.java
index 20ea12a4..615789bf 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/IntegerProperties.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/IntegerProperties.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.command.properties;
+package org.geysermc.mcprotocollib.protocol.data.game.command.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/LongProperties.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/LongProperties.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/LongProperties.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/LongProperties.java
index bf736340..ca16ba3a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/LongProperties.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/LongProperties.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.command.properties;
+package org.geysermc.mcprotocollib.protocol.data.game.command.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/RangeProperties.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/RangeProperties.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/RangeProperties.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/RangeProperties.java
index 92e6017e..32d3e67a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/RangeProperties.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/RangeProperties.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.command.properties;
+package org.geysermc.mcprotocollib.protocol.data.game.command.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/ResourceProperties.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/ResourceProperties.java
similarity index 64%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/ResourceProperties.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/ResourceProperties.java
index e6cf64d4..670ea551 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/ResourceProperties.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/ResourceProperties.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.command.properties;
+package org.geysermc.mcprotocollib.protocol.data.game.command.properties;
 
-import com.github.steveice10.mc.protocol.data.game.Identifier;
+import org.geysermc.mcprotocollib.protocol.data.game.Identifier;
 import lombok.Data;
 
 @Data
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/ScoreHolderProperties.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/ScoreHolderProperties.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/ScoreHolderProperties.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/ScoreHolderProperties.java
index c9baaa42..4e490606 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/ScoreHolderProperties.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/ScoreHolderProperties.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.command.properties;
+package org.geysermc.mcprotocollib.protocol.data.game.command.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/StringProperties.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/StringProperties.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/StringProperties.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/StringProperties.java
index bb3c055d..49d4b93a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/StringProperties.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/StringProperties.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.command.properties;
+package org.geysermc.mcprotocollib.protocol.data.game.command.properties;
 
 public enum StringProperties implements CommandProperties {
     SINGLE_WORD,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/TimeProperties.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/TimeProperties.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/TimeProperties.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/TimeProperties.java
index 0895fd0a..3d39af88 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/TimeProperties.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/properties/TimeProperties.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.command.properties;
+package org.geysermc.mcprotocollib.protocol.data.game.command.properties;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/Effect.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/Effect.java
similarity index 91%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/Effect.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/Effect.java
index a084773b..3b19e54f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/Effect.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/Effect.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity;
+package org.geysermc.mcprotocollib.protocol.data.game.entity;
 
 public enum Effect {
     SPEED,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/EntityEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/EntityEvent.java
similarity index 96%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/EntityEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/EntityEvent.java
index f4943b0c..60f04f82 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/EntityEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/EntityEvent.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity;
+package org.geysermc.mcprotocollib.protocol.data.game.entity;
 
 public enum EntityEvent {
     TIPPED_ARROW_EMIT_PARTICLES,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/EquipmentSlot.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/EquipmentSlot.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/EquipmentSlot.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/EquipmentSlot.java
index 57c6255d..59ff1476 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/EquipmentSlot.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/EquipmentSlot.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity;
+package org.geysermc.mcprotocollib.protocol.data.game.entity;
 
 public enum EquipmentSlot {
     MAIN_HAND,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/RotationOrigin.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/RotationOrigin.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/RotationOrigin.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/RotationOrigin.java
index ff207868..fa9e713f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/RotationOrigin.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/RotationOrigin.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity;
+package org.geysermc.mcprotocollib.protocol.data.game.entity;
 
 public enum RotationOrigin {
     FEET,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/Attribute.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/Attribute.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/Attribute.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/Attribute.java
index 812f68ec..45910ab3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/Attribute.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/Attribute.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.attribute;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.attribute;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/AttributeModifier.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/AttributeModifier.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/AttributeModifier.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/AttributeModifier.java
index 62a15ab3..935a11b7 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/AttributeModifier.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/AttributeModifier.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.attribute;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.attribute;
 
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/AttributeType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/AttributeType.java
similarity index 97%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/AttributeType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/AttributeType.java
index d081a9f0..caa89d86 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/AttributeType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/AttributeType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.attribute;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.attribute;
 
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/ModifierOperation.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/ModifierOperation.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/ModifierOperation.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/ModifierOperation.java
index 63c3d02d..5471cc3a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/ModifierOperation.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/ModifierOperation.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.attribute;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.attribute;
 
 public enum ModifierOperation {
     ADD,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/ModifierType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/ModifierType.java
similarity index 97%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/ModifierType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/ModifierType.java
index b873ca1a..8a70623a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/attribute/ModifierType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/ModifierType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.attribute;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.attribute;
 
 import java.util.UUID;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/BooleanMetadataType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/BooleanMetadataType.java
similarity index 89%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/BooleanMetadataType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/BooleanMetadataType.java
index f1d37bd8..72361598 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/BooleanMetadataType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/BooleanMetadataType.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
 import io.netty.buffer.ByteBuf;
 
 public class BooleanMetadataType extends MetadataType<Boolean> {
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/ByteMetadataType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/ByteMetadataType.java
similarity index 89%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/ByteMetadataType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/ByteMetadataType.java
index f64e25a3..abdc3cbd 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/ByteMetadataType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/ByteMetadataType.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
 import io.netty.buffer.ByteBuf;
 
 public class ByteMetadataType extends MetadataType<Byte> {
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/EntityMetadata.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/EntityMetadata.java
similarity index 84%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/EntityMetadata.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/EntityMetadata.java
index 6809d502..b09d1f91 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/EntityMetadata.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/EntityMetadata.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ObjectEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.ObjectEntityMetadata;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/Equipment.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/Equipment.java
similarity index 64%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/Equipment.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/Equipment.java
index bff1fa8e..9d36c42e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/Equipment.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/Equipment.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
-import com.github.steveice10.mc.protocol.data.game.entity.EquipmentSlot;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.EquipmentSlot;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/FloatMetadataType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/FloatMetadataType.java
similarity index 89%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/FloatMetadataType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/FloatMetadataType.java
index c8a91423..2a5c60fb 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/FloatMetadataType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/FloatMetadataType.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.FloatEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.FloatEntityMetadata;
 import io.netty.buffer.ByteBuf;
 
 public class FloatMetadataType extends MetadataType<Float> {
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/GlobalPos.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/GlobalPos.java
similarity index 89%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/GlobalPos.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/GlobalPos.java
index ca3c4515..6489b59e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/GlobalPos.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/GlobalPos.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
 import org.cloudburstmc.math.vector.Vector3i;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/IntMetadataType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/IntMetadataType.java
similarity index 90%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/IntMetadataType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/IntMetadataType.java
index f2f5085f..cd7ce92a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/IntMetadataType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/IntMetadataType.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.IntEntityMetadata;
 import io.netty.buffer.ByteBuf;
 
 public class IntMetadataType extends MetadataType<Integer> {
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/ItemStack.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/ItemStack.java
similarity index 86%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/ItemStack.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/ItemStack.java
index e1d43153..2f4dfa2d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/ItemStack.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/ItemStack.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/LongMetadataType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/LongMetadataType.java
similarity index 90%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/LongMetadataType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/LongMetadataType.java
index f3224853..fc0f6bdf 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/LongMetadataType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/LongMetadataType.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.LongEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.LongEntityMetadata;
 import io.netty.buffer.ByteBuf;
 
 public class LongMetadataType extends MetadataType<Long> {
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/MetadataType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/MetadataType.java
similarity index 90%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/MetadataType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/MetadataType.java
index b29b6038..d0f0b13a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/MetadataType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/MetadataType.java
@@ -1,15 +1,15 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.FloatEntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.LongEntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ObjectEntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
-import com.github.steveice10.mc.protocol.data.game.entity.type.PaintingType;
-import com.github.steveice10.mc.protocol.data.game.level.particle.Particle;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.FloatEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.IntEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.LongEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.ObjectEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.type.PaintingType;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.Particle;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import io.netty.buffer.ByteBuf;
 import lombok.Getter;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/OptionalIntMetadataType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/OptionalIntMetadataType.java
similarity index 89%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/OptionalIntMetadataType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/OptionalIntMetadataType.java
index df1efe5d..7fb401b8 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/OptionalIntMetadataType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/OptionalIntMetadataType.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
 import io.netty.buffer.ByteBuf;
 
 import java.util.OptionalInt;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/Pose.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/Pose.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/Pose.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/Pose.java
index a51f0837..49d28442 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/Pose.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/Pose.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
 public enum Pose {
     STANDING,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/SnifferState.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/SnifferState.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/SnifferState.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/SnifferState.java
index c79f6ae3..284b5ef1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/SnifferState.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/SnifferState.java
@@ -1,17 +1,17 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
-
-public enum SnifferState {
-    IDLING,
-    FEELING_HAPPY,
-    SCENTING,
-    SNIFFING,
-    SEARCHING,
-    DIGGING,
-    RISING;
-
-    private static final SnifferState[] VALUES = values();
-
-    public static SnifferState from(int id) {
-        return VALUES[id];
-    }
-}
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
+
+public enum SnifferState {
+    IDLING,
+    FEELING_HAPPY,
+    SCENTING,
+    SNIFFING,
+    SEARCHING,
+    DIGGING,
+    RISING;
+
+    private static final SnifferState[] VALUES = values();
+
+    public static SnifferState from(int id) {
+        return VALUES[id];
+    }
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/VillagerData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/VillagerData.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/VillagerData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/VillagerData.java
index 50360f86..69809fa2 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/VillagerData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/VillagerData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/BooleanEntityMetadata.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/BooleanEntityMetadata.java
similarity index 68%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/BooleanEntityMetadata.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/BooleanEntityMetadata.java
index 711403bf..ba84dd46 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/BooleanEntityMetadata.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/BooleanEntityMetadata.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata.type;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.BooleanMetadataType;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.BooleanMetadataType;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
 import io.netty.buffer.ByteBuf;
 import lombok.NonNull;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/ByteEntityMetadata.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/ByteEntityMetadata.java
similarity index 67%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/ByteEntityMetadata.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/ByteEntityMetadata.java
index dfa1d974..b6d302b6 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/ByteEntityMetadata.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/ByteEntityMetadata.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata.type;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ByteMetadataType;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ByteMetadataType;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
 import io.netty.buffer.ByteBuf;
 import lombok.NonNull;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/FloatEntityMetadata.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/FloatEntityMetadata.java
similarity index 68%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/FloatEntityMetadata.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/FloatEntityMetadata.java
index b29aefcb..fe944ac5 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/FloatEntityMetadata.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/FloatEntityMetadata.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata.type;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.FloatMetadataType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.FloatMetadataType;
 import io.netty.buffer.ByteBuf;
 import lombok.NonNull;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/IntEntityMetadata.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/IntEntityMetadata.java
similarity index 67%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/IntEntityMetadata.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/IntEntityMetadata.java
index b1abf18f..496af36c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/IntEntityMetadata.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/IntEntityMetadata.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata.type;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.IntMetadataType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.IntMetadataType;
 import io.netty.buffer.ByteBuf;
 import lombok.NonNull;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/LongEntityMetadata.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/LongEntityMetadata.java
similarity index 67%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/LongEntityMetadata.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/LongEntityMetadata.java
index 700edab4..fb477d81 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/LongEntityMetadata.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/LongEntityMetadata.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata.type;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.LongMetadataType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.LongMetadataType;
 import io.netty.buffer.ByteBuf;
 import lombok.NonNull;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/ObjectEntityMetadata.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/ObjectEntityMetadata.java
similarity index 58%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/ObjectEntityMetadata.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/ObjectEntityMetadata.java
index f820adf6..5943903e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/metadata/type/ObjectEntityMetadata.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/type/ObjectEntityMetadata.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.data.game.entity.metadata.type;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.MetadataType;
 import lombok.NonNull;
 
 public class ObjectEntityMetadata<T> extends EntityMetadata<T, MetadataType<T>> {
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/Direction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/Direction.java
similarity index 90%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/Direction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/Direction.java
index 8f7c94a5..b7f1b9d3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/Direction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/Direction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.object;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.object;
 
 import lombok.Getter;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/FallingBlockData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/FallingBlockData.java
similarity index 73%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/FallingBlockData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/FallingBlockData.java
index 9cb7fab0..c7846c87 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/FallingBlockData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/FallingBlockData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.object;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.object;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/GenericObjectData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/GenericObjectData.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/GenericObjectData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/GenericObjectData.java
index 478801b7..7a673c0b 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/GenericObjectData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/GenericObjectData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.object;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.object;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/MinecartType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/MinecartType.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/MinecartType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/MinecartType.java
index 9f512c65..a0c3951f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/MinecartType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/MinecartType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.object;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.object;
 
 public enum MinecartType implements ObjectData {
     NORMAL,
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/ObjectData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/ObjectData.java
new file mode 100644
index 00000000..eccb994b
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/ObjectData.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.entity.object;
+
+public interface ObjectData {
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/ProjectileData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/ProjectileData.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/ProjectileData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/ProjectileData.java
index cdacdc2f..cf63d7db 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/ProjectileData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/ProjectileData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.object;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.object;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/SplashPotionData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/SplashPotionData.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/SplashPotionData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/SplashPotionData.java
index 64d6e723..5642059a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/SplashPotionData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/SplashPotionData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.object;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.object;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/WardenData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/WardenData.java
similarity index 73%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/WardenData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/WardenData.java
index a776dc6a..c8b794ae 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/WardenData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/object/WardenData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.object;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.object;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/Animation.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/Animation.java
similarity index 91%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/Animation.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/Animation.java
index f4b63eb1..d9545e8b 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/Animation.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/Animation.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.player;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.player;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/BlockBreakStage.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/BlockBreakStage.java
similarity index 86%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/BlockBreakStage.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/BlockBreakStage.java
index 73661885..55573eee 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/BlockBreakStage.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/BlockBreakStage.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.player;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.player;
 
 public enum BlockBreakStage {
     STAGE_1,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/GameMode.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/GameMode.java
similarity index 84%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/GameMode.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/GameMode.java
index 70953b66..b1ce73a8 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/GameMode.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/GameMode.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.entity.player;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.player;
 
-import com.github.steveice10.mc.protocol.data.game.level.notify.GameEventValue;
+import org.geysermc.mcprotocollib.protocol.data.game.level.notify.GameEventValue;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public enum GameMode implements GameEventValue {
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/Hand.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/Hand.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/Hand.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/Hand.java
index 09c52fe0..2b19d31e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/Hand.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/Hand.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.player;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.player;
 
 public enum Hand {
     MAIN_HAND,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/HandPreference.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/HandPreference.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/HandPreference.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/HandPreference.java
index 5850bc18..2f6e79f2 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/HandPreference.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/HandPreference.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.player;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.player;
 
 public enum HandPreference {
     LEFT_HAND,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/InteractAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/InteractAction.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/InteractAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/InteractAction.java
index ce748b52..ce72bd26 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/InteractAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/InteractAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.player;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.player;
 
 public enum InteractAction {
     INTERACT,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/PlayerAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PlayerAction.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/PlayerAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PlayerAction.java
index 1a5bb055..eea2f51f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/PlayerAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PlayerAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.player;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.player;
 
 public enum PlayerAction {
     START_DIGGING,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/PlayerSpawnInfo.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PlayerSpawnInfo.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/PlayerSpawnInfo.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PlayerSpawnInfo.java
index 556989e3..a784016a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/PlayerSpawnInfo.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PlayerSpawnInfo.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.entity.player;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.player;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.GlobalPos;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.GlobalPos;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/PlayerState.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PlayerState.java
similarity index 83%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/PlayerState.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PlayerState.java
index cbf4f767..1caa7d48 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/PlayerState.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PlayerState.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.player;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.player;
 
 public enum PlayerState {
     START_SNEAKING,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/PositionElement.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PositionElement.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/PositionElement.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PositionElement.java
index 2c5b1e6a..a38825e1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/player/PositionElement.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/player/PositionElement.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.player;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.player;
 
 public enum PositionElement {
     X,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/type/EntityType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/type/EntityType.java
similarity index 96%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/type/EntityType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/type/EntityType.java
index 1aa1293a..0e41a069 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/type/EntityType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/type/EntityType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.type;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.type;
 
 public enum EntityType {
     ALLAY,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/type/PaintingType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/type/PaintingType.java
similarity index 88%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/entity/type/PaintingType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/type/PaintingType.java
index e35d99e4..2f6f31ca 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/type/PaintingType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/type/PaintingType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.entity.type;
+package org.geysermc.mcprotocollib.protocol.data.game.entity.type;
 
 public enum PaintingType {
     KEBAB,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/AdvancementTabAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/AdvancementTabAction.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/AdvancementTabAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/AdvancementTabAction.java
index 58062212..00e4f26e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/AdvancementTabAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/AdvancementTabAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 public enum AdvancementTabAction {
     OPENED_TAB,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ClickItemAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ClickItemAction.java
similarity index 82%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ClickItemAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ClickItemAction.java
index 28c08e5b..3599f5ac 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ClickItemAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ClickItemAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 public enum ClickItemAction implements ContainerAction {
     LEFT_CLICK,
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ContainerAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ContainerAction.java
new file mode 100644
index 00000000..3e7bcbb1
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ContainerAction.java
@@ -0,0 +1,5 @@
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
+
+public interface ContainerAction {
+    int getId();
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ContainerActionType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ContainerActionType.java
similarity index 83%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ContainerActionType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ContainerActionType.java
index 8999e7d7..9c199007 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ContainerActionType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ContainerActionType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 public enum ContainerActionType {
     CLICK_ITEM,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ContainerType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ContainerType.java
similarity index 89%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ContainerType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ContainerType.java
index 24723a48..ba8f5f7c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ContainerType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ContainerType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 public enum ContainerType {
     GENERIC_9X1,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/CraftingBookStateType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/CraftingBookStateType.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/CraftingBookStateType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/CraftingBookStateType.java
index 8202141b..e5716d7c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/CraftingBookStateType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/CraftingBookStateType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 public enum CraftingBookStateType {
     CRAFTING,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/CreativeGrabAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/CreativeGrabAction.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/CreativeGrabAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/CreativeGrabAction.java
index be2f75f4..201f3a2d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/CreativeGrabAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/CreativeGrabAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 public enum CreativeGrabAction implements ContainerAction {
     GRAB;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/DropItemAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/DropItemAction.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/DropItemAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/DropItemAction.java
index dec329ef..e124d437 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/DropItemAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/DropItemAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 public enum DropItemAction implements ContainerAction {
     DROP_FROM_SELECTED,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/FillStackAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/FillStackAction.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/FillStackAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/FillStackAction.java
index 48dfbb89..89128c60 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/FillStackAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/FillStackAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 public enum FillStackAction implements ContainerAction {
     FILL;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/MoveToHotbarAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/MoveToHotbarAction.java
similarity index 92%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/MoveToHotbarAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/MoveToHotbarAction.java
index 9bf0600b..e6741204 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/MoveToHotbarAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/MoveToHotbarAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ShiftClickItemAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ShiftClickItemAction.java
similarity index 82%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ShiftClickItemAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ShiftClickItemAction.java
index 0a3b2f42..ace8f864 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ShiftClickItemAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/ShiftClickItemAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 public enum ShiftClickItemAction implements ContainerAction {
     LEFT_CLICK,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/SpreadItemAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/SpreadItemAction.java
similarity index 93%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/SpreadItemAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/SpreadItemAction.java
index d069b461..098f2f3a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/SpreadItemAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/SpreadItemAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/UpdateStructureBlockAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/UpdateStructureBlockAction.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/UpdateStructureBlockAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/UpdateStructureBlockAction.java
index 470c0daf..fa5ee5b9 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/UpdateStructureBlockAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/UpdateStructureBlockAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 public enum UpdateStructureBlockAction {
     UPDATE_DATA,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/UpdateStructureBlockMode.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/UpdateStructureBlockMode.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/UpdateStructureBlockMode.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/UpdateStructureBlockMode.java
index c8d93574..3956c606 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/UpdateStructureBlockMode.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/UpdateStructureBlockMode.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
 public enum UpdateStructureBlockMode {
     SAVE,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/VillagerTrade.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/VillagerTrade.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/VillagerTrade.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/VillagerTrade.java
index 64249d88..befdf691 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/VillagerTrade.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/VillagerTrade.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/AnvilProperty.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/AnvilProperty.java
similarity index 82%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/AnvilProperty.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/AnvilProperty.java
index e6e13e96..c5c98b29 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/AnvilProperty.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/AnvilProperty.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory.property;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory.property;
 
 /**
  * Container properties of an anvil.
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/BrewingStandProperty.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/BrewingStandProperty.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/BrewingStandProperty.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/BrewingStandProperty.java
index 77a56f3f..ef42c13a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/BrewingStandProperty.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/BrewingStandProperty.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory.property;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory.property;
 
 /**
  * Container properties of a brewing stand.
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/ContainerProperty.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/ContainerProperty.java
new file mode 100644
index 00000000..d21571a8
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/ContainerProperty.java
@@ -0,0 +1,5 @@
+package org.geysermc.mcprotocollib.protocol.data.game.inventory.property;
+
+public interface ContainerProperty {
+    int ordinal();
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/EnchantmentTableProperty.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/EnchantmentTableProperty.java
similarity index 96%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/EnchantmentTableProperty.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/EnchantmentTableProperty.java
index 76b55d19..5f308d5e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/EnchantmentTableProperty.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/EnchantmentTableProperty.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory.property;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory.property;
 
 /**
  * Container properties of an enchantment table.
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/FurnaceProperty.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/FurnaceProperty.java
similarity index 89%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/FurnaceProperty.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/FurnaceProperty.java
index bd7cb7a0..6b5194cd 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/FurnaceProperty.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/inventory/property/FurnaceProperty.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.inventory.property;
+package org.geysermc.mcprotocollib.protocol.data.game.inventory.property;
 
 /**
  * Container properties of a furnace.
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/LightUpdateData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/LightUpdateData.java
similarity index 94%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/LightUpdateData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/LightUpdateData.java
index 3d7de483..c1b3b5d2 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/LightUpdateData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/LightUpdateData.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.level;
+package org.geysermc.mcprotocollib.protocol.data.game.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/BlockChangeEntry.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/BlockChangeEntry.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/BlockChangeEntry.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/BlockChangeEntry.java
index 31066a7a..dda471b5 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/BlockChangeEntry.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/BlockChangeEntry.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/BlockEntityInfo.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/BlockEntityInfo.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/BlockEntityInfo.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/BlockEntityInfo.java
index a791ae6b..048731bc 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/BlockEntityInfo.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/BlockEntityInfo.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/BlockEntityType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/BlockEntityType.java
similarity index 93%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/BlockEntityType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/BlockEntityType.java
index e64c2ba8..bc83b115 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/BlockEntityType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/BlockEntityType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/CommandBlockMode.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/CommandBlockMode.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/CommandBlockMode.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/CommandBlockMode.java
index a191a8a1..07056dd2 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/CommandBlockMode.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/CommandBlockMode.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block;
 
 public enum CommandBlockMode {
     SEQUENCE,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/ExplosionInteraction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/ExplosionInteraction.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/ExplosionInteraction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/ExplosionInteraction.java
index 76439534..42e92325 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/ExplosionInteraction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/ExplosionInteraction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block;
 
 public enum ExplosionInteraction {
     KEEP,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/StructureMirror.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/StructureMirror.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/StructureMirror.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/StructureMirror.java
index 75fac3f2..6026dab1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/StructureMirror.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/StructureMirror.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block;
 
 public enum StructureMirror {
     NONE,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/StructureRotation.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/StructureRotation.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/StructureRotation.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/StructureRotation.java
index c1ad5922..63c0efa4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/StructureRotation.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/StructureRotation.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block;
 
 public enum StructureRotation {
     NONE,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/WobbleStyle.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/WobbleStyle.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/WobbleStyle.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/WobbleStyle.java
index 9139fc41..547d3fae 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/WobbleStyle.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/WobbleStyle.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block;
 
 public enum WobbleStyle {
     POSITIVE,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BeaconValueType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BeaconValueType.java
similarity index 52%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BeaconValueType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BeaconValueType.java
index 991204f7..ca8de320 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BeaconValueType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BeaconValueType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
 public enum BeaconValueType implements BlockValueType {
     RECALCULATE_BEAM;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BellValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BellValue.java
similarity index 52%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BellValue.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BellValue.java
index 52fc0100..212cd644 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BellValue.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BellValue.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
-import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BellValueType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BellValueType.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BellValueType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BellValueType.java
index a425c7e7..71b25fa7 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BellValueType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BellValueType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
 public enum BellValueType implements BlockValueType {
     SHAKE_DIRECTION;
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BlockValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BlockValue.java
new file mode 100644
index 00000000..10aab49a
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BlockValue.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
+
+public interface BlockValue {
+}
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BlockValueType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BlockValueType.java
new file mode 100644
index 00000000..cd6261e7
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/BlockValueType.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
+
+public interface BlockValueType {
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/ChestValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/ChestValue.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/ChestValue.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/ChestValue.java
index 9a8d12f0..ad30e4fc 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/ChestValue.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/ChestValue.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/ChestValueType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/ChestValueType.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/ChestValueType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/ChestValueType.java
index cba7cb64..0ab6a5c4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/ChestValueType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/ChestValueType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
 public enum ChestValueType implements BlockValueType {
     VIEWING_PLAYER_COUNT;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/DecoratedPotValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/DecoratedPotValue.java
similarity index 59%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/DecoratedPotValue.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/DecoratedPotValue.java
index f82fbaa0..06292cf9 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/DecoratedPotValue.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/DecoratedPotValue.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
-import com.github.steveice10.mc.protocol.data.game.level.block.WobbleStyle;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.WobbleStyle;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/DecoratedPotValueType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/DecoratedPotValueType.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/DecoratedPotValueType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/DecoratedPotValueType.java
index ab9bdd22..84d4ec50 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/DecoratedPotValueType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/DecoratedPotValueType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
 public enum DecoratedPotValueType implements BlockValueType {
     WOBBLE_STYLE;
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/EndGatewayValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/EndGatewayValue.java
new file mode 100644
index 00000000..08988cbd
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/EndGatewayValue.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
+
+public class EndGatewayValue implements BlockValue {
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/EndGatewayValueType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/EndGatewayValueType.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/EndGatewayValueType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/EndGatewayValueType.java
index 18b965d2..11d7512c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/EndGatewayValueType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/EndGatewayValueType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
 public enum EndGatewayValueType implements BlockValueType {
     TRIGGER_BEAM;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/GenericBlockValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/GenericBlockValue.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/GenericBlockValue.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/GenericBlockValue.java
index 8b511e32..14dfa2f0 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/GenericBlockValue.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/GenericBlockValue.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/GenericBlockValueType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/GenericBlockValueType.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/GenericBlockValueType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/GenericBlockValueType.java
index 3e833c21..b9aeda8b 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/GenericBlockValueType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/GenericBlockValueType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
 public enum GenericBlockValueType implements BlockValueType {
     GENERIC_0,
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/MobSpawnerValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/MobSpawnerValue.java
new file mode 100644
index 00000000..60ca3ecf
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/MobSpawnerValue.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
+
+public class MobSpawnerValue implements BlockValue {
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/MobSpawnerValueType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/MobSpawnerValueType.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/MobSpawnerValueType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/MobSpawnerValueType.java
index e3a9d48d..768804e0 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/MobSpawnerValueType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/MobSpawnerValueType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
 public enum MobSpawnerValueType implements BlockValueType {
     RESET_DELAY;
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/NoteBlockValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/NoteBlockValue.java
new file mode 100644
index 00000000..dc9eadb9
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/NoteBlockValue.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
+
+public class NoteBlockValue implements BlockValue {
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/NoteBlockValueType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/NoteBlockValueType.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/NoteBlockValueType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/NoteBlockValueType.java
index 0983fdc7..eebf6a3f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/NoteBlockValueType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/NoteBlockValueType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
 public enum NoteBlockValueType implements BlockValueType {
     PLAY_NOTE;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/PistonValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/PistonValue.java
similarity index 53%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/PistonValue.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/PistonValue.java
index b9814ebc..5d12e4a1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/PistonValue.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/PistonValue.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
-import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/PistonValueType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/PistonValueType.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/PistonValueType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/PistonValueType.java
index 69dc8d43..54683450 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/PistonValueType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/block/value/PistonValueType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
+package org.geysermc.mcprotocollib.protocol.data.game.level.block.value;
 
 public enum PistonValueType implements BlockValueType {
     PUSHING,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/BonemealGrowEventData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/BonemealGrowEventData.java
similarity index 73%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/BonemealGrowEventData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/BonemealGrowEventData.java
index 80d552e3..c4857bb0 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/BonemealGrowEventData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/BonemealGrowEventData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/BreakBlockEventData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/BreakBlockEventData.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/BreakBlockEventData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/BreakBlockEventData.java
index b54c6c50..01335fea 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/BreakBlockEventData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/BreakBlockEventData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/BreakPotionEventData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/BreakPotionEventData.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/BreakPotionEventData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/BreakPotionEventData.java
index afc8ee81..521cc4c1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/BreakPotionEventData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/BreakPotionEventData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/ComposterEventData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/ComposterEventData.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/ComposterEventData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/ComposterEventData.java
index 95cce1f8..7b8fd816 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/ComposterEventData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/ComposterEventData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
 public enum ComposterEventData implements LevelEventData {
     FILL,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/DragonFireballEventData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/DragonFireballEventData.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/DragonFireballEventData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/DragonFireballEventData.java
index 497992e7..23abc1e4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/DragonFireballEventData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/DragonFireballEventData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
 public enum DragonFireballEventData implements LevelEventData {
     NO_SOUND,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/ElectricSparkData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/ElectricSparkData.java
similarity index 55%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/ElectricSparkData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/ElectricSparkData.java
index 3bfc6b91..6ef33bf6 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/ElectricSparkData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/ElectricSparkData.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
-import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/FireExtinguishData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/FireExtinguishData.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/FireExtinguishData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/FireExtinguishData.java
index 1b5d431d..c767d4fd 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/FireExtinguishData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/FireExtinguishData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
 public enum FireExtinguishData implements LevelEventData {
     EXTINGUISH,
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEvent.java
new file mode 100644
index 00000000..d40acfe9
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEvent.java
@@ -0,0 +1,5 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
+
+public interface LevelEvent {
+    int getId();
+}
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEventData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEventData.java
new file mode 100644
index 00000000..ddb399ed
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEventData.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
+
+public interface LevelEventData {
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/LevelEventType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEventType.java
similarity index 97%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/LevelEventType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEventType.java
index 6a71bb29..bc3cba8a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/LevelEventType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEventType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
 import lombok.AllArgsConstructor;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/RecordEventData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/RecordEventData.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/RecordEventData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/RecordEventData.java
index 0d24f9af..f91d5a82 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/RecordEventData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/RecordEventData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/SculkBlockChargeEventData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/SculkBlockChargeEventData.java
similarity index 86%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/SculkBlockChargeEventData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/SculkBlockChargeEventData.java
index a13ac63f..ca2aadec 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/SculkBlockChargeEventData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/SculkBlockChargeEventData.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
-import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
 import lombok.Value;
 
 import java.util.EnumSet;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/SmokeEventData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/SmokeEventData.java
similarity index 55%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/SmokeEventData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/SmokeEventData.java
index 6e9e5c64..37f644fc 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/SmokeEventData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/SmokeEventData.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
-import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/TrialSpawnerDetectEventData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/TrialSpawnerDetectEventData.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/TrialSpawnerDetectEventData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/TrialSpawnerDetectEventData.java
index b80653c6..6f69c0be 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/TrialSpawnerDetectEventData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/TrialSpawnerDetectEventData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/UnknownLevelEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/UnknownLevelEvent.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/UnknownLevelEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/UnknownLevelEvent.java
index e9bdf6dd..f7bb9e2c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/UnknownLevelEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/UnknownLevelEvent.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
 public final class UnknownLevelEvent implements LevelEvent {
     private final int id;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/UnknownLevelEventData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/UnknownLevelEventData.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/UnknownLevelEventData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/UnknownLevelEventData.java
index a1bda843..98c0adae 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/UnknownLevelEventData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/UnknownLevelEventData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
+package org.geysermc.mcprotocollib.protocol.data.game.level.event;
 
 public final class UnknownLevelEventData implements LevelEventData {
     private final int data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/map/MapData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/map/MapData.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/map/MapData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/map/MapData.java
index 4a98ff7e..c05d79e6 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/map/MapData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/map/MapData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.map;
+package org.geysermc.mcprotocollib.protocol.data.game.level.map;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/map/MapIcon.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/map/MapIcon.java
similarity index 84%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/map/MapIcon.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/map/MapIcon.java
index fe9e7a38..6ea39664 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/map/MapIcon.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/map/MapIcon.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.map;
+package org.geysermc.mcprotocollib.protocol.data.game.level.map;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/map/MapIconType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/map/MapIconType.java
similarity index 92%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/map/MapIconType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/map/MapIconType.java
index cf60edaf..2b7a8cc9 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/map/MapIconType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/map/MapIconType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.map;
+package org.geysermc.mcprotocollib.protocol.data.game.level.map;
 
 public enum MapIconType {
     WHITE_ARROW,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/DemoMessageValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/DemoMessageValue.java
similarity index 91%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/DemoMessageValue.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/DemoMessageValue.java
index 39a4ab95..f5868aa8 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/DemoMessageValue.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/DemoMessageValue.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.notify;
+package org.geysermc.mcprotocollib.protocol.data.game.level.notify;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/ElderGuardianEffectValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/ElderGuardianEffectValue.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/ElderGuardianEffectValue.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/ElderGuardianEffectValue.java
index 915cf41d..6191458b 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/ElderGuardianEffectValue.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/ElderGuardianEffectValue.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.notify;
+package org.geysermc.mcprotocollib.protocol.data.game.level.notify;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/EnterCreditsValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/EnterCreditsValue.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/EnterCreditsValue.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/EnterCreditsValue.java
index 8bf55b21..64538d1d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/EnterCreditsValue.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/EnterCreditsValue.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.notify;
+package org.geysermc.mcprotocollib.protocol.data.game.level.notify;
 
 public enum EnterCreditsValue implements GameEventValue {
     SEEN_BEFORE,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/GameEvent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/GameEvent.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/GameEvent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/GameEvent.java
index 319718b9..83132eb0 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/GameEvent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/GameEvent.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.notify;
+package org.geysermc.mcprotocollib.protocol.data.game.level.notify;
 
 public enum GameEvent {
     INVALID_BED,
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/GameEventValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/GameEventValue.java
new file mode 100644
index 00000000..999ba8a5
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/GameEventValue.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level.notify;
+
+public interface GameEventValue {
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/LimitedCraftingValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/LimitedCraftingValue.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/LimitedCraftingValue.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/LimitedCraftingValue.java
index e706873a..cb1f1ec5 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/LimitedCraftingValue.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/LimitedCraftingValue.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.notify;
+package org.geysermc.mcprotocollib.protocol.data.game.level.notify;
 
 public enum LimitedCraftingValue implements GameEventValue {
     UNLIMITED_CRAFTING,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/RainStrengthValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/RainStrengthValue.java
similarity index 83%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/RainStrengthValue.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/RainStrengthValue.java
index b44bee15..4b08fdc0 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/RainStrengthValue.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/RainStrengthValue.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.notify;
+package org.geysermc.mcprotocollib.protocol.data.game.level.notify;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/RespawnScreenValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/RespawnScreenValue.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/RespawnScreenValue.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/RespawnScreenValue.java
index 854a8957..f2432940 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/RespawnScreenValue.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/RespawnScreenValue.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.notify;
+package org.geysermc.mcprotocollib.protocol.data.game.level.notify;
 
 public enum RespawnScreenValue implements GameEventValue {
     ENABLE_RESPAWN_SCREEN,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/ThunderStrengthValue.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/ThunderStrengthValue.java
similarity index 83%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/ThunderStrengthValue.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/ThunderStrengthValue.java
index 82c0f79e..0354e75c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/ThunderStrengthValue.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/notify/ThunderStrengthValue.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.notify;
+package org.geysermc.mcprotocollib.protocol.data.game.level.notify;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/BlockParticleData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/BlockParticleData.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/BlockParticleData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/BlockParticleData.java
index 82802d0a..1b9ac7d1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/BlockParticleData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/BlockParticleData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/DustColorTransitionParticleData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/DustColorTransitionParticleData.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/DustColorTransitionParticleData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/DustColorTransitionParticleData.java
index e36c0f4f..95146009 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/DustColorTransitionParticleData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/DustColorTransitionParticleData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
 
 import lombok.Getter;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/DustParticleData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/DustParticleData.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/DustParticleData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/DustParticleData.java
index a478ff3a..33127fd1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/DustParticleData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/DustParticleData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/FallingDustParticleData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/FallingDustParticleData.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/FallingDustParticleData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/FallingDustParticleData.java
index b3ccecaa..a5f69638 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/FallingDustParticleData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/FallingDustParticleData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ItemParticleData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ItemParticleData.java
similarity index 62%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ItemParticleData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ItemParticleData.java
index dfa88534..f23346c3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ItemParticleData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ItemParticleData.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.checkerframework.checker.nullness.qual.Nullable;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/Particle.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/Particle.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/Particle.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/Particle.java
index 22f8675f..c6e81f5e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/Particle.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/Particle.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ParticleData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ParticleData.java
new file mode 100644
index 00000000..45018f05
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ParticleData.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
+
+public interface ParticleData {
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ParticleType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ParticleType.java
similarity index 96%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ParticleType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ParticleType.java
index 5617ec92..cf259d26 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ParticleType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ParticleType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
 
 public enum ParticleType {
     AMBIENT_ENTITY_EFFECT,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/SculkChargeParticleData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/SculkChargeParticleData.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/SculkChargeParticleData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/SculkChargeParticleData.java
index 1ec30e46..f083d67d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/SculkChargeParticleData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/SculkChargeParticleData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ShriekParticleData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ShriekParticleData.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ShriekParticleData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ShriekParticleData.java
index 84a41fee..03a20938 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ShriekParticleData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ShriekParticleData.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/VibrationParticleData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/VibrationParticleData.java
similarity index 54%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/VibrationParticleData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/VibrationParticleData.java
index b81fcd75..589e0c50 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/VibrationParticleData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/VibrationParticleData.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
 
-import com.github.steveice10.mc.protocol.data.game.level.particle.positionsource.PositionSource;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.positionsource.PositionSource;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/BlockPositionSource.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/BlockPositionSource.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/BlockPositionSource.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/BlockPositionSource.java
index 8d9bdee5..0a53d447 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/BlockPositionSource.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/BlockPositionSource.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle.positionsource;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle.positionsource;
 
 import lombok.Value;
 import org.cloudburstmc.math.vector.Vector3i;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/EntityPositionSource.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/EntityPositionSource.java
similarity index 73%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/EntityPositionSource.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/EntityPositionSource.java
index 73e3b4b4..7d2566c0 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/EntityPositionSource.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/EntityPositionSource.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle.positionsource;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle.positionsource;
 
 import lombok.Value;
 
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/PositionSource.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/PositionSource.java
new file mode 100644
index 00000000..0040ea86
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/PositionSource.java
@@ -0,0 +1,6 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle.positionsource;
+
+public interface PositionSource {
+
+    PositionSourceType getType();
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/PositionSourceType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/PositionSourceType.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/PositionSourceType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/PositionSourceType.java
index b15dddd9..037d5d84 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/PositionSourceType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/positionsource/PositionSourceType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle.positionsource;
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle.positionsource;
 
 public enum PositionSourceType {
     BLOCK,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/sound/BuiltinSound.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/BuiltinSound.java
similarity index 99%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/sound/BuiltinSound.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/BuiltinSound.java
index d68d623c..be36d182 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/sound/BuiltinSound.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/BuiltinSound.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.sound;
+package org.geysermc.mcprotocollib.protocol.data.game.level.sound;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/sound/CustomSound.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/CustomSound.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/sound/CustomSound.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/CustomSound.java
index c785a07a..85b431b6 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/sound/CustomSound.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/CustomSound.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.sound;
+package org.geysermc.mcprotocollib.protocol.data.game.level.sound;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/sound/Sound.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/Sound.java
similarity index 60%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/sound/Sound.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/Sound.java
index f2c41cf9..8014345d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/sound/Sound.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/Sound.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.sound;
+package org.geysermc.mcprotocollib.protocol.data.game.level.sound;
 
 public interface Sound {
     String getName();
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/sound/SoundCategory.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/SoundCategory.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/level/sound/SoundCategory.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/SoundCategory.java
index 1ef9e736..fba10dc9 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/sound/SoundCategory.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/SoundCategory.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.level.sound;
+package org.geysermc.mcprotocollib.protocol.data.game.level.sound;
 
 public enum SoundCategory {
     MASTER,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/CraftingBookCategory.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/CraftingBookCategory.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/CraftingBookCategory.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/CraftingBookCategory.java
index 22cf0348..6adcfb0c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/CraftingBookCategory.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/CraftingBookCategory.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.recipe;
+package org.geysermc.mcprotocollib.protocol.data.game.recipe;
 
 public enum CraftingBookCategory {
     BUILDING,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/Ingredient.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/Ingredient.java
similarity index 63%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/Ingredient.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/Ingredient.java
index 38e48e76..6d676b35 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/Ingredient.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/Ingredient.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.recipe;
+package org.geysermc.mcprotocollib.protocol.data.game.recipe;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/Recipe.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/Recipe.java
similarity index 64%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/Recipe.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/Recipe.java
index cb9c5a5b..e80f3960 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/Recipe.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/Recipe.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.recipe;
+package org.geysermc.mcprotocollib.protocol.data.game.recipe;
 
-import com.github.steveice10.mc.protocol.data.game.recipe.data.RecipeData;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.data.RecipeData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/RecipeType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/RecipeType.java
similarity index 91%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/RecipeType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/RecipeType.java
index 20c23045..e0ffb76f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/RecipeType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/RecipeType.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.recipe;
+package org.geysermc.mcprotocollib.protocol.data.game.recipe;
 
-import com.github.steveice10.mc.protocol.data.game.Identifier;
+import org.geysermc.mcprotocollib.protocol.data.game.Identifier;
 
 import java.util.HashMap;
 import java.util.Locale;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/CookedRecipeData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/CookedRecipeData.java
similarity index 61%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/CookedRecipeData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/CookedRecipeData.java
index a161bf2a..53ece5c8 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/CookedRecipeData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/CookedRecipeData.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.data.game.recipe.data;
+package org.geysermc.mcprotocollib.protocol.data.game.recipe.data;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.game.recipe.CraftingBookCategory;
-import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.CraftingBookCategory;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.Ingredient;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/RecipeData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/RecipeData.java
new file mode 100644
index 00000000..e96fcebd
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/RecipeData.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.recipe.data;
+
+public interface RecipeData {
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/ShapedRecipeData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/ShapedRecipeData.java
similarity index 63%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/ShapedRecipeData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/ShapedRecipeData.java
index f0f6742e..7708a425 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/ShapedRecipeData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/ShapedRecipeData.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.data.game.recipe.data;
+package org.geysermc.mcprotocollib.protocol.data.game.recipe.data;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.game.recipe.CraftingBookCategory;
-import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.CraftingBookCategory;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.Ingredient;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/ShapelessRecipeData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/ShapelessRecipeData.java
similarity index 58%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/ShapelessRecipeData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/ShapelessRecipeData.java
index 9e2952ba..bf590ebe 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/ShapelessRecipeData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/ShapelessRecipeData.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.data.game.recipe.data;
+package org.geysermc.mcprotocollib.protocol.data.game.recipe.data;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.game.recipe.CraftingBookCategory;
-import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.CraftingBookCategory;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.Ingredient;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/SimpleCraftingRecipeData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/SimpleCraftingRecipeData.java
similarity index 60%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/SimpleCraftingRecipeData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/SimpleCraftingRecipeData.java
index e9a78167..21748f9d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/SimpleCraftingRecipeData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/SimpleCraftingRecipeData.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.recipe.data;
+package org.geysermc.mcprotocollib.protocol.data.game.recipe.data;
 
-import com.github.steveice10.mc.protocol.data.game.recipe.CraftingBookCategory;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.CraftingBookCategory;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/SmithingTransformRecipeData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/SmithingTransformRecipeData.java
similarity index 65%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/SmithingTransformRecipeData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/SmithingTransformRecipeData.java
index d750a8fd..dd4b99ca 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/SmithingTransformRecipeData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/SmithingTransformRecipeData.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.data.game.recipe.data;
+package org.geysermc.mcprotocollib.protocol.data.game.recipe.data;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.Ingredient;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/SmithingTrimRecipeData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/SmithingTrimRecipeData.java
similarity index 68%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/SmithingTrimRecipeData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/SmithingTrimRecipeData.java
index 5e822402..7f381543 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/SmithingTrimRecipeData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/SmithingTrimRecipeData.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.recipe.data;
+package org.geysermc.mcprotocollib.protocol.data.game.recipe.data;
 
-import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.Ingredient;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/StoneCuttingRecipeData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/StoneCuttingRecipeData.java
similarity index 62%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/StoneCuttingRecipeData.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/StoneCuttingRecipeData.java
index 11e59ed7..ad0897cc 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/StoneCuttingRecipeData.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/StoneCuttingRecipeData.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.data.game.recipe.data;
+package org.geysermc.mcprotocollib.protocol.data.game.recipe.data;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.Ingredient;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/CollisionRule.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/CollisionRule.java
similarity index 90%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/CollisionRule.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/CollisionRule.java
index 15992c1c..31830404 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/CollisionRule.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/CollisionRule.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.scoreboard;
+package org.geysermc.mcprotocollib.protocol.data.game.scoreboard;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/NameTagVisibility.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/NameTagVisibility.java
similarity index 91%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/NameTagVisibility.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/NameTagVisibility.java
index 9fc1109e..3190916d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/NameTagVisibility.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/NameTagVisibility.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.scoreboard;
+package org.geysermc.mcprotocollib.protocol.data.game.scoreboard;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/ObjectiveAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/ObjectiveAction.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/ObjectiveAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/ObjectiveAction.java
index a9035560..7fc4600a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/ObjectiveAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/ObjectiveAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.scoreboard;
+package org.geysermc.mcprotocollib.protocol.data.game.scoreboard;
 
 public enum ObjectiveAction {
     ADD,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/ScoreType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/ScoreType.java
similarity index 73%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/ScoreType.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/ScoreType.java
index 4579ca07..e3890cc8 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/ScoreType.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/ScoreType.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.scoreboard;
+package org.geysermc.mcprotocollib.protocol.data.game.scoreboard;
 
 public enum ScoreType {
     INTEGER,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/ScoreboardPosition.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/ScoreboardPosition.java
similarity index 90%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/ScoreboardPosition.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/ScoreboardPosition.java
index 17d2626d..c3977e88 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/ScoreboardPosition.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/ScoreboardPosition.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.scoreboard;
+package org.geysermc.mcprotocollib.protocol.data.game.scoreboard;
 
 public enum ScoreboardPosition {
     PLAYER_LIST,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/TeamAction.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/TeamAction.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/TeamAction.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/TeamAction.java
index b7c922c6..411178fb 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/TeamAction.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/TeamAction.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.scoreboard;
+package org.geysermc.mcprotocollib.protocol.data.game.scoreboard;
 
 public enum TeamAction {
     CREATE,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/TeamColor.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/TeamColor.java
similarity index 84%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/TeamColor.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/TeamColor.java
index 5fb36921..875b1680 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/scoreboard/TeamColor.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/TeamColor.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.scoreboard;
+package org.geysermc.mcprotocollib.protocol.data.game.scoreboard;
 
 public enum TeamColor {
     BLACK,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/setting/ChatVisibility.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/setting/ChatVisibility.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/setting/ChatVisibility.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/setting/ChatVisibility.java
index 0fb4c82d..89cbb8aa 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/setting/ChatVisibility.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/setting/ChatVisibility.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.setting;
+package org.geysermc.mcprotocollib.protocol.data.game.setting;
 
 public enum ChatVisibility {
     FULL,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/setting/Difficulty.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/setting/Difficulty.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/setting/Difficulty.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/setting/Difficulty.java
index 64c2c858..51a11d69 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/setting/Difficulty.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/setting/Difficulty.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.setting;
+package org.geysermc.mcprotocollib.protocol.data.game.setting;
 
 public enum Difficulty {
     PEACEFUL,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/setting/SkinPart.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/setting/SkinPart.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/setting/SkinPart.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/setting/SkinPart.java
index d64fe0e2..030a0063 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/setting/SkinPart.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/setting/SkinPart.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.setting;
+package org.geysermc.mcprotocollib.protocol.data.game.setting;
 
 public enum SkinPart {
     CAPE,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/BreakBlockStatistic.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/BreakBlockStatistic.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/BreakBlockStatistic.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/BreakBlockStatistic.java
index 4776219a..e4f90e57 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/BreakBlockStatistic.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/BreakBlockStatistic.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.statistic;
+package org.geysermc.mcprotocollib.protocol.data.game.statistic;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/BreakItemStatistic.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/BreakItemStatistic.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/BreakItemStatistic.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/BreakItemStatistic.java
index 774fba0e..c272ee0e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/BreakItemStatistic.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/BreakItemStatistic.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.statistic;
+package org.geysermc.mcprotocollib.protocol.data.game.statistic;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/CraftItemStatistic.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/CraftItemStatistic.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/CraftItemStatistic.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/CraftItemStatistic.java
index 26735c37..130bda15 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/CraftItemStatistic.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/CraftItemStatistic.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.statistic;
+package org.geysermc.mcprotocollib.protocol.data.game.statistic;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/CustomStatistic.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/CustomStatistic.java
similarity index 97%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/CustomStatistic.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/CustomStatistic.java
index c9773f29..d0e4b6b4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/CustomStatistic.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/CustomStatistic.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.statistic;
+package org.geysermc.mcprotocollib.protocol.data.game.statistic;
 
 import lombok.Getter;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/DropItemStatistic.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/DropItemStatistic.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/DropItemStatistic.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/DropItemStatistic.java
index 35f84a9f..3de182b4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/DropItemStatistic.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/DropItemStatistic.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.statistic;
+package org.geysermc.mcprotocollib.protocol.data.game.statistic;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/KillEntityStatistic.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/KillEntityStatistic.java
similarity index 55%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/KillEntityStatistic.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/KillEntityStatistic.java
index 8046ae0e..46af6e4e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/KillEntityStatistic.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/KillEntityStatistic.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.statistic;
+package org.geysermc.mcprotocollib.protocol.data.game.statistic;
 
-import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.type.EntityType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/KilledByEntityStatistic.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/KilledByEntityStatistic.java
similarity index 56%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/KilledByEntityStatistic.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/KilledByEntityStatistic.java
index 837ccf56..4564468d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/KilledByEntityStatistic.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/KilledByEntityStatistic.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.data.game.statistic;
+package org.geysermc.mcprotocollib.protocol.data.game.statistic;
 
-import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.type.EntityType;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/PickupItemStatistic.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/PickupItemStatistic.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/PickupItemStatistic.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/PickupItemStatistic.java
index bdfabf89..fa5c4144 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/PickupItemStatistic.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/PickupItemStatistic.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.statistic;
+package org.geysermc.mcprotocollib.protocol.data.game.statistic;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/Statistic.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/Statistic.java
new file mode 100644
index 00000000..215ed247
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/Statistic.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.statistic;
+
+public interface Statistic {
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/StatisticCategory.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/StatisticCategory.java
similarity index 83%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/StatisticCategory.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/StatisticCategory.java
index eb1e3cbb..fa48c2fc 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/StatisticCategory.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/StatisticCategory.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.statistic;
+package org.geysermc.mcprotocollib.protocol.data.game.statistic;
 
 public enum StatisticCategory {
     BREAK_BLOCK,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/StatisticFormat.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/StatisticFormat.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/StatisticFormat.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/StatisticFormat.java
index ad49133c..c88ec96f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/StatisticFormat.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/StatisticFormat.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.statistic;
+package org.geysermc.mcprotocollib.protocol.data.game.statistic;
 
 public enum StatisticFormat {
     /**
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/UseItemStatistic.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/UseItemStatistic.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/UseItemStatistic.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/UseItemStatistic.java
index d0e2a51c..71acc492 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/UseItemStatistic.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/statistic/UseItemStatistic.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.game.statistic;
+package org.geysermc.mcprotocollib.protocol.data.game.statistic;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/handshake/HandshakeIntent.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/handshake/HandshakeIntent.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/data/handshake/HandshakeIntent.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/handshake/HandshakeIntent.java
index 92bc8e97..660ec9db 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/handshake/HandshakeIntent.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/handshake/HandshakeIntent.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.handshake;
+package org.geysermc.mcprotocollib.protocol.data.handshake;
 
 public enum HandshakeIntent {
     STATUS,
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/status/PlayerInfo.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/PlayerInfo.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/data/status/PlayerInfo.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/PlayerInfo.java
index c65976b9..ed085307 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/status/PlayerInfo.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/PlayerInfo.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.status;
+package org.geysermc.mcprotocollib.protocol.data.status;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
 import lombok.AccessLevel;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/status/ServerStatusInfo.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/ServerStatusInfo.java
similarity index 88%
rename from src/main/java/com/github/steveice10/mc/protocol/data/status/ServerStatusInfo.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/ServerStatusInfo.java
index 17efd43a..55e5c1e4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/status/ServerStatusInfo.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/ServerStatusInfo.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.status;
+package org.geysermc.mcprotocollib.protocol.data.status;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/status/VersionInfo.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/VersionInfo.java
similarity index 83%
rename from src/main/java/com/github/steveice10/mc/protocol/data/status/VersionInfo.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/VersionInfo.java
index 3edcdc8e..fb0611d5 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/data/status/VersionInfo.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/VersionInfo.java
@@ -1,4 +1,4 @@
-package com.github.steveice10.mc.protocol.data.status;
+package org.geysermc.mcprotocollib.protocol.data.status;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/handler/ServerInfoBuilder.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/handler/ServerInfoBuilder.java
new file mode 100644
index 00000000..6ad4a1a6
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/handler/ServerInfoBuilder.java
@@ -0,0 +1,8 @@
+package org.geysermc.mcprotocollib.protocol.data.status.handler;
+
+import org.geysermc.mcprotocollib.protocol.data.status.ServerStatusInfo;
+import org.geysermc.mcprotocollib.network.Session;
+
+public interface ServerInfoBuilder {
+    ServerStatusInfo buildInfo(Session session);
+}
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/handler/ServerInfoHandler.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/handler/ServerInfoHandler.java
new file mode 100644
index 00000000..3f5b6808
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/handler/ServerInfoHandler.java
@@ -0,0 +1,8 @@
+package org.geysermc.mcprotocollib.protocol.data.status.handler;
+
+import org.geysermc.mcprotocollib.protocol.data.status.ServerStatusInfo;
+import org.geysermc.mcprotocollib.network.Session;
+
+public interface ServerInfoHandler {
+    void handle(Session session, ServerStatusInfo info);
+}
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/handler/ServerPingTimeHandler.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/handler/ServerPingTimeHandler.java
new file mode 100644
index 00000000..296acf21
--- /dev/null
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/status/handler/ServerPingTimeHandler.java
@@ -0,0 +1,7 @@
+package org.geysermc.mcprotocollib.protocol.data.status.handler;
+
+import org.geysermc.mcprotocollib.network.Session;
+
+public interface ServerPingTimeHandler {
+    void handle(Session session, long pingTime);
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundCustomPayloadPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundCustomPayloadPacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundCustomPayloadPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundCustomPayloadPacket.java
index 56d2959d..7b750f87 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundCustomPayloadPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundCustomPayloadPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.common.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.common.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundDisconnectPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundDisconnectPacket.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundDisconnectPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundDisconnectPacket.java
index 6e0fb388..a57f9ec8 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundDisconnectPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundDisconnectPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.common.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.common.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.DefaultComponentSerializer;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.DefaultComponentSerializer;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundKeepAlivePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundKeepAlivePacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundKeepAlivePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundKeepAlivePacket.java
index 1449cc2d..ff77065a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundKeepAlivePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundKeepAlivePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.common.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.common.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundPingPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundPingPacket.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundPingPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundPingPacket.java
index 020959d9..24eff51b 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundPingPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundPingPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.common.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.common.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundResourcePackPopPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundResourcePackPopPacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundResourcePackPopPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundResourcePackPopPacket.java
index 562bad5f..7b21fd03 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundResourcePackPopPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundResourcePackPopPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.common.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.common.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundResourcePackPushPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundResourcePackPushPacket.java
similarity index 86%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundResourcePackPushPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundResourcePackPushPacket.java
index 71f54c03..464813d8 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundResourcePackPushPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundResourcePackPushPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.common.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.common.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundUpdateTagsPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundUpdateTagsPacket.java
similarity index 90%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundUpdateTagsPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundUpdateTagsPacket.java
index 41116ba8..670f4c37 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/common/clientbound/ClientboundUpdateTagsPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundUpdateTagsPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.common.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.common.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundClientInformationPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundClientInformationPacket.java
similarity index 82%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundClientInformationPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundClientInformationPacket.java
index e404f50e..65241fda 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundClientInformationPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundClientInformationPacket.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.mc.protocol.packet.common.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.common.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.player.HandPreference;
-import com.github.steveice10.mc.protocol.data.game.setting.ChatVisibility;
-import com.github.steveice10.mc.protocol.data.game.setting.SkinPart;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.HandPreference;
+import org.geysermc.mcprotocollib.protocol.data.game.setting.ChatVisibility;
+import org.geysermc.mcprotocollib.protocol.data.game.setting.SkinPart;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundCustomPayloadPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundCustomPayloadPacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundCustomPayloadPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundCustomPayloadPacket.java
index 9a3ad5e0..179e556a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundCustomPayloadPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundCustomPayloadPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.common.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.common.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundKeepAlivePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundKeepAlivePacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundKeepAlivePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundKeepAlivePacket.java
index 65c53dc5..953b37a0 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundKeepAlivePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundKeepAlivePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.common.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.common.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundPongPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundPongPacket.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundPongPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundPongPacket.java
index 7356a12c..ccabb8d3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundPongPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundPongPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.common.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.common.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundResourcePackPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundResourcePackPacket.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundResourcePackPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundResourcePackPacket.java
index 1c3ff144..266a8720 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/common/serverbound/ServerboundResourcePackPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/serverbound/ServerboundResourcePackPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.common.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.common.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.ResourcePackStatus;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.ResourcePackStatus;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/configuration/clientbound/ClientboundFinishConfigurationPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/clientbound/ClientboundFinishConfigurationPacket.java
similarity index 63%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/configuration/clientbound/ClientboundFinishConfigurationPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/clientbound/ClientboundFinishConfigurationPacket.java
index 14c7e3c2..b5e24b2a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/configuration/clientbound/ClientboundFinishConfigurationPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/clientbound/ClientboundFinishConfigurationPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.configuration.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/configuration/clientbound/ClientboundRegistryDataPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/clientbound/ClientboundRegistryDataPacket.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/configuration/clientbound/ClientboundRegistryDataPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/clientbound/ClientboundRegistryDataPacket.java
index 79ac9877..33049da8 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/configuration/clientbound/ClientboundRegistryDataPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/clientbound/ClientboundRegistryDataPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.configuration.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/configuration/clientbound/ClientboundUpdateEnabledFeaturesPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/clientbound/ClientboundUpdateEnabledFeaturesPacket.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/configuration/clientbound/ClientboundUpdateEnabledFeaturesPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/clientbound/ClientboundUpdateEnabledFeaturesPacket.java
index fe4cd9f8..059bd0e7 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/configuration/clientbound/ClientboundUpdateEnabledFeaturesPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/clientbound/ClientboundUpdateEnabledFeaturesPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.configuration.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/configuration/serverbound/ServerboundFinishConfigurationPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/serverbound/ServerboundFinishConfigurationPacket.java
similarity index 63%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/configuration/serverbound/ServerboundFinishConfigurationPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/serverbound/ServerboundFinishConfigurationPacket.java
index 4385dde6..47692659 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/configuration/serverbound/ServerboundFinishConfigurationPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/serverbound/ServerboundFinishConfigurationPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.configuration.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.configuration.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/handshake/serverbound/ClientIntentionPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/handshake/serverbound/ClientIntentionPacket.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/handshake/serverbound/ClientIntentionPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/handshake/serverbound/ClientIntentionPacket.java
index 14f0ff0f..113890f6 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/handshake/serverbound/ClientIntentionPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/handshake/serverbound/ClientIntentionPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.handshake.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.handshake.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.handshake.HandshakeIntent;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.handshake.HandshakeIntent;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundAwardStatsPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundAwardStatsPacket.java
similarity index 91%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundAwardStatsPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundAwardStatsPacket.java
index 6c6b9980..9a1e85ca 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundAwardStatsPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundAwardStatsPacket.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
-import com.github.steveice10.mc.protocol.data.game.statistic.*;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.type.EntityType;
+import org.geysermc.mcprotocollib.protocol.data.game.statistic.*;
 import io.netty.buffer.ByteBuf;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundBossEventPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundBossEventPacket.java
similarity index 91%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundBossEventPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundBossEventPacket.java
index 3ac0368c..94b2995d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundBossEventPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundBossEventPacket.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.BossBarAction;
-import com.github.steveice10.mc.protocol.data.game.BossBarColor;
-import com.github.steveice10.mc.protocol.data.game.BossBarDivision;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.BossBarAction;
+import org.geysermc.mcprotocollib.protocol.data.game.BossBarColor;
+import org.geysermc.mcprotocollib.protocol.data.game.BossBarDivision;
 import io.netty.buffer.ByteBuf;
 import lombok.*;
 import net.kyori.adventure.text.Component;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundBundlePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundBundlePacket.java
similarity index 62%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundBundlePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundBundlePacket.java
index e857c810..68e1c760 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundBundlePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundBundlePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundChangeDifficultyPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundChangeDifficultyPacket.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundChangeDifficultyPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundChangeDifficultyPacket.java
index e26d51bc..b0a8e95a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundChangeDifficultyPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundChangeDifficultyPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.setting.Difficulty;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.setting.Difficulty;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCommandSuggestionsPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCommandSuggestionsPacket.java
similarity index 91%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCommandSuggestionsPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCommandSuggestionsPacket.java
index 3930f45d..db3b75be 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCommandSuggestionsPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCommandSuggestionsPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCommandsPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCommandsPacket.java
similarity index 95%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCommandsPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCommandsPacket.java
index 7b829956..ecd88450 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCommandsPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCommandsPacket.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.command.CommandNode;
-import com.github.steveice10.mc.protocol.data.game.command.CommandParser;
-import com.github.steveice10.mc.protocol.data.game.command.CommandType;
-import com.github.steveice10.mc.protocol.data.game.command.properties.*;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.command.CommandNode;
+import org.geysermc.mcprotocollib.protocol.data.game.command.CommandParser;
+import org.geysermc.mcprotocollib.protocol.data.game.command.CommandType;
+import org.geysermc.mcprotocollib.protocol.data.game.command.properties.*;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCooldownPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCooldownPacket.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCooldownPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCooldownPacket.java
index 5e60a64b..7c10d0ae 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCooldownPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCooldownPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCustomChatCompletionsPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCustomChatCompletionsPacket.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCustomChatCompletionsPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCustomChatCompletionsPacket.java
index 0d993693..60dc27d4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCustomChatCompletionsPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCustomChatCompletionsPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.chat.ChatCompletionAction;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.chat.ChatCompletionAction;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundDeleteChatPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundDeleteChatPacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundDeleteChatPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundDeleteChatPacket.java
index be59626c..1ecd144f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundDeleteChatPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundDeleteChatPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.chat.MessageSignature;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.chat.MessageSignature;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundDelimiterPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundDelimiterPacket.java
similarity index 56%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundDelimiterPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundDelimiterPacket.java
index 10e120c1..b24b4cc2 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundDelimiterPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundDelimiterPacket.java
@@ -1,14 +1,14 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
-
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import io.netty.buffer.ByteBuf;
-
-public class ClientboundDelimiterPacket implements MinecraftPacket {
-    public ClientboundDelimiterPacket(ByteBuf in, MinecraftCodecHelper helper) {
-    }
-
-    @Override
-    public void serialize(ByteBuf out, MinecraftCodecHelper helper) {
-    }
-}
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
+
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import io.netty.buffer.ByteBuf;
+
+public class ClientboundDelimiterPacket implements MinecraftPacket {
+    public ClientboundDelimiterPacket(ByteBuf in, MinecraftCodecHelper helper) {
+    }
+
+    @Override
+    public void serialize(ByteBuf out, MinecraftCodecHelper helper) {
+    }
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundDisguisedChatPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundDisguisedChatPacket.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundDisguisedChatPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundDisguisedChatPacket.java
index 714216ef..37f89d21 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundDisguisedChatPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundDisguisedChatPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.chat.BuiltinChatType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.chat.BuiltinChatType;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundLoginPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundLoginPacket.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundLoginPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundLoginPacket.java
index 282789b5..a4cb2815 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundLoginPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundLoginPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerSpawnInfo;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.PlayerSpawnInfo;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundPlayerChatPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundPlayerChatPacket.java
similarity index 88%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundPlayerChatPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundPlayerChatPacket.java
index 9eb757fa..47ebf9f3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundPlayerChatPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundPlayerChatPacket.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.chat.BuiltinChatType;
-import com.github.steveice10.mc.protocol.data.game.chat.ChatFilterType;
-import com.github.steveice10.mc.protocol.data.game.chat.MessageSignature;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.chat.BuiltinChatType;
+import org.geysermc.mcprotocollib.protocol.data.game.chat.ChatFilterType;
+import org.geysermc.mcprotocollib.protocol.data.game.chat.MessageSignature;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundPlayerInfoRemovePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundPlayerInfoRemovePacket.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundPlayerInfoRemovePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundPlayerInfoRemovePacket.java
index 776f7eba..2ea01b30 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundPlayerInfoRemovePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundPlayerInfoRemovePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundPlayerInfoUpdatePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundPlayerInfoUpdatePacket.java
similarity index 92%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundPlayerInfoUpdatePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundPlayerInfoUpdatePacket.java
index c2340050..0be03598 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundPlayerInfoUpdatePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundPlayerInfoUpdatePacket.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.PlayerListEntry;
-import com.github.steveice10.mc.protocol.data.game.PlayerListEntryAction;
-import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.PlayerListEntry;
+import org.geysermc.mcprotocollib.protocol.data.game.PlayerListEntryAction;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundRecipePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundRecipePacket.java
similarity index 95%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundRecipePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundRecipePacket.java
index 9ebabc78..760f2672 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundRecipePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundRecipePacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.UnlockRecipesAction;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.UnlockRecipesAction;
 import io.netty.buffer.ByteBuf;
 import lombok.*;
 
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundRespawnPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundRespawnPacket.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundRespawnPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundRespawnPacket.java
index 2c64e4f8..991230c1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundRespawnPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundRespawnPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerSpawnInfo;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.PlayerSpawnInfo;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundSelectAdvancementsTabPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundSelectAdvancementsTabPacket.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundSelectAdvancementsTabPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundSelectAdvancementsTabPacket.java
index 3f129828..fea35d93 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundSelectAdvancementsTabPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundSelectAdvancementsTabPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundServerDataPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundServerDataPacket.java
similarity index 83%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundServerDataPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundServerDataPacket.java
index 0bd560b1..9c2d4a7f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundServerDataPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundServerDataPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundSetCameraPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundSetCameraPacket.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundSetCameraPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundSetCameraPacket.java
index e820b953..f785a31a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundSetCameraPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundSetCameraPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundSoundEntityPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundSoundEntityPacket.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundSoundEntityPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundSoundEntityPacket.java
index 67708eb0..c01ba035 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundSoundEntityPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundSoundEntityPacket.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.level.sound.BuiltinSound;
-import com.github.steveice10.mc.protocol.data.game.level.sound.CustomSound;
-import com.github.steveice10.mc.protocol.data.game.level.sound.Sound;
-import com.github.steveice10.mc.protocol.data.game.level.sound.SoundCategory;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.BuiltinSound;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.CustomSound;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.Sound;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.SoundCategory;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundStartConfigurationPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundStartConfigurationPacket.java
similarity index 63%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundStartConfigurationPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundStartConfigurationPacket.java
index 8152b999..f9c1c00f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundStartConfigurationPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundStartConfigurationPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundStopSoundPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundStopSoundPacket.java
similarity index 83%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundStopSoundPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundStopSoundPacket.java
index 00a2a20b..5f1d2d69 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundStopSoundPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundStopSoundPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.level.sound.SoundCategory;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.SoundCategory;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundSystemChatPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundSystemChatPacket.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundSystemChatPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundSystemChatPacket.java
index 3e20e52f..fa6ae8b6 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundSystemChatPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundSystemChatPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundTabListPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundTabListPacket.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundTabListPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundTabListPacket.java
index 464989f6..b080e06d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundTabListPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundTabListPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundTickingStatePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundTickingStatePacket.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundTickingStatePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundTickingStatePacket.java
index f6c985af..7ba7d140 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundTickingStatePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundTickingStatePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundTickingStepPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundTickingStepPacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundTickingStepPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundTickingStepPacket.java
index c0840e97..7126670e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundTickingStepPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundTickingStepPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundUpdateAdvancementsPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundUpdateAdvancementsPacket.java
similarity index 92%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundUpdateAdvancementsPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundUpdateAdvancementsPacket.java
index dc388531..6925c22e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundUpdateAdvancementsPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundUpdateAdvancementsPacket.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.advancement.Advancement;
-import com.github.steveice10.mc.protocol.data.game.advancement.Advancement.DisplayData;
-import com.github.steveice10.mc.protocol.data.game.advancement.Advancement.DisplayData.AdvancementType;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.advancement.Advancement;
+import org.geysermc.mcprotocollib.protocol.data.game.advancement.Advancement.DisplayData;
+import org.geysermc.mcprotocollib.protocol.data.game.advancement.Advancement.DisplayData.AdvancementType;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundUpdateRecipesPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundUpdateRecipesPacket.java
similarity index 92%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundUpdateRecipesPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundUpdateRecipesPacket.java
index b8746395..9206dc00 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundUpdateRecipesPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundUpdateRecipesPacket.java
@@ -1,13 +1,13 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.game.recipe.CraftingBookCategory;
-import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient;
-import com.github.steveice10.mc.protocol.data.game.recipe.Recipe;
-import com.github.steveice10.mc.protocol.data.game.recipe.RecipeType;
-import com.github.steveice10.mc.protocol.data.game.recipe.data.*;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.CraftingBookCategory;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.Ingredient;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.Recipe;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.RecipeType;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.data.*;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundAnimatePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundAnimatePacket.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundAnimatePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundAnimatePacket.java
index f26461d2..9dfb79a3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundAnimatePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundAnimatePacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.player.Animation;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Animation;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundDamageEventPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundDamageEventPacket.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundDamageEventPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundDamageEventPacket.java
index a8d267de..5eb7d7ec 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundDamageEventPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundDamageEventPacket.java
@@ -1,44 +1,44 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
-
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import io.netty.buffer.ByteBuf;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import org.cloudburstmc.math.vector.Vector3d;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-@Data
-@AllArgsConstructor
-public class ClientboundDamageEventPacket implements MinecraftPacket {
-    private final int entityId;
-    private final int sourceTypeId;
-    private final int sourceCauseId;
-    private final int sourceDirectId;
-    private final @Nullable Vector3d sourcePosition;
-
-    public ClientboundDamageEventPacket(ByteBuf in, MinecraftCodecHelper helper) {
-        this.entityId = helper.readVarInt(in);
-        this.sourceTypeId = helper.readVarInt(in);
-        this.sourceCauseId = helper.readVarInt(in) - 1;
-        this.sourceDirectId = helper.readVarInt(in) - 1;
-        this.sourcePosition = in.readBoolean() ? Vector3d.from(in.readDouble(), in.readDouble(), in.readDouble()) : null;
-    }
-
-    @Override
-    public void serialize(ByteBuf out, MinecraftCodecHelper helper) {
-        helper.writeVarInt(out, this.entityId);
-        helper.writeVarInt(out, this.sourceTypeId);
-        helper.writeVarInt(out, this.sourceCauseId + 1);
-        helper.writeVarInt(out, this.sourceDirectId + 1);
-
-        if (this.sourcePosition != null) {
-            out.writeBoolean(true);
-            out.writeDouble(this.sourcePosition.getX());
-            out.writeDouble(this.sourcePosition.getY());
-            out.writeDouble(this.sourcePosition.getZ());
-        } else {
-            out.writeBoolean(false);
-        }
-    }
-}
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
+
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.cloudburstmc.math.vector.Vector3d;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+@Data
+@AllArgsConstructor
+public class ClientboundDamageEventPacket implements MinecraftPacket {
+    private final int entityId;
+    private final int sourceTypeId;
+    private final int sourceCauseId;
+    private final int sourceDirectId;
+    private final @Nullable Vector3d sourcePosition;
+
+    public ClientboundDamageEventPacket(ByteBuf in, MinecraftCodecHelper helper) {
+        this.entityId = helper.readVarInt(in);
+        this.sourceTypeId = helper.readVarInt(in);
+        this.sourceCauseId = helper.readVarInt(in) - 1;
+        this.sourceDirectId = helper.readVarInt(in) - 1;
+        this.sourcePosition = in.readBoolean() ? Vector3d.from(in.readDouble(), in.readDouble(), in.readDouble()) : null;
+    }
+
+    @Override
+    public void serialize(ByteBuf out, MinecraftCodecHelper helper) {
+        helper.writeVarInt(out, this.entityId);
+        helper.writeVarInt(out, this.sourceTypeId);
+        helper.writeVarInt(out, this.sourceCauseId + 1);
+        helper.writeVarInt(out, this.sourceDirectId + 1);
+
+        if (this.sourcePosition != null) {
+            out.writeBoolean(true);
+            out.writeDouble(this.sourcePosition.getX());
+            out.writeDouble(this.sourcePosition.getY());
+            out.writeDouble(this.sourcePosition.getZ());
+        } else {
+            out.writeBoolean(false);
+        }
+    }
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundEntityEventPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundEntityEventPacket.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundEntityEventPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundEntityEventPacket.java
index 64d99458..fa4cc250 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundEntityEventPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundEntityEventPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.EntityEvent;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.EntityEvent;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundHurtAnimationPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundHurtAnimationPacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundHurtAnimationPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundHurtAnimationPacket.java
index 76486f6a..ff183fcd 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundHurtAnimationPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundHurtAnimationPacket.java
@@ -1,27 +1,27 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
-
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import io.netty.buffer.ByteBuf;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.With;
-
-@Data
-@With
-@AllArgsConstructor
-public class ClientboundHurtAnimationPacket implements MinecraftPacket {
-    private final int id;
-    private final float yaw;
-
-    public ClientboundHurtAnimationPacket(ByteBuf in, MinecraftCodecHelper helper) {
-        this.id = helper.readVarInt(in);
-        this.yaw = in.readFloat();
-    }
-
-    @Override
-    public void serialize(ByteBuf out, MinecraftCodecHelper helper) {
-        helper.writeVarInt(out, this.id);
-        out.writeFloat(this.yaw);
-    }
-}
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
+
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.With;
+
+@Data
+@With
+@AllArgsConstructor
+public class ClientboundHurtAnimationPacket implements MinecraftPacket {
+    private final int id;
+    private final float yaw;
+
+    public ClientboundHurtAnimationPacket(ByteBuf in, MinecraftCodecHelper helper) {
+        this.id = helper.readVarInt(in);
+        this.yaw = in.readFloat();
+    }
+
+    @Override
+    public void serialize(ByteBuf out, MinecraftCodecHelper helper) {
+        helper.writeVarInt(out, this.id);
+        out.writeFloat(this.yaw);
+    }
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosPacket.java
similarity index 82%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosPacket.java
index fc50024c..bb4b1d30 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosRotPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosRotPacket.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosRotPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosRotPacket.java
index 38e46719..4070abc7 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosRotPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityPosRotPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityRotPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityRotPacket.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityRotPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityRotPacket.java
index e3ad09e7..25c748d0 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityRotPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundMoveEntityRotPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundMoveVehiclePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundMoveVehiclePacket.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundMoveVehiclePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundMoveVehiclePacket.java
index e33e2475..674ade83 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundMoveVehiclePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundMoveVehiclePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundRemoveEntitiesPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundRemoveEntitiesPacket.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundRemoveEntitiesPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundRemoveEntitiesPacket.java
index 8ca78c40..4f119ad4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundRemoveEntitiesPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundRemoveEntitiesPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundRemoveMobEffectPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundRemoveMobEffectPacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundRemoveMobEffectPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundRemoveMobEffectPacket.java
index 554765c2..50f2fe61 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundRemoveMobEffectPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundRemoveMobEffectPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.Effect;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.Effect;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundRotateHeadPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundRotateHeadPacket.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundRotateHeadPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundRotateHeadPacket.java
index bf9b090b..75a13caa 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundRotateHeadPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundRotateHeadPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityDataPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityDataPacket.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityDataPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityDataPacket.java
index 3e045d48..e4cdf92a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityDataPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityDataPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityLinkPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityLinkPacket.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityLinkPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityLinkPacket.java
index ef5f2496..e04cbfe8 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityLinkPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityLinkPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityMotionPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityMotionPacket.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityMotionPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityMotionPacket.java
index 9b85011c..53a2a98f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityMotionPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetEntityMotionPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetEquipmentPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetEquipmentPacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetEquipmentPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetEquipmentPacket.java
index 89d9d3b9..78887913 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetEquipmentPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetEquipmentPacket.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.EquipmentSlot;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.Equipment;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.EquipmentSlot;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.Equipment;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetPassengersPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetPassengersPacket.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetPassengersPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetPassengersPacket.java
index 1c3d1edb..541f436f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundSetPassengersPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundSetPassengersPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundTakeItemEntityPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundTakeItemEntityPacket.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundTakeItemEntityPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundTakeItemEntityPacket.java
index 0d4365d2..2d39031a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundTakeItemEntityPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundTakeItemEntityPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundTeleportEntityPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundTeleportEntityPacket.java
similarity index 84%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundTeleportEntityPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundTeleportEntityPacket.java
index 06e73b4a..b6f3854d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundTeleportEntityPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundTeleportEntityPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundUpdateAttributesPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundUpdateAttributesPacket.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundUpdateAttributesPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundUpdateAttributesPacket.java
index f61dd842..c544fee9 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundUpdateAttributesPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundUpdateAttributesPacket.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.Identifier;
-import com.github.steveice10.mc.protocol.data.game.entity.attribute.Attribute;
-import com.github.steveice10.mc.protocol.data.game.entity.attribute.AttributeModifier;
-import com.github.steveice10.mc.protocol.data.game.entity.attribute.AttributeType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.Identifier;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.attribute.Attribute;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.attribute.AttributeModifier;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.attribute.AttributeType;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundUpdateMobEffectPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundUpdateMobEffectPacket.java
similarity index 88%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundUpdateMobEffectPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundUpdateMobEffectPacket.java
index b7a80d65..e1445e05 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/ClientboundUpdateMobEffectPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/ClientboundUpdateMobEffectPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.Effect;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.Effect;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundBlockChangedAckPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundBlockChangedAckPacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundBlockChangedAckPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundBlockChangedAckPacket.java
index 63376f46..51fed79a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundBlockChangedAckPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundBlockChangedAckPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerAbilitiesPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerAbilitiesPacket.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerAbilitiesPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerAbilitiesPacket.java
index f6aeae0d..9685ee0d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerAbilitiesPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerAbilitiesPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEndPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEndPacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEndPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEndPacket.java
index 1acc2f3a..64393fc9 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEndPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEndPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEnterPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEnterPacket.java
similarity index 66%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEnterPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEnterPacket.java
index af78eea4..1b385e75 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEnterPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatEnterPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatKillPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatKillPacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatKillPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatKillPacket.java
index e5ff8bfe..eba6b9af 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatKillPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerCombatKillPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerLookAtPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerLookAtPacket.java
similarity index 84%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerLookAtPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerLookAtPacket.java
index 19c46958..03ef0c67 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerLookAtPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerLookAtPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.RotationOrigin;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.RotationOrigin;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerPositionPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerPositionPacket.java
similarity index 86%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerPositionPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerPositionPacket.java
index 3250e32b..b66d51b2 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerPositionPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundPlayerPositionPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.player.PositionElement;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.PositionElement;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundSetCarriedItemPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundSetCarriedItemPacket.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundSetCarriedItemPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundSetCarriedItemPacket.java
index 9b351f54..8aa91222 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundSetCarriedItemPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundSetCarriedItemPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundSetExperiencePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundSetExperiencePacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundSetExperiencePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundSetExperiencePacket.java
index 18008ff2..94bb833c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundSetExperiencePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundSetExperiencePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundSetHealthPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundSetHealthPacket.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundSetHealthPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundSetHealthPacket.java
index 63f44143..0cb3c05b 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/player/ClientboundSetHealthPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/player/ClientboundSetHealthPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddEntityPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddEntityPacket.java
similarity index 93%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddEntityPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddEntityPacket.java
index 7e5ec27a..92f39180 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddEntityPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddEntityPacket.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.spawn;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.object.*;
-import com.github.steveice10.mc.protocol.data.game.entity.type.EntityType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.*;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.type.EntityType;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddExperienceOrbPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddExperienceOrbPacket.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddExperienceOrbPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddExperienceOrbPacket.java
index 70b213c2..f0cb68e0 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddExperienceOrbPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/entity/spawn/ClientboundAddExperienceOrbPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.spawn;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundContainerClosePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundContainerClosePacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundContainerClosePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundContainerClosePacket.java
index a5f18f07..432e1408 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundContainerClosePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundContainerClosePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetContentPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetContentPacket.java
similarity index 82%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetContentPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetContentPacket.java
index 1f870a60..d5aca62e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetContentPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetContentPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetDataPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetDataPacket.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetDataPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetDataPacket.java
index cf417e23..28b8a010 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetDataPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetDataPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.inventory.property.ContainerProperty;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.property.ContainerProperty;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetSlotPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetSlotPacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetSlotPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetSlotPacket.java
index 66d6b537..e4d6232e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetSlotPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundContainerSetSlotPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundHorseScreenOpenPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundHorseScreenOpenPacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundHorseScreenOpenPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundHorseScreenOpenPacket.java
index df929f01..cb6c16ed 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundHorseScreenOpenPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundHorseScreenOpenPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundMerchantOffersPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundMerchantOffersPacket.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundMerchantOffersPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundMerchantOffersPacket.java
index b4cfa2ac..1d2dfff3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundMerchantOffersPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundMerchantOffersPacket.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.game.inventory.VillagerTrade;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.VillagerTrade;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundOpenBookPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundOpenBookPacket.java
similarity index 65%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundOpenBookPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundOpenBookPacket.java
index 8ee2ee2d..181a982c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundOpenBookPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundOpenBookPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.player.Hand;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundOpenScreenPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundOpenScreenPacket.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundOpenScreenPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundOpenScreenPacket.java
index 58252f12..40a8ec23 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundOpenScreenPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundOpenScreenPacket.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.DefaultComponentSerializer;
-import com.github.steveice10.mc.protocol.data.game.inventory.ContainerType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.DefaultComponentSerializer;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.ContainerType;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundPlaceGhostRecipePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundPlaceGhostRecipePacket.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundPlaceGhostRecipePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundPlaceGhostRecipePacket.java
index 9b39dbe3..1915c8e4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/inventory/ClientboundPlaceGhostRecipePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundPlaceGhostRecipePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockDestructionPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockDestructionPacket.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockDestructionPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockDestructionPacket.java
index 4f6edb27..6191f706 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockDestructionPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockDestructionPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.player.BlockBreakStage;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.BlockBreakStage;
 import org.cloudburstmc.math.vector.Vector3i;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockEntityDataPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockEntityDataPacket.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockEntityDataPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockEntityDataPacket.java
index 7860b2b3..b214f76b 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockEntityDataPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockEntityDataPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityType;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockEventPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockEventPacket.java
similarity index 90%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockEventPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockEventPacket.java
index 1aa60d12..26cda0f3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockEventPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockEventPacket.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
-import com.github.steveice10.mc.protocol.data.game.level.block.WobbleStyle;
-import com.github.steveice10.mc.protocol.data.game.level.block.value.*;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.WobbleStyle;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.value.*;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacket.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacket.java
index 3d283941..2e31f233 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.level.block.BlockChangeEntry;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockChangeEntry;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchFinishedPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchFinishedPacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchFinishedPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchFinishedPacket.java
index 8273a816..a4d27c10 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchFinishedPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchFinishedPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchStartPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchStartPacket.java
similarity index 62%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchStartPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchStartPacket.java
index 6f33ad78..145a620e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchStartPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundChunkBatchStartPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundChunksBiomesPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundChunksBiomesPacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundChunksBiomesPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundChunksBiomesPacket.java
index eba47102..997c3c70 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundChunksBiomesPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundChunksBiomesPacket.java
@@ -1,37 +1,37 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
-
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.chunk.ChunkBiomeData;
-import io.netty.buffer.ByteBuf;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-public class ClientboundChunksBiomesPacket implements MinecraftPacket {
-    private final List<ChunkBiomeData> chunkBiomeData;
-
-    public ClientboundChunksBiomesPacket(ByteBuf in, MinecraftCodecHelper helper) {
-        this.chunkBiomeData = new ArrayList<>();
-
-        int length = helper.readVarInt(in);
-        for (int i = 0; i < length; i++) {
-            long raw = in.readLong();
-            this.chunkBiomeData.add(new ChunkBiomeData((int)raw, (int)(raw >> 32), helper.readByteArray(in)));
-        }
-    }
-
-    @Override
-    public void serialize(ByteBuf out, MinecraftCodecHelper helper) {
-        helper.writeVarInt(out, this.chunkBiomeData.size());
-        for (ChunkBiomeData entry : this.chunkBiomeData) {
-            long raw = (long)entry.getX() & 0xFFFFFFFFL | ((long)entry.getZ() & 0xFFFFFFFFL) << 32;
-            out.writeLong(raw);
-            helper.writeByteArray(out, entry.getBuffer());
-        }
-    }
-}
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
+
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.ChunkBiomeData;
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class ClientboundChunksBiomesPacket implements MinecraftPacket {
+    private final List<ChunkBiomeData> chunkBiomeData;
+
+    public ClientboundChunksBiomesPacket(ByteBuf in, MinecraftCodecHelper helper) {
+        this.chunkBiomeData = new ArrayList<>();
+
+        int length = helper.readVarInt(in);
+        for (int i = 0; i < length; i++) {
+            long raw = in.readLong();
+            this.chunkBiomeData.add(new ChunkBiomeData((int)raw, (int)(raw >> 32), helper.readByteArray(in)));
+        }
+    }
+
+    @Override
+    public void serialize(ByteBuf out, MinecraftCodecHelper helper) {
+        helper.writeVarInt(out, this.chunkBiomeData.size());
+        for (ChunkBiomeData entry : this.chunkBiomeData) {
+            long raw = (long)entry.getX() & 0xFFFFFFFFL | ((long)entry.getZ() & 0xFFFFFFFFL) << 32;
+            out.writeLong(raw);
+            helper.writeByteArray(out, entry.getBuffer());
+        }
+    }
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundExplodePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundExplodePacket.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundExplodePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundExplodePacket.java
index b0fbe672..1fa86ff4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundExplodePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundExplodePacket.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.level.block.ExplosionInteraction;
-import com.github.steveice10.mc.protocol.data.game.level.particle.Particle;
-import com.github.steveice10.mc.protocol.data.game.level.sound.Sound;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.ExplosionInteraction;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.Particle;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.Sound;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundForgetLevelChunkPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundForgetLevelChunkPacket.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundForgetLevelChunkPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundForgetLevelChunkPacket.java
index bfc5067d..be9c6aea 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundForgetLevelChunkPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundForgetLevelChunkPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundGameEventPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundGameEventPacket.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundGameEventPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundGameEventPacket.java
index 9a6e3ec9..047ade18 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundGameEventPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundGameEventPacket.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
-import com.github.steveice10.mc.protocol.data.game.level.notify.*;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
+import org.geysermc.mcprotocollib.protocol.data.game.level.notify.*;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacket.java
similarity index 83%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacket.java
index e5aa14d9..cd6fc359 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacket.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.level.LightUpdateData;
-import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityInfo;
-import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.level.LightUpdateData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityInfo;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityType;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
@@ -63,4 +63,4 @@ public class ClientboundLevelChunkWithLightPacket implements MinecraftPacket {
 
         helper.writeLightUpdateData(out, this.lightData);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelEventPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLevelEventPacket.java
similarity index 92%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelEventPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLevelEventPacket.java
index 4bd9fe3f..4185261f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelEventPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLevelEventPacket.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
-import com.github.steveice10.mc.protocol.data.game.level.event.*;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.data.game.level.event.*;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelParticlesPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLevelParticlesPacket.java
similarity index 82%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelParticlesPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLevelParticlesPacket.java
index d3b0b5e2..062e0ef5 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelParticlesPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLevelParticlesPacket.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.level.particle.Particle;
-import com.github.steveice10.mc.protocol.data.game.level.particle.ParticleType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.Particle;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.ParticleType;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLightUpdatePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLightUpdatePacket.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLightUpdatePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLightUpdatePacket.java
index 6c12bd19..b54864c9 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLightUpdatePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLightUpdatePacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.level.LightUpdateData;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.level.LightUpdateData;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundMapItemDataPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundMapItemDataPacket.java
similarity index 88%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundMapItemDataPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundMapItemDataPacket.java
index a7348862..865fbd19 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundMapItemDataPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundMapItemDataPacket.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.level.map.MapData;
-import com.github.steveice10.mc.protocol.data.game.level.map.MapIcon;
-import com.github.steveice10.mc.protocol.data.game.level.map.MapIconType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.level.map.MapData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.map.MapIcon;
+import org.geysermc.mcprotocollib.protocol.data.game.level.map.MapIconType;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundOpenSignEditorPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundOpenSignEditorPacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundOpenSignEditorPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundOpenSignEditorPacket.java
index 12966f0f..fdf9b0f5 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundOpenSignEditorPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundOpenSignEditorPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacket.java
similarity index 89%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacket.java
index fb341cb0..4bc1cd1a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.level.block.BlockChangeEntry;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockChangeEntry;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheCenterPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheCenterPacket.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheCenterPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheCenterPacket.java
index e7ad047e..4a9dfff6 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheCenterPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheCenterPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheRadiusPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheRadiusPacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheRadiusPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheRadiusPacket.java
index 857b67ac..d28dea5f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheRadiusPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetChunkCacheRadiusPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetDefaultSpawnPositionPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetDefaultSpawnPositionPacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetDefaultSpawnPositionPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetDefaultSpawnPositionPacket.java
index fcc9e0ae..4f57a678 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetDefaultSpawnPositionPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetDefaultSpawnPositionPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetSimulationDistancePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetSimulationDistancePacket.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetSimulationDistancePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetSimulationDistancePacket.java
index 233ea685..4331a3d6 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetSimulationDistancePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetSimulationDistancePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetTimePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetTimePacket.java
similarity index 73%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetTimePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetTimePacket.java
index bea56555..29043dd9 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetTimePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetTimePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSoundPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSoundPacket.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSoundPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSoundPacket.java
index 40fb79ca..2ad4dbd6 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSoundPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSoundPacket.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.level.sound.BuiltinSound;
-import com.github.steveice10.mc.protocol.data.game.level.sound.CustomSound;
-import com.github.steveice10.mc.protocol.data.game.level.sound.Sound;
-import com.github.steveice10.mc.protocol.data.game.level.sound.SoundCategory;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.BuiltinSound;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.CustomSound;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.Sound;
+import org.geysermc.mcprotocollib.protocol.data.game.level.sound.SoundCategory;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundTagQueryPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundTagQueryPacket.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundTagQueryPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundTagQueryPacket.java
index 43492f7a..b70a2d17 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundTagQueryPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundTagQueryPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundInitializeBorderPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundInitializeBorderPacket.java
similarity index 86%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundInitializeBorderPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundInitializeBorderPacket.java
index 9a41bb89..a5f853f8 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundInitializeBorderPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundInitializeBorderPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderCenterPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderCenterPacket.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderCenterPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderCenterPacket.java
index 2baa4af9..9274d32d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderCenterPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderCenterPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderLerpSizePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderLerpSizePacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderLerpSizePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderLerpSizePacket.java
index e1053c3d..39c63894 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderLerpSizePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderLerpSizePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderSizePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderSizePacket.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderSizePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderSizePacket.java
index 2677f276..d3b4f599 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderSizePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderSizePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDelayPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDelayPacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDelayPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDelayPacket.java
index f9c9e6f2..e3666c18 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDelayPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDelayPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDistancePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDistancePacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDistancePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDistancePacket.java
index 05434501..1c6494d5 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDistancePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/border/ClientboundSetBorderWarningDistancePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.border;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.border;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundResetScorePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundResetScorePacket.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundResetScorePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundResetScorePacket.java
index 15feab8e..61f94e4f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundResetScorePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundResetScorePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetDisplayObjectivePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetDisplayObjectivePacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetDisplayObjectivePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetDisplayObjectivePacket.java
index 6c43c127..3b181f13 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetDisplayObjectivePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetDisplayObjectivePacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreboardPosition;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.ScoreboardPosition;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetObjectivePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetObjectivePacket.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetObjectivePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetObjectivePacket.java
index 98e66a24..bffb2471 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetObjectivePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetObjectivePacket.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.chat.numbers.NumberFormat;
-import com.github.steveice10.mc.protocol.data.game.scoreboard.ObjectiveAction;
-import com.github.steveice10.mc.protocol.data.game.scoreboard.ScoreType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.chat.numbers.NumberFormat;
+import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.ObjectiveAction;
+import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.ScoreType;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetPlayerTeamPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetPlayerTeamPacket.java
similarity index 92%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetPlayerTeamPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetPlayerTeamPacket.java
index 2cb12d51..aaad2530 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetPlayerTeamPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetPlayerTeamPacket.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.scoreboard.CollisionRule;
-import com.github.steveice10.mc.protocol.data.game.scoreboard.NameTagVisibility;
-import com.github.steveice10.mc.protocol.data.game.scoreboard.TeamAction;
-import com.github.steveice10.mc.protocol.data.game.scoreboard.TeamColor;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.CollisionRule;
+import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.NameTagVisibility;
+import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.TeamAction;
+import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.TeamColor;
 import io.netty.buffer.ByteBuf;
 import lombok.*;
 import net.kyori.adventure.text.Component;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetScorePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetScorePacket.java
similarity index 84%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetScorePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetScorePacket.java
index 3f32003b..2e0b8bbf 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetScorePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetScorePacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.chat.numbers.NumberFormat;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.chat.numbers.NumberFormat;
 import io.netty.buffer.ByteBuf;
 import lombok.*;
 import net.kyori.adventure.text.Component;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundClearTitlesPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundClearTitlesPacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundClearTitlesPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundClearTitlesPacket.java
index 52a466c9..54809f5a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundClearTitlesPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundClearTitlesPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.title;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.title;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundSetActionBarTextPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundSetActionBarTextPacket.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundSetActionBarTextPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundSetActionBarTextPacket.java
index d6443eba..a878c0ac 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundSetActionBarTextPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundSetActionBarTextPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.title;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.title;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundSetSubtitleTextPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundSetSubtitleTextPacket.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundSetSubtitleTextPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundSetSubtitleTextPacket.java
index ee1deaca..096e75f4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundSetSubtitleTextPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundSetSubtitleTextPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.title;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.title;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundSetTitleTextPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundSetTitleTextPacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundSetTitleTextPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundSetTitleTextPacket.java
index b60d7bdf..be408290 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundSetTitleTextPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundSetTitleTextPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.title;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.title;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.DefaultComponentSerializer;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.DefaultComponentSerializer;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundSetTitlesAnimationPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundSetTitlesAnimationPacket.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundSetTitlesAnimationPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundSetTitlesAnimationPacket.java
index b49cadca..e53ac2f4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/title/ClientboundSetTitlesAnimationPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/title/ClientboundSetTitlesAnimationPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.title;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.title;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChangeDifficultyPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChangeDifficultyPacket.java
similarity index 68%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChangeDifficultyPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChangeDifficultyPacket.java
index 8ac49ac1..a75e178d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChangeDifficultyPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChangeDifficultyPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.setting.Difficulty;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.setting.Difficulty;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChatAckPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChatAckPacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChatAckPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChatAckPacket.java
index f3045c9e..cefdcdc1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChatAckPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChatAckPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChatCommandPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChatCommandPacket.java
similarity index 86%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChatCommandPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChatCommandPacket.java
index 6a0c57b9..bcff868d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChatCommandPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChatCommandPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.ArgumentSignature;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.ArgumentSignature;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChatPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChatPacket.java
similarity index 88%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChatPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChatPacket.java
index fa73804c..03c026f3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChatPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChatPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChatSessionUpdatePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChatSessionUpdatePacket.java
similarity index 88%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChatSessionUpdatePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChatSessionUpdatePacket.java
index 13caf1fd..7a86a639 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundChatSessionUpdatePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChatSessionUpdatePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundClientCommandPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundClientCommandPacket.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundClientCommandPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundClientCommandPacket.java
index febb0a75..4cb26c95 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundClientCommandPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundClientCommandPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.ClientCommand;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.ClientCommand;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundCommandSuggestionPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundCommandSuggestionPacket.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundCommandSuggestionPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundCommandSuggestionPacket.java
index de991ed6..64dfe60e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundCommandSuggestionPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundCommandSuggestionPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundConfigurationAcknowledgedPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundConfigurationAcknowledgedPacket.java
similarity index 65%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundConfigurationAcknowledgedPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundConfigurationAcknowledgedPacket.java
index e8c5dd7f..80b702ef 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundConfigurationAcknowledgedPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundConfigurationAcknowledgedPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundLockDifficultyPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundLockDifficultyPacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundLockDifficultyPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundLockDifficultyPacket.java
index 4f63e23e..f5ddd30f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/ServerboundLockDifficultyPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundLockDifficultyPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundContainerButtonClickPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundContainerButtonClickPacket.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundContainerButtonClickPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundContainerButtonClickPacket.java
index 529a04a1..e338f53f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundContainerButtonClickPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundContainerButtonClickPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClickPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClickPacket.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClickPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClickPacket.java
index 8bd3234e..ae9e9836 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClickPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClickPacket.java
@@ -1,17 +1,17 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.game.inventory.ClickItemAction;
-import com.github.steveice10.mc.protocol.data.game.inventory.ContainerAction;
-import com.github.steveice10.mc.protocol.data.game.inventory.ContainerActionType;
-import com.github.steveice10.mc.protocol.data.game.inventory.CreativeGrabAction;
-import com.github.steveice10.mc.protocol.data.game.inventory.DropItemAction;
-import com.github.steveice10.mc.protocol.data.game.inventory.FillStackAction;
-import com.github.steveice10.mc.protocol.data.game.inventory.MoveToHotbarAction;
-import com.github.steveice10.mc.protocol.data.game.inventory.ShiftClickItemAction;
-import com.github.steveice10.mc.protocol.data.game.inventory.SpreadItemAction;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.ClickItemAction;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.ContainerAction;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.ContainerActionType;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.CreativeGrabAction;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.DropItemAction;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.FillStackAction;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.MoveToHotbarAction;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.ShiftClickItemAction;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.SpreadItemAction;
 import io.netty.buffer.ByteBuf;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClosePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClosePacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClosePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClosePacket.java
index a416aa66..9abb7193 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClosePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundContainerClosePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundContainerSlotStateChangedPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundContainerSlotStateChangedPacket.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundContainerSlotStateChangedPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundContainerSlotStateChangedPacket.java
index b942f29e..1c9b1bc0 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundContainerSlotStateChangedPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundContainerSlotStateChangedPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundEditBookPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundEditBookPacket.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundEditBookPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundEditBookPacket.java
index d2744fe4..f2e28943 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundEditBookPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundEditBookPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundPickItemPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundPickItemPacket.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundPickItemPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundPickItemPacket.java
index 45ee9e67..a258de4d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundPickItemPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundPickItemPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundPlaceRecipePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundPlaceRecipePacket.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundPlaceRecipePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundPlaceRecipePacket.java
index 68da26e8..9ca36394 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundPlaceRecipePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundPlaceRecipePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookChangeSettingsPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookChangeSettingsPacket.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookChangeSettingsPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookChangeSettingsPacket.java
index 0622b2f1..395556f2 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookChangeSettingsPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookChangeSettingsPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.inventory.CraftingBookStateType;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.CraftingBookStateType;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookSeenRecipePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookSeenRecipePacket.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookSeenRecipePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookSeenRecipePacket.java
index 6dfd43e9..c1e2b221 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookSeenRecipePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundRecipeBookSeenRecipePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundRenameItemPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundRenameItemPacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundRenameItemPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundRenameItemPacket.java
index 03b2455a..505b5abc 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundRenameItemPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundRenameItemPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSeenAdvancementsPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSeenAdvancementsPacket.java
similarity index 86%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSeenAdvancementsPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSeenAdvancementsPacket.java
index 81e731f2..24924862 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSeenAdvancementsPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSeenAdvancementsPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.inventory.AdvancementTabAction;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.AdvancementTabAction;
 import io.netty.buffer.ByteBuf;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSelectTradePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSelectTradePacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSelectTradePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSelectTradePacket.java
index 64c68af4..f4a83831 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSelectTradePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSelectTradePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetBeaconPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetBeaconPacket.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetBeaconPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetBeaconPacket.java
index 988f7f9c..44eea6d3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetBeaconPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetBeaconPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandBlockPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandBlockPacket.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandBlockPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandBlockPacket.java
index a63eea4f..542850a5 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandBlockPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandBlockPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.level.block.CommandBlockMode;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.CommandBlockMode;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandMinecartPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandMinecartPacket.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandMinecartPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandMinecartPacket.java
index 37b96068..608a32e0 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandMinecartPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetCommandMinecartPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetCreativeModeSlotPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetCreativeModeSlotPacket.java
similarity index 73%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetCreativeModeSlotPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetCreativeModeSlotPacket.java
index 4298ea52..6cbb3c0a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetCreativeModeSlotPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetCreativeModeSlotPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetJigsawBlockPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetJigsawBlockPacket.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetJigsawBlockPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetJigsawBlockPacket.java
index 6b8d8de5..b80cd164 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetJigsawBlockPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetJigsawBlockPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetStructureBlockPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetStructureBlockPacket.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetStructureBlockPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetStructureBlockPacket.java
index 411b3985..eb42e0f2 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/inventory/ServerboundSetStructureBlockPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/inventory/ServerboundSetStructureBlockPacket.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.inventory.UpdateStructureBlockAction;
-import com.github.steveice10.mc.protocol.data.game.inventory.UpdateStructureBlockMode;
-import com.github.steveice10.mc.protocol.data.game.level.block.StructureMirror;
-import com.github.steveice10.mc.protocol.data.game.level.block.StructureRotation;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.UpdateStructureBlockAction;
+import org.geysermc.mcprotocollib.protocol.data.game.inventory.UpdateStructureBlockMode;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.StructureMirror;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.StructureRotation;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundAcceptTeleportationPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundAcceptTeleportationPacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundAcceptTeleportationPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundAcceptTeleportationPacket.java
index 78459753..dc08cd78 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundAcceptTeleportationPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundAcceptTeleportationPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundBlockEntityTagQuery.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundBlockEntityTagQuery.java
similarity index 77%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundBlockEntityTagQuery.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundBlockEntityTagQuery.java
index 3d0d67e6..896723c6 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundBlockEntityTagQuery.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundBlockEntityTagQuery.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundChunkBatchReceivedPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundChunkBatchReceivedPacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundChunkBatchReceivedPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundChunkBatchReceivedPacket.java
index 66dbbf10..5092dff1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundChunkBatchReceivedPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundChunkBatchReceivedPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundEntityTagQuery.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundEntityTagQuery.java
similarity index 75%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundEntityTagQuery.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundEntityTagQuery.java
index fcd24658..656773b9 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundEntityTagQuery.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundEntityTagQuery.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundJigsawGeneratePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundJigsawGeneratePacket.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundJigsawGeneratePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundJigsawGeneratePacket.java
index fa0e11f3..db8f8641 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundJigsawGeneratePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundJigsawGeneratePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundMoveVehiclePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundMoveVehiclePacket.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundMoveVehiclePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundMoveVehiclePacket.java
index 4dee0753..a3b1d22f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundMoveVehiclePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundMoveVehiclePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundPaddleBoatPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundPaddleBoatPacket.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundPaddleBoatPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundPaddleBoatPacket.java
index 68cfec92..141b8def 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundPaddleBoatPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundPaddleBoatPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundPlayerInputPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundPlayerInputPacket.java
similarity index 84%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundPlayerInputPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundPlayerInputPacket.java
index 478a593b..da4bf006 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundPlayerInputPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundPlayerInputPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundSignUpdatePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundSignUpdatePacket.java
similarity index 86%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundSignUpdatePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundSignUpdatePacket.java
index a23fa4b6..53abbd96 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundSignUpdatePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundSignUpdatePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundTeleportToEntityPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundTeleportToEntityPacket.java
similarity index 72%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundTeleportToEntityPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundTeleportToEntityPacket.java
index a21fb0c1..2e57614c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/level/ServerboundTeleportToEntityPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/level/ServerboundTeleportToEntityPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundInteractPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundInteractPacket.java
similarity index 85%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundInteractPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundInteractPacket.java
index 565b3864..1db44748 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundInteractPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundInteractPacket.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.player.Hand;
-import com.github.steveice10.mc.protocol.data.game.entity.player.InteractAction;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.InteractAction;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosPacket.java
similarity index 78%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosPacket.java
index 49714a00..6704b8ba 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosRotPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosRotPacket.java
similarity index 82%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosRotPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosRotPacket.java
index 4e11e243..6b00bb19 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosRotPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerPosRotPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerRotPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerRotPacket.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerRotPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerRotPacket.java
index fd3e9ff1..6113b18e 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerRotPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerRotPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerStatusOnlyPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerStatusOnlyPacket.java
similarity index 71%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerStatusOnlyPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerStatusOnlyPacket.java
index 5002fe60..8ca179a4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerStatusOnlyPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundMovePlayerStatusOnlyPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundPlayerAbilitiesPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundPlayerAbilitiesPacket.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundPlayerAbilitiesPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundPlayerAbilitiesPacket.java
index beb31605..e9344fa1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundPlayerAbilitiesPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundPlayerAbilitiesPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundPlayerActionPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundPlayerActionPacket.java
similarity index 73%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundPlayerActionPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundPlayerActionPacket.java
index ddc77393..30f8842b 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundPlayerActionPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundPlayerActionPacket.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
-import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerAction;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.PlayerAction;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundPlayerCommandPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundPlayerCommandPacket.java
similarity index 76%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundPlayerCommandPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundPlayerCommandPacket.java
index ea76f3df..0f55eca6 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundPlayerCommandPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundPlayerCommandPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerState;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.PlayerState;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundSetCarriedItemPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundSetCarriedItemPacket.java
similarity index 69%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundSetCarriedItemPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundSetCarriedItemPacket.java
index c8fd49af..ee2bedc4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundSetCarriedItemPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundSetCarriedItemPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundSwingPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundSwingPacket.java
similarity index 65%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundSwingPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundSwingPacket.java
index ffb15168..7c49d2c3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundSwingPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundSwingPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.player.Hand;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundUseItemOnPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundUseItemOnPacket.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundUseItemOnPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundUseItemOnPacket.java
index 1e05a05c..b0a85240 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundUseItemOnPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundUseItemOnPacket.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
-import com.github.steveice10.mc.protocol.data.game.entity.player.Hand;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundUseItemPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundUseItemPacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundUseItemPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundUseItemPacket.java
index 87e6bea5..d22b35b4 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/ingame/serverbound/player/ServerboundUseItemPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundUseItemPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.ingame.serverbound.player;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.game.entity.player.Hand;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundCustomQueryPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundCustomQueryPacket.java
similarity index 80%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundCustomQueryPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundCustomQueryPacket.java
index 0aea50ba..4a17bca3 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundCustomQueryPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundCustomQueryPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.login.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundGameProfilePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundGameProfilePacket.java
similarity index 90%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundGameProfilePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundGameProfilePacket.java
index 6aa020b5..0b81e96a 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundGameProfilePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundGameProfilePacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.login.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.clientbound;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundHelloPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundHelloPacket.java
similarity index 87%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundHelloPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundHelloPacket.java
index f3b7f6ad..dfac4070 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundHelloPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundHelloPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.login.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundLoginCompressionPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundLoginCompressionPacket.java
similarity index 74%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundLoginCompressionPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundLoginCompressionPacket.java
index 07160e1f..f012320c 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundLoginCompressionPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundLoginCompressionPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.login.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacket.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacket.java
index 60f7c8e8..41634f30 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacket.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet.login.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.DefaultComponentSerializer;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.DefaultComponentSerializer;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacket.java
similarity index 81%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacket.java
index f5c3ec1f..cb575d88 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.login.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundHelloPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/serverbound/ServerboundHelloPacket.java
similarity index 79%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundHelloPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/serverbound/ServerboundHelloPacket.java
index ad24c4e7..0ec78216 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundHelloPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/serverbound/ServerboundHelloPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.login.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundKeyPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/serverbound/ServerboundKeyPacket.java
similarity index 90%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundKeyPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/serverbound/ServerboundKeyPacket.java
index 0c8081af..29c402d1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundKeyPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/serverbound/ServerboundKeyPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.login.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundLoginAcknowledgedPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/serverbound/ServerboundLoginAcknowledgedPacket.java
similarity index 64%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundLoginAcknowledgedPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/serverbound/ServerboundLoginAcknowledgedPacket.java
index 397aa1c8..1f8e8e3f 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundLoginAcknowledgedPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/serverbound/ServerboundLoginAcknowledgedPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.login.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/status/clientbound/ClientboundPongResponsePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/status/clientbound/ClientboundPongResponsePacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/status/clientbound/ClientboundPongResponsePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/status/clientbound/ClientboundPongResponsePacket.java
index 9597cd4f..af55ef1d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/status/clientbound/ClientboundPongResponsePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/status/clientbound/ClientboundPongResponsePacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.status.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.status.clientbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/status/clientbound/ClientboundStatusResponsePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/status/clientbound/ClientboundStatusResponsePacket.java
similarity index 89%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/status/clientbound/ClientboundStatusResponsePacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/status/clientbound/ClientboundStatusResponsePacket.java
index e8a4c8ba..3a2396f1 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/status/clientbound/ClientboundStatusResponsePacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/status/clientbound/ClientboundStatusResponsePacket.java
@@ -1,13 +1,13 @@
-package com.github.steveice10.mc.protocol.packet.status.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.status.clientbound;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
 import com.github.steveice10.mc.auth.util.Base64;
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.DefaultComponentSerializer;
-import com.github.steveice10.mc.protocol.data.status.PlayerInfo;
-import com.github.steveice10.mc.protocol.data.status.ServerStatusInfo;
-import com.github.steveice10.mc.protocol.data.status.VersionInfo;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.DefaultComponentSerializer;
+import org.geysermc.mcprotocollib.protocol.data.status.PlayerInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.ServerStatusInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.VersionInfo;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/status/serverbound/ServerboundPingRequestPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/status/serverbound/ServerboundPingRequestPacket.java
similarity index 70%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/status/serverbound/ServerboundPingRequestPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/status/serverbound/ServerboundPingRequestPacket.java
index 7fa67d2c..75cc663d 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/status/serverbound/ServerboundPingRequestPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/status/serverbound/ServerboundPingRequestPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.status.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.status.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/com/github/steveice10/mc/protocol/packet/status/serverbound/ServerboundStatusRequestPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/status/serverbound/ServerboundStatusRequestPacket.java
similarity index 64%
rename from src/main/java/com/github/steveice10/mc/protocol/packet/status/serverbound/ServerboundStatusRequestPacket.java
rename to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/status/serverbound/ServerboundStatusRequestPacket.java
index 2bbaf66a..bfcb6369 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/packet/status/serverbound/ServerboundStatusRequestPacket.java
+++ b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/status/serverbound/ServerboundStatusRequestPacket.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.status.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.status.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import io.netty.buffer.ByteBuf;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/resources/networkCodec.nbt b/protocol/src/main/resources/networkCodec.nbt
similarity index 100%
rename from src/main/resources/networkCodec.nbt
rename to protocol/src/main/resources/networkCodec.nbt
diff --git a/src/test/java/com/github/steveice10/mc/protocol/MinecraftProtocolTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/MinecraftProtocolTest.java
similarity index 74%
rename from src/test/java/com/github/steveice10/mc/protocol/MinecraftProtocolTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/MinecraftProtocolTest.java
index b2938667..79c3b9f4 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/MinecraftProtocolTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/MinecraftProtocolTest.java
@@ -1,21 +1,21 @@
-package com.github.steveice10.mc.protocol;
+package org.geysermc.mcprotocollib.protocol;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodec;
-import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
-import com.github.steveice10.mc.protocol.data.game.entity.player.PlayerSpawnInfo;
-import com.github.steveice10.mc.protocol.data.status.PlayerInfo;
-import com.github.steveice10.mc.protocol.data.status.ServerStatusInfo;
-import com.github.steveice10.mc.protocol.data.status.VersionInfo;
-import com.github.steveice10.mc.protocol.data.status.handler.ServerInfoBuilder;
-import com.github.steveice10.mc.protocol.data.status.handler.ServerInfoHandler;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundLoginPacket;
-import com.github.steveice10.packetlib.Server;
-import com.github.steveice10.packetlib.Session;
-import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
-import com.github.steveice10.packetlib.event.session.SessionAdapter;
-import com.github.steveice10.packetlib.packet.Packet;
-import com.github.steveice10.packetlib.tcp.TcpClientSession;
-import com.github.steveice10.packetlib.tcp.TcpServer;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodec;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.PlayerSpawnInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.PlayerInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.ServerStatusInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.VersionInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.handler.ServerInfoBuilder;
+import org.geysermc.mcprotocollib.protocol.data.status.handler.ServerInfoHandler;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundLoginPacket;
+import org.geysermc.mcprotocollib.network.Server;
+import org.geysermc.mcprotocollib.network.Session;
+import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
+import org.geysermc.mcprotocollib.network.event.session.SessionAdapter;
+import org.geysermc.mcprotocollib.network.packet.Packet;
+import org.geysermc.mcprotocollib.network.tcp.TcpClientSession;
+import org.geysermc.mcprotocollib.network.tcp.TcpServer;
 import net.kyori.adventure.text.Component;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -24,11 +24,11 @@ import org.junit.jupiter.api.Test;
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 
-import static com.github.steveice10.mc.protocol.MinecraftConstants.SERVER_COMPRESSION_THRESHOLD;
-import static com.github.steveice10.mc.protocol.MinecraftConstants.SERVER_INFO_BUILDER_KEY;
-import static com.github.steveice10.mc.protocol.MinecraftConstants.SERVER_INFO_HANDLER_KEY;
-import static com.github.steveice10.mc.protocol.MinecraftConstants.SERVER_LOGIN_HANDLER_KEY;
-import static com.github.steveice10.mc.protocol.MinecraftConstants.VERIFY_USERS_KEY;
+import static org.geysermc.mcprotocollib.protocol.MinecraftConstants.SERVER_COMPRESSION_THRESHOLD;
+import static org.geysermc.mcprotocollib.protocol.MinecraftConstants.SERVER_INFO_BUILDER_KEY;
+import static org.geysermc.mcprotocollib.protocol.MinecraftConstants.SERVER_INFO_HANDLER_KEY;
+import static org.geysermc.mcprotocollib.protocol.MinecraftConstants.SERVER_LOGIN_HANDLER_KEY;
+import static org.geysermc.mcprotocollib.protocol.MinecraftConstants.VERIFY_USERS_KEY;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/src/test/java/com/github/steveice10/mc/protocol/data/ChunkTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/data/ChunkTest.java
similarity index 84%
rename from src/test/java/com/github/steveice10/mc/protocol/data/ChunkTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/data/ChunkTest.java
index 13c8ea12..1ba2b975 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/data/ChunkTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/data/ChunkTest.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.mc.protocol.data;
+package org.geysermc.mcprotocollib.protocol.data;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.chunk.ChunkSection;
-import com.github.steveice10.mc.protocol.data.game.chunk.DataPalette;
-import com.github.steveice10.mc.protocol.data.game.chunk.palette.PaletteType;
-import com.github.steveice10.mc.protocol.data.game.chunk.palette.SingletonPalette;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.ChunkSection;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.DataPalette;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.palette.PaletteType;
+import org.geysermc.mcprotocollib.protocol.data.game.chunk.palette.SingletonPalette;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
diff --git a/src/test/java/com/github/steveice10/mc/protocol/data/NetworkDataTests.java b/protocol/src/test/java/org/geysermc/mc/protocol/data/NetworkDataTests.java
similarity index 79%
rename from src/test/java/com/github/steveice10/mc/protocol/data/NetworkDataTests.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/data/NetworkDataTests.java
index 68e2a9fa..98a33f25 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/data/NetworkDataTests.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/data/NetworkDataTests.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.data;
+package org.geysermc.mcprotocollib.protocol.data;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.data.game.entity.Effect;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.Effect;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/PacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/PacketTest.java
similarity index 86%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/PacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/PacketTest.java
index f3d412f4..371b3ee3 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/PacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/PacketTest.java
@@ -1,8 +1,8 @@
-package com.github.steveice10.mc.protocol.packet;
+package org.geysermc.mcprotocollib.protocol.packet;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodecHelper;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.packetlib.packet.Packet;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodecHelper;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.network.packet.Packet;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/handshake/serverbound/ClientIntentionPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/handshake/serverbound/ClientIntentionPacketTest.java
similarity index 60%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/handshake/serverbound/ClientIntentionPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/handshake/serverbound/ClientIntentionPacketTest.java
index b77bf540..a11643a6 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/handshake/serverbound/ClientIntentionPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/handshake/serverbound/ClientIntentionPacketTest.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol.packet.handshake.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.handshake.serverbound;
 
-import com.github.steveice10.mc.protocol.codec.MinecraftCodec;
-import com.github.steveice10.mc.protocol.codec.MinecraftPacket;
-import com.github.steveice10.mc.protocol.data.handshake.HandshakeIntent;
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodec;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.data.handshake.HandshakeIntent;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 
 import java.util.ArrayList;
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCommandsPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/ClientboundCommandsPacketTest.java
similarity index 83%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCommandsPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/ClientboundCommandsPacketTest.java
index 78cebbbc..b939c35e 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ClientboundCommandsPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/ClientboundCommandsPacketTest.java
@@ -1,12 +1,12 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.data.game.command.CommandNode;
-import com.github.steveice10.mc.protocol.data.game.command.CommandParser;
-import com.github.steveice10.mc.protocol.data.game.command.CommandType;
-import com.github.steveice10.mc.protocol.data.game.command.SuggestionType;
-import com.github.steveice10.mc.protocol.data.game.command.properties.DoubleProperties;
-import com.github.steveice10.mc.protocol.data.game.command.properties.StringProperties;
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.data.game.command.CommandNode;
+import org.geysermc.mcprotocollib.protocol.data.game.command.CommandParser;
+import org.geysermc.mcprotocollib.protocol.data.game.command.CommandType;
+import org.geysermc.mcprotocollib.protocol.data.game.command.SuggestionType;
+import org.geysermc.mcprotocollib.protocol.data.game.command.properties.DoubleProperties;
+import org.geysermc.mcprotocollib.protocol.data.game.command.properties.StringProperties;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 
 import java.util.OptionalInt;
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ServerDeclareRecipesTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/ServerDeclareRecipesTest.java
similarity index 91%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ServerDeclareRecipesTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/ServerDeclareRecipesTest.java
index 7f1e47c8..32f63f14 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/ServerDeclareRecipesTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/ServerDeclareRecipesTest.java
@@ -1,12 +1,12 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.data.game.recipe.CraftingBookCategory;
-import com.github.steveice10.mc.protocol.data.game.recipe.Ingredient;
-import com.github.steveice10.mc.protocol.data.game.recipe.Recipe;
-import com.github.steveice10.mc.protocol.data.game.recipe.RecipeType;
-import com.github.steveice10.mc.protocol.data.game.recipe.data.*;
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.CraftingBookCategory;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.Ingredient;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.Recipe;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.RecipeType;
+import org.geysermc.mcprotocollib.protocol.data.game.recipe.data.*;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 
 public class ServerDeclareRecipesTest extends PacketTest {
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacketTest.java
similarity index 63%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacketTest.java
index 109971e7..9f7856fd 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundBlockUpdatePacketTest.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.data.game.level.block.BlockChangeEntry;
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockChangeEntry;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.cloudburstmc.math.vector.Vector3i;
 import org.junit.jupiter.api.BeforeEach;
 
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacketTest.java
similarity index 73%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacketTest.java
index 6c70e90a..7ba596ad 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacketTest.java
@@ -1,9 +1,9 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.data.game.level.LightUpdateData;
-import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityInfo;
-import com.github.steveice10.mc.protocol.data.game.level.block.BlockEntityType;
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.data.game.level.LightUpdateData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityInfo;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityType;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import org.junit.jupiter.api.BeforeEach;
 
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacketTest.java
similarity index 62%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacketTest.java
index 2c973dcf..0c67a609 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundSectionBlocksUpdatePacketTest.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.data.game.level.block.BlockChangeEntry;
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockChangeEntry;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.cloudburstmc.math.vector.Vector3i;
 import org.junit.jupiter.api.BeforeEach;
 
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEntityDataPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEntityDataPacketTest.java
similarity index 62%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEntityDataPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEntityDataPacketTest.java
index 6bcf6606..41536e32 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEntityDataPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEntityDataPacketTest.java
@@ -1,16 +1,16 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.FloatEntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.LongEntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.ObjectEntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.entity.object.Direction;
-import com.github.steveice10.mc.protocol.packet.PacketTest;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityDataPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.EntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.MetadataType;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.ByteEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.FloatEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.IntEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.LongEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.ObjectEntityMetadata;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundSetEntityDataPacket;
 import org.cloudburstmc.math.vector.Vector3i;
 import org.junit.jupiter.api.BeforeEach;
 
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEquipmentPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEquipmentPacketTest.java
similarity index 55%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEquipmentPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEquipmentPacketTest.java
index 44c57078..44af3909 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEquipmentPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundSetEquipmentPacketTest.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.data.game.entity.EquipmentSlot;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.Equipment;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
-import com.github.steveice10.mc.protocol.packet.PacketTest;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundSetEquipmentPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.EquipmentSlot;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.Equipment;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.ItemStack;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundSetEquipmentPacket;
 import org.junit.jupiter.api.BeforeEach;
 
 public class ClientboundSetEquipmentPacketTest extends PacketTest {
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetPlayerTeamPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundSetPlayerTeamPacketTest.java
similarity index 61%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetPlayerTeamPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundSetPlayerTeamPacketTest.java
index 5a39f99b..660757da 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/ingame/clientbound/level/ClientboundSetPlayerTeamPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/ingame/clientbound/level/ClientboundSetPlayerTeamPacketTest.java
@@ -1,10 +1,10 @@
-package com.github.steveice10.mc.protocol.packet.ingame.clientbound.level;
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level;
 
-import com.github.steveice10.mc.protocol.data.game.scoreboard.CollisionRule;
-import com.github.steveice10.mc.protocol.data.game.scoreboard.NameTagVisibility;
-import com.github.steveice10.mc.protocol.data.game.scoreboard.TeamColor;
-import com.github.steveice10.mc.protocol.packet.PacketTest;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetPlayerTeamPacket;
+import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.CollisionRule;
+import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.NameTagVisibility;
+import org.geysermc.mcprotocollib.protocol.data.game.scoreboard.TeamColor;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.scoreboard.ClientboundSetPlayerTeamPacket;
 import net.kyori.adventure.text.Component;
 import org.junit.jupiter.api.BeforeEach;
 
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundCustomQueryPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundCustomQueryPacketTest.java
similarity index 72%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundCustomQueryPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundCustomQueryPacketTest.java
index c8b04130..d3bbc1ef 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundCustomQueryPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundCustomQueryPacketTest.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.packet.login.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.clientbound;
 
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 
 import java.util.Random;
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundGameProfilePacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundGameProfilePacketTest.java
similarity index 72%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundGameProfilePacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundGameProfilePacketTest.java
index 849a137f..183d69ea 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundGameProfilePacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundGameProfilePacketTest.java
@@ -1,7 +1,7 @@
-package com.github.steveice10.mc.protocol.packet.login.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.clientbound;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 
 import java.util.UUID;
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundHelloPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundHelloPacketTest.java
similarity index 86%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundHelloPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundHelloPacketTest.java
index 56ea8ca0..b0e13de6 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundHelloPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundHelloPacketTest.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.packet.login.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.clientbound;
 
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 
 import java.security.KeyPair;
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundLoginCompressionPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundLoginCompressionPacketTest.java
similarity index 63%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundLoginCompressionPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundLoginCompressionPacketTest.java
index 19de6869..8e23c53c 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundLoginCompressionPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundLoginCompressionPacketTest.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.packet.login.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.clientbound;
 
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 
 public class ClientboundLoginCompressionPacketTest extends PacketTest {
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacketTest.java
similarity index 73%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacketTest.java
index 05ec9e19..2a6b3568 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/clientbound/ClientboundLoginDisconnectPacketTest.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.packet.login.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.clientbound;
 
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import net.kyori.adventure.text.Component;
 import org.junit.jupiter.api.BeforeEach;
 
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacketTest.java
similarity index 75%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacketTest.java
index 8ec65e7c..2112fc29 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/serverbound/ServerboundCustomQueryAnswerPacketTest.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.packet.login.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.serverbound;
 
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 
 import java.util.Random;
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundHelloPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/serverbound/ServerboundHelloPacketTest.java
similarity index 66%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundHelloPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/login/serverbound/ServerboundHelloPacketTest.java
index 0c8c3afc..3cc51972 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundHelloPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/serverbound/ServerboundHelloPacketTest.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.packet.login.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.serverbound;
 
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 
 import java.util.UUID;
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundKeyPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/serverbound/ServerboundKeyPacketTest.java
similarity index 92%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundKeyPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/login/serverbound/ServerboundKeyPacketTest.java
index ed54b69c..c1c86b5d 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/login/serverbound/ServerboundKeyPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/login/serverbound/ServerboundKeyPacketTest.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.packet.login.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.login.serverbound;
 
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/status/clientbound/ClientboundPongResponsePacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/status/clientbound/ClientboundPongResponsePacketTest.java
similarity index 65%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/status/clientbound/ClientboundPongResponsePacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/status/clientbound/ClientboundPongResponsePacketTest.java
index 1da3fc80..52f609de 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/status/clientbound/ClientboundPongResponsePacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/status/clientbound/ClientboundPongResponsePacketTest.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.packet.status.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.status.clientbound;
 
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 
 public class ClientboundPongResponsePacketTest extends PacketTest {
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/status/clientbound/ClientboundStatusResponsePacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/status/clientbound/ClientboundStatusResponsePacketTest.java
similarity index 69%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/status/clientbound/ClientboundStatusResponsePacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/status/clientbound/ClientboundStatusResponsePacketTest.java
index 6904ade7..e6d81f40 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/status/clientbound/ClientboundStatusResponsePacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/status/clientbound/ClientboundStatusResponsePacketTest.java
@@ -1,11 +1,11 @@
-package com.github.steveice10.mc.protocol.packet.status.clientbound;
+package org.geysermc.mcprotocollib.protocol.packet.status.clientbound;
 
 import com.github.steveice10.mc.auth.data.GameProfile;
-import com.github.steveice10.mc.protocol.codec.MinecraftCodec;
-import com.github.steveice10.mc.protocol.data.status.PlayerInfo;
-import com.github.steveice10.mc.protocol.data.status.ServerStatusInfo;
-import com.github.steveice10.mc.protocol.data.status.VersionInfo;
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftCodec;
+import org.geysermc.mcprotocollib.protocol.data.status.PlayerInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.ServerStatusInfo;
+import org.geysermc.mcprotocollib.protocol.data.status.VersionInfo;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import net.kyori.adventure.text.Component;
 import org.junit.jupiter.api.BeforeEach;
 
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/status/serverbound/ServerboundPingRequestPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/status/serverbound/ServerboundPingRequestPacketTest.java
similarity index 65%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/status/serverbound/ServerboundPingRequestPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/status/serverbound/ServerboundPingRequestPacketTest.java
index 5b58977a..18c87782 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/status/serverbound/ServerboundPingRequestPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/status/serverbound/ServerboundPingRequestPacketTest.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.packet.status.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.status.serverbound;
 
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 
 public class ServerboundPingRequestPacketTest extends PacketTest {
diff --git a/src/test/java/com/github/steveice10/mc/protocol/packet/status/serverbound/ServerboundStatusRequestPacketTest.java b/protocol/src/test/java/org/geysermc/mc/protocol/packet/status/serverbound/ServerboundStatusRequestPacketTest.java
similarity index 62%
rename from src/test/java/com/github/steveice10/mc/protocol/packet/status/serverbound/ServerboundStatusRequestPacketTest.java
rename to protocol/src/test/java/org/geysermc/mc/protocol/packet/status/serverbound/ServerboundStatusRequestPacketTest.java
index c6b7930c..9d95eac0 100644
--- a/src/test/java/com/github/steveice10/mc/protocol/packet/status/serverbound/ServerboundStatusRequestPacketTest.java
+++ b/protocol/src/test/java/org/geysermc/mc/protocol/packet/status/serverbound/ServerboundStatusRequestPacketTest.java
@@ -1,6 +1,6 @@
-package com.github.steveice10.mc.protocol.packet.status.serverbound;
+package org.geysermc.mcprotocollib.protocol.packet.status.serverbound;
 
-import com.github.steveice10.mc.protocol.packet.PacketTest;
+import org.geysermc.mcprotocollib.protocol.packet.PacketTest;
 import org.junit.jupiter.api.BeforeEach;
 
 public class ServerboundStatusRequestPacketTest extends PacketTest {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4bf6ec6a..03e9e3b1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,5 @@
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
 dependencyResolutionManagement {
     repositories {
         maven("https://repo.opencollab.dev/maven-releases/") {
@@ -19,4 +21,4 @@ dependencyResolutionManagement {
 
 rootProject.name = "mcprotocollib"
 
-include("example")
+include("protocol", "example")
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/NumberFormat.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/NumberFormat.java
deleted file mode 100644
index e5abbfc1..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/chat/numbers/NumberFormat.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.chat.numbers;
-
-public interface NumberFormat {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/CommandProperties.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/CommandProperties.java
deleted file mode 100644
index 727ab09c..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/command/properties/CommandProperties.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.command.properties;
-
-public interface CommandProperties {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/ObjectData.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/ObjectData.java
deleted file mode 100644
index c5728d85..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/entity/object/ObjectData.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.entity.object;
-
-public interface ObjectData {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ContainerAction.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ContainerAction.java
deleted file mode 100644
index 4a384852..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/ContainerAction.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.inventory;
-
-public interface ContainerAction {
-    int getId();
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/ContainerProperty.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/ContainerProperty.java
deleted file mode 100644
index b9487e63..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/inventory/property/ContainerProperty.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.inventory.property;
-
-public interface ContainerProperty {
-    int ordinal();
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BlockValue.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BlockValue.java
deleted file mode 100644
index d151f64c..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BlockValue.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
-
-public interface BlockValue {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BlockValueType.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BlockValueType.java
deleted file mode 100644
index c8ba1625..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/BlockValueType.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
-
-public interface BlockValueType {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/EndGatewayValue.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/EndGatewayValue.java
deleted file mode 100644
index 5bcd08d8..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/EndGatewayValue.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
-
-public class EndGatewayValue implements BlockValue {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/MobSpawnerValue.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/MobSpawnerValue.java
deleted file mode 100644
index 9f7fe816..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/MobSpawnerValue.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
-
-public class MobSpawnerValue implements BlockValue {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/NoteBlockValue.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/NoteBlockValue.java
deleted file mode 100644
index 267613c9..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/block/value/NoteBlockValue.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.level.block.value;
-
-public class NoteBlockValue implements BlockValue {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/LevelEvent.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/LevelEvent.java
deleted file mode 100644
index 378d3c83..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/LevelEvent.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
-
-public interface LevelEvent {
-    int getId();
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/LevelEventData.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/LevelEventData.java
deleted file mode 100644
index f06b3785..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/event/LevelEventData.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.level.event;
-
-public interface LevelEventData {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/GameEventValue.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/GameEventValue.java
deleted file mode 100644
index d2dac1dc..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/notify/GameEventValue.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.level.notify;
-
-public interface GameEventValue {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ParticleData.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ParticleData.java
deleted file mode 100644
index a0519d41..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/ParticleData.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle;
-
-public interface ParticleData {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/PositionSource.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/PositionSource.java
deleted file mode 100644
index e3119a73..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/level/particle/positionsource/PositionSource.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.level.particle.positionsource;
-
-public interface PositionSource {
-
-    PositionSourceType getType();
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/RecipeData.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/RecipeData.java
deleted file mode 100644
index c55acaa3..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/recipe/data/RecipeData.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.recipe.data;
-
-public interface RecipeData {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/Statistic.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/Statistic.java
deleted file mode 100644
index aef349f5..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/Statistic.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.steveice10.mc.protocol.data.game.statistic;
-
-public interface Statistic {
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/status/handler/ServerInfoBuilder.java b/src/main/java/com/github/steveice10/mc/protocol/data/status/handler/ServerInfoBuilder.java
deleted file mode 100644
index aaaa6167..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/status/handler/ServerInfoBuilder.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.steveice10.mc.protocol.data.status.handler;
-
-import com.github.steveice10.mc.protocol.data.status.ServerStatusInfo;
-import com.github.steveice10.packetlib.Session;
-
-public interface ServerInfoBuilder {
-    ServerStatusInfo buildInfo(Session session);
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/status/handler/ServerInfoHandler.java b/src/main/java/com/github/steveice10/mc/protocol/data/status/handler/ServerInfoHandler.java
deleted file mode 100644
index aaccccbb..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/status/handler/ServerInfoHandler.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.steveice10.mc.protocol.data.status.handler;
-
-import com.github.steveice10.mc.protocol.data.status.ServerStatusInfo;
-import com.github.steveice10.packetlib.Session;
-
-public interface ServerInfoHandler {
-    void handle(Session session, ServerStatusInfo info);
-}
diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/status/handler/ServerPingTimeHandler.java b/src/main/java/com/github/steveice10/mc/protocol/data/status/handler/ServerPingTimeHandler.java
deleted file mode 100644
index 1b5d4464..00000000
--- a/src/main/java/com/github/steveice10/mc/protocol/data/status/handler/ServerPingTimeHandler.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.github.steveice10.mc.protocol.data.status.handler;
-
-import com.github.steveice10.packetlib.Session;
-
-public interface ServerPingTimeHandler {
-    void handle(Session session, long pingTime);
-}