diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js
index 79276ef9d..2654104dc 100644
--- a/backend/.eslintrc.js
+++ b/backend/.eslintrc.js
@@ -55,7 +55,7 @@ module.exports = {
     'import/named': 'error',
     'import/namespace': 'error',
     'import/no-absolute-path': 'error',
-    'import/no-cycle': 'off',
+    'import/no-cycle': 'error',
     'import/no-dynamic-require': 'error',
     'import/no-internal-modules': 'off',
     'import/no-relative-packages': 'error',
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
index 33c9ae36e..cb1f8b32b 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_CONFIRM = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts
index bf85345cf..64797fc26 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_CREATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts
index dd37c76b5..a2770b34d 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_DELETE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts
index 8d34be87f..cb9e32fbf 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_DENY = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts
index b7ee39c36..93bfdbf4b 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_CREATE = async (
   moderator: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts
index b5816e45d..2794f5fa3 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts
@@ -1,7 +1,8 @@
 import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_DELETE = async (
   moderator: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts
index 1cd998e26..810cecf29 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE = async (
   moderator: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts
index f07d38e98..ab96b78f6 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts
@@ -2,7 +2,8 @@ import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts
index 7d1bc175e..6bea692fd 100644
--- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts
+++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_UPDATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_USER_DELETE.ts b/backend/src/event/EVENT_ADMIN_USER_DELETE.ts
index bfd5be740..1eb7399aa 100644
--- a/backend/src/event/EVENT_ADMIN_USER_DELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_USER_DELETE.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_USER_DELETE = async (user: DbUser, moderator: DbUser): Promise<DbEvent> =>
   Event(EventType.ADMIN_USER_DELETE, user, moderator).save()
diff --git a/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts b/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts
index 3be825ad4..37c840475 100644
--- a/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts
+++ b/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_USER_ROLE_SET = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts b/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts
index eb861dbf1..121662ea8 100644
--- a/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts
+++ b/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_USER_UNDELETE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts b/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts
index f1469c725..6842bc4eb 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_CREATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts b/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts
index 8c62e3ae6..30130662f 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_DELETE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts b/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts
index 9f44de95d..5138548a6 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts
@@ -4,7 +4,8 @@ import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_LINK_REDEEM = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts b/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts
index b06685a6d..1200834de 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts
@@ -2,7 +2,8 @@ import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_MESSAGE_CREATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts b/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts
index c2e6951cc..38df20a4c 100644
--- a/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts
+++ b/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_UPDATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts b/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts
index c16bbfac3..ad9d27596 100644
--- a/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts
+++ b/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.EMAIL_ACCOUNT_MULTIREGISTRATION, user, { id: 0 } as DbUser).save()
diff --git a/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts b/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts
index ae10f9fba..2ba31af9d 100644
--- a/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts
+++ b/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_EMAIL_ADMIN_CONFIRMATION = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts b/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts
index 9d64207e0..5edef7f20 100644
--- a/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts
+++ b/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_EMAIL_CONFIRMATION = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.EMAIL_CONFIRMATION, user, user).save()
diff --git a/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts b/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts
index f7e328369..72d3b2b2c 100644
--- a/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts
+++ b/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_EMAIL_FORGOT_PASSWORD = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.EMAIL_FORGOT_PASSWORD, user, { id: 0 } as DbUser).save()
diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts b/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts
index e766fe38e..74e4c1b42 100644
--- a/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts
+++ b/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_LINK_CREATE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts b/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts
index d15c786a8..70e06bbd4 100644
--- a/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts
+++ b/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts
@@ -1,7 +1,8 @@
 import { User as DbUser } from '@entity/User'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_LINK_DELETE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts b/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts
index 5f8cd5c4d..75bc87916 100644
--- a/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts
+++ b/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_LINK_REDEEM = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts b/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts
index c6e06ccb7..a09e1c4b2 100644
--- a/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts
+++ b/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_RECEIVE = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_TRANSACTION_SEND.ts b/backend/src/event/EVENT_TRANSACTION_SEND.ts
index 888162747..71c70a425 100644
--- a/backend/src/event/EVENT_TRANSACTION_SEND.ts
+++ b/backend/src/event/EVENT_TRANSACTION_SEND.ts
@@ -2,7 +2,8 @@ import { Decimal } from 'decimal.js-light'
 import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_SEND = async (
   user: DbUser,
diff --git a/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts b/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts
index 2e224d550..9b2ce31ee 100644
--- a/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts
+++ b/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_USER_ACTIVATE_ACCOUNT = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.USER_ACTIVATE_ACCOUNT, user, user).save()
diff --git a/backend/src/event/EVENT_USER_INFO_UPDATE.ts b/backend/src/event/EVENT_USER_INFO_UPDATE.ts
index 681ecd473..6b9d89738 100644
--- a/backend/src/event/EVENT_USER_INFO_UPDATE.ts
+++ b/backend/src/event/EVENT_USER_INFO_UPDATE.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_USER_INFO_UPDATE = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.USER_INFO_UPDATE, user, user).save()
diff --git a/backend/src/event/EVENT_USER_LOGIN.ts b/backend/src/event/EVENT_USER_LOGIN.ts
index 351ec5a95..81477b8a6 100644
--- a/backend/src/event/EVENT_USER_LOGIN.ts
+++ b/backend/src/event/EVENT_USER_LOGIN.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_USER_LOGIN = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.USER_LOGIN, user, user).save()
diff --git a/backend/src/event/EVENT_USER_LOGOUT.ts b/backend/src/event/EVENT_USER_LOGOUT.ts
index 4f5650fc6..c6c63405a 100644
--- a/backend/src/event/EVENT_USER_LOGOUT.ts
+++ b/backend/src/event/EVENT_USER_LOGOUT.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_USER_LOGOUT = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.USER_LOGOUT, user, user).save()
diff --git a/backend/src/event/EVENT_USER_REGISTER.ts b/backend/src/event/EVENT_USER_REGISTER.ts
index cdb8b22e2..45bc6b6f4 100644
--- a/backend/src/event/EVENT_USER_REGISTER.ts
+++ b/backend/src/event/EVENT_USER_REGISTER.ts
@@ -1,6 +1,7 @@
 import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_USER_REGISTER = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.USER_REGISTER, user, user).save()
