diff --git a/src/index.ts b/src/index.ts
index f119312..a4e73e4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,19 +1,19 @@
 export * from './lib/aggregate';
 export * from './lib/projection';
 
-export * from './@types/Aggregate'
-export * from './@types/BaseEvent'
-export * from './@types/CloudEventV1'
-export * from './@types/Command'
-export * from './@types/CommandHandler'
-export * from './@types/CommandHandlerEnum'
-export * from './@types/EventHandler'
-export * from './@types/EventHandlerEnum'
-export * from './@types/GlobalProjection'
-export * from './@types/LittleEsEvent'
-export * from './@types/LittleEsEventMetadata'
-export * from './@types/NamedProjection'
-export * from './@types/PersistanceHandler'
-export * from './@types/PersistedAggregate'
-export * from './@types/PublishingHandler'
-export * from './@types/Snapshot'
\ No newline at end of file
+export * from './types/Aggregate'
+export * from './types/BaseEvent'
+export * from './types/CloudEventV1'
+export * from './types/Command'
+export * from './types/CommandHandler'
+export * from './types/CommandHandlerEnum'
+export * from './types/EventHandler'
+export * from './types/EventHandlerEnum'
+export * from './types/GlobalProjection'
+export * from './types/LittleEsEvent'
+export * from './types/LittleEsEventMetadata'
+export * from './types/NamedProjection'
+export * from './types/PersistanceHandler'
+export * from './types/PersistedAggregate'
+export * from './types/PublishingHandler'
+export * from './types/Snapshot'
\ No newline at end of file
diff --git a/src/lib/aggregate.spec.ts b/src/lib/aggregate.spec.ts
index e203b21..162716c 100644
--- a/src/lib/aggregate.spec.ts
+++ b/src/lib/aggregate.spec.ts
@@ -3,9 +3,9 @@
 
 import anyTest, { TestFn } from 'ava';
 
-import { Aggregate } from '../@types/Aggregate';
-import { LittleEsEvent } from '../@types/LittleEsEvent';
-import { Snapshot } from '../@types/Snapshot';
+import { Aggregate } from '../types/Aggregate';
+import { LittleEsEvent } from '../types/LittleEsEvent';
+import { Snapshot } from '../types/Snapshot';
 
 import { createAggregate } from './aggregate';
 import { aggregateEventHandlers, commandHandlers, mockPersistanceHandler, Product, ProductCommand, ProductEvent } from './testdata.spec';
diff --git a/src/lib/aggregate.ts b/src/lib/aggregate.ts
index d1388fa..60a31d2 100644
--- a/src/lib/aggregate.ts
+++ b/src/lib/aggregate.ts
@@ -1,11 +1,11 @@
-import { Aggregate } from "../@types/Aggregate";
-import { BaseEvent } from "../@types/BaseEvent";
-import { Command } from "../@types/Command";
-import { CommandHandler } from "../@types/CommandHandler";
-import { EventHandler } from "../@types/EventHandler";
-import { EventStoreResult, LittleEsEvent } from "../@types/LittleEsEvent";
-import { PersistanceHandler } from "../@types/PersistanceHandler";
-import { PublishingHandler } from "../@types/PublishingHandler";
+import { Aggregate } from "../types/Aggregate";
+import { BaseEvent } from "../types/BaseEvent";
+import { Command } from "../types/Command";
+import { CommandHandler } from "../types/CommandHandler";
+import { EventHandler } from "../types/EventHandler";
+import { EventStoreResult, LittleEsEvent } from "../types/LittleEsEvent";
+import { PersistanceHandler } from "../types/PersistanceHandler";
+import { PublishingHandler } from "../types/PublishingHandler";
 
 import { hydrateAggregate, ID_SEPARATOR, SafeArray } from "./util";
 
diff --git a/src/lib/globalProjection.spec.ts b/src/lib/globalProjection.spec.ts
index 160ae8c..403bcd5 100644
--- a/src/lib/globalProjection.spec.ts
+++ b/src/lib/globalProjection.spec.ts
@@ -2,9 +2,9 @@
 /* eslint-disable functional/prefer-readonly-type */
 import anyTest, { TestFn } from 'ava';
 
