diff --git a/crates/migrations/src/m20240903_add_changes_for_user_to_collection_removal.rs b/crates/migrations/src/m20240903_add_changes_for_user_to_collection_removal.rs
index da95d0ed8f..8b539013f9 100644
--- a/crates/migrations/src/m20240903_add_changes_for_user_to_collection_removal.rs
+++ b/crates/migrations/src/m20240903_add_changes_for_user_to_collection_removal.rs
@@ -1,6 +1,6 @@
 use sea_orm_migration::prelude::*;
 
-use crate::m20231017_create_user_to_entity::CONSTRAINT_SQL;
+use super::m20231017_create_user_to_entity::CONSTRAINT_SQL;
 
 #[derive(DeriveMigrationName)]
 pub struct Migration;
diff --git a/crates/migrations/src/m20240926_add_columns_for_open_sourcing_pro_version.rs b/crates/migrations/src/m20240926_add_columns_for_open_sourcing_pro_version.rs
index 523dc81ef2..12bb9f29db 100644
--- a/crates/migrations/src/m20240926_add_columns_for_open_sourcing_pro_version.rs
+++ b/crates/migrations/src/m20240926_add_columns_for_open_sourcing_pro_version.rs
@@ -1,6 +1,6 @@
 use sea_orm_migration::prelude::*;
 
-use crate::{
+use super::{
     m20231016_create_collection_to_entity::{CONSTRAINT_SQL, ENTITY_ID_SQL, ENTITY_LOT_SQL},
     m20240904_create_monitored_entity::MONITORED_ENTITY_VIEW_CREATION_SQL,
 };
diff --git a/crates/migrations/src/m20241019_changes_for_issue_929.rs b/crates/migrations/src/m20241019_changes_for_issue_929.rs
index 0544bb07a1..e702e1c863 100644
--- a/crates/migrations/src/m20241019_changes_for_issue_929.rs
+++ b/crates/migrations/src/m20241019_changes_for_issue_929.rs
@@ -1,6 +1,6 @@
 use sea_orm_migration::prelude::*;
 
-use crate::m20240904_create_monitored_entity::MONITORED_ENTITY_VIEW_CREATION_SQL;
+use super::m20240904_create_monitored_entity::MONITORED_ENTITY_VIEW_CREATION_SQL;
 
 #[derive(DeriveMigrationName)]
 pub struct Migration;
diff --git a/crates/migrations/src/m20241126_changes_for_issue_1113.rs b/crates/migrations/src/m20241126_changes_for_issue_1113.rs
index 3a18b387a8..e8da7f4460 100644
--- a/crates/migrations/src/m20241126_changes_for_issue_1113.rs
+++ b/crates/migrations/src/m20241126_changes_for_issue_1113.rs
@@ -1,6 +1,6 @@
 use sea_orm_migration::prelude::*;
 
-use crate::{
+use super::{
     m20230822_create_exercise::EXERCISE_NAME_INDEX,
     m20240827_create_daily_user_activity::create_daily_user_activity_table,
 };
diff --git a/crates/models/database/src/functions.rs b/crates/models/database/src/functions.rs
index 4f4035887a..752512ac44 100644
--- a/crates/models/database/src/functions.rs
+++ b/crates/models/database/src/functions.rs
@@ -5,7 +5,7 @@ use sea_orm::{
     ActiveModelTrait, ActiveValue, ColumnTrait, ConnectionTrait, EntityTrait, QueryFilter,
 };
 
-use crate::{prelude::UserToEntity, user_to_entity};
+use super::{prelude::UserToEntity, user_to_entity};
 
 pub async fn get_user_to_entity_association<C>(
     db: &C,
diff --git a/crates/models/database/src/review.rs b/crates/models/database/src/review.rs
index 0964ba387e..4eb462039b 100644
--- a/crates/models/database/src/review.rs
+++ b/crates/models/database/src/review.rs
@@ -11,7 +11,7 @@ use rust_decimal::Decimal;
 use sea_orm::{entity::prelude::*, ActiveValue};
 use serde::{Deserialize, Serialize};
 
-use crate::functions::associate_user_with_entity;
+use super::functions::associate_user_with_entity;
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
 #[sea_orm(table_name = "review")]
diff --git a/crates/models/database/src/seen.rs b/crates/models/database/src/seen.rs
index bc3d893b70..088b61025d 100644
--- a/crates/models/database/src/seen.rs
+++ b/crates/models/database/src/seen.rs
@@ -15,7 +15,7 @@ use rust_decimal_macros::dec;
 use sea_orm::{entity::prelude::*, ActiveValue};
 use serde::{Deserialize, Serialize};
 
-use crate::functions::associate_user_with_entity;
+use super::functions::associate_user_with_entity;
 
 #[derive(Clone, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize, SimpleObject, Educe)]
 #[graphql(name = "Seen")]
diff --git a/crates/services/importer/src/audiobookshelf.rs b/crates/services/importer/src/audiobookshelf.rs
index e604c1411a..ce1b577638 100644
--- a/crates/services/importer/src/audiobookshelf.rs
+++ b/crates/services/importer/src/audiobookshelf.rs
@@ -20,9 +20,7 @@ use reqwest::{
 use serde_json::json;
 use specific_models::audiobookshelf as audiobookshelf_models;
 
-use crate::utils;
-
-use super::{ImportFailStep, ImportFailedItem};
+use super::{utils, ImportFailStep, ImportFailedItem};
 
 pub async fn import<F>(
     input: DeployUrlAndKeyImportInput,
diff --git a/crates/services/importer/src/goodreads.rs b/crates/services/importer/src/goodreads.rs
index f497399a35..d2304e4340 100644
--- a/crates/services/importer/src/goodreads.rs
+++ b/crates/services/importer/src/goodreads.rs
@@ -15,9 +15,7 @@ use rust_decimal::Decimal;
 use rust_decimal_macros::dec;
 use serde::Deserialize;
 
-use crate::utils;
-
-use super::{ImportFailStep, ImportFailedItem};
+use super::{utils, ImportFailStep, ImportFailedItem};
 
 #[derive(Debug, Deserialize)]
 struct Book {
diff --git a/crates/services/importer/src/hevy.rs b/crates/services/importer/src/hevy.rs
index 074ef0355e..91a2a7ac54 100644
--- a/crates/services/importer/src/hevy.rs
+++ b/crates/services/importer/src/hevy.rs
@@ -19,7 +19,7 @@ use rust_decimal_macros::dec;
 use serde::{Deserialize, Serialize};
 use supporting_service::SupportingService;
 
-use crate::utils;
+use super::utils;
 
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]
 struct Entry {
diff --git a/crates/services/importer/src/storygraph.rs b/crates/services/importer/src/storygraph.rs
index 0800b0dd21..457470937e 100644
--- a/crates/services/importer/src/storygraph.rs
+++ b/crates/services/importer/src/storygraph.rs
@@ -15,9 +15,7 @@ use rust_decimal::Decimal;
 use rust_decimal_macros::dec;
 use serde::{Deserialize, Serialize};
 
-use crate::utils;
-
-use super::{ImportFailStep, ImportFailedItem, ImportOrExportMetadataItem};
+use super::{utils, ImportFailStep, ImportFailedItem, ImportOrExportMetadataItem};
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(untagged)]