From 0d710fad45124367236ede383bce36fddb68d3dc Mon Sep 17 00:00:00 2001 From: jake Date: Mon, 13 Nov 2023 23:41:48 -0700 Subject: [PATCH] move all the crate dirs back under src/ --- Cargo.toml | 89 +++++++++---------- {client => src/client}/Cargo.toml | 0 {client => src/client}/src/lib.rs | 0 {drops => src/drops}/Cargo.toml | 0 {drops => src/drops}/src/box_drop_table.rs | 0 {drops => src/drops}/src/generic_armor.rs | 0 {drops => src/drops}/src/generic_shield.rs | 0 {drops => src/drops}/src/generic_unit.rs | 0 {drops => src/drops}/src/generic_weapon.rs | 0 {drops => src/drops}/src/lib.rs | 0 {drops => src/drops}/src/rare_drop_table.rs | 0 {drops => src/drops}/src/tech_table.rs | 0 {drops => src/drops}/src/tool_table.rs | 0 {entity => src/entity}/Cargo.toml | 0 {entity => src/entity}/src/account.rs | 0 {entity => src/entity}/src/character.rs | 0 .../entity}/src/gateway/entitygateway.rs | 0 .../entity}/src/gateway/inmemory.rs | 0 {entity => src/entity}/src/gateway/mod.rs | 0 .../postgres/migrations/V0001__initial.sql | 0 .../postgres/migrations/V0002__equips.sql | 0 .../postgres/migrations/V0003__item_notes.sql | 0 .../postgres/migrations/V0004__meseta.sql | 0 .../postgres/migrations/V0005__trade.sql | 0 .../postgres/migrations/V0006__playtime.sql | 0 .../migrations/V0007__player_keyconfig.sql | 0 .../migrations/V0008__playtime_not_null.sql | 0 .../migrations/V0009__no_player_keyconfig.sql | 0 .../V0010__char_create_timestamp.sql | 0 .../migrations/V0011__shared_bank.sql | 0 .../postgres/migrations/V0012__room.sql | 0 .../postgres/migrations/V0013__room2.sql | 0 .../src/gateway/postgres/migrations/mod.rs | 0 .../entity}/src/gateway/postgres/mod.rs | 0 .../entity}/src/gateway/postgres/models.rs | 0 .../entity}/src/gateway/postgres/postgres.rs | 0 {entity => src/entity}/src/item/armor.rs | 0 {entity => src/entity}/src/item/esweapon.rs | 0 {entity => src/entity}/src/item/mag.rs | 0 {entity => src/entity}/src/item/mod.rs | 0 {entity => src/entity}/src/item/shield.rs | 0 {entity => src/entity}/src/item/tech.rs | 0 {entity => src/entity}/src/item/tool.rs | 0 {entity => src/entity}/src/item/unit.rs | 0 {entity => src/entity}/src/item/weapon.rs | 0 {entity => src/entity}/src/lib.rs | 0 {entity => src/entity}/src/room.rs | 0 {entity => src/entity}/src/team.rs | 0 {items => src/items}/Cargo.toml | 0 {items => src/items}/src/actions.rs | 0 {items => src/items}/src/apply_item.rs | 0 {items => src/items}/src/bank.rs | 0 {items => src/items}/src/floor.rs | 0 {items => src/items}/src/inventory.rs | 0 {items => src/items}/src/itemstateaction.rs | 0 {items => src/items}/src/lib.rs | 0 {items => src/items}/src/manager.rs | 0 {items => src/items}/src/state.rs | 0 {items => src/items}/src/tasks.rs | 0 {items => src/items}/src/trade.rs | 0 {location => src/location}/Cargo.toml | 0 {location => src/location}/src/lib.rs | 0 {login_server => src/login_server}/Cargo.toml | 0 .../login_server}/src/character.rs | 0 {login_server => src/login_server}/src/lib.rs | 0 .../login_server}/src/login.rs | 0 {maps => src/maps}/Cargo.toml | 0 {maps => src/maps}/src/area.rs | 0 {maps => src/maps}/src/enemy.rs | 0 {maps => src/maps}/src/lib.rs | 0 {maps => src/maps}/src/maps.rs | 0 {maps => src/maps}/src/monster.rs | 0 {maps => src/maps}/src/object.rs | 0 {maps => src/maps}/src/room.rs | 0 {maps => src/maps}/src/variant.rs | 0 {networking => src/networking}/Cargo.toml | 0 .../networking}/src/cipherkeys.rs | 0 .../networking}/src/interserver.rs | 0 {networking => src/networking}/src/lib.rs | 0 .../networking}/src/mainloop/client.rs | 0 .../networking}/src/mainloop/interserver.rs | 0 .../networking}/src/mainloop/mod.rs | 0 .../networking}/src/serverstate.rs | 0 {patch_server => src/patch_server}/Cargo.toml | 0 {patch_server => src/patch_server}/src/lib.rs | 0 {pktbuilder => src/pktbuilder}/Cargo.toml | 0 .../pktbuilder}/src/character.rs | 0 {pktbuilder => src/pktbuilder}/src/lib.rs | 0 {pktbuilder => src/pktbuilder}/src/lobby.rs | 0 {pktbuilder => src/pktbuilder}/src/message.rs | 0 {pktbuilder => src/pktbuilder}/src/quest.rs | 0 {pktbuilder => src/pktbuilder}/src/room.rs | 0 {pktbuilder => src/pktbuilder}/src/ship.rs | 0 {pktbuilder => src/pktbuilder}/src/team.rs | 0 {pktbuilder => src/pktbuilder}/src/trade.rs | 0 {quests => src/quests}/Cargo.toml | 0 {quests => src/quests}/src/lib.rs | 0 {room => src/room}/Cargo.toml | 0 {room => src/room}/src/lib.rs | 0 {ship_server => src/ship_server}/Cargo.toml | 0 {ship_server => src/ship_server}/src/auth.rs | 0 .../ship_server}/src/chatcommand.rs | 0 .../ship_server}/src/communication.rs | 0 .../ship_server}/src/direct_message.rs | 0 {ship_server => src/ship_server}/src/lib.rs | 0 {ship_server => src/ship_server}/src/lobby.rs | 0 .../ship_server}/src/message.rs | 0 {ship_server => src/ship_server}/src/quest.rs | 0 {ship_server => src/ship_server}/src/room.rs | 0 .../ship_server}/src/settings.rs | 0 {ship_server => src/ship_server}/src/ship.rs | 0 {ship_server => src/ship_server}/src/trade.rs | 0 {shops => src/shops}/Cargo.toml | 0 {shops => src/shops}/src/armor.rs | 0 {shops => src/shops}/src/lib.rs | 0 {shops => src/shops}/src/tool.rs | 0 {shops => src/shops}/src/weapon.rs | 0 {stats => src/stats}/Cargo.toml | 0 {stats => src/stats}/src/items.rs | 0 {stats => src/stats}/src/leveltable.rs | 0 {stats => src/stats}/src/lib.rs | 0 {trade => src/trade}/Cargo.toml | 0 {trade => src/trade}/src/lib.rs | 0 123 files changed, 40 insertions(+), 49 deletions(-) rename {client => src/client}/Cargo.toml (100%) rename {client => src/client}/src/lib.rs (100%) rename {drops => src/drops}/Cargo.toml (100%) rename {drops => src/drops}/src/box_drop_table.rs (100%) rename {drops => src/drops}/src/generic_armor.rs (100%) rename {drops => src/drops}/src/generic_shield.rs (100%) rename {drops => src/drops}/src/generic_unit.rs (100%) rename {drops => src/drops}/src/generic_weapon.rs (100%) rename {drops => src/drops}/src/lib.rs (100%) rename {drops => src/drops}/src/rare_drop_table.rs (100%) rename {drops => src/drops}/src/tech_table.rs (100%) rename {drops => src/drops}/src/tool_table.rs (100%) rename {entity => src/entity}/Cargo.toml (100%) rename {entity => src/entity}/src/account.rs (100%) rename {entity => src/entity}/src/character.rs (100%) rename {entity => src/entity}/src/gateway/entitygateway.rs (100%) rename {entity => src/entity}/src/gateway/inmemory.rs (100%) rename {entity => src/entity}/src/gateway/mod.rs (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0001__initial.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0002__equips.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0003__item_notes.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0004__meseta.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0005__trade.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0006__playtime.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0007__player_keyconfig.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0008__playtime_not_null.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0009__no_player_keyconfig.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0010__char_create_timestamp.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0011__shared_bank.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0012__room.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/V0013__room2.sql (100%) rename {entity => src/entity}/src/gateway/postgres/migrations/mod.rs (100%) rename {entity => src/entity}/src/gateway/postgres/mod.rs (100%) rename {entity => src/entity}/src/gateway/postgres/models.rs (100%) rename {entity => src/entity}/src/gateway/postgres/postgres.rs (100%) rename {entity => src/entity}/src/item/armor.rs (100%) rename {entity => src/entity}/src/item/esweapon.rs (100%) rename {entity => src/entity}/src/item/mag.rs (100%) rename {entity => src/entity}/src/item/mod.rs (100%) rename {entity => src/entity}/src/item/shield.rs (100%) rename {entity => src/entity}/src/item/tech.rs (100%) rename {entity => src/entity}/src/item/tool.rs (100%) rename {entity => src/entity}/src/item/unit.rs (100%) rename {entity => src/entity}/src/item/weapon.rs (100%) rename {entity => src/entity}/src/lib.rs (100%) rename {entity => src/entity}/src/room.rs (100%) rename {entity => src/entity}/src/team.rs (100%) rename {items => src/items}/Cargo.toml (100%) rename {items => src/items}/src/actions.rs (100%) rename {items => src/items}/src/apply_item.rs (100%) rename {items => src/items}/src/bank.rs (100%) rename {items => src/items}/src/floor.rs (100%) rename {items => src/items}/src/inventory.rs (100%) rename {items => src/items}/src/itemstateaction.rs (100%) rename {items => src/items}/src/lib.rs (100%) rename {items => src/items}/src/manager.rs (100%) rename {items => src/items}/src/state.rs (100%) rename {items => src/items}/src/tasks.rs (100%) rename {items => src/items}/src/trade.rs (100%) rename {location => src/location}/Cargo.toml (100%) rename {location => src/location}/src/lib.rs (100%) rename {login_server => src/login_server}/Cargo.toml (100%) rename {login_server => src/login_server}/src/character.rs (100%) rename {login_server => src/login_server}/src/lib.rs (100%) rename {login_server => src/login_server}/src/login.rs (100%) rename {maps => src/maps}/Cargo.toml (100%) rename {maps => src/maps}/src/area.rs (100%) rename {maps => src/maps}/src/enemy.rs (100%) rename {maps => src/maps}/src/lib.rs (100%) rename {maps => src/maps}/src/maps.rs (100%) rename {maps => src/maps}/src/monster.rs (100%) rename {maps => src/maps}/src/object.rs (100%) rename {maps => src/maps}/src/room.rs (100%) rename {maps => src/maps}/src/variant.rs (100%) rename {networking => src/networking}/Cargo.toml (100%) rename {networking => src/networking}/src/cipherkeys.rs (100%) rename {networking => src/networking}/src/interserver.rs (100%) rename {networking => src/networking}/src/lib.rs (100%) rename {networking => src/networking}/src/mainloop/client.rs (100%) rename {networking => src/networking}/src/mainloop/interserver.rs (100%) rename {networking => src/networking}/src/mainloop/mod.rs (100%) rename {networking => src/networking}/src/serverstate.rs (100%) rename {patch_server => src/patch_server}/Cargo.toml (100%) rename {patch_server => src/patch_server}/src/lib.rs (100%) rename {pktbuilder => src/pktbuilder}/Cargo.toml (100%) rename {pktbuilder => src/pktbuilder}/src/character.rs (100%) rename {pktbuilder => src/pktbuilder}/src/lib.rs (100%) rename {pktbuilder => src/pktbuilder}/src/lobby.rs (100%) rename {pktbuilder => src/pktbuilder}/src/message.rs (100%) rename {pktbuilder => src/pktbuilder}/src/quest.rs (100%) rename {pktbuilder => src/pktbuilder}/src/room.rs (100%) rename {pktbuilder => src/pktbuilder}/src/ship.rs (100%) rename {pktbuilder => src/pktbuilder}/src/team.rs (100%) rename {pktbuilder => src/pktbuilder}/src/trade.rs (100%) rename {quests => src/quests}/Cargo.toml (100%) rename {quests => src/quests}/src/lib.rs (100%) rename {room => src/room}/Cargo.toml (100%) rename {room => src/room}/src/lib.rs (100%) rename {ship_server => src/ship_server}/Cargo.toml (100%) rename {ship_server => src/ship_server}/src/auth.rs (100%) rename {ship_server => src/ship_server}/src/chatcommand.rs (100%) rename {ship_server => src/ship_server}/src/communication.rs (100%) rename {ship_server => src/ship_server}/src/direct_message.rs (100%) rename {ship_server => src/ship_server}/src/lib.rs (100%) rename {ship_server => src/ship_server}/src/lobby.rs (100%) rename {ship_server => src/ship_server}/src/message.rs (100%) rename {ship_server => src/ship_server}/src/quest.rs (100%) rename {ship_server => src/ship_server}/src/room.rs (100%) rename {ship_server => src/ship_server}/src/settings.rs (100%) rename {ship_server => src/ship_server}/src/ship.rs (100%) rename {ship_server => src/ship_server}/src/trade.rs (100%) rename {shops => src/shops}/Cargo.toml (100%) rename {shops => src/shops}/src/armor.rs (100%) rename {shops => src/shops}/src/lib.rs (100%) rename {shops => src/shops}/src/tool.rs (100%) rename {shops => src/shops}/src/weapon.rs (100%) rename {stats => src/stats}/Cargo.toml (100%) rename {stats => src/stats}/src/items.rs (100%) rename {stats => src/stats}/src/leveltable.rs (100%) rename {stats => src/stats}/src/lib.rs (100%) rename {trade => src/trade}/Cargo.toml (100%) rename {trade => src/trade}/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index a514c54..32363b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,41 +6,41 @@ edition = "2021" [workspace] members = [ - "client", - "drops", - "entity", - "items", - "location", - "maps", - "networking", - "pktbuilder", - "quests", - "room", - "shops", - "stats", - "trade", - "patch_server", - "login_server", - "ship_server", + "src/client", + "src/drops", + "src/entity", + "src/items", + "src/location", + "src/maps", + "src/networking", + "src/pktbuilder", + "src/quests", + "src/room", + "src/shops", + "src/stats", + "src/trade", + "src/patch_server", + "src/login_server", + "src/ship_server", ] [workspace.dependencies] -entity = { path = "./entity" } -maps = { path = "./maps" } -networking = { path = "./networking" } -shops = { path = "./shops" } -stats = { path = "./stats" } -items = { path = "./items" } -pktbuilder = { path = "./pktbuilder" } -quests = { path = "./quests" } -location = { path = "./location" } -client = { path = "./client" } -drops = { path = "./drops" } -trade = { path = "./trade" } -room = { path = "./room" } -patch_server = { path = "./patch_server" } -login_server = { path = "./login_server" } -ship_server = { path = "./ship_server" } +entity = { path = "./src/entity" } +maps = { path = "./src/maps" } +networking = { path = "./src/networking" } +shops = { path = "./src/shops" } +stats = { path = "./src/stats" } +items = { path = "./src/items" } +pktbuilder = { path = "./src/pktbuilder" } +quests = { path = "./src/quests" } +location = { path = "./src/location" } +client = { path = "./src/client" } +drops = { path = "./src/drops" } +trade = { path = "./src/trade" } +room = { path = "./src/room" } +patch_server = { path = "./src/patch_server" } +login_server = { path = "./src/login_server" } +ship_server = { path = "./src/ship_server" } libpso = { git = "http://git.sharnoth.com/jake/libpso" } @@ -76,32 +76,23 @@ anyhow = { version = "1.0.68", features = ["backtrace"] } entity = { workspace = true } maps = { workspace = true } networking = { workspace = true } -shops = { workspace = true } -stats = { workspace = true } -items = { workspace = true } -pktbuilder = { workspace = true } -quests = { workspace = true } -location = { workspace = true } -client = { workspace = true } -drops = { workspace = true } -trade = { workspace = true } -room = { workspace = true } patch_server = { workspace = true } login_server = { workspace = true } ship_server = { workspace = true } libpso = { workspace = true } -anyhow = { workspace = true } async-std = { workspace = true } -async-trait = { workspace = true } bcrypt = { workspace = true } chrono = { workspace = true } -crc = { workspace = true } fern = { workspace = true } futures = { workspace = true } log = { workspace = true } -rand = { workspace = true } -ron = { workspace = true } -serde = { workspace = true } -thiserror = { workspace = true } \ No newline at end of file + +[dev-dependencies] +drops = { workspace = true } +shops = { workspace = true } +items = { workspace = true } +quests = { workspace = true } +stats = { workspace = true } +async-trait = { workspace = true } \ No newline at end of file diff --git a/client/Cargo.toml b/src/client/Cargo.toml similarity index 100% rename from client/Cargo.toml rename to src/client/Cargo.toml diff --git a/client/src/lib.rs b/src/client/src/lib.rs similarity index 100% rename from client/src/lib.rs rename to src/client/src/lib.rs diff --git a/drops/Cargo.toml b/src/drops/Cargo.toml similarity index 100% rename from drops/Cargo.toml rename to src/drops/Cargo.toml diff --git a/drops/src/box_drop_table.rs b/src/drops/src/box_drop_table.rs similarity index 100% rename from drops/src/box_drop_table.rs rename to src/drops/src/box_drop_table.rs diff --git a/drops/src/generic_armor.rs b/src/drops/src/generic_armor.rs similarity index 100% rename from drops/src/generic_armor.rs rename to src/drops/src/generic_armor.rs diff --git a/drops/src/generic_shield.rs b/src/drops/src/generic_shield.rs similarity index 100% rename from drops/src/generic_shield.rs rename to src/drops/src/generic_shield.rs diff --git a/drops/src/generic_unit.rs b/src/drops/src/generic_unit.rs similarity index 100% rename from drops/src/generic_unit.rs rename to src/drops/src/generic_unit.rs diff --git a/drops/src/generic_weapon.rs b/src/drops/src/generic_weapon.rs similarity index 100% rename from drops/src/generic_weapon.rs rename to src/drops/src/generic_weapon.rs diff --git a/drops/src/lib.rs b/src/drops/src/lib.rs similarity index 100% rename from drops/src/lib.rs rename to src/drops/src/lib.rs diff --git a/drops/src/rare_drop_table.rs b/src/drops/src/rare_drop_table.rs similarity index 100% rename from drops/src/rare_drop_table.rs rename to src/drops/src/rare_drop_table.rs diff --git a/drops/src/tech_table.rs b/src/drops/src/tech_table.rs similarity index 100% rename from drops/src/tech_table.rs rename to src/drops/src/tech_table.rs diff --git a/drops/src/tool_table.rs b/src/drops/src/tool_table.rs similarity index 100% rename from drops/src/tool_table.rs rename to src/drops/src/tool_table.rs diff --git a/entity/Cargo.toml b/src/entity/Cargo.toml similarity index 100% rename from entity/Cargo.toml rename to src/entity/Cargo.toml diff --git a/entity/src/account.rs b/src/entity/src/account.rs similarity index 100% rename from entity/src/account.rs rename to src/entity/src/account.rs diff --git a/entity/src/character.rs b/src/entity/src/character.rs similarity index 100% rename from entity/src/character.rs rename to src/entity/src/character.rs diff --git a/entity/src/gateway/entitygateway.rs b/src/entity/src/gateway/entitygateway.rs similarity index 100% rename from entity/src/gateway/entitygateway.rs rename to src/entity/src/gateway/entitygateway.rs diff --git a/entity/src/gateway/inmemory.rs b/src/entity/src/gateway/inmemory.rs similarity index 100% rename from entity/src/gateway/inmemory.rs rename to src/entity/src/gateway/inmemory.rs diff --git a/entity/src/gateway/mod.rs b/src/entity/src/gateway/mod.rs similarity index 100% rename from entity/src/gateway/mod.rs rename to src/entity/src/gateway/mod.rs diff --git a/entity/src/gateway/postgres/migrations/V0001__initial.sql b/src/entity/src/gateway/postgres/migrations/V0001__initial.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0001__initial.sql rename to src/entity/src/gateway/postgres/migrations/V0001__initial.sql diff --git a/entity/src/gateway/postgres/migrations/V0002__equips.sql b/src/entity/src/gateway/postgres/migrations/V0002__equips.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0002__equips.sql rename to src/entity/src/gateway/postgres/migrations/V0002__equips.sql diff --git a/entity/src/gateway/postgres/migrations/V0003__item_notes.sql b/src/entity/src/gateway/postgres/migrations/V0003__item_notes.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0003__item_notes.sql rename to src/entity/src/gateway/postgres/migrations/V0003__item_notes.sql diff --git a/entity/src/gateway/postgres/migrations/V0004__meseta.sql b/src/entity/src/gateway/postgres/migrations/V0004__meseta.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0004__meseta.sql rename to src/entity/src/gateway/postgres/migrations/V0004__meseta.sql diff --git a/entity/src/gateway/postgres/migrations/V0005__trade.sql b/src/entity/src/gateway/postgres/migrations/V0005__trade.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0005__trade.sql rename to src/entity/src/gateway/postgres/migrations/V0005__trade.sql diff --git a/entity/src/gateway/postgres/migrations/V0006__playtime.sql b/src/entity/src/gateway/postgres/migrations/V0006__playtime.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0006__playtime.sql rename to src/entity/src/gateway/postgres/migrations/V0006__playtime.sql diff --git a/entity/src/gateway/postgres/migrations/V0007__player_keyconfig.sql b/src/entity/src/gateway/postgres/migrations/V0007__player_keyconfig.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0007__player_keyconfig.sql rename to src/entity/src/gateway/postgres/migrations/V0007__player_keyconfig.sql diff --git a/entity/src/gateway/postgres/migrations/V0008__playtime_not_null.sql b/src/entity/src/gateway/postgres/migrations/V0008__playtime_not_null.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0008__playtime_not_null.sql rename to src/entity/src/gateway/postgres/migrations/V0008__playtime_not_null.sql diff --git a/entity/src/gateway/postgres/migrations/V0009__no_player_keyconfig.sql b/src/entity/src/gateway/postgres/migrations/V0009__no_player_keyconfig.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0009__no_player_keyconfig.sql rename to src/entity/src/gateway/postgres/migrations/V0009__no_player_keyconfig.sql diff --git a/entity/src/gateway/postgres/migrations/V0010__char_create_timestamp.sql b/src/entity/src/gateway/postgres/migrations/V0010__char_create_timestamp.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0010__char_create_timestamp.sql rename to src/entity/src/gateway/postgres/migrations/V0010__char_create_timestamp.sql diff --git a/entity/src/gateway/postgres/migrations/V0011__shared_bank.sql b/src/entity/src/gateway/postgres/migrations/V0011__shared_bank.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0011__shared_bank.sql rename to src/entity/src/gateway/postgres/migrations/V0011__shared_bank.sql diff --git a/entity/src/gateway/postgres/migrations/V0012__room.sql b/src/entity/src/gateway/postgres/migrations/V0012__room.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0012__room.sql rename to src/entity/src/gateway/postgres/migrations/V0012__room.sql diff --git a/entity/src/gateway/postgres/migrations/V0013__room2.sql b/src/entity/src/gateway/postgres/migrations/V0013__room2.sql similarity index 100% rename from entity/src/gateway/postgres/migrations/V0013__room2.sql rename to src/entity/src/gateway/postgres/migrations/V0013__room2.sql diff --git a/entity/src/gateway/postgres/migrations/mod.rs b/src/entity/src/gateway/postgres/migrations/mod.rs similarity index 100% rename from entity/src/gateway/postgres/migrations/mod.rs rename to src/entity/src/gateway/postgres/migrations/mod.rs diff --git a/entity/src/gateway/postgres/mod.rs b/src/entity/src/gateway/postgres/mod.rs similarity index 100% rename from entity/src/gateway/postgres/mod.rs rename to src/entity/src/gateway/postgres/mod.rs diff --git a/entity/src/gateway/postgres/models.rs b/src/entity/src/gateway/postgres/models.rs similarity index 100% rename from entity/src/gateway/postgres/models.rs rename to src/entity/src/gateway/postgres/models.rs diff --git a/entity/src/gateway/postgres/postgres.rs b/src/entity/src/gateway/postgres/postgres.rs similarity index 100% rename from entity/src/gateway/postgres/postgres.rs rename to src/entity/src/gateway/postgres/postgres.rs diff --git a/entity/src/item/armor.rs b/src/entity/src/item/armor.rs similarity index 100% rename from entity/src/item/armor.rs rename to src/entity/src/item/armor.rs diff --git a/entity/src/item/esweapon.rs b/src/entity/src/item/esweapon.rs similarity index 100% rename from entity/src/item/esweapon.rs rename to src/entity/src/item/esweapon.rs diff --git a/entity/src/item/mag.rs b/src/entity/src/item/mag.rs similarity index 100% rename from entity/src/item/mag.rs rename to src/entity/src/item/mag.rs diff --git a/entity/src/item/mod.rs b/src/entity/src/item/mod.rs similarity index 100% rename from entity/src/item/mod.rs rename to src/entity/src/item/mod.rs diff --git a/entity/src/item/shield.rs b/src/entity/src/item/shield.rs similarity index 100% rename from entity/src/item/shield.rs rename to src/entity/src/item/shield.rs diff --git a/entity/src/item/tech.rs b/src/entity/src/item/tech.rs similarity index 100% rename from entity/src/item/tech.rs rename to src/entity/src/item/tech.rs diff --git a/entity/src/item/tool.rs b/src/entity/src/item/tool.rs similarity index 100% rename from entity/src/item/tool.rs rename to src/entity/src/item/tool.rs diff --git a/entity/src/item/unit.rs b/src/entity/src/item/unit.rs similarity index 100% rename from entity/src/item/unit.rs rename to src/entity/src/item/unit.rs diff --git a/entity/src/item/weapon.rs b/src/entity/src/item/weapon.rs similarity index 100% rename from entity/src/item/weapon.rs rename to src/entity/src/item/weapon.rs diff --git a/entity/src/lib.rs b/src/entity/src/lib.rs similarity index 100% rename from entity/src/lib.rs rename to src/entity/src/lib.rs diff --git a/entity/src/room.rs b/src/entity/src/room.rs similarity index 100% rename from entity/src/room.rs rename to src/entity/src/room.rs diff --git a/entity/src/team.rs b/src/entity/src/team.rs similarity index 100% rename from entity/src/team.rs rename to src/entity/src/team.rs diff --git a/items/Cargo.toml b/src/items/Cargo.toml similarity index 100% rename from items/Cargo.toml rename to src/items/Cargo.toml diff --git a/items/src/actions.rs b/src/items/src/actions.rs similarity index 100% rename from items/src/actions.rs rename to src/items/src/actions.rs diff --git a/items/src/apply_item.rs b/src/items/src/apply_item.rs similarity index 100% rename from items/src/apply_item.rs rename to src/items/src/apply_item.rs diff --git a/items/src/bank.rs b/src/items/src/bank.rs similarity index 100% rename from items/src/bank.rs rename to src/items/src/bank.rs diff --git a/items/src/floor.rs b/src/items/src/floor.rs similarity index 100% rename from items/src/floor.rs rename to src/items/src/floor.rs diff --git a/items/src/inventory.rs b/src/items/src/inventory.rs similarity index 100% rename from items/src/inventory.rs rename to src/items/src/inventory.rs diff --git a/items/src/itemstateaction.rs b/src/items/src/itemstateaction.rs similarity index 100% rename from items/src/itemstateaction.rs rename to src/items/src/itemstateaction.rs diff --git a/items/src/lib.rs b/src/items/src/lib.rs similarity index 100% rename from items/src/lib.rs rename to src/items/src/lib.rs diff --git a/items/src/manager.rs b/src/items/src/manager.rs similarity index 100% rename from items/src/manager.rs rename to src/items/src/manager.rs diff --git a/items/src/state.rs b/src/items/src/state.rs similarity index 100% rename from items/src/state.rs rename to src/items/src/state.rs diff --git a/items/src/tasks.rs b/src/items/src/tasks.rs similarity index 100% rename from items/src/tasks.rs rename to src/items/src/tasks.rs diff --git a/items/src/trade.rs b/src/items/src/trade.rs similarity index 100% rename from items/src/trade.rs rename to src/items/src/trade.rs diff --git a/location/Cargo.toml b/src/location/Cargo.toml similarity index 100% rename from location/Cargo.toml rename to src/location/Cargo.toml diff --git a/location/src/lib.rs b/src/location/src/lib.rs similarity index 100% rename from location/src/lib.rs rename to src/location/src/lib.rs diff --git a/login_server/Cargo.toml b/src/login_server/Cargo.toml similarity index 100% rename from login_server/Cargo.toml rename to src/login_server/Cargo.toml diff --git a/login_server/src/character.rs b/src/login_server/src/character.rs similarity index 100% rename from login_server/src/character.rs rename to src/login_server/src/character.rs diff --git a/login_server/src/lib.rs b/src/login_server/src/lib.rs similarity index 100% rename from login_server/src/lib.rs rename to src/login_server/src/lib.rs diff --git a/login_server/src/login.rs b/src/login_server/src/login.rs similarity index 100% rename from login_server/src/login.rs rename to src/login_server/src/login.rs diff --git a/maps/Cargo.toml b/src/maps/Cargo.toml similarity index 100% rename from maps/Cargo.toml rename to src/maps/Cargo.toml diff --git a/maps/src/area.rs b/src/maps/src/area.rs similarity index 100% rename from maps/src/area.rs rename to src/maps/src/area.rs diff --git a/maps/src/enemy.rs b/src/maps/src/enemy.rs similarity index 100% rename from maps/src/enemy.rs rename to src/maps/src/enemy.rs diff --git a/maps/src/lib.rs b/src/maps/src/lib.rs similarity index 100% rename from maps/src/lib.rs rename to src/maps/src/lib.rs diff --git a/maps/src/maps.rs b/src/maps/src/maps.rs similarity index 100% rename from maps/src/maps.rs rename to src/maps/src/maps.rs diff --git a/maps/src/monster.rs b/src/maps/src/monster.rs similarity index 100% rename from maps/src/monster.rs rename to src/maps/src/monster.rs diff --git a/maps/src/object.rs b/src/maps/src/object.rs similarity index 100% rename from maps/src/object.rs rename to src/maps/src/object.rs diff --git a/maps/src/room.rs b/src/maps/src/room.rs similarity index 100% rename from maps/src/room.rs rename to src/maps/src/room.rs diff --git a/maps/src/variant.rs b/src/maps/src/variant.rs similarity index 100% rename from maps/src/variant.rs rename to src/maps/src/variant.rs diff --git a/networking/Cargo.toml b/src/networking/Cargo.toml similarity index 100% rename from networking/Cargo.toml rename to src/networking/Cargo.toml diff --git a/networking/src/cipherkeys.rs b/src/networking/src/cipherkeys.rs similarity index 100% rename from networking/src/cipherkeys.rs rename to src/networking/src/cipherkeys.rs diff --git a/networking/src/interserver.rs b/src/networking/src/interserver.rs similarity index 100% rename from networking/src/interserver.rs rename to src/networking/src/interserver.rs diff --git a/networking/src/lib.rs b/src/networking/src/lib.rs similarity index 100% rename from networking/src/lib.rs rename to src/networking/src/lib.rs diff --git a/networking/src/mainloop/client.rs b/src/networking/src/mainloop/client.rs similarity index 100% rename from networking/src/mainloop/client.rs rename to src/networking/src/mainloop/client.rs diff --git a/networking/src/mainloop/interserver.rs b/src/networking/src/mainloop/interserver.rs similarity index 100% rename from networking/src/mainloop/interserver.rs rename to src/networking/src/mainloop/interserver.rs diff --git a/networking/src/mainloop/mod.rs b/src/networking/src/mainloop/mod.rs similarity index 100% rename from networking/src/mainloop/mod.rs rename to src/networking/src/mainloop/mod.rs diff --git a/networking/src/serverstate.rs b/src/networking/src/serverstate.rs similarity index 100% rename from networking/src/serverstate.rs rename to src/networking/src/serverstate.rs diff --git a/patch_server/Cargo.toml b/src/patch_server/Cargo.toml similarity index 100% rename from patch_server/Cargo.toml rename to src/patch_server/Cargo.toml diff --git a/patch_server/src/lib.rs b/src/patch_server/src/lib.rs similarity index 100% rename from patch_server/src/lib.rs rename to src/patch_server/src/lib.rs diff --git a/pktbuilder/Cargo.toml b/src/pktbuilder/Cargo.toml similarity index 100% rename from pktbuilder/Cargo.toml rename to src/pktbuilder/Cargo.toml diff --git a/pktbuilder/src/character.rs b/src/pktbuilder/src/character.rs similarity index 100% rename from pktbuilder/src/character.rs rename to src/pktbuilder/src/character.rs diff --git a/pktbuilder/src/lib.rs b/src/pktbuilder/src/lib.rs similarity index 100% rename from pktbuilder/src/lib.rs rename to src/pktbuilder/src/lib.rs diff --git a/pktbuilder/src/lobby.rs b/src/pktbuilder/src/lobby.rs similarity index 100% rename from pktbuilder/src/lobby.rs rename to src/pktbuilder/src/lobby.rs diff --git a/pktbuilder/src/message.rs b/src/pktbuilder/src/message.rs similarity index 100% rename from pktbuilder/src/message.rs rename to src/pktbuilder/src/message.rs diff --git a/pktbuilder/src/quest.rs b/src/pktbuilder/src/quest.rs similarity index 100% rename from pktbuilder/src/quest.rs rename to src/pktbuilder/src/quest.rs diff --git a/pktbuilder/src/room.rs b/src/pktbuilder/src/room.rs similarity index 100% rename from pktbuilder/src/room.rs rename to src/pktbuilder/src/room.rs diff --git a/pktbuilder/src/ship.rs b/src/pktbuilder/src/ship.rs similarity index 100% rename from pktbuilder/src/ship.rs rename to src/pktbuilder/src/ship.rs diff --git a/pktbuilder/src/team.rs b/src/pktbuilder/src/team.rs similarity index 100% rename from pktbuilder/src/team.rs rename to src/pktbuilder/src/team.rs diff --git a/pktbuilder/src/trade.rs b/src/pktbuilder/src/trade.rs similarity index 100% rename from pktbuilder/src/trade.rs rename to src/pktbuilder/src/trade.rs diff --git a/quests/Cargo.toml b/src/quests/Cargo.toml similarity index 100% rename from quests/Cargo.toml rename to src/quests/Cargo.toml diff --git a/quests/src/lib.rs b/src/quests/src/lib.rs similarity index 100% rename from quests/src/lib.rs rename to src/quests/src/lib.rs diff --git a/room/Cargo.toml b/src/room/Cargo.toml similarity index 100% rename from room/Cargo.toml rename to src/room/Cargo.toml diff --git a/room/src/lib.rs b/src/room/src/lib.rs similarity index 100% rename from room/src/lib.rs rename to src/room/src/lib.rs diff --git a/ship_server/Cargo.toml b/src/ship_server/Cargo.toml similarity index 100% rename from ship_server/Cargo.toml rename to src/ship_server/Cargo.toml diff --git a/ship_server/src/auth.rs b/src/ship_server/src/auth.rs similarity index 100% rename from ship_server/src/auth.rs rename to src/ship_server/src/auth.rs diff --git a/ship_server/src/chatcommand.rs b/src/ship_server/src/chatcommand.rs similarity index 100% rename from ship_server/src/chatcommand.rs rename to src/ship_server/src/chatcommand.rs diff --git a/ship_server/src/communication.rs b/src/ship_server/src/communication.rs similarity index 100% rename from ship_server/src/communication.rs rename to src/ship_server/src/communication.rs diff --git a/ship_server/src/direct_message.rs b/src/ship_server/src/direct_message.rs similarity index 100% rename from ship_server/src/direct_message.rs rename to src/ship_server/src/direct_message.rs diff --git a/ship_server/src/lib.rs b/src/ship_server/src/lib.rs similarity index 100% rename from ship_server/src/lib.rs rename to src/ship_server/src/lib.rs diff --git a/ship_server/src/lobby.rs b/src/ship_server/src/lobby.rs similarity index 100% rename from ship_server/src/lobby.rs rename to src/ship_server/src/lobby.rs diff --git a/ship_server/src/message.rs b/src/ship_server/src/message.rs similarity index 100% rename from ship_server/src/message.rs rename to src/ship_server/src/message.rs diff --git a/ship_server/src/quest.rs b/src/ship_server/src/quest.rs similarity index 100% rename from ship_server/src/quest.rs rename to src/ship_server/src/quest.rs diff --git a/ship_server/src/room.rs b/src/ship_server/src/room.rs similarity index 100% rename from ship_server/src/room.rs rename to src/ship_server/src/room.rs diff --git a/ship_server/src/settings.rs b/src/ship_server/src/settings.rs similarity index 100% rename from ship_server/src/settings.rs rename to src/ship_server/src/settings.rs diff --git a/ship_server/src/ship.rs b/src/ship_server/src/ship.rs similarity index 100% rename from ship_server/src/ship.rs rename to src/ship_server/src/ship.rs diff --git a/ship_server/src/trade.rs b/src/ship_server/src/trade.rs similarity index 100% rename from ship_server/src/trade.rs rename to src/ship_server/src/trade.rs diff --git a/shops/Cargo.toml b/src/shops/Cargo.toml similarity index 100% rename from shops/Cargo.toml rename to src/shops/Cargo.toml diff --git a/shops/src/armor.rs b/src/shops/src/armor.rs similarity index 100% rename from shops/src/armor.rs rename to src/shops/src/armor.rs diff --git a/shops/src/lib.rs b/src/shops/src/lib.rs similarity index 100% rename from shops/src/lib.rs rename to src/shops/src/lib.rs diff --git a/shops/src/tool.rs b/src/shops/src/tool.rs similarity index 100% rename from shops/src/tool.rs rename to src/shops/src/tool.rs diff --git a/shops/src/weapon.rs b/src/shops/src/weapon.rs similarity index 100% rename from shops/src/weapon.rs rename to src/shops/src/weapon.rs diff --git a/stats/Cargo.toml b/src/stats/Cargo.toml similarity index 100% rename from stats/Cargo.toml rename to src/stats/Cargo.toml diff --git a/stats/src/items.rs b/src/stats/src/items.rs similarity index 100% rename from stats/src/items.rs rename to src/stats/src/items.rs diff --git a/stats/src/leveltable.rs b/src/stats/src/leveltable.rs similarity index 100% rename from stats/src/leveltable.rs rename to src/stats/src/leveltable.rs diff --git a/stats/src/lib.rs b/src/stats/src/lib.rs similarity index 100% rename from stats/src/lib.rs rename to src/stats/src/lib.rs diff --git a/trade/Cargo.toml b/src/trade/Cargo.toml similarity index 100% rename from trade/Cargo.toml rename to src/trade/Cargo.toml diff --git a/trade/src/lib.rs b/src/trade/src/lib.rs similarity index 100% rename from trade/src/lib.rs rename to src/trade/src/lib.rs