diff --git a/SCsub b/SCsub
index cbc789a..136a438 100644
--- a/SCsub
+++ b/SCsub
@@ -10,10 +10,12 @@ module_env.add_source_files(env.modules_sources, "blackboard/*.cpp")
 module_env.add_source_files(env.modules_sources, "blackboard/bb_param/*.cpp")
 module_env.add_source_files(env.modules_sources, "bt/*.cpp")
 module_env.add_source_files(env.modules_sources, "bt/tasks/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/tasks/blackboard/*.cpp")
 module_env.add_source_files(env.modules_sources, "bt/tasks/composites/*.cpp")
-module_env.add_source_files(env.modules_sources, "bt/tasks/actions/*.cpp")
 module_env.add_source_files(env.modules_sources, "bt/tasks/decorators/*.cpp")
-module_env.add_source_files(env.modules_sources, "bt/tasks/conditions/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/tasks/misc/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/tasks/scene/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/tasks/utility/*.cpp")
 if env.editor_build:
     module_env.add_source_files(env.modules_sources, "editor/*.cpp")
 module_env.add_source_files(env.modules_sources, "editor/debugger/*.cpp")
diff --git a/bt/tasks/conditions/bt_check_trigger.cpp b/bt/tasks/blackboard/bt_check_trigger.cpp
similarity index 100%
rename from bt/tasks/conditions/bt_check_trigger.cpp
rename to bt/tasks/blackboard/bt_check_trigger.cpp
diff --git a/bt/tasks/conditions/bt_check_trigger.h b/bt/tasks/blackboard/bt_check_trigger.h
similarity index 94%
rename from bt/tasks/conditions/bt_check_trigger.h
rename to bt/tasks/blackboard/bt_check_trigger.h
index 37bc50b..e3ca3e0 100644
--- a/bt/tasks/conditions/bt_check_trigger.h
+++ b/bt/tasks/blackboard/bt_check_trigger.h
@@ -18,7 +18,7 @@
 
 class BTCheckTrigger : public BTCondition {
 	GDCLASS(BTCheckTrigger, BTCondition);
-	TASK_CATEGORY(Conditions);
+	TASK_CATEGORY(Blackboard);
 
 private:
 	String variable;
diff --git a/bt/tasks/conditions/bt_check_var.cpp b/bt/tasks/blackboard/bt_check_var.cpp
similarity index 100%
rename from bt/tasks/conditions/bt_check_var.cpp
rename to bt/tasks/blackboard/bt_check_var.cpp
diff --git a/bt/tasks/conditions/bt_check_var.h b/bt/tasks/blackboard/bt_check_var.h
similarity index 96%
rename from bt/tasks/conditions/bt_check_var.h
rename to bt/tasks/blackboard/bt_check_var.h
index e25723b..ae87574 100644
--- a/bt/tasks/conditions/bt_check_var.h
+++ b/bt/tasks/blackboard/bt_check_var.h
@@ -19,7 +19,7 @@
 
 class BTCheckVar : public BTCondition {
 	GDCLASS(BTCheckVar, BTCondition);
-	TASK_CATEGORY(Conditions);
+	TASK_CATEGORY(Blackboard);
 
 private:
 	String variable;
diff --git a/bt/tasks/actions/bt_set_var.cpp b/bt/tasks/blackboard/bt_set_var.cpp
similarity index 100%
rename from bt/tasks/actions/bt_set_var.cpp
rename to bt/tasks/blackboard/bt_set_var.cpp
diff --git a/bt/tasks/actions/bt_set_var.h b/bt/tasks/blackboard/bt_set_var.h
similarity index 95%
rename from bt/tasks/actions/bt_set_var.h
rename to bt/tasks/blackboard/bt_set_var.h
index cf9a26c..00d35f5 100644
--- a/bt/tasks/actions/bt_set_var.h
+++ b/bt/tasks/blackboard/bt_set_var.h
@@ -20,7 +20,7 @@
 
 class BTSetVar : public BTAction {
 	GDCLASS(BTSetVar, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Blackboard);
 
 private:
 	String variable;
diff --git a/bt/tasks/bt_comment.h b/bt/tasks/bt_comment.h
index 25b5033..3bb59f2 100644
--- a/bt/tasks/bt_comment.h
+++ b/bt/tasks/bt_comment.h
@@ -16,10 +16,9 @@
 
 class BTComment : public BTTask {
 	GDCLASS(BTComment, BTTask);
+	TASK_CATEGORY(Utility);
 
 public:
-	static _FORCE_INLINE_ String get_task_category() { return LimboTaskDB::get_misc_category(); }
-
 	virtual Ref<BTTask> clone() const override;
 	virtual PackedStringArray get_configuration_warnings() const override;
 };
diff --git a/bt/tasks/decorators/bt_new_scope.h b/bt/tasks/decorators/bt_new_scope.h
index 80ba395..060b787 100644
--- a/bt/tasks/decorators/bt_new_scope.h
+++ b/bt/tasks/decorators/bt_new_scope.h
@@ -16,7 +16,7 @@
 
 class BTNewScope : public BTDecorator {
 	GDCLASS(BTNewScope, BTDecorator);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Decorators);
 
 private:
 	Dictionary blackboard_data;
diff --git a/bt/tasks/decorators/bt_subtree.h b/bt/tasks/decorators/bt_subtree.h
index 9a7fe26..3c5a710 100644
--- a/bt/tasks/decorators/bt_subtree.h
+++ b/bt/tasks/decorators/bt_subtree.h
@@ -18,7 +18,7 @@
 
 class BTSubtree : public BTNewScope {
 	GDCLASS(BTSubtree, BTNewScope);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Decorators);
 
 private:
 	Ref<BehaviorTree> subtree;
diff --git a/bt/tasks/actions/bt_await_animation.cpp b/bt/tasks/scene/bt_await_animation.cpp
similarity index 100%
rename from bt/tasks/actions/bt_await_animation.cpp
rename to bt/tasks/scene/bt_await_animation.cpp
diff --git a/bt/tasks/actions/bt_await_animation.h b/bt/tasks/scene/bt_await_animation.h
similarity index 96%
rename from bt/tasks/actions/bt_await_animation.h
rename to bt/tasks/scene/bt_await_animation.h
index 5780efc..0c56efd 100644
--- a/bt/tasks/actions/bt_await_animation.h
+++ b/bt/tasks/scene/bt_await_animation.h
@@ -20,7 +20,7 @@
 
 class BTAwaitAnimation : public BTAction {
 	GDCLASS(BTAwaitAnimation, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Scene);
 
 private:
 	Ref<BBNode> animation_player_param;
diff --git a/bt/tasks/actions/bt_call_method.cpp b/bt/tasks/scene/bt_call_method.cpp
similarity index 100%
rename from bt/tasks/actions/bt_call_method.cpp
rename to bt/tasks/scene/bt_call_method.cpp
diff --git a/bt/tasks/actions/bt_call_method.h b/bt/tasks/scene/bt_call_method.h
similarity index 95%
rename from bt/tasks/actions/bt_call_method.h
rename to bt/tasks/scene/bt_call_method.h
index c06a4c9..8445c3c 100644
--- a/bt/tasks/actions/bt_call_method.h
+++ b/bt/tasks/scene/bt_call_method.h
@@ -18,7 +18,7 @@
 
 class BTCallMethod : public BTAction {
 	GDCLASS(BTCallMethod, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Scene);
 
 private:
 	StringName method_name;
diff --git a/bt/tasks/conditions/bt_check_agent_property.cpp b/bt/tasks/scene/bt_check_agent_property.cpp
similarity index 100%
rename from bt/tasks/conditions/bt_check_agent_property.cpp
rename to bt/tasks/scene/bt_check_agent_property.cpp
diff --git a/bt/tasks/conditions/bt_check_agent_property.h b/bt/tasks/scene/bt_check_agent_property.h
similarity index 95%
rename from bt/tasks/conditions/bt_check_agent_property.h
rename to bt/tasks/scene/bt_check_agent_property.h
index d466e65..2c50c00 100644
--- a/bt/tasks/conditions/bt_check_agent_property.h
+++ b/bt/tasks/scene/bt_check_agent_property.h
@@ -21,7 +21,7 @@
 
 class BTCheckAgentProperty : public BTCondition {
 	GDCLASS(BTCheckAgentProperty, BTCondition);
-	TASK_CATEGORY(Conditions);
+	TASK_CATEGORY(Scene);
 
 private:
 	StringName property;
diff --git a/bt/tasks/actions/bt_pause_animation.cpp b/bt/tasks/scene/bt_pause_animation.cpp
similarity index 100%
rename from bt/tasks/actions/bt_pause_animation.cpp
rename to bt/tasks/scene/bt_pause_animation.cpp
diff --git a/bt/tasks/actions/bt_pause_animation.h b/bt/tasks/scene/bt_pause_animation.h
similarity index 97%
rename from bt/tasks/actions/bt_pause_animation.h
rename to bt/tasks/scene/bt_pause_animation.h
index 626cb5f..4424e77 100644
--- a/bt/tasks/actions/bt_pause_animation.h
+++ b/bt/tasks/scene/bt_pause_animation.h
@@ -20,7 +20,7 @@
 
 class BTPauseAnimation : public BTAction {
 	GDCLASS(BTPauseAnimation, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Scene);
 
 private:
 	Ref<BBNode> animation_player_param;
diff --git a/bt/tasks/actions/bt_play_animation.cpp b/bt/tasks/scene/bt_play_animation.cpp
similarity index 100%
rename from bt/tasks/actions/bt_play_animation.cpp
rename to bt/tasks/scene/bt_play_animation.cpp
diff --git a/bt/tasks/actions/bt_play_animation.h b/bt/tasks/scene/bt_play_animation.h
similarity index 97%
rename from bt/tasks/actions/bt_play_animation.h
rename to bt/tasks/scene/bt_play_animation.h
index ce5bca9..4c277c2 100644
--- a/bt/tasks/actions/bt_play_animation.h
+++ b/bt/tasks/scene/bt_play_animation.h
@@ -20,7 +20,7 @@
 
 class BTPlayAnimation : public BTAction {
 	GDCLASS(BTPlayAnimation, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Scene);
 
 private:
 	Ref<BBNode> animation_player_param;
diff --git a/bt/tasks/actions/bt_set_agent_property.cpp b/bt/tasks/scene/bt_set_agent_property.cpp
similarity index 100%
rename from bt/tasks/actions/bt_set_agent_property.cpp
rename to bt/tasks/scene/bt_set_agent_property.cpp
diff --git a/bt/tasks/actions/bt_set_agent_property.h b/bt/tasks/scene/bt_set_agent_property.h
similarity index 95%
rename from bt/tasks/actions/bt_set_agent_property.h
rename to bt/tasks/scene/bt_set_agent_property.h
index 7d2dd9b..8df6389 100644
--- a/bt/tasks/actions/bt_set_agent_property.h
+++ b/bt/tasks/scene/bt_set_agent_property.h
@@ -18,7 +18,7 @@
 
 class BTSetAgentProperty : public BTAction {
 	GDCLASS(BTSetAgentProperty, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Scene);
 
 private:
 	StringName property;
diff --git a/bt/tasks/actions/bt_stop_animation.cpp b/bt/tasks/scene/bt_stop_animation.cpp
similarity index 100%
rename from bt/tasks/actions/bt_stop_animation.cpp
rename to bt/tasks/scene/bt_stop_animation.cpp
diff --git a/bt/tasks/actions/bt_stop_animation.h b/bt/tasks/scene/bt_stop_animation.h
similarity index 96%
rename from bt/tasks/actions/bt_stop_animation.h
rename to bt/tasks/scene/bt_stop_animation.h
index bd38bd0..217e10d 100644
--- a/bt/tasks/actions/bt_stop_animation.h
+++ b/bt/tasks/scene/bt_stop_animation.h
@@ -20,7 +20,7 @@
 
 class BTStopAnimation : public BTAction {
 	GDCLASS(BTStopAnimation, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Scene);
 
 private:
 	Ref<BBNode> animation_player_param;
diff --git a/bt/tasks/actions/bt_console_print.cpp b/bt/tasks/utility/bt_console_print.cpp
similarity index 100%
rename from bt/tasks/actions/bt_console_print.cpp
rename to bt/tasks/utility/bt_console_print.cpp
diff --git a/bt/tasks/actions/bt_console_print.h b/bt/tasks/utility/bt_console_print.h
similarity index 95%
rename from bt/tasks/actions/bt_console_print.h
rename to bt/tasks/utility/bt_console_print.h
index 2472bd0..dc8d718 100644
--- a/bt/tasks/actions/bt_console_print.h
+++ b/bt/tasks/utility/bt_console_print.h
@@ -18,7 +18,7 @@
 
 class BTConsolePrint : public BTAction {
 	GDCLASS(BTConsolePrint, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Utility);
 
 private:
 	String text;
diff --git a/bt/tasks/actions/bt_fail.cpp b/bt/tasks/utility/bt_fail.cpp
similarity index 100%
rename from bt/tasks/actions/bt_fail.cpp
rename to bt/tasks/utility/bt_fail.cpp
diff --git a/bt/tasks/actions/bt_fail.h b/bt/tasks/utility/bt_fail.h
similarity index 92%
rename from bt/tasks/actions/bt_fail.h
rename to bt/tasks/utility/bt_fail.h
index 0def5fe..e1cbb24 100644
--- a/bt/tasks/actions/bt_fail.h
+++ b/bt/tasks/utility/bt_fail.h
@@ -16,7 +16,7 @@
 
 class BTFail : public BTAction {
 	GDCLASS(BTFail, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Utility);
 
 protected:
 	virtual int _tick(double p_delta) override;
diff --git a/bt/tasks/actions/bt_random_wait.cpp b/bt/tasks/utility/bt_random_wait.cpp
similarity index 100%
rename from bt/tasks/actions/bt_random_wait.cpp
rename to bt/tasks/utility/bt_random_wait.cpp
diff --git a/bt/tasks/actions/bt_random_wait.h b/bt/tasks/utility/bt_random_wait.h
similarity index 95%
rename from bt/tasks/actions/bt_random_wait.h
rename to bt/tasks/utility/bt_random_wait.h
index 2915f89..5490f6c 100644
--- a/bt/tasks/actions/bt_random_wait.h
+++ b/bt/tasks/utility/bt_random_wait.h
@@ -16,7 +16,7 @@
 
 class BTRandomWait : public BTAction {
 	GDCLASS(BTRandomWait, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Utility);
 
 private:
 	double min_duration = 1.0;
diff --git a/bt/tasks/actions/bt_wait.cpp b/bt/tasks/utility/bt_wait.cpp
similarity index 100%
rename from bt/tasks/actions/bt_wait.cpp
rename to bt/tasks/utility/bt_wait.cpp
diff --git a/bt/tasks/actions/bt_wait.h b/bt/tasks/utility/bt_wait.h
similarity index 94%
rename from bt/tasks/actions/bt_wait.h
rename to bt/tasks/utility/bt_wait.h
index faed149..9824f9b 100644
--- a/bt/tasks/actions/bt_wait.h
+++ b/bt/tasks/utility/bt_wait.h
@@ -16,7 +16,7 @@
 
 class BTWait : public BTAction {
 	GDCLASS(BTWait, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Utility);
 
 private:
 	double duration = 1.0;
diff --git a/bt/tasks/actions/bt_wait_ticks.cpp b/bt/tasks/utility/bt_wait_ticks.cpp
similarity index 100%
rename from bt/tasks/actions/bt_wait_ticks.cpp
rename to bt/tasks/utility/bt_wait_ticks.cpp
diff --git a/bt/tasks/actions/bt_wait_ticks.h b/bt/tasks/utility/bt_wait_ticks.h
similarity index 94%
rename from bt/tasks/actions/bt_wait_ticks.h
rename to bt/tasks/utility/bt_wait_ticks.h
index 013d95e..2e5ae50 100644
--- a/bt/tasks/actions/bt_wait_ticks.h
+++ b/bt/tasks/utility/bt_wait_ticks.h
@@ -16,7 +16,7 @@
 
 class BTWaitTicks : public BTAction {
 	GDCLASS(BTWaitTicks, BTAction);
-	TASK_CATEGORY(Actions);
+	TASK_CATEGORY(Utility);
 
 private:
 	int num_ticks = 1;
diff --git a/register_types.cpp b/register_types.cpp
index 0b9c234..b9c43c3 100644
--- a/register_types.cpp
+++ b/register_types.cpp
@@ -47,18 +47,9 @@
 #include "bt/behavior_tree.h"
 #include "bt/bt_player.h"
 #include "bt/bt_state.h"
-#include "bt/tasks/actions/bt_await_animation.h"
-#include "bt/tasks/actions/bt_call_method.h"
-#include "bt/tasks/actions/bt_console_print.h"
-#include "bt/tasks/actions/bt_fail.h"
-#include "bt/tasks/actions/bt_pause_animation.h"
-#include "bt/tasks/actions/bt_play_animation.h"
-#include "bt/tasks/actions/bt_random_wait.h"
-#include "bt/tasks/actions/bt_set_agent_property.h"
-#include "bt/tasks/actions/bt_set_var.h"
-#include "bt/tasks/actions/bt_stop_animation.h"
-#include "bt/tasks/actions/bt_wait.h"
-#include "bt/tasks/actions/bt_wait_ticks.h"
+#include "bt/tasks/blackboard/bt_check_trigger.h"
+#include "bt/tasks/blackboard/bt_check_var.h"
+#include "bt/tasks/blackboard/bt_set_var.h"
 #include "bt/tasks/bt_action.h"
 #include "bt/tasks/bt_comment.h"
 #include "bt/tasks/bt_composite.h"
@@ -72,9 +63,6 @@
 #include "bt/tasks/composites/bt_random_sequence.h"
 #include "bt/tasks/composites/bt_selector.h"
 #include "bt/tasks/composites/bt_sequence.h"
-#include "bt/tasks/conditions/bt_check_agent_property.h"
-#include "bt/tasks/conditions/bt_check_trigger.h"
-#include "bt/tasks/conditions/bt_check_var.h"
 #include "bt/tasks/decorators/bt_always_fail.h"
 #include "bt/tasks/decorators/bt_always_succeed.h"
 #include "bt/tasks/decorators/bt_cooldown.h"
@@ -89,6 +77,18 @@
 #include "bt/tasks/decorators/bt_run_limit.h"
 #include "bt/tasks/decorators/bt_subtree.h"
 #include "bt/tasks/decorators/bt_time_limit.h"
+#include "bt/tasks/scene/bt_await_animation.h"
+#include "bt/tasks/scene/bt_call_method.h"
+#include "bt/tasks/scene/bt_check_agent_property.h"
+#include "bt/tasks/scene/bt_pause_animation.h"
+#include "bt/tasks/scene/bt_play_animation.h"
+#include "bt/tasks/scene/bt_set_agent_property.h"
+#include "bt/tasks/scene/bt_stop_animation.h"
+#include "bt/tasks/utility/bt_console_print.h"
+#include "bt/tasks/utility/bt_fail.h"
+#include "bt/tasks/utility/bt_random_wait.h"
+#include "bt/tasks/utility/bt_wait.h"
+#include "bt/tasks/utility/bt_wait_ticks.h"
 #include "editor/debugger/limbo_debugger.h"
 #include "hsm/limbo_hsm.h"
 #include "hsm/limbo_state.h"