diff --git a/Package.resolved b/Package.resolved
index a4a61c3..28c6d9b 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/swift-server/async-http-client.git",
         "state": {
           "branch": null,
-          "revision": "fc510a39cff61b849bf5cdff17eb2bd6d0777b49",
-          "version": "1.11.5"
+          "revision": "78db67e5bf4a8543075787f228e8920097319281",
+          "version": "1.18.0"
         }
       },
       {
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/vapor/async-kit.git",
         "state": {
           "branch": null,
-          "revision": "c3329e444bafbb12d1d312af9191be95348a8175",
-          "version": "1.13.0"
+          "revision": "a61da00d404ec91d12766f1b9aac7d90777b484d",
+          "version": "1.17.0"
         }
       },
       {
@@ -24,16 +24,16 @@
         "repositoryURL": "https://github.com/vapor/console-kit.git",
         "state": {
           "branch": null,
-          "revision": "a7e67a1719933318b5ab7eaaed355cde020465b1",
-          "version": "4.5.0"
+          "revision": "447f1046fb4e9df40973fe426ecb24a6f0e8d3b4",
+          "version": "4.6.0"
         }
       },
       {
         "package": "feather-core",
-        "repositoryURL": "https://github.com/feathercms/feather-core",
+        "repositoryURL": "https://github.com/Rando-Coderissian/feather-core",
         "state": {
-          "branch": "dev",
-          "revision": "752952ac420c0dc9fa11bd07f193b1855ff66094",
+          "branch": "test-refactored-modules",
+          "revision": "7a352c919180a9c6f05bc05f1ba86936d8d11e56",
           "version": null
         }
       },
@@ -46,22 +46,13 @@
           "version": null
         }
       },
