diff --git a/Package.resolved b/Package.resolved
index 8e85e1d..aaa0a4c 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": "7a4dfe026f6ee0f8ad741b58df74c60af296365d",
-          "version": "1.9.0"
+          "revision": "78db67e5bf4a8543075787f228e8920097319281",
+          "version": "1.18.0"
         }
       },
       {
@@ -15,16 +15,16 @@
         "repositoryURL": "https://github.com/vapor/async-kit.git",
         "state": {
           "branch": null,
-          "revision": "e2f741640364c1d271405da637029ea6a33f754e",
-          "version": "1.11.1"
+          "revision": "a61da00d404ec91d12766f1b9aac7d90777b484d",
+          "version": "1.17.0"
         }
       },
       {
         "package": "blog-objects",
-        "repositoryURL": "https://github.com/feathercms/blog-objects",
+        "repositoryURL": "https://github.com/Rando-Coderissian/blog-objects",
         "state": {
-          "branch": "main",
-          "revision": "d3a974afbd317ee3a4ba5e7b9feb155f2b494e08",
+          "branch": "test-refactor-modules",
+          "revision": "e292777a21418b23031fda9fce34df5911a71305",
           "version": null
         }
       },
@@ -33,16 +33,16 @@
         "repositoryURL": "https://github.com/vapor/console-kit.git",
         "state": {
           "branch": null,
-          "revision": "75ea3b627d88221440b878e5dfccc73fd06842ed",
-          "version": "4.2.7"
+          "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": "a5df6b3986431e33663d294d0dee84814fccbd14",
+          "branch": "test-refactored-modules",
+          "revision": "7a352c919180a9c6f05bc05f1ba86936d8d11e56",
           "version": null
         }
       },
