diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeSettingsTab.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeSettingsTab.tsx
index 55e1d4d86c..2360b75b2c 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeSettingsTab.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeSettingsTab.tsx
@@ -5,7 +5,7 @@ import type { AttributeClass } from "@prisma/client";
 import { useForm } from "react-hook-form";
 import { ArchiveBoxArrowDownIcon, ArchiveBoxXMarkIcon } from "@heroicons/react/24/solid";
 import { useRouter } from "next/navigation";
-import { updatetAttributeClass } from "@formbricks/lib/services/attributeClass";
+import { updatetAttributeClass } from "@formbricks/lib/attributeClass/service";
 import { useState } from "react";
 
 interface AttributeSettingsTabProps {
diff --git a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/page.tsx b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/page.tsx
index 6a37ff53bf..6eda4be838 100644
--- a/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/page.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/page.tsx
@@ -5,7 +5,7 @@ import AttributeClassDataRow from "@/app/(app)/environments/[environmentId]/(act
 import AttributeTableHeading from "@/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/AttributeTableHeading";
 import HowToAddAttributesButton from "@/app/(app)/environments/[environmentId]/(actionsAndAttributes)/attributes/HowToAddAttributesButton";
 import { REVALIDATION_INTERVAL } from "@formbricks/lib/constants";
-import { getAttributeClasses } from "@formbricks/lib/services/attributeClass";
+import { getAttributeClasses } from "@formbricks/lib/attributeClass/service";
 import { Metadata } from "next";
 
 export const metadata: Metadata = {
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/page.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/page.tsx
index fd18a81945..846e0ba128 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/page.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/page.tsx
@@ -6,7 +6,7 @@ import { getSurveyWithAnalytics } from "@formbricks/lib/survey/service";
 import { getProductByEnvironmentId } from "@formbricks/lib/services/product";
 import { getEnvironment } from "@formbricks/lib/services/environment";
 import { getActionClasses } from "@formbricks/lib/actionClass/service";
-import { getAttributeClasses } from "@formbricks/lib/services/attributeClass";
+import { getAttributeClasses } from "@formbricks/lib/attributeClass/service";
 import { ErrorComponent } from "@formbricks/ui";
 
 export default async function SurveysEditPage({ params }) {
diff --git a/apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts b/apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts
index 10cafc9191..6d959707cc 100644
--- a/apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts
+++ b/apps/web/app/api/v1/js/people/[personId]/set-attribute/route.ts
@@ -1,7 +1,7 @@
 import { getUpdatedState } from "@/app/api/v1/js/sync/lib/sync";
 import { responses } from "@/lib/api/response";
 import { transformErrorToDetails } from "@/lib/api/validator";
-import { createAttributeClass, getAttributeClassByNameCached } from "@formbricks/lib/services/attributeClass";
+import { createAttributeClass, getAttributeClassByNameCached } from "@formbricks/lib/attributeClass/service";
 import { getPersonCached, updatePersonAttribute } from "@formbricks/lib/services/person";
 import { ZJsPeopleAttributeInput } from "@formbricks/types/v1/js";
 import { NextResponse } from "next/server";
diff --git a/apps/web/app/api/v1/management/attribute-classes/[attributeClassId]/route.ts b/apps/web/app/api/v1/management/attribute-classes/[attributeClassId]/route.ts
index f46f0145f9..fe2363263d 100644
--- a/apps/web/app/api/v1/management/attribute-classes/[attributeClassId]/route.ts
+++ b/apps/web/app/api/v1/management/attribute-classes/[attributeClassId]/route.ts
@@ -5,7 +5,7 @@ import {
   deleteAttributeClass,
   getAttributeClass,
   updatetAttributeClass,
-} from "@formbricks/lib/services/attributeClass";
+} from "@formbricks/lib/attributeClass/service";
 import { TAttributeClass, ZAttributeClassUpdateInput } from "@formbricks/types/v1/attributeClasses";
 import { transformErrorToDetails } from "@/lib/api/validator";
 import { authenticateRequest } from "@/app/api/v1/auth";
diff --git a/apps/web/app/api/v1/management/attribute-classes/route.ts b/apps/web/app/api/v1/management/attribute-classes/route.ts
index ca0b33f2c6..48a5aeb8d1 100644
--- a/apps/web/app/api/v1/management/attribute-classes/route.ts
+++ b/apps/web/app/api/v1/management/attribute-classes/route.ts
@@ -4,7 +4,7 @@ import { authenticateRequest } from "@/app/api/v1/auth";
 import { NextResponse } from "next/server";
 import { transformErrorToDetails } from "@/lib/api/validator";
 import { TAttributeClass, ZAttributeClassInput } from "@formbricks/types/v1/attributeClasses";
-import { createAttributeClass, getAttributeClasses } from "@formbricks/lib/services/attributeClass";
+import { createAttributeClass, getAttributeClasses } from "@formbricks/lib/attributeClass/service";
 
 export async function GET(request: Request) {
   try {
diff --git a/packages/lib/services/attributeClass.ts b/packages/lib/attributeClass/service.ts
similarity index 100%
rename from packages/lib/services/attributeClass.ts
rename to packages/lib/attributeClass/service.ts
diff --git a/packages/lib/services/person.ts b/packages/lib/services/person.ts
index bc2ca3f203..21a89535b9 100644
--- a/packages/lib/services/person.ts
+++ b/packages/lib/services/person.ts
@@ -9,7 +9,7 @@ import { revalidateTag, unstable_cache } from "next/cache";
 import { cache } from "react";
 import { PEOPLE_PER_PAGE } from "../constants";
 import { validateInputs } from "../utils/validate";
-import { getAttributeClassByName } from "./attributeClass";
+import { getAttributeClassByName } from "../attributeClass/service";
 import { SERVICES_REVALIDATION_INTERVAL } from "../constants";
 
 export const selectPerson = {