diff --git a/coordinator/src/db.rs b/coordinator/src/db/mod.rs
similarity index 100%
rename from coordinator/src/db.rs
rename to coordinator/src/db/mod.rs
diff --git a/coordinator/src/orderbook/db.rs b/coordinator/src/orderbook/db/mod.rs
similarity index 100%
rename from coordinator/src/orderbook/db.rs
rename to coordinator/src/orderbook/db/mod.rs
diff --git a/coordinator/src/orderbook.rs b/coordinator/src/orderbook/mod.rs
similarity index 100%
rename from coordinator/src/orderbook.rs
rename to coordinator/src/orderbook/mod.rs
diff --git a/coordinator/src/orderbook/tests.rs b/coordinator/src/orderbook/tests/mod.rs
similarity index 100%
rename from coordinator/src/orderbook/tests.rs
rename to coordinator/src/orderbook/tests/mod.rs
diff --git a/coordinator/src/position.rs b/coordinator/src/position/mod.rs
similarity index 100%
rename from coordinator/src/position.rs
rename to coordinator/src/position/mod.rs
diff --git a/coordinator/src/routing_fee.rs b/coordinator/src/routing_fee/mod.rs
similarity index 100%
rename from coordinator/src/routing_fee.rs
rename to coordinator/src/routing_fee/mod.rs
diff --git a/coordinator/src/trade.rs b/coordinator/src/trade/mod.rs
similarity index 100%
rename from coordinator/src/trade.rs
rename to coordinator/src/trade/mod.rs
diff --git a/crates/ln-dlc-node/src/ln.rs b/crates/ln-dlc-node/src/ln/mod.rs
similarity index 100%
rename from crates/ln-dlc-node/src/ln.rs
rename to crates/ln-dlc-node/src/ln/mod.rs
diff --git a/crates/ln-dlc-node/src/node.rs b/crates/ln-dlc-node/src/node/mod.rs
similarity index 100%
rename from crates/ln-dlc-node/src/node.rs
rename to crates/ln-dlc-node/src/node/mod.rs
diff --git a/crates/ln-dlc-node/src/tests/dlc.rs b/crates/ln-dlc-node/src/tests/dlc/mod.rs
similarity index 100%
rename from crates/ln-dlc-node/src/tests/dlc.rs
rename to crates/ln-dlc-node/src/tests/dlc/mod.rs
diff --git a/crates/ln-dlc-node/src/tests/just_in_time_channel.rs b/crates/ln-dlc-node/src/tests/just_in_time_channel/mod.rs
similarity index 100%
rename from crates/ln-dlc-node/src/tests/just_in_time_channel.rs
rename to crates/ln-dlc-node/src/tests/just_in_time_channel/mod.rs
diff --git a/crates/ln-dlc-node/src/tests.rs b/crates/ln-dlc-node/src/tests/mod.rs
similarity index 100%
rename from crates/ln-dlc-node/src/tests.rs
rename to crates/ln-dlc-node/src/tests/mod.rs
diff --git a/maker/src/trading.rs b/maker/src/trading/mod.rs
similarity index 100%
rename from maker/src/trading.rs
rename to maker/src/trading/mod.rs
diff --git a/mobile/native/src/bridge_generated.rs b/mobile/native/src/bridge_generated/mod.rs
similarity index 100%
rename from mobile/native/src/bridge_generated.rs
rename to mobile/native/src/bridge_generated/mod.rs
diff --git a/mobile/native/src/calculations.rs b/mobile/native/src/calculations/mod.rs
similarity index 100%
rename from mobile/native/src/calculations.rs
rename to mobile/native/src/calculations/mod.rs
diff --git a/mobile/native/src/commons.rs b/mobile/native/src/commons/mod.rs
similarity index 100%
rename from mobile/native/src/commons.rs
rename to mobile/native/src/commons/mod.rs
diff --git a/mobile/native/src/config.rs b/mobile/native/src/config/mod.rs
similarity index 100%
rename from mobile/native/src/config.rs
rename to mobile/native/src/config/mod.rs
diff --git a/mobile/native/src/db.rs b/mobile/native/src/db/mod.rs
similarity index 100%
rename from mobile/native/src/db.rs
rename to mobile/native/src/db/mod.rs
diff --git a/mobile/native/src/event.rs b/mobile/native/src/event/mod.rs
similarity index 100%
rename from mobile/native/src/event.rs
rename to mobile/native/src/event/mod.rs
diff --git a/mobile/native/src/ln_dlc.rs b/mobile/native/src/ln_dlc/mod.rs
similarity index 100%
rename from mobile/native/src/ln_dlc.rs
rename to mobile/native/src/ln_dlc/mod.rs
diff --git a/mobile/native/src/trade.rs b/mobile/native/src/trade/mod.rs
similarity index 100%
rename from mobile/native/src/trade.rs
rename to mobile/native/src/trade/mod.rs
diff --git a/mobile/native/src/trade/order.rs b/mobile/native/src/trade/order/mod.rs
similarity index 100%
rename from mobile/native/src/trade/order.rs
rename to mobile/native/src/trade/order/mod.rs
diff --git a/mobile/native/src/trade/position.rs b/mobile/native/src/trade/position/mod.rs
similarity index 100%
rename from mobile/native/src/trade/position.rs
rename to mobile/native/src/trade/position/mod.rs
diff --git a/mobile/native/src/trade/users.rs b/mobile/native/src/trade/users/mod.rs
similarity index 100%
rename from mobile/native/src/trade/users.rs
rename to mobile/native/src/trade/users/mod.rs