diff --git a/backend/sync_server/src/main.rs b/backend/sync_server/src/main.rs
index 7838cd97..02e4104b 100644
--- a/backend/sync_server/src/main.rs
+++ b/backend/sync_server/src/main.rs
@@ -1,12 +1,11 @@
-mod app_state;
 mod config;
 mod consts;
 mod database;
 mod errors;
 mod server;
+mod utils;
 
 use anyhow::{Context as _, Result};
-use app_state::AppState;
 use errors::{init_error, SyncServerError};
 use log::info;
 use server::create_server;
@@ -34,12 +33,7 @@ async fn main() -> Result<(), SyncServerError> {
         env!("CARGO_PKG_VERSION")
     );
 
-    let app_state = AppState::try_new()
-        .await
-        .context("Failed to initialise app state")
-        .map_err(init_error)?;
-
-    create_server(app_state)
+    create_server()
         .await
         .context("Failed to start server")
         .map_err(init_error)
diff --git a/backend/sync_server/src/server.rs b/backend/sync_server/src/server.rs
index 4747858b..ad7e603f 100644
--- a/backend/sync_server/src/server.rs
+++ b/backend/sync_server/src/server.rs
@@ -10,6 +10,7 @@ use aide::{
     transform::TransformOpenApi,
 };
 use anyhow::{anyhow, Context as _, Result};
+use app_state::AppState;
 use axum::{
     extract::{DefaultBodyLimit, Request},
     http::{self, HeaderValue, Method},
@@ -28,10 +29,8 @@ use tower_http::{
 };
 use tracing::{info_span, Level};
 
-use crate::{
-    app_state::AppState,
-    errors::{not_found_error, SerializedError},
-};
+use crate::errors::{not_found_error, SerializedError};
+mod app_state;
 mod auth;
 mod create_document;
 mod delete_document;
@@ -42,10 +41,14 @@ mod requests;
 mod responses;
 mod update_document;
 
-pub async fn create_server(app_state: AppState) -> Result<()> {
+pub async fn create_server() -> Result<()> {
     aide::gen::on_error(|err| error!("{err}"));
     aide::gen::extract_schemas(true);
 
+    let app_state = AppState::try_new()
+        .await
+        .context("Failed to initialise app state")?;
+
     let address = format!(
         "{}:{}",
         &app_state.config.server.host, &app_state.config.server.port
diff --git a/backend/sync_server/src/app_state.rs b/backend/sync_server/src/server/app_state.rs
similarity index 100%
rename from backend/sync_server/src/app_state.rs
rename to backend/sync_server/src/server/app_state.rs
diff --git a/backend/sync_server/src/server/auth.rs b/backend/sync_server/src/server/auth.rs
index 9d2dd31f..3e936097 100644
--- a/backend/sync_server/src/server/auth.rs
+++ b/backend/sync_server/src/server/auth.rs
@@ -1,5 +1,5 @@
+use super::app_state::AppState;
 use crate::{
-    app_state::AppState,
     config::user_config::User,
     errors::{unauthorized_error, SyncServerError},
 };
diff --git a/backend/sync_server/src/server/fetch_latest_document_version.rs b/backend/sync_server/src/server/fetch_latest_document_version.rs
index 3cf617e7..47c4514e 100644
--- a/backend/sync_server/src/server/fetch_latest_document_version.rs
+++ b/backend/sync_server/src/server/fetch_latest_document_version.rs
@@ -10,9 +10,8 @@ use axum_extra::{
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::auth::auth;
+use super::{app_state::AppState, auth::auth};
 use crate::{
-    app_state::AppState,
     database::models::{DocumentId, DocumentVersion, VaultId},
     errors::{not_found_error, server_error, SyncServerError},
 };
diff --git a/backend/sync_server/src/server/fetch_latest_documents.rs b/backend/sync_server/src/server/fetch_latest_documents.rs
index b376f268..f0181173 100644
--- a/backend/sync_server/src/server/fetch_latest_documents.rs
+++ b/backend/sync_server/src/server/fetch_latest_documents.rs
@@ -9,9 +9,8 @@ use axum_extra::{
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use super::{auth::auth, responses::FetchLatestDocumentsResponse};
+use super::{app_state::AppState, auth::auth, responses::FetchLatestDocumentsResponse};
 use crate::{
-    app_state::AppState,
     database::models::{VaultId, VaultUpdateId},
     errors::{server_error, SyncServerError},
 };
diff --git a/backend/sync_server/src/server/ping.rs b/backend/sync_server/src/server/ping.rs
index c8b48bd0..3ffd2cf7 100644
--- a/backend/sync_server/src/server/ping.rs
+++ b/backend/sync_server/src/server/ping.rs
@@ -4,8 +4,8 @@ use axum_extra::{
     TypedHeader,
 };
 
-use super::{auth::auth, responses::PingResponse};
-use crate::{app_state::AppState, errors::SyncServerError};
+use super::{app_state::AppState, auth::auth, responses::PingResponse};
+use crate::errors::SyncServerError;
 
 #[axum::debug_handler]
 pub async fn ping(