diff --git a/apps/api/src/app/access/access-filter.dto.ts b/apps/api/src/app/access/access-filter.dto.ts
index 748763acb..22c2ce603 100644
--- a/apps/api/src/app/access/access-filter.dto.ts
+++ b/apps/api/src/app/access/access-filter.dto.ts
@@ -1,4 +1,4 @@
-import { AssetProfileIdentifierDto } from '@ghostfolio/common/dto';
+import { AssetProfileIdentifierDto } from '@ghostfolio/common/dtos';
 
 import { Type } from 'class-transformer';
 import { IsArray, IsOptional, IsString, ValidateNested } from 'class-validator';
diff --git a/libs/common/src/lib/dto/index.ts b/libs/common/src/lib/dto/index.ts
deleted file mode 100644
index 16465bcde..000000000
--- a/libs/common/src/lib/dto/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './asset-profile-identifier.dto';
diff --git a/libs/common/src/lib/dto/asset-profile-identifier.dto.ts b/libs/common/src/lib/dtos/asset-profile-identifier.dto.ts
similarity index 100%
rename from libs/common/src/lib/dto/asset-profile-identifier.dto.ts
rename to libs/common/src/lib/dtos/asset-profile-identifier.dto.ts
diff --git a/libs/common/src/lib/dtos/create-account-with-balances.dto.ts b/libs/common/src/lib/dtos/create-account-with-balances.dto.ts
index 53740f0f9..2d1d3ed2a 100644
--- a/libs/common/src/lib/dtos/create-account-with-balances.dto.ts
+++ b/libs/common/src/lib/dtos/create-account-with-balances.dto.ts
@@ -1,8 +1,9 @@
-import { CreateAccountDto } from '@ghostfolio/common/dtos';
 import { AccountBalance } from '@ghostfolio/common/interfaces';
 
 import { IsArray, IsOptional } from 'class-validator';
 
+import { CreateAccountDto } from './create-account.dto';
+
 export class CreateAccountWithBalancesDto extends CreateAccountDto {
   @IsArray()
   @IsOptional()
diff --git a/libs/common/src/lib/dtos/index.ts b/libs/common/src/lib/dtos/index.ts
index 3631d6eae..346a6434f 100644
--- a/libs/common/src/lib/dtos/index.ts
+++ b/libs/common/src/lib/dtos/index.ts
@@ -1,3 +1,4 @@
+import { AssetProfileIdentifierDto } from './asset-profile-identifier.dto';
 import { AuthDeviceDto } from './auth-device.dto';
 import { CreateAccessDto } from './create-access.dto';
 import { CreateAccountBalanceDto } from './create-account-balance.dto';
@@ -24,6 +25,7 @@ import { UpdateTagDto } from './update-tag.dto';
 import { UpdateUserSettingDto } from './update-user-setting.dto';
 
 export {
+  AssetProfileIdentifierDto,
   AuthDeviceDto,
   CreateAccessDto,
   CreateAccountBalanceDto,
diff --git a/libs/common/src/lib/dtos/update-bulk-market-data.dto.ts b/libs/common/src/lib/dtos/update-bulk-market-data.dto.ts
index f92112f24..da0da1272 100644
--- a/libs/common/src/lib/dtos/update-bulk-market-data.dto.ts
+++ b/libs/common/src/lib/dtos/update-bulk-market-data.dto.ts
@@ -1,8 +1,8 @@
-import { UpdateMarketDataDto } from '@ghostfolio/common/dtos';
-
 import { Type } from 'class-transformer';
 import { ArrayNotEmpty, IsArray } from 'class-validator';
 
+import { UpdateMarketDataDto } from './update-market-data.dto';
+
 export class UpdateBulkMarketDataDto {
   @ArrayNotEmpty()
   @IsArray()