diff --git a/backend/src/event/Event.ts b/backend/src/event/Event.ts
index feb167adf..d19177b53 100644
--- a/backend/src/event/Event.ts
+++ b/backend/src/event/Event.ts
@@ -33,37 +33,3 @@ export const Event = (
   event.amount = amount
   return event
 }
-
-export { EventType }
-
-export { EVENT_ADMIN_CONTRIBUTION_CONFIRM } from './EVENT_ADMIN_CONTRIBUTION_CONFIRM'
-export { EVENT_ADMIN_CONTRIBUTION_CREATE } from './EVENT_ADMIN_CONTRIBUTION_CREATE'
-export { EVENT_ADMIN_CONTRIBUTION_DELETE } from './EVENT_ADMIN_CONTRIBUTION_DELETE'
-export { EVENT_ADMIN_CONTRIBUTION_DENY } from './EVENT_ADMIN_CONTRIBUTION_DENY'
-export { EVENT_ADMIN_CONTRIBUTION_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_UPDATE'
-export { EVENT_ADMIN_CONTRIBUTION_LINK_CREATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_CREATE'
-export { EVENT_ADMIN_CONTRIBUTION_LINK_DELETE } from './EVENT_ADMIN_CONTRIBUTION_LINK_DELETE'
-export { EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE'
-export { EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE'
-export { EVENT_ADMIN_USER_DELETE } from './EVENT_ADMIN_USER_DELETE'
-export { EVENT_ADMIN_USER_UNDELETE } from './EVENT_ADMIN_USER_UNDELETE'
-export { EVENT_ADMIN_USER_ROLE_SET } from './EVENT_ADMIN_USER_ROLE_SET'
-export { EVENT_CONTRIBUTION_CREATE } from './EVENT_CONTRIBUTION_CREATE'
-export { EVENT_CONTRIBUTION_DELETE } from './EVENT_CONTRIBUTION_DELETE'
-export { EVENT_CONTRIBUTION_UPDATE } from './EVENT_CONTRIBUTION_UPDATE'
-export { EVENT_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_CONTRIBUTION_MESSAGE_CREATE'
-export { EVENT_CONTRIBUTION_LINK_REDEEM } from './EVENT_CONTRIBUTION_LINK_REDEEM'
-export { EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION } from './EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION'
-export { EVENT_EMAIL_ADMIN_CONFIRMATION } from './EVENT_EMAIL_ADMIN_CONFIRMATION'
-export { EVENT_EMAIL_CONFIRMATION } from './EVENT_EMAIL_CONFIRMATION'
-export { EVENT_EMAIL_FORGOT_PASSWORD } from './EVENT_EMAIL_FORGOT_PASSWORD'
-export { EVENT_TRANSACTION_SEND } from './EVENT_TRANSACTION_SEND'
-export { EVENT_TRANSACTION_RECEIVE } from './EVENT_TRANSACTION_RECEIVE'
-export { EVENT_TRANSACTION_LINK_CREATE } from './EVENT_TRANSACTION_LINK_CREATE'
-export { EVENT_TRANSACTION_LINK_DELETE } from './EVENT_TRANSACTION_LINK_DELETE'
-export { EVENT_TRANSACTION_LINK_REDEEM } from './EVENT_TRANSACTION_LINK_REDEEM'
-export { EVENT_USER_ACTIVATE_ACCOUNT } from './EVENT_USER_ACTIVATE_ACCOUNT'
-export { EVENT_USER_INFO_UPDATE } from './EVENT_USER_INFO_UPDATE'
-export { EVENT_USER_LOGIN } from './EVENT_USER_LOGIN'
-export { EVENT_USER_LOGOUT } from './EVENT_USER_LOGOUT'
-export { EVENT_USER_REGISTER } from './EVENT_USER_REGISTER'
diff --git a/backend/src/event/Events.ts b/backend/src/event/Events.ts
new file mode 100644
index 000000000..d217cde28
--- /dev/null
+++ b/backend/src/event/Events.ts
@@ -0,0 +1,33 @@
+export { EventType } from './EventType'
+export { Event } from './Event'
+export { EVENT_ADMIN_CONTRIBUTION_CONFIRM } from './EVENT_ADMIN_CONTRIBUTION_CONFIRM'
+export { EVENT_ADMIN_CONTRIBUTION_CREATE } from './EVENT_ADMIN_CONTRIBUTION_CREATE'
+export { EVENT_ADMIN_CONTRIBUTION_DELETE } from './EVENT_ADMIN_CONTRIBUTION_DELETE'
+export { EVENT_ADMIN_CONTRIBUTION_DENY } from './EVENT_ADMIN_CONTRIBUTION_DENY'
+export { EVENT_ADMIN_CONTRIBUTION_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_UPDATE'
+export { EVENT_ADMIN_CONTRIBUTION_LINK_CREATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_CREATE'
+export { EVENT_ADMIN_CONTRIBUTION_LINK_DELETE } from './EVENT_ADMIN_CONTRIBUTION_LINK_DELETE'
+export { EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE'
+export { EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE'
+export { EVENT_ADMIN_USER_DELETE } from './EVENT_ADMIN_USER_DELETE'
+export { EVENT_ADMIN_USER_UNDELETE } from './EVENT_ADMIN_USER_UNDELETE'
+export { EVENT_ADMIN_USER_ROLE_SET } from './EVENT_ADMIN_USER_ROLE_SET'
+export { EVENT_CONTRIBUTION_CREATE } from './EVENT_CONTRIBUTION_CREATE'
+export { EVENT_CONTRIBUTION_DELETE } from './EVENT_CONTRIBUTION_DELETE'
+export { EVENT_CONTRIBUTION_UPDATE } from './EVENT_CONTRIBUTION_UPDATE'
+export { EVENT_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_CONTRIBUTION_MESSAGE_CREATE'
+export { EVENT_CONTRIBUTION_LINK_REDEEM } from './EVENT_CONTRIBUTION_LINK_REDEEM'
+export { EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION } from './EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION'
+export { EVENT_EMAIL_ADMIN_CONFIRMATION } from './EVENT_EMAIL_ADMIN_CONFIRMATION'
+export { EVENT_EMAIL_CONFIRMATION } from './EVENT_EMAIL_CONFIRMATION'
+export { EVENT_EMAIL_FORGOT_PASSWORD } from './EVENT_EMAIL_FORGOT_PASSWORD'
+export { EVENT_TRANSACTION_SEND } from './EVENT_TRANSACTION_SEND'
+export { EVENT_TRANSACTION_RECEIVE } from './EVENT_TRANSACTION_RECEIVE'
+export { EVENT_TRANSACTION_LINK_CREATE } from './EVENT_TRANSACTION_LINK_CREATE'
+export { EVENT_TRANSACTION_LINK_DELETE } from './EVENT_TRANSACTION_LINK_DELETE'
+export { EVENT_TRANSACTION_LINK_REDEEM } from './EVENT_TRANSACTION_LINK_REDEEM'
+export { EVENT_USER_ACTIVATE_ACCOUNT } from './EVENT_USER_ACTIVATE_ACCOUNT'
+export { EVENT_USER_INFO_UPDATE } from './EVENT_USER_INFO_UPDATE'
+export { EVENT_USER_LOGIN } from './EVENT_USER_LOGIN'
+export { EVENT_USER_LOGOUT } from './EVENT_USER_LOGOUT'
+export { EVENT_USER_REGISTER } from './EVENT_USER_REGISTER'
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
index 6a69e257e..d89edc695 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts
@@ -20,7 +20,7 @@ import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { userFactory } from '@/seeds/factory/user'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 
 let mutate: any, query: any, con: any
 let testEnv: any
diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts
index 55a23187f..6328bd3bc 100644
--- a/backend/src/graphql/resolver/ContributionLinkResolver.ts
+++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts
@@ -25,7 +25,7 @@ import {
   EVENT_ADMIN_CONTRIBUTION_LINK_CREATE,
   EVENT_ADMIN_CONTRIBUTION_LINK_DELETE,
   EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE,
-} from '@/event/Event'
+} from '@/event/Events'
 
 @Resolver()
 export class ContributionLinkResolver {
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index 6b2c7c4d8..b8125f8cb 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -21,7 +21,7 @@ import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 
 jest.mock('@/emails/sendEmailVariants', () => {
   const originalModule = jest.requireActual('@/emails/sendEmailVariants')
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index 999ccc2b1..276183894 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -21,7 +21,7 @@ import LogError from '@/server/LogError'
 import {
   EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE,
   EVENT_CONTRIBUTION_MESSAGE_CREATE,
-} from '@/event/Event'
+} from '@/event/Events'
 
 @Resolver()
 export class ContributionMessageResolver {
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index df8524a0c..b99c6b0c7 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -51,7 +51,7 @@ import { userFactory } from '@/seeds/factory/user'
 import { creationFactory } from '@/seeds/factory/creation'
 import { creations } from '@/seeds/creation/index'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 import { logger, i18n as localization } from '@test/testSetup'
 import { raeuberHotzenplotz } from '@/seeds/users/raeuber-hotzenplotz'
 import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 83cf29fc7..e5112e8b4 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -46,7 +46,7 @@ import {
   EVENT_ADMIN_CONTRIBUTION_DELETE,
   EVENT_ADMIN_CONTRIBUTION_CONFIRM,
   EVENT_ADMIN_CONTRIBUTION_DENY,
-} from '@/event/Event'
+} from '@/event/Events'
 import { calculateDecay } from '@/util/decay'
 import {
   sendContributionConfirmedEmail,
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index 5c2fff0ad..1a15a65a9 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -35,7 +35,7 @@ import { listTransactionLinksAdmin } from '@/seeds/graphql/queries'
 import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import { logger } from '@test/testSetup'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 
 // mock semaphore to allow use fake timers
 jest.mock('@/util/TRANSACTIONS_LOCK')
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 6aa829ac1..3b2f7704a 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -38,7 +38,7 @@ import {
   EVENT_TRANSACTION_LINK_CREATE,
   EVENT_TRANSACTION_LINK_DELETE,
   EVENT_TRANSACTION_LINK_REDEEM,
-} from '@/event/Event'
+} from '@/event/Events'
 
 // TODO: do not export, test it inside the resolver
 export const transactionLinkCode = (date: Date): string => {
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index f26234363..0ac1f724a 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -11,7 +11,7 @@ import { User } from '@entity/User'
 import { GraphQLError } from 'graphql'
 import { Event as DbEvent } from '@entity/Event'
 import { findUserByEmail } from './UserResolver'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 import { userFactory } from '@/seeds/factory/user'
 import {
   confirmContribution,
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index f38a4a07b..3620dbcef 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -34,7 +34,7 @@ import {
   sendTransactionLinkRedeemedEmail,
   sendTransactionReceivedEmail,
 } from '@/emails/sendEmailVariants'
-import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Event'
+import { EVENT_TRANSACTION_RECEIVE, EVENT_TRANSACTION_SEND } from '@/event/Events'
 
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import LogError from '@/server/LogError'
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index aebd0f0eb..735c27950 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -45,7 +45,7 @@ import {
 import { contributionLinkFactory } from '@/seeds/factory/contributionLink'
 import { transactionLinkFactory } from '@/seeds/factory/transactionLink'
 import { ContributionLink } from '@model/ContributionLink'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 import { stephenHawking } from '@/seeds/users/stephen-hawking'
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 54d4f583f..8f72b3bcf 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -70,7 +70,7 @@ import {
   EVENT_ADMIN_USER_ROLE_SET,
   EVENT_ADMIN_USER_DELETE,
   EVENT_ADMIN_USER_UNDELETE,
-} from '@/event/Event'
+} from '@/event/Events'
 import { isValidPassword } from '@/password/EncryptorUtils'
 import { encryptPassword, verifyPassword } from '@/password/PasswordEncryptor'
 import LogError from '@/server/LogError'