diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e11b9ea..fe7186b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -294,7 +294,6 @@ set(${PREFIX}ENABLE_FILTER_BLUR ${FEATURE_UNSTABLE} CACHE BOOL "Enable Blur Filt
 set(${PREFIX}ENABLE_FILTER_COLOR_GRADE ${FEATURE_STABLE} CACHE BOOL "Enable Color Grade Filter")
 set(${PREFIX}ENABLE_FILTER_DENOISING ${FEATURE_EXPERIMENTAL} CACHE BOOL "Enable Denoising filter")
 set(${PREFIX}ENABLE_FILTER_DENOISING_NVIDIA ${FEATURE_EXPERIMENTAL} CACHE BOOL "Enable NVIDIA provider(s) for Denoising Filter")
-set(${PREFIX}ENABLE_FILTER_DYNAMIC_MASK ${FEATURE_STABLE} CACHE BOOL "Enable Dynamic Mask Filter")
 set(${PREFIX}ENABLE_FILTER_SDF_EFFECTS ${FEATURE_EXPERIMENTAL} CACHE BOOL "Enable SDF Effects Filter")
 set(${PREFIX}ENABLE_FILTER_TRANSFORM ${FEATURE_STABLE} CACHE BOOL "Enable Transform Filter")
 set(${PREFIX}ENABLE_FILTER_UPSCALING ${FEATURE_EXPERIMENTAL} CACHE BOOL "Enable Upscaling Filter")
@@ -485,10 +484,6 @@ function(feature_filter_denoising RESOLVE)
 	endif()
 endfunction()
 
-function(feature_filter_dynamic_mask RESOLVE)
-	is_feature_enabled(FILTER_DYNAMIC_MASK T_CHECK)
-endfunction()
-
 function(feature_filter_sdf_effects RESOLVE)
 	is_feature_enabled(FILTER_SDF_EFFECTS T_CHECK)
 endfunction()
@@ -582,7 +577,6 @@ feature_filter_autoframing(OFF)
 feature_filter_blur(OFF)
 feature_filter_color_grade(OFF)
 feature_filter_denoising(OFF)
-feature_filter_dynamic_mask(OFF)
 feature_filter_sdf_effects(OFF)
 feature_filter_transform(OFF)
 feature_filter_upscaling(OFF)
@@ -716,7 +710,6 @@ feature_filter_autoframing(ON)
 feature_filter_blur(ON)
 feature_filter_color_grade(ON)
 feature_filter_denoising(ON)
-feature_filter_dynamic_mask(ON)
 feature_filter_sdf_effects(ON)
 feature_filter_transform(ON)
 feature_filter_upscaling(ON)
@@ -1059,21 +1052,6 @@ if(T_CHECK)
 	set(REQUIRE_LUT ON)
 endif()
 
-# Filter/Dynamic Mask
-is_feature_enabled(FILTER_DYNAMIC_MASK T_CHECK)
-if(T_CHECK)
-	list(APPEND PROJECT_DATA
-		"data/effects/channel-mask.effect"
-	)
-	list(APPEND PROJECT_PRIVATE_SOURCE
-		"source/filters/filter-dynamic-mask.hpp"
-		"source/filters/filter-dynamic-mask.cpp"
-	)
-	list(APPEND PROJECT_DEFINITIONS
-		ENABLE_FILTER_DYNAMIC_MASK
-	)
-endif()
-
 # Filter/SDF Effects
 is_feature_enabled(FILTER_SDF_EFFECTS T_CHECK)
 if(T_CHECK)
diff --git a/components/dynamic-mask/CMakeLists.txt b/components/dynamic-mask/CMakeLists.txt
new file mode 100644
index 00000000..9d4568f1
--- /dev/null
+++ b/components/dynamic-mask/CMakeLists.txt
@@ -0,0 +1,8 @@
+## AUTOGENERATED COPYRIGHT HEADER START
+# Copyright (C) NaN-NaN undefined
+# AUTOGENERATED COPYRIGHT HEADER END
+cmake_minimum_required(VERSION 3.26)
+project("DynamicMask")
+list(APPEND CMAKE_MESSAGE_INDENT "[${PROJECT_NAME}] ")
+
+streamfx_add_component("Dynamic Mask")
diff --git a/source/filters/filter-dynamic-mask.cpp b/components/dynamic-mask/source/filters/filter-dynamic-mask.cpp
similarity index 100%
rename from source/filters/filter-dynamic-mask.cpp
rename to components/dynamic-mask/source/filters/filter-dynamic-mask.cpp
diff --git a/source/filters/filter-dynamic-mask.hpp b/components/dynamic-mask/source/filters/filter-dynamic-mask.hpp
similarity index 100%
rename from source/filters/filter-dynamic-mask.hpp
rename to components/dynamic-mask/source/filters/filter-dynamic-mask.hpp