@@ -57,9 +57,9 @@
       },
       {
         "package": "feather-objects",
-        "repositoryURL": "https://github.com/feathercms/feather-objects",
+        "repositoryURL": "https://github.com/Rando-Coderissian/feather-objects",
         "state": {
-          "branch": "main",
+          "branch": "test-refactor-modules",
           "revision": "169386ce3bf664fa768186467e4aec1caaee0fcf",
           "version": null
         }
@@ -69,8 +69,8 @@
         "repositoryURL": "https://github.com/vapor/fluent",
         "state": {
           "branch": null,
-          "revision": "ea707ee318066a073c95b2b2df1aa640fcb67f9e",
-          "version": "4.4.0"
+          "revision": "4b4d8bf15a06fd60137e9c543e5503c4b842654e",
+          "version": "4.8.0"
         }
       },
       {
@@ -78,8 +78,8 @@
         "repositoryURL": "https://github.com/vapor/fluent-kit.git",
         "state": {
           "branch": null,
-          "revision": "19da0d91d0fa9a0cf93958d67823c0e94ef666f1",
-          "version": "1.23.0"
+          "revision": "e53acf986e32c54fe522b2c12f737baa01828c1c",
+          "version": "1.42.2"
         }
       },
       {
@@ -123,8 +123,8 @@
         "repositoryURL": "https://github.com/vapor/multipart-kit.git",
         "state": {
           "branch": null,
-          "revision": "2dd9368a3c9580792b77c7ef364f3735909d9996",
-          "version": "4.5.1"
+          "revision": "1adfd69df2da08f7931d4281b257475e32c96734",
+          "version": "4.5.4"
         }
       },
       {
@@ -132,8 +132,8 @@
         "repositoryURL": "https://github.com/vapor/routing-kit.git",
         "state": {
           "branch": null,
-          "revision": "5603b81ceb744b8318feab1e60943704977a866b",
-          "version": "4.3.1"
+          "revision": "611bc45c5dfb1f54b84d99b89d1f72191fb6b71b",
+          "version": "4.7.2"
         }
       },
       {
@@ -141,8 +141,26 @@
         "repositoryURL": "https://github.com/vapor/sql-kit.git",
         "state": {
           "branch": null,
-          "revision": "9cc30f8cef132e91a07e36005612b37f918731fc",
-          "version": "3.16.0"
+          "revision": "5026e7c0f2e464ea1af9f5948701aa8922ab14eb",
+          "version": "3.27.0"
+        }
+      },
+      {
+        "package": "swift-algorithms",
+        "repositoryURL": "https://github.com/apple/swift-algorithms.git",
+        "state": {
+          "branch": null,
+          "revision": "b14b7f4c528c942f121c8b860b9410b2bf57825e",
+          "version": "1.0.0"
+        }
+      },
+      {
+        "package": "swift-atomics",
+        "repositoryURL": "https://github.com/apple/swift-atomics.git",
+        "state": {
+          "branch": null,
+          "revision": "6c89474e62719ddcc1e9614989fff2f68208fe10",
+          "version": "1.1.0"
         }
       },
       {
@@ -150,8 +168,17 @@
         "repositoryURL": "https://github.com/swift-server/swift-backtrace.git",
         "state": {
           "branch": null,
-          "revision": "d3e04a9d4b3833363fb6192065b763310b156d54",
-          "version": "1.3.1"
+          "revision": "f25620d5d05e2f1ba27154b40cafea2b67566956",
+          "version": "1.3.3"
+        }
+      },
+      {
+        "package": "swift-collections",
+        "repositoryURL": "https://github.com/apple/swift-collections.git",
+        "state": {
+          "branch": null,
+          "revision": "937e904258d22af6e447a0b72c0bc67583ef64a2",
+          "version": "1.0.4"
         }
       },
       {
@@ -159,8 +186,8 @@
         "repositoryURL": "https://github.com/apple/swift-crypto.git",
         "state": {
           "branch": null,
-          "revision": "a8911e0fadc25aef1071d582355bd1037a176060",
-          "version": "2.0.4"
+          "revision": "33a20e650c33f6d72d822d558333f2085effa3dc",
+          "version": "2.5.0"
         }
       },
       {
@@ -168,8 +195,8 @@
         "repositoryURL": "https://github.com/binarybirds/swift-html",
         "state": {
           "branch": null,
-          "revision": "e07678a77d296e66fa891a9d4d08acc4471d1783",
-          "version": "1.6.11"
+          "revision": "f4fa5bc83fbee8dbd301c6fbb3969437415adad0",
+          "version": "1.7.0"
         }
       },
       {
@@ -177,8 +204,8 @@
         "repositoryURL": "https://github.com/apple/swift-log.git",
         "state": {
           "branch": null,
-          "revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
-          "version": "1.4.2"
+          "revision": "32e8d724467f8fe623624570367e3d50c5638e46",
+          "version": "1.5.2"
         }
       },
       {
@@ -186,8 +213,8 @@
         "repositoryURL": "https://github.com/apple/swift-metrics.git",
         "state": {
           "branch": null,
-          "revision": "eadb828f878fed144387e3845866225bb7082c56",
-          "version": "2.3.0"
+          "revision": "e8bced74bc6d747745935e469f45d03f048d6cbd",
+          "version": "2.3.4"
         }
       },
       {
@@ -195,8 +222,8 @@
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "154f1d32366449dcccf6375a173adf4ed2a74429",
-          "version": "2.38.0"
+          "revision": "2d8e6ca36fe3e8ed74b0883f593757a45463c34d",
+          "version": "2.53.0"
         }
       },
       {
@@ -204,8 +231,8 @@
         "repositoryURL": "https://github.com/apple/swift-nio-extras.git",
         "state": {
           "branch": null,
-          "revision": "f73ca5ee9c6806800243f1ac415fcf82de9a4c91",
-          "version": "1.10.2"
+          "revision": "0e0d0aab665ff1a0659ce75ac003081f2b1c8997",
+          "version": "1.19.0"
         }
       },
       {
@@ -213,8 +240,8 @@
         "repositoryURL": "https://github.com/apple/swift-nio-http2.git",
         "state": {
           "branch": null,
-          "revision": "ac2a5afce3dbb6795b4f78ec3f19726dc28f5617",
-          "version": "1.20.0"
+          "revision": "6d021a48483dbb273a9be43f65234bdc9185b364",
+          "version": "1.26.0"
         }
       },
       {
@@ -222,8 +249,8 @@
         "repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
         "state": {
           "branch": null,
-          "revision": "52a486ff6de9bc3e26bf634c5413c41c5fa89ca5",
-          "version": "2.17.2"
+          "revision": "e866a626e105042a6a72a870c88b4c531ba05f83",
+          "version": "2.24.0"
         }
       },
       {
@@ -231,8 +258,17 @@
         "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
         "state": {
           "branch": null,
-          "revision": "8ab824b140d0ebcd87e9149266ddc353e3705a3e",
-          "version": "1.11.4"
+          "revision": "41f4098903878418537020075a4d8a6e20a0b182",
+          "version": "1.17.0"
+        }
+      },
+      {
+        "package": "swift-numerics",
+        "repositoryURL": "https://github.com/apple/swift-numerics",
+        "state": {
+          "branch": null,
+          "revision": "0a5bc04095a675662cf24757cc0640aa2204253b",
+          "version": "1.0.2"
         }
       },
       {
@@ -240,25 +276,25 @@
         "repositoryURL": "https://github.com/vapor/vapor",
         "state": {
           "branch": null,
-          "revision": "5861bf9e2cff2c4cb0dcfb0c15ecfaa8bc5630e0",
-          "version": "4.55.3"
+          "revision": "8b79ff0bd264a33bd0b7471dcf50dd1be983f992",
+          "version": "4.76.3"
         }
       },
       {
         "package": "web-module",
-        "repositoryURL": "https://github.com/feathercms/web-module",
+        "repositoryURL": "https://github.com/Rando-Coderissian/web-module",
         "state": {
-          "branch": "main",
-          "revision": "90013f6930477ccd0bf9cb06f9cd1fd3b912dce7",
+          "branch": "test-refactor-modules",
+          "revision": "0d6d1c28944466172228b8a43b7f6c92e8ef871d",
           "version": null
         }
       },
       {
         "package": "web-objects",
-        "repositoryURL": "https://github.com/feathercms/web-objects",
+        "repositoryURL": "https://github.com/Rando-Coderissian/web-objects",
         "state": {
-          "branch": "main",
-          "revision": "fef5a6fef17c4b0037405adff199afa47a0389dd",
+          "branch": "test-refactor-modules",
+          "revision": "4066d2e8a63b6f7b9f5a364d0c46a88deeb4ab21",
           "version": null
         }
       },
