8 files changed, 17 insertions, 8 deletions
diff --git a/azalea-client/src/attack.rs b/azalea-client/src/attack.rs
index 45a4ccaf..ca2ff312 100644
--- a/azalea-client/src/attack.rs
+++ b/azalea-client/src/attack.rs
@@ -1,4 +1,4 @@
-use azalea_core::GameMode;
+use azalea_core::game_type::GameMode;
 use azalea_entity::{
     metadata::{ShiftKeyDown, Sprinting},
     update_bounding_box, Attributes, Physics,
diff --git a/azalea-client/src/client.rs b/azalea-client/src/client.rs
index 6438cf06..90d90e01 100644
--- a/azalea-client/src/client.rs
+++ b/azalea-client/src/client.rs
@@ -23,7 +23,7 @@ use crate::{
 use azalea_auth::{game_profile::GameProfile, sessionserver::ClientSessionServerError};
 use azalea_buf::McBufWritable;
 use azalea_chat::FormattedText;
-use azalea_core::{ResourceLocation, Vec3};
+use azalea_core::{position::Vec3, resource_location::ResourceLocation};
 use azalea_entity::{
     indexing::{EntityIdIndex, EntityUuidIndex},
     metadata::Health,
diff --git a/azalea-client/src/interact.rs b/azalea-client/src/interact.rs
index dc1306e3..b7b47ec6 100644
--- a/azalea-client/src/interact.rs
+++ b/azalea-client/src/interact.rs
@@ -1,7 +1,12 @@
 use std::ops::AddAssign;
 
 use azalea_block::BlockState;
-use azalea_core::{BlockHitResult, BlockPos, Direction, GameMode, Vec3};
+use azalea_core::{
+    block_hit_result::BlockHitResult,
+    direction::Direction,
+    game_type::GameMode,
+    position::{BlockPos, Vec3},
+};
 use azalea_entity::{
     clamp_look_direction, view_vector, Attributes, EyeHeight, LocalEntity, LookDirection, Position,
 };
diff --git a/azalea-client/src/local_player.rs b/azalea-client/src/local_player.rs
index 2989f36e..22ea2232 100644
--- a/azalea-client/src/local_player.rs
+++ b/azalea-client/src/local_player.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashMap, io, sync::Arc};
 
 use azalea_auth::game_profile::GameProfile;
-use azalea_core::GameMode;
+use azalea_core::game_type::GameMode;
 use azalea_entity::Dead;
 use azalea_protocol::packets::game::{
     clientbound_player_abilities_packet::ClientboundPlayerAbilitiesPacket, ServerboundGamePacket,
diff --git a/azalea-client/src/mining.rs b/azalea-client/src/mining.rs
index 5db357b8..806a7b91 100644
--- a/azalea-client/src/mining.rs
+++ b/azalea-client/src/mining.rs
@@ -1,5 +1,5 @@
 use azalea_block::{Block, BlockState, FluidState};
-use azalea_core::{BlockPos, Direction, GameMode};
+use azalea_core::{direction::Direction, game_type::GameMode, position::BlockPos};
 use azalea_entity::{mining::get_mine_progress, FluidOnEyes, Physics};
 use azalea_inventory::ItemSlot;
 use azalea_physics::PhysicsSet;
diff --git a/azalea-client/src/packet_handling/game.rs b/azalea-client/src/packet_handling/game.rs
index c97c1a49..049eab03 100644
--- a/azalea-client/src/packet_handling/game.rs
+++ b/azalea-client/src/packet_handling/game.rs
@@ -5,7 +5,11 @@ use std::{
 };
 
 use azalea_chat::FormattedText;
-use azalea_core::{ChunkPos, GameMode, ResourceLocation, Vec3};
+use azalea_core::{
+    game_type::GameMode,
+    position::{ChunkPos, Vec3},
+    resource_location::ResourceLocation,
+};
 use azalea_entity::{
     indexing::{EntityIdIndex, EntityUuidIndex},
     metadata::{apply_metadata, Health, PlayerMetadataBundle},
diff --git a/azalea-client/src/player.rs b/azalea-client/src/player.rs
index 1aba172a..0a3f204f 100755
--- a/azalea-client/src/player.rs
+++ b/azalea-client/src/player.rs
@@ -1,6 +1,6 @@
 use azalea_auth::game_profile::GameProfile;
 use azalea_chat::FormattedText;
-use azalea_core::GameMode;
+use azalea_core::game_type::GameMode;
 use azalea_entity::indexing::EntityUuidIndex;
 use bevy_ecs::{
     event::EventReader,
diff --git a/azalea-client/src/received_registries.rs b/azalea-client/src/received_registries.rs
index 024f5222..f959a590 100644
--- a/azalea-client/src/received_registries.rs
+++ b/azalea-client/src/received_registries.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use azalea_core::ResourceLocation;
+use azalea_core::resource_location::ResourceLocation;
 use azalea_nbt::Nbt;
 use azalea_protocol::packets::configuration::clientbound_registry_data_packet::registry::{
     DimensionTypeElement, RegistryType,