-      {
-        "package": "feather-objects",
-        "repositoryURL": "https://github.com/feathercms/feather-objects",
-        "state": {
-          "branch": "main",
-          "revision": "169386ce3bf664fa768186467e4aec1caaee0fcf",
-          "version": null
-        }
-      },
       {
         "package": "fluent",
         "repositoryURL": "https://github.com/vapor/fluent",
         "state": {
           "branch": null,
-          "revision": "26c446002f03c5ab34b20d86873014ef3d92d0da",
-          "version": "4.5.0"
+          "revision": "4b4d8bf15a06fd60137e9c543e5503c4b842654e",
+          "version": "4.8.0"
         }
       },
       {
@@ -69,8 +60,8 @@
         "repositoryURL": "https://github.com/vapor/fluent-kit.git",
         "state": {
           "branch": null,
-          "revision": "38670d2eefcba27530272946d627ac8d4e45f017",
-          "version": "1.35.1"
+          "revision": "e53acf986e32c54fe522b2c12f737baa01828c1c",
+          "version": "1.42.2"
         }
       },
       {
@@ -114,8 +105,8 @@
         "repositoryURL": "https://github.com/vapor/multipart-kit.git",
         "state": {
           "branch": null,
-          "revision": "0d55c35e788451ee27222783c7d363cb88092fab",
-          "version": "4.5.2"
+          "revision": "1adfd69df2da08f7931d4281b257475e32c96734",
+          "version": "4.5.4"
         }
       },
       {
@@ -123,8 +114,8 @@
         "repositoryURL": "https://github.com/vapor/routing-kit.git",
         "state": {
           "branch": null,
-          "revision": "ffac7b3a127ce1e85fb232f1a6271164628809ad",
-          "version": "4.6.0"
+          "revision": "611bc45c5dfb1f54b84d99b89d1f72191fb6b71b",
+          "version": "4.7.2"
         }
       },
       {
@@ -132,8 +123,8 @@
         "repositoryURL": "https://github.com/vapor/sql-kit.git",
         "state": {
           "branch": null,
-          "revision": "3c5413a229bc2abc962dab17ea66d25e448ad344",
-          "version": "3.21.0"
+          "revision": "5026e7c0f2e464ea1af9f5948701aa8922ab14eb",
+          "version": "3.27.0"
         }
       },
       {
@@ -150,8 +141,8 @@
         "repositoryURL": "https://github.com/apple/swift-atomics.git",
         "state": {
           "branch": null,
-          "revision": "919eb1d83e02121cdb434c7bfc1f0c66ef17febe",
-          "version": "1.0.2"
+          "revision": "6c89474e62719ddcc1e9614989fff2f68208fe10",
+          "version": "1.1.0"
         }
       },
       {
@@ -168,8 +159,8 @@
         "repositoryURL": "https://github.com/apple/swift-collections.git",
         "state": {
           "branch": null,
-          "revision": "f504716c27d2e5d4144fa4794b12129301d17729",
-          "version": "1.0.3"
+          "revision": "937e904258d22af6e447a0b72c0bc67583ef64a2",
+          "version": "1.0.4"
         }
       },
       {
@@ -177,8 +168,8 @@
         "repositoryURL": "https://github.com/apple/swift-crypto.git",
         "state": {
           "branch": null,
-          "revision": "d9825fa541df64b1a7b182178d61b9a82730d01f",
-          "version": "2.1.0"
+          "revision": "33a20e650c33f6d72d822d558333f2085effa3dc",
+          "version": "2.5.0"
         }
       },
       {
@@ -186,8 +177,8 @@
         "repositoryURL": "https://github.com/binarybirds/swift-html",
         "state": {
           "branch": null,
-          "revision": "e07678a77d296e66fa891a9d4d08acc4471d1783",
-          "version": "1.6.11"
+          "revision": "f4fa5bc83fbee8dbd301c6fbb3969437415adad0",
+          "version": "1.7.0"
         }
       },
       {
@@ -195,8 +186,8 @@
         "repositoryURL": "https://github.com/apple/swift-log.git",
         "state": {
           "branch": null,
-          "revision": "6fe203dc33195667ce1759bf0182975e4653ba1c",
-          "version": "1.4.4"
+          "revision": "32e8d724467f8fe623624570367e3d50c5638e46",
+          "version": "1.5.2"
         }
       },
       {
@@ -204,8 +195,8 @@
         "repositoryURL": "https://github.com/apple/swift-metrics.git",
         "state": {
           "branch": null,
-          "revision": "53be78637ecd165d1ddedc4e20de69b8f43ec3b7",
-          "version": "2.3.2"
+          "revision": "e8bced74bc6d747745935e469f45d03f048d6cbd",
+          "version": "2.3.4"
         }
       },
       {
@@ -213,8 +204,8 @@
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "b4e0a274f7f34210e97e2f2c50ab02a10b549250",
-          "version": "2.41.1"
+          "revision": "2d8e6ca36fe3e8ed74b0883f593757a45463c34d",
+          "version": "2.53.0"
         }
       },
       {
@@ -222,8 +213,8 @@
         "repositoryURL": "https://github.com/apple/swift-nio-extras.git",
         "state": {
           "branch": null,
-          "revision": "6c84d247754ad77487a6f0694273b89b83efd056",
-          "version": "1.14.0"
+          "revision": "0e0d0aab665ff1a0659ce75ac003081f2b1c8997",
+          "version": "1.19.0"
         }
       },
       {
@@ -231,8 +222,8 @@
         "repositoryURL": "https://github.com/apple/swift-nio-http2.git",
         "state": {
           "branch": null,
-          "revision": "f9ab1c94c80d568efd762d2a638f25162691d766",
-          "version": "1.22.1"
+          "revision": "6d021a48483dbb273a9be43f65234bdc9185b364",
+          "version": "1.26.0"
         }
       },
       {
@@ -240,8 +231,8 @@
         "repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
         "state": {
           "branch": null,
-          "revision": "ba7c0d7f82affc518147ea61d240330bf7f7ea9b",
-          "version": "2.22.1"
+          "revision": "e866a626e105042a6a72a870c88b4c531ba05f83",
+          "version": "2.24.0"
         }
       },
       {
@@ -249,8 +240,8 @@
         "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
         "state": {
           "branch": null,
-          "revision": "4e02d9cf35cabfb538c96613272fb027dd0c8692",
-          "version": "1.13.1"
+          "revision": "41f4098903878418537020075a4d8a6e20a0b182",
+          "version": "1.17.0"
         }
       },
       {
@@ -264,10 +255,10 @@
       },
       {
         "package": "user-objects",
-        "repositoryURL": "https://github.com/feathercms/user-objects",
+        "repositoryURL": "https://github.com/Rando-Coderissian/user-objects",
         "state": {
-          "branch": "main",
-          "revision": "7ffe36b06b753e906a263e4864d8ff3bdc6830d7",
+          "branch": "test-refactor-modules",
+          "revision": "ac2fa6f42b5f17c12202e9f0cdab1eb4f5913743",
           "version": null
         }
       },
