18 files changed, 16 insertions, 32 deletions

diff --git a/src/bin/client/connection.rs b/src/bin/client/connection.rs
index 6aff321..e54b646 100644
--- a/src/bin/client/connection.rs
+++ b/src/bin/client/connection.rs
@@ -1,4 +1,4 @@
-use crate::database;
+use zagan_bet::client::database;
 use crate::tls::TlsConnector;
 use rusqlite::Connection;
 use std::io::{Read, Write};
diff --git a/src/bin/client/main.rs b/src/bin/client/main.rs
index 4e03381..1b701d8 100644
--- a/src/bin/client/main.rs
+++ b/src/bin/client/main.rs
@@ -1,8 +1,6 @@
 #[macro_use]
 mod macros;
 mod connection;
-mod database;
-mod games;
 mod repl;
 mod tls;
 
diff --git a/src/bin/client/mod.rs b/src/bin/client/mod.rs
deleted file mode 100644
index 5921c41..0000000
--- a/src/bin/client/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod database;
-mod connection;
-mod games;
-pub mod platform;
-pub mod tls;
-pub mod repl;
diff --git a/src/bin/client/repl.rs b/src/bin/client/repl.rs
index a6f0331..24605e2 100644
--- a/src/bin/client/repl.rs
+++ b/src/bin/client/repl.rs
@@ -4,9 +4,9 @@ use std::sync::{Arc, Mutex};
 use std::time::Instant;
 
 use crate::connection::TlsStream;
-use crate::database;
-use crate::games::manager::GameManager;
-use crate::games::traits::GamePhase;
+use zagan_bet::client::database;
+use zagan_bet::client::games::manager::GameManager;
+use zagan_bet::client::games::traits::GamePhase;
 
 use crossterm::{
     cursor::{Hide, MoveToColumn, Show},
diff --git a/src/bin/server/handler.rs b/src/bin/server/handler.rs
index 0a4934f..06ed5cb 100644
--- a/src/bin/server/handler.rs
+++ b/src/bin/server/handler.rs
@@ -1,7 +1,7 @@
-use crate::database;
-use crate::games::registry::get_game_registry;
-use crate::games::session::SessionManager;
-use crate::games::traits::{GameError, GamePhase};
+use zagan_bet::server::database;
+use zagan_bet::server::games::registry::get_game_registry;
+use zagan_bet::server::games::session::SessionManager;
+use zagan_bet::server::games::traits::GameError;
 use crate::tls::TlsStream;
 use once_cell::sync::Lazy;
 use parking_lot::Mutex;
diff --git a/src/bin/server/main.rs b/src/bin/server/main.rs
index 4328559..8dba415 100644
--- a/src/bin/server/main.rs
+++ b/src/bin/server/main.rs
@@ -1,6 +1,4 @@
 mod args;
-mod database;
-mod games;
 mod handler;
 mod tls;
 
diff --git a/src/bin/server/mod.rs b/src/bin/server/mod.rs
deleted file mode 100644
index b2d622e..0000000
--- a/src/bin/server/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod args;
-pub mod handler;
-pub mod database;
diff --git a/src/bin/client/database.rs b/src/client/database.rs
index e1fa42d..e1fa42d 100644
--- a/src/bin/client/database.rs
+++ b/src/client/database.rs
diff --git a/src/bin/client/games/manager.rs b/src/client/games/manager.rs
index 0b5b4cb..be96b1a 100644
--- a/src/bin/client/games/manager.rs
+++ b/src/client/games/manager.rs
@@ -1,5 +1,5 @@
-use crate::games::slots::SlotsGame;
-use crate::games::traits::{Game, GameError, GamePhase, GameState};
+use super::slots::SlotsGame;
+use super::traits::{Game, GameError, GamePhase, GameState};
 use std::collections::HashMap;
 use std::io::Write;
 
@@ -49,10 +49,7 @@ impl GameManager {
         Ok(())
     }
 
-    pub fn start_game(
-        &mut self,
-        stream: &mut crate::connection::TlsStream,
-    ) -> Result<(), GameError> {
+    pub fn start_game<W: Write>(&mut self, stream: &mut W) -> Result<(), GameError> {
         let game_type = self
             .pending_game_type
             .as_ref()
diff --git a/src/bin/client/games/mod.rs b/src/client/games/mod.rs
index aa74574..aa74574 100644
--- a/src/bin/client/games/mod.rs
+++ b/src/client/games/mod.rs
diff --git a/src/bin/client/games/slots.rs b/src/client/games/slots.rs
index ff55274..6e2ebbe 100644
--- a/src/bin/client/games/slots.rs
+++ b/src/client/games/slots.rs
@@ -1,4 +1,4 @@
-use crate::games::traits::{Game, GameState};
+use super::traits::{Game, GameState};
 
 pub struct SlotsGame;
 
diff --git a/src/bin/client/games/traits.rs b/src/client/games/traits.rs
index aed0c24..aed0c24 100644
--- a/src/bin/client/games/traits.rs
+++ b/src/client/games/traits.rs
diff --git a/src/bin/server/database.rs b/src/server/database.rs
index c73aec5..c73aec5 100644
--- a/src/bin/server/database.rs
+++ b/src/server/database.rs
diff --git a/src/bin/server/games/mod.rs b/src/server/games/mod.rs
index 4c62760..4c62760 100644
--- a/src/bin/server/games/mod.rs
+++ b/src/server/games/mod.rs
diff --git a/src/bin/server/games/registry.rs b/src/server/games/registry.rs
index e77a138..3b8c391 100644
--- a/src/bin/server/games/registry.rs
+++ b/src/server/games/registry.rs
@@ -1,6 +1,6 @@
 #![allow(dead_code)]
 
-use crate::games::traits::Game;
+use super::traits::Game;
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 
@@ -40,7 +40,7 @@ impl GameRegistry {
 }
 
 // Global registry instance
-use crate::games::slots::SlotsGame;
+use super::slots::SlotsGame;
 use once_cell::sync::Lazy;
 
 static GAME_REGISTRY: Lazy<GameRegistry> = Lazy::new(|| {
diff --git a/src/bin/server/games/session.rs b/src/server/games/session.rs
index 595a745..97ceaf3 100644
--- a/src/bin/server/games/session.rs
+++ b/src/server/games/session.rs
@@ -1,6 +1,6 @@
 #![allow(dead_code)]
 
-use crate::games::traits::{GameError, GameState};
+use super::traits::{GameError, GameState};
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 use uuid::Uuid;
diff --git a/src/bin/server/games/slots.rs b/src/server/games/slots.rs
index 04ac175..0a9797d 100644
--- a/src/bin/server/games/slots.rs
+++ b/src/server/games/slots.rs
@@ -1,4 +1,4 @@
-use crate::games::traits::{Game, GameError, GamePhase, GameResult, GameState};
+use super::traits::{Game, GameError, GamePhase, GameResult, GameState};
 use rand::Rng;
 use std::collections::HashMap;
 
diff --git a/src/bin/server/games/traits.rs b/src/server/games/traits.rs
index d56b334..d56b334 100644
--- a/src/bin/server/games/traits.rs
+++ b/src/server/games/traits.rs