-import { GlobalProjection } from '../@types/GlobalProjection';
-import { LittleEsEvent } from '../@types/LittleEsEvent';
-import { Snapshot } from '../@types/Snapshot';
+import { GlobalProjection } from '../types/GlobalProjection';
+import { LittleEsEvent } from '../types/LittleEsEvent';
+import { Snapshot } from '../types/Snapshot';
 
 import { createGlobalProjection } from './projection';
 import { mockPersistanceHandler, ProductEvent, ProductPriceChangesGlobalProjection, projectionTestEventData } from './testdata.spec';
diff --git a/src/lib/namedProjection.spec.ts b/src/lib/namedProjection.spec.ts
index a91cb08..777db49 100644
--- a/src/lib/namedProjection.spec.ts
+++ b/src/lib/namedProjection.spec.ts
@@ -2,9 +2,9 @@
 /* eslint-disable functional/prefer-readonly-type */
 import anyTest, { TestFn } from 'ava';
 
-import { LittleEsEvent } from '../@types/LittleEsEvent';
-import { NamedProjection } from '../@types/NamedProjection';
-import { Snapshot } from '../@types/Snapshot';
+import { LittleEsEvent } from '../types/LittleEsEvent';
+import { NamedProjection } from '../types/NamedProjection';
+import { Snapshot } from '../types/Snapshot';
 
 import { createNamedProjection } from './projection';
 import { mockPersistanceHandler, ProductEvent, ProductHistoryProjection, projectionTestEventData } from './testdata.spec';
diff --git a/src/lib/projection.ts b/src/lib/projection.ts
index 2371699..a7d5aaf 100644
--- a/src/lib/projection.ts
+++ b/src/lib/projection.ts
@@ -1,10 +1,10 @@
-import { BaseEvent } from "../@types/BaseEvent";
-import { EventHandler } from "../@types/EventHandler";
-import { GlobalProjection } from "../@types/GlobalProjection";
-import { EventStoreResult } from "../@types/LittleEsEvent";
-import { NamedProjection } from "../@types/NamedProjection";
-import { PersistanceHandler } from "../@types/PersistanceHandler";
-import { PersistedProjection } from "../@types/PersistedAggregate";
+import { BaseEvent } from "../types/BaseEvent";
+import { EventHandler } from "../types/EventHandler";
+import { GlobalProjection } from "../types/GlobalProjection";
+import { EventStoreResult } from "../types/LittleEsEvent";
+import { NamedProjection } from "../types/NamedProjection";
+import { PersistanceHandler } from "../types/PersistanceHandler";
+import { PersistedProjection } from "../types/PersistedAggregate";
 
 import { hydrateProjectionFromSnapshot, SafeArray, snapshotProjection } from "./util";
 
diff --git a/src/lib/testdata.spec.ts b/src/lib/testdata.spec.ts
index bf6822a..2dc4df6 100644
--- a/src/lib/testdata.spec.ts
+++ b/src/lib/testdata.spec.ts
@@ -3,12 +3,12 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { ExecutionContext } from "ava"
 
-import { BaseEvent } from "../@types/BaseEvent"
-import { CommandHandlerEnum } from "../@types/CommandHandlerEnum"
-import { EventHandlerEnum } from "../@types/EventHandlerEnum"
-import { LittleEsEvent } from "../@types/LittleEsEvent"
-import { PersistanceHandler } from "../@types/PersistanceHandler"
-import { Snapshot } from "../@types/Snapshot"
+import { BaseEvent } from "../types/BaseEvent"
+import { CommandHandlerEnum } from "../types/CommandHandlerEnum"
+import { EventHandlerEnum } from "../types/EventHandlerEnum"
+import { LittleEsEvent } from "../types/LittleEsEvent"
+import { PersistanceHandler } from "../types/PersistanceHandler"
+import { Snapshot } from "../types/Snapshot"
 
 import { extractEventSequenceId, validateEventId } from "./util"
 
