diff --git a/rust/src/game/mod.rs b/rust/src/game/mod.rs
index 9b91043..0f7d429 100644
--- a/rust/src/game/mod.rs
+++ b/rust/src/game/mod.rs
@@ -14,8 +14,7 @@ use crate::{
         commands::{register_commands, unregister_commands},
         opts::{GameOption, GameOptionValue, GameOptions, PrivateGameOptions, TeamOptions},
     },
-    map::Map,
-    map_resource::MapResource,
+    map::{Map, map_resource::MapResource, pickup::PickupKind},
     net::{
         network_manager::{
             BallSync, NetworkManager,
@@ -26,7 +25,6 @@ use crate::{
         },
         util::NetVector3,
     },
-    pickup::PickupKind,
     player::{
         DamageSource, IPlayer, NetTransform,
         ball::Ball,
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index b31cec0..7d1d40a 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -8,14 +8,9 @@ pub mod cli_parser;
 pub mod credits;
 pub mod game;
 pub mod game_settings;
-pub mod goal;
-pub mod killbox;
 pub mod lobby_world;
 pub mod map;
-pub mod map_resource;
-pub mod map_static;
 pub mod net;
-pub mod pickup;
 pub mod player;
 pub mod popup_queue;
 pub mod replay;
diff --git a/rust/src/lobby_world.rs b/rust/src/lobby_world.rs
index 1a73b9d..31fd818 100644
--- a/rust/src/lobby_world.rs
+++ b/rust/src/lobby_world.rs
@@ -4,9 +4,7 @@ use godot::{classes::RandomNumberGenerator, prelude::*};
 
 use crate::{
     game::{Game, GameManager},
-    map::Map,
-    map_resource::MapResource,
-    map_static::StaticMap,
+    map::map_static::StaticMap,
     player::menu_player::MenuPlayer,
     ui::lobby::LobbyPanel,
 };
diff --git a/rust/src/goal.rs b/rust/src/map/goal.rs
similarity index 100%
rename from rust/src/goal.rs
rename to rust/src/map/goal.rs
diff --git a/rust/src/killbox.rs b/rust/src/map/killbox.rs
similarity index 100%
rename from rust/src/killbox.rs
rename to rust/src/map/killbox.rs
diff --git a/rust/src/map_resource.rs b/rust/src/map/map_resource.rs
similarity index 100%
rename from rust/src/map_resource.rs
rename to rust/src/map/map_resource.rs
diff --git a/rust/src/map_static.rs b/rust/src/map/map_static.rs
similarity index 100%
rename from rust/src/map_static.rs
rename to rust/src/map/map_static.rs
diff --git a/rust/src/map.rs b/rust/src/map/mod.rs
similarity index 98%
rename from rust/src/map.rs
rename to rust/src/map/mod.rs
index 0a87d0f..95f88a7 100644
--- a/rust/src/map.rs
+++ b/rust/src/map/mod.rs
@@ -4,8 +4,8 @@ use godot::{classes::CharacterBody3D, prelude::*};
 
 use crate::{
     game::{Game, GameManager},
+    map::pickup::Pickup,
     net::util::NetVector3,
-    pickup::Pickup,
     player::{
         IPlayer, NetTransform, ball::Ball, local_player::LocalPlayer, remote_player::RemotePlayer,
         telegrenade::Telegrenade,
@@ -13,6 +13,12 @@ use crate::{
     replay::{ReplayPlayer, ReplayPlayerState, StandaloneReplayManager},
 };
 
+pub mod goal;
+pub mod killbox;
+pub mod map_resource;
+pub mod map_static;
+pub mod pickup;
+
 #[derive(GodotClass)]
 #[class(base=Node3D, init)]
 pub struct Map {
diff --git a/rust/src/pickup.rs b/rust/src/map/pickup.rs
similarity index 100%
rename from rust/src/pickup.rs
rename to rust/src/map/pickup.rs
diff --git a/rust/src/player/local_player.rs b/rust/src/player/local_player.rs
index 5860018..6e2080c 100644
--- a/rust/src/player/local_player.rs
+++ b/rust/src/player/local_player.rs
@@ -12,7 +12,7 @@ use godot::{
 use crate::{
     game::{Game, GameManager, opts::GameOption},
     game_settings::{GameSettings, GameSettingsManager},
-    killbox::KillboxKind,
+    map::{killbox::KillboxKind, pickup::PickupKind},
     net::{
         network_manager::{
             NetworkManager,
@@ -21,7 +21,6 @@ use crate::{
         },
         util::cast_ray,
     },
-    pickup::PickupKind,
     player::{
         DamageSource, DamageSourceSignal, IPlayer, NetTransform, PlayerCommon,
         buffs::{Buff, Buffs},
diff --git a/rust/src/player/mod.rs b/rust/src/player/mod.rs
index 0e8281f..973e7d6 100644
--- a/rust/src/player/mod.rs
+++ b/rust/src/player/mod.rs
@@ -9,12 +9,11 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     game::{Game, opts::GameOption},
-    killbox::KillboxKind,
+    map::{killbox::KillboxKind, pickup::PickupKind},
     net::{
         network_manager::NetworkManager,
         util::{NetVector3, shotgun_ray},
     },
-    pickup::PickupKind,
     player::{
         buffs::{Buff, Buffs},
         shootable::Shootable,
diff --git a/rust/src/player/remote_player.rs b/rust/src/player/remote_player.rs
index b57db9f..568b267 100644
--- a/rust/src/player/remote_player.rs
+++ b/rust/src/player/remote_player.rs
@@ -9,8 +9,7 @@ use godot::{
 
 use crate::{
     game::{Game, opts::GameOption},
-    killbox::KillboxKind,
-    pickup::PickupKind,
+    map::{killbox::KillboxKind, pickup::PickupKind},
     player::{
         DamageSource, DamageSourceSignal, IPlayer, NetTransform, PlayerCommon,
         buffs::{Buff, Buffs},
diff --git a/rust/src/replay.rs b/rust/src/replay.rs
index f3a531c..c97bfeb 100644
--- a/rust/src/replay.rs
+++ b/rust/src/replay.rs
@@ -8,15 +8,17 @@ use std::{
 };
 
 use flate2::{Compression, bufread::GzDecoder, write::GzEncoder};
-use godot::{ prelude::*, tools::get_autoload_by_name};
+use godot::{prelude::*, tools::get_autoload_by_name};
 use serde::{Deserialize, Serialize};
 
 use crate::{
     game::{Game, GameManager, Player, PlayerStats},
     game_settings::GameSettingsManager,
-    map::Map,
+    map::{
+        Map,
+        pickup::{PickupKind, ReplayVisibility},
+    },
     net::{network_manager::BallSync, util::NetVector3},
-    pickup::{PickupKind, ReplayVisibility},
     player::{
         DamageSource, IPlayer, NetTransform, ball::Ball, buffs::Buffs, remote_player::RemotePlayer,
         telegrenade::Telegrenade, weapon::WeaponType,