diff --git a/server/src/db/mod.rs b/server/src/db/mod.rs
index 639f412..7a2d337 100644
--- a/server/src/db/mod.rs
+++ b/server/src/db/mod.rs
@@ -4,6 +4,9 @@ use diesel::{Connection, PgConnection};
 use diesel::pg::Pg;
 use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
 
+pub mod models;
+pub mod schema;
+
 pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("./migrations");
 
 pub fn establish_connection() -> Result<PgConnection, Box<dyn error::Error>> {
diff --git a/server/src/models.rs b/server/src/db/models.rs
similarity index 88%
rename from server/src/models.rs
rename to server/src/db/models.rs
index 883eef0..9b26e0a 100644
--- a/server/src/models.rs
+++ b/server/src/db/models.rs
@@ -6,7 +6,7 @@ use diesel::prelude::*;
 use uuid::Uuid;
 
 #[derive(Queryable, Selectable)]
-#[diesel(table_name = crate::schema::tasks)]
+#[diesel(table_name = crate::db::schema::tasks)]
 #[diesel(check_for_backend(diesel::pg::Pg))]
 pub struct Task {
     pub id: Uuid,
diff --git a/server/src/schema.rs b/server/src/db/schema.rs
similarity index 100%
rename from server/src/schema.rs
rename to server/src/db/schema.rs
diff --git a/server/src/main.rs b/server/src/main.rs
index 5767f39..4b265e8 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -6,8 +6,6 @@ use std::{env, io};
 use actix_web::{App, get, HttpResponse, HttpServer, Responder};
 
 pub mod db;
-pub mod models;
-pub mod schema;
 pub mod util;
 
 #[actix_web::main]