diff --git a/apps/api/v2/src/modules/auth/auth.module.ts b/apps/api/v2/src/modules/auth/auth.module.ts
index 24f11fff68..5288dc6bd5 100644
--- a/apps/api/v2/src/modules/auth/auth.module.ts
+++ b/apps/api/v2/src/modules/auth/auth.module.ts
@@ -2,8 +2,8 @@ import { ApiKeyModule } from "@/modules/api-key/api-key.module";
 import { NextAuthGuard } from "@/modules/auth/guard";
 import { NextAuthStrategy } from "@/modules/auth/strategy";
 import { ApiKeyAuthStrategy } from "@/modules/auth/strategy/api-key-auth/api-key-auth.strategy";
-import { MembershipModule } from "@/modules/repositories/membership/membership-repository.module";
-import { UserModule } from "@/modules/repositories/user/user-repository.module";
+import { MembershipModule } from "@/modules/membership/membership.module";
+import { UserModule } from "@/modules/user/user.module";
 import { Module } from "@nestjs/common";
 import { JwtModule } from "@nestjs/jwt";
 import { PassportModule } from "@nestjs/passport";
diff --git a/apps/api/v2/src/modules/auth/guard/organization-roles/organization-roles.guard.ts b/apps/api/v2/src/modules/auth/guard/organization-roles/organization-roles.guard.ts
index 32fcb7c249..15c9700a30 100644
--- a/apps/api/v2/src/modules/auth/guard/organization-roles/organization-roles.guard.ts
+++ b/apps/api/v2/src/modules/auth/guard/organization-roles/organization-roles.guard.ts
@@ -1,5 +1,5 @@
 import { Roles } from "@/modules/auth/decorator/roles/roles.decorator";
-import { MembershipRepository } from "@/modules/repositories/membership/membership-repository.service";
+import { MembershipRepository } from "@/modules/membership/membership-repository.service";
 import { Injectable, CanActivate, ExecutionContext } from "@nestjs/common";
 import { Reflector } from "@nestjs/core";
 
diff --git a/apps/api/v2/src/modules/auth/strategy/api-key-auth/api-key-auth.strategy.ts b/apps/api/v2/src/modules/auth/strategy/api-key-auth/api-key-auth.strategy.ts
index 931807c5b3..6568f157c0 100644
--- a/apps/api/v2/src/modules/auth/strategy/api-key-auth/api-key-auth.strategy.ts
+++ b/apps/api/v2/src/modules/auth/strategy/api-key-auth/api-key-auth.strategy.ts
@@ -1,5 +1,5 @@
 import { ApiKeyService } from "@/modules/api-key/api-key.service";
-import { UserRepository } from "@/modules/repositories/user/user-repository.service";
+import { UserRepository } from "@/modules/user/user-repository.service";
 import { Injectable, UnauthorizedException } from "@nestjs/common";
 import { PassportStrategy } from "@nestjs/passport";
 import type { Request } from "express";
diff --git a/apps/api/v2/src/modules/auth/strategy/next-auth/next-auth.strategy.ts b/apps/api/v2/src/modules/auth/strategy/next-auth/next-auth.strategy.ts
index d19b0bc99f..a8d4706d18 100644
--- a/apps/api/v2/src/modules/auth/strategy/next-auth/next-auth.strategy.ts
+++ b/apps/api/v2/src/modules/auth/strategy/next-auth/next-auth.strategy.ts
@@ -1,4 +1,4 @@
-import { UserRepository } from "@/modules/repositories/user/user-repository.service";
+import { UserRepository } from "@/modules/user/user-repository.service";
 import { Injectable, UnauthorizedException } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { PassportStrategy } from "@nestjs/passport";
diff --git a/apps/api/v2/src/modules/repositories/booking/booking-repository.service.ts b/apps/api/v2/src/modules/booking/booking-repository.service.ts
similarity index 100%
rename from apps/api/v2/src/modules/repositories/booking/booking-repository.service.ts
rename to apps/api/v2/src/modules/booking/booking-repository.service.ts
diff --git a/apps/api/v2/src/modules/booking/booking.controller.ts b/apps/api/v2/src/modules/booking/booking.controller.ts
index 824adcb492..81160ececf 100644
--- a/apps/api/v2/src/modules/booking/booking.controller.ts
+++ b/apps/api/v2/src/modules/booking/booking.controller.ts
@@ -1,8 +1,8 @@
 import { GetUser } from "@/modules/auth/decorator";
+import { BookingRepository } from "@/modules/booking/booking-repository.service";
 import { CreateBookingInput } from "@/modules/booking/input/create-booking";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
