diff --git a/src/test_utils.rs b/src/test_utils.rs
index 391a44c..aa01e89 100644
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -198,7 +198,7 @@ pub async fn create_test_app() -> (Router, ContainerAsync<Postgres>) {
         oidc_redirect_uri: None,
     };
     
-    let queue_service = Arc::new(crate::ocr_queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
+    let queue_service = Arc::new(crate::ocr::queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
     
     let state = Arc::new(AppState { 
         db, 
diff --git a/src/tests/helpers.rs b/src/tests/helpers.rs
index f676cea..cf7ad98 100644
--- a/src/tests/helpers.rs
+++ b/src/tests/helpers.rs
@@ -48,7 +48,7 @@ pub async fn create_test_app() -> (Router, ContainerAsync<Postgres>) {
         oidc_redirect_uri: None,
     };
     
-    let queue_service = Arc::new(crate::ocr_queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
+    let queue_service = Arc::new(crate::ocr::queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
     
     let state = Arc::new(AppState { 
         db, 
diff --git a/src/tests/oidc_tests.rs b/src/tests/oidc_tests.rs
index 9d40fce..32551f5 100644
--- a/src/tests/oidc_tests.rs
+++ b/src/tests/oidc_tests.rs
@@ -60,7 +60,7 @@ mod tests {
                 config,
                 webdav_scheduler: None,
                 source_scheduler: None,
-                queue_service: Arc::new(crate::ocr_queue::OcrQueueService::new(
+                queue_service: Arc::new(crate::ocr::queue::OcrQueueService::new(
                     db.clone(),
                     db.pool.clone(),
                     2
@@ -148,7 +148,7 @@ mod tests {
                 config,
                 webdav_scheduler: None,
                 source_scheduler: None,
-                queue_service: Arc::new(crate::ocr_queue::OcrQueueService::new(
+                queue_service: Arc::new(crate::ocr::queue::OcrQueueService::new(
                     db.clone(),
                     db.pool.clone(),
                     2
diff --git a/tests/auto_resume_tests.rs b/tests/auto_resume_tests.rs
index 98feeb9..6380444 100644
--- a/tests/auto_resume_tests.rs
+++ b/tests/auto_resume_tests.rs
@@ -22,7 +22,7 @@ use readur::{
     config::Config,
     db::Database,
     models::{Source, SourceType, SourceStatus, WebDAVSourceConfig, CreateNotification},
-    source_scheduler::SourceScheduler,
+    scheduling::source_scheduler::SourceScheduler,
 };
 
 /// Create a test app state
@@ -55,7 +55,7 @@ async fn create_test_app_state() -> Arc<AppState> {
     };
 
     let db = Database::new(&config.database_url).await.unwrap();
-    let queue_service = Arc::new(readur::ocr_queue::OcrQueueService::new(
+    let queue_service = Arc::new(readur::ocr::queue::OcrQueueService::new(
         db.clone(),
         db.pool.clone(),
         4,
diff --git a/tests/cancellation_tests.rs b/tests/cancellation_tests.rs
index 44ccc79..76a80eb 100644
--- a/tests/cancellation_tests.rs
+++ b/tests/cancellation_tests.rs
@@ -24,7 +24,7 @@ use readur::{
     config::Config,
     db::Database,
     models::{Source, SourceType, SourceStatus, WebDAVSourceConfig},
-    source_scheduler::SourceScheduler,
+    scheduling::source_scheduler::SourceScheduler,
 };
 
 /// Create a test app state
@@ -54,7 +54,7 @@ async fn create_test_app_state() -> Arc<AppState> {
 
     let db = Database::new(&config.database_url).await.unwrap();
     
-    let queue_service = Arc::new(readur::ocr_queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
+    let queue_service = Arc::new(readur::ocr::queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
     Arc::new(AppState {
         db,
         config,
diff --git a/tests/document_upload_hash_duplicate_tests.rs b/tests/document_upload_hash_duplicate_tests.rs
index ecca3b8..01735ae 100644
--- a/tests/document_upload_hash_duplicate_tests.rs
+++ b/tests/document_upload_hash_duplicate_tests.rs
@@ -85,7 +85,7 @@ async fn create_test_app_state() -> Result<Arc<AppState>> {
     });
     let db = Database::new(&config.database_url).await?;
     let queue_service = std::sync::Arc::new(
-        readur::ocr_queue::OcrQueueService::new(db.clone(), db.get_pool().clone(), 1)
+        readur::ocr::queue::OcrQueueService::new(db.clone(), db.get_pool().clone(), 1)
     );
     
     Ok(Arc::new(AppState {
diff --git a/tests/hash_duplicate_detection_tests.rs b/tests/hash_duplicate_detection_tests.rs
index 2037519..dc193ab 100644
--- a/tests/hash_duplicate_detection_tests.rs
+++ b/tests/hash_duplicate_detection_tests.rs
@@ -6,7 +6,7 @@ use tempfile::TempDir;
 
 use readur::{
     db::Database,
-    file_service::FileService,
+    services::file_service::FileService,
     models::{Document, CreateUser, UserRole},
 };
 
diff --git a/tests/ignored_files_integration_tests.rs b/tests/ignored_files_integration_tests.rs
index 48d0b27..90b5952 100644
--- a/tests/ignored_files_integration_tests.rs
+++ b/tests/ignored_files_integration_tests.rs
@@ -40,7 +40,7 @@ async fn create_test_app_state() -> Result<Arc<AppState>> {
     });
 
     let db = Database::new(&config.database_url).await?;
-    let queue_service = Arc::new(readur::ocr_queue::OcrQueueService::new(db.clone(), db.pool.clone(), 1));
+    let queue_service = Arc::new(readur::ocr::queue::OcrQueueService::new(db.clone(), db.pool.clone(), 1));
     
     Ok(Arc::new(AppState {
         db,
diff --git a/tests/local_folder_sync_tests.rs b/tests/local_folder_sync_tests.rs
index 1c78936..b58a1e6 100644
--- a/tests/local_folder_sync_tests.rs
+++ b/tests/local_folder_sync_tests.rs
@@ -19,7 +19,7 @@ use serde_json::json;
 
 use readur::{
     models::{LocalFolderSourceConfig, SourceType},
-    local_folder_service::LocalFolderService,
+    services::local_folder_service::LocalFolderService,
 };
 
 /// Create a test local folder configuration
diff --git a/tests/ocr_pipeline_integration_test.rs b/tests/ocr_pipeline_integration_test.rs
index 6729bf7..26202a1 100644
--- a/tests/ocr_pipeline_integration_test.rs
+++ b/tests/ocr_pipeline_integration_test.rs
@@ -16,9 +16,9 @@ use readur::{
     config::Config,
     db::Database,
     models::Document,
-    file_service::FileService,
-    enhanced_ocr::EnhancedOcrService,
-    ocr_queue::{OcrQueueService, OcrQueueItem},
+    services::file_service::FileService,
+    ocr::enhanced::EnhancedOcrService,
+    ocr::queue::{OcrQueueService, OcrQueueItem},
     db_guardrails_simple::DocumentTransactionManager,
 };
 
diff --git a/tests/simple_throttling_test.rs b/tests/simple_throttling_test.rs
index 061ac82..c21ffe5 100644
--- a/tests/simple_throttling_test.rs
+++ b/tests/simple_throttling_test.rs
@@ -14,8 +14,8 @@ use uuid::Uuid;
 
 use readur::{
     db::Database,
-    ocr_queue::OcrQueueService,
-    enhanced_ocr::EnhancedOcrService,
+    ocr::queue::OcrQueueService,
+    ocr::enhanced::EnhancedOcrService,
 };
 
 // Use the same database URL as the running server
diff --git a/tests/source_scheduler_simple_tests.rs b/tests/source_scheduler_simple_tests.rs
index d8c8e1f..3bb197b 100644
--- a/tests/source_scheduler_simple_tests.rs
+++ b/tests/source_scheduler_simple_tests.rs
@@ -14,7 +14,7 @@ use readur::{
     config::Config,
     db::Database,
     models::{Source, SourceType, SourceStatus, WebDAVSourceConfig, LocalFolderSourceConfig, S3SourceConfig},
-    source_scheduler::SourceScheduler,
+    scheduling::source_scheduler::SourceScheduler,
 };
 
 /// Create a test app state
@@ -48,7 +48,7 @@ async fn create_test_app_state() -> Arc<AppState> {
 
     let db = Database::new(&config.database_url).await.unwrap();
     
-    let queue_service = Arc::new(readur::ocr_queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
+    let queue_service = Arc::new(readur::ocr::queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
     Arc::new(AppState {
         db,
         config,
diff --git a/tests/source_scheduler_tests.rs b/tests/source_scheduler_tests.rs
index 91769d4..43523b8 100644
--- a/tests/source_scheduler_tests.rs
+++ b/tests/source_scheduler_tests.rs
@@ -21,7 +21,7 @@ use readur::{
     config::Config,
     db::Database,
     models::{Source, SourceType, SourceStatus, WebDAVSourceConfig, LocalFolderSourceConfig, S3SourceConfig},
-    source_scheduler::SourceScheduler,
+    scheduling::source_scheduler::SourceScheduler,
 };
 
 /// Mock database for testing
@@ -184,7 +184,7 @@ async fn create_test_app_state() -> Arc<AppState> {
     };
 
     let db = Database::new(&config.database_url).await.unwrap();
-    let queue_service = std::sync::Arc::new(readur::ocr_queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
+    let queue_service = std::sync::Arc::new(readur::ocr::queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
     
     Arc::new(AppState {
         db,
diff --git a/tests/source_sync_hash_duplicate_tests.rs b/tests/source_sync_hash_duplicate_tests.rs
index 642453d..4925e8d 100644
--- a/tests/source_sync_hash_duplicate_tests.rs
+++ b/tests/source_sync_hash_duplicate_tests.rs
@@ -122,7 +122,7 @@ async fn create_test_app_state() -> Result<Arc<AppState>> {
     });
     let db = Database::new(&config.database_url).await?;
     let queue_service = std::sync::Arc::new(
-        readur::ocr_queue::OcrQueueService::new(db.clone(), db.get_pool().clone(), 1)
+        readur::ocr::queue::OcrQueueService::new(db.clone(), db.get_pool().clone(), 1)
     );
     
     Ok(Arc::new(AppState {
diff --git a/tests/stop_sync_functionality_tests.rs b/tests/stop_sync_functionality_tests.rs
index 1be1ed7..9574f57 100644
--- a/tests/stop_sync_functionality_tests.rs
+++ b/tests/stop_sync_functionality_tests.rs
@@ -21,7 +21,7 @@ use readur::{
     config::Config,
     db::Database,
     models::{Source, SourceType, SourceStatus, WebDAVSourceConfig},
-    source_scheduler::SourceScheduler,
+    scheduling::source_scheduler::SourceScheduler,
 };
 
 /// Create a test app state
@@ -54,7 +54,7 @@ async fn create_test_app_state() -> Arc<AppState> {
     };
 
     let db = Database::new(&config.database_url).await.unwrap();
-    let queue_service = Arc::new(readur::ocr_queue::OcrQueueService::new(
+    let queue_service = Arc::new(readur::ocr::queue::OcrQueueService::new(
         db.clone(),
         db.pool.clone(),
         4,
diff --git a/tests/universal_source_sync_tests.rs b/tests/universal_source_sync_tests.rs
index b838e35..354e26d 100644
--- a/tests/universal_source_sync_tests.rs
+++ b/tests/universal_source_sync_tests.rs
@@ -22,7 +22,7 @@ use readur::{
     config::Config,
     db::Database,
     models::{Source, SourceType, SourceStatus, WebDAVSourceConfig, LocalFolderSourceConfig, S3SourceConfig},
-    source_sync::SourceSyncService,
+    scheduling::source_sync::SourceSyncService,
 };
 
 /// Create a test WebDAV source
@@ -144,7 +144,7 @@ async fn create_test_app_state() -> Arc<AppState> {
 
     let db = Database::new(&config.database_url).await.unwrap();
     
-    let queue_service = Arc::new(readur::ocr_queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
+    let queue_service = Arc::new(readur::ocr::queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
     Arc::new(AppState {
         db,
         config,
diff --git a/tests/webdav_comprehensive_tests.rs b/tests/webdav_comprehensive_tests.rs
index bc3ae67..4c9a2c2 100644
--- a/tests/webdav_comprehensive_tests.rs
+++ b/tests/webdav_comprehensive_tests.rs
@@ -4,8 +4,8 @@ use tokio::time::timeout;
 use uuid::Uuid;
 
 use readur::{
-    webdav_service::{WebDAVService, WebDAVConfig, RetryConfig},
-    webdav_scheduler::WebDAVScheduler,
+    services::webdav_service::{WebDAVService, WebDAVConfig, RetryConfig},
+    scheduling::webdav_scheduler::WebDAVScheduler,
     models::*,
     db::Database,
     config::Config,
diff --git a/tests/webdav_enhanced_unit_tests.rs b/tests/webdav_enhanced_unit_tests.rs
index 95f94df..5f67ad1 100644
--- a/tests/webdav_enhanced_unit_tests.rs
+++ b/tests/webdav_enhanced_unit_tests.rs
@@ -1,4 +1,4 @@
-use readur::webdav_service::{WebDAVService, WebDAVConfig, RetryConfig};
+use readur::services::webdav_service::{WebDAVService, WebDAVConfig, RetryConfig};
 use readur::models::FileInfo;
 use readur::models::*;
 use tokio;
diff --git a/tests/webdav_hash_duplicate_tests.rs b/tests/webdav_hash_duplicate_tests.rs
index 56c936d..e50e1e9 100644
--- a/tests/webdav_hash_duplicate_tests.rs
+++ b/tests/webdav_hash_duplicate_tests.rs
@@ -126,7 +126,7 @@ async fn create_test_app_state() -> Result<Arc<AppState>> {
     });
     let db = Database::new(&config.database_url).await?;
     let queue_service = std::sync::Arc::new(
-        readur::ocr_queue::OcrQueueService::new(db.clone(), db.get_pool().clone(), 1)
+        readur::ocr::queue::OcrQueueService::new(db.clone(), db.get_pool().clone(), 1)
     );
     
     Ok(Arc::new(AppState {
diff --git a/tests/webdav_integration_tests.rs b/tests/webdav_integration_tests.rs
index c2fb351..6d1f85d 100644
--- a/tests/webdav_integration_tests.rs
+++ b/tests/webdav_integration_tests.rs
@@ -104,7 +104,7 @@ async fn setup_test_app() -> (Router, Arc<AppState>) {
     let db_url = database_url;
 
     let db = Database::new(&db_url).await.expect("Failed to connect to test database");
-    let queue_service = Arc::new(readur::ocr_queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
+    let queue_service = Arc::new(readur::ocr::queue::OcrQueueService::new(db.clone(), db.pool.clone(), 2));
     let state = Arc::new(AppState { 
         db, 
         config,
diff --git a/tests/webdav_sync_tests.rs b/tests/webdav_sync_tests.rs
index ed343ab..67eb79b 100644
--- a/tests/webdav_sync_tests.rs
+++ b/tests/webdav_sync_tests.rs
@@ -17,7 +17,7 @@ use serde_json::json;
 
 use readur::{
     models::{WebDAVSourceConfig, SourceType, WebDAVFile, WebDAVCrawlEstimate, WebDAVFolderInfo},
-    webdav_service::{WebDAVService, WebDAVConfig},
+    services::webdav_service::{WebDAVService, WebDAVConfig},
 };
 
 /// Create a test WebDAV configuration
diff --git a/tests/webdav_unit_tests.rs b/tests/webdav_unit_tests.rs
index 8e9e5ef..633724e 100644
--- a/tests/webdav_unit_tests.rs
+++ b/tests/webdav_unit_tests.rs
@@ -1,4 +1,4 @@
-use readur::webdav_service::{WebDAVService, WebDAVConfig};
+use readur::services::webdav_service::{WebDAVService, WebDAVConfig};
 use readur::models::FileInfo;
 use readur::models::*;
 use tokio;