diff --git a/FoodsharingSiegen.Contracts/Entity/AuditType.cs b/FoodsharingSiegen.Contracts/Entity/AuditType.cs
deleted file mode 100644
index 7284c2c..0000000
--- a/FoodsharingSiegen.Contracts/Entity/AuditType.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace FoodsharingSiegen.Contracts.Entity
-{
-    public enum AuditType : int
-    {
-        None = 0,
-        
-        // Profile
-        SaveProfile = 10,
-        SetOwnPassword = 20,
-        
-        // Usermanagement
-        CreateUser = 30,
-        UpdateUser = 40,
-        RemoveUser = 50,
-        SetUserPassword = 60,
-        
-        // Prospect
-        CreateProspect = 70,
-        EditProspect = 80,
-        AddInteraction = 90,
-        RemoveInteraction = 100
-    }
-}
\ No newline at end of file
diff --git a/FoodsharingSiegen.Contracts/Entity/Enums.cs b/FoodsharingSiegen.Contracts/Entity/Enums.cs
new file mode 100644
index 0000000..e283e20
--- /dev/null
+++ b/FoodsharingSiegen.Contracts/Entity/Enums.cs
@@ -0,0 +1,161 @@
+namespace FoodsharingSiegen.Contracts.Entity
+{
+    /// <summary>
+    ///     The audit type enum
+    /// </summary>
+    public enum AuditType
+    {
+        /// <summary>
+        ///     The none audit type
+        /// </summary>
+        None = 0,
+
+        // Profile
+        /// <summary>
+        ///     The save profile audit type
+        /// </summary>
+        SaveProfile = 10,
+
+        /// <summary>
+        ///     The set own password audit type
+        /// </summary>
+        SetOwnPassword = 20,
+
+        #region Usermanagement
+
+        /// <summary>
+        ///     The create user audit type
+        /// </summary>
+        CreateUser = 30,
+
+        /// <summary>
+        ///     The update user audit type
+        /// </summary>
+        UpdateUser = 40,
+
+        /// <summary>
+        ///     The remove user audit type
+        /// </summary>
+        RemoveUser = 50,
+
+        /// <summary>
+        ///     The set user password audit type
+        /// </summary>
+        SetUserPassword = 60,
+
+        #endregion Usermanagement
+
+        #region Prospects
+
+        // Prospect
+        /// <summary>
+        ///     The create prospect audit type
+        /// </summary>
+        CreateProspect = 70,
+
+        /// <summary>
+        ///     The edit prospect audit type
+        /// </summary>
+        EditProspect = 80,
+
+        /// <summary>
+        ///     The add interaction audit type
+        /// </summary>
+        AddInteraction = 90,
+
+        /// <summary>
+        ///     The remove interaction audit type
+        /// </summary>
+        RemoveInteraction = 100
+
+        #endregion Prospects
+    }
+
+    /// <summary>
+    ///     The user type enum
+    /// </summary>
+    public enum UserType
+    {
+        /// <summary>
+        ///     The unverified user type
+        /// </summary>
+        Unverified = 100,
+
+        /// <summary>
+        ///     The user user type
+        /// </summary>
+        User = 200,
+
+        /// <summary>
+        ///     The admin user type
+        /// </summary>
+        Admin = 300
+    }
+
+    /// <summary>
+    ///     The user group enum
+    /// </summary>
+    public enum UserGroup
+    {
+        /// <summary>
+        ///     The read only user group
+        /// </summary>
+        ReadOnly = 100,
+
+        /// <summary>
+        ///     The welcome team user group
+        /// </summary>
+        WelcomeTeam = 200,
+
+        /// <summary>
+        ///     The store manager user group
+        /// </summary>
+        StoreManager = 300,
+
+        /// <summary>
+        ///     The ambassador user group
+        /// </summary>
+        Ambassador = 400
+    }
+
+    /// <summary>
+    ///     The interaction type enum
+    /// </summary>
+    public enum InteractionType
+    {
+        /// <summary>
+        ///     The ein ab interaction type
+        /// </summary>
+        EinAb = 10,
+
+        /// <summary>
+        ///     The welcome interaction type
+        /// </summary>
+        Welcome = 20,
+
+        /// <summary>
+        ///     The id check interaction type
+        /// </summary>
+        IdCheck = 30,
+
+        /// <summary>
+        ///     The print pass interaction type
+        /// </summary>
+        PrintPass = 40,
+
+        /// <summary>
+        ///     The pdf pass interaction type
+        /// </summary>
+        PdfPass = 50,
+
+        /// <summary>
+        ///     The verify interaction type
+        /// </summary>
+        Verify = 60,
+
+        /// <summary>
+        ///     The complete interaction type
+        /// </summary>
+        Complete = 70
+    }
+}
\ No newline at end of file
diff --git a/FoodsharingSiegen.Contracts/Entity/InteractionType.cs b/FoodsharingSiegen.Contracts/Entity/InteractionType.cs
deleted file mode 100644
index 60bc430..0000000
--- a/FoodsharingSiegen.Contracts/Entity/InteractionType.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace FoodsharingSiegen.Contracts.Entity
-{
-    /// <summary>
-    /// The interaction type enum
-    /// </summary>
-    public enum InteractionType : int
-    {
-        /// <summary>
-        /// The ein ab interaction type
-        /// </summary>
-        EinAb = 10,
-        /// <summary>
-        /// The welcome interaction type
-        /// </summary>
-        Welcome = 20,
-        /// <summary>
-        /// The id check interaction type
-        /// </summary>
-        IdCheck = 30,
-        /// <summary>
-        /// The print pass interaction type
-        /// </summary>
-        PrintPass = 40,
-        /// <summary>
-        /// The pdf pass interaction type
-        /// </summary>
-        PdfPass = 50,
-        /// <summary>
-        /// The verify interaction type
-        /// </summary>
-        Verify = 60,
-        /// <summary>
-        /// The complete interaction type
-        /// </summary>
-        Complete = 70
-    }
-}
diff --git a/FoodsharingSiegen.Contracts/Entity/UserGroup.cs b/FoodsharingSiegen.Contracts/Entity/UserGroup.cs
deleted file mode 100644
index 6a1f87f..0000000
--- a/FoodsharingSiegen.Contracts/Entity/UserGroup.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//------------------------------------------------------------------------------
-// This is auto-generated code.
-//------------------------------------------------------------------------------
-// This code was generated by Entity Developer tool using EF Core template.
-// Code is generated on: 11.04.2022 17:16:51
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//------------------------------------------------------------------------------
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Data.Common;
-using System.Linq;
-using System.Linq.Expressions;
-
-namespace FoodsharingSiegen.Contracts.Entity
-{
-    /// <summary>
-    /// The user group enum
-    /// </summary>
-    public enum UserGroup : int
-    {
-        /// <summary>
-        /// The read only user group
-        /// </summary>
-        ReadOnly = 100,
-        /// <summary>
-        /// The welcome team user group
-        /// </summary>
-        WelcomeTeam = 200,
-        /// <summary>
-        /// The store manager user group
-        /// </summary>
-        StoreManager = 300,
-        /// <summary>
-        /// The ambassador user group
-        /// </summary>
-        Ambassador = 400
-    }
-}
diff --git a/FoodsharingSiegen.Contracts/Entity/UserType.cs b/FoodsharingSiegen.Contracts/Entity/UserType.cs
deleted file mode 100644
index e223af3..0000000
--- a/FoodsharingSiegen.Contracts/Entity/UserType.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//------------------------------------------------------------------------------
-// This is auto-generated code.
-//------------------------------------------------------------------------------
-// This code was generated by Entity Developer tool using EF Core template.
-// Code is generated on: 11.04.2022 17:16:51
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//------------------------------------------------------------------------------
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Data.Common;
-using System.Linq;
-using System.Linq.Expressions;
-
-namespace FoodsharingSiegen.Contracts.Entity
-{
-    /// <summary>
-    /// The user type enum
-    /// </summary>
-    public enum UserType : int
-    {
-        /// <summary>
-        /// The unverified user type
-        /// </summary>
-        Unverified = 100,
-        /// <summary>
-        /// The user user type
-        /// </summary>
-        User = 200,
-        /// <summary>
-        /// The admin user type
-        /// </summary>
-        Admin = 300,
-    }
-}