-import { BookingRepository } from "@/modules/repositories/booking/booking-repository.service";
 import {
   Body,
   Controller,
diff --git a/apps/api/v2/src/modules/booking/booking.module.ts b/apps/api/v2/src/modules/booking/booking.module.ts
index 34e21c2f49..b13e680bed 100644
--- a/apps/api/v2/src/modules/booking/booking.module.ts
+++ b/apps/api/v2/src/modules/booking/booking.module.ts
@@ -1,10 +1,11 @@
+import { BookingRepository } from "@/modules/booking/booking-repository.service";
 import { BookingController } from "@/modules/booking/booking.controller";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
-import { BookingRepositoryModule } from "@/modules/repositories/booking/booking-repository.module";
 import { Module } from "@nestjs/common";
 
 @Module({
-  imports: [PrismaModule, BookingRepositoryModule],
+  imports: [PrismaModule],
+  providers: [BookingRepository],
   controllers: [BookingController],
 })
 export class BookingModule {}
diff --git a/apps/api/v2/src/modules/repositories/membership/membership-repository.service.ts b/apps/api/v2/src/modules/membership/membership-repository.service.ts
similarity index 100%
rename from apps/api/v2/src/modules/repositories/membership/membership-repository.service.ts
rename to apps/api/v2/src/modules/membership/membership-repository.service.ts
diff --git a/apps/api/v2/src/modules/repositories/membership/membership-repository.module.ts b/apps/api/v2/src/modules/membership/membership.module.ts
similarity index 70%
rename from apps/api/v2/src/modules/repositories/membership/membership-repository.module.ts
rename to apps/api/v2/src/modules/membership/membership.module.ts
index a1c984e862..97403167e2 100644
--- a/apps/api/v2/src/modules/repositories/membership/membership-repository.module.ts
+++ b/apps/api/v2/src/modules/membership/membership.module.ts
@@ -1,5 +1,5 @@
+import { MembershipRepository } from "@/modules/membership/membership-repository.service";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
-import { MembershipRepository } from "@/modules/repositories/membership/membership-repository.service";
 import { Module } from "@nestjs/common";
 
 @Module({
diff --git a/apps/api/v2/src/modules/repositories/oauth/oauth-client-repository.service.ts b/apps/api/v2/src/modules/oauth/oauth-client-repository.service.ts
similarity index 100%
rename from apps/api/v2/src/modules/repositories/oauth/oauth-client-repository.service.ts
rename to apps/api/v2/src/modules/oauth/oauth-client-repository.service.ts
diff --git a/apps/api/v2/src/modules/oauth/oauth-client.controller.ts b/apps/api/v2/src/modules/oauth/oauth-client.controller.ts
index a4ad963d8c..24ce64f256 100644
--- a/apps/api/v2/src/modules/oauth/oauth-client.controller.ts
+++ b/apps/api/v2/src/modules/oauth/oauth-client.controller.ts
@@ -4,7 +4,7 @@ import { NextAuthGuard } from "@/modules/auth/guard";
 import { OrganizationRolesGuard } from "@/modules/auth/guard/organization-roles/organization-roles.guard";
 import { CreateOAuthClientInput } from "@/modules/oauth/input/create-oauth-client";
 import { UpdateOAuthClientInput } from "@/modules/oauth/input/update-oauth-client";
-import { OAuthClientRepository } from "@/modules/repositories/oauth/oauth-client-repository.service";
+import { OAuthClientRepository } from "@/modules/oauth/oauth-client-repository.service";
 import {
   Body,
   Controller,
diff --git a/apps/api/v2/src/modules/oauth/oauth-client.module.ts b/apps/api/v2/src/modules/oauth/oauth-client.module.ts
index 6bf95262ad..289f03b43c 100644
--- a/apps/api/v2/src/modules/oauth/oauth-client.module.ts
+++ b/apps/api/v2/src/modules/oauth/oauth-client.module.ts
@@ -1,13 +1,22 @@
+import { getEnv } from "@/env";
 import { AuthModule } from "@/modules/auth/auth.module";
+import { MembershipModule } from "@/modules/membership/membership.module";
+import { OAuthClientRepository } from "@/modules/oauth/oauth-client-repository.service";
 import { OAuthClientController } from "@/modules/oauth/oauth-client.controller";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
-import { MembershipModule } from "@/modules/repositories/membership/membership-repository.module";
-import { OAuthClientRepositoryModule } from "@/modules/repositories/oauth/oauth-client-repository.module";
-import { UserModule } from "@/modules/repositories/user/user-repository.module";
+import { UserModule } from "@/modules/user/user.module";
 import { Module } from "@nestjs/common";
+import { JwtModule } from "@nestjs/jwt";
 
 @Module({
-  imports: [PrismaModule, OAuthClientRepositoryModule, AuthModule, UserModule, MembershipModule],
+  imports: [
+    PrismaModule,
+    AuthModule,
+    UserModule,
+    MembershipModule,
+    JwtModule.register({ secret: getEnv("JWT_SECRET") }),
+  ],
+  providers: [OAuthClientRepository],
   controllers: [OAuthClientController],
 })
 export class OAuthClientModule {}
diff --git a/apps/api/v2/src/modules/repositories/booking/booking-repository.module.ts b/apps/api/v2/src/modules/repositories/booking/booking-repository.module.ts
deleted file mode 100644
index ddf7244db0..0000000000
--- a/apps/api/v2/src/modules/repositories/booking/booking-repository.module.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { PrismaModule } from "@/modules/prisma/prisma.module";
-import { BookingRepository } from "@/modules/repositories/booking/booking-repository.service";
-import { Module } from "@nestjs/common";
-
-@Module({
-  imports: [PrismaModule],
-  providers: [BookingRepository],
-  exports: [BookingRepository],
-})
-export class BookingRepositoryModule {}
diff --git a/apps/api/v2/src/modules/repositories/oauth/oauth-client-repository.module.ts b/apps/api/v2/src/modules/repositories/oauth/oauth-client-repository.module.ts
deleted file mode 100644
index 37f768ae40..0000000000
--- a/apps/api/v2/src/modules/repositories/oauth/oauth-client-repository.module.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { getEnv } from "@/env";
-import { PrismaModule } from "@/modules/prisma/prisma.module";
-import { OAuthClientRepository } from "@/modules/repositories/oauth/oauth-client-repository.service";
-import { Module } from "@nestjs/common";
-import { JwtModule } from "@nestjs/jwt";
-
-@Module({
-  imports: [PrismaModule, JwtModule.register({ secret: getEnv("JWT_SECRET") })],
-  providers: [OAuthClientRepository],
-  exports: [OAuthClientRepository],
-})
-export class OAuthClientRepositoryModule {}
diff --git a/apps/api/v2/src/modules/repositories/user/user-repository.service.ts b/apps/api/v2/src/modules/user/user-repository.service.ts
similarity index 100%
rename from apps/api/v2/src/modules/repositories/user/user-repository.service.ts
rename to apps/api/v2/src/modules/user/user-repository.service.ts
diff --git a/apps/api/v2/src/modules/repositories/user/user-repository.module.ts b/apps/api/v2/src/modules/user/user.module.ts
similarity index 72%
rename from apps/api/v2/src/modules/repositories/user/user-repository.module.ts
rename to apps/api/v2/src/modules/user/user.module.ts
index da709dfe59..500b2664d3 100644
--- a/apps/api/v2/src/modules/repositories/user/user-repository.module.ts
+++ b/apps/api/v2/src/modules/user/user.module.ts
@@ -1,5 +1,5 @@
 import { PrismaModule } from "@/modules/prisma/prisma.module";
-import { UserRepository } from "@/modules/repositories/user/user-repository.service";
+import { UserRepository } from "@/modules/user/user-repository.service";
 import { Module } from "@nestjs/common";
 
 @Module({
diff --git a/apps/api/v2/test/mocks/next-auth-mock.strategy.ts b/apps/api/v2/test/mocks/next-auth-mock.strategy.ts
index dce7786ce2..d023132909 100644
--- a/apps/api/v2/test/mocks/next-auth-mock.strategy.ts
+++ b/apps/api/v2/test/mocks/next-auth-mock.strategy.ts
@@ -1,4 +1,4 @@
-import { UserRepository } from "@/modules/repositories/user/user-repository.service";
+import { UserRepository } from "@/modules/user/user-repository.service";
 import { Injectable } from "@nestjs/common";
 import { PassportStrategy } from "@nestjs/passport";
 
diff --git a/apps/api/v2/test/oauth.e2e-spec.ts b/apps/api/v2/test/oauth.e2e-spec.ts
index caf55cc3d9..b20a8f320d 100644
--- a/apps/api/v2/test/oauth.e2e-spec.ts
+++ b/apps/api/v2/test/oauth.e2e-spec.ts
@@ -7,7 +7,7 @@ import { CreateOAuthClientInput } from "@/modules/oauth/input/create-oauth-clien
 import { UpdateOAuthClientInput } from "@/modules/oauth/input/update-oauth-client";
 import { OAuthClientModule } from "@/modules/oauth/oauth-client.module";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
-import { UserModule } from "@/modules/repositories/user/user-repository.module";
+import { UserModule } from "@/modules/user/user.module";
 import { INestApplication } from "@nestjs/common";
 import { NestExpressApplication } from "@nestjs/platform-express";
 import { Test } from "@nestjs/testing";
diff --git a/apps/api/v2/test/utils/withNextAuth.ts b/apps/api/v2/test/utils/withNextAuth.ts
index c0be0874e3..9dc64a1539 100644
--- a/apps/api/v2/test/utils/withNextAuth.ts
+++ b/apps/api/v2/test/utils/withNextAuth.ts
@@ -1,5 +1,5 @@
 import { NextAuthStrategy } from "@/modules/auth/strategy";
-import { UserRepository } from "@/modules/repositories/user/user-repository.service";
+import { UserRepository } from "@/modules/user/user-repository.service";
 import { TestingModuleBuilder } from "@nestjs/testing";
 
 import { NextAuthMockStrategy } from "../mocks/next-auth-mock.strategy";