diff --git a/libs/askar/src/askar-nats/askar.nats.module.ts b/libs/askar/src/askar-nats/askar.nats.module.ts
index 35bc4aa73f1e25fb884acb2f115f75974079b3a5..49b7913835848bd4d80667b95538b8e919d9d2c5 100644
--- a/libs/askar/src/askar-nats/askar.nats.module.ts
+++ b/libs/askar/src/askar-nats/askar.nats.module.ts
@@ -3,14 +3,14 @@ import { ConfigModule } from "@nestjs/config";
 import { LedgersModule } from "@ocm-engine/ledgers";
 import { APP_PIPE } from "@nestjs/core";
 import { AgentConsumerService } from "./agent.consumer.service";
-import { AgentAnoncredsService } from "../askar/agent.anoncreds.service";
-import { AgentBasicMessagesService } from "../askar/agent.basicMessages.service";
-import { AgentConnectionsService } from "../askar/agent.connections.service";
-import { AgentCredentialsService } from "../askar/agent.credentials.service";
-import { AgentDidsService } from "../askar/agent.dids.service";
-import { AgentJsonldService } from "../askar/agent.jsonld.service";
-import { AgentOobService } from "../askar/agent.oob.service";
-import { AgentProofsService } from "../askar/agent.proofs.service";
+import { AgentAnoncredsService } from "../askar/services/agent.anoncreds.service";
+import { AgentBasicMessagesService } from "../askar/services/agent.basicMessages.service";
+import { AgentConnectionsService } from "../askar/services/agent.connections.service";
+import { AgentCredentialsService } from "../askar/services/agent.credentials.service";
+import { AgentDidsService } from "../askar/services/agent.dids.service";
+import { AgentJsonldService } from "../askar/services/agent.jsonld.service";
+import { AgentOobService } from "../askar/services/agent.oob.service";
+import { AgentProofsService } from "../askar/services/agent.proofs.service";
 import { ConsumerService } from "@ocm-engine/nats";
 import { GatewayClient } from "@ocm-engine/clients";
 import { EventHandlerService } from "./event.handler.service";
diff --git a/libs/askar/src/askar-nats/event.handler.service.ts b/libs/askar/src/askar-nats/event.handler.service.ts
index 88e1c77125e674ad9d330793e62f55b26b92e68a..aaff61b75ef8ba7a1cc761fe0603999a34420628 100644
--- a/libs/askar/src/askar-nats/event.handler.service.ts
+++ b/libs/askar/src/askar-nats/event.handler.service.ts
@@ -1,12 +1,12 @@
 import { Injectable, Logger } from "@nestjs/common";
