diff --git a/app/api/job/handler/sync-analysis-groups.ts b/app/api/job/handler/sync-analysis-groups.ts
index d2d5115..c9bd2e0 100644
--- a/app/api/job/handler/sync-analysis-groups.ts
+++ b/app/api/job/handler/sync-analysis-groups.ts
@@ -2,7 +2,7 @@ import axios from 'axios';
 import { XMLParser } from 'fast-xml-parser';
 import fs from 'fs';
 import { createAnalysisGroup, getAnalysisGroups } from '~/lib/services/analysis-group.service';
-import { IMedipostPublicMessageDataParsed } from '~/lib/services/medipost.types';
+import { IMedipostPublicMessageDataParsed } from '~/lib/services/medipost/medipost.types';
 import { createAnalysis, createNoDataReceivedEntry, createNoNewDataReceivedEntry, createSyncFailEntry, createSyncSuccessEntry } from '~/lib/services/analyses.service';
 import { getLastCheckedDate } from '~/lib/services/sync-entries.service';
 import { createAnalysisElement } from '~/lib/services/analysis-element.service';
diff --git a/app/api/job/medipost-retry-dispatch/route.ts b/app/api/job/medipost-retry-dispatch/route.ts
index 7b1a55d..3ccf0f9 100644
--- a/app/api/job/medipost-retry-dispatch/route.ts
+++ b/app/api/job/medipost-retry-dispatch/route.ts
@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import loadEnv from "../handler/load-env";
 import validateApiKey from "../handler/validate-api-key";
-import { getOrderedAnalysisIds } from "~/lib/services/medipost.service";
+import { getOrderedAnalysisIds } from "~/lib/services/medusaOrder.service";
 import { sendOrderToMedipost } from "~/lib/services/medipost/medipostPrivateMessage.service";
 import { retrieveOrder } from "@lib/data/orders";
 import { getMedipostDispatchTries } from "~/lib/services/audit.service";
diff --git a/app/api/job/test-medipost-responses/route.ts b/app/api/job/test-medipost-responses/route.ts
index 7c2944d..619756f 100644
--- a/app/api/job/test-medipost-responses/route.ts
+++ b/app/api/job/test-medipost-responses/route.ts
@@ -1,9 +1,9 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getAnalysisOrdersAdmin } from "~/lib/services/order.service";
-import { composeOrderTestResponseXML, sendPrivateMessageTestResponse } from "~/lib/services/medipostTest.service";
+import { composeOrderTestResponseXML, sendPrivateMessageTestResponse } from "~/lib/services/medipost/medipostTest.service";
 import { retrieveOrder } from "@lib/data";
 import { getAccountAdmin } from "~/lib/services/account.service";
-import { getOrderedAnalysisIds } from "~/lib/services/medipost.service";
+import { getOrderedAnalysisIds } from "~/lib/services/medusaOrder.service";
 import loadEnv from "../handler/load-env";
 import validateApiKey from "../handler/validate-api-key";
 
diff --git a/app/api/order/medipost-test-response/route.ts b/app/api/order/medipost-test-response/route.ts
index fb7e8b0..5142972 100644
--- a/app/api/order/medipost-test-response/route.ts
+++ b/app/api/order/medipost-test-response/route.ts
@@ -1,10 +1,10 @@
 import { NextResponse } from "next/server";
 import { getAnalysisOrder } from "~/lib/services/order.service";
-import { composeOrderTestResponseXML, sendPrivateMessageTestResponse } from "~/lib/services/medipostTest.service";
+import { composeOrderTestResponseXML, sendPrivateMessageTestResponse } from "~/lib/services/medipost/medipostTest.service";
 import { retrieveOrder } from "@lib/data";
 import { getAccountAdmin } from "~/lib/services/account.service";
 import { createMedipostActionLog } from "~/lib/services/medipost/medipostMessageBase.service";
