diff --git a/compositor/converter/compositor_cpu_renders/node_color_ramp.png b/compositor/color/compositor_cpu_renders/node_color_ramp.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_color_ramp.png
rename to compositor/color/compositor_cpu_renders/node_color_ramp.png
diff --git a/compositor/converter/compositor_cpu_renders/node_comb_h_s_v_a.png b/compositor/color/compositor_cpu_renders/node_comb_h_s_v_a.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_comb_h_s_v_a.png
rename to compositor/color/compositor_cpu_renders/node_comb_h_s_v_a.png
diff --git a/compositor/converter/compositor_cpu_renders/node_comb_r_g_b_a.png b/compositor/color/compositor_cpu_renders/node_comb_r_g_b_a.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_comb_r_g_b_a.png
rename to compositor/color/compositor_cpu_renders/node_comb_r_g_b_a.png
diff --git a/compositor/converter/compositor_cpu_renders/node_comb_y_c_c_a.png b/compositor/color/compositor_cpu_renders/node_comb_y_c_c_a.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_comb_y_c_c_a.png
rename to compositor/color/compositor_cpu_renders/node_comb_y_c_c_a.png
diff --git a/compositor/converter/compositor_cpu_renders/node_comb_y_u_v_a.png b/compositor/color/compositor_cpu_renders/node_comb_y_u_v_a.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_comb_y_u_v_a.png
rename to compositor/color/compositor_cpu_renders/node_comb_y_u_v_a.png
diff --git a/compositor/converter/compositor_cpu_renders/node_convert_alpha_premul.png b/compositor/color/compositor_cpu_renders/node_convert_alpha_premul.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_convert_alpha_premul.png
rename to compositor/color/compositor_cpu_renders/node_convert_alpha_premul.png
diff --git a/compositor/converter/compositor_cpu_renders/node_convert_alpha_straight.png b/compositor/color/compositor_cpu_renders/node_convert_alpha_straight.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_convert_alpha_straight.png
rename to compositor/color/compositor_cpu_renders/node_convert_alpha_straight.png
diff --git a/compositor/converter/compositor_cpu_renders/node_r_g_b_to_b_w.png b/compositor/color/compositor_cpu_renders/node_r_g_b_to_b_w.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_r_g_b_to_b_w.png
rename to compositor/color/compositor_cpu_renders/node_r_g_b_to_b_w.png
diff --git a/compositor/converter/compositor_cpu_renders/node_sep_h_s_v_a.png b/compositor/color/compositor_cpu_renders/node_sep_h_s_v_a.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_sep_h_s_v_a.png
rename to compositor/color/compositor_cpu_renders/node_sep_h_s_v_a.png
diff --git a/compositor/converter/compositor_cpu_renders/node_sep_r_g_b_a.png b/compositor/color/compositor_cpu_renders/node_sep_r_g_b_a.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_sep_r_g_b_a.png
rename to compositor/color/compositor_cpu_renders/node_sep_r_g_b_a.png
diff --git a/compositor/converter/compositor_cpu_renders/node_sep_y_c_c_a.png b/compositor/color/compositor_cpu_renders/node_sep_y_c_c_a.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_sep_y_c_c_a.png
rename to compositor/color/compositor_cpu_renders/node_sep_y_c_c_a.png
diff --git a/compositor/converter/compositor_cpu_renders/node_sep_y_u_v_a.png b/compositor/color/compositor_cpu_renders/node_sep_y_u_v_a.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_sep_y_u_v_a.png
rename to compositor/color/compositor_cpu_renders/node_sep_y_u_v_a.png
diff --git a/compositor/converter/compositor_cpu_renders/node_set_alpha_apply.png b/compositor/color/compositor_cpu_renders/node_set_alpha_apply.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_set_alpha_apply.png
rename to compositor/color/compositor_cpu_renders/node_set_alpha_apply.png
diff --git a/compositor/converter/compositor_cpu_renders/node_set_alpha_replace.png b/compositor/color/compositor_cpu_renders/node_set_alpha_replace.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_set_alpha_replace.png
rename to compositor/color/compositor_cpu_renders/node_set_alpha_replace.png
diff --git a/compositor/converter/compositor_realtime_renders/node_color_ramp.png b/compositor/color/compositor_realtime_renders/node_color_ramp.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_color_ramp.png
rename to compositor/color/compositor_realtime_renders/node_color_ramp.png
diff --git a/compositor/converter/compositor_realtime_renders/node_comb_h_s_v_a.png b/compositor/color/compositor_realtime_renders/node_comb_h_s_v_a.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_comb_h_s_v_a.png
rename to compositor/color/compositor_realtime_renders/node_comb_h_s_v_a.png
diff --git a/compositor/converter/compositor_realtime_renders/node_comb_r_g_b_a.png b/compositor/color/compositor_realtime_renders/node_comb_r_g_b_a.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_comb_r_g_b_a.png
rename to compositor/color/compositor_realtime_renders/node_comb_r_g_b_a.png
diff --git a/compositor/converter/compositor_realtime_renders/node_comb_y_c_c_a.png b/compositor/color/compositor_realtime_renders/node_comb_y_c_c_a.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_comb_y_c_c_a.png
rename to compositor/color/compositor_realtime_renders/node_comb_y_c_c_a.png
diff --git a/compositor/converter/compositor_realtime_renders/node_comb_y_u_v_a.png b/compositor/color/compositor_realtime_renders/node_comb_y_u_v_a.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_comb_y_u_v_a.png
rename to compositor/color/compositor_realtime_renders/node_comb_y_u_v_a.png
diff --git a/compositor/converter/compositor_realtime_renders/node_convert_alpha_premul.png b/compositor/color/compositor_realtime_renders/node_convert_alpha_premul.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_convert_alpha_premul.png
rename to compositor/color/compositor_realtime_renders/node_convert_alpha_premul.png
diff --git a/compositor/converter/compositor_realtime_renders/node_convert_alpha_straight.png b/compositor/color/compositor_realtime_renders/node_convert_alpha_straight.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_convert_alpha_straight.png
rename to compositor/color/compositor_realtime_renders/node_convert_alpha_straight.png
diff --git a/compositor/converter/compositor_realtime_renders/node_r_g_b_to_b_w.png b/compositor/color/compositor_realtime_renders/node_r_g_b_to_b_w.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_r_g_b_to_b_w.png
rename to compositor/color/compositor_realtime_renders/node_r_g_b_to_b_w.png
diff --git a/compositor/converter/compositor_realtime_renders/node_sep_h_s_v_a.png b/compositor/color/compositor_realtime_renders/node_sep_h_s_v_a.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_sep_h_s_v_a.png
rename to compositor/color/compositor_realtime_renders/node_sep_h_s_v_a.png
diff --git a/compositor/converter/compositor_realtime_renders/node_sep_r_g_b_a.png b/compositor/color/compositor_realtime_renders/node_sep_r_g_b_a.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_sep_r_g_b_a.png
rename to compositor/color/compositor_realtime_renders/node_sep_r_g_b_a.png
diff --git a/compositor/converter/compositor_realtime_renders/node_sep_y_c_c_a.png b/compositor/color/compositor_realtime_renders/node_sep_y_c_c_a.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_sep_y_c_c_a.png
rename to compositor/color/compositor_realtime_renders/node_sep_y_c_c_a.png
diff --git a/compositor/converter/compositor_realtime_renders/node_sep_y_u_v_a.png b/compositor/color/compositor_realtime_renders/node_sep_y_u_v_a.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_sep_y_u_v_a.png
rename to compositor/color/compositor_realtime_renders/node_sep_y_u_v_a.png
diff --git a/compositor/converter/compositor_realtime_renders/node_set_alpha_apply.png b/compositor/color/compositor_realtime_renders/node_set_alpha_apply.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_set_alpha_apply.png
rename to compositor/color/compositor_realtime_renders/node_set_alpha_apply.png
diff --git a/compositor/converter/compositor_realtime_renders/node_set_alpha_replace.png b/compositor/color/compositor_realtime_renders/node_set_alpha_replace.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_set_alpha_replace.png
rename to compositor/color/compositor_realtime_renders/node_set_alpha_replace.png
diff --git a/compositor/converter/node_color_ramp.blend b/compositor/color/node_color_ramp.blend
similarity index 100%
rename from compositor/converter/node_color_ramp.blend
rename to compositor/color/node_color_ramp.blend
diff --git a/compositor/converter/node_comb_h_s_v_a.blend b/compositor/color/node_comb_h_s_v_a.blend
similarity index 100%
rename from compositor/converter/node_comb_h_s_v_a.blend
rename to compositor/color/node_comb_h_s_v_a.blend
diff --git a/compositor/converter/node_comb_r_g_b_a.blend b/compositor/color/node_comb_r_g_b_a.blend
similarity index 100%
rename from compositor/converter/node_comb_r_g_b_a.blend
rename to compositor/color/node_comb_r_g_b_a.blend
diff --git a/compositor/converter/node_comb_y_c_c_a.blend b/compositor/color/node_comb_y_c_c_a.blend
similarity index 100%
rename from compositor/converter/node_comb_y_c_c_a.blend
rename to compositor/color/node_comb_y_c_c_a.blend
diff --git a/compositor/converter/node_comb_y_u_v_a.blend b/compositor/color/node_comb_y_u_v_a.blend
similarity index 100%
rename from compositor/converter/node_comb_y_u_v_a.blend
rename to compositor/color/node_comb_y_u_v_a.blend
diff --git a/compositor/converter/node_convert_alpha_premul.blend b/compositor/color/node_convert_alpha_premul.blend
similarity index 100%
rename from compositor/converter/node_convert_alpha_premul.blend
rename to compositor/color/node_convert_alpha_premul.blend
diff --git a/compositor/converter/node_convert_alpha_straight.blend b/compositor/color/node_convert_alpha_straight.blend
similarity index 100%
rename from compositor/converter/node_convert_alpha_straight.blend
rename to compositor/color/node_convert_alpha_straight.blend
diff --git a/compositor/converter/node_r_g_b_to_b_w.blend b/compositor/color/node_r_g_b_to_b_w.blend
similarity index 100%
rename from compositor/converter/node_r_g_b_to_b_w.blend
rename to compositor/color/node_r_g_b_to_b_w.blend
diff --git a/compositor/converter/node_sep_h_s_v_a.blend b/compositor/color/node_sep_h_s_v_a.blend
similarity index 100%
rename from compositor/converter/node_sep_h_s_v_a.blend
rename to compositor/color/node_sep_h_s_v_a.blend
diff --git a/compositor/converter/node_sep_r_g_b_a.blend b/compositor/color/node_sep_r_g_b_a.blend
similarity index 100%
rename from compositor/converter/node_sep_r_g_b_a.blend
rename to compositor/color/node_sep_r_g_b_a.blend
diff --git a/compositor/converter/node_sep_y_c_c_a.blend b/compositor/color/node_sep_y_c_c_a.blend
similarity index 100%
rename from compositor/converter/node_sep_y_c_c_a.blend
rename to compositor/color/node_sep_y_c_c_a.blend
diff --git a/compositor/converter/node_sep_y_u_v_a.blend b/compositor/color/node_sep_y_u_v_a.blend
similarity index 100%
rename from compositor/converter/node_sep_y_u_v_a.blend
rename to compositor/color/node_sep_y_u_v_a.blend
diff --git a/compositor/converter/node_set_alpha_apply.blend b/compositor/color/node_set_alpha_apply.blend
similarity index 100%
rename from compositor/converter/node_set_alpha_apply.blend
rename to compositor/color/node_set_alpha_apply.blend
diff --git a/compositor/converter/node_set_alpha_replace.blend b/compositor/color/node_set_alpha_replace.blend
similarity index 100%
rename from compositor/converter/node_set_alpha_replace.blend
rename to compositor/color/node_set_alpha_replace.blend
diff --git a/compositor/distort/node_crop.blend b/compositor/distort/node_crop.blend
deleted file mode 100644
index dd6ef1d..0000000
--- a/compositor/distort/node_crop.blend
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db91b69ed38ca6905e262e0a158c1cd6f7876010a600b56346f76457fde68e89
-size 868900
diff --git a/compositor/filter/compositor_realtime_renders/node_glare_fog_glow.png b/compositor/filter/compositor_realtime_renders/node_glare_fog_glow.png
index f8a36d1..b88854f 100644
--- a/compositor/filter/compositor_realtime_renders/node_glare_fog_glow.png
+++ b/compositor/filter/compositor_realtime_renders/node_glare_fog_glow.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e9e0802f12bd75165c388387027882bf6d44358355148cc6c64c7464b0b81af
-size 87174
+oid sha256:89f774c950fff6a6eaa24636e3d514e608cfed5d238a8f077c06dfbec81c6e97
+size 83217
diff --git a/compositor/matte/compositor_cpu_renders/node_channel_matte.png b/compositor/keying/compositor_cpu_renders/node_channel_key.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_channel_matte.png
rename to compositor/keying/compositor_cpu_renders/node_channel_key.png
diff --git a/compositor/matte/compositor_cpu_renders/node_chroma_matte.png b/compositor/keying/compositor_cpu_renders/node_chroma_key.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_chroma_matte.png
rename to compositor/keying/compositor_cpu_renders/node_chroma_key.png
diff --git a/compositor/matte/compositor_cpu_renders/node_color_matte.png b/compositor/keying/compositor_cpu_renders/node_color_key.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_color_matte.png
rename to compositor/keying/compositor_cpu_renders/node_color_key.png
diff --git a/compositor/matte/compositor_cpu_renders/node_color_spill.png b/compositor/keying/compositor_cpu_renders/node_color_spill.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_color_spill.png
rename to compositor/keying/compositor_cpu_renders/node_color_spill.png
diff --git a/compositor/matte/compositor_cpu_renders/node_diff_matte.png b/compositor/keying/compositor_cpu_renders/node_diff_key.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_diff_matte.png
rename to compositor/keying/compositor_cpu_renders/node_diff_key.png
diff --git a/compositor/matte/compositor_cpu_renders/node_distance_matte.png b/compositor/keying/compositor_cpu_renders/node_distance_key.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_distance_matte.png
rename to compositor/keying/compositor_cpu_renders/node_distance_key.png
diff --git a/compositor/matte/compositor_cpu_renders/node_keying.png b/compositor/keying/compositor_cpu_renders/node_keying.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_keying.png
rename to compositor/keying/compositor_cpu_renders/node_keying.png
diff --git a/compositor/matte/compositor_cpu_renders/node_keying_edge.png b/compositor/keying/compositor_cpu_renders/node_keying_edge.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_keying_edge.png
rename to compositor/keying/compositor_cpu_renders/node_keying_edge.png
diff --git a/compositor/matte/compositor_cpu_renders/node_keying_matte.png b/compositor/keying/compositor_cpu_renders/node_keying_matte.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_keying_matte.png
rename to compositor/keying/compositor_cpu_renders/node_keying_matte.png
diff --git a/compositor/matte/compositor_cpu_renders/node_keying_screen.png b/compositor/keying/compositor_cpu_renders/node_keying_screen.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_keying_screen.png
rename to compositor/keying/compositor_cpu_renders/node_keying_screen.png
diff --git a/compositor/matte/compositor_cpu_renders/node_luma_matte.png b/compositor/keying/compositor_cpu_renders/node_luma_key.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_luma_matte.png
rename to compositor/keying/compositor_cpu_renders/node_luma_key.png
diff --git a/compositor/matte/compositor_realtime_renders/node_channel_matte.png b/compositor/keying/compositor_realtime_renders/node_channel_key.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_channel_matte.png
rename to compositor/keying/compositor_realtime_renders/node_channel_key.png
diff --git a/compositor/matte/compositor_realtime_renders/node_chroma_matte.png b/compositor/keying/compositor_realtime_renders/node_chroma_key.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_chroma_matte.png
rename to compositor/keying/compositor_realtime_renders/node_chroma_key.png
diff --git a/compositor/matte/compositor_realtime_renders/node_color_matte.png b/compositor/keying/compositor_realtime_renders/node_color_key.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_color_matte.png
rename to compositor/keying/compositor_realtime_renders/node_color_key.png
diff --git a/compositor/matte/compositor_realtime_renders/node_color_spill.png b/compositor/keying/compositor_realtime_renders/node_color_spill.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_color_spill.png
rename to compositor/keying/compositor_realtime_renders/node_color_spill.png
diff --git a/compositor/matte/compositor_realtime_renders/node_diff_matte.png b/compositor/keying/compositor_realtime_renders/node_diff_key.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_diff_matte.png
rename to compositor/keying/compositor_realtime_renders/node_diff_key.png
diff --git a/compositor/matte/compositor_realtime_renders/node_distance_matte.png b/compositor/keying/compositor_realtime_renders/node_distance_key.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_distance_matte.png
rename to compositor/keying/compositor_realtime_renders/node_distance_key.png
diff --git a/compositor/matte/compositor_realtime_renders/node_keying.png b/compositor/keying/compositor_realtime_renders/node_keying.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_keying.png
rename to compositor/keying/compositor_realtime_renders/node_keying.png
diff --git a/compositor/matte/compositor_realtime_renders/node_keying_edge.png b/compositor/keying/compositor_realtime_renders/node_keying_edge.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_keying_edge.png
rename to compositor/keying/compositor_realtime_renders/node_keying_edge.png
diff --git a/compositor/matte/compositor_realtime_renders/node_keying_matte.png b/compositor/keying/compositor_realtime_renders/node_keying_matte.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_keying_matte.png
rename to compositor/keying/compositor_realtime_renders/node_keying_matte.png
diff --git a/compositor/matte/compositor_realtime_renders/node_keying_screen.png b/compositor/keying/compositor_realtime_renders/node_keying_screen.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_keying_screen.png
rename to compositor/keying/compositor_realtime_renders/node_keying_screen.png
diff --git a/compositor/matte/compositor_realtime_renders/node_luma_matte.png b/compositor/keying/compositor_realtime_renders/node_luma_key.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_luma_matte.png
rename to compositor/keying/compositor_realtime_renders/node_luma_key.png
diff --git a/compositor/matte/node_channel_matte.blend b/compositor/keying/node_channel_key.blend
similarity index 100%
rename from compositor/matte/node_channel_matte.blend
rename to compositor/keying/node_channel_key.blend
diff --git a/compositor/matte/node_chroma_matte.blend b/compositor/keying/node_chroma_key.blend
similarity index 100%
rename from compositor/matte/node_chroma_matte.blend
rename to compositor/keying/node_chroma_key.blend
diff --git a/compositor/matte/node_color_matte.blend b/compositor/keying/node_color_key.blend
similarity index 100%
rename from compositor/matte/node_color_matte.blend
rename to compositor/keying/node_color_key.blend
diff --git a/compositor/matte/node_color_spill.blend b/compositor/keying/node_color_spill.blend
similarity index 100%
rename from compositor/matte/node_color_spill.blend
rename to compositor/keying/node_color_spill.blend
diff --git a/compositor/matte/node_diff_matte.blend b/compositor/keying/node_diff_key.blend
similarity index 100%
rename from compositor/matte/node_diff_matte.blend
rename to compositor/keying/node_diff_key.blend
diff --git a/compositor/matte/node_distance_matte.blend b/compositor/keying/node_distance_key.blend
similarity index 100%
rename from compositor/matte/node_distance_matte.blend
rename to compositor/keying/node_distance_key.blend
diff --git a/compositor/matte/node_keying.blend b/compositor/keying/node_keying.blend
similarity index 100%
rename from compositor/matte/node_keying.blend
rename to compositor/keying/node_keying.blend
diff --git a/compositor/matte/node_keying_edge.blend b/compositor/keying/node_keying_edge.blend
similarity index 100%
rename from compositor/matte/node_keying_edge.blend
rename to compositor/keying/node_keying_edge.blend
diff --git a/compositor/matte/node_keying_matte.blend b/compositor/keying/node_keying_matte.blend
similarity index 100%
rename from compositor/matte/node_keying_matte.blend
rename to compositor/keying/node_keying_matte.blend
diff --git a/compositor/matte/node_keying_screen.blend b/compositor/keying/node_keying_screen.blend
similarity index 100%
rename from compositor/matte/node_keying_screen.blend
rename to compositor/keying/node_keying_screen.blend
diff --git a/compositor/matte/node_luma_matte.blend b/compositor/keying/node_luma_key.blend
similarity index 100%
rename from compositor/matte/node_luma_matte.blend
rename to compositor/keying/node_luma_key.blend
diff --git a/compositor/matte/compositor_cpu_renders/double_edge_mask_adjacent_bleed_out.png b/compositor/mask/compositor_cpu_renders/double_edge_mask_adjacent_bleed_out.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/double_edge_mask_adjacent_bleed_out.png
rename to compositor/mask/compositor_cpu_renders/double_edge_mask_adjacent_bleed_out.png
diff --git a/compositor/matte/compositor_cpu_renders/double_edge_mask_adjacent_keep_in.png b/compositor/mask/compositor_cpu_renders/double_edge_mask_adjacent_keep_in.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/double_edge_mask_adjacent_keep_in.png
rename to compositor/mask/compositor_cpu_renders/double_edge_mask_adjacent_keep_in.png
diff --git a/compositor/matte/compositor_cpu_renders/double_edge_mask_all_bleed_out.png b/compositor/mask/compositor_cpu_renders/double_edge_mask_all_bleed_out.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/double_edge_mask_all_bleed_out.png
rename to compositor/mask/compositor_cpu_renders/double_edge_mask_all_bleed_out.png
diff --git a/compositor/matte/compositor_cpu_renders/double_edge_mask_all_keep_in.png b/compositor/mask/compositor_cpu_renders/double_edge_mask_all_keep_in.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/double_edge_mask_all_keep_in.png
rename to compositor/mask/compositor_cpu_renders/double_edge_mask_all_keep_in.png
diff --git a/compositor/matte/compositor_cpu_renders/node_box_mask.png b/compositor/mask/compositor_cpu_renders/node_box_mask.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_box_mask.png
rename to compositor/mask/compositor_cpu_renders/node_box_mask.png
diff --git a/compositor/matte/compositor_cpu_renders/node_cryptomatte.png b/compositor/mask/compositor_cpu_renders/node_cryptomatte.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_cryptomatte.png
rename to compositor/mask/compositor_cpu_renders/node_cryptomatte.png
diff --git a/compositor/matte/compositor_cpu_renders/node_cryptomatte_legacy.png b/compositor/mask/compositor_cpu_renders/node_cryptomatte_legacy.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_cryptomatte_legacy.png
rename to compositor/mask/compositor_cpu_renders/node_cryptomatte_legacy.png
diff --git a/compositor/matte/compositor_cpu_renders/node_ellipse_mask.png b/compositor/mask/compositor_cpu_renders/node_ellipse_mask.png
similarity index 100%
rename from compositor/matte/compositor_cpu_renders/node_ellipse_mask.png
rename to compositor/mask/compositor_cpu_renders/node_ellipse_mask.png
diff --git a/compositor/converter/compositor_cpu_renders/node_i_d_mask.png b/compositor/mask/compositor_cpu_renders/node_i_d_mask.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_i_d_mask.png
rename to compositor/mask/compositor_cpu_renders/node_i_d_mask.png
diff --git a/compositor/matte/compositor_realtime_renders/double_edge_mask_adjacent_bleed_out.png b/compositor/mask/compositor_realtime_renders/double_edge_mask_adjacent_bleed_out.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/double_edge_mask_adjacent_bleed_out.png
rename to compositor/mask/compositor_realtime_renders/double_edge_mask_adjacent_bleed_out.png
diff --git a/compositor/matte/compositor_realtime_renders/double_edge_mask_adjacent_keep_in.png b/compositor/mask/compositor_realtime_renders/double_edge_mask_adjacent_keep_in.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/double_edge_mask_adjacent_keep_in.png
rename to compositor/mask/compositor_realtime_renders/double_edge_mask_adjacent_keep_in.png
diff --git a/compositor/matte/compositor_realtime_renders/double_edge_mask_all_bleed_out.png b/compositor/mask/compositor_realtime_renders/double_edge_mask_all_bleed_out.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/double_edge_mask_all_bleed_out.png
rename to compositor/mask/compositor_realtime_renders/double_edge_mask_all_bleed_out.png
diff --git a/compositor/matte/compositor_realtime_renders/double_edge_mask_all_keep_in.png b/compositor/mask/compositor_realtime_renders/double_edge_mask_all_keep_in.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/double_edge_mask_all_keep_in.png
rename to compositor/mask/compositor_realtime_renders/double_edge_mask_all_keep_in.png
diff --git a/compositor/matte/compositor_realtime_renders/node_box_mask.png b/compositor/mask/compositor_realtime_renders/node_box_mask.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_box_mask.png
rename to compositor/mask/compositor_realtime_renders/node_box_mask.png
diff --git a/compositor/matte/compositor_realtime_renders/node_cryptomatte.png b/compositor/mask/compositor_realtime_renders/node_cryptomatte.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_cryptomatte.png
rename to compositor/mask/compositor_realtime_renders/node_cryptomatte.png
diff --git a/compositor/matte/compositor_realtime_renders/node_cryptomatte_legacy.png b/compositor/mask/compositor_realtime_renders/node_cryptomatte_legacy.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_cryptomatte_legacy.png
rename to compositor/mask/compositor_realtime_renders/node_cryptomatte_legacy.png
diff --git a/compositor/matte/compositor_realtime_renders/node_ellipse_mask.png b/compositor/mask/compositor_realtime_renders/node_ellipse_mask.png
similarity index 100%
rename from compositor/matte/compositor_realtime_renders/node_ellipse_mask.png
rename to compositor/mask/compositor_realtime_renders/node_ellipse_mask.png
diff --git a/compositor/converter/compositor_realtime_renders/node_i_d_mask.png b/compositor/mask/compositor_realtime_renders/node_i_d_mask.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_i_d_mask.png
rename to compositor/mask/compositor_realtime_renders/node_i_d_mask.png
diff --git a/compositor/matte/double_edge_mask_adjacent_bleed_out.blend b/compositor/mask/double_edge_mask_adjacent_bleed_out.blend
similarity index 100%
rename from compositor/matte/double_edge_mask_adjacent_bleed_out.blend
rename to compositor/mask/double_edge_mask_adjacent_bleed_out.blend
diff --git a/compositor/matte/double_edge_mask_adjacent_keep_in.blend b/compositor/mask/double_edge_mask_adjacent_keep_in.blend
similarity index 100%
rename from compositor/matte/double_edge_mask_adjacent_keep_in.blend
rename to compositor/mask/double_edge_mask_adjacent_keep_in.blend
diff --git a/compositor/matte/double_edge_mask_all_bleed_out.blend b/compositor/mask/double_edge_mask_all_bleed_out.blend
similarity index 100%
rename from compositor/matte/double_edge_mask_all_bleed_out.blend
rename to compositor/mask/double_edge_mask_all_bleed_out.blend
diff --git a/compositor/matte/double_edge_mask_all_keep_in.blend b/compositor/mask/double_edge_mask_all_keep_in.blend
similarity index 100%
rename from compositor/matte/double_edge_mask_all_keep_in.blend
rename to compositor/mask/double_edge_mask_all_keep_in.blend
diff --git a/compositor/matte/node_box_mask.blend b/compositor/mask/node_box_mask.blend
similarity index 100%
rename from compositor/matte/node_box_mask.blend
rename to compositor/mask/node_box_mask.blend
diff --git a/compositor/matte/node_cryptomatte.blend b/compositor/mask/node_cryptomatte.blend
similarity index 100%
rename from compositor/matte/node_cryptomatte.blend
rename to compositor/mask/node_cryptomatte.blend
diff --git a/compositor/matte/node_cryptomatte_legacy.blend b/compositor/mask/node_cryptomatte_legacy.blend
similarity index 100%
rename from compositor/matte/node_cryptomatte_legacy.blend
rename to compositor/mask/node_cryptomatte_legacy.blend
diff --git a/compositor/matte/node_ellipse_mask.blend b/compositor/mask/node_ellipse_mask.blend
similarity index 100%
rename from compositor/matte/node_ellipse_mask.blend
rename to compositor/mask/node_ellipse_mask.blend
diff --git a/compositor/converter/node_i_d_mask.blend b/compositor/mask/node_i_d_mask.blend
similarity index 100%
rename from compositor/converter/node_i_d_mask.blend
rename to compositor/mask/node_i_d_mask.blend
diff --git a/compositor/distort/compositor_cpu_renders/node_plane_track_image.png b/compositor/tracking/compositor_cpu_renders/node_plane_track_image.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_plane_track_image.png
rename to compositor/tracking/compositor_cpu_renders/node_plane_track_image.png
diff --git a/compositor/distort/compositor_cpu_renders/node_plane_track_motion_image.png b/compositor/tracking/compositor_cpu_renders/node_plane_track_motion_image.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_plane_track_motion_image.png
rename to compositor/tracking/compositor_cpu_renders/node_plane_track_motion_image.png
diff --git a/compositor/distort/compositor_cpu_renders/node_plane_track_motion_plane.png b/compositor/tracking/compositor_cpu_renders/node_plane_track_motion_plane.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_plane_track_motion_plane.png
rename to compositor/tracking/compositor_cpu_renders/node_plane_track_motion_plane.png
diff --git a/compositor/distort/compositor_cpu_renders/node_plane_track_plane.png b/compositor/tracking/compositor_cpu_renders/node_plane_track_plane.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_plane_track_plane.png
rename to compositor/tracking/compositor_cpu_renders/node_plane_track_plane.png
diff --git a/compositor/distort/compositor_cpu_renders/node_stabilize_2d.png b/compositor/tracking/compositor_cpu_renders/node_stabilize_2d.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_stabilize_2d.png
rename to compositor/tracking/compositor_cpu_renders/node_stabilize_2d.png
diff --git a/compositor/distort/compositor_cpu_renders/node_stabilize_2d_bicubic.png b/compositor/tracking/compositor_cpu_renders/node_stabilize_2d_bicubic.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_stabilize_2d_bicubic.png
rename to compositor/tracking/compositor_cpu_renders/node_stabilize_2d_bicubic.png
diff --git a/compositor/distort/compositor_cpu_renders/node_stabilize_2d_invert.png b/compositor/tracking/compositor_cpu_renders/node_stabilize_2d_invert.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_stabilize_2d_invert.png
rename to compositor/tracking/compositor_cpu_renders/node_stabilize_2d_invert.png
diff --git a/compositor/input/compositor_cpu_renders/node_track_pos_speed.png b/compositor/tracking/compositor_cpu_renders/node_track_pos_speed.png
similarity index 100%
rename from compositor/input/compositor_cpu_renders/node_track_pos_speed.png
rename to compositor/tracking/compositor_cpu_renders/node_track_pos_speed.png
diff --git a/compositor/input/compositor_cpu_renders/node_track_pos_x.png b/compositor/tracking/compositor_cpu_renders/node_track_pos_x.png
similarity index 100%
rename from compositor/input/compositor_cpu_renders/node_track_pos_x.png
rename to compositor/tracking/compositor_cpu_renders/node_track_pos_x.png
diff --git a/compositor/input/compositor_cpu_renders/node_track_pos_y.png b/compositor/tracking/compositor_cpu_renders/node_track_pos_y.png
similarity index 100%
rename from compositor/input/compositor_cpu_renders/node_track_pos_y.png
rename to compositor/tracking/compositor_cpu_renders/node_track_pos_y.png
diff --git a/compositor/distort/compositor_realtime_renders/node_plane_track_image.png b/compositor/tracking/compositor_realtime_renders/node_plane_track_image.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_plane_track_image.png
rename to compositor/tracking/compositor_realtime_renders/node_plane_track_image.png
diff --git a/compositor/distort/compositor_realtime_renders/node_plane_track_motion_image.png b/compositor/tracking/compositor_realtime_renders/node_plane_track_motion_image.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_plane_track_motion_image.png
rename to compositor/tracking/compositor_realtime_renders/node_plane_track_motion_image.png
diff --git a/compositor/distort/compositor_realtime_renders/node_plane_track_motion_plane.png b/compositor/tracking/compositor_realtime_renders/node_plane_track_motion_plane.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_plane_track_motion_plane.png
rename to compositor/tracking/compositor_realtime_renders/node_plane_track_motion_plane.png
diff --git a/compositor/distort/compositor_realtime_renders/node_plane_track_plane.png b/compositor/tracking/compositor_realtime_renders/node_plane_track_plane.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_plane_track_plane.png
rename to compositor/tracking/compositor_realtime_renders/node_plane_track_plane.png
diff --git a/compositor/distort/compositor_realtime_renders/node_stabilize_2d.png b/compositor/tracking/compositor_realtime_renders/node_stabilize_2d.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_stabilize_2d.png
rename to compositor/tracking/compositor_realtime_renders/node_stabilize_2d.png
diff --git a/compositor/distort/compositor_realtime_renders/node_stabilize_2d_bicubic.png b/compositor/tracking/compositor_realtime_renders/node_stabilize_2d_bicubic.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_stabilize_2d_bicubic.png
rename to compositor/tracking/compositor_realtime_renders/node_stabilize_2d_bicubic.png
diff --git a/compositor/distort/compositor_realtime_renders/node_stabilize_2d_invert.png b/compositor/tracking/compositor_realtime_renders/node_stabilize_2d_invert.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_stabilize_2d_invert.png
rename to compositor/tracking/compositor_realtime_renders/node_stabilize_2d_invert.png
diff --git a/compositor/input/compositor_realtime_renders/node_track_pos_speed.png b/compositor/tracking/compositor_realtime_renders/node_track_pos_speed.png
similarity index 100%
rename from compositor/input/compositor_realtime_renders/node_track_pos_speed.png
rename to compositor/tracking/compositor_realtime_renders/node_track_pos_speed.png
diff --git a/compositor/input/compositor_realtime_renders/node_track_pos_x.png b/compositor/tracking/compositor_realtime_renders/node_track_pos_x.png
similarity index 100%
rename from compositor/input/compositor_realtime_renders/node_track_pos_x.png
rename to compositor/tracking/compositor_realtime_renders/node_track_pos_x.png
diff --git a/compositor/input/compositor_realtime_renders/node_track_pos_y.png b/compositor/tracking/compositor_realtime_renders/node_track_pos_y.png
similarity index 100%
rename from compositor/input/compositor_realtime_renders/node_track_pos_y.png
rename to compositor/tracking/compositor_realtime_renders/node_track_pos_y.png
diff --git a/compositor/distort/node_plane_track_image.blend b/compositor/tracking/node_plane_track_image.blend
similarity index 100%
rename from compositor/distort/node_plane_track_image.blend
rename to compositor/tracking/node_plane_track_image.blend
diff --git a/compositor/distort/node_plane_track_motion_image.blend b/compositor/tracking/node_plane_track_motion_image.blend
similarity index 100%
rename from compositor/distort/node_plane_track_motion_image.blend
rename to compositor/tracking/node_plane_track_motion_image.blend
diff --git a/compositor/distort/node_plane_track_motion_plane.blend b/compositor/tracking/node_plane_track_motion_plane.blend
similarity index 100%
rename from compositor/distort/node_plane_track_motion_plane.blend
rename to compositor/tracking/node_plane_track_motion_plane.blend
diff --git a/compositor/distort/node_plane_track_plane.blend b/compositor/tracking/node_plane_track_plane.blend
similarity index 100%
rename from compositor/distort/node_plane_track_plane.blend
rename to compositor/tracking/node_plane_track_plane.blend
diff --git a/compositor/distort/node_stabilize_2d.blend b/compositor/tracking/node_stabilize_2d.blend
similarity index 100%
rename from compositor/distort/node_stabilize_2d.blend
rename to compositor/tracking/node_stabilize_2d.blend
diff --git a/compositor/distort/node_stabilize_2d_bicubic.blend b/compositor/tracking/node_stabilize_2d_bicubic.blend
similarity index 100%
rename from compositor/distort/node_stabilize_2d_bicubic.blend
rename to compositor/tracking/node_stabilize_2d_bicubic.blend
diff --git a/compositor/distort/node_stabilize_2d_invert.blend b/compositor/tracking/node_stabilize_2d_invert.blend
similarity index 100%
rename from compositor/distort/node_stabilize_2d_invert.blend
rename to compositor/tracking/node_stabilize_2d_invert.blend
diff --git a/compositor/input/node_track_pos_speed.blend b/compositor/tracking/node_track_pos_speed.blend
similarity index 100%
rename from compositor/input/node_track_pos_speed.blend
rename to compositor/tracking/node_track_pos_speed.blend
diff --git a/compositor/input/node_track_pos_x.blend b/compositor/tracking/node_track_pos_x.blend
similarity index 100%
rename from compositor/input/node_track_pos_x.blend
rename to compositor/tracking/node_track_pos_x.blend
diff --git a/compositor/input/node_track_pos_y.blend b/compositor/tracking/node_track_pos_y.blend
similarity index 100%
rename from compositor/input/node_track_pos_y.blend
rename to compositor/tracking/node_track_pos_y.blend
diff --git a/compositor/distort/compositor_cpu_renders/node_corner_pin.png b/compositor/transform/compositor_cpu_renders/node_corner_pin.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_corner_pin.png
rename to compositor/transform/compositor_cpu_renders/node_corner_pin.png
diff --git a/compositor/distort/compositor_cpu_renders/node_corner_pin_plane.png b/compositor/transform/compositor_cpu_renders/node_corner_pin_plane.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_corner_pin_plane.png
rename to compositor/transform/compositor_cpu_renders/node_corner_pin_plane.png
diff --git a/compositor/distort/compositor_cpu_renders/node_crop.png b/compositor/transform/compositor_cpu_renders/node_crop.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_crop.png
rename to compositor/transform/compositor_cpu_renders/node_crop.png
diff --git a/compositor/distort/compositor_cpu_renders/node_displace.png b/compositor/transform/compositor_cpu_renders/node_displace.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_displace.png
rename to compositor/transform/compositor_cpu_renders/node_displace.png
diff --git a/compositor/distort/compositor_cpu_renders/node_flip.png b/compositor/transform/compositor_cpu_renders/node_flip.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_flip.png
rename to compositor/transform/compositor_cpu_renders/node_flip.png
diff --git a/compositor/distort/compositor_cpu_renders/node_lens_distortion_negative.png b/compositor/transform/compositor_cpu_renders/node_lens_distortion_negative.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_lens_distortion_negative.png
rename to compositor/transform/compositor_cpu_renders/node_lens_distortion_negative.png
diff --git a/compositor/distort/compositor_cpu_renders/node_lens_distortion_positive.png b/compositor/transform/compositor_cpu_renders/node_lens_distortion_positive.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_lens_distortion_positive.png
rename to compositor/transform/compositor_cpu_renders/node_lens_distortion_positive.png
diff --git a/compositor/distort/compositor_cpu_renders/node_lens_distortion_projector.png b/compositor/transform/compositor_cpu_renders/node_lens_distortion_projector.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_lens_distortion_projector.png
rename to compositor/transform/compositor_cpu_renders/node_lens_distortion_projector.png
diff --git a/compositor/distort/compositor_cpu_renders/node_map_u_v.png b/compositor/transform/compositor_cpu_renders/node_map_u_v.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_map_u_v.png
rename to compositor/transform/compositor_cpu_renders/node_map_u_v.png
diff --git a/compositor/distort/compositor_cpu_renders/node_movie_distortion_distort.png b/compositor/transform/compositor_cpu_renders/node_movie_distortion_distort.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_movie_distortion_distort.png
rename to compositor/transform/compositor_cpu_renders/node_movie_distortion_distort.png
diff --git a/compositor/distort/compositor_cpu_renders/node_movie_distortion_undistort.png b/compositor/transform/compositor_cpu_renders/node_movie_distortion_undistort.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_movie_distortion_undistort.png
rename to compositor/transform/compositor_cpu_renders/node_movie_distortion_undistort.png
diff --git a/compositor/distort/compositor_cpu_renders/node_rotate.png b/compositor/transform/compositor_cpu_renders/node_rotate.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_rotate.png
rename to compositor/transform/compositor_cpu_renders/node_rotate.png
diff --git a/compositor/distort/compositor_cpu_renders/node_rotate_bicubic.png b/compositor/transform/compositor_cpu_renders/node_rotate_bicubic.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_rotate_bicubic.png
rename to compositor/transform/compositor_cpu_renders/node_rotate_bicubic.png
diff --git a/compositor/distort/compositor_cpu_renders/node_rotate_bilinear.png b/compositor/transform/compositor_cpu_renders/node_rotate_bilinear.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_rotate_bilinear.png
rename to compositor/transform/compositor_cpu_renders/node_rotate_bilinear.png
diff --git a/compositor/distort/compositor_cpu_renders/node_scale.png b/compositor/transform/compositor_cpu_renders/node_scale.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_scale.png
rename to compositor/transform/compositor_cpu_renders/node_scale.png
diff --git a/compositor/distort/compositor_cpu_renders/node_transform.png b/compositor/transform/compositor_cpu_renders/node_transform.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_transform.png
rename to compositor/transform/compositor_cpu_renders/node_transform.png
diff --git a/compositor/distort/compositor_cpu_renders/node_transform_bicubic.png b/compositor/transform/compositor_cpu_renders/node_transform_bicubic.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_transform_bicubic.png
rename to compositor/transform/compositor_cpu_renders/node_transform_bicubic.png
diff --git a/compositor/distort/compositor_cpu_renders/node_transform_bilinear.png b/compositor/transform/compositor_cpu_renders/node_transform_bilinear.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_transform_bilinear.png
rename to compositor/transform/compositor_cpu_renders/node_transform_bilinear.png
diff --git a/compositor/distort/compositor_cpu_renders/node_translate.png b/compositor/transform/compositor_cpu_renders/node_translate.png
similarity index 100%
rename from compositor/distort/compositor_cpu_renders/node_translate.png
rename to compositor/transform/compositor_cpu_renders/node_translate.png
diff --git a/compositor/distort/compositor_realtime_renders/node_corner_pin.png b/compositor/transform/compositor_realtime_renders/node_corner_pin.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_corner_pin.png
rename to compositor/transform/compositor_realtime_renders/node_corner_pin.png
diff --git a/compositor/distort/compositor_realtime_renders/node_corner_pin_plane.png b/compositor/transform/compositor_realtime_renders/node_corner_pin_plane.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_corner_pin_plane.png
rename to compositor/transform/compositor_realtime_renders/node_corner_pin_plane.png
diff --git a/compositor/distort/compositor_realtime_renders/node_crop.png b/compositor/transform/compositor_realtime_renders/node_crop.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_crop.png
rename to compositor/transform/compositor_realtime_renders/node_crop.png
diff --git a/compositor/distort/compositor_realtime_renders/node_displace.png b/compositor/transform/compositor_realtime_renders/node_displace.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_displace.png
rename to compositor/transform/compositor_realtime_renders/node_displace.png
diff --git a/compositor/distort/compositor_realtime_renders/node_flip.png b/compositor/transform/compositor_realtime_renders/node_flip.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_flip.png
rename to compositor/transform/compositor_realtime_renders/node_flip.png
diff --git a/compositor/distort/compositor_realtime_renders/node_lens_distortion_negative.png b/compositor/transform/compositor_realtime_renders/node_lens_distortion_negative.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_lens_distortion_negative.png
rename to compositor/transform/compositor_realtime_renders/node_lens_distortion_negative.png
diff --git a/compositor/distort/compositor_realtime_renders/node_lens_distortion_positive.png b/compositor/transform/compositor_realtime_renders/node_lens_distortion_positive.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_lens_distortion_positive.png
rename to compositor/transform/compositor_realtime_renders/node_lens_distortion_positive.png
diff --git a/compositor/distort/compositor_realtime_renders/node_lens_distortion_projector.png b/compositor/transform/compositor_realtime_renders/node_lens_distortion_projector.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_lens_distortion_projector.png
rename to compositor/transform/compositor_realtime_renders/node_lens_distortion_projector.png
diff --git a/compositor/distort/compositor_realtime_renders/node_map_u_v.png b/compositor/transform/compositor_realtime_renders/node_map_u_v.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_map_u_v.png
rename to compositor/transform/compositor_realtime_renders/node_map_u_v.png
diff --git a/compositor/distort/compositor_realtime_renders/node_movie_distortion_distort.png b/compositor/transform/compositor_realtime_renders/node_movie_distortion_distort.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_movie_distortion_distort.png
rename to compositor/transform/compositor_realtime_renders/node_movie_distortion_distort.png
diff --git a/compositor/distort/compositor_realtime_renders/node_movie_distortion_undistort.png b/compositor/transform/compositor_realtime_renders/node_movie_distortion_undistort.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_movie_distortion_undistort.png
rename to compositor/transform/compositor_realtime_renders/node_movie_distortion_undistort.png
diff --git a/compositor/distort/compositor_realtime_renders/node_rotate.png b/compositor/transform/compositor_realtime_renders/node_rotate.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_rotate.png
rename to compositor/transform/compositor_realtime_renders/node_rotate.png
diff --git a/compositor/distort/compositor_realtime_renders/node_rotate_bicubic.png b/compositor/transform/compositor_realtime_renders/node_rotate_bicubic.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_rotate_bicubic.png
rename to compositor/transform/compositor_realtime_renders/node_rotate_bicubic.png
diff --git a/compositor/distort/compositor_realtime_renders/node_rotate_bilinear.png b/compositor/transform/compositor_realtime_renders/node_rotate_bilinear.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_rotate_bilinear.png
rename to compositor/transform/compositor_realtime_renders/node_rotate_bilinear.png
diff --git a/compositor/distort/compositor_realtime_renders/node_scale.png b/compositor/transform/compositor_realtime_renders/node_scale.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_scale.png
rename to compositor/transform/compositor_realtime_renders/node_scale.png
diff --git a/compositor/distort/compositor_realtime_renders/node_transform.png b/compositor/transform/compositor_realtime_renders/node_transform.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_transform.png
rename to compositor/transform/compositor_realtime_renders/node_transform.png
diff --git a/compositor/distort/compositor_realtime_renders/node_transform_bicubic.png b/compositor/transform/compositor_realtime_renders/node_transform_bicubic.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_transform_bicubic.png
rename to compositor/transform/compositor_realtime_renders/node_transform_bicubic.png
diff --git a/compositor/distort/compositor_realtime_renders/node_transform_bilinear.png b/compositor/transform/compositor_realtime_renders/node_transform_bilinear.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_transform_bilinear.png
rename to compositor/transform/compositor_realtime_renders/node_transform_bilinear.png
diff --git a/compositor/distort/compositor_realtime_renders/node_translate.png b/compositor/transform/compositor_realtime_renders/node_translate.png
similarity index 100%
rename from compositor/distort/compositor_realtime_renders/node_translate.png
rename to compositor/transform/compositor_realtime_renders/node_translate.png
diff --git a/compositor/distort/node_corner_pin.blend b/compositor/transform/node_corner_pin.blend
similarity index 100%
rename from compositor/distort/node_corner_pin.blend
rename to compositor/transform/node_corner_pin.blend
diff --git a/compositor/distort/node_corner_pin_plane.blend b/compositor/transform/node_corner_pin_plane.blend
similarity index 100%
rename from compositor/distort/node_corner_pin_plane.blend
rename to compositor/transform/node_corner_pin_plane.blend
diff --git a/compositor/transform/node_crop.blend b/compositor/transform/node_crop.blend
new file mode 100644
index 0000000..c378abb
--- /dev/null
+++ b/compositor/transform/node_crop.blend
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1dfed0ab248dd5bbf3307c23d09284cb4a7b7dbcdd281b094eb16d29621fad30
+size 856348
diff --git a/compositor/distort/node_displace.blend b/compositor/transform/node_displace.blend
similarity index 100%
rename from compositor/distort/node_displace.blend
rename to compositor/transform/node_displace.blend
diff --git a/compositor/distort/node_flip.blend b/compositor/transform/node_flip.blend
similarity index 100%
rename from compositor/distort/node_flip.blend
rename to compositor/transform/node_flip.blend
diff --git a/compositor/distort/node_lens_distortion_negative.blend b/compositor/transform/node_lens_distortion_negative.blend
similarity index 100%
rename from compositor/distort/node_lens_distortion_negative.blend
rename to compositor/transform/node_lens_distortion_negative.blend
diff --git a/compositor/distort/node_lens_distortion_positive.blend b/compositor/transform/node_lens_distortion_positive.blend
similarity index 100%
rename from compositor/distort/node_lens_distortion_positive.blend
rename to compositor/transform/node_lens_distortion_positive.blend
diff --git a/compositor/distort/node_lens_distortion_projector.blend b/compositor/transform/node_lens_distortion_projector.blend
similarity index 100%
rename from compositor/distort/node_lens_distortion_projector.blend
rename to compositor/transform/node_lens_distortion_projector.blend
diff --git a/compositor/distort/node_map_u_v.blend b/compositor/transform/node_map_u_v.blend
similarity index 100%
rename from compositor/distort/node_map_u_v.blend
rename to compositor/transform/node_map_u_v.blend
diff --git a/compositor/distort/node_movie_distortion_distort.blend b/compositor/transform/node_movie_distortion_distort.blend
similarity index 100%
rename from compositor/distort/node_movie_distortion_distort.blend
rename to compositor/transform/node_movie_distortion_distort.blend
diff --git a/compositor/distort/node_movie_distortion_undistort.blend b/compositor/transform/node_movie_distortion_undistort.blend
similarity index 100%
rename from compositor/distort/node_movie_distortion_undistort.blend
rename to compositor/transform/node_movie_distortion_undistort.blend
diff --git a/compositor/distort/node_rotate.blend b/compositor/transform/node_rotate.blend
similarity index 100%
rename from compositor/distort/node_rotate.blend
rename to compositor/transform/node_rotate.blend
diff --git a/compositor/distort/node_rotate_bicubic.blend b/compositor/transform/node_rotate_bicubic.blend
similarity index 100%
rename from compositor/distort/node_rotate_bicubic.blend
rename to compositor/transform/node_rotate_bicubic.blend
diff --git a/compositor/distort/node_rotate_bilinear.blend b/compositor/transform/node_rotate_bilinear.blend
similarity index 100%
rename from compositor/distort/node_rotate_bilinear.blend
rename to compositor/transform/node_rotate_bilinear.blend
diff --git a/compositor/distort/node_scale.blend b/compositor/transform/node_scale.blend
similarity index 100%
rename from compositor/distort/node_scale.blend
rename to compositor/transform/node_scale.blend
diff --git a/compositor/distort/node_transform.blend b/compositor/transform/node_transform.blend
similarity index 100%
rename from compositor/distort/node_transform.blend
rename to compositor/transform/node_transform.blend
diff --git a/compositor/distort/node_transform_bicubic.blend b/compositor/transform/node_transform_bicubic.blend
similarity index 100%
rename from compositor/distort/node_transform_bicubic.blend
rename to compositor/transform/node_transform_bicubic.blend
diff --git a/compositor/distort/node_transform_bilinear.blend b/compositor/transform/node_transform_bilinear.blend
similarity index 100%
rename from compositor/distort/node_transform_bilinear.blend
rename to compositor/transform/node_transform_bilinear.blend
diff --git a/compositor/distort/node_translate.blend b/compositor/transform/node_translate.blend
similarity index 100%
rename from compositor/distort/node_translate.blend
rename to compositor/transform/node_translate.blend
diff --git a/compositor/output/compositor_cpu_renders/node_levels.png b/compositor/utilities/compositor_cpu_renders/node_levels.png
similarity index 100%
rename from compositor/output/compositor_cpu_renders/node_levels.png
rename to compositor/utilities/compositor_cpu_renders/node_levels.png
diff --git a/compositor/vector/compositor_cpu_renders/node_map_range.png b/compositor/utilities/compositor_cpu_renders/node_map_range.png
similarity index 100%
rename from compositor/vector/compositor_cpu_renders/node_map_range.png
rename to compositor/utilities/compositor_cpu_renders/node_map_range.png
diff --git a/compositor/vector/compositor_cpu_renders/node_map_value.png b/compositor/utilities/compositor_cpu_renders/node_map_value.png
similarity index 100%
rename from compositor/vector/compositor_cpu_renders/node_map_value.png
rename to compositor/utilities/compositor_cpu_renders/node_map_value.png
diff --git a/compositor/converter/compositor_cpu_renders/node_math.png b/compositor/utilities/compositor_cpu_renders/node_math.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_math.png
rename to compositor/utilities/compositor_cpu_renders/node_math.png
diff --git a/compositor/vector/compositor_cpu_renders/node_normalize.png b/compositor/utilities/compositor_cpu_renders/node_normalize.png
similarity index 100%
rename from compositor/vector/compositor_cpu_renders/node_normalize.png
rename to compositor/utilities/compositor_cpu_renders/node_normalize.png
diff --git a/compositor/converter/compositor_cpu_renders/node_split_2_linked.png b/compositor/utilities/compositor_cpu_renders/node_split_2_linked.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_split_2_linked.png
rename to compositor/utilities/compositor_cpu_renders/node_split_2_linked.png
diff --git a/compositor/converter/compositor_cpu_renders/node_split_first_linked.png b/compositor/utilities/compositor_cpu_renders/node_split_first_linked.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_split_first_linked.png
rename to compositor/utilities/compositor_cpu_renders/node_split_first_linked.png
diff --git a/compositor/converter/compositor_cpu_renders/node_switch.png b/compositor/utilities/compositor_cpu_renders/node_switch.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_switch.png
rename to compositor/utilities/compositor_cpu_renders/node_switch.png
diff --git a/compositor/converter/compositor_cpu_renders/node_switch_view.png b/compositor/utilities/compositor_cpu_renders/node_switch_view.png
similarity index 100%
rename from compositor/converter/compositor_cpu_renders/node_switch_view.png
rename to compositor/utilities/compositor_cpu_renders/node_switch_view.png
diff --git a/compositor/output/compositor_realtime_renders/node_levels.png b/compositor/utilities/compositor_realtime_renders/node_levels.png
similarity index 100%
rename from compositor/output/compositor_realtime_renders/node_levels.png
rename to compositor/utilities/compositor_realtime_renders/node_levels.png
diff --git a/compositor/vector/compositor_realtime_renders/node_map_range.png b/compositor/utilities/compositor_realtime_renders/node_map_range.png
similarity index 100%
rename from compositor/vector/compositor_realtime_renders/node_map_range.png
rename to compositor/utilities/compositor_realtime_renders/node_map_range.png
diff --git a/compositor/vector/compositor_realtime_renders/node_map_value.png b/compositor/utilities/compositor_realtime_renders/node_map_value.png
similarity index 100%
rename from compositor/vector/compositor_realtime_renders/node_map_value.png
rename to compositor/utilities/compositor_realtime_renders/node_map_value.png
diff --git a/compositor/converter/compositor_realtime_renders/node_math.png b/compositor/utilities/compositor_realtime_renders/node_math.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_math.png
rename to compositor/utilities/compositor_realtime_renders/node_math.png
diff --git a/compositor/vector/compositor_realtime_renders/node_normalize.png b/compositor/utilities/compositor_realtime_renders/node_normalize.png
similarity index 100%
rename from compositor/vector/compositor_realtime_renders/node_normalize.png
rename to compositor/utilities/compositor_realtime_renders/node_normalize.png
diff --git a/compositor/converter/compositor_realtime_renders/node_split_2_linked.png b/compositor/utilities/compositor_realtime_renders/node_split_2_linked.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_split_2_linked.png
rename to compositor/utilities/compositor_realtime_renders/node_split_2_linked.png
diff --git a/compositor/converter/compositor_realtime_renders/node_split_first_linked.png b/compositor/utilities/compositor_realtime_renders/node_split_first_linked.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_split_first_linked.png
rename to compositor/utilities/compositor_realtime_renders/node_split_first_linked.png
diff --git a/compositor/converter/compositor_realtime_renders/node_switch.png b/compositor/utilities/compositor_realtime_renders/node_switch.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_switch.png
rename to compositor/utilities/compositor_realtime_renders/node_switch.png
diff --git a/compositor/converter/compositor_realtime_renders/node_switch_view.png b/compositor/utilities/compositor_realtime_renders/node_switch_view.png
similarity index 100%
rename from compositor/converter/compositor_realtime_renders/node_switch_view.png
rename to compositor/utilities/compositor_realtime_renders/node_switch_view.png
diff --git a/compositor/output/node_levels.blend b/compositor/utilities/node_levels.blend
similarity index 100%
rename from compositor/output/node_levels.blend
rename to compositor/utilities/node_levels.blend
diff --git a/compositor/vector/node_map_range.blend b/compositor/utilities/node_map_range.blend
similarity index 100%
rename from compositor/vector/node_map_range.blend
rename to compositor/utilities/node_map_range.blend
diff --git a/compositor/vector/node_map_value.blend b/compositor/utilities/node_map_value.blend
similarity index 100%
rename from compositor/vector/node_map_value.blend
rename to compositor/utilities/node_map_value.blend
diff --git a/compositor/converter/node_math.blend b/compositor/utilities/node_math.blend
similarity index 100%
rename from compositor/converter/node_math.blend
rename to compositor/utilities/node_math.blend
diff --git a/compositor/vector/node_normalize.blend b/compositor/utilities/node_normalize.blend
similarity index 100%
rename from compositor/vector/node_normalize.blend
rename to compositor/utilities/node_normalize.blend
diff --git a/compositor/converter/node_split_2_linked.blend b/compositor/utilities/node_split_2_linked.blend
similarity index 100%
rename from compositor/converter/node_split_2_linked.blend
rename to compositor/utilities/node_split_2_linked.blend
diff --git a/compositor/converter/node_split_first_linked.blend b/compositor/utilities/node_split_first_linked.blend
similarity index 100%
rename from compositor/converter/node_split_first_linked.blend
rename to compositor/utilities/node_split_first_linked.blend
diff --git a/compositor/converter/node_switch.blend b/compositor/utilities/node_switch.blend
similarity index 100%
rename from compositor/converter/node_switch.blend
rename to compositor/utilities/node_switch.blend
diff --git a/compositor/converter/node_switch_view.blend b/compositor/utilities/node_switch_view.blend
similarity index 100%
rename from compositor/converter/node_switch_view.blend
rename to compositor/utilities/node_switch_view.blend