@@ -267,8 +303,8 @@
         "repositoryURL": "https://github.com/vapor/websocket-kit.git",
         "state": {
           "branch": null,
-          "revision": "ff8fbce837ef01a93d49c6fb49a72be0f150dac7",
-          "version": "2.3.0"
+          "revision": "2ec14506d5f8199926906dc5a620ac22b147db86",
+          "version": "2.13.0"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
index f443fa9..8e638a5 100644
--- a/Package.swift
+++ b/Package.swift
@@ -10,13 +10,13 @@ let package = Package(
         .library(name: "BlogModule", targets: ["BlogModule"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/feathercms/feather-core", .branch("dev")),
-        .package(url: "https://github.com/feathercms/blog-objects", .branch("main")),
-        .package(url: "https://github.com/feathercms/web-module", .branch("main")),
+       .package(url: "https://github.com/feathercms/feather-core", .branch("dev")),
+       .package(url: "https://github.com/feathercms/blog-objects", .branch("main")),
+       .package(url: "https://github.com/feathercms/web-module", .branch("main")),
     ],
     targets: [
         .target(name: "BlogModule", dependencies: [
-            .product(name: "Feather", package: "feather-core"),
+            .product(name: "FeatherCore", package: "feather-core"),
             .product(name: "BlogObjects", package: "blog-objects"),
             .product(name: "WebModule", package: "web-module"),
         ],
diff --git a/Sources/BlogModule/BlogBuilder.swift b/Sources/BlogModule/BlogBuilder.swift
index 4212297..14dbe0e 100644
--- a/Sources/BlogModule/BlogBuilder.swift
+++ b/Sources/BlogModule/BlogBuilder.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 27..
 //
 
-import Feather
+import FeatherCore
 
 @_cdecl("createBlogModule")
 public func createBlogModule() -> UnsafeMutableRawPointer {
diff --git a/Sources/BlogModule/BlogModule.swift b/Sources/BlogModule/BlogModule.swift
index d3ed63a..00ba667 100644
--- a/Sources/BlogModule/BlogModule.swift
+++ b/Sources/BlogModule/BlogModule.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import FeatherObjects
 import BlogObjects
 import WebModule
diff --git a/Sources/BlogModule/Controllers/Admin/BlogAuthorAdminController.swift b/Sources/BlogModule/Controllers/Admin/BlogAuthorAdminController.swift
index 4ab15f8..f4a9feb 100644
--- a/Sources/BlogModule/Controllers/Admin/BlogAuthorAdminController.swift
+++ b/Sources/BlogModule/Controllers/Admin/BlogAuthorAdminController.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import FeatherObjects
 import BlogObjects
 
diff --git a/Sources/BlogModule/Controllers/Admin/BlogAuthorLinkAdminController.swift b/Sources/BlogModule/Controllers/Admin/BlogAuthorLinkAdminController.swift
index 8a57143..799d71f 100644
--- a/Sources/BlogModule/Controllers/Admin/BlogAuthorLinkAdminController.swift
+++ b/Sources/BlogModule/Controllers/Admin/BlogAuthorLinkAdminController.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import BlogObjects
 
 
diff --git a/Sources/BlogModule/Controllers/Admin/BlogCategoryAdminController.swift b/Sources/BlogModule/Controllers/Admin/BlogCategoryAdminController.swift
index e12b0b8..f18e66d 100644
--- a/Sources/BlogModule/Controllers/Admin/BlogCategoryAdminController.swift
+++ b/Sources/BlogModule/Controllers/Admin/BlogCategoryAdminController.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import BlogObjects
 
 struct BlogCategoryAdminController: AdminController {
diff --git a/Sources/BlogModule/Controllers/Admin/BlogPostAdminController.swift b/Sources/BlogModule/Controllers/Admin/BlogPostAdminController.swift
index a573dd0..c150a96 100644
--- a/Sources/BlogModule/Controllers/Admin/BlogPostAdminController.swift
+++ b/Sources/BlogModule/Controllers/Admin/BlogPostAdminController.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import BlogObjects
 
 
diff --git a/Sources/BlogModule/Controllers/Api/BlogAuthorApiController.swift b/Sources/BlogModule/Controllers/Api/BlogAuthorApiController.swift
index 795b7bd..4d06730 100644
--- a/Sources/BlogModule/Controllers/Api/BlogAuthorApiController.swift
+++ b/Sources/BlogModule/Controllers/Api/BlogAuthorApiController.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import BlogObjects
 
 
diff --git a/Sources/BlogModule/Controllers/Api/BlogAuthorLinkApiController.swift b/Sources/BlogModule/Controllers/Api/BlogAuthorLinkApiController.swift
index d8a1777..40ad245 100644
--- a/Sources/BlogModule/Controllers/Api/BlogAuthorLinkApiController.swift
+++ b/Sources/BlogModule/Controllers/Api/BlogAuthorLinkApiController.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import BlogObjects
 
 extension Blog.AuthorLink.List: Content {}
diff --git a/Sources/BlogModule/Controllers/Api/BlogCategoryApiController.swift b/Sources/BlogModule/Controllers/Api/BlogCategoryApiController.swift
index 9229667..4467cc5 100644
--- a/Sources/BlogModule/Controllers/Api/BlogCategoryApiController.swift
+++ b/Sources/BlogModule/Controllers/Api/BlogCategoryApiController.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import BlogObjects
 
 
diff --git a/Sources/BlogModule/Controllers/Api/BlogPostApiController.swift b/Sources/BlogModule/Controllers/Api/BlogPostApiController.swift
index 12dba12..3baea5c 100644
--- a/Sources/BlogModule/Controllers/Api/BlogPostApiController.swift
+++ b/Sources/BlogModule/Controllers/Api/BlogPostApiController.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import BlogObjects
 
 
diff --git a/Sources/BlogModule/Controllers/Install/BlogInstallStepController.swift b/Sources/BlogModule/Controllers/Install/BlogInstallStepController.swift
index 749b9af..aa65777 100644
--- a/Sources/BlogModule/Controllers/Install/BlogInstallStepController.swift
+++ b/Sources/BlogModule/Controllers/Install/BlogInstallStepController.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import BlogObjects
 
 struct BlogInstallStepController: SystemInstallStepController {
diff --git a/Sources/BlogModule/Database/Models/BlogAuthorLinkModel.swift b/Sources/BlogModule/Database/Models/BlogAuthorLinkModel.swift
index 9a28a02..90d01e4 100644
--- a/Sources/BlogModule/Database/Models/BlogAuthorLinkModel.swift
+++ b/Sources/BlogModule/Database/Models/BlogAuthorLinkModel.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import Fluent
-import Feather
+import FeatherCore
 
 final class BlogAuthorLinkModel: FeatherDatabaseModel {
     typealias Module = BlogModule
diff --git a/Sources/BlogModule/Database/Models/BlogAuthorModel.swift b/Sources/BlogModule/Database/Models/BlogAuthorModel.swift
index 1417adb..c7518c7 100644
--- a/Sources/BlogModule/Database/Models/BlogAuthorModel.swift
+++ b/Sources/BlogModule/Database/Models/BlogAuthorModel.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import FeatherObjects
 import BlogObjects
 
diff --git a/Sources/BlogModule/Database/Models/BlogCategoryModel.swift b/Sources/BlogModule/Database/Models/BlogCategoryModel.swift
index 1cba80a..f725329 100644
--- a/Sources/BlogModule/Database/Models/BlogCategoryModel.swift
+++ b/Sources/BlogModule/Database/Models/BlogCategoryModel.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import Fluent
-import Feather
+import FeatherCore
 import FeatherObjects
 import BlogObjects
 
diff --git a/Sources/BlogModule/Database/Models/BlogPostAuthorModel.swift b/Sources/BlogModule/Database/Models/BlogPostAuthorModel.swift
index 84f7410..39cc527 100644
--- a/Sources/BlogModule/Database/Models/BlogPostAuthorModel.swift
+++ b/Sources/BlogModule/Database/Models/BlogPostAuthorModel.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import Fluent
-import Feather
+import FeatherCore
 import FeatherObjects
 
 final class BlogPostAuthorModel: FeatherDatabaseModel {
diff --git a/Sources/BlogModule/Database/Models/BlogPostCategoryModel.swift b/Sources/BlogModule/Database/Models/BlogPostCategoryModel.swift
index e796d7b..eedcfac 100644
--- a/Sources/BlogModule/Database/Models/BlogPostCategoryModel.swift
+++ b/Sources/BlogModule/Database/Models/BlogPostCategoryModel.swift
@@ -7,8 +7,7 @@
 
 import Foundation
 import Fluent
-import Feather
-import Feather
+import FeatherCore
 import FeatherObjects
 
 final class BlogPostCategoryModel: FeatherDatabaseModel {
diff --git a/Sources/BlogModule/Database/Models/BlogPostModel.swift b/Sources/BlogModule/Database/Models/BlogPostModel.swift
index 873e72a..df0c233 100644
--- a/Sources/BlogModule/Database/Models/BlogPostModel.swift
+++ b/Sources/BlogModule/Database/Models/BlogPostModel.swift
@@ -7,7 +7,7 @@
 
 import Vapor
 import Fluent
-import Feather
+import FeatherCore
 import FeatherObjects
 import BlogObjects
 
diff --git a/Sources/BlogModule/Editors/BlogAuthorEditor.swift b/Sources/BlogModule/Editors/BlogAuthorEditor.swift
index 4310dcb..f7f4f2e 100644
--- a/Sources/BlogModule/Editors/BlogAuthorEditor.swift
+++ b/Sources/BlogModule/Editors/BlogAuthorEditor.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 
 struct BlogAuthorEditor: FeatherModelEditor {
diff --git a/Sources/BlogModule/Editors/BlogAuthorLinkEditor.swift b/Sources/BlogModule/Editors/BlogAuthorLinkEditor.swift
index f29440e..7611a6f 100644
--- a/Sources/BlogModule/Editors/BlogAuthorLinkEditor.swift
+++ b/Sources/BlogModule/Editors/BlogAuthorLinkEditor.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 
 
diff --git a/Sources/BlogModule/Editors/BlogCategoryEditor.swift b/Sources/BlogModule/Editors/BlogCategoryEditor.swift
index af65663..f4f6d86 100644
--- a/Sources/BlogModule/Editors/BlogCategoryEditor.swift
+++ b/Sources/BlogModule/Editors/BlogCategoryEditor.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 
 struct BlogCategoryEditor: FeatherModelEditor {
diff --git a/Sources/BlogModule/Editors/BlogPostEditor.swift b/Sources/BlogModule/Editors/BlogPostEditor.swift
index d5ba282..6d3ca63 100644
--- a/Sources/BlogModule/Editors/BlogPostEditor.swift
+++ b/Sources/BlogModule/Editors/BlogPostEditor.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 
 struct BlogPostEditor: FeatherModelEditor {
diff --git a/Sources/BlogModule/Forms/BlogInstallForm.swift b/Sources/BlogModule/Forms/BlogInstallForm.swift
index 0af94bc..7618581 100644
--- a/Sources/BlogModule/Forms/BlogInstallForm.swift
+++ b/Sources/BlogModule/Forms/BlogInstallForm.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 
 final class BlogInstallForm: AbstractForm {
diff --git a/Sources/BlogModule/Routers/BlogRouter.swift b/Sources/BlogModule/Routers/BlogRouter.swift
index 46f6dde..a947fae 100644
--- a/Sources/BlogModule/Routers/BlogRouter.swift
+++ b/Sources/BlogModule/Routers/BlogRouter.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 
 struct BlogRouter: FeatherRouter {
diff --git a/Sources/BlogModule/Templates/Contexts/BlogInstallStepContext.swift b/Sources/BlogModule/Templates/Contexts/BlogInstallStepContext.swift
index 7493b0e..5e12d60 100644
--- a/Sources/BlogModule/Templates/Contexts/BlogInstallStepContext.swift
+++ b/Sources/BlogModule/Templates/Contexts/BlogInstallStepContext.swift
@@ -6,7 +6,7 @@
 //
 
 import BlogObjects
-import Feather
+import FeatherCore
 
 struct BlogInstallStepContext {
 
diff --git a/Sources/BlogModule/Templates/Html/BlogAdminWidgetTemplate.swift b/Sources/BlogModule/Templates/Html/BlogAdminWidgetTemplate.swift
index bb82168..5d316d3 100644
--- a/Sources/BlogModule/Templates/Html/BlogAdminWidgetTemplate.swift
+++ b/Sources/BlogModule/Templates/Html/BlogAdminWidgetTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 import SwiftHtml
 import FeatherIcons
diff --git a/Sources/BlogModule/Templates/Html/BlogAuthorPageTemplate.swift b/Sources/BlogModule/Templates/Html/BlogAuthorPageTemplate.swift
index aa916c2..0010eae 100644
--- a/Sources/BlogModule/Templates/Html/BlogAuthorPageTemplate.swift
+++ b/Sources/BlogModule/Templates/Html/BlogAuthorPageTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 import SwiftHtml
 
diff --git a/Sources/BlogModule/Templates/Html/BlogAuthorsPageTemplate.swift b/Sources/BlogModule/Templates/Html/BlogAuthorsPageTemplate.swift
index caabd48..0c3391a 100644
--- a/Sources/BlogModule/Templates/Html/BlogAuthorsPageTemplate.swift
+++ b/Sources/BlogModule/Templates/Html/BlogAuthorsPageTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 import SwiftHtml
 
diff --git a/Sources/BlogModule/Templates/Html/BlogCategoriesPageTemplate.swift b/Sources/BlogModule/Templates/Html/BlogCategoriesPageTemplate.swift
index 77f6462..798da02 100644
--- a/Sources/BlogModule/Templates/Html/BlogCategoriesPageTemplate.swift
+++ b/Sources/BlogModule/Templates/Html/BlogCategoriesPageTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 import SwiftHtml
 
diff --git a/Sources/BlogModule/Templates/Html/BlogCategoryPageTemplate.swift b/Sources/BlogModule/Templates/Html/BlogCategoryPageTemplate.swift
index c514ec2..927a63b 100644
--- a/Sources/BlogModule/Templates/Html/BlogCategoryPageTemplate.swift
+++ b/Sources/BlogModule/Templates/Html/BlogCategoryPageTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 import SwiftHtml
 
diff --git a/Sources/BlogModule/Templates/Html/BlogHomePageTemplate.swift b/Sources/BlogModule/Templates/Html/BlogHomePageTemplate.swift
index 617861a..f82c0ea 100644
--- a/Sources/BlogModule/Templates/Html/BlogHomePageTemplate.swift
+++ b/Sources/BlogModule/Templates/Html/BlogHomePageTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 import SwiftHtml
 
diff --git a/Sources/BlogModule/Templates/Html/BlogInstallStepTemplate.swift b/Sources/BlogModule/Templates/Html/BlogInstallStepTemplate.swift
index d6caad4..8e3a404 100644
--- a/Sources/BlogModule/Templates/Html/BlogInstallStepTemplate.swift
+++ b/Sources/BlogModule/Templates/Html/BlogInstallStepTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 import SwiftHtml
 
diff --git a/Sources/BlogModule/Templates/Html/BlogPostPageTemplate.swift b/Sources/BlogModule/Templates/Html/BlogPostPageTemplate.swift
index 41b4bce..cb5ab25 100644
--- a/Sources/BlogModule/Templates/Html/BlogPostPageTemplate.swift
+++ b/Sources/BlogModule/Templates/Html/BlogPostPageTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 import SwiftHtml
 
diff --git a/Sources/BlogModule/Templates/Html/BlogPostsPageTemplate.swift b/Sources/BlogModule/Templates/Html/BlogPostsPageTemplate.swift
index 84be2ad..7ecbc2d 100644
--- a/Sources/BlogModule/Templates/Html/BlogPostsPageTemplate.swift
+++ b/Sources/BlogModule/Templates/Html/BlogPostsPageTemplate.swift
@@ -6,7 +6,7 @@
 //
 
 import Vapor
-import Feather
+import FeatherCore
 import BlogObjects
 import SwiftHtml