diff --git a/Libraries/.swiftpm/xcode/xcshareddata/xcschemes/ReviewsKit.xcscheme b/Libraries/.swiftpm/xcode/xcshareddata/xcschemes/ReviewsKit.xcscheme
index 6b81aea..d647ee3 100644
--- a/Libraries/.swiftpm/xcode/xcshareddata/xcschemes/ReviewsKit.xcscheme
+++ b/Libraries/.swiftpm/xcode/xcshareddata/xcschemes/ReviewsKit.xcscheme
@@ -27,13 +27,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <TestPlans>
-         <TestPlanReference
-            reference = "container:../Libraries.xctestplan"
-            default = "YES">
-         </TestPlanReference>
-      </TestPlans>
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
diff --git a/Libraries/Foundation/Kit/Sources/Use Cases/FilterWordsUseCase.swift b/Libraries/Filter/Kit/Sources/Use Cases/FilterWordsUseCase.swift
similarity index 100%
rename from Libraries/Foundation/Kit/Sources/Use Cases/FilterWordsUseCase.swift
rename to Libraries/Filter/Kit/Sources/Use Cases/FilterWordsUseCase.swift
diff --git a/Libraries/Foundation/Test/Tests/Use Cases/FilterWordsUseCaseTests.swift b/Libraries/Filter/Test/Tests/Use Cases/FilterWordsUseCaseTests.swift
similarity index 98%
rename from Libraries/Foundation/Test/Tests/Use Cases/FilterWordsUseCaseTests.swift
rename to Libraries/Filter/Test/Tests/Use Cases/FilterWordsUseCaseTests.swift
index 8cfeae2..92c5679 100644
--- a/Libraries/Foundation/Test/Tests/Use Cases/FilterWordsUseCaseTests.swift	
+++ b/Libraries/Filter/Test/Tests/Use Cases/FilterWordsUseCaseTests.swift	
@@ -1,11 +1,12 @@
 //
 //  FilterWordsUseCaseTests.swift
-//  ReviewsFoundationTest
+//  ReviewsFilterTest
 //
 //  Created by Javier Cicchelli on 18/03/2024.
 //  Copyright © 2024 Röck+Cöde VoF. All rights reserved.
 //
 
+import ReviewsFilterKit
 import ReviewsFoundationKit
 import XCTest
 
diff --git a/Libraries/Package.swift b/Libraries/Package.swift
index 25f97f7..dcc0630 100644
--- a/Libraries/Package.swift
+++ b/Libraries/Package.swift
@@ -12,6 +12,7 @@ let package = Package(
             name: .Product.name.kit,
             targets: [
                 .Target.feed.kit,
+                .Target.filter.kit,
                 .Target.foundation.kit,
                 .Target.iTunes.kit,
             ]
@@ -25,6 +26,13 @@ let package = Package(
             ],
             path: "Feed/Kit"
         ),
+        .target(
+            name: .Target.filter.kit,
+            dependencies: [
+                .byName(name: .Target.foundation.kit),
+            ],
+            path: "Filter/Kit"
+        ),
         .target(
             name: .Target.foundation.kit,
             path: "Foundation/Kit"
@@ -44,6 +52,13 @@ let package = Package(
             ],
             path: "Feed/Test"
         ),
+        .testTarget(
+            name: .Target.filter.test,
+            dependencies: [
+                .byName(name: .Target.filter.kit),
+            ],
+            path: "Filter/Test"
+        ),
         .testTarget(
             name: .Target.foundation.test,
             dependencies: [
@@ -73,6 +88,7 @@ private extension String {
     
     enum Target {
         static let feed = "\(String.Product.name)Feed"
+        static let filter = "\(String.Product.name)Filter"
         static let foundation = "\(String.Product.name)Foundation"
         static let iTunes = "\(String.Product.name)iTunes"
     }
diff --git a/Reviews.xcodeproj/project.pbxproj b/Reviews.xcodeproj/project.pbxproj
index 22420ed..6bbe025 100644
--- a/Reviews.xcodeproj/project.pbxproj
+++ b/Reviews.xcodeproj/project.pbxproj
@@ -46,7 +46,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		02900C4B2BA5347A008D2E8D /* Libraries.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = Libraries.xctestplan; sourceTree = "<group>"; };
 		02DC7F8F2BA51793000EEEBE /* ReviewsFeed.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReviewsFeed.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		02DC7F912BA51793000EEEBE /* ReviewsFeed.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReviewsFeed.h; sourceTree = "<group>"; };
 		02DC7FB12BA52084000EEEBE /* Libraries */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Libraries; sourceTree = "<group>"; };
@@ -82,14 +81,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		02900C4C2BA5347A008D2E8D /* Test Plans */ = {
-			isa = PBXGroup;
-			children = (
-				02900C4B2BA5347A008D2E8D /* Libraries.xctestplan */,
-			);
-			path = "Test Plans";
-			sourceTree = "<group>";
-		};
 		02A6DA2F2BA591C000B943E2 /* Bundle */ = {
 			isa = PBXGroup;
 			children = (
@@ -182,7 +173,6 @@
 				02DC7FB12BA52084000EEEBE /* Libraries */,
 				02DC7FAB2BA51848000EEEBE /* Frameworks */,
 				345AD11A24C6EDD9004E2EE1 /* App */,
-				02900C4C2BA5347A008D2E8D /* Test Plans */,
 				345AD11924C6EDD9004E2EE1 /* Products */,
 			);
 			sourceTree = "<group>";
diff --git a/Test Plans/Libraries.xctestplan b/Test Plans/Libraries.xctestplan
deleted file mode 100644
index 67792eb..0000000
--- a/Test Plans/Libraries.xctestplan	
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "configurations" : [
-    {
-      "id" : "BF43DE96-4FFB-475F-B056-3EE94ACD1F54",
-      "name" : "Test Scheme Action",
-      "options" : {
-
-      }
-    }
-  ],
-  "defaultOptions" : {
-    "codeCoverage" : false
-  },
-  "testTargets" : [
-    {
-      "target" : {
-        "containerPath" : "container:Libraries",
-        "identifier" : "ReviewsFoundationTest",
-        "name" : "ReviewsFoundationTest"
-      }
-    }
-  ],
-  "version" : 1
-}