diff --git a/Cargo.toml b/Cargo.toml
index 7bb3ad2..773af21 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,6 +10,7 @@ sqlx = { version = "0.8.6", features = [
     "runtime-tokio-rustls",
     "sqlite",
     "chrono",
+    "macros",
     "rust_decimal",
 ] }
 rust_decimal = { version = "1.33", features = ["serde"] }
diff --git a/src/db/mod.rs b/src/db/mod.rs
index 177cdf6..8720608 100644
--- a/src/db/mod.rs
+++ b/src/db/mod.rs
@@ -1,16 +1,8 @@
-pub mod currency_type;
 pub mod dao;
-pub mod listing_id;
 pub mod models;
-pub mod money_amount;
-pub mod telegram_user_id;
-pub mod user_id;
+pub mod types;
 
-// Re-export all models for easy access
-pub use currency_type::*;
+// Re-export all modules for easy access
 pub use dao::*;
-pub use listing_id::*;
 pub use models::*;
-pub use money_amount::*;
-pub use telegram_user_id::*;
-pub use user_id::*;
+pub use types::*;
diff --git a/src/db/currency_type.rs b/src/db/types/currency_type.rs
similarity index 100%
rename from src/db/currency_type.rs
rename to src/db/types/currency_type.rs
diff --git a/src/db/listing_id.rs b/src/db/types/listing_id.rs
similarity index 100%
rename from src/db/listing_id.rs
rename to src/db/types/listing_id.rs
diff --git a/src/db/types/mod.rs b/src/db/types/mod.rs
new file mode 100644
index 0000000..b91af12
--- /dev/null
+++ b/src/db/types/mod.rs
@@ -0,0 +1,12 @@
+pub mod currency_type;
+pub mod listing_id;
+pub mod money_amount;
+pub mod telegram_user_id;
+pub mod user_id;
+
+// Re-export all types for easy access
+pub use currency_type::*;
+pub use listing_id::*;
+pub use money_amount::*;
+pub use telegram_user_id::*;
+pub use user_id::*;
diff --git a/src/db/money_amount.rs b/src/db/types/money_amount.rs
similarity index 100%
rename from src/db/money_amount.rs
rename to src/db/types/money_amount.rs
diff --git a/src/db/telegram_user_id.rs b/src/db/types/telegram_user_id.rs
similarity index 100%
rename from src/db/telegram_user_id.rs
rename to src/db/types/telegram_user_id.rs
diff --git a/src/db/user_id.rs b/src/db/types/user_id.rs
similarity index 100%
rename from src/db/user_id.rs
rename to src/db/types/user_id.rs