diff --git a/game/player/mount/mount_profile.gd b/game/mount/mount_profile.gd
similarity index 100%
rename from game/player/mount/mount_profile.gd
rename to game/mount/mount_profile.gd
diff --git a/game/player/mount/mount_profile.gd.uid b/game/mount/mount_profile.gd.uid
similarity index 100%
rename from game/player/mount/mount_profile.gd.uid
rename to game/mount/mount_profile.gd.uid
diff --git a/game/player/mount/mount_registry.gd b/game/mount/mount_registry.gd
similarity index 100%
rename from game/player/mount/mount_registry.gd
rename to game/mount/mount_registry.gd
diff --git a/game/player/mount/mount_registry.gd.uid b/game/mount/mount_registry.gd.uid
similarity index 100%
rename from game/player/mount/mount_registry.gd.uid
rename to game/mount/mount_registry.gd.uid
diff --git a/game/player/pokemon/move_slot.gd b/game/pokemon/move_slot.gd
similarity index 100%
rename from game/player/pokemon/move_slot.gd
rename to game/pokemon/move_slot.gd
diff --git a/game/player/pokemon/move_slot.gd.uid b/game/pokemon/move_slot.gd.uid
similarity index 100%
rename from game/player/pokemon/move_slot.gd.uid
rename to game/pokemon/move_slot.gd.uid
diff --git a/game/player/pokemon/pokemon_instance.gd b/game/pokemon/pokemon_instance.gd
similarity index 100%
rename from game/player/pokemon/pokemon_instance.gd
rename to game/pokemon/pokemon_instance.gd
diff --git a/game/player/pokemon/pokemon_instance.gd.uid b/game/pokemon/pokemon_instance.gd.uid
similarity index 100%
rename from game/player/pokemon/pokemon_instance.gd.uid
rename to game/pokemon/pokemon_instance.gd.uid
diff --git a/game/player/pokemon/pokemon_nature.gd b/game/pokemon/pokemon_nature.gd
similarity index 100%
rename from game/player/pokemon/pokemon_nature.gd
rename to game/pokemon/pokemon_nature.gd
diff --git a/game/player/pokemon/pokemon_nature.gd.uid b/game/pokemon/pokemon_nature.gd.uid
similarity index 100%
rename from game/player/pokemon/pokemon_nature.gd.uid
rename to game/pokemon/pokemon_nature.gd.uid
diff --git a/game/player/pokemon/pokemon_team.gd b/game/pokemon/pokemon_team.gd
similarity index 100%
rename from game/player/pokemon/pokemon_team.gd
rename to game/pokemon/pokemon_team.gd
diff --git a/game/player/pokemon/pokemon_team.gd.uid b/game/pokemon/pokemon_team.gd.uid
similarity index 100%
rename from game/player/pokemon/pokemon_team.gd.uid
rename to game/pokemon/pokemon_team.gd.uid
diff --git a/game/player/pokemon/trainer_data.gd b/game/pokemon/trainer_data.gd
similarity index 100%
rename from game/player/pokemon/trainer_data.gd
rename to game/pokemon/trainer_data.gd
diff --git a/game/player/pokemon/trainer_data.gd.uid b/game/pokemon/trainer_data.gd.uid
similarity index 100%
rename from game/player/pokemon/trainer_data.gd.uid
rename to game/pokemon/trainer_data.gd.uid
diff --git a/game/player/pokemon/trainer_party_entry.gd b/game/pokemon/trainer_party_entry.gd
similarity index 100%
rename from game/player/pokemon/trainer_party_entry.gd
rename to game/pokemon/trainer_party_entry.gd
diff --git a/game/player/pokemon/trainer_party_entry.gd.uid b/game/pokemon/trainer_party_entry.gd.uid
similarity index 100%
rename from game/player/pokemon/trainer_party_entry.gd.uid
rename to game/pokemon/trainer_party_entry.gd.uid