diff --git a/packages/integration-test/src/lib/issues/profiles/account.profile.ts b/packages/integration-test/src/lib/issues/profiles/account.profile.ts
index 233cc8dd1..bb6461d1d 100644
--- a/packages/integration-test/src/lib/issues/profiles/account.profile.ts
+++ b/packages/integration-test/src/lib/issues/profiles/account.profile.ts
@@ -1,6 +1,6 @@
-import { MappingProfile } from '@automapper/types';
+import { MappingProfile } from '@automapper/core';
import { AccountDTO, AccountEntity } from '../models/account';
-export const accountProfile: MappingProfile = mapper => {
+export const accountProfile: MappingProfile = (mapper) => {
mapper.createMap(AccountEntity, AccountDTO);
-}
+};
diff --git a/packages/integration-test/src/lib/setup.spec.ts b/packages/integration-test/src/lib/setup.spec.ts
index ca62713f2..4774a780c 100644
--- a/packages/integration-test/src/lib/setup.spec.ts
+++ b/packages/integration-test/src/lib/setup.spec.ts
@@ -1,7 +1,7 @@
import { classes } from '@automapper/classes';
+import type { CreateMapperOptions, Mapper } from '@automapper/core';
import { createMapper } from '@automapper/core';
import { pojos } from '@automapper/pojos';
-import type { CreateMapperOptions, Mapper } from '@automapper/types';
export function setup(
name: string,
diff --git a/packages/integration-test/src/lib/with-classes/creation.spec.ts b/packages/integration-test/src/lib/with-classes/creation.spec.ts
index 66597d00f..601a16f51 100644
--- a/packages/integration-test/src/lib/with-classes/creation.spec.ts
+++ b/packages/integration-test/src/lib/with-classes/creation.spec.ts
@@ -1,4 +1,4 @@
-import { MappingProfile } from '@automapper/types';
+import { MappingProfile } from '@automapper/core';
import { setupClasses } from '../setup.spec';
import {
SimpleBar,
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/converters/date-to-string.converter.ts b/packages/integration-test/src/lib/with-classes/fixtures/converters/date-to-string.converter.ts
index 7dbacb430..0ad240c6e 100644
--- a/packages/integration-test/src/lib/with-classes/fixtures/converters/date-to-string.converter.ts
+++ b/packages/integration-test/src/lib/with-classes/fixtures/converters/date-to-string.converter.ts
@@ -1,4 +1,4 @@
-import type { Converter } from '@automapper/types';
+import type { Converter } from '@automapper/core';
export const dateToStringConverter: Converter = {
convert(source: Date): string {
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/profiles/address.profile.ts b/packages/integration-test/src/lib/with-classes/fixtures/profiles/address.profile.ts
index f4a4c24e9..2a4fbf7e0 100644
--- a/packages/integration-test/src/lib/with-classes/fixtures/profiles/address.profile.ts
+++ b/packages/integration-test/src/lib/with-classes/fixtures/profiles/address.profile.ts
@@ -1,5 +1,5 @@
+import type { MappingProfile } from '@automapper/core';
import { mapFrom } from '@automapper/core';
-import type { MappingProfile } from '@automapper/types';
import { Address, AddressVm } from '../models/address';
import { PascalAddress, PascalAddressVm } from '../models/address-pascal';
import { SnakeAddress, SnakeAddressVm } from '../models/address-snake';
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/profiles/avatar.profile.ts b/packages/integration-test/src/lib/with-classes/fixtures/profiles/avatar.profile.ts
index 87bbc971b..61c9463e5 100644
--- a/packages/integration-test/src/lib/with-classes/fixtures/profiles/avatar.profile.ts
+++ b/packages/integration-test/src/lib/with-classes/fixtures/profiles/avatar.profile.ts
@@ -1,3 +1,4 @@
+import type { MappingProfile } from '@automapper/core';
import {
condition,
ignore,
@@ -5,7 +6,6 @@ import {
nullSubstitution,
preCondition,
} from '@automapper/core';
-import type { MappingProfile } from '@automapper/types';
import { Avatar, AvatarVm } from '../models/avatar';
import { PascalAvatar, PascalAvatarVm } from '../models/avatar-pascal';
import { SnakeAvatar, SnakeAvatarVm } from '../models/avatar-snake';
@@ -28,9 +28,7 @@ export const avatarProfile: MappingProfile = (mapper) => {
.forMember((d) => d.willBeIgnored, ignore())
.forMember((d) => d.shouldBeSubstituted, nullSubstitution('sub'));
- mapper
- .createMap(AvatarVm, Avatar)
- .forMember((d) => d.shouldIgnore, ignore());
+ mapper.createMap(AvatarVm, Avatar).forMember((d) => d.shouldIgnore, ignore());
mapper
.createMap(Avatar, PascalAvatarVm)
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/profiles/custom-key.profile.ts b/packages/integration-test/src/lib/with-classes/fixtures/profiles/custom-key.profile.ts
index 47fbedd78..cc25dc53f 100644
--- a/packages/integration-test/src/lib/with-classes/fixtures/profiles/custom-key.profile.ts
+++ b/packages/integration-test/src/lib/with-classes/fixtures/profiles/custom-key.profile.ts
@@ -1,4 +1,4 @@
-import type { MappingProfile } from '@automapper/types';
+import type { MappingProfile } from '@automapper/core';
import {
CustomKeyBar,
CustomKeyBarVm,
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/profiles/deep-nest-override.profile.ts b/packages/integration-test/src/lib/with-classes/fixtures/profiles/deep-nest-override.profile.ts
index 4237648b5..61e8489a0 100644
--- a/packages/integration-test/src/lib/with-classes/fixtures/profiles/deep-nest-override.profile.ts
+++ b/packages/integration-test/src/lib/with-classes/fixtures/profiles/deep-nest-override.profile.ts
@@ -1,5 +1,5 @@
+import type { MappingProfile } from '@automapper/core';
import { fromValue } from '@automapper/core';
-import type { MappingProfile } from '@automapper/types';
import {
Foo,
FooBar,
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/profiles/doctor.profile.ts b/packages/integration-test/src/lib/with-classes/fixtures/profiles/doctor.profile.ts
index ffc802b7a..806ad2791 100644
--- a/packages/integration-test/src/lib/with-classes/fixtures/profiles/doctor.profile.ts
+++ b/packages/integration-test/src/lib/with-classes/fixtures/profiles/doctor.profile.ts
@@ -1,4 +1,4 @@
-import type { MappingProfile } from '@automapper/types';
+import type { MappingProfile } from '@automapper/core';
import { Doctor, DoctorDto } from '../models/doctor';
export const doctorProfile: MappingProfile = (mapper) => {
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/profiles/rocket.profile.ts b/packages/integration-test/src/lib/with-classes/fixtures/profiles/rocket.profile.ts
index 91dce162d..cfc3b45df 100644
--- a/packages/integration-test/src/lib/with-classes/fixtures/profiles/rocket.profile.ts
+++ b/packages/integration-test/src/lib/with-classes/fixtures/profiles/rocket.profile.ts
@@ -1,5 +1,5 @@
+import type { MappingProfile } from '@automapper/core';
import { mapFrom } from '@automapper/core';
-import type { MappingProfile } from '@automapper/types';
import {
CompositeFairing,
Engines,
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/profiles/simple-inheritance-foo.profile.ts b/packages/integration-test/src/lib/with-classes/fixtures/profiles/simple-inheritance-foo.profile.ts
index e060e0374..6d0330550 100644
--- a/packages/integration-test/src/lib/with-classes/fixtures/profiles/simple-inheritance-foo.profile.ts
+++ b/packages/integration-test/src/lib/with-classes/fixtures/profiles/simple-inheritance-foo.profile.ts
@@ -1,5 +1,4 @@
-import { mapFrom } from '@automapper/core';
-import { MappingProfile } from '@automapper/types';
+import { mapFrom, MappingProfile } from '@automapper/core';
import {
EmptyFoo,
EmptyFooVm,
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/profiles/simple-user.profile.ts b/packages/integration-test/src/lib/with-classes/fixtures/profiles/simple-user.profile.ts
index 32e27d578..193d97ee7 100644
--- a/packages/integration-test/src/lib/with-classes/fixtures/profiles/simple-user.profile.ts
+++ b/packages/integration-test/src/lib/with-classes/fixtures/profiles/simple-user.profile.ts
@@ -1,5 +1,5 @@
+import type { MapAction, Mapper, MappingProfile } from '@automapper/core';
import { mapFrom } from '@automapper/core';
-import type { MapAction, Mapper, MappingProfile } from '@automapper/types';
import { SimpleUser, SimpleUserVm } from '../models/simple-user';
export const selfUserProfile: MappingProfile = (mapper) => {
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/profiles/type-converter.profile.ts b/packages/integration-test/src/lib/with-classes/fixtures/profiles/type-converter.profile.ts
index 532983120..05b6ff361 100644
--- a/packages/integration-test/src/lib/with-classes/fixtures/profiles/type-converter.profile.ts
+++ b/packages/integration-test/src/lib/with-classes/fixtures/profiles/type-converter.profile.ts
@@ -1,4 +1,4 @@
-import type { MappingProfile } from '@automapper/types';
+import type { MappingProfile } from '@automapper/core';
import {
TypeConverterCamelSource,
TypeConverterDestination,
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/profiles/user-profile.profile.ts b/packages/integration-test/src/lib/with-classes/fixtures/profiles/user-profile.profile.ts
index 8b23fdc6c..13dccb1b4 100644
--- a/packages/integration-test/src/lib/with-classes/fixtures/profiles/user-profile.profile.ts
+++ b/packages/integration-test/src/lib/with-classes/fixtures/profiles/user-profile.profile.ts
@@ -1,5 +1,5 @@
+import type { MappingProfile } from '@automapper/core';
import { convertUsing, mapFrom, mapWith } from '@automapper/core';
-import type { MappingProfile } from '@automapper/types';
import { dateToStringConverter } from '../converters/date-to-string.converter';
import { Avatar, AvatarVm } from '../models/avatar';
import { PascalAvatar, PascalAvatarVm } from '../models/avatar-pascal';
diff --git a/packages/integration-test/src/lib/with-classes/fixtures/profiles/user.profile.ts b/packages/integration-test/src/lib/with-classes/fixtures/profiles/user.profile.ts
index 0fe520277..9384b9f49 100644
--- a/packages/integration-test/src/lib/with-classes/fixtures/profiles/user.profile.ts
+++ b/packages/integration-test/src/lib/with-classes/fixtures/profiles/user.profile.ts
@@ -1,5 +1,5 @@
+import type { MappingProfile, Resolver } from '@automapper/core';
import { mapFrom } from '@automapper/core';
-import type { MappingProfile, Resolver } from '@automapper/types';
import { User, UserVm } from '../models/user';
import { PascalUser, PascalUserVm } from '../models/user-pascal';
import { SnakeUser, SnakeUserVm } from '../models/user-snake';
@@ -55,11 +55,11 @@ export const userProfile: MappingProfile = (mapper) => {
.createMap(UserVm, User)
.forMember(
(d) => d.firstName,
- mapFrom((s) => s.first),
+ mapFrom((s) => s.first)
)
.forMember(
(d) => d.lastName,
- mapFrom((s) => s.last),
+ mapFrom((s) => s.last)
);
};
diff --git a/packages/integration-test/src/lib/with-classes/with-extend-plugin.spec.ts b/packages/integration-test/src/lib/with-classes/with-extend-plugin.spec.ts
index 5db4e508e..16622adbd 100644
--- a/packages/integration-test/src/lib/with-classes/with-extend-plugin.spec.ts
+++ b/packages/integration-test/src/lib/with-classes/with-extend-plugin.spec.ts
@@ -1,6 +1,6 @@
import { classes } from '@automapper/classes';
+import type { ErrorHandler } from '@automapper/core';
import { createMapper } from '@automapper/core';
-import { ErrorHandler } from '@automapper/types';
import {
SimpleBar,
SimpleBarVm,
diff --git a/packages/integration-test/src/lib/with-classes/with-extra-arguments.spec.ts b/packages/integration-test/src/lib/with-classes/with-extra-arguments.spec.ts
index e20c7f054..d71c5340b 100644
--- a/packages/integration-test/src/lib/with-classes/with-extra-arguments.spec.ts
+++ b/packages/integration-test/src/lib/with-classes/with-extra-arguments.spec.ts
@@ -1,5 +1,5 @@
+import type { Resolver } from '@automapper/core';
import { mapWithArguments } from '@automapper/core';
-import type { Resolver } from '@automapper/types';
import { setupClasses } from '../setup.spec';
import {
SimpleBar,
diff --git a/packages/integration-test/src/lib/with-pojos/creation.spec.ts b/packages/integration-test/src/lib/with-pojos/creation.spec.ts
index 10bb4b959..8cd83056e 100644
--- a/packages/integration-test/src/lib/with-pojos/creation.spec.ts
+++ b/packages/integration-test/src/lib/with-pojos/creation.spec.ts
@@ -1,4 +1,4 @@
-import { MappingProfile } from '@automapper/types';
+import type { MappingProfile } from '@automapper/core';
import { setupPojos } from '../setup.spec';
import type {
SimpleBar,
diff --git a/packages/integration-test/src/lib/with-pojos/fixtures/converters/date-to-string.converter.ts b/packages/integration-test/src/lib/with-pojos/fixtures/converters/date-to-string.converter.ts
index 7dbacb430..0ad240c6e 100644
--- a/packages/integration-test/src/lib/with-pojos/fixtures/converters/date-to-string.converter.ts
+++ b/packages/integration-test/src/lib/with-pojos/fixtures/converters/date-to-string.converter.ts
@@ -1,4 +1,4 @@
-import type { Converter } from '@automapper/types';
+import type { Converter } from '@automapper/core';
export const dateToStringConverter: Converter = {
convert(source: Date): string {
diff --git a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/address.profile.ts b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/address.profile.ts
index be95d3d0b..5990b4fd0 100644
--- a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/address.profile.ts
+++ b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/address.profile.ts
@@ -1,5 +1,5 @@
+import type { MappingProfile } from '@automapper/core';
import { mapFrom } from '@automapper/core';
-import type { MappingProfile } from '@automapper/types';
import type {
PascalAddress,
PascalAddressVm,
diff --git a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/avatar.profile.ts b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/avatar.profile.ts
index cc1fc8e82..0435fdf55 100644
--- a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/avatar.profile.ts
+++ b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/avatar.profile.ts
@@ -1,3 +1,4 @@
+import type { MappingProfile } from '@automapper/core';
import {
condition,
ignore,
@@ -5,7 +6,6 @@ import {
nullSubstitution,
preCondition,
} from '@automapper/core';
-import type { MappingProfile } from '@automapper/types';
import type {
PascalAvatar,
PascalAvatarVm,
diff --git a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/custom-keys.profile.ts b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/custom-keys.profile.ts
index 60f4ee1d7..c1e801f7f 100644
--- a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/custom-keys.profile.ts
+++ b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/custom-keys.profile.ts
@@ -1,4 +1,4 @@
-import { MappingProfile } from '@automapper/types';
+import { MappingProfile } from '@automapper/core';
import {
createCustomKeyFooMetadata,
CustomKeyBar,
diff --git a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/simple-inheritance-foo.profile.ts b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/simple-inheritance-foo.profile.ts
index 896ced307..ee6b2bfc7 100644
--- a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/simple-inheritance-foo.profile.ts
+++ b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/simple-inheritance-foo.profile.ts
@@ -1,5 +1,4 @@
-import { mapFrom } from '@automapper/core';
-import { MappingProfile } from '@automapper/types';
+import { mapFrom, MappingProfile } from '@automapper/core';
import type {
Foo,
FooFoo,
diff --git a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/simple-user.profile.ts b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/simple-user.profile.ts
index 093a42b9d..69eb2e2ae 100644
--- a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/simple-user.profile.ts
+++ b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/simple-user.profile.ts
@@ -1,5 +1,5 @@
+import type { MapAction, Mapper, MappingProfile } from '@automapper/core';
import { mapFrom } from '@automapper/core';
-import type { MapAction, Mapper, MappingProfile } from '@automapper/types';
import {
createSimpleUserMetadata,
SimpleUser,
diff --git a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/type-converter.profile.ts b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/type-converter.profile.ts
index e8bdd2d8d..b305ccaf6 100644
--- a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/type-converter.profile.ts
+++ b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/type-converter.profile.ts
@@ -1,4 +1,4 @@
-import type { MappingProfile } from '@automapper/types';
+import type { MappingProfile } from '@automapper/core';
import {
createTypeConverterMetadata,
TypeConverterCamelSource,
diff --git a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/user-profile.profile.ts b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/user-profile.profile.ts
index 14e217235..805697b4b 100644
--- a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/user-profile.profile.ts
+++ b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/user-profile.profile.ts
@@ -1,5 +1,5 @@
+import type { MappingProfile } from '@automapper/core';
import { convertUsing, mapWith } from '@automapper/core';
-import type { MappingProfile } from '@automapper/types';
import { dateToStringConverter } from '../converters/date-to-string.converter';
import type {
PascalUserProfile,
diff --git a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/user.profile.ts b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/user.profile.ts
index 025ec4cf5..89fd3237a 100644
--- a/packages/integration-test/src/lib/with-pojos/fixtures/profiles/user.profile.ts
+++ b/packages/integration-test/src/lib/with-pojos/fixtures/profiles/user.profile.ts
@@ -1,5 +1,5 @@
+import type { MappingProfile } from '@automapper/core';
import { mapFrom } from '@automapper/core';
-import type { MappingProfile } from '@automapper/types';
import type {
PascalUser,
PascalUserVm,
diff --git a/packages/nestjs-integration-test/src/app/app.service.ts b/packages/nestjs-integration-test/src/app/app.service.ts
index 1d43995b5..d60b14f06 100644
--- a/packages/nestjs-integration-test/src/app/app.service.ts
+++ b/packages/nestjs-integration-test/src/app/app.service.ts
@@ -1,5 +1,5 @@
import { InjectMapper } from '@automapper/nestjs';
-import type { Mapper } from '@automapper/types';
+import type { Mapper } from '@automapper/core';
import { Injectable } from '@nestjs/common';
import { Bar, Foo, FooVm } from './models/foo';
import { getUser } from './models/get-user';
diff --git a/packages/nestjs-integration-test/src/app/foo-extend/foo-extend.controller.ts b/packages/nestjs-integration-test/src/app/foo-extend/foo-extend.controller.ts
index b64597b15..558f5e456 100644
--- a/packages/nestjs-integration-test/src/app/foo-extend/foo-extend.controller.ts
+++ b/packages/nestjs-integration-test/src/app/foo-extend/foo-extend.controller.ts
@@ -1,5 +1,5 @@
import { InjectMapper } from '@automapper/nestjs';
-import type { Mapper } from '@automapper/types';
+import type { Mapper } from '@automapper/core';
import { Controller, Get } from '@nestjs/common';
import { Bar } from '../models/foo';
import { FooExtend, FooExtendVm } from './foo-extend.model';
diff --git a/packages/nestjs-integration-test/src/app/foo-extend/foo-extend.profile.spec.ts b/packages/nestjs-integration-test/src/app/foo-extend/foo-extend.profile.spec.ts
index afee8dc2d..7380a7660 100644
--- a/packages/nestjs-integration-test/src/app/foo-extend/foo-extend.profile.spec.ts
+++ b/packages/nestjs-integration-test/src/app/foo-extend/foo-extend.profile.spec.ts
@@ -1,7 +1,7 @@
import { classes } from '@automapper/classes';
+import type { Mapper } from '@automapper/core';
import { createMapper } from '@automapper/core';
import { getMapperToken } from '@automapper/nestjs';
-import type { Mapper } from '@automapper/types';
import { Test } from '@nestjs/testing';
import { FooProfile } from '../foo/foo.profile';
import { Bar } from '../models/foo';
diff --git a/packages/nestjs-integration-test/src/app/foo-extend/foo-extend.profile.ts b/packages/nestjs-integration-test/src/app/foo-extend/foo-extend.profile.ts
index e74caa572..ae6532351 100644
--- a/packages/nestjs-integration-test/src/app/foo-extend/foo-extend.profile.ts
+++ b/packages/nestjs-integration-test/src/app/foo-extend/foo-extend.profile.ts
@@ -1,5 +1,5 @@
import { AutomapperProfile, InjectMapper } from '@automapper/nestjs';
-import type { Mapper, MappingProfile } from '@automapper/types';
+import type { Mapper, MappingProfile } from '@automapper/core';
import { Injectable } from '@nestjs/common';
import { Foo, FooVm } from '../models/foo';
import { FooExtend, FooExtendVm } from './foo-extend.model';
diff --git a/packages/nestjs-integration-test/src/app/foo/foo.profile.spec.ts b/packages/nestjs-integration-test/src/app/foo/foo.profile.spec.ts
index 22915cc88..341b83069 100644
--- a/packages/nestjs-integration-test/src/app/foo/foo.profile.spec.ts
+++ b/packages/nestjs-integration-test/src/app/foo/foo.profile.spec.ts
@@ -1,7 +1,7 @@
import { classes } from '@automapper/classes';
+import type { Mapper } from '@automapper/core';
import { createMapper } from '@automapper/core';
import { getMapperToken } from '@automapper/nestjs';
-import type { Mapper } from '@automapper/types';
import { Test } from '@nestjs/testing';
import { Bar, Foo, FooVm } from '../models/foo';
import { FooProfile } from './foo.profile';
diff --git a/packages/nestjs-integration-test/src/app/foo/foo.profile.ts b/packages/nestjs-integration-test/src/app/foo/foo.profile.ts
index f93df9391..e15c76a75 100644
--- a/packages/nestjs-integration-test/src/app/foo/foo.profile.ts
+++ b/packages/nestjs-integration-test/src/app/foo/foo.profile.ts
@@ -1,6 +1,6 @@
+import type { Mapper, MappingProfile } from '@automapper/core';
import { mapFrom, mapWith } from '@automapper/core';
import { AutomapperProfile, InjectMapper } from '@automapper/nestjs';
-import type { Mapper, MappingProfile } from '@automapper/types';
import { Injectable } from '@nestjs/common';
import { Bar, BarVm, Foo, FooVm } from '../models/foo';
diff --git a/packages/nestjs-integration-test/src/app/profiles/address.profile.spec.ts b/packages/nestjs-integration-test/src/app/profiles/address.profile.spec.ts
index a6937939d..6e26ea0c2 100644
--- a/packages/nestjs-integration-test/src/app/profiles/address.profile.spec.ts
+++ b/packages/nestjs-integration-test/src/app/profiles/address.profile.spec.ts
@@ -1,7 +1,7 @@
import { classes } from '@automapper/classes';
+import type { Mapper } from '@automapper/core';
import { createMapper } from '@automapper/core';
import { getMapperToken } from '@automapper/nestjs';
-import type { Mapper } from '@automapper/types';
import { Test } from '@nestjs/testing';
import { Address, AddressVm } from '../models/address';
import { AddressProfile } from './address.profile';
diff --git a/packages/nestjs-integration-test/src/app/profiles/address.profile.ts b/packages/nestjs-integration-test/src/app/profiles/address.profile.ts
index befaea12e..cfb07c802 100644
--- a/packages/nestjs-integration-test/src/app/profiles/address.profile.ts
+++ b/packages/nestjs-integration-test/src/app/profiles/address.profile.ts
@@ -1,6 +1,6 @@
+import type { Mapper, MappingProfile } from '@automapper/core';
import { mapFrom } from '@automapper/core';
import { AutomapperProfile, InjectMapper } from '@automapper/nestjs';
-import type { Mapper, MappingProfile } from '@automapper/types';
import { Injectable } from '@nestjs/common';
import { Address, AddressVm } from '../models/address';
diff --git a/packages/nestjs-integration-test/src/app/profiles/avatar.profile.spec.ts b/packages/nestjs-integration-test/src/app/profiles/avatar.profile.spec.ts
index 242de4846..0185e4a14 100644
--- a/packages/nestjs-integration-test/src/app/profiles/avatar.profile.spec.ts
+++ b/packages/nestjs-integration-test/src/app/profiles/avatar.profile.spec.ts
@@ -1,7 +1,7 @@
import { classes } from '@automapper/classes';
+import type { Mapper } from '@automapper/core';
import { createMapper } from '@automapper/core';
import { getMapperToken } from '@automapper/nestjs';
-import type { Mapper } from '@automapper/types';
import { Test } from '@nestjs/testing';
import { Avatar, AvatarVm } from '../models/avatar';
import { AvatarProfile } from './avatar.profile';
diff --git a/packages/nestjs-integration-test/src/app/profiles/avatar.profile.ts b/packages/nestjs-integration-test/src/app/profiles/avatar.profile.ts
index e2fc198b7..92acab834 100644
--- a/packages/nestjs-integration-test/src/app/profiles/avatar.profile.ts
+++ b/packages/nestjs-integration-test/src/app/profiles/avatar.profile.ts
@@ -1,3 +1,4 @@
+import type { Mapper, MappingProfile } from '@automapper/core';
import {
condition,
ignore,
@@ -6,7 +7,6 @@ import {
preCondition,
} from '@automapper/core';
import { AutomapperProfile, InjectMapper } from '@automapper/nestjs';
-import type { Mapper, MappingProfile } from '@automapper/types';
import { Injectable } from '@nestjs/common';
import { Avatar, AvatarVm } from '../models/avatar';
diff --git a/packages/nestjs-integration-test/src/app/profiles/user-profile.profile.spec.ts b/packages/nestjs-integration-test/src/app/profiles/user-profile.profile.spec.ts
index 588d92217..9c45fe5ae 100644
--- a/packages/nestjs-integration-test/src/app/profiles/user-profile.profile.spec.ts
+++ b/packages/nestjs-integration-test/src/app/profiles/user-profile.profile.spec.ts
@@ -1,7 +1,7 @@
import { classes } from '@automapper/classes';
+import type { Mapper } from '@automapper/core';
import { createMapper } from '@automapper/core';
import { getMapperToken } from '@automapper/nestjs';
-import type { Mapper } from '@automapper/types';
import { Test } from '@nestjs/testing';
import { Address, AddressVm } from '../models/address';
import { Avatar, AvatarVm } from '../models/avatar';
diff --git a/packages/nestjs-integration-test/src/app/profiles/user-profile.profile.ts b/packages/nestjs-integration-test/src/app/profiles/user-profile.profile.ts
index eb02aa63c..14e92cee5 100644
--- a/packages/nestjs-integration-test/src/app/profiles/user-profile.profile.ts
+++ b/packages/nestjs-integration-test/src/app/profiles/user-profile.profile.ts
@@ -1,6 +1,6 @@
+import type { Converter, Mapper, MappingProfile } from '@automapper/core';
import { convertUsing, mapWith } from '@automapper/core';
import { AutomapperProfile, InjectMapper } from '@automapper/nestjs';
-import type { Converter, Mapper, MappingProfile } from '@automapper/types';
import { Injectable } from '@nestjs/common';
import { Avatar, AvatarVm } from '../models/avatar';
import { UserProfile, UserProfileVm } from '../models/user-profile';
diff --git a/packages/nestjs-integration-test/src/app/profiles/user.profile.spec.ts b/packages/nestjs-integration-test/src/app/profiles/user.profile.spec.ts
index bf9fa5b91..16877184e 100644
--- a/packages/nestjs-integration-test/src/app/profiles/user.profile.spec.ts
+++ b/packages/nestjs-integration-test/src/app/profiles/user.profile.spec.ts
@@ -1,7 +1,7 @@
import { classes } from '@automapper/classes';
+import type { Mapper } from '@automapper/core';
import { CamelCaseNamingConvention, createMapper } from '@automapper/core';
import { getMapperToken } from '@automapper/nestjs';
-import type { Mapper } from '@automapper/types';
import { Test } from '@nestjs/testing';
import { getUser } from '../models/get-user';
import { User, UserVm } from '../models/user';
diff --git a/packages/nestjs-integration-test/src/app/profiles/user.profile.ts b/packages/nestjs-integration-test/src/app/profiles/user.profile.ts
index 8f8c6466d..8ba253369 100644
--- a/packages/nestjs-integration-test/src/app/profiles/user.profile.ts
+++ b/packages/nestjs-integration-test/src/app/profiles/user.profile.ts
@@ -1,6 +1,6 @@
+import type { Mapper, MappingProfile } from '@automapper/core';
import { mapFrom } from '@automapper/core';
import { AutomapperProfile, InjectMapper } from '@automapper/nestjs';
-import type { Mapper, MappingProfile } from '@automapper/types';
import { Injectable } from '@nestjs/common';
import { User, UserVm } from '../models/user';