diff --git a/src/lib/util.ts b/src/lib/util.ts
index a81a847..6b6ca07 100644
--- a/src/lib/util.ts
+++ b/src/lib/util.ts
@@ -1,8 +1,8 @@
-import { BaseEvent } from "../@types/BaseEvent";
-import { EventHandler } from "../@types/EventHandler";
-import { EventStoreResult, LittleEsEvent } from "../@types/LittleEsEvent";
-import { PersistanceHandler } from "../@types/PersistanceHandler";
-import { PersistedProjection } from "../@types/PersistedAggregate";
+import { BaseEvent } from "../types/BaseEvent";
+import { EventHandler } from "../types/EventHandler";
+import { EventStoreResult, LittleEsEvent } from "../types/LittleEsEvent";
+import { PersistanceHandler } from "../types/PersistanceHandler";
+import { PersistedProjection } from "../types/PersistedAggregate";
 
 export const SafeArray = (arr: readonly unknown[]) => arr?.length;
 
diff --git a/src/@types/Aggregate.d.ts b/src/types/Aggregate.d.ts
similarity index 100%
rename from src/@types/Aggregate.d.ts
rename to src/types/Aggregate.d.ts
diff --git a/src/@types/BaseEvent.d.ts b/src/types/BaseEvent.d.ts
similarity index 100%
rename from src/@types/BaseEvent.d.ts
rename to src/types/BaseEvent.d.ts
diff --git a/src/@types/CloudEventV1.d.ts b/src/types/CloudEventV1.d.ts
similarity index 100%
rename from src/@types/CloudEventV1.d.ts
rename to src/types/CloudEventV1.d.ts
diff --git a/src/@types/Command.d.ts b/src/types/Command.d.ts
similarity index 100%
rename from src/@types/Command.d.ts
rename to src/types/Command.d.ts
diff --git a/src/@types/CommandHandler.d.ts b/src/types/CommandHandler.d.ts
similarity index 100%
rename from src/@types/CommandHandler.d.ts
rename to src/types/CommandHandler.d.ts
diff --git a/src/@types/CommandHandlerEnum.d.ts b/src/types/CommandHandlerEnum.d.ts
similarity index 100%
rename from src/@types/CommandHandlerEnum.d.ts
rename to src/types/CommandHandlerEnum.d.ts
diff --git a/src/@types/EventHandler.d.ts b/src/types/EventHandler.d.ts
similarity index 100%
rename from src/@types/EventHandler.d.ts
rename to src/types/EventHandler.d.ts
diff --git a/src/@types/EventHandlerEnum.d.ts b/src/types/EventHandlerEnum.d.ts
similarity index 100%
rename from src/@types/EventHandlerEnum.d.ts
rename to src/types/EventHandlerEnum.d.ts
diff --git a/src/@types/GlobalProjection.d.ts b/src/types/GlobalProjection.d.ts
similarity index 100%
rename from src/@types/GlobalProjection.d.ts
rename to src/types/GlobalProjection.d.ts
diff --git a/src/@types/LittleEsEvent.d.ts b/src/types/LittleEsEvent.d.ts
similarity index 100%
rename from src/@types/LittleEsEvent.d.ts
rename to src/types/LittleEsEvent.d.ts
diff --git a/src/@types/LittleEsEventMetadata.d.ts b/src/types/LittleEsEventMetadata.d.ts
similarity index 100%
rename from src/@types/LittleEsEventMetadata.d.ts
rename to src/types/LittleEsEventMetadata.d.ts
diff --git a/src/@types/NamedProjection.d.ts b/src/types/NamedProjection.d.ts
similarity index 100%
rename from src/@types/NamedProjection.d.ts
rename to src/types/NamedProjection.d.ts
diff --git a/src/@types/PersistanceHandler.d.ts b/src/types/PersistanceHandler.d.ts
similarity index 100%
rename from src/@types/PersistanceHandler.d.ts
rename to src/types/PersistanceHandler.d.ts
diff --git a/src/@types/PersistedAggregate.d.ts b/src/types/PersistedAggregate.d.ts
similarity index 100%
rename from src/@types/PersistedAggregate.d.ts
rename to src/types/PersistedAggregate.d.ts
diff --git a/src/@types/PublishingHandler.d.ts b/src/types/PublishingHandler.d.ts
similarity index 100%
rename from src/@types/PublishingHandler.d.ts
rename to src/types/PublishingHandler.d.ts
diff --git a/src/@types/Snapshot.d.ts b/src/types/Snapshot.d.ts
similarity index 100%
rename from src/@types/Snapshot.d.ts
rename to src/types/Snapshot.d.ts