@@ -276,8 +267,8 @@
         "repositoryURL": "https://github.com/vapor/vapor",
         "state": {
           "branch": null,
-          "revision": "dda0de537e7906414dccd551e77095be1e34e3da",
-          "version": "4.65.2"
+          "revision": "8b79ff0bd264a33bd0b7471dcf50dd1be983f992",
+          "version": "4.76.3"
         }
       },
       {
@@ -285,8 +276,8 @@
         "repositoryURL": "https://github.com/vapor/websocket-kit.git",
         "state": {
           "branch": null,
-          "revision": "2d9d2188a08eef4a869d368daab21b3c08510991",
-          "version": "2.6.1"
+          "revision": "2ec14506d5f8199926906dc5a620ac22b147db86",
+          "version": "2.13.0"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
index 2bbbaee..0d7411b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -10,14 +10,14 @@ let package = Package(
         .library(name: "UserModule", targets: ["UserModule"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/feathercms/feather-core", .branch("dev")),
-        .package(url: "https://github.com/feathercms/user-objects", .branch("main")),
+       .package(url: "https://github.com/feathercms/feather-core", .branch("dev")),
+       .package(url: "https://github.com/feathercms/user-objects", .branch("main")),
     ],
     targets: [
         .target(name: "UserModule",
                 dependencies: [
                     .product(name: "UserObjects", package: "user-objects"),
-                    .product(name: "Feather", package: "feather-core"),
+                    .product(name: "FeatherCore", package: "feather-core"),
                 ],
                 resources: [
 //                    .copy("Bundle"),
diff --git a/Sources/UserModule/Interface/Api/UserAccountApi.swift b/Sources/UserModule/Interface/Api/UserAccountApi.swift
index 57c59c5..903e1a8 100644
--- a/Sources/UserModule/Interface/Api/UserAccountApi.swift
+++ b/Sources/UserModule/Interface/Api/UserAccountApi.swift
@@ -1,12 +1,5 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 02. 24..
-//
-
 import Foundation
-import Feather
+import FeatherCore
 import UserObjects
 import Fluent
 
diff --git a/Sources/UserModule/Interface/Api/UserAccountRoleApi.swift b/Sources/UserModule/Interface/Api/UserAccountRoleApi.swift
index 227f512..d0c41d3 100644
--- a/Sources/UserModule/Interface/Api/UserAccountRoleApi.swift
+++ b/Sources/UserModule/Interface/Api/UserAccountRoleApi.swift
@@ -1,12 +1,5 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 03. 31..
-//
-
 import Foundation
-import Feather
+import FeatherCore
 import UserObjects
 import Fluent
 
diff --git a/Sources/UserModule/Interface/Api/UserInvitationApi.swift b/Sources/UserModule/Interface/Api/UserInvitationApi.swift
index 4a2810f..7018ebc 100644
--- a/Sources/UserModule/Interface/Api/UserInvitationApi.swift
+++ b/Sources/UserModule/Interface/Api/UserInvitationApi.swift
@@ -1,12 +1,5 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 03. 27..
-//
-
 import Foundation
-import Feather
+import FeatherCore
 import UserObjects
 
 public struct UserInvitationApi {
diff --git a/Sources/UserModule/Interface/Api/UserProfileApi.swift b/Sources/UserModule/Interface/Api/UserProfileApi.swift
index bed8959..005dd83 100644
--- a/Sources/UserModule/Interface/Api/UserProfileApi.swift
+++ b/Sources/UserModule/Interface/Api/UserProfileApi.swift
@@ -1,12 +1,5 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 03. 27..
-//
-
 import Foundation
-import Feather
+import FeatherCore
 import UserObjects
 
 public struct UserProfileApi {
diff --git a/Sources/UserModule/Interface/Api/UserRoleApi.swift b/Sources/UserModule/Interface/Api/UserRoleApi.swift
index ef06f2d..e1418db 100644
--- a/Sources/UserModule/Interface/Api/UserRoleApi.swift
+++ b/Sources/UserModule/Interface/Api/UserRoleApi.swift
@@ -1,12 +1,5 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 02. 28..
-//
-
 import Foundation
-import Feather
+import FeatherCore
 import UserObjects
 
 public struct UserRoleApi {
diff --git a/Sources/UserModule/Interface/Template/Contexts/UserInvitationContext.swift b/Sources/UserModule/Interface/Template/Contexts/UserInvitationContext.swift
index ba63be3..4f833a1 100644
--- a/Sources/UserModule/Interface/Template/Contexts/UserInvitationContext.swift
+++ b/Sources/UserModule/Interface/Template/Contexts/UserInvitationContext.swift
@@ -6,7 +6,7 @@
 //
 
 import SwiftSgml
-import Feather
+import FeatherCore
 
 public struct UserInvitationContext {
     public let title: String
diff --git a/Sources/UserModule/Interface/Template/Contexts/UserLoginContext.swift b/Sources/UserModule/Interface/Template/Contexts/UserLoginContext.swift
index 042936b..060aa33 100644
--- a/Sources/UserModule/Interface/Template/Contexts/UserLoginContext.swift
+++ b/Sources/UserModule/Interface/Template/Contexts/UserLoginContext.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 23..
 //
 
-import Feather
+import FeatherCore
 
 public struct UserLoginContext {
     public let title: String
diff --git a/Sources/UserModule/Interface/Template/Contexts/UserNewPasswordContext.swift b/Sources/UserModule/Interface/Template/Contexts/UserNewPasswordContext.swift
index f3d5bf0..4d1b75a 100644
--- a/Sources/UserModule/Interface/Template/Contexts/UserNewPasswordContext.swift
+++ b/Sources/UserModule/Interface/Template/Contexts/UserNewPasswordContext.swift
@@ -6,7 +6,7 @@
 //
 
 import SwiftSgml
-import Feather
+import FeatherCore
 
 public struct UserNewPasswordContext {
     public let title: String
diff --git a/Sources/UserModule/Interface/Template/Contexts/UserRegisterContext.swift b/Sources/UserModule/Interface/Template/Contexts/UserRegisterContext.swift
index 1f18abb..62ad6ac 100644
--- a/Sources/UserModule/Interface/Template/Contexts/UserRegisterContext.swift
+++ b/Sources/UserModule/Interface/Template/Contexts/UserRegisterContext.swift
@@ -6,7 +6,7 @@
 //
 
 import SwiftSgml
-import Feather
+import FeatherCore
 
 public struct UserRegisterContext {
     public let title: String
diff --git a/Sources/UserModule/Interface/Template/Contexts/UserResetPasswordContext.swift b/Sources/UserModule/Interface/Template/Contexts/UserResetPasswordContext.swift
index 13b1cea..eee97a8 100644
--- a/Sources/UserModule/Interface/Template/Contexts/UserResetPasswordContext.swift
+++ b/Sources/UserModule/Interface/Template/Contexts/UserResetPasswordContext.swift
@@ -6,7 +6,7 @@
 //
 
 import SwiftSgml
-import Feather
+import FeatherCore
 
 public struct UserResetPasswordContext {
     public let title: String
diff --git a/Sources/UserModule/Interface/Template/UserModuleTemplate.swift b/Sources/UserModule/Interface/Template/UserModuleTemplate.swift
index fa82ed0..5ea7d35 100644
--- a/Sources/UserModule/Interface/Template/UserModuleTemplate.swift
+++ b/Sources/UserModule/Interface/Template/UserModuleTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import SwiftSgml
-import Feather
+import FeatherCore
 
 public protocol UserModuleTemplate: FeatherTemplate {
     func login(_ context: UserLoginContext) -> AbstractTemplate<UserLoginContext>
diff --git a/Sources/UserModule/Interface/User+Hooks.swift b/Sources/UserModule/Interface/User+Hooks.swift
index ffd3ee8..bab7445 100644
--- a/Sources/UserModule/Interface/User+Hooks.swift
+++ b/Sources/UserModule/Interface/User+Hooks.swift
@@ -1,11 +1,4 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 03. 27..
-//
-
-import Feather
+import FeatherCore
 
 public extension HookName {
     static let installUserRoles: HookName = "install-user-roles"
diff --git a/Sources/UserModule/Interface/UserConfig.swift b/Sources/UserModule/Interface/UserConfig.swift
index 2271aaa..75c5424 100644
--- a/Sources/UserModule/Interface/UserConfig.swift
+++ b/Sources/UserModule/Interface/UserConfig.swift
@@ -1,10 +1,3 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 03. 15..
-//
-
 import Foundation
 
 public struct UserConfig {
diff --git a/Sources/UserModule/Interface/UserFactory.swift b/Sources/UserModule/Interface/UserFactory.swift
index c44e6b4..222bf26 100644
--- a/Sources/UserModule/Interface/UserFactory.swift
+++ b/Sources/UserModule/Interface/UserFactory.swift
@@ -1,11 +1,4 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 02. 23..
-//
-
-import Feather
+import FeatherCore
 
 /// user module factory
 public struct UserModuleFactory {
diff --git a/Sources/UserModule/Interface/UserInterface.swift b/Sources/UserModule/Interface/UserInterface.swift
index fd4cee5..a874160 100644
--- a/Sources/UserModule/Interface/UserInterface.swift
+++ b/Sources/UserModule/Interface/UserInterface.swift
@@ -1,13 +1,6 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 02. 23..
-//
-
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 
 public struct UserInterface {
     
diff --git a/Sources/UserModule/Internal/Authenticators/UserAccountSessionAuthenticator.swift b/Sources/UserModule/Internal/Authenticators/UserAccountSessionAuthenticator.swift
index 0ba2488..d8fd2cb 100644
--- a/Sources/UserModule/Internal/Authenticators/UserAccountSessionAuthenticator.swift
+++ b/Sources/UserModule/Internal/Authenticators/UserAccountSessionAuthenticator.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import FeatherObjects
 import UserObjects
 
diff --git a/Sources/UserModule/Internal/Authenticators/UserAccountTokenAuthenticator.swift b/Sources/UserModule/Internal/Authenticators/UserAccountTokenAuthenticator.swift
index fb3bea6..8b4005c 100644
--- a/Sources/UserModule/Internal/Authenticators/UserAccountTokenAuthenticator.swift
+++ b/Sources/UserModule/Internal/Authenticators/UserAccountTokenAuthenticator.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import FeatherObjects
 import UserObjects
 
diff --git a/Sources/UserModule/Internal/Controllers/Admin/UserAccountAdminController.swift b/Sources/UserModule/Internal/Controllers/Admin/UserAccountAdminController.swift
index c462a8b..b8bd022 100644
--- a/Sources/UserModule/Internal/Controllers/Admin/UserAccountAdminController.swift
+++ b/Sources/UserModule/Internal/Controllers/Admin/UserAccountAdminController.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 11. 23..
 //
 
-import Feather
+import FeatherCore
 import Fluent
 import UserObjects
 import Vapor
diff --git a/Sources/UserModule/Internal/Controllers/Admin/UserInvitationAdminController.swift b/Sources/UserModule/Internal/Controllers/Admin/UserInvitationAdminController.swift
index e450bbd..adaf1fa 100644
--- a/Sources/UserModule/Internal/Controllers/Admin/UserInvitationAdminController.swift
+++ b/Sources/UserModule/Internal/Controllers/Admin/UserInvitationAdminController.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2022. 03. 27..
 //
 
-import Feather
+import FeatherCore
 import Fluent
 import UserObjects
 import Vapor
diff --git a/Sources/UserModule/Internal/Controllers/Admin/UserProfileAdminController.swift b/Sources/UserModule/Internal/Controllers/Admin/UserProfileAdminController.swift
index 92f8153..48d7dc9 100644
--- a/Sources/UserModule/Internal/Controllers/Admin/UserProfileAdminController.swift
+++ b/Sources/UserModule/Internal/Controllers/Admin/UserProfileAdminController.swift
@@ -1,12 +1,5 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 03. 04..
-//
-
 import Vapor
-import Feather
+import FeatherCore
 import FeatherObjects
 import UserObjects
 
diff --git a/Sources/UserModule/Internal/Controllers/Admin/UserRoleAdminController.swift b/Sources/UserModule/Internal/Controllers/Admin/UserRoleAdminController.swift
index 0328875..d0c7169 100644
--- a/Sources/UserModule/Internal/Controllers/Admin/UserRoleAdminController.swift
+++ b/Sources/UserModule/Internal/Controllers/Admin/UserRoleAdminController.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import Fluent
 import UserObjects
 
diff --git a/Sources/UserModule/Internal/Controllers/Apis/UserAccountApiController.swift b/Sources/UserModule/Internal/Controllers/Apis/UserAccountApiController.swift
index 4337758..18c20bf 100644
--- a/Sources/UserModule/Internal/Controllers/Apis/UserAccountApiController.swift
+++ b/Sources/UserModule/Internal/Controllers/Apis/UserAccountApiController.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import UserObjects
 
 extension User.Account.List: Content {}
diff --git a/Sources/UserModule/Internal/Controllers/Apis/UserAuthApiController.swift b/Sources/UserModule/Internal/Controllers/Apis/UserAuthApiController.swift
index 3eb3b77..42f5da4 100644
--- a/Sources/UserModule/Internal/Controllers/Apis/UserAuthApiController.swift
+++ b/Sources/UserModule/Internal/Controllers/Apis/UserAuthApiController.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import FeatherObjects
 import UserObjects
 import Fluent
diff --git a/Sources/UserModule/Internal/Controllers/Apis/UserInvitationApiController.swift b/Sources/UserModule/Internal/Controllers/Apis/UserInvitationApiController.swift
index fb26812..026a795 100644
--- a/Sources/UserModule/Internal/Controllers/Apis/UserInvitationApiController.swift
+++ b/Sources/UserModule/Internal/Controllers/Apis/UserInvitationApiController.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import UserObjects
 
 extension User.Invitation.List: Content {}
diff --git a/Sources/UserModule/Internal/Controllers/Apis/UserRoleApiController.swift b/Sources/UserModule/Internal/Controllers/Apis/UserRoleApiController.swift
index cc11ac3..20039a3 100644
--- a/Sources/UserModule/Internal/Controllers/Apis/UserRoleApiController.swift
+++ b/Sources/UserModule/Internal/Controllers/Apis/UserRoleApiController.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import UserObjects
 
 extension User.Role.List: Content {}
diff --git a/Sources/UserModule/Internal/Controllers/AuthController.swift b/Sources/UserModule/Internal/Controllers/AuthController.swift
index 7c6ab75..49ddc04 100644
--- a/Sources/UserModule/Internal/Controllers/AuthController.swift
+++ b/Sources/UserModule/Internal/Controllers/AuthController.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import Mail
 
 //extension Request {
diff --git a/Sources/UserModule/Internal/Controllers/Install/UserInstallStepController.swift b/Sources/UserModule/Internal/Controllers/Install/UserInstallStepController.swift
index 94e2769..0c46da7 100644
--- a/Sources/UserModule/Internal/Controllers/Install/UserInstallStepController.swift
+++ b/Sources/UserModule/Internal/Controllers/Install/UserInstallStepController.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import FeatherObjects
 
 struct UserInstallStepController: SystemInstallStepController {
diff --git a/Sources/UserModule/Internal/Controllers/Web/UserAuthController.swift b/Sources/UserModule/Internal/Controllers/Web/UserAuthController.swift
index bdff597..a02ae63 100644
--- a/Sources/UserModule/Internal/Controllers/Web/UserAuthController.swift
+++ b/Sources/UserModule/Internal/Controllers/Web/UserAuthController.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 11. 27..
 //
 
-import Feather
+import FeatherCore
 import Vapor
 import Fluent
 import FeatherObjects
diff --git a/Sources/UserModule/Internal/Database/Models/UserAccountModel.swift b/Sources/UserModule/Internal/Database/Models/UserAccountModel.swift
index 0a8738f..d94b519 100644
--- a/Sources/UserModule/Internal/Database/Models/UserAccountModel.swift
+++ b/Sources/UserModule/Internal/Database/Models/UserAccountModel.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import Feather
+import FeatherCore
 import Fluent
 
 final class UserAccountModel: FeatherDatabaseModel {
diff --git a/Sources/UserModule/Internal/Database/Models/UserAccountRoleModel.swift b/Sources/UserModule/Internal/Database/Models/UserAccountRoleModel.swift
index 92c0cf1..d05f963 100644
--- a/Sources/UserModule/Internal/Database/Models/UserAccountRoleModel.swift
+++ b/Sources/UserModule/Internal/Database/Models/UserAccountRoleModel.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import Feather
+import FeatherCore
 import Fluent
 
 final class UserAccountRoleModel: FeatherDatabaseModel {
diff --git a/Sources/UserModule/Internal/Database/Models/UserInvitationModel.swift b/Sources/UserModule/Internal/Database/Models/UserInvitationModel.swift
index de2ab22..79b91a5 100644
--- a/Sources/UserModule/Internal/Database/Models/UserInvitationModel.swift
+++ b/Sources/UserModule/Internal/Database/Models/UserInvitationModel.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import Feather
+import FeatherCore
 import Fluent
 
 final class UserInvitationModel: FeatherDatabaseModel {
diff --git a/Sources/UserModule/Internal/Database/Models/UserResetPasswordModel.swift b/Sources/UserModule/Internal/Database/Models/UserResetPasswordModel.swift
index 22c64bc..62b93a5 100644
--- a/Sources/UserModule/Internal/Database/Models/UserResetPasswordModel.swift
+++ b/Sources/UserModule/Internal/Database/Models/UserResetPasswordModel.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import Feather
+import FeatherCore
 import Fluent
 
 final class UserResetPasswordModel: FeatherDatabaseModel {
diff --git a/Sources/UserModule/Internal/Database/Models/UserRoleModel.swift b/Sources/UserModule/Internal/Database/Models/UserRoleModel.swift
index 4101596..ca283fd 100644
--- a/Sources/UserModule/Internal/Database/Models/UserRoleModel.swift
+++ b/Sources/UserModule/Internal/Database/Models/UserRoleModel.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import Feather
+import FeatherCore
 import Fluent
 
 final class UserRoleModel: FeatherDatabaseModel {
diff --git a/Sources/UserModule/Internal/Database/Models/UserRolePermissionModel.swift b/Sources/UserModule/Internal/Database/Models/UserRolePermissionModel.swift
index 7f8d4bd..294733d 100644
--- a/Sources/UserModule/Internal/Database/Models/UserRolePermissionModel.swift
+++ b/Sources/UserModule/Internal/Database/Models/UserRolePermissionModel.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import Fluent
-import Feather
+import FeatherCore
 
 final class UserRolePermissionModel: FeatherDatabaseModel {
     typealias Module = UserModule
diff --git a/Sources/UserModule/Internal/Database/Models/UserTokenModel.swift b/Sources/UserModule/Internal/Database/Models/UserTokenModel.swift
index c3f0aa0..26c69e3 100644
--- a/Sources/UserModule/Internal/Database/Models/UserTokenModel.swift
+++ b/Sources/UserModule/Internal/Database/Models/UserTokenModel.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import Feather
+import FeatherCore
 import Fluent
 
 final class UserTokenModel: FeatherDatabaseModel {
diff --git a/Sources/UserModule/Internal/Database/Repositories/UserAccountRepository.swift b/Sources/UserModule/Internal/Database/Repositories/UserAccountRepository.swift
index 6a698fa..6b06e1e 100644
--- a/Sources/UserModule/Internal/Database/Repositories/UserAccountRepository.swift
+++ b/Sources/UserModule/Internal/Database/Repositories/UserAccountRepository.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 
 struct UserAccountRepository: FeatherModelRepository {
     typealias DatabaseModel = UserAccountModel
diff --git a/Sources/UserModule/Internal/Database/Repositories/UserAccountRoleRepository.swift b/Sources/UserModule/Internal/Database/Repositories/UserAccountRoleRepository.swift
index 8633d2a..03a1798 100644
--- a/Sources/UserModule/Internal/Database/Repositories/UserAccountRoleRepository.swift
+++ b/Sources/UserModule/Internal/Database/Repositories/UserAccountRoleRepository.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 
 struct UserAccountRoleRepository: FeatherModelRepository {
     typealias DatabaseModel = UserAccountRoleModel
diff --git a/Sources/UserModule/Internal/Database/Repositories/UserInvitationRepository.swift b/Sources/UserModule/Internal/Database/Repositories/UserInvitationRepository.swift
index 74f6f41..1263af0 100644
--- a/Sources/UserModule/Internal/Database/Repositories/UserInvitationRepository.swift
+++ b/Sources/UserModule/Internal/Database/Repositories/UserInvitationRepository.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2022. 03. 27..
 //
 
-import Feather
+import FeatherCore
 import Vapor
 import Fluent
 import FeatherObjects
diff --git a/Sources/UserModule/Internal/Database/Repositories/UserResetPasswordRepository.swift b/Sources/UserModule/Internal/Database/Repositories/UserResetPasswordRepository.swift
index 20f179b..7171980 100644
--- a/Sources/UserModule/Internal/Database/Repositories/UserResetPasswordRepository.swift
+++ b/Sources/UserModule/Internal/Database/Repositories/UserResetPasswordRepository.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 
 struct UserResetPasswordRepository: FeatherModelRepository {
     typealias DatabaseModel = UserResetPasswordModel
diff --git a/Sources/UserModule/Internal/Database/Repositories/UserRoleRepository.swift b/Sources/UserModule/Internal/Database/Repositories/UserRoleRepository.swift
index 2e643a2..57f074e 100644
--- a/Sources/UserModule/Internal/Database/Repositories/UserRoleRepository.swift
+++ b/Sources/UserModule/Internal/Database/Repositories/UserRoleRepository.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2022. 02. 28..
 //
 
-import Feather
+import FeatherCore
 import Vapor
 import Fluent
 import FeatherObjects
diff --git a/Sources/UserModule/Internal/Database/Repositories/UserTokenRepository.swift b/Sources/UserModule/Internal/Database/Repositories/UserTokenRepository.swift
index bd9b3b7..7c5cc2b 100644
--- a/Sources/UserModule/Internal/Database/Repositories/UserTokenRepository.swift
+++ b/Sources/UserModule/Internal/Database/Repositories/UserTokenRepository.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 
 struct UserTokenRepository: FeatherModelRepository {
     typealias DatabaseModel = UserTokenModel
diff --git a/Sources/UserModule/Internal/Editors/UserAccountEditor.swift b/Sources/UserModule/Internal/Editors/UserAccountEditor.swift
index 673ed95..6e3bda6 100644
--- a/Sources/UserModule/Internal/Editors/UserAccountEditor.swift
+++ b/Sources/UserModule/Internal/Editors/UserAccountEditor.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import UserObjects
 
 struct UserAccountEditor: FeatherModelEditor {
diff --git a/Sources/UserModule/Internal/Editors/UserInvitationEditor.swift b/Sources/UserModule/Internal/Editors/UserInvitationEditor.swift
index b028112..d8c49eb 100644
--- a/Sources/UserModule/Internal/Editors/UserInvitationEditor.swift
+++ b/Sources/UserModule/Internal/Editors/UserInvitationEditor.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import UserObjects
 
 struct UserInvitationEditor: FeatherModelEditor {
diff --git a/Sources/UserModule/Internal/Editors/UserRoleEditor.swift b/Sources/UserModule/Internal/Editors/UserRoleEditor.swift
index 35af774..a02aab4 100644
--- a/Sources/UserModule/Internal/Editors/UserRoleEditor.swift
+++ b/Sources/UserModule/Internal/Editors/UserRoleEditor.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import Fluent
 import UserObjects
 
diff --git a/Sources/UserModule/Internal/Forms/UserInstallForm.swift b/Sources/UserModule/Internal/Forms/UserInstallForm.swift
index e9b6a8b..dbac449 100644
--- a/Sources/UserModule/Internal/Forms/UserInstallForm.swift
+++ b/Sources/UserModule/Internal/Forms/UserInstallForm.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 
 final class UserInstallForm: AbstractForm {
 
diff --git a/Sources/UserModule/Internal/Forms/UserInvitationForm.swift b/Sources/UserModule/Internal/Forms/UserInvitationForm.swift
index dd8d61a..b87c3ca 100644
--- a/Sources/UserModule/Internal/Forms/UserInvitationForm.swift
+++ b/Sources/UserModule/Internal/Forms/UserInvitationForm.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 
 final class UserInvitationForm: AbstractForm {
 
diff --git a/Sources/UserModule/Internal/Forms/UserLoginForm.swift b/Sources/UserModule/Internal/Forms/UserLoginForm.swift
index 9e05d89..eb8e0f9 100644
--- a/Sources/UserModule/Internal/Forms/UserLoginForm.swift
+++ b/Sources/UserModule/Internal/Forms/UserLoginForm.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 
 final class UserLoginForm: AbstractForm {
 
diff --git a/Sources/UserModule/Internal/Forms/UserNewPasswordForm.swift b/Sources/UserModule/Internal/Forms/UserNewPasswordForm.swift
index 080b7d1..eb0f3fb 100644
--- a/Sources/UserModule/Internal/Forms/UserNewPasswordForm.swift
+++ b/Sources/UserModule/Internal/Forms/UserNewPasswordForm.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 
 final class UserNewPasswordForm: AbstractForm {
 
diff --git a/Sources/UserModule/Internal/Forms/UserRegisterForm.swift b/Sources/UserModule/Internal/Forms/UserRegisterForm.swift
index a1e92d3..905af77 100644
--- a/Sources/UserModule/Internal/Forms/UserRegisterForm.swift
+++ b/Sources/UserModule/Internal/Forms/UserRegisterForm.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 
 final class UserRegisterForm: AbstractForm {
     
diff --git a/Sources/UserModule/Internal/Forms/UserResetPasswordForm.swift b/Sources/UserModule/Internal/Forms/UserResetPasswordForm.swift
index 27c0110..2924553 100644
--- a/Sources/UserModule/Internal/Forms/UserResetPasswordForm.swift
+++ b/Sources/UserModule/Internal/Forms/UserResetPasswordForm.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 
 final class UserResetPasswordForm: AbstractForm {
 
diff --git a/Sources/UserModule/Internal/Routers/UserRouter.swift b/Sources/UserModule/Internal/Routers/UserRouter.swift
index d9845c0..706aef7 100644
--- a/Sources/UserModule/Internal/Routers/UserRouter.swift
+++ b/Sources/UserModule/Internal/Routers/UserRouter.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import UserObjects
 
 struct UserRouter: FeatherRouter {
diff --git a/Sources/UserModule/Internal/Templates/Contexts/UserInstallStepContext.swift b/Sources/UserModule/Internal/Templates/Contexts/UserInstallStepContext.swift
index 88196cc..8c987e6 100644
--- a/Sources/UserModule/Internal/Templates/Contexts/UserInstallStepContext.swift
+++ b/Sources/UserModule/Internal/Templates/Contexts/UserInstallStepContext.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 25..
 //
 
-import Feather
+import FeatherCore
 
 struct UserInstallStepContext {
 
diff --git a/Sources/UserModule/Internal/Templates/DefaultUserModuleTemplate.swift b/Sources/UserModule/Internal/Templates/DefaultUserModuleTemplate.swift
index fdb673d..1460319 100644
--- a/Sources/UserModule/Internal/Templates/DefaultUserModuleTemplate.swift
+++ b/Sources/UserModule/Internal/Templates/DefaultUserModuleTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import SwiftSgml
 
 struct DefaultUserModuleTemplate: UserModuleTemplate {
diff --git a/Sources/UserModule/Internal/Templates/Html/UserAdminWidgetTemplate.swift b/Sources/UserModule/Internal/Templates/Html/UserAdminWidgetTemplate.swift
index 65d0070..8cc7a00 100644
--- a/Sources/UserModule/Internal/Templates/Html/UserAdminWidgetTemplate.swift
+++ b/Sources/UserModule/Internal/Templates/Html/UserAdminWidgetTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import SwiftHtml
 import FeatherIcons
 import UserObjects
diff --git a/Sources/UserModule/Internal/Templates/Html/UserInstallStepTemplate.swift b/Sources/UserModule/Internal/Templates/Html/UserInstallStepTemplate.swift
index 995ae8f..400e6cd 100644
--- a/Sources/UserModule/Internal/Templates/Html/UserInstallStepTemplate.swift
+++ b/Sources/UserModule/Internal/Templates/Html/UserInstallStepTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import SwiftHtml
 
 final class UserInstallStepTemplate: AbstractTemplate<UserInstallStepContext> {
diff --git a/Sources/UserModule/Internal/Templates/Html/UserInvitationAdminTemplate.swift b/Sources/UserModule/Internal/Templates/Html/UserInvitationAdminTemplate.swift
index 6063e2a..9682a5d 100644
--- a/Sources/UserModule/Internal/Templates/Html/UserInvitationAdminTemplate.swift
+++ b/Sources/UserModule/Internal/Templates/Html/UserInvitationAdminTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import SwiftHtml
 
 final class UserInvitationAdminTemplate: AbstractTemplate<UserInvitationContext> {
diff --git a/Sources/UserModule/Internal/Templates/Html/UserLoginTemplate.swift b/Sources/UserModule/Internal/Templates/Html/UserLoginTemplate.swift
index 0347900..1d8def0 100644
--- a/Sources/UserModule/Internal/Templates/Html/UserLoginTemplate.swift
+++ b/Sources/UserModule/Internal/Templates/Html/UserLoginTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import SwiftHtml
 
 final class UserLoginTemplate: AbstractTemplate<UserLoginContext> {
diff --git a/Sources/UserModule/Internal/Templates/Html/UserNewPasswordTemplate.swift b/Sources/UserModule/Internal/Templates/Html/UserNewPasswordTemplate.swift
index d1b6c21..9c94aab 100644
--- a/Sources/UserModule/Internal/Templates/Html/UserNewPasswordTemplate.swift
+++ b/Sources/UserModule/Internal/Templates/Html/UserNewPasswordTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import SwiftHtml
 
 final class UserNewPasswordTemplate: AbstractTemplate<UserNewPasswordContext> {
diff --git a/Sources/UserModule/Internal/Templates/Html/UserRegisterTemplate.swift b/Sources/UserModule/Internal/Templates/Html/UserRegisterTemplate.swift
index 9e87a9d..4846f3b 100644
--- a/Sources/UserModule/Internal/Templates/Html/UserRegisterTemplate.swift
+++ b/Sources/UserModule/Internal/Templates/Html/UserRegisterTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import SwiftHtml
 
 final class UserRegisterTemplate: AbstractTemplate<UserRegisterContext> {
diff --git a/Sources/UserModule/Internal/Templates/Html/UserResetPasswordTemplate.swift b/Sources/UserModule/Internal/Templates/Html/UserResetPasswordTemplate.swift
index 11f1b2f..d146c59 100644
--- a/Sources/UserModule/Internal/Templates/Html/UserResetPasswordTemplate.swift
+++ b/Sources/UserModule/Internal/Templates/Html/UserResetPasswordTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import SwiftHtml
 
 final class UserResetPasswordTemplate: AbstractTemplate<UserResetPasswordContext> {
diff --git a/Sources/UserModule/Internal/UserModule.swift b/Sources/UserModule/Internal/UserModule.swift
index accd824..e783588 100644
--- a/Sources/UserModule/Internal/UserModule.swift
+++ b/Sources/UserModule/Internal/UserModule.swift
@@ -1,13 +1,6 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2021. 11. 23..
-//
-
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import FeatherObjects
 import UserObjects