diff --git a/server/src/external/logtail/logtailUtils.ts b/server/src/external/logtail/logtailUtils.ts
index 2b58cc0f2..c5d45860a 100644
--- a/server/src/external/logtail/logtailUtils.ts
+++ b/server/src/external/logtail/logtailUtils.ts
@@ -1,8 +1,6 @@
-import dotenv from "dotenv";
+import "dotenv/config";
 
-dotenv.config();
-
-import { initLogger } from "@/errors/logger.js";
+import { initLogger } from "@server/errors/logger.js";
 
 const pinoLogger = initLogger();
 
diff --git a/server/src/internal/customers/CusService.ts b/server/src/internal/customers/CusService.ts
index d6b5fe48d..081865d28 100644
--- a/server/src/internal/customers/CusService.ts
+++ b/server/src/internal/customers/CusService.ts
@@ -10,10 +10,11 @@ import {
 	type FullCusProduct,
 	type FullCustomer,
 	type Organization,
+	RecaseError,
 } from "@autumn/shared";
 import { and, eq, ilike, or, sql, type Table } from "drizzle-orm";
 import type { DrizzleCli } from "@/db/initDrizzle.js";
-import RecaseError from "@/utils/errorUtils.js";
+
 import { withSpan } from "../analytics/tracer/spanUtils.js";
 import { RELEVANT_STATUSES } from "./cusProducts/CusProductService.js";
 import { getFullCusQuery } from "./getFullCusQuery.js";
diff --git a/server/src/internal/customers/cusProducts/CusProductService.ts b/server/src/internal/customers/cusProducts/CusProductService.ts
index 581891be0..72048e1bc 100644
--- a/server/src/internal/customers/cusProducts/CusProductService.ts
+++ b/server/src/internal/customers/cusProducts/CusProductService.ts
@@ -8,10 +8,10 @@ import {
 	type FullCusProduct,
 	InternalError,
 	products,
+	RecaseError,
 } from "@autumn/shared";
 import { and, arrayContains, eq, inArray, isNotNull, or } from "drizzle-orm";
 import type { DrizzleCli } from "@/db/initDrizzle.js";
-import RecaseError from "@/utils/errorUtils.js";
 
 export const ACTIVE_STATUSES = [
 	CusProductStatus.Active,
diff --git a/server/src/internal/customers/cusUtils/apiCusCacheUtils/deleteCachedApiCustomer.ts b/server/src/internal/customers/cusUtils/apiCusCacheUtils/deleteCachedApiCustomer.ts
index 33cd43413..d4ed3f56a 100644
--- a/server/src/internal/customers/cusUtils/apiCusCacheUtils/deleteCachedApiCustomer.ts
+++ b/server/src/internal/customers/cusUtils/apiCusCacheUtils/deleteCachedApiCustomer.ts
@@ -1,5 +1,5 @@
-import { redis } from "@/external/redis/initRedis.js";
 import { logger } from "../../../../external/logtail/logtailUtils.js";
+import { redis } from "../../../../external/redis/initRedis.js";
 
 /**
  * Delete all cached ApiCustomer data from Redis
diff --git a/server/tsconfig.json b/server/tsconfig.json
index 64c5c0a90..833b5afa3 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -19,6 +19,7 @@
     "forceConsistentCasingInFileNames": true,
     "paths": {
       "@/*": ["./src/*"],
+      "@server/*": ["./src/*"],
       "@shared/*": ["../shared/*"],
       "@emails/*": ["./emails/*"],
       "@scripts/*": ["./scripts/*"],
diff --git a/shared/api/customers/previousVersions/apiCustomerV2.ts b/shared/api/customers/previousVersions/apiCustomerV2.ts
index c9989f908..c1733fc8f 100644
--- a/shared/api/customers/previousVersions/apiCustomerV2.ts
+++ b/shared/api/customers/previousVersions/apiCustomerV2.ts
@@ -4,11 +4,11 @@ import { ApiTrialsUsedV0Schema } from "@api/customers/components/apiTrialsUsed/p
 import { ApiCusFeatureV2Schema } from "@api/customers/cusFeatures/previousVersions/apiCusFeatureV2.js";
 import { ApiCusProductV2Schema } from "@api/customers/cusPlans/previousVersions/apiCusProductV2.js";
 import { ApiBaseEntitySchema } from "@api/entities/apiBaseEntity.js";
-import { ApiCusRewardsSchema } from "@api/models.js";
 import { ApiInvoiceV0Schema } from "@api/others/apiInvoice/prevVersions/apiInvoiceV0.js";
 import { AppEnv } from "@models/genModels/genEnums.js";
 
 import { z } from "zod/v4";
+import { ApiCusRewardsSchema } from "../../others/apiDiscount.js";
 
 /**
  * ApiCustomerV2Schema - Customer response format for API V1.1+ (merged format)
diff --git a/shared/api/errors/classes/balancesErrClasses.ts b/shared/api/errors/classes/balancesErrClasses.ts
index 9c032580b..e768d9af1 100644
--- a/shared/api/errors/classes/balancesErrClasses.ts
+++ b/shared/api/errors/classes/balancesErrClasses.ts
@@ -1,4 +1,4 @@
-import { RecaseError } from "../../../index.js";
+import { RecaseError } from "../base/RecaseError.js";
 import { BalancesErrorCode } from "../codes/balancesErrCodes.js";
 
 export class InsufficientBalanceError extends RecaseError {