-import { AgentAnoncredsService } from "../askar/agent.anoncreds.service";
-import { AgentBasicMessagesService } from "../askar/agent.basicMessages.service";
-import { AgentConnectionsService } from "../askar/agent.connections.service";
-import { AgentCredentialsService } from "../askar/agent.credentials.service";
-import { AgentDidsService } from "../askar/agent.dids.service";
-import { AgentJsonldService } from "../askar/agent.jsonld.service";
-import { AgentOobService } from "../askar/agent.oob.service";
-import { AgentProofsService } from "../askar/agent.proofs.service";
+import { AgentAnoncredsService } from "../askar/services/agent.anoncreds.service";
+import { AgentBasicMessagesService } from "../askar/services/agent.basicMessages.service";
+import { AgentConnectionsService } from "../askar/services/agent.connections.service";
+import { AgentCredentialsService } from "../askar/services/agent.credentials.service";
+import { AgentDidsService } from "../askar/services/agent.dids.service";
+import { AgentJsonldService } from "../askar/services/agent.jsonld.service";
+import { AgentOobService } from "../askar/services/agent.oob.service";
+import { AgentProofsService } from "../askar/services/agent.proofs.service";
 import {
   AcceptProofDto,
   CloudEventDto,
diff --git a/libs/askar/src/askar-rest/askar.rest.module.ts b/libs/askar/src/askar-rest/askar.rest.module.ts
index 853cc04e0e4b64edcd422544052bb782ae381873..b68904ff287db8d43ccced196bb0ddf3df40e50d 100644
--- a/libs/askar/src/askar-rest/askar.rest.module.ts
+++ b/libs/askar/src/askar-rest/askar.rest.module.ts
@@ -1,12 +1,12 @@
 import { Module, ValidationPipe } from "@nestjs/common";
-import { AgentAnoncredsService } from "../askar/agent.anoncreds.service";
-import { AgentBasicMessagesService } from "../askar/agent.basicMessages.service";
-import { AgentConnectionsService } from "../askar/agent.connections.service";
-import { AgentCredentialsService } from "../askar/agent.credentials.service";
-import { AgentDidsService } from "../askar/agent.dids.service";
-import { AgentJsonldService } from "../askar/agent.jsonld.service";
-import { AgentOobService } from "../askar/agent.oob.service";
-import { AgentProofsService } from "../askar/agent.proofs.service";
+import { AgentAnoncredsService } from "../askar/services/agent.anoncreds.service";
+import { AgentBasicMessagesService } from "../askar/services/agent.basicMessages.service";
+import { AgentConnectionsService } from "../askar/services/agent.connections.service";
+import { AgentCredentialsService } from "../askar/services/agent.credentials.service";
+import { AgentDidsService } from "../askar/services/agent.dids.service";
+import { AgentJsonldService } from "../askar/services/agent.jsonld.service";
+import { AgentOobService } from "../askar/services/agent.oob.service";
+import { AgentProofsService } from "../askar/services/agent.proofs.service";
 import { ConfigModule } from "@nestjs/config";
 import { LedgersModule } from "@ocm-engine/ledgers";
 import { APP_PIPE } from "@nestjs/core";
diff --git a/libs/askar/src/askar-rest/rest.controller.ts b/libs/askar/src/askar-rest/rest.controller.ts
index 5fc0b0e6877f0c42428642f9491f12125a0ca94f..c2d8a349c05b68c332b62fe7af8cbe629fe795eb 100644
--- a/libs/askar/src/askar-rest/rest.controller.ts
+++ b/libs/askar/src/askar-rest/rest.controller.ts
@@ -9,14 +9,14 @@ import {
   UseFilters,
   UseGuards,
 } from "@nestjs/common";
-import { AgentAnoncredsService } from "../askar/agent.anoncreds.service";
-import { AgentBasicMessagesService } from "../askar/agent.basicMessages.service";
-import { AgentConnectionsService } from "../askar/agent.connections.service";
-import { AgentCredentialsService } from "../askar/agent.credentials.service";
-import { AgentDidsService } from "../askar/agent.dids.service";
-import { AgentJsonldService } from "../askar/agent.jsonld.service";
-import { AgentOobService } from "../askar/agent.oob.service";
-import { AgentProofsService } from "../askar/agent.proofs.service";
+import { AgentAnoncredsService } from "../askar/services/agent.anoncreds.service";
+import { AgentBasicMessagesService } from "../askar/services/agent.basicMessages.service";
+import { AgentConnectionsService } from "../askar/services/agent.connections.service";
+import { AgentCredentialsService } from "../askar/services/agent.credentials.service";
+import { AgentDidsService } from "../askar/services/agent.dids.service";
+import { AgentJsonldService } from "../askar/services/agent.jsonld.service";
+import { AgentOobService } from "../askar/services/agent.oob.service";
+import { AgentProofsService } from "../askar/services/agent.proofs.service";
 import {
   CreateCredentialDefinitionRequestDto,
   OfferCredentialRequestDto,
diff --git a/libs/askar/src/askar/askar.module.ts b/libs/askar/src/askar/askar.module.ts
index 6edfac6da968268420a08954cfc5b3ea7abc5c9a..44dc10a3af3f5c9e330c39637fa28e7f4c5a2b9d 100644
--- a/libs/askar/src/askar/askar.module.ts
+++ b/libs/askar/src/askar/askar.module.ts
@@ -1,16 +1,16 @@
 import { Module, Global } from "@nestjs/common";
-import { AskarService } from "./askar.service";
-import { AgentAnoncredsService } from "./agent.anoncreds.service";
-import { AgentBasicMessagesService } from "./agent.basicMessages.service";
-import { AgentConnectionsService } from "./agent.connections.service";
-import { AgentCredentialsService } from "./agent.credentials.service";
-import { AgentDidsService } from "./agent.dids.service";
-import { AgentJsonldService } from "./agent.jsonld.service";
-import { AgentOobService } from "./agent.oob.service";
-import { AgentProofsService } from "./agent.proofs.service";
+import { AskarService } from "./services/askar.service";
+import { AgentAnoncredsService } from "./services/agent.anoncreds.service";
+import { AgentBasicMessagesService } from "./services/agent.basicMessages.service";
+import { AgentConnectionsService } from "./services/agent.connections.service";
+import { AgentCredentialsService } from "./services/agent.credentials.service";
+import { AgentDidsService } from "./services/agent.dids.service";
+import { AgentJsonldService } from "./services/agent.jsonld.service";
+import { AgentOobService } from "./services/agent.oob.service";
+import { AgentProofsService } from "./services/agent.proofs.service";
 import { ConfigModule } from "@nestjs/config";
 import { LedgersModule } from "@ocm-engine/ledgers";
-import { AgentEventListenerService } from "./agent-event-listener.service";
+import { AgentEventListenerService } from "./services/agent-event-listener.service";
 import { GatewayClient } from "@ocm-engine/clients";
 
 @Global()
diff --git a/libs/askar/src/askar/agent-event-listener.service.ts b/libs/askar/src/askar/services/agent-event-listener.service.ts
similarity index 99%
rename from libs/askar/src/askar/agent-event-listener.service.ts
rename to libs/askar/src/askar/services/agent-event-listener.service.ts
index 64977822ee80e6ab0382ca46ef06a845db5e72de..d1dde4d69b17da2853996b292f759a7bee8bd43d 100644
--- a/libs/askar/src/askar/agent-event-listener.service.ts
+++ b/libs/askar/src/askar/services/agent-event-listener.service.ts
@@ -19,7 +19,7 @@ import {
   svdxConnectionStateChangeHandler,
   svdxProofStateChangeHandler,
   webHookHandler,
-} from "../agent.utils";
+} from "../../agent.utils";
 
 @Injectable()
 export class AgentEventListenerService implements OnModuleInit {
diff --git a/libs/askar/src/askar/agent.anoncreds.service.ts b/libs/askar/src/askar/services/agent.anoncreds.service.ts
similarity index 100%
rename from libs/askar/src/askar/agent.anoncreds.service.ts
rename to libs/askar/src/askar/services/agent.anoncreds.service.ts
diff --git a/libs/askar/src/askar/agent.basicMessages.service.ts b/libs/askar/src/askar/services/agent.basicMessages.service.ts
similarity index 100%
rename from libs/askar/src/askar/agent.basicMessages.service.ts
rename to libs/askar/src/askar/services/agent.basicMessages.service.ts
diff --git a/libs/askar/src/askar/agent.connections.service.ts b/libs/askar/src/askar/services/agent.connections.service.ts
similarity index 100%
rename from libs/askar/src/askar/agent.connections.service.ts
rename to libs/askar/src/askar/services/agent.connections.service.ts
diff --git a/libs/askar/src/askar/agent.credentials.service.ts b/libs/askar/src/askar/services/agent.credentials.service.ts
similarity index 99%
rename from libs/askar/src/askar/agent.credentials.service.ts
rename to libs/askar/src/askar/services/agent.credentials.service.ts
index fa8904a7e27ecc699dcf38174f547dced275e408..8cfbbbadbea8f75e120584a3309d0ef0417a52d5 100644
--- a/libs/askar/src/askar/agent.credentials.service.ts
+++ b/libs/askar/src/askar/services/agent.credentials.service.ts
@@ -15,7 +15,7 @@ import {
   CredentialState,
   Query,
 } from "@credo-ts/core";
-import { waitForCredentialExchangeRecordSubject } from "../agent.utils";
+import { waitForCredentialExchangeRecordSubject } from "../../agent.utils";
 
 @Injectable()
 export class AgentCredentialsService {
diff --git a/libs/askar/src/askar/agent.dids.service.ts b/libs/askar/src/askar/services/agent.dids.service.ts
similarity index 100%
rename from libs/askar/src/askar/agent.dids.service.ts
rename to libs/askar/src/askar/services/agent.dids.service.ts
diff --git a/libs/askar/src/askar/agent.jsonld.service.ts b/libs/askar/src/askar/services/agent.jsonld.service.ts
similarity index 99%
rename from libs/askar/src/askar/agent.jsonld.service.ts
rename to libs/askar/src/askar/services/agent.jsonld.service.ts
index d69751aa0ce6b590caceef83106ecd20089dc2d8..c0f8029e9f4a5e8d87dcdd3a0e1370e48b20a80a 100644
--- a/libs/askar/src/askar/agent.jsonld.service.ts
+++ b/libs/askar/src/askar/services/agent.jsonld.service.ts
@@ -19,7 +19,7 @@ import {
   W3cJsonLdVerifiableCredential,
 } from "@credo-ts/core";
 import { uuid } from "@credo-ts/core/build/utils/uuid";
-import { getFirstDidWebRecord } from "../agent.utils";
+import { getFirstDidWebRecord } from "../../agent.utils";
 
 @Injectable()
 export class AgentJsonldService {
diff --git a/libs/askar/src/askar/agent.oob.service.ts b/libs/askar/src/askar/services/agent.oob.service.ts
similarity index 100%
rename from libs/askar/src/askar/agent.oob.service.ts
rename to libs/askar/src/askar/services/agent.oob.service.ts
diff --git a/libs/askar/src/askar/agent.proofs.service.ts b/libs/askar/src/askar/services/agent.proofs.service.ts
similarity index 99%
rename from libs/askar/src/askar/agent.proofs.service.ts
rename to libs/askar/src/askar/services/agent.proofs.service.ts
index 11d3ed6c51166f0b75c81af63c012c03ea18f887..fa4c5f3c672d7bdfe5844f9f7623b455ced34573 100644
--- a/libs/askar/src/askar/agent.proofs.service.ts
+++ b/libs/askar/src/askar/services/agent.proofs.service.ts
@@ -12,7 +12,7 @@ import {
 import { ProofState, Query, ProofExchangeRecord } from "@credo-ts/core";
 import { AnonCredsRequestedAttribute } from "@credo-ts/anoncreds";
 import { uuid } from "@credo-ts/core/build/utils/uuid";
-import { waitForProofExchangeRecordSubject } from "../agent.utils";
+import { waitForProofExchangeRecordSubject } from "../../agent.utils";
 
 @Injectable()
 export class AgentProofsService {
diff --git a/libs/askar/src/askar/askar.service.ts b/libs/askar/src/askar/services/askar.service.ts
similarity index 99%
rename from libs/askar/src/askar/askar.service.ts
rename to libs/askar/src/askar/services/askar.service.ts
index facf24316a14d64954e789697e2ae26d6ec26dea..84819cf912afdf37b47f6e1cee576e3ac97d2923 100644
--- a/libs/askar/src/askar/askar.service.ts
+++ b/libs/askar/src/askar/services/askar.service.ts
@@ -29,7 +29,7 @@ import {
   setupEventBehaviorSubjects,
   setupSubjectTransports,
   generateDidWeb,
-} from "../agent.utils";
+} from "../../agent.utils";
 import { IConfAgent } from "@ocm-engine/config";
 import { BehaviorSubject } from "rxjs";
 import express from "express";
diff --git a/libs/askar/src/index.ts b/libs/askar/src/index.ts
index 6aecc57083a2f46d7e8e40b0bd578c1ad7ef46b5..c9a560b5d869bf040a97e7a452cdc39e11e675fa 100644
--- a/libs/askar/src/index.ts
+++ b/libs/askar/src/index.ts
@@ -1,12 +1,12 @@
 export * from "./askar/askar.module";
-export * from "./askar/agent.anoncreds.service";
-export * from "./askar/agent.basicMessages.service";
-export * from "./askar/agent.connections.service";
-export * from "./askar/agent.credentials.service";
-export * from "./askar/agent.dids.service";
-export * from "./askar/agent.jsonld.service";
-export * from "./askar/agent.oob.service";
-export * from "./askar/agent.proofs.service";
-export * from "./askar/askar.service";
+export * from "./askar/services/agent.anoncreds.service";
+export * from "./askar/services/agent.basicMessages.service";
+export * from "./askar/services/agent.connections.service";
+export * from "./askar/services/agent.credentials.service";
+export * from "./askar/services/agent.dids.service";
+export * from "./askar/services/agent.jsonld.service";
+export * from "./askar/services/agent.oob.service";
+export * from "./askar/services/agent.proofs.service";
+export * from "./askar/services/askar.service";
 export * from "./askar.dynamic.module";
 export * from "./askar-rest/askar.rest.module";