-import { getOrderedAnalysisIds } from "~/lib/services/medipost.service";
+import { getOrderedAnalysisIds } from "~/lib/services/medusaOrder.service";
 
 export async function POST(request: Request) {
   // const isDev = process.env.NODE_ENV === 'development';
diff --git a/app/home/(user)/(dashboard)/cart/montonio-callback/actions.ts b/app/home/(user)/(dashboard)/cart/montonio-callback/actions.ts
index 23d39de..5650f0c 100644
--- a/app/home/(user)/(dashboard)/cart/montonio-callback/actions.ts
+++ b/app/home/(user)/(dashboard)/cart/montonio-callback/actions.ts
@@ -9,7 +9,7 @@ import { placeOrder, retrieveCart } from "@lib/data/cart";
 import { createI18nServerInstance } from "~/lib/i18n/i18n.server";
 import { createAnalysisOrder, getAnalysisOrder } from '~/lib/services/order.service';
 import { sendOrderToMedipost } from '~/lib/services/medipost/medipostPrivateMessage.service';
-import { getOrderedAnalysisIds } from '~/lib/services/medipost.service';
+import { getOrderedAnalysisIds } from '~/lib/services/medusaOrder.service';
 import { createNotificationsApi } from '@kit/notifications/api';
 import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
 import type { AccountWithParams } from '@kit/accounts/api';
diff --git a/lib/services/analyses.service.ts b/lib/services/analyses.service.ts
index 790b201..7eabeac 100644
--- a/lib/services/analyses.service.ts
+++ b/lib/services/analyses.service.ts
@@ -1,6 +1,6 @@
 import type { Tables } from '@/packages/supabase/src/database.types';
 import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
-import type { IUuringElement } from "./medipost.types";
+import type { IUuringElement } from "./medipost/medipost.types";
 
 export type AnalysesWithGroupsAndElements = ({
   analysis_elements: Tables<{ schema: 'medreport' }, 'analysis_elements'> & {
diff --git a/lib/services/analysis-element.service.ts b/lib/services/analysis-element.service.ts
index 635320c..9049254 100644
--- a/lib/services/analysis-element.service.ts
+++ b/lib/services/analysis-element.service.ts
@@ -1,6 +1,6 @@
 import { Json, Tables } from '@kit/supabase/database';
 import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
-import type { IMaterialGroup, IUuringElement } from './medipost.types';
+import type { IMaterialGroup, IUuringElement } from './medipost/medipost.types';
 
 export type AnalysisElement = Tables<{ schema: 'medreport' }, 'analysis_elements'> & {
   analysis_groups: Tables<{ schema: 'medreport' }, 'analysis_groups'>;
diff --git a/lib/services/medipost.types.ts b/lib/services/medipost/medipost.types.ts
similarity index 100%
rename from lib/services/medipost.types.ts
rename to lib/services/medipost/medipost.types.ts
diff --git a/lib/services/medipost/medipostPrivateMessage.service.ts b/lib/services/medipost/medipostPrivateMessage.service.ts
index afb341b..ab4d406 100644
--- a/lib/services/medipost/medipostPrivateMessage.service.ts
+++ b/lib/services/medipost/medipostPrivateMessage.service.ts
@@ -18,7 +18,7 @@ import { createMedipostActionLog, getLatestMessage } from './medipostMessageBase
 import { validateMedipostResponse } from './medipostValidate.service';
 import { getAnalysisOrder, updateAnalysisOrderStatus } from '../order.service';
 import { parseXML } from '../util/xml.service';
-import { composeOrderXML, OrderedAnalysisElement } from '../medipostXML.service';
+import { composeOrderXML, OrderedAnalysisElement } from './medipostXML.service';
 import { getAccountAdmin } from '../account.service';
 import { logMedipostDispatch } from '../audit.service';
 import { MedipostValidationError } from './MedipostValidationError';
diff --git a/lib/services/medipostTest.service.ts b/lib/services/medipost/medipostTest.service.ts
similarity index 97%
rename from lib/services/medipostTest.service.ts
rename to lib/services/medipost/medipostTest.service.ts
index 18dd35a..a7ce270 100644
--- a/lib/services/medipostTest.service.ts
+++ b/lib/services/medipost/medipostTest.service.ts
@@ -16,9 +16,9 @@ import { uniqBy } from 'lodash';
 
 import { Tables } from '@kit/supabase/database';
 import { formatDate } from 'date-fns';
-import { getAnalyses } from './analyses.service';
-import { getAnalysisElementsAdmin } from './analysis-element.service';
-import { validateMedipostResponse } from './medipost/medipostValidate.service';
+import { getAnalyses } from '../analyses.service';
+import { getAnalysisElementsAdmin } from '../analysis-element.service';
+import { validateMedipostResponse } from './medipostValidate.service';
 
 const BASE_URL = process.env.MEDIPOST_URL!;
 const USER = process.env.MEDIPOST_USER!;
diff --git a/lib/services/medipostXML.service.ts b/lib/services/medipost/medipostXML.service.ts
similarity index 97%
rename from lib/services/medipostXML.service.ts
rename to lib/services/medipost/medipostXML.service.ts
index 77e00eb..335a011 100644
--- a/lib/services/medipostXML.service.ts
+++ b/lib/services/medipost/medipostXML.service.ts
@@ -18,8 +18,8 @@ import { toArray } from '@/lib/utils';
 import { uniqBy } from 'lodash';
 
 import { Tables } from '@kit/supabase/database';
-import { AnalysisElement } from './analysis-element.service';
-import { AnalysesWithGroupsAndElements } from './analyses.service';
+import { AnalysisElement } from '../analysis-element.service';
+import { AnalysesWithGroupsAndElements } from '../analyses.service';
 
 const USER = process.env.MEDIPOST_USER!;
 const RECIPIENT = process.env.MEDIPOST_RECIPIENT!;
diff --git a/lib/services/medipost.service.ts b/lib/services/medusaOrder.service.ts
similarity index 100%
rename from lib/services/medipost.service.ts
rename to lib/services/medusaOrder.service.ts