diff --git a/SCsub b/SCsub
index 66a7e5c..3c14de0 100644
--- a/SCsub
+++ b/SCsub
@@ -1,12 +1,16 @@
-# SCsub
+#!/usr/bin/env python
 
-Import('env')
+Import("env")
+Import("env_modules")
 
-env.add_source_files(env.modules_sources, "*.cpp")
-env.add_source_files(env.modules_sources, "bt/*.cpp")
-env.add_source_files(env.modules_sources, "bt/composites/*.cpp")
-env.add_source_files(env.modules_sources, "bt/actions/*.cpp")
-env.add_source_files(env.modules_sources, "bt/decorators/*.cpp")
-env.add_source_files(env.modules_sources, "bt/conditions/*.cpp")
-env.add_source_files(env.modules_sources, "editor/*.cpp")
-env.add_source_files(env.modules_sources, "bb_param/*.cpp")
+module_env = env.Clone()
+
+module_env.add_source_files(env.modules_sources, "*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/composites/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/actions/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/decorators/*.cpp")
+module_env.add_source_files(env.modules_sources, "bt/conditions/*.cpp")
+module_env.add_source_files(env.modules_sources, "bb_param/*.cpp")
+if env.editor_build:
+    module_env.add_source_files(env.modules_sources, "editor/*.cpp")
diff --git a/bb_param/bb_aabb.h b/bb_param/bb_aabb.h
index 4e8dbf4..2017225 100644
--- a/bb_param/bb_aabb.h
+++ b/bb_param/bb_aabb.h
@@ -4,13 +4,13 @@
 #define BB_AABB_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBAabb : public BBParam {
 	GDCLASS(BBAabb, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::AABB; }
+	virtual Variant::Type get_type() const override { return Variant::AABB; }
 };
 
 #endif // BB_AABB_H
\ No newline at end of file
diff --git a/bb_param/bb_array.h b/bb_param/bb_array.h
index 61acb88..1198b88 100644
--- a/bb_param/bb_array.h
+++ b/bb_param/bb_array.h
@@ -4,13 +4,13 @@
 #define BB_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBArray : public BBParam {
 	GDCLASS(BBArray, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::ARRAY; }
+	virtual Variant::Type get_type() const override { return Variant::ARRAY; }
 };
 
 #endif // BB_ARRAY_H
\ No newline at end of file
diff --git a/bb_param/bb_basis.h b/bb_param/bb_basis.h
index 235be0e..f0bf997 100644
--- a/bb_param/bb_basis.h
+++ b/bb_param/bb_basis.h
@@ -4,13 +4,13 @@
 #define BB_BASIS_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBBasis : public BBParam {
 	GDCLASS(BBBasis, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::BASIS; }
+	virtual Variant::Type get_type() const override { return Variant::BASIS; }
 };
 
 #endif // BB_BASIS_H
\ No newline at end of file
diff --git a/bb_param/bb_bool.h b/bb_param/bb_bool.h
index 46e45c9..6cd3381 100644
--- a/bb_param/bb_bool.h
+++ b/bb_param/bb_bool.h
@@ -4,13 +4,13 @@
 #define BB_BOOL_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBBool : public BBParam {
 	GDCLASS(BBBool, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::BOOL; }
+	virtual Variant::Type get_type() const override { return Variant::BOOL; }
 };
 
 #endif // BB_BOOL_H
\ No newline at end of file
diff --git a/bb_param/bb_byte_array.h b/bb_param/bb_byte_array.h
index 2d1d104..c2abfb2 100644
--- a/bb_param/bb_byte_array.h
+++ b/bb_param/bb_byte_array.h
@@ -4,13 +4,13 @@
 #define BB_BYTE_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBByteArray : public BBParam {
 	GDCLASS(BBByteArray, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::POOL_BYTE_ARRAY; }
+	virtual Variant::Type get_type() const override { return Variant::PACKED_BYTE_ARRAY; }
 };
 
 #endif // BB_BYTE_ARRAY_H
\ No newline at end of file
diff --git a/bb_param/bb_color.h b/bb_param/bb_color.h
index 2d4a3cf..3db96b8 100644
--- a/bb_param/bb_color.h
+++ b/bb_param/bb_color.h
@@ -4,13 +4,13 @@
 #define BB_COLOR_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBColor : public BBParam {
 	GDCLASS(BBColor, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::COLOR; }
+	virtual Variant::Type get_type() const override { return Variant::COLOR; }
 };
 
 #endif // BB_COLOR_H
\ No newline at end of file
diff --git a/bb_param/bb_color_array.h b/bb_param/bb_color_array.h
index 47c9b78..c3f5c7f 100644
--- a/bb_param/bb_color_array.h
+++ b/bb_param/bb_color_array.h
@@ -4,13 +4,13 @@
 #define BB_COLOR_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBColorArray : public BBParam {
 	GDCLASS(BBColorArray, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::POOL_COLOR_ARRAY; }
+	virtual Variant::Type get_type() const override { return Variant::PACKED_COLOR_ARRAY; }
 };
 
 #endif // BB_COLOR_ARRAY_H
\ No newline at end of file
diff --git a/bb_param/bb_dictionary.h b/bb_param/bb_dictionary.h
index 12b9939..7328aea 100644
--- a/bb_param/bb_dictionary.h
+++ b/bb_param/bb_dictionary.h
@@ -4,13 +4,13 @@
 #define BB_DICTIONARY_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBDictionary : public BBParam {
 	GDCLASS(BBDictionary, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::DICTIONARY; }
+	virtual Variant::Type get_type() const override { return Variant::DICTIONARY; }
 };
 
 #endif // BB_DICTIONARY_H
\ No newline at end of file
diff --git a/bb_param/bb_float.h b/bb_param/bb_float.h
index 28f6842..2c6cfb3 100644
--- a/bb_param/bb_float.h
+++ b/bb_param/bb_float.h
@@ -4,13 +4,13 @@
 #define BB_FLOAT_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBFloat : public BBParam {
 	GDCLASS(BBFloat, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::REAL; }
+	virtual Variant::Type get_type() const override { return Variant::FLOAT; }
 };
 
 #endif // BB_FLOAT_H
\ No newline at end of file
diff --git a/bb_param/bb_int.h b/bb_param/bb_int.h
index 8e0529e..ee90afb 100644
--- a/bb_param/bb_int.h
+++ b/bb_param/bb_int.h
@@ -4,13 +4,13 @@
 #define BB_INT_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBInt : public BBParam {
 	GDCLASS(BBInt, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::INT; }
+	virtual Variant::Type get_type() const override { return Variant::INT; }
 };
 
 #endif // BB_INT_H
\ No newline at end of file
diff --git a/bb_param/bb_int_array.h b/bb_param/bb_int_array.h
index ccb41c0..089c85b 100644
--- a/bb_param/bb_int_array.h
+++ b/bb_param/bb_int_array.h
@@ -4,13 +4,13 @@
 #define BB_INT_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBIntArray : public BBParam {
 	GDCLASS(BBIntArray, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::POOL_INT_ARRAY; }
+	virtual Variant::Type get_type() const override { return Variant::PACKED_INT64_ARRAY; }
 };
 
 #endif // BB_INT_ARRAY_H
\ No newline at end of file
diff --git a/bb_param/bb_node.cpp b/bb_param/bb_node.cpp
index 113e2f9..9aeaace 100644
--- a/bb_param/bb_node.cpp
+++ b/bb_param/bb_node.cpp
@@ -1,8 +1,8 @@
 /* bb_node.cpp */
 
 #include "bb_node.h"
-#include "core/error_macros.h"
-#include "core/variant.h"
+#include "core/error/error_macros.h"
+#include "core/variant/variant.h"
 #include "scene/main/node.h"
 
 Variant BBNode::get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard, const Variant &p_default) {
@@ -21,7 +21,7 @@ Variant BBNode::get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard,
 		ERR_FAIL_COND_V_MSG(agent == nullptr, Variant(), "BBNode: p_agent must be a Node.");
 		return agent->get_node(val);
 	} else {
-		Node *node = val;
+		Node *node = Object::cast_to<Node>(val);
 		if (unlikely(node == nullptr && val.get_type() != Variant::NIL)) {
 			WARN_PRINT("BBNode: Unexpected variant type of a blackboard variable.");
 			return p_default;
diff --git a/bb_param/bb_node.h b/bb_param/bb_node.h
index cf8ae19..d2ba1b6 100644
--- a/bb_param/bb_node.h
+++ b/bb_param/bb_node.h
@@ -4,16 +4,16 @@
 #define BB_NODE_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBNode : public BBParam {
 	GDCLASS(BBNode, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::NODE_PATH; }
+	virtual Variant::Type get_type() const override { return Variant::NODE_PATH; }
 
 public:
-	virtual Variant get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard, const Variant &p_default = Variant());
+	virtual Variant get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard, const Variant &p_default = Variant()) override;
 };
 
 #endif // BB_NODE_H
\ No newline at end of file
diff --git a/bb_param/bb_param.cpp b/bb_param/bb_param.cpp
index 241874a..de8f23c 100644
--- a/bb_param/bb_param.cpp
+++ b/bb_param/bb_param.cpp
@@ -1,25 +1,26 @@
 /* bb_param.cpp */
 
 #include "bb_param.h"
-#include "core/class_db.h"
-#include "core/error_macros.h"
-#include "core/object.h"
-#include "core/variant.h"
+#include "core/core_bind.h"
+#include "core/error/error_macros.h"
+#include "core/object/class_db.h"
+#include "core/object/object.h"
+#include "core/variant/variant.h"
 #include "modules/limboai/limbo_utility.h"
 
 VARIANT_ENUM_CAST(BBParam::ValueSource);
 
 void BBParam::set_value_source(ValueSource p_value) {
 	value_source = p_value;
-	property_list_changed_notify();
+	notify_property_list_changed();
 	_update_name();
 	emit_changed();
 }
 
 Variant BBParam::get_saved_value() {
 	if (saved_value.get_type() != get_type()) {
-		Variant::CallError err;
-		saved_value = Variant::construct(get_type(), nullptr, 0, err);
+		Callable::CallError err;
+		Variant::construct(get_type(), saved_value, nullptr, 0, err);
 	}
 	return saved_value;
 }
diff --git a/bb_param/bb_param.h b/bb_param/bb_param.h
index 48bad4a..7719ea0 100644
--- a/bb_param/bb_param.h
+++ b/bb_param/bb_param.h
@@ -3,10 +3,10 @@
 #ifndef BB_PARAM_H
 #define BB_PARAM_H
 
-#include "core/object.h"
-#include "core/resource.h"
+#include "core/io/resource.h"
+#include "core/object/object.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "modules/limboai/blackboard.h"
 #include "modules/limboai/limbo_utility.h"
 
@@ -45,7 +45,7 @@ public:
 	void set_variable(const String &p_value);
 	String get_variable() const { return variable; }
 
-	virtual String to_string();
+	virtual String to_string() override;
 
 	virtual Variant get_value(Object *p_agent, const Ref<Blackboard> &p_blackboard, const Variant &p_default = Variant());
 
diff --git a/bb_param/bb_plane.h b/bb_param/bb_plane.h
index dd8d9cd..9dfb543 100644
--- a/bb_param/bb_plane.h
+++ b/bb_param/bb_plane.h
@@ -4,13 +4,13 @@
 #define BB_PLANE_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBPlane : public BBParam {
 	GDCLASS(BBPlane, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::PLANE; }
+	virtual Variant::Type get_type() const override { return Variant::PLANE; }
 };
 
 #endif // BB_PLANE_H
\ No newline at end of file
diff --git a/bb_param/bb_quat.h b/bb_param/bb_quat.h
index 6d18164..83dd778 100644
--- a/bb_param/bb_quat.h
+++ b/bb_param/bb_quat.h
@@ -4,13 +4,13 @@
 #define BB_QUAT_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBQuat : public BBParam {
 	GDCLASS(BBQuat, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::QUAT; }
+	virtual Variant::Type get_type() const override { return Variant::QUATERNION; }
 };
 
 #endif // BB_QUAT_H
\ No newline at end of file
diff --git a/bb_param/bb_real_array.h b/bb_param/bb_real_array.h
index 81147a6..b956beb 100644
--- a/bb_param/bb_real_array.h
+++ b/bb_param/bb_real_array.h
@@ -4,13 +4,13 @@
 #define BB_REAL_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBRealArray : public BBParam {
 	GDCLASS(BBRealArray, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::POOL_REAL_ARRAY; }
+	virtual Variant::Type get_type() const override { return Variant::PACKED_FLOAT64_ARRAY; }
 };
 
 #endif // BB_REAL_ARRAY_H
\ No newline at end of file
diff --git a/bb_param/bb_rect2.h b/bb_param/bb_rect2.h
index 4fa8d40..0cd1c98 100644
--- a/bb_param/bb_rect2.h
+++ b/bb_param/bb_rect2.h
@@ -4,13 +4,13 @@
 #define BB_RECT2_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBRect2 : public BBParam {
 	GDCLASS(BBRect2, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::RECT2; }
+	virtual Variant::Type get_type() const override { return Variant::RECT2; }
 };
 
 #endif // BB_RECT2_H
\ No newline at end of file
diff --git a/bb_param/bb_string.h b/bb_param/bb_string.h
index 249fe83..7fb4b51 100644
--- a/bb_param/bb_string.h
+++ b/bb_param/bb_string.h
@@ -4,13 +4,13 @@
 #define BB_STRING_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBString : public BBParam {
 	GDCLASS(BBString, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::STRING; }
+	virtual Variant::Type get_type() const override { return Variant::STRING; }
 };
 
 #endif // BB_STRING_H
\ No newline at end of file
diff --git a/bb_param/bb_string_array.h b/bb_param/bb_string_array.h
index 985ddff..66e6087 100644
--- a/bb_param/bb_string_array.h
+++ b/bb_param/bb_string_array.h
@@ -4,13 +4,13 @@
 #define BB_STRING_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBStringArray : public BBParam {
 	GDCLASS(BBStringArray, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::POOL_STRING_ARRAY; }
+	virtual Variant::Type get_type() const override { return Variant::PACKED_STRING_ARRAY; }
 };
 
 #endif // BB_STRING_ARRAY_H
\ No newline at end of file
diff --git a/bb_param/bb_transform.h b/bb_param/bb_transform.h
index 4080277..4fa680b 100644
--- a/bb_param/bb_transform.h
+++ b/bb_param/bb_transform.h
@@ -4,13 +4,13 @@
 #define BB_TRANSFORM_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBTransform : public BBParam {
 	GDCLASS(BBTransform, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::TRANSFORM; }
+	virtual Variant::Type get_type() const override { return Variant::TRANSFORM3D; }
 };
 
 #endif // BB_TRANSFORM_H
\ No newline at end of file
diff --git a/bb_param/bb_transform2d.h b/bb_param/bb_transform2d.h
index fcfa3b7..c414522 100644
--- a/bb_param/bb_transform2d.h
+++ b/bb_param/bb_transform2d.h
@@ -4,13 +4,13 @@
 #define BB_TRANSFORM2D_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBTransform2D : public BBParam {
 	GDCLASS(BBTransform2D, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::TRANSFORM2D; }
+	virtual Variant::Type get_type() const override { return Variant::TRANSFORM2D; }
 };
 
 #endif // BB_TRANSFORM2D_H
\ No newline at end of file
diff --git a/bb_param/bb_variant.cpp b/bb_param/bb_variant.cpp
index e9ca51d..ef8d2df 100644
--- a/bb_param/bb_variant.cpp
+++ b/bb_param/bb_variant.cpp
@@ -1,12 +1,12 @@
 /* bb_variant.cpp */
 
 #include "bb_variant.h"
-#include "core/object.h"
-#include "core/variant.h"
+#include "core/object/object.h"
+#include "core/variant/variant.h"
 
 void BBVariant::set_type(Variant::Type p_type) {
 	type = p_type;
-	property_list_changed_notify();
+	notify_property_list_changed();
 	emit_changed();
 }
 
diff --git a/bb_param/bb_variant.h b/bb_param/bb_variant.h
index 45fe747..3a8b4ec 100644
--- a/bb_param/bb_variant.h
+++ b/bb_param/bb_variant.h
@@ -4,8 +4,8 @@
 #define BB_VARIANT_H
 
 #include "bb_param.h"
-#include "core/object.h"
-#include "core/variant.h"
+#include "core/object/object.h"
+#include "core/variant/variant.h"
 
 class BBVariant : public BBParam {
 	GDCLASS(BBVariant, BBParam);
@@ -16,7 +16,7 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual Variant::Type get_type() const { return type; }
+	virtual Variant::Type get_type() const override { return type; }
 	void set_type(Variant::Type p_type);
 
 public:
diff --git a/bb_param/bb_vector2.h b/bb_param/bb_vector2.h
index cf16a5d..9c0279f 100644
--- a/bb_param/bb_vector2.h
+++ b/bb_param/bb_vector2.h
@@ -4,13 +4,13 @@
 #define BB_VECTOR2_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBVector2 : public BBParam {
 	GDCLASS(BBVector2, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::VECTOR2; }
+	virtual Variant::Type get_type() const override { return Variant::VECTOR2; }
 };
 
 #endif // BB_VECTOR2_H
\ No newline at end of file
diff --git a/bb_param/bb_vector2_array.h b/bb_param/bb_vector2_array.h
index b8e8f5e..c422950 100644
--- a/bb_param/bb_vector2_array.h
+++ b/bb_param/bb_vector2_array.h
@@ -4,13 +4,13 @@
 #define BB_VECTOR2_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBVector2Array : public BBParam {
 	GDCLASS(BBVector2Array, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::POOL_VECTOR2_ARRAY; }
+	virtual Variant::Type get_type() const override { return Variant::PACKED_VECTOR2_ARRAY; }
 };
 
 #endif // BB_VECTOR2_ARRAY_H
\ No newline at end of file
diff --git a/bb_param/bb_vector3.h b/bb_param/bb_vector3.h
index dfb91c0..1f3cf6b 100644
--- a/bb_param/bb_vector3.h
+++ b/bb_param/bb_vector3.h
@@ -4,13 +4,13 @@
 #define BB_VECTOR3_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBVector3 : public BBParam {
 	GDCLASS(BBVector3, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::VECTOR3; }
+	virtual Variant::Type get_type() const override { return Variant::VECTOR3; }
 };
 
 #endif // BB_VECTOR3_H
\ No newline at end of file
diff --git a/bb_param/bb_vector3_array.h b/bb_param/bb_vector3_array.h
index e5c2143..a7d37bb 100644
--- a/bb_param/bb_vector3_array.h
+++ b/bb_param/bb_vector3_array.h
@@ -4,13 +4,13 @@
 #define BB_VECTOR3_ARRAY_H
 
 #include "bb_param.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BBVector3Array : public BBParam {
 	GDCLASS(BBVector3Array, BBParam);
 
 protected:
-	virtual Variant::Type get_type() const { return Variant::POOL_VECTOR3_ARRAY; }
+	virtual Variant::Type get_type() const override { return Variant::PACKED_VECTOR3_ARRAY; }
 };
 
 #endif // BB_VECTOR3_ARRAY_H
\ No newline at end of file
diff --git a/blackboard.cpp b/blackboard.cpp
index 6f44d9e..faac7ef 100644
--- a/blackboard.cpp
+++ b/blackboard.cpp
@@ -1,10 +1,9 @@
 /* blackboard.cpp */
 
 #include "blackboard.h"
-#include "core/error_macros.h"
-#include "core/variant.h"
+#include "core/error/error_macros.h"
+#include "core/variant/variant.h"
 #include "scene/main/node.h"
-#include <cstddef>
 
 Ref<Blackboard> Blackboard::top() const {
 	Ref<Blackboard> bb(this);
diff --git a/blackboard.h b/blackboard.h
index 4289f94..322dd15 100644
--- a/blackboard.h
+++ b/blackboard.h
@@ -3,13 +3,14 @@
 #ifndef BLACKBOARD_H
 #define BLACKBOARD_H
 
-#include "core/dictionary.h"
-#include "core/object.h"
-#include "core/reference.h"
-#include "core/variant.h"
+#include "core/object/object.h"
+#include "core/object/ref_counted.h"
+#include "core/variant/dictionary.h"
+#include "core/variant/variant.h"
+#include "scene/main/node.h"
 
-class Blackboard : public Reference {
-	GDCLASS(Blackboard, Reference);
+class Blackboard : public RefCounted {
+	GDCLASS(Blackboard, RefCounted);
 
 private:
 	Dictionary data;
diff --git a/bt/actions/bt_action.cpp b/bt/actions/bt_action.cpp
index 9175dda..2034160 100644
--- a/bt/actions/bt_action.cpp
+++ b/bt/actions/bt_action.cpp
@@ -4,7 +4,7 @@
 
 String BTAction::get_configuration_warning() const {
 	String warning = BTTask::get_configuration_warning();
-	if (!warning.empty()) {
+	if (!warning.is_empty()) {
 		warning += "\n";
 	}
 	if (get_child_count() != 0) {
diff --git a/bt/actions/bt_action.h b/bt/actions/bt_action.h
index 57bfd97..3004ee6 100644
--- a/bt/actions/bt_action.h
+++ b/bt/actions/bt_action.h
@@ -4,13 +4,13 @@
 #define BT_ACTION_H
 
 #include "../bt_task.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTAction : public BTTask {
 	GDCLASS(BTAction, BTTask);
 
 public:
-	virtual String get_configuration_warning() const;
+	virtual String get_configuration_warning() const override;
 };
 
 #endif // BT_ACTION_H
\ No newline at end of file
diff --git a/bt/actions/bt_console_print.cpp b/bt/actions/bt_console_print.cpp
index ac08542..33a91a9 100644
--- a/bt/actions/bt_console_print.cpp
+++ b/bt/actions/bt_console_print.cpp
@@ -1,8 +1,8 @@
 /* bt_console_print.cpp */
 
 #include "bt_console_print.h"
-#include "core/object.h"
-#include "core/print_string.h"
+#include "core/object/object.h"
+#include "core/string/print_string.h"
 #include "modules/limboai/bt/actions/bt_action.h"
 
 String BTConsolePrint::_generate_name() const {
@@ -54,7 +54,7 @@ int BTConsolePrint::_tick(float p_delta) {
 
 String BTConsolePrint::get_configuration_warning() const {
 	String warning = BTAction::get_configuration_warning();
-	if (!warning.empty()) {
+	if (!warning.is_empty()) {
 		warning += "\n";
 	}
 	if (format_var_args.size() > 5) {
@@ -70,5 +70,5 @@ void BTConsolePrint::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_format_var_args"), &BTConsolePrint::get_format_var_args);
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_MULTILINE_TEXT), "set_text", "get_text");
-	ADD_PROPERTY(PropertyInfo(Variant::POOL_STRING_ARRAY, "format_var_args"), "set_format_var_args", "get_format_var_args");
+	ADD_PROPERTY(PropertyInfo(Variant::PACKED_STRING_ARRAY, "format_var_args"), "set_format_var_args", "get_format_var_args");
 }
\ No newline at end of file
diff --git a/bt/actions/bt_console_print.h b/bt/actions/bt_console_print.h
index 6a21475..bdf165c 100644
--- a/bt/actions/bt_console_print.h
+++ b/bt/actions/bt_console_print.h
@@ -4,21 +4,21 @@
 #define BT_CONSOLE_PRINT_H
 
 #include "bt_action.h"
-#include "core/object.h"
-#include "core/variant.h"
+#include "core/object/object.h"
+#include "core/variant/variant.h"
 
 class BTConsolePrint : public BTAction {
 	GDCLASS(BTConsolePrint, BTAction);
 
 private:
 	String text;
-	PoolStringArray format_var_args;
+	PackedStringArray format_var_args;
 
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
-	virtual int _tick(float p_delta);
+	virtual String _generate_name() const override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	void set_text(String p_value) {
@@ -27,13 +27,13 @@ public:
 	}
 	String get_text() const { return text; }
 
-	void set_format_var_args(const PoolStringArray &p_value) {
+	void set_format_var_args(const PackedStringArray &p_value) {
 		format_var_args = p_value;
 		emit_changed();
 	}
-	PoolStringArray get_format_var_args() const { return format_var_args; }
+	PackedStringArray get_format_var_args() const { return format_var_args; }
 
-	virtual String get_configuration_warning() const;
+	virtual String get_configuration_warning() const override;
 };
 
 #endif // BT_CONSOLE_PRINT_H
\ No newline at end of file
diff --git a/bt/actions/bt_fail.h b/bt/actions/bt_fail.h
index 88689b6..20f27fc 100644
--- a/bt/actions/bt_fail.h
+++ b/bt/actions/bt_fail.h
@@ -4,13 +4,13 @@
 #define BT_FAIL_H
 
 #include "bt_action.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTFail : public BTAction {
 	GDCLASS(BTFail, BTAction);
 
 protected:
-	virtual int _tick(float p_delta);
+	virtual int _tick(float p_delta) override;
 };
 
 #endif // BT_FAIL_H
\ No newline at end of file
diff --git a/bt/actions/bt_random_wait.h b/bt/actions/bt_random_wait.h
index 9311e07..3ee457d 100644
--- a/bt/actions/bt_random_wait.h
+++ b/bt/actions/bt_random_wait.h
@@ -4,7 +4,7 @@
 #define BT_RANDOM_WAIT_H
 
 #include "bt_action.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTRandomWait : public BTAction {
 	GDCLASS(BTRandomWait, BTAction);
@@ -18,9 +18,9 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual String _generate_name() const override;
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	void set_duration_min_max(Vector2 p_value) {
diff --git a/bt/actions/bt_wait.cpp b/bt/actions/bt_wait.cpp
index 73c64fc..59b0d7b 100644
--- a/bt/actions/bt_wait.cpp
+++ b/bt/actions/bt_wait.cpp
@@ -1,9 +1,9 @@
 /* bt_wait.cpp */
 
 #include "bt_wait.h"
-#include "core/class_db.h"
-#include "core/object.h"
-#include "core/variant.h"
+#include "core/object/class_db.h"
+#include "core/object/object.h"
+#include "core/variant/variant.h"
 
 String BTWait::_generate_name() const {
 	return vformat("Wait %ss", duration);
@@ -26,5 +26,5 @@ void BTWait::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_duration", "p_value"), &BTWait::set_duration);
 	ClassDB::bind_method(D_METHOD("get_duration"), &BTWait::get_duration);
 
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "duration"), "set_duration", "get_duration");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "duration"), "set_duration", "get_duration");
 }
diff --git a/bt/actions/bt_wait.h b/bt/actions/bt_wait.h
index aadff9a..a426037 100644
--- a/bt/actions/bt_wait.h
+++ b/bt/actions/bt_wait.h
@@ -4,7 +4,7 @@
 #define BT_WAIT_H
 
 #include "bt_action.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTWait : public BTAction {
 	GDCLASS(BTWait, BTAction);
@@ -17,9 +17,9 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual String _generate_name() const override;
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	void set_duration(float p_value) {
diff --git a/bt/actions/bt_wait_ticks.cpp b/bt/actions/bt_wait_ticks.cpp
index 099cec0..fdd564d 100644
--- a/bt/actions/bt_wait_ticks.cpp
+++ b/bt/actions/bt_wait_ticks.cpp
@@ -1,9 +1,9 @@
 /* bt_wait_ticks.cpp */
 
 #include "bt_wait_ticks.h"
-#include "core/class_db.h"
-#include "core/object.h"
-#include "core/variant.h"
+#include "core/object/class_db.h"
+#include "core/object/object.h"
+#include "core/variant/variant.h"
 
 String BTWaitTicks::_generate_name() const {
 	return vformat("WaitTicks x%d", num_ticks);
diff --git a/bt/actions/bt_wait_ticks.h b/bt/actions/bt_wait_ticks.h
index 3d6aa9a..1ba2e8e 100644
--- a/bt/actions/bt_wait_ticks.h
+++ b/bt/actions/bt_wait_ticks.h
@@ -4,7 +4,7 @@
 #define BT_WAIT_TICKS_H
 
 #include "bt_action.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTWaitTicks : public BTAction {
 	GDCLASS(BTWaitTicks, BTAction);
@@ -17,9 +17,9 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual String _generate_name() const override;
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	void set_num_ticks(int p_value) {
diff --git a/bt/behavior_tree.cpp b/bt/behavior_tree.cpp
index 6482da7..421a57b 100644
--- a/bt/behavior_tree.cpp
+++ b/bt/behavior_tree.cpp
@@ -1,12 +1,11 @@
 /* behavior_tree.cpp */
 
 #include "behavior_tree.h"
-#include "core/class_db.h"
-#include "core/error_macros.h"
-#include "core/list.h"
-#include "core/object.h"
-#include "core/variant.h"
-#include <cstddef>
+#include "core/error/error_macros.h"
+#include "core/object/class_db.h"
+#include "core/object/object.h"
+#include "core/templates/list.h"
+#include "core/variant/variant.h"
 
 void BehaviorTree::init() {
 	List<BTTask *> stack;
@@ -17,7 +16,7 @@ void BehaviorTree::init() {
 			stack.push_back(task->get_child(i).ptr());
 		}
 		task = nullptr;
-		if (!stack.empty()) {
+		if (!stack.is_empty()) {
 			task = stack.front()->get();
 			stack.pop_front();
 		}
diff --git a/bt/behavior_tree.h b/bt/behavior_tree.h
index 72003e5..1bba891 100644
--- a/bt/behavior_tree.h
+++ b/bt/behavior_tree.h
@@ -4,8 +4,8 @@
 #define BEHAVIOR_TREE_H
 
 #include "bt_task.h"
-#include "core/object.h"
-#include "core/resource.h"
+#include "core/io/resource.h"
+#include "core/object/object.h"
 #include "modules/limboai/blackboard.h"
 
 class BehaviorTree : public Resource {
diff --git a/bt/bt_player.cpp b/bt/bt_player.cpp
index 3940d11..ee55626 100644
--- a/bt/bt_player.cpp
+++ b/bt/bt_player.cpp
@@ -4,14 +4,13 @@
 
 #include "../limbo_string_names.h"
 #include "bt_task.h"
-#include "core/class_db.h"
-#include "core/engine.h"
+#include "core/config/engine.h"
 #include "core/io/resource_loader.h"
-#include "core/object.h"
+#include "core/object/class_db.h"
+#include "core/object/object.h"
 #include "core/os/memory.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "modules/limboai/blackboard.h"
-#include <cstddef>
 
 VARIANT_ENUM_CAST(BTPlayer::UpdateMode);
 
diff --git a/bt/bt_player.h b/bt/bt_player.h
index b361dc1..46e4062 100644
--- a/bt/bt_player.h
+++ b/bt/bt_player.h
@@ -5,7 +5,7 @@
 
 #include "behavior_tree.h"
 #include "bt_task.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "modules/limboai/blackboard.h"
 #include "scene/main/node.h"
 
diff --git a/bt/bt_state.cpp b/bt/bt_state.cpp
index 556d467..746c8d0 100644
--- a/bt/bt_state.cpp
+++ b/bt/bt_state.cpp
@@ -1,8 +1,8 @@
 /* bt_state.cpp */
 
 #include "bt_state.h"
-#include "core/class_db.h"
-#include "core/variant.h"
+#include "core/object/class_db.h"
+#include "core/variant/variant.h"
 #include "modules/limboai/bt/bt_task.h"
 #include "modules/limboai/limbo_state.h"
 
diff --git a/bt/bt_state.h b/bt/bt_state.h
index e944ad9..51fc677 100644
--- a/bt/bt_state.h
+++ b/bt/bt_state.h
@@ -3,7 +3,7 @@
 #ifndef BT_STATE_H
 #define BT_STATE_H
 
-#include "core/object.h"
+#include "core/object/object.h"
 #include "modules/limboai/bt/behavior_tree.h"
 #include "modules/limboai/bt/bt_task.h"
 #include "modules/limboai/limbo_state.h"
@@ -20,10 +20,10 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual void _setup();
-	virtual void _enter() {}
-	virtual void _exit();
-	virtual void _update(float p_delta);
+	virtual void _setup() override;
+	virtual void _enter() override {}
+	virtual void _exit() override;
+	virtual void _update(float p_delta) override;
 
 public:
 	void set_behavior_tree(const Ref<BehaviorTree> &p_value) { behavior_tree = p_value; }
diff --git a/bt/bt_task.cpp b/bt/bt_task.cpp
index 3fad3f6..6b4a434 100644
--- a/bt/bt_task.cpp
+++ b/bt/bt_task.cpp
@@ -2,16 +2,18 @@
 
 #include "bt_task.h"
 
-#include "core/class_db.h"
-#include "core/error_macros.h"
-#include "core/object.h"
-#include "core/script_language.h"
-#include "core/variant.h"
-#include "editor/editor_node.h"
+#include "core/error/error_macros.h"
+#include "core/io/resource.h"
+#include "core/object/class_db.h"
+#include "core/object/object.h"
+#include "core/object/ref_counted.h"
+#include "core/object/script_language.h"
+#include "core/string/ustring.h"
+#include "core/templates/hash_map.h"
+#include "core/variant/variant.h"
 #include "modules/limboai/blackboard.h"
 #include "modules/limboai/limbo_string_names.h"
 #include "modules/limboai/limbo_utility.h"
-#include <cstddef>
 
 String BTTask::_generate_name() const {
 	if (get_script_instance()) {
@@ -20,7 +22,7 @@ String BTTask::_generate_name() const {
 			return get_script_instance()->call(LimboStringNames::get_singleton()->_generate_name);
 		}
 		String name = get_script_instance()->get_script()->get_path();
-		if (!name.empty()) {
+		if (!name.is_empty()) {
 			// Generate name based on script file
 			name = name.get_basename().get_file().trim_prefix("BT");
 			return name;
@@ -53,7 +55,7 @@ void BTTask::_set_children(Array p_children) {
 }
 
 String BTTask::get_task_name() const {
-	if (custom_name.empty()) {
+	if (custom_name.is_empty()) {
 		return _generate_name();
 	}
 	return custom_name;
@@ -82,12 +84,16 @@ void BTTask::initialize(Object *p_agent, const Ref<Blackboard> &p_blackboard) {
 	for (int i = 0; i < children.size(); i++) {
 		get_child(i)->initialize(p_agent, p_blackboard);
 	}
-	if (get_script_instance() &&
-			get_script_instance()->has_method(LimboStringNames::get_singleton()->_setup)) {
-		get_script_instance()->call(LimboStringNames::get_singleton()->_setup);
-	} else {
+
+	if (!GDVIRTUAL_CALL(_setup)) {
 		_setup();
 	}
+	// if (get_script_instance() &&
+	// 		get_script_instance()->has_method(LimboStringNames::get_singleton()->_setup)) {
+	// 	get_script_instance()->call(LimboStringNames::get_singleton()->_setup);
+	// } else {
+	// 	_setup();
+	// }
 }
 
 Ref<BTTask> BTTask::clone() const {
@@ -104,7 +110,7 @@ Ref<BTTask> BTTask::clone() const {
 	// Make BBParam properties unique.
 	List<PropertyInfo> props;
 	inst->get_property_list(&props);
-	Map<RES, RES> duplicates;
+	HashMap<Ref<Resource>, Ref<Resource>> duplicates;
 	for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
 		if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) {
 			continue;
@@ -112,10 +118,10 @@ Ref<BTTask> BTTask::clone() const {
 
 		Variant v = inst->get(E->get().name);
 
-		if (v.is_ref()) {
-			REF ref = v;
+		if (v.is_ref_counted()) {
+			Ref<RefCounted> ref = v;
 			if (ref.is_valid()) {
-				RES res = ref;
+				Ref<Resource> res = ref;
 				if (res.is_valid() && res->is_class("BBParam")) {
 					if (!duplicates.has(res)) {
 						duplicates[res] = res->duplicate();
@@ -132,31 +138,40 @@ Ref<BTTask> BTTask::clone() const {
 
 int BTTask::execute(float p_delta) {
 	if (status != RUNNING) {
-		if (get_script_instance() &&
-				// get_script_instance()->get_script()->is_valid() &&
-				get_script_instance()->has_method(LimboStringNames::get_singleton()->_enter)) {
-			get_script_instance()->call(LimboStringNames::get_singleton()->_enter);
-		} else {
+		if (!GDVIRTUAL_CALL(_enter)) {
 			_enter();
 		}
+		// if (get_script_instance() &&
+		// 		// get_script_instance()->get_script()->is_valid() &&
+		// 		get_script_instance()->has_method(LimboStringNames::get_singleton()->_enter)) {
+		// 	get_script_instance()->call(LimboStringNames::get_singleton()->_enter);
+		// } else {
+		// 	_enter();
+		// }
 	}
 
-	if (get_script_instance() &&
-			// get_script_instance()->get_script()->is_valid() &&
-			get_script_instance()->has_method(LimboStringNames::get_singleton()->_tick)) {
-		status = get_script_instance()->call(LimboStringNames::get_singleton()->_tick, Variant(p_delta));
-	} else {
+	if (!GDVIRTUAL_CALL(_tick, p_delta, status)) {
 		status = _tick(p_delta);
 	}
+	// if (get_script_instance() &&
+	// 		// get_script_instance()->get_script()->is_valid() &&
+	// 		get_script_instance()->has_method(LimboStringNames::get_singleton()->_tick)) {
+	// 	status = get_script_instance()->call(LimboStringNames::get_singleton()->_tick, Variant(p_delta));
+	// } else {
+	// 	status = _tick(p_delta);
+	// }
 
 	if (status != RUNNING) {
-		if (get_script_instance() &&
-				// get_script_instance()->get_script()->is_valid() &&
-				get_script_instance()->has_method(LimboStringNames::get_singleton()->_exit)) {
-			get_script_instance()->call(LimboStringNames::get_singleton()->_exit);
-		} else {
+		if (!GDVIRTUAL_CALL(_exit)) {
 			_exit();
 		}
+		// if (get_script_instance() &&
+		// 		// get_script_instance()->get_script()->is_valid() &&
+		// 		get_script_instance()->has_method(LimboStringNames::get_singleton()->_exit)) {
+		// 	get_script_instance()->call(LimboStringNames::get_singleton()->_exit);
+		// } else {
+		// 	_exit();
+		// }
 	}
 	return status;
 }
@@ -166,13 +181,16 @@ void BTTask::cancel() {
 		get_child(i)->cancel();
 	}
 	if (status == RUNNING) {
-		if (get_script_instance() &&
-				// get_script_instance()->get_script()->is_valid() &&
-				get_script_instance()->has_method(LimboStringNames::get_singleton()->_exit)) {
-			get_script_instance()->call(LimboStringNames::get_singleton()->_exit);
-		} else {
+		if (!GDVIRTUAL_CALL(_exit)) {
 			_exit();
 		}
+		// if (get_script_instance() &&
+		// 		// get_script_instance()->get_script()->is_valid() &&
+		// 		get_script_instance()->has_method(LimboStringNames::get_singleton()->_exit)) {
+		// 	get_script_instance()->call(LimboStringNames::get_singleton()->_exit);
+		// } else {
+		// 	_exit();
+		// }
 	}
 	status = FRESH;
 }
@@ -208,7 +226,7 @@ void BTTask::remove_child(Ref<BTTask> p_child) {
 	if (idx == -1) {
 		ERR_FAIL_MSG("p_child not found!");
 	} else {
-		children.remove(idx);
+		children.remove_at(idx);
 		p_child->parent = nullptr;
 		emit_changed();
 	}
@@ -216,7 +234,7 @@ void BTTask::remove_child(Ref<BTTask> p_child) {
 
 void BTTask::remove_child_at_index(int p_idx) {
 	ERR_FAIL_INDEX(p_idx, get_child_count());
-	children.remove(p_idx);
+	children.remove_at(p_idx);
 }
 
 bool BTTask::has_child(const Ref<BTTask> &p_child) const {
@@ -250,10 +268,13 @@ Ref<BTTask> BTTask::next_sibling() const {
 
 String BTTask::get_configuration_warning() const {
 	String warning = "";
-	if (get_script_instance() &&
-			get_script_instance()->has_method(LimboStringNames::get_singleton()->_get_configuration_warning)) {
-		warning = get_script_instance()->call(LimboStringNames::get_singleton()->_get_configuration_warning);
-	}
+
+	GDVIRTUAL_CALL(_get_configuration_warning, warning);
+	// if (get_script_instance() &&
+	// 		get_script_instance()->has_method(LimboStringNames::get_singleton()->_get_configuration_warning)) {
+	// 	warning = get_script_instance()->call(LimboStringNames::get_singleton()->_get_configuration_warning);
+	// }
+
 	return warning;
 }
 
@@ -287,22 +308,24 @@ void BTTask::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "agent", PROPERTY_HINT_RESOURCE_TYPE, "Object", 0), "set_agent", "get_agent");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "blackboard", PROPERTY_HINT_RESOURCE_TYPE, "Blackboard", 0), "", "get_blackboard");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "parent", PROPERTY_HINT_RESOURCE_TYPE, "BTTask", 0), "", "get_parent");
-	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "children", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "_set_children", "_get_children");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "children", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_children", "_get_children");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "status", PROPERTY_HINT_NONE, "", 0), "", "get_status");
 
 	// Virtual methods.
+	// TODO: Remove if unneeded.
 	ClassDB::bind_method(D_METHOD("_setup"), &BTTask::_setup);
-	BIND_VMETHOD(MethodInfo("_setup"));
 	ClassDB::bind_method(D_METHOD("_enter"), &BTTask::_enter);
-	BIND_VMETHOD(MethodInfo("_enter"))
 	ClassDB::bind_method(D_METHOD("_exit"), &BTTask::_exit);
-	BIND_VMETHOD(MethodInfo("_exit"));
 	ClassDB::bind_method(D_METHOD("_tick", "p_delta"), &BTTask::_tick);
-	BIND_VMETHOD(MethodInfo(Variant::INT, "_tick", PropertyInfo(Variant::REAL, "p_delta")));
 	ClassDB::bind_method(D_METHOD("_generate_name"), &BTTask::_generate_name);
-	BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::STRING, ""), "_generate_name"));
 	ClassDB::bind_method(D_METHOD("_get_configuration_warning"), &BTTask::get_configuration_warning);
-	BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::STRING, ""), "_get_configuration_warning"));
+
+	GDVIRTUAL_BIND(_setup);
+	GDVIRTUAL_BIND(_enter);
+	GDVIRTUAL_BIND(_exit);
+	GDVIRTUAL_BIND(_tick, "p_delta");
+	GDVIRTUAL_BIND(_generate_name);
+	GDVIRTUAL_BIND(_get_configuration_warning);
 
 	// Public Methods.
 	ClassDB::bind_method(D_METHOD("is_root"), &BTTask::is_root);
diff --git a/bt/bt_task.h b/bt/bt_task.h
index 983af51..070f821 100644
--- a/bt/bt_task.h
+++ b/bt/bt_task.h
@@ -3,13 +3,13 @@
 #ifndef BTTASK_H
 #define BTTASK_H
 
-#include "core/array.h"
-#include "core/dictionary.h"
-#include "core/object.h"
-#include "core/reference.h"
-#include "core/resource.h"
-#include "core/ustring.h"
-#include "core/vector.h"
+#include "core/io/resource.h"
+#include "core/object/object.h"
+#include "core/object/ref_counted.h"
+#include "core/string/ustring.h"
+#include "core/templates/vector.h"
+#include "core/variant/array.h"
+#include "core/variant/dictionary.h"
 #include "modules/limboai/blackboard.h"
 #include "scene/resources/texture.h"
 
@@ -46,6 +46,13 @@ protected:
 	virtual void _exit() {}
 	virtual int _tick(float p_delta) { return FAILURE; }
 
+	GDVIRTUAL0RC(String, _generate_name);
+	GDVIRTUAL0(_setup);
+	GDVIRTUAL0(_enter);
+	GDVIRTUAL0(_exit);
+	GDVIRTUAL1R(int, _tick, float);
+	GDVIRTUAL0RC(String, _get_configuration_warning);
+
 public:
 	Object *get_agent() const { return agent; }
 	void set_agent(Object *p_agent) { agent = p_agent; }
@@ -60,6 +67,7 @@ public:
 
 	virtual Ref<BTTask> clone() const;
 	virtual void initialize(Object *p_agent, const Ref<Blackboard> &p_blackboard);
+
 	int execute(float p_delta);
 	void cancel();
 	Ref<BTTask> get_child(int p_idx) const;
diff --git a/bt/composites/bt_composite.cpp b/bt/composites/bt_composite.cpp
index 2325ebf..b1ef2b5 100644
--- a/bt/composites/bt_composite.cpp
+++ b/bt/composites/bt_composite.cpp
@@ -4,7 +4,7 @@
 
 String BTComposite::get_configuration_warning() const {
 	String warning = BTTask::get_configuration_warning();
-	if (!warning.empty()) {
+	if (!warning.is_empty()) {
 		warning += "\n";
 	}
 	if (get_child_count() < 1) {
diff --git a/bt/composites/bt_composite.h b/bt/composites/bt_composite.h
index d892223..3628cf3 100644
--- a/bt/composites/bt_composite.h
+++ b/bt/composites/bt_composite.h
@@ -4,13 +4,13 @@
 #define BT_COMPOSITE_H
 
 #include "../bt_task.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTComposite : public BTTask {
 	GDCLASS(BTComposite, BTTask);
 
 public:
-	virtual String get_configuration_warning() const;
+	virtual String get_configuration_warning() const override;
 };
 
 #endif // BT_COMPOSITE_H
\ No newline at end of file
diff --git a/bt/composites/bt_dynamic_selector.h b/bt/composites/bt_dynamic_selector.h
index 1375929..059e755 100644
--- a/bt/composites/bt_dynamic_selector.h
+++ b/bt/composites/bt_dynamic_selector.h
@@ -4,7 +4,7 @@
 #define BT_DYNAMIC_SELECTOR_H
 
 #include "bt_composite.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTDynamicSelector : public BTComposite {
 	GDCLASS(BTDynamicSelector, BTComposite);
@@ -13,8 +13,8 @@ private:
 	int last_running_idx = 0;
 
 protected:
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 };
 
 #endif // BT_DYNAMIC_SELECTOR_H
\ No newline at end of file
diff --git a/bt/composites/bt_dynamic_sequence.h b/bt/composites/bt_dynamic_sequence.h
index a1a627d..66999f7 100644
--- a/bt/composites/bt_dynamic_sequence.h
+++ b/bt/composites/bt_dynamic_sequence.h
@@ -4,7 +4,7 @@
 #define BT_DYNAMIC_SEQUENCE_H
 
 #include "bt_composite.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTDynamicSequence : public BTComposite {
 	GDCLASS(BTDynamicSequence, BTComposite);
@@ -13,8 +13,8 @@ private:
 	int last_running_idx = 0;
 
 protected:
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 };
 
 #endif // BT_DYNAMIC_SEQUENCE_H
\ No newline at end of file
diff --git a/bt/composites/bt_parallel.cpp b/bt/composites/bt_parallel.cpp
index 7a991a6..19bb4b5 100644
--- a/bt/composites/bt_parallel.cpp
+++ b/bt/composites/bt_parallel.cpp
@@ -1,7 +1,7 @@
 /* bt_parallel.cpp */
 
 #include "bt_parallel.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 
 void BTParallel::_enter() {
 	for (int i = 0; i < get_child_count(); i++) {
diff --git a/bt/composites/bt_parallel.h b/bt/composites/bt_parallel.h
index 1fa2ed8..5da2733 100644
--- a/bt/composites/bt_parallel.h
+++ b/bt/composites/bt_parallel.h
@@ -4,7 +4,7 @@
 #define BT_PARALLEL_H
 
 #include "bt_composite.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTParallel : public BTComposite {
 	GDCLASS(BTParallel, BTComposite);
@@ -17,8 +17,8 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	int get_num_successes_required() const { return num_successes_required; }
diff --git a/bt/composites/bt_random_selector.h b/bt/composites/bt_random_selector.h
index 1415072..94603cd 100644
--- a/bt/composites/bt_random_selector.h
+++ b/bt/composites/bt_random_selector.h
@@ -4,7 +4,7 @@
 #define BT_RANDOM_SELECTOR_H
 
 #include "bt_composite.h"
-#include "core/vector.h"
+#include "core/templates/vector.h"
 
 class BTRandomSelector : public BTComposite {
 	GDCLASS(BTRandomSelector, BTComposite);
@@ -14,7 +14,7 @@ private:
 	Array _indicies;
 
 protected:
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 };
 #endif // BT_RANDOM_SELECTOR_H
\ No newline at end of file
diff --git a/bt/composites/bt_random_sequence.h b/bt/composites/bt_random_sequence.h
index 0fd3404..06cf178 100644
--- a/bt/composites/bt_random_sequence.h
+++ b/bt/composites/bt_random_sequence.h
@@ -4,7 +4,7 @@
 #define BT_RANDOM_SEQUENCE_H
 
 #include "bt_composite.h"
-#include "core/vector.h"
+#include "core/templates/vector.h"
 
 class BTRandomSequence : public BTComposite {
 	GDCLASS(BTRandomSequence, BTComposite);
@@ -14,7 +14,7 @@ private:
 	Array _indicies;
 
 protected:
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 };
 #endif // BT_RANDOM_SEQUENCE_H
\ No newline at end of file
diff --git a/bt/composites/bt_selector.h b/bt/composites/bt_selector.h
index 5ea52d5..bc43994 100644
--- a/bt/composites/bt_selector.h
+++ b/bt/composites/bt_selector.h
@@ -12,7 +12,7 @@ private:
 	int last_running_idx = 0;
 
 protected:
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 };
 #endif // BT_SELECTOR_H
\ No newline at end of file
diff --git a/bt/composites/bt_sequence.h b/bt/composites/bt_sequence.h
index a1556de..dd61497 100644
--- a/bt/composites/bt_sequence.h
+++ b/bt/composites/bt_sequence.h
@@ -4,7 +4,7 @@
 #define BT_SEQUENCE_H
 
 #include "bt_composite.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTSequence : public BTComposite {
 	GDCLASS(BTSequence, BTComposite);
@@ -13,8 +13,8 @@ private:
 	int last_running_idx = 0;
 
 protected:
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 };
 
 #endif // BT_SEQUENCE_H
\ No newline at end of file
diff --git a/bt/conditions/bt_condition.cpp b/bt/conditions/bt_condition.cpp
index f3c1d5b..9746d71 100644
--- a/bt/conditions/bt_condition.cpp
+++ b/bt/conditions/bt_condition.cpp
@@ -4,7 +4,7 @@
 
 String BTCondition::get_configuration_warning() const {
 	String warning = BTTask::get_configuration_warning();
-	if (!warning.empty()) {
+	if (!warning.is_empty()) {
 		warning += "\n";
 	}
 	if (get_child_count() != 0) {
diff --git a/bt/conditions/bt_condition.h b/bt/conditions/bt_condition.h
index 9cb60db..1158d72 100644
--- a/bt/conditions/bt_condition.h
+++ b/bt/conditions/bt_condition.h
@@ -4,13 +4,13 @@
 #define BT_CONDITION_H
 
 #include "../bt_task.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTCondition : public BTTask {
 	GDCLASS(BTCondition, BTTask);
 
 public:
-	virtual String get_configuration_warning() const;
+	virtual String get_configuration_warning() const override;
 };
 
 #endif // BT_CONDITION_H
\ No newline at end of file
diff --git a/bt/decorators/bt_always_fail.h b/bt/decorators/bt_always_fail.h
index e67a101..9021313 100644
--- a/bt/decorators/bt_always_fail.h
+++ b/bt/decorators/bt_always_fail.h
@@ -4,13 +4,13 @@
 #define BT_ALWAYS_FAIL_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTAlwaysFail : public BTDecorator {
 	GDCLASS(BTAlwaysFail, BTDecorator);
 
 protected:
-	virtual int _tick(float p_delta);
+	virtual int _tick(float p_delta) override;
 };
 
 #endif // BT_ALWAYS_FAIL_H
\ No newline at end of file
diff --git a/bt/decorators/bt_always_succeed.h b/bt/decorators/bt_always_succeed.h
index 58a4179..936349c 100644
--- a/bt/decorators/bt_always_succeed.h
+++ b/bt/decorators/bt_always_succeed.h
@@ -4,13 +4,13 @@
 #define BT_ALWAYS_SUCCEED_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTAlwaysSucceed : public BTDecorator {
 	GDCLASS(BTAlwaysSucceed, BTDecorator);
 
 protected:
-	virtual int _tick(float p_delta);
+	virtual int _tick(float p_delta) override;
 };
 
 #endif // BT_ALWAYS_SUCCEED_H
\ No newline at end of file
diff --git a/bt/decorators/bt_cooldown.cpp b/bt/decorators/bt_cooldown.cpp
index d0dd76a..089e1f0 100644
--- a/bt/decorators/bt_cooldown.cpp
+++ b/bt/decorators/bt_cooldown.cpp
@@ -1,8 +1,8 @@
 /* bt_cooldown.cpp */
 
 #include "bt_cooldown.h"
-#include "core/array.h"
-#include "core/class_db.h"
+#include "core/object/class_db.h"
+#include "core/variant/array.h"
 #include "scene/main/scene_tree.h"
 
 String BTCooldown::_generate_name() const {
@@ -10,7 +10,7 @@ String BTCooldown::_generate_name() const {
 }
 
 void BTCooldown::_setup() {
-	if (cooldown_state_var.empty()) {
+	if (cooldown_state_var.is_empty()) {
 		cooldown_state_var = vformat("cooldown_%d", rand());
 	}
 	get_blackboard()->set_var(cooldown_state_var, false);
@@ -37,7 +37,7 @@ void BTCooldown::_chill() {
 		_timer->set_time_left(duration);
 	} else {
 		_timer = SceneTree::get_singleton()->create_timer(duration, process_pause);
-		_timer->connect("timeout", this, "_on_timeout", Vector<Variant>(), CONNECT_ONESHOT);
+		_timer->connect("timeout", callable_mp(this, &BTCooldown::_on_timeout), CONNECT_ONE_SHOT);
 	}
 }
 
@@ -59,7 +59,7 @@ void BTCooldown::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_cooldown_state_var"), &BTCooldown::get_cooldown_state_var);
 	ClassDB::bind_method(D_METHOD("_on_timeout"), &BTCooldown::_on_timeout);
 
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "duration"), "set_duration", "get_duration");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "duration"), "set_duration", "get_duration");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "process_pause"), "set_process_pause", "get_process_pause");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "start_cooled"), "set_start_cooled", "get_start_cooled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "trigger_on_failure"), "set_trigger_on_failure", "get_trigger_on_failure");
diff --git a/bt/decorators/bt_cooldown.h b/bt/decorators/bt_cooldown.h
index 4169406..1474df4 100644
--- a/bt/decorators/bt_cooldown.h
+++ b/bt/decorators/bt_cooldown.h
@@ -4,7 +4,7 @@
 #define BT_COOLDOWN_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "scene/main/scene_tree.h"
 
 class BTCooldown : public BTDecorator {
@@ -25,9 +25,9 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
-	virtual void _setup();
-	virtual int _tick(float p_delta);
+	virtual String _generate_name() const override;
+	virtual void _setup() override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	void set_duration(float p_value) {
diff --git a/bt/decorators/bt_decorator.cpp b/bt/decorators/bt_decorator.cpp
index afab3c5..fc8388d 100644
--- a/bt/decorators/bt_decorator.cpp
+++ b/bt/decorators/bt_decorator.cpp
@@ -4,7 +4,7 @@
 
 String BTDecorator::get_configuration_warning() const {
 	String warning = BTTask::get_configuration_warning();
-	if (!warning.empty()) {
+	if (!warning.is_empty()) {
 		warning += "\n";
 	}
 	if (get_child_count() != 1) {
diff --git a/bt/decorators/bt_decorator.h b/bt/decorators/bt_decorator.h
index 75f6aa7..93af2ec 100644
--- a/bt/decorators/bt_decorator.h
+++ b/bt/decorators/bt_decorator.h
@@ -4,13 +4,13 @@
 #define BT_DECORATOR_H
 
 #include "../bt_task.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTDecorator : public BTTask {
 	GDCLASS(BTDecorator, BTTask)
 
 public:
-	virtual String get_configuration_warning() const;
+	virtual String get_configuration_warning() const override;
 };
 
 #endif // BT_DECORATOR_H
\ No newline at end of file
diff --git a/bt/decorators/bt_delay.cpp b/bt/decorators/bt_delay.cpp
index 4118a26..3e8a285 100644
--- a/bt/decorators/bt_delay.cpp
+++ b/bt/decorators/bt_delay.cpp
@@ -1,11 +1,11 @@
 /* bt_delay.cpp */
 
 #include "bt_delay.h"
-#include "core/array.h"
-#include "core/class_db.h"
-#include "core/error_macros.h"
-#include "core/object.h"
-#include "core/variant.h"
+#include "core/error/error_macros.h"
+#include "core/object/class_db.h"
+#include "core/object/object.h"
+#include "core/variant/array.h"
+#include "core/variant/variant.h"
 
 String BTDelay::_generate_name() const {
 	return vformat("Delay %ss", seconds);
@@ -27,5 +27,5 @@ int BTDelay::_tick(float p_delta) {
 void BTDelay::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_seconds", "p_value"), &BTDelay::set_seconds);
 	ClassDB::bind_method(D_METHOD("get_seconds"), &BTDelay::get_seconds);
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "seconds"), "set_seconds", "get_seconds");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "seconds"), "set_seconds", "get_seconds");
 }
diff --git a/bt/decorators/bt_delay.h b/bt/decorators/bt_delay.h
index d0c5b9f..34e4267 100644
--- a/bt/decorators/bt_delay.h
+++ b/bt/decorators/bt_delay.h
@@ -4,7 +4,7 @@
 #define BT_DELAY_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTDelay : public BTDecorator {
 	GDCLASS(BTDelay, BTDecorator);
@@ -16,9 +16,9 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual String _generate_name() const override;
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	void set_seconds(float p_value) {
diff --git a/bt/decorators/bt_for_each.cpp b/bt/decorators/bt_for_each.cpp
index 5ff038c..46d5fb8 100644
--- a/bt/decorators/bt_for_each.cpp
+++ b/bt/decorators/bt_for_each.cpp
@@ -1,9 +1,9 @@
 /* bt_for_each.cpp */
 
 #include "bt_for_each.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
-#include "core/variant.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
+#include "core/variant/variant.h"
 #include "modules/limboai/blackboard.h"
 #include "modules/limboai/limbo_utility.h"
 
@@ -19,8 +19,8 @@ void BTForEach::_enter() {
 
 int BTForEach::_tick(float p_delta) {
 	ERR_FAIL_COND_V_MSG(get_child_count() == 0, FAILURE, "ForEach decorator has no child.");
-	ERR_FAIL_COND_V_MSG(save_var.empty(), FAILURE, "ForEach save variable is not set.");
-	ERR_FAIL_COND_V_MSG(array_var.empty(), FAILURE, "ForEach array variable is not set.");
+	ERR_FAIL_COND_V_MSG(save_var.is_empty(), FAILURE, "ForEach save variable is not set.");
+	ERR_FAIL_COND_V_MSG(array_var.is_empty(), FAILURE, "ForEach array variable is not set.");
 
 	Array arr = get_blackboard()->get_var(array_var, Variant());
 	if (arr.size() == 0) {
diff --git a/bt/decorators/bt_for_each.h b/bt/decorators/bt_for_each.h
index 94aea10..9f65ca0 100644
--- a/bt/decorators/bt_for_each.h
+++ b/bt/decorators/bt_for_each.h
@@ -4,7 +4,7 @@
 #define BT_FOR_EACH_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTForEach : public BTDecorator {
 	GDCLASS(BTForEach, BTDecorator);
@@ -18,9 +18,9 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual String _generate_name() const override;
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	void set_array_var(String p_value) {
diff --git a/bt/decorators/bt_invert.h b/bt/decorators/bt_invert.h
index 6f8875a..5b0519b 100644
--- a/bt/decorators/bt_invert.h
+++ b/bt/decorators/bt_invert.h
@@ -4,13 +4,13 @@
 #define BT_INVERT_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTInvert : public BTDecorator {
 	GDCLASS(BTInvert, BTDecorator);
 
 protected:
-	virtual int _tick(float p_delta);
+	virtual int _tick(float p_delta) override;
 };
 
 #endif // BT_INVERT_H
\ No newline at end of file
diff --git a/bt/decorators/bt_new_scope.cpp b/bt/decorators/bt_new_scope.cpp
index 8670185..4b9864c 100644
--- a/bt/decorators/bt_new_scope.cpp
+++ b/bt/decorators/bt_new_scope.cpp
@@ -1,9 +1,9 @@
 /* bt_new_scope.cpp */
 
 #include "bt_new_scope.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
-#include "core/ustring.h"
+#include "core/string/ustring.h"
 #include "modules/limboai/blackboard.h"
 
 void BTNewScope::initialize(Object *p_agent, const Ref<Blackboard> &p_blackboard) {
diff --git a/bt/decorators/bt_new_scope.h b/bt/decorators/bt_new_scope.h
index 18d4fcb..10a4542 100644
--- a/bt/decorators/bt_new_scope.h
+++ b/bt/decorators/bt_new_scope.h
@@ -4,7 +4,7 @@
 #define BT_NEW_SCOPE_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 #include "bt_decorator.h"
 class BTNewScope : public BTDecorator {
@@ -19,10 +19,10 @@ protected:
 	void _set_blackboard_data(const Dictionary &p_value) { blackboard_data = p_value; }
 	Dictionary _get_blackboard_data() const { return blackboard_data; }
 
-	virtual int _tick(float p_delta);
+	virtual int _tick(float p_delta) override;
 
 public:
-	virtual void initialize(Object *p_agent, const Ref<Blackboard> &p_blackboard);
+	virtual void initialize(Object *p_agent, const Ref<Blackboard> &p_blackboard) override;
 };
 
 #endif // BT_NEW_SCOPE_H
\ No newline at end of file
diff --git a/bt/decorators/bt_probability.cpp b/bt/decorators/bt_probability.cpp
index c656c17..ec149fc 100644
--- a/bt/decorators/bt_probability.cpp
+++ b/bt/decorators/bt_probability.cpp
@@ -1,7 +1,7 @@
 /* bt_probability.cpp */
 
 #include "bt_probability.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 String BTProbability::_generate_name() const {
 	return vformat("Probability %.1f%%", run_chance);
@@ -18,5 +18,5 @@ int BTProbability::_tick(float p_delta) {
 void BTProbability::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_run_chance", "p_value"), &BTProbability::set_run_chance);
 	ClassDB::bind_method(D_METHOD("get_run_chance"), &BTProbability::get_run_chance);
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "run_chance", PROPERTY_HINT_RANGE, "0.0,1.0"), "set_run_chance", "get_run_chance");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "run_chance", PROPERTY_HINT_RANGE, "0.0,1.0"), "set_run_chance", "get_run_chance");
 }
diff --git a/bt/decorators/bt_probability.h b/bt/decorators/bt_probability.h
index 3e73202..7aa7613 100644
--- a/bt/decorators/bt_probability.h
+++ b/bt/decorators/bt_probability.h
@@ -4,7 +4,7 @@
 #define BT_PROBABILITY_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTProbability : public BTDecorator {
 	GDCLASS(BTProbability, BTDecorator);
@@ -15,8 +15,8 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
-	virtual int _tick(float p_delta);
+	virtual String _generate_name() const override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	void set_run_chance(float p_value) {
diff --git a/bt/decorators/bt_repeat.cpp b/bt/decorators/bt_repeat.cpp
index 607a4e1..406fb2b 100644
--- a/bt/decorators/bt_repeat.cpp
+++ b/bt/decorators/bt_repeat.cpp
@@ -1,8 +1,8 @@
 /* bt_repeat.cpp */
 
 #include "bt_repeat.h"
-#include "core/object.h"
-#include "core/variant.h"
+#include "core/object/object.h"
+#include "core/variant/variant.h"
 
 String BTRepeat::_generate_name() const {
 	return vformat("Repeat x%s", times);
diff --git a/bt/decorators/bt_repeat.h b/bt/decorators/bt_repeat.h
index e56dfaf..2e629fa 100644
--- a/bt/decorators/bt_repeat.h
+++ b/bt/decorators/bt_repeat.h
@@ -4,7 +4,7 @@
 #define BT_REPEAT_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTRepeat : public BTDecorator {
 	GDCLASS(BTRepeat, BTDecorator);
@@ -17,9 +17,9 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual String _generate_name() const override;
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	void set_times(int p_value) {
diff --git a/bt/decorators/bt_repeat_until_failure.h b/bt/decorators/bt_repeat_until_failure.h
index 12de583..5e06795 100644
--- a/bt/decorators/bt_repeat_until_failure.h
+++ b/bt/decorators/bt_repeat_until_failure.h
@@ -4,13 +4,13 @@
 #define BT_REPEAT_UNTIL_FAILURE_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTRepeatUntilFailure : public BTDecorator {
 	GDCLASS(BTRepeatUntilFailure, BTDecorator);
 
 protected:
-	virtual int _tick(float p_delta);
+	virtual int _tick(float p_delta) override;
 };
 
 #endif // BT_REPEAT_UNTIL_FAILURE_H
\ No newline at end of file
diff --git a/bt/decorators/bt_repeat_until_success.h b/bt/decorators/bt_repeat_until_success.h
index db83ea6..7729379 100644
--- a/bt/decorators/bt_repeat_until_success.h
+++ b/bt/decorators/bt_repeat_until_success.h
@@ -4,13 +4,13 @@
 #define BT_REPEAT_UNTIL_SUCCESS_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTRepeatUntilSuccess : public BTDecorator {
 	GDCLASS(BTRepeatUntilSuccess, BTDecorator);
 
 protected:
-	virtual int _tick(float p_delta);
+	virtual int _tick(float p_delta) override;
 };
 
 #endif // BT_REPEAT_UNTIL_SUCCESS_H
\ No newline at end of file
diff --git a/bt/decorators/bt_run_limit.h b/bt/decorators/bt_run_limit.h
index 313d358..75ab8b5 100644
--- a/bt/decorators/bt_run_limit.h
+++ b/bt/decorators/bt_run_limit.h
@@ -4,7 +4,7 @@
 #define BT_RUN_LIMIT_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTRunLimit : public BTDecorator {
 	GDCLASS(BTRunLimit, BTDecorator);
@@ -16,8 +16,8 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
-	virtual int _tick(float p_delta);
+	virtual String _generate_name() const override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	void set_run_limit(int p_value) {
diff --git a/bt/decorators/bt_subtree.cpp b/bt/decorators/bt_subtree.cpp
index 0801b25..341708e 100644
--- a/bt/decorators/bt_subtree.cpp
+++ b/bt/decorators/bt_subtree.cpp
@@ -1,11 +1,11 @@
 /* bt_subtree.cpp */
 
 #include "bt_subtree.h"
-#include "core/engine.h"
-#include "core/error_macros.h"
-#include "core/object.h"
+#include "core/config/engine.h"
+#include "core/error/error_macros.h"
+#include "core/object/object.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "modules/limboai/blackboard.h"
 #include "modules/limboai/bt/actions/bt_action.h"
 #include "modules/limboai/bt/actions/bt_fail.h"
@@ -17,7 +17,7 @@ String BTSubtree::_generate_name() const {
 	String s;
 	if (subtree.is_null()) {
 		s = "(unassigned)";
-	} else if (subtree->get_path().empty()) {
+	} else if (subtree->get_path().is_empty()) {
 		s = "(unsaved)";
 	} else {
 		s = vformat("\"%s\"", subtree->get_path());
@@ -46,7 +46,7 @@ int BTSubtree::_tick(float p_delta) {
 
 String BTSubtree::get_configuration_warning() const {
 	String warning = BTTask::get_configuration_warning(); // BTDecorator skipped intentionally
-	if (!warning.empty()) {
+	if (!warning.is_empty()) {
 		warning += "\n";
 	}
 	if (subtree.is_null()) {
diff --git a/bt/decorators/bt_subtree.h b/bt/decorators/bt_subtree.h
index 90fade7..cde74ae 100644
--- a/bt/decorators/bt_subtree.h
+++ b/bt/decorators/bt_subtree.h
@@ -4,7 +4,7 @@
 #define BT_SUBTREE_H
 
 #include "bt_new_scope.h"
-#include "core/object.h"
+#include "core/object/object.h"
 #include "modules/limboai/bt/behavior_tree.h"
 
 class BTSubtree : public BTNewScope {
@@ -16,8 +16,8 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
-	virtual int _tick(float p_delta);
+	virtual String _generate_name() const override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	void set_subtree(const Ref<BehaviorTree> &p_value) {
@@ -26,8 +26,8 @@ public:
 	}
 	Ref<BehaviorTree> get_subtree() const { return subtree; }
 
-	virtual void initialize(Object *p_agent, const Ref<Blackboard> &p_blackboard);
-	virtual String get_configuration_warning() const;
+	virtual void initialize(Object *p_agent, const Ref<Blackboard> &p_blackboard) override;
+	virtual String get_configuration_warning() const override;
 };
 
 #endif // BT_SUBTREE_H
\ No newline at end of file
diff --git a/bt/decorators/bt_time_limit.cpp b/bt/decorators/bt_time_limit.cpp
index 2ab6d2f..791f4ab 100644
--- a/bt/decorators/bt_time_limit.cpp
+++ b/bt/decorators/bt_time_limit.cpp
@@ -24,5 +24,5 @@ int BTTimeLimit::_tick(float p_delta) {
 void BTTimeLimit::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_time_limit", "p_value"), &BTTimeLimit::set_time_limit);
 	ClassDB::bind_method(D_METHOD("get_time_limit"), &BTTimeLimit::get_time_limit);
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "time_limit"), "set_time_limit", "get_time_limit");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "time_limit"), "set_time_limit", "get_time_limit");
 }
diff --git a/bt/decorators/bt_time_limit.h b/bt/decorators/bt_time_limit.h
index ef2dd25..cc99f95 100644
--- a/bt/decorators/bt_time_limit.h
+++ b/bt/decorators/bt_time_limit.h
@@ -4,7 +4,7 @@
 #define BT_TIME_LIMIT_H
 
 #include "bt_decorator.h"
-#include "core/object.h"
+#include "core/object/object.h"
 
 class BTTimeLimit : public BTDecorator {
 	GDCLASS(BTTimeLimit, BTDecorator);
@@ -16,9 +16,9 @@ private:
 protected:
 	static void _bind_methods();
 
-	virtual String _generate_name() const;
-	virtual void _enter();
-	virtual int _tick(float p_delta);
+	virtual String _generate_name() const override;
+	virtual void _enter() override;
+	virtual int _tick(float p_delta) override;
 
 public:
 	void set_time_limit(float p_value) {
diff --git a/config.py b/config.py
index 85a1238..bd07da5 100644
--- a/config.py
+++ b/config.py
@@ -13,6 +13,10 @@ def get_doc_path():
     return "doc_classes"
 
 
+# def get_icons_path():
+#     return "icons"
+
+
 def get_doc_classes():
     return [
         "BBAabb",
diff --git a/editor/limbo_ai_editor_plugin.cpp b/editor/limbo_ai_editor_plugin.cpp
index 8c24ef6..828c776 100644
--- a/editor/limbo_ai_editor_plugin.cpp
+++ b/editor/limbo_ai_editor_plugin.cpp
@@ -4,35 +4,40 @@
 
 #include "limbo_ai_editor_plugin.h"
 
-#include "core/array.h"
-#include "core/class_db.h"
-#include "core/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/config/project_settings.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
+#include "core/io/dir_access.h"
 #include "core/io/image_loader.h"
+#include "core/io/resource.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/list.h"
 #include "core/math/math_defs.h"
 #include "core/math/vector2.h"
-#include "core/object.h"
-#include "core/os/dir_access.h"
+#include "core/object/callable_method_pointer.h"
+#include "core/object/class_db.h"
+#include "core/object/object.h"
+#include "core/object/script_language.h"
 #include "core/os/memory.h"
-#include "core/print_string.h"
-#include "core/project_settings.h"
-#include "core/resource.h"
-#include "core/script_language.h"
-#include "core/string_name.h"
+#include "core/string/print_string.h"
+#include "core/string/string_name.h"
+#include "core/string/ustring.h"
+#include "core/templates/list.h"
+#include "core/templates/vector.h"
 #include "core/typedefs.h"
-#include "core/ustring.h"
-#include "core/variant.h"
-#include "core/vector.h"
+#include "core/variant/array.h"
+#include "core/variant/dictionary.h"
+#include "core/variant/variant.h"
+#include "editor/editor_file_system.h"
 #include "editor/editor_inspector.h"
 #include "editor/editor_node.h"
+#include "editor/editor_paths.h"
 #include "editor/editor_plugin.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "editor/inspector_dock.h"
+#include "editor/plugins/script_editor_plugin.h"
 #include "modules/limboai/bt/actions/bt_action.h"
 #include "modules/limboai/bt/behavior_tree.h"
 #include "modules/limboai/bt/bt_task.h"
@@ -51,7 +56,7 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tree.h"
-#include <cstddef>
+#include "servers/display_server.h"
 
 //////////////////////////////  TaskTree  //////////////////////////////////////
 
@@ -72,7 +77,7 @@ void TaskTree::_update_item(TreeItem *p_item) {
 	Ref<BTTask> task = p_item->get_metadata(0);
 	ERR_FAIL_COND_MSG(!task.is_valid(), "Invalid task reference in metadata.");
 	p_item->set_text(0, task->get_task_name());
-	if (task->get_script_instance() && !task->get_script_instance()->get_script()->get_path().empty()) {
+	if (task->get_script_instance() && !task->get_script_instance()->get_script()->get_path().is_empty()) {
 		p_item->set_icon(0, LimboAIEditor::get_task_icon(task->get_script_instance()->get_script()->get_path()));
 	} else {
 		p_item->set_icon(0, LimboAIEditor::get_task_icon(task->get_class()));
@@ -83,8 +88,8 @@ void TaskTree::_update_item(TreeItem *p_item) {
 		p_item->erase_button(0, i);
 	}
 	String warning = task->get_configuration_warning();
-	if (!warning.empty()) {
-		p_item->add_button(0, get_icon("NodeWarning", "EditorIcons"), 0, false, warning);
+	if (!warning.is_empty()) {
+		p_item->add_button(0, get_theme_icon(SNAME("NodeWarning"), SNAME("EditorIcons")), 0, false, warning);
 	}
 
 	// TODO: Update probabilities.
@@ -114,11 +119,11 @@ TreeItem *TaskTree::_find_item(const Ref<BTTask> &p_task) const {
 	TreeItem *item = tree->get_root();
 	List<TreeItem *> stack;
 	while (item && item->get_metadata(0) != p_task) {
-		if (item->get_children()) {
-			stack.push_back(item->get_children());
+		if (item->get_child_count() > 0) {
+			stack.push_back(item->get_first_child());
 		}
 		item = item->get_next();
-		if (item == nullptr && !stack.empty()) {
+		if (item == nullptr && !stack.is_empty()) {
 			item = stack.front()->get();
 			stack.pop_front();
 		}
@@ -126,19 +131,21 @@ TreeItem *TaskTree::_find_item(const Ref<BTTask> &p_task) const {
 	return item;
 }
 
-void TaskTree::_on_item_rmb_selected(const Vector2 &p_pos) {
-	emit_signal("rmb_pressed", tree->get_global_transform().xform(p_pos));
+void TaskTree::_on_item_mouse_selected(const Vector2 &p_pos, int p_button_index) {
+	if (p_button_index == 2) {
+		emit_signal("rmb_pressed", tree->get_global_transform().xform(p_pos));
+	}
 }
 
 void TaskTree::_on_item_selected() {
 	if (last_selected.is_valid()) {
 		update_task(last_selected);
-		if (last_selected->is_connected("changed", this, "_on_task_changed")) {
-			last_selected->disconnect("changed", this, "_on_task_changed");
+		if (last_selected->is_connected("changed", callable_mp(this, &TaskTree::_on_task_changed))) {
+			last_selected->disconnect("changed", callable_mp(this, &TaskTree::_on_task_changed));
 		}
 	}
 	last_selected = get_selected();
-	last_selected->connect("changed", this, "_on_task_changed");
+	last_selected->connect("changed", callable_mp(this, &TaskTree::_on_task_changed));
 	emit_signal("task_selected", last_selected);
 }
 
@@ -153,8 +160,8 @@ void TaskTree::_on_task_changed() {
 void TaskTree::load_bt(const Ref<BehaviorTree> &p_behavior_tree) {
 	ERR_FAIL_COND_MSG(p_behavior_tree.is_null(), "Tried to load a null tree.");
 
-	if (last_selected.is_valid() and last_selected->is_connected("changed", this, "_on_task_changed")) {
-		last_selected->disconnect("changed", this, "_on_task_changed");
+	if (last_selected.is_valid() and last_selected->is_connected("changed", callable_mp(this, &TaskTree::_on_task_changed))) {
+		last_selected->disconnect("changed", callable_mp(this, &TaskTree::_on_task_changed));
 	}
 
 	bt = p_behavior_tree;
@@ -186,7 +193,7 @@ void TaskTree::deselect() {
 	}
 }
 
-Variant TaskTree::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
+Variant TaskTree::_get_drag_data_fw(const Point2 &p_point, Control *p_from) {
 	if (editable && tree->get_item_at_position(p_point)) {
 		Dictionary drag_data;
 		drag_data["type"] = "task";
@@ -197,7 +204,7 @@ Variant TaskTree::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
 	return Variant();
 }
 
-bool TaskTree::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
+bool TaskTree::_can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
 	if (!editable) {
 		return false;
 	}
@@ -224,7 +231,7 @@ bool TaskTree::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Co
 	return false;
 }
 
-void TaskTree::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
+void TaskTree::_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
 	Dictionary d = p_data;
 	TreeItem *item = tree->get_item_at_position(p_point);
 	if (item && d.has("task")) {
@@ -234,7 +241,7 @@ void TaskTree::drop_data_fw(const Point2 &p_point, const Variant &p_data, Contro
 }
 
 void TaskTree::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("_on_item_rmb_selected"), &TaskTree::_on_item_rmb_selected);
+	ClassDB::bind_method(D_METHOD("_on_item_mouse_selected"), &TaskTree::_on_item_mouse_selected);
 	ClassDB::bind_method(D_METHOD("_on_item_selected"), &TaskTree::_on_item_selected);
 	ClassDB::bind_method(D_METHOD("_on_item_double_clicked"), &TaskTree::_on_item_double_clicked);
 	ClassDB::bind_method(D_METHOD("_on_task_changed"), &TaskTree::_on_task_changed);
@@ -245,9 +252,9 @@ void TaskTree::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_selected"), &TaskTree::get_selected);
 	ClassDB::bind_method(D_METHOD("deselect"), &TaskTree::deselect);
 
-	ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &TaskTree::get_drag_data_fw);
-	ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &TaskTree::can_drop_data_fw);
-	ClassDB::bind_method(D_METHOD("drop_data_fw"), &TaskTree::drop_data_fw);
+	ClassDB::bind_method(D_METHOD("_get_drag_data_fw"), &TaskTree::_get_drag_data_fw);
+	ClassDB::bind_method(D_METHOD("_can_drop_data_fw"), &TaskTree::_can_drop_data_fw);
+	ClassDB::bind_method(D_METHOD("_drop_data_fw"), &TaskTree::_drop_data_fw);
 
 	ADD_SIGNAL(MethodInfo("rmb_pressed"));
 	ADD_SIGNAL(MethodInfo("task_selected"));
@@ -266,19 +273,20 @@ TaskTree::TaskTree() {
 	tree->set_columns(2);
 	tree->set_column_expand(0, true);
 	tree->set_column_expand(1, false);
-	tree->set_column_min_width(1, 64);
-	tree->set_anchor(MARGIN_RIGHT, ANCHOR_END);
-	tree->set_anchor(MARGIN_BOTTOM, ANCHOR_END);
+	tree->set_column_custom_minimum_width(1, 64);
+	tree->set_anchor(SIDE_RIGHT, ANCHOR_END);
+	tree->set_anchor(SIDE_BOTTOM, ANCHOR_END);
 	tree->set_allow_rmb_select(true);
-	tree->connect("item_rmb_selected", this, "_on_item_rmb_selected");
-	tree->connect("item_selected", this, "_on_item_selected");
-	tree->connect("item_activated", this, "_on_item_double_clicked");
+	tree->connect("item_mouse_selected", callable_mp(this, &TaskTree::_on_item_mouse_selected));
+	tree->connect("item_selected", callable_mp(this, &TaskTree::_on_item_selected));
+	tree->connect("item_activated", callable_mp(this, &TaskTree::_on_item_double_clicked));
+
 	tree->set_drag_forwarding(this);
 }
 
 TaskTree::~TaskTree() {
-	if (last_selected.is_valid() and last_selected->is_connected("changed", this, "_on_task_changed")) {
-		last_selected->disconnect("changed", this, "_on_task_changed");
+	if (last_selected.is_valid() and last_selected->is_connected("changed", callable_mp(this, &TaskTree::_on_task_changed))) {
+		last_selected->disconnect("changed", callable_mp(this, &TaskTree::_on_task_changed));
 	}
 }
 
@@ -292,12 +300,12 @@ void TaskSection::_on_task_button_pressed(const StringName &p_task) {
 
 void TaskSection::_on_header_pressed() {
 	tasks_container->set_visible(!tasks_container->is_visible());
-	section_header->set_icon(tasks_container->is_visible() ? get_icon("GuiTreeArrowDown", "EditorIcons") : get_icon("GuiTreeArrowRight", "EditorIcons"));
+	section_header->set_icon(tasks_container->is_visible() ? get_theme_icon(SNAME("GuiTreeArrowDown"), SNAME("EditorIcons")) : get_theme_icon(SNAME("GuiTreeArrowRight"), SNAME("EditorIcons")));
 }
 
 void TaskSection::set_filter(String p_filter_text) {
 	int num_hidden = 0;
-	if (p_filter_text.empty()) {
+	if (p_filter_text.is_empty()) {
 		for (int i = 0; i < tasks_container->get_child_count(); i++) {
 			Object::cast_to<Button>(tasks_container->get_child(i))->show();
 		}
@@ -316,13 +324,13 @@ void TaskSection::add_task_button(String p_name, const Ref<Texture> &icon, Varia
 	Button *btn = memnew(Button);
 	btn->set_text(p_name);
 	btn->set_icon(icon);
-	btn->connect("pressed", this, "_on_task_button_pressed", varray(p_meta));
+	btn->connect("pressed", callable_mp(this, &TaskSection::_on_task_button_pressed).bind(p_meta));
 	tasks_container->add_child(btn);
 }
 
 void TaskSection::set_collapsed(bool p_collapsed) {
 	tasks_container->set_visible(!p_collapsed);
-	section_header->set_icon(p_collapsed ? get_icon("GuiTreeArrowRight", "EditorIcons") : get_icon("GuiTreeArrowDown", "EditorIcons"));
+	section_header->set_icon(p_collapsed ? get_theme_icon(SNAME("GuiTreeArrowRight"), SNAME("EditorIcons")) : get_theme_icon(SNAME("GuiTreeArrowDown"), SNAME("EditorIcons")));
 }
 
 bool TaskSection::is_collapsed() const {
@@ -336,13 +344,13 @@ void TaskSection::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("task_button_pressed"));
 }
 
-TaskSection::TaskSection(String p_category_name, EditorNode *p_editor) {
+TaskSection::TaskSection(String p_category_name) {
 	section_header = memnew(Button);
 	add_child(section_header);
 	section_header->set_text(p_category_name);
-	section_header->set_icon(p_editor->get_gui_base()->get_icon("GuiTreeArrowDown", "EditorIcons"));
+	section_header->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("GuiTreeArrowDown"), SNAME("EditorIcons")));
 	section_header->set_focus_mode(FOCUS_NONE);
-	section_header->connect("pressed", this, "_on_header_pressed");
+	section_header->connect("pressed", callable_mp(this, &TaskSection::_on_header_pressed));
 
 	tasks_container = memnew(HFlowContainer);
 	add_child(tasks_container);
@@ -367,13 +375,13 @@ void TaskPanel::_on_filter_text_changed(String p_text) {
 }
 
 void TaskPanel::refresh() {
-	filter_edit->set_right_icon(get_icon("Search", "EditorIcons"));
+	filter_edit->set_right_icon(get_theme_icon(SNAME("Search"), SNAME("EditorIcons")));
 
-	Set<String> collapsed_sections;
+	HashSet<String> collapsed_sections;
 	if (sections->get_child_count() == 0) {
 		// Restore collapsed state from config.
 		ConfigFile conf;
-		String conf_path = EditorSettings::get_singleton()->get_project_settings_dir().plus_file("limbo_ai.cfg");
+		String conf_path = EditorPaths::get_singleton()->get_project_settings_dir().path_join("limbo_ai.cfg");
 		if (conf.load(conf_path) == OK) {
 			Variant value = conf.get_value("bt_editor", "collapsed_sections", Array());
 			if (value.is_array()) {
@@ -391,7 +399,7 @@ void TaskPanel::refresh() {
 			if (sec->is_collapsed()) {
 				collapsed_sections.insert(sec->get_category_name());
 			}
-			sections->get_child(i)->queue_delete();
+			sections->get_child(i)->queue_free();
 		}
 	}
 
@@ -421,7 +429,9 @@ void TaskPanel::refresh() {
 	_populate_from_user_dir(dir3, &categories);
 
 	List<String> keys;
-	categories.get_key_list(&keys);
+	for (const KeyValue<String, List<String>> &K : categories) {
+		keys.push_back(K.key);
+	}
 	keys.sort();
 	for (List<String>::Element *E = keys.front(); E; E = E->next()) {
 		String cat = E->get();
@@ -431,7 +441,7 @@ void TaskPanel::refresh() {
 			continue;
 		}
 
-		TaskSection *sec = memnew(TaskSection(cat, editor));
+		TaskSection *sec = memnew(TaskSection(cat));
 		for (List<String>::Element *E = task_list.front(); E; E = E->next()) {
 			String meta = E->get();
 			String tname;
@@ -441,7 +451,7 @@ void TaskPanel::refresh() {
 			sec->add_task_button(tname, icon, meta);
 		}
 		sec->set_filter("");
-		sec->connect("task_button_pressed", this, "_on_task_button_pressed");
+		sec->connect("task_button_pressed", callable_mp(this, &TaskPanel::_on_task_button_pressed));
 		sections->add_child(sec);
 		sec->set_collapsed(collapsed_sections.has(cat));
 	}
@@ -457,14 +467,14 @@ void TaskPanel::_populate_core_tasks_from_class(const StringName &p_base_class,
 }
 
 void TaskPanel::_populate_from_user_dir(String p_path, HashMap<String, List<String>> *p_categories) {
-	if (p_path.empty()) {
+	if (p_path.is_empty()) {
 		return;
 	}
-	DirAccess *dir = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	Ref<DirAccess> dir = DirAccess::create(DirAccess::ACCESS_RESOURCES);
 	if (dir->change_dir(p_path) == OK) {
 		dir->list_dir_begin();
 		String fn = dir->get_next();
-		while (!fn.empty()) {
+		while (!fn.is_empty()) {
 			if (dir->current_is_dir() && fn != "..") {
 				String full_path;
 				String category;
@@ -472,12 +482,12 @@ void TaskPanel::_populate_from_user_dir(String p_path, HashMap<String, List<Stri
 					full_path = p_path;
 					category = "User";
 				} else {
-					full_path = p_path.plus_file(fn);
+					full_path = p_path.path_join(fn);
 					category = fn.capitalize();
 				}
 
 				if (!p_categories->has(category)) {
-					p_categories->set(category, List<String>());
+					p_categories->insert(category, List<String>());
 				}
 
 				_populate_scripted_tasks_from_dir(full_path, &p_categories->get(category));
@@ -488,20 +498,19 @@ void TaskPanel::_populate_from_user_dir(String p_path, HashMap<String, List<Stri
 	} else {
 		ERR_FAIL_MSG(vformat("Failed to list \"%s\" directory.", p_path));
 	}
-	memdelete(dir);
 }
 
 void TaskPanel::_populate_scripted_tasks_from_dir(String p_path, List<String> *p_task_classes) {
-	if (p_path.empty()) {
+	if (p_path.is_empty()) {
 		return;
 	}
-	DirAccess *dir = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	Ref<DirAccess> dir = DirAccess::create(DirAccess::ACCESS_RESOURCES);
 	if (dir->change_dir(p_path) == OK) {
 		dir->list_dir_begin();
 		String fn = dir->get_next();
-		while (!fn.empty()) {
+		while (!fn.is_empty()) {
 			if (fn.ends_with(".gd")) {
-				String full_path = p_path.plus_file(fn);
+				String full_path = p_path.path_join(fn);
 				p_task_classes->push_back(full_path);
 			}
 			fn = dir->get_next();
@@ -510,7 +519,6 @@ void TaskPanel::_populate_scripted_tasks_from_dir(String p_path, List<String> *p
 	} else {
 		ERR_FAIL_MSG(vformat("Failed to list \"%s\" directory.", p_path));
 	}
-	memdelete(dir);
 }
 
 void TaskPanel::_notification(int p_what) {
@@ -526,7 +534,7 @@ void TaskPanel::_notification(int p_what) {
 			}
 		}
 		ConfigFile conf;
-		String conf_path = EditorSettings::get_singleton()->get_project_settings_dir().plus_file("limbo_ai.cfg");
+		String conf_path = EditorPaths::get_singleton()->get_project_settings_dir().path_join("limbo_ai.cfg");
 		conf.load(conf_path);
 		conf.set_value("bt_editor", "collapsed_sections", collapsed_sections);
 		conf.save(conf_path);
@@ -541,16 +549,14 @@ void TaskPanel::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("task_selected"));
 }
 
-TaskPanel::TaskPanel(EditorNode *p_editor) {
-	editor = p_editor;
-
+TaskPanel::TaskPanel() {
 	VBoxContainer *vb = memnew(VBoxContainer);
 	add_child(vb);
 
 	filter_edit = memnew(LineEdit);
 	vb->add_child(filter_edit);
 	filter_edit->set_clear_button_enabled(true);
-	filter_edit->connect("text_changed", this, "_on_filter_text_changed");
+	filter_edit->connect("text_changed", callable_mp(this, &TaskPanel::_on_filter_text_changed));
 
 	ScrollContainer *sc = memnew(ScrollContainer);
 	vb->add_child(sc);
@@ -588,14 +594,14 @@ void LimboAIEditor::_add_task(const Ref<BTTask> &p_task) {
 
 void LimboAIEditor::_update_header() const {
 	String text = task_tree->get_bt()->get_path();
-	if (text.empty()) {
+	if (text.is_empty()) {
 		text = TTR("New Behavior Tree");
 	} else if (dirty.has(task_tree->get_bt())) {
 		text += "(*)";
 	}
 
 	header->set_text(text);
-	header->set_icon(editor->get_object_icon(task_tree->get_bt().ptr(), "BehaviorTree"));
+	header->set_icon(EditorNode::get_singleton()->get_object_icon(task_tree->get_bt().ptr(), "BehaviorTree"));
 }
 
 void LimboAIEditor::_update_history_buttons() {
@@ -606,20 +612,20 @@ void LimboAIEditor::_update_history_buttons() {
 void LimboAIEditor::_new_bt() {
 	BehaviorTree *bt = memnew(BehaviorTree);
 	bt->set_root_task(memnew(BTSelector));
-	editor->edit_resource(bt);
+	EditorNode::get_singleton()->edit_resource(bt);
 }
 
 void LimboAIEditor::_save_bt(String p_path) {
-	ERR_FAIL_COND_MSG(p_path.empty(), "Empty p_path");
+	ERR_FAIL_COND_MSG(p_path.is_empty(), "Empty p_path");
 	ERR_FAIL_COND_MSG(task_tree->get_bt().is_null(), "Behavior Tree is null.");
 	task_tree->get_bt()->set_path(p_path, true);
-	ResourceSaver::save(p_path, task_tree->get_bt(), ResourceSaver::FLAG_CHANGE_PATH);
+	ResourceSaver::save(task_tree->get_bt(), p_path, ResourceSaver::FLAG_CHANGE_PATH);
 	_update_header();
 	_mark_as_dirty(false);
 }
 
 void LimboAIEditor::_load_bt(String p_path) {
-	ERR_FAIL_COND_MSG(p_path.empty(), "Empty p_path");
+	ERR_FAIL_COND_MSG(p_path.is_empty(), "Empty p_path");
 	Ref<BehaviorTree> bt = ResourceLoader::load(p_path, "BehaviorTree");
 
 	if (history.find(bt) != -1) {
@@ -627,7 +633,7 @@ void LimboAIEditor::_load_bt(String p_path) {
 		history.push_back(bt);
 	}
 
-	editor->edit_resource(bt);
+	EditorNode::get_singleton()->edit_resource(bt);
 }
 
 void LimboAIEditor::edit_bt(Ref<BehaviorTree> p_behavior_tree, bool p_force_refresh) {
@@ -671,12 +677,12 @@ void LimboAIEditor::_on_tree_rmb(const Vector2 &p_menu_pos) {
 	menu->set_position(p_menu_pos);
 
 	menu->clear();
-	menu->add_icon_item(get_icon("Remove", "EditorIcons"), TTR("Remove"), ACTION_REMOVE);
+	menu->add_icon_item(get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")), TTR("Remove"), ACTION_REMOVE);
 	menu->add_separator();
-	menu->add_icon_item(get_icon("MoveUp", "EditorIcons"), TTR("Move Up"), ACTION_MOVE_UP);
-	menu->add_icon_item(get_icon("MoveDown", "EditorIcons"), TTR("Move Down"), ACTION_MOVE_DOWN);
-	menu->add_icon_item(get_icon("Duplicate", "EditorIcons"), TTR("Duplicate"), ACTION_DUPLICATE);
-	menu->add_icon_item(get_icon("NewRoot", "EditorIcons"), TTR("Make Root"), ACTION_MAKE_ROOT);
+	menu->add_icon_item(get_theme_icon(SNAME("MoveUp"), SNAME("EditorIcons")), TTR("Move Up"), ACTION_MOVE_UP);
+	menu->add_icon_item(get_theme_icon(SNAME("MoveDown"), SNAME("EditorIcons")), TTR("Move Down"), ACTION_MOVE_DOWN);
+	menu->add_icon_item(get_theme_icon(SNAME("Duplicate"), SNAME("EditorIcons")), TTR("Duplicate"), ACTION_DUPLICATE);
+	menu->add_icon_item(get_theme_icon(SNAME("NewRoot"), SNAME("EditorIcons")), TTR("Make Root"), ACTION_MAKE_ROOT);
 
 	menu->popup();
 }
@@ -692,7 +698,7 @@ void LimboAIEditor::_on_action_selected(int p_id) {
 					sel->get_parent()->remove_child(sel);
 				}
 				task_tree->update_tree();
-				editor->edit_node(nullptr);
+				EditorNode::get_singleton()->edit_node(nullptr);
 				_mark_as_dirty(true);
 			}
 		} break;
@@ -750,8 +756,8 @@ void LimboAIEditor::_on_action_selected(int p_id) {
 	}
 }
 
-void LimboAIEditor::_on_tree_task_selected(const Ref<BTTask> &p_task) const {
-	editor->edit_resource(p_task);
+void LimboAIEditor::_on_tree_task_selected(const Ref<BTTask> &p_task) {
+	EditorNode::get_singleton()->edit_resource(p_task);
 }
 
 void LimboAIEditor::_on_tree_task_double_clicked() {
@@ -769,11 +775,11 @@ void LimboAIEditor::_on_panel_task_selected(String p_task) {
 	if (p_task.begins_with("res:")) {
 		Ref<Script> script = ResourceLoader::load(p_task, "Script");
 		ERR_FAIL_COND_MSG(script.is_null() || !script->is_valid(), vformat("LimboAI: Failed to instance task. Bad script: %s", p_task));
-		Variant inst = ClassDB::instance(script->get_instance_base_type());
+		Variant inst = ClassDB::instantiate(script->get_instance_base_type());
 		ERR_FAIL_COND_MSG(inst.is_zero(), vformat("LimboAI: Failed to instance base type \"%s\".", script->get_instance_base_type()));
 
 		if (unlikely(!((Object *)inst)->is_class("BTTask"))) {
-			if (!inst.is_ref()) {
+			if (!inst.is_ref_counted()) {
 				memdelete((Object *)inst);
 			}
 			ERR_PRINT(vformat("LimboAI: Failed to instance task. Script is not a BTTask: %s", p_task));
@@ -781,31 +787,31 @@ void LimboAIEditor::_on_panel_task_selected(String p_task) {
 		}
 
 		if (inst && script.is_valid()) {
-			((Object *)inst)->set_script(script.get_ref_ptr());
+			((Object *)inst)->set_script(script);
 			_add_task(Variant(inst));
 		}
 	} else {
-		_add_task(Ref<BTTask>(ClassDB::instance(p_task)));
+		_add_task(Ref<BTTask>(ClassDB::instantiate(p_task)));
 	}
 }
 
-void LimboAIEditor::_on_visibility_changed() const {
-	if (is_visible()) {
+void LimboAIEditor::_on_visibility_changed() {
+	if (task_tree->is_visible()) {
 		Ref<BTTask> sel = task_tree->get_selected();
 		if (sel.is_valid()) {
-			editor->edit_resource(sel);
-		} else if (task_tree->get_bt().is_valid() && editor->get_inspector()->get_edited_object() != task_tree->get_bt().ptr()) {
-			editor->edit_resource(task_tree->get_bt());
+			EditorNode::get_singleton()->edit_resource(sel);
+		} else if (task_tree->get_bt().is_valid() && InspectorDock::get_inspector_singleton()->get_edited_object() != task_tree->get_bt().ptr()) {
+			EditorNode::get_singleton()->edit_resource(task_tree->get_bt());
 		}
 
 		task_panel->refresh();
 	}
 }
 
-void LimboAIEditor::_on_header_pressed() const {
+void LimboAIEditor::_on_header_pressed() {
 	_update_header();
 	task_tree->deselect();
-	editor->edit_resource(task_tree->get_bt());
+	EditorNode::get_singleton()->edit_resource(task_tree->get_bt());
 }
 
 void LimboAIEditor::_on_save_pressed() {
@@ -813,7 +819,7 @@ void LimboAIEditor::_on_save_pressed() {
 		return;
 	}
 	String path = task_tree->get_bt()->get_path();
-	if (path.empty()) {
+	if (path.is_empty()) {
 		save_dialog->popup_centered_ratio();
 	} else {
 		_save_bt(path);
@@ -822,12 +828,12 @@ void LimboAIEditor::_on_save_pressed() {
 
 void LimboAIEditor::_on_history_back() {
 	idx_history = MAX(idx_history - 1, 0);
-	editor->edit_resource(history[idx_history]);
+	EditorNode::get_singleton()->edit_resource(history[idx_history]);
 }
 
 void LimboAIEditor::_on_history_forward() {
 	idx_history = MIN(idx_history + 1, history.size() - 1);
-	editor->edit_resource(history[idx_history]);
+	EditorNode::get_singleton()->edit_resource(history[idx_history]);
 }
 
 void LimboAIEditor::_on_task_dragged(Ref<BTTask> p_task, Ref<BTTask> p_to_task, int p_type) {
@@ -872,10 +878,9 @@ void LimboAIEditor::_on_resources_reload(const Vector<String> &p_resources) {
 		disk_changed_list->clear();
 		disk_changed_list->set_hide_root(true);
 		disk_changed_list->create_item();
-		for (Set<String>::Element *E = disk_changed_files.front(); E; E = E->next()) {
-			// for (int i = 0; i < disk_changed_files.size(); i++) {
+		for (const String &fn : disk_changed_files) {
 			TreeItem *ti = disk_changed_list->create_item();
-			ti->set_text(0, E->get());
+			ti->set_text(0, fn);
 		}
 
 		if (!is_visible()) {
@@ -886,9 +891,9 @@ void LimboAIEditor::_on_resources_reload(const Vector<String> &p_resources) {
 }
 
 void LimboAIEditor::_reload_modified() {
-	for (Set<String>::Element *E = disk_changed_files.front(); E; E = E->next()) {
+	for (const String &fn : disk_changed_files) {
 		for (int j = 0; j < history.size(); j++) {
-			if (history.get(j)->get_path() == E->get()) {
+			if (history.get(j)->get_path() == fn) {
 				dirty.erase(history.get(j));
 				history.get(j)->get_root_task()->clear_internal_resource_paths();
 				history.get(j)->reload_from_file();
@@ -902,10 +907,10 @@ void LimboAIEditor::_reload_modified() {
 }
 
 void LimboAIEditor::_resave_modified(String _str) {
-	for (Set<String>::Element *E = disk_changed_files.front(); E; E = E->next()) {
+	for (const String &fn : disk_changed_files) {
 		for (int j = 0; j < history.size(); j++) {
-			if (history.get(j)->get_path() == E->get()) {
-				ResourceSaver::save(history.get(j)->get_path(), history.get(j));
+			if (history.get(j)->get_path() == fn) {
+				ResourceSaver::save(history.get(j), history.get(j)->get_path());
 			}
 		}
 	}
@@ -917,7 +922,7 @@ void LimboAIEditor::_rename_task(String _str) {
 	ERR_FAIL_COND(!task_tree->get_selected().is_valid());
 	task_tree->get_selected()->set_custom_name(rename_edit->get_text());
 	rename_dialog->hide();
-	editor->edit_resource(task_tree->get_selected());
+	EditorNode::get_singleton()->edit_resource(task_tree->get_selected());
 }
 
 void LimboAIEditor::apply_changes() {
@@ -925,7 +930,7 @@ void LimboAIEditor::apply_changes() {
 		Ref<BehaviorTree> bt = history.get(i);
 		String path = bt->get_path();
 		if (ResourceLoader::exists(path)) {
-			ResourceSaver::save(path, bt);
+			ResourceSaver::save(bt, path);
 		}
 		dirty.clear();
 		_update_header();
@@ -941,7 +946,7 @@ Ref<Texture> LimboAIEditor::get_task_icon(String p_script_path_or_class) {
 		while (base_script.is_valid()) {
 			StringName name = EditorNode::get_editor_data().script_class_get_name(base_script->get_path());
 			String icon_path = EditorNode::get_editor_data().script_class_get_icon_path(name);
-			if (!icon_path.empty()) {
+			if (!icon_path.is_empty()) {
 				Ref<Image> img = memnew(Image);
 				Error err = ImageLoader::load_image(icon_path, img);
 				if (err == OK) {
@@ -964,14 +969,14 @@ void LimboAIEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
 			ConfigFile conf;
-			String conf_path = EditorSettings::get_singleton()->get_project_settings_dir().plus_file("limbo_ai.cfg");
+			String conf_path = EditorPaths::get_singleton()->get_project_settings_dir().path_join("limbo_ai.cfg");
 			if (conf.load(conf_path) == OK) {
 				hsc->set_split_offset(conf.get_value("bt_editor", "bteditor_hsplit", hsc->get_split_offset()));
 			}
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
 			ConfigFile conf;
-			String conf_path = EditorSettings::get_singleton()->get_project_settings_dir().plus_file("limbo_ai.cfg");
+			String conf_path = EditorPaths::get_singleton()->get_project_settings_dir().path_join("limbo_ai.cfg");
 			conf.load(conf_path);
 			conf.set_value("bt_editor", "bteditor_hsplit", hsc->get_split_offset());
 			conf.save(conf_path);
@@ -1003,28 +1008,28 @@ void LimboAIEditor::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_rename_task"), &LimboAIEditor::_rename_task, String());
 }
 
-LimboAIEditor::LimboAIEditor(EditorNode *p_editor) {
-	editor = p_editor;
+LimboAIEditor::LimboAIEditor() {
+	idx_history = 0;
 
 	save_dialog = memnew(FileDialog);
 	add_child(save_dialog);
-	save_dialog->set_mode(FileDialog::MODE_SAVE_FILE);
+	save_dialog->set_file_mode(FileDialog::FILE_MODE_SAVE_FILE);
 	save_dialog->set_title("Save Behavior Tree");
 	save_dialog->add_filter("*.tres");
-	save_dialog->connect("file_selected", this, "_save_bt");
+	save_dialog->connect("file_selected", callable_mp(this, &LimboAIEditor::_save_bt));
 	save_dialog->hide();
 
 	load_dialog = memnew(FileDialog);
 	add_child(load_dialog);
-	load_dialog->set_mode(FileDialog::MODE_OPEN_FILE);
+	load_dialog->set_file_mode(FileDialog::FILE_MODE_OPEN_FILE);
 	load_dialog->set_title("Load Behavior Tree");
 	load_dialog->add_filter("*.tres");
-	load_dialog->connect("file_selected", this, "_load_bt");
+	load_dialog->connect("file_selected", callable_mp(this, &LimboAIEditor::_load_bt));
 	load_dialog->hide();
 
 	VBoxContainer *vb = memnew(VBoxContainer);
-	vb->set_anchor(MARGIN_RIGHT, ANCHOR_END);
-	vb->set_anchor(MARGIN_BOTTOM, ANCHOR_END);
+	vb->set_anchor(SIDE_RIGHT, ANCHOR_END);
+	vb->set_anchor(SIDE_BOTTOM, ANCHOR_END);
 	add_child(vb);
 
 	HBoxContainer *panel = memnew(HBoxContainer);
@@ -1032,29 +1037,29 @@ LimboAIEditor::LimboAIEditor(EditorNode *p_editor) {
 
 	Button *selector_btn = memnew(Button);
 	selector_btn->set_text(TTR("Selector"));
-	selector_btn->set_tooltip(TTR("Add Selector task."));
-	selector_btn->set_icon(editor->get_class_icon("BTSelector"));
+	selector_btn->set_tooltip_text(TTR("Add Selector task."));
+	selector_btn->set_icon(EditorNode::get_singleton()->get_class_icon("BTSelector"));
 	selector_btn->set_flat(true);
 	selector_btn->set_focus_mode(Control::FOCUS_NONE);
-	selector_btn->connect("pressed", this, "_add_task_with_prototype", varray(Ref<BTTask>(memnew(BTSelector))));
+	selector_btn->connect("pressed", callable_mp(this, &LimboAIEditor::_add_task_with_prototype).bind(Ref<BTTask>(memnew(BTSelector))));
 	panel->add_child(selector_btn);
 
 	Button *sequence_btn = memnew(Button);
 	sequence_btn->set_text(TTR("Sequence"));
-	sequence_btn->set_tooltip(TTR("Add Sequence task."));
-	sequence_btn->set_icon(editor->get_class_icon("BTSequence"));
+	sequence_btn->set_tooltip_text(TTR("Add Sequence task."));
+	sequence_btn->set_icon(EditorNode::get_singleton()->get_class_icon("BTSequence"));
 	sequence_btn->set_flat(true);
 	sequence_btn->set_focus_mode(Control::FOCUS_NONE);
-	sequence_btn->connect("pressed", this, "_add_task_with_prototype", varray(Ref<BTTask>(memnew(BTSequence))));
+	sequence_btn->connect("pressed", callable_mp(this, &LimboAIEditor::_add_task_with_prototype).bind(Ref<BTTask>(memnew(BTSequence))));
 	panel->add_child(sequence_btn);
 
 	Button *parallel_btn = memnew(Button);
 	parallel_btn->set_text(TTR("Parallel"));
-	parallel_btn->set_tooltip(TTR("Add Parallel task."));
-	parallel_btn->set_icon(editor->get_class_icon("BTParallel"));
+	parallel_btn->set_tooltip_text(TTR("Add Parallel task."));
+	parallel_btn->set_icon(EditorNode::get_singleton()->get_class_icon("BTParallel"));
 	parallel_btn->set_flat(true);
 	parallel_btn->set_focus_mode(Control::FOCUS_NONE);
-	parallel_btn->connect("pressed", this, "_add_task_with_prototype", varray(Ref<BTTask>(memnew(BTParallel))));
+	parallel_btn->connect("pressed", callable_mp(this, &LimboAIEditor::_add_task_with_prototype).bind(Ref<BTTask>(memnew(BTParallel))));
 	panel->add_child(parallel_btn);
 
 	panel->add_child(memnew(VSeparator));
@@ -1062,37 +1067,37 @@ LimboAIEditor::LimboAIEditor(EditorNode *p_editor) {
 	Button *new_btn = memnew(Button);
 	panel->add_child(new_btn);
 	new_btn->set_text(TTR("New"));
-	new_btn->set_tooltip(TTR("Create new behavior tree."));
-	new_btn->set_icon(editor->get_gui_base()->get_icon("New", "EditorIcons"));
+	new_btn->set_tooltip_text(TTR("Create new behavior tree."));
+	new_btn->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("New"), SNAME("EditorIcons")));
 	new_btn->set_flat(true);
 	new_btn->set_focus_mode(Control::FOCUS_NONE);
-	new_btn->connect("pressed", this, "_new_bt");
+	new_btn->connect("pressed", callable_mp(this, &LimboAIEditor::_new_bt));
 
 	Button *load_btn = memnew(Button);
 	panel->add_child(load_btn);
 	load_btn->set_text(TTR("Load"));
-	load_btn->set_tooltip(TTR("Load behavior tree."));
-	load_btn->set_icon(editor->get_gui_base()->get_icon("Load", "EditorIcons"));
+	load_btn->set_tooltip_text(TTR("Load behavior tree."));
+	load_btn->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Load"), SNAME("EditorIcons")));
 	load_btn->set_flat(true);
 	load_btn->set_focus_mode(Control::FOCUS_NONE);
-	load_btn->connect("pressed", load_dialog, "popup_centered_ratio");
+	load_btn->connect("pressed", callable_mp(load_dialog, &FileDialog::popup_file_dialog));
 
 	Button *save_btn = memnew(Button);
 	panel->add_child(save_btn);
 	save_btn->set_text(TTR("Save"));
-	save_btn->set_tooltip(TTR("Save current behavior tree."));
-	save_btn->set_icon(editor->get_gui_base()->get_icon("Save", "EditorIcons"));
+	save_btn->set_tooltip_text(TTR("Save current behavior tree."));
+	save_btn->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Save"), SNAME("EditorIcons")));
 	save_btn->set_flat(true);
 	save_btn->set_focus_mode(Control::FOCUS_NONE);
-	save_btn->connect("pressed", this, "_on_save_pressed");
+	save_btn->connect("pressed", callable_mp(this, &LimboAIEditor::_on_save_pressed));
 
 	panel->add_child(memnew(VSeparator));
 
 	Button *new_script_btn = memnew(Button);
 	panel->add_child(new_script_btn);
 	new_script_btn->set_text(TTR("New Task"));
-	new_script_btn->set_tooltip(TTR("Create new task script and edit it."));
-	new_script_btn->set_icon(editor->get_gui_base()->get_icon("ScriptCreate", "EditorIcons"));
+	new_script_btn->set_tooltip_text(TTR("Create new task script and edit it."));
+	new_script_btn->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("ScriptCreate"), SNAME("EditorIcons")));
 	new_script_btn->set_flat(true);
 	new_script_btn->set_focus_mode(Control::FOCUS_NONE);
 
@@ -1101,24 +1106,24 @@ LimboAIEditor::LimboAIEditor(EditorNode *p_editor) {
 	nav->set_h_size_flags(SIZE_EXPAND | SIZE_SHRINK_END);
 
 	history_back = memnew(Button);
-	history_back->set_icon(editor->get_gui_base()->get_icon("Back", "EditorIcons"));
+	history_back->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Back"), SNAME("EditorIcons")));
 	history_back->set_flat(true);
 	history_back->set_focus_mode(FOCUS_NONE);
-	history_back->connect("pressed", this, "_on_history_back");
+	history_back->connect("pressed", callable_mp(this, &LimboAIEditor::_on_history_back));
 	nav->add_child(history_back);
 
 	history_forward = memnew(Button);
-	history_forward->set_icon(editor->get_gui_base()->get_icon("Forward", "EditorIcons"));
+	history_forward->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Forward"), SNAME("EditorIcons")));
 	history_forward->set_flat(true);
 	history_forward->set_focus_mode(FOCUS_NONE);
-	history_forward->connect("pressed", this, "_on_history_forward");
+	history_forward->connect("pressed", callable_mp(this, &LimboAIEditor::_on_history_forward));
 	nav->add_child(history_forward);
 
 	header = memnew(Button);
 	vb->add_child(header);
-	header->set_text_align(Button::ALIGN_LEFT);
-	header->add_constant_override("hseparation", 8);
-	header->connect("pressed", this, "_on_header_pressed");
+	header->set_text_alignment(HORIZONTAL_ALIGNMENT_LEFT);
+	header->add_theme_constant_override("hseparation", 8);
+	header->connect("pressed", callable_mp(this, &LimboAIEditor::_on_header_pressed));
 
 	hsc = memnew(HSplitContainer);
 	vb->add_child(hsc);
@@ -1129,11 +1134,11 @@ LimboAIEditor::LimboAIEditor(EditorNode *p_editor) {
 	hsc->add_child(task_tree);
 	task_tree->set_v_size_flags(SIZE_EXPAND_FILL);
 	task_tree->set_h_size_flags(SIZE_EXPAND_FILL);
-	task_tree->connect("rmb_pressed", this, "_on_tree_rmb");
-	task_tree->connect("task_selected", this, "_on_tree_task_selected");
-	task_tree->connect("visibility_changed", this, "_on_visibility_changed");
-	task_tree->connect("task_dragged", this, "_on_task_dragged");
-	task_tree->connect("task_double_clicked", this, "_on_tree_task_double_clicked");
+	task_tree->connect("rmb_pressed", callable_mp(this, &LimboAIEditor::_on_tree_rmb));
+	task_tree->connect("task_selected", callable_mp(this, &LimboAIEditor::_on_tree_task_selected));
+	task_tree->connect("visibility_changed", callable_mp(this, &LimboAIEditor::_on_visibility_changed));
+	task_tree->connect("task_dragged", callable_mp(this, &LimboAIEditor::_on_task_dragged));
+	task_tree->connect("task_double_clicked", callable_mp(this, &LimboAIEditor::_on_tree_task_double_clicked));
 	task_tree->hide();
 
 	usage_hint = memnew(Panel);
@@ -1141,23 +1146,23 @@ LimboAIEditor::LimboAIEditor(EditorNode *p_editor) {
 	usage_hint->set_h_size_flags(SIZE_EXPAND_FILL);
 	hsc->add_child(usage_hint);
 	Label *usage_label = memnew(Label);
-	usage_label->set_anchor(MARGIN_RIGHT, 1);
-	usage_label->set_anchor(MARGIN_BOTTOM, 1);
-	usage_label->set_align(Label::ALIGN_CENTER);
-	usage_label->set_valign(Label::VALIGN_CENTER);
+	usage_label->set_anchor(SIDE_RIGHT, 1);
+	usage_label->set_anchor(SIDE_BOTTOM, 1);
+	usage_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
+	usage_label->set_vertical_alignment(VERTICAL_ALIGNMENT_CENTER);
 	usage_label->set_text(TTR("Create a new or load an existing behavior tree."));
 	usage_hint->add_child(usage_label);
 
-	task_panel = memnew(TaskPanel(p_editor));
+	task_panel = memnew(TaskPanel());
 	hsc->add_child(task_panel);
 	hsc->set_split_offset(-300);
-	task_panel->connect("task_selected", this, "_on_panel_task_selected");
+	task_panel->connect("task_selected", callable_mp(this, &LimboAIEditor::_on_panel_task_selected));
 	task_panel->hide();
 
 	menu = memnew(PopupMenu);
 	add_child(menu);
-	menu->connect("id_pressed", this, "_on_action_selected");
-	menu->set_hide_on_window_lose_focus(true);
+	menu->connect("id_pressed", callable_mp(this, &LimboAIEditor::_on_action_selected));
+	// menu->set_hide_on_window_lose_focus(true);
 
 	rename_dialog = memnew(ConfirmationDialog);
 	{
@@ -1171,10 +1176,10 @@ LimboAIEditor::LimboAIEditor(EditorNode *p_editor) {
 		rename_edit->set_placeholder("Custom Name");
 		rename_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		rename_edit->set_custom_minimum_size(Size2(350.0, 0.0));
-		rename_edit->connect("text_entered", this, "_rename_task");
+		rename_edit->connect("text_changed", callable_mp(this, &LimboAIEditor::_rename_task));
 
-		rename_dialog->get_ok()->set_text(TTR("Rename"));
-		rename_dialog->connect("confirmed", this, "_rename_task");
+		rename_dialog->get_ok_button()->set_text(TTR("Rename"));
+		rename_dialog->connect("confirmed", callable_mp(this, &LimboAIEditor::_rename_task));
 	}
 	add_child(rename_dialog);
 
@@ -1191,13 +1196,13 @@ LimboAIEditor::LimboAIEditor(EditorNode *p_editor) {
 		vbc->add_child(disk_changed_list);
 		disk_changed_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 
-		disk_changed->get_ok()->set_text(TTR("Reload"));
-		disk_changed->connect("confirmed", this, "_reload_modified");
+		disk_changed->get_ok_button()->set_text(TTR("Reload"));
+		disk_changed->connect("confirmed", callable_mp(this, &LimboAIEditor::_reload_modified));
 
-		disk_changed->add_button(TTR("Resave"), !OS::get_singleton()->get_swap_ok_cancel(), "resave");
-		disk_changed->connect("custom_action", this, "_resave_modified");
+		disk_changed->add_button(TTR("Resave"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave");
+		disk_changed->connect("custom_action", callable_mp(this, &LimboAIEditor::_resave_modified));
 	}
-	editor->get_gui_base()->add_child(disk_changed);
+	EditorNode::get_singleton()->get_gui_base()->add_child(disk_changed);
 
 	GLOBAL_DEF("limbo_ai/behavior_tree/behavior_tree_default_dir", "res://ai/trees");
 	ProjectSettings::get_singleton()->set_custom_property_info("limbo_ai/behavior_tree/behavior_tree_default_dir",
@@ -1214,10 +1219,9 @@ LimboAIEditor::LimboAIEditor(EditorNode *p_editor) {
 
 	save_dialog->set_current_dir(GLOBAL_GET("limbo_ai/behavior_tree/behavior_tree_default_dir"));
 	load_dialog->set_current_dir(GLOBAL_GET("limbo_ai/behavior_tree/behavior_tree_default_dir"));
-	new_script_btn->connect("pressed", ScriptEditor::get_singleton(), "open_script_create_dialog",
-			varray("BTAction", String(GLOBAL_GET("limbo_ai/behavior_tree/user_task_dir_1")).plus_file("new_task")));
+	new_script_btn->connect("pressed", callable_mp(ScriptEditor::get_singleton(), &ScriptEditor::open_script_create_dialog).bind("BTAction", String(GLOBAL_GET("limbo_ai/behavior_tree/user_task_dir_1")).path_join("new_task")));
 
-	EditorFileSystem::get_singleton()->connect("resources_reload", this, "_on_resources_reload");
+	EditorFileSystem::get_singleton()->connect("resources_reload", callable_mp(this, &LimboAIEditor::_on_resources_reload));
 }
 
 LimboAIEditor::~LimboAIEditor() {
@@ -1227,8 +1231,8 @@ LimboAIEditor::~LimboAIEditor() {
 
 /////////////////////////  LimboAIEditorPlugin  ////////////////////////////////
 
-const Ref<Texture> LimboAIEditorPlugin::get_icon() const {
-	return editor->get_gui_base()->get_icon("LimboAIEditor", "EditorIcons");
+const Ref<Texture2D> LimboAIEditorPlugin::get_icon() const {
+	return EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("LimboAIEditor"), SNAME("EditorIcons"));
 }
 
 void LimboAIEditorPlugin::apply_changes() {
@@ -1253,11 +1257,10 @@ bool LimboAIEditorPlugin::handles(Object *p_object) const {
 	return p_object->is_class("BehaviorTree");
 }
 
-LimboAIEditorPlugin::LimboAIEditorPlugin(EditorNode *p_editor) {
-	editor = p_editor;
-	limbo_ai_editor = memnew(LimboAIEditor(p_editor));
+LimboAIEditorPlugin::LimboAIEditorPlugin() {
+	limbo_ai_editor = memnew(LimboAIEditor());
 	limbo_ai_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	editor->get_viewport()->add_child(limbo_ai_editor);
+	EditorNode::get_singleton()->get_main_screen_control()->add_child(limbo_ai_editor);
 	limbo_ai_editor->hide();
 }
 
diff --git a/editor/limbo_ai_editor_plugin.h b/editor/limbo_ai_editor_plugin.h
index bbfeab1..b97d742 100644
--- a/editor/limbo_ai_editor_plugin.h
+++ b/editor/limbo_ai_editor_plugin.h
@@ -4,15 +4,19 @@
 #ifndef LIMBO_AI_EDITOR_PLUGIN_H
 #define LIMBO_AI_EDITOR_PLUGIN_H
 
-#include "core/object.h"
+#include "core/object/class_db.h"
+#include "core/object/object.h"
+#include "core/templates/hash_set.h"
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
 #include "modules/limboai/bt/behavior_tree.h"
 #include "modules/limboai/bt/bt_task.h"
 #include "scene/gui/box_container.h"
+#include "scene/gui/control.h"
 #include "scene/gui/file_dialog.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/line_edit.h"
+#include "scene/gui/panel_container.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tree.h"
@@ -34,12 +38,12 @@ private:
 
 	void _on_item_selected();
 	void _on_item_double_clicked();
-	void _on_item_rmb_selected(const Vector2 &p_pos);
+	void _on_item_mouse_selected(const Vector2 &p_pos, int p_button_index);
 	void _on_task_changed();
 
-	Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
-	bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
-	void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
+	Variant _get_drag_data_fw(const Point2 &p_point, Control *p_from);
+	bool _can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
+	void _drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
 
 protected:
 	static void _bind_methods();
@@ -80,7 +84,7 @@ public:
 
 	String get_category_name() const { return section_header->get_text(); }
 
-	TaskSection(String p_category_name, EditorNode *p_editor);
+	TaskSection(String p_category_name);
 	~TaskSection();
 };
 
@@ -88,7 +92,6 @@ class TaskPanel : public PanelContainer {
 	GDCLASS(TaskPanel, PanelContainer)
 
 private:
-	EditorNode *editor;
 	LineEdit *filter_edit;
 	VBoxContainer *sections;
 
@@ -106,7 +109,7 @@ protected:
 public:
 	void refresh();
 
-	TaskPanel(EditorNode *p_editor);
+	TaskPanel();
 	~TaskPanel();
 };
 
@@ -122,10 +125,9 @@ private:
 		ACTION_MAKE_ROOT,
 	};
 
-	EditorNode *editor;
 	Vector<Ref<BehaviorTree>> history;
 	int idx_history;
-	Set<Ref<BehaviorTree>> dirty;
+	HashSet<Ref<BehaviorTree>> dirty;
 
 	Button *header;
 	HSplitContainer *hsc;
@@ -143,7 +145,7 @@ private:
 
 	ConfirmationDialog *disk_changed;
 	Tree *disk_changed_list;
-	Set<String> disk_changed_files;
+	HashSet<String> disk_changed_files;
 
 	void _add_task(const Ref<BTTask> &p_task);
 	_FORCE_INLINE_ void _add_task_with_prototype(const Ref<BTTask> &p_prototype) { _add_task(p_prototype->clone()); }
@@ -161,10 +163,10 @@ private:
 
 	void _on_tree_rmb(const Vector2 &p_menu_pos);
 	void _on_action_selected(int p_id);
-	void _on_tree_task_selected(const Ref<BTTask> &p_task) const;
+	void _on_tree_task_selected(const Ref<BTTask> &p_task);
 	void _on_tree_task_double_clicked();
-	void _on_visibility_changed() const;
-	void _on_header_pressed() const;
+	void _on_visibility_changed();
+	void _on_header_pressed();
 	void _on_save_pressed();
 	void _on_panel_task_selected(String p_task);
 	void _on_history_back();
@@ -184,7 +186,7 @@ public:
 
 	void apply_changes();
 
-	LimboAIEditor(EditorNode *p_editor);
+	LimboAIEditor();
 	~LimboAIEditor();
 };
 
@@ -192,22 +194,21 @@ class LimboAIEditorPlugin : public EditorPlugin {
 	GDCLASS(LimboAIEditorPlugin, EditorPlugin);
 
 private:
-	EditorNode *editor;
 	LimboAIEditor *limbo_ai_editor;
 
 protected:
 	void _notification(int p_notification);
 
 public:
-	virtual String get_name() const { return "LimboAI"; }
-	virtual const Ref<Texture> get_icon() const;
-	bool has_main_screen() const { return true; }
-	virtual void make_visible(bool p_visible);
-	virtual void apply_changes();
-	virtual void edit(Object *p_object);
-	virtual bool handles(Object *p_object) const;
+	virtual String get_name() const override { return "LimboAI"; }
+	virtual const Ref<Texture2D> get_icon() const override;
+	bool has_main_screen() const override { return true; }
+	virtual void make_visible(bool p_visible) override;
+	virtual void apply_changes() override;
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
 
-	LimboAIEditorPlugin(EditorNode *p_editor);
+	LimboAIEditorPlugin();
 	~LimboAIEditorPlugin();
 };
 
diff --git a/icons/icon_b_t_action.svg b/icons/BTAction.svg
similarity index 100%
rename from icons/icon_b_t_action.svg
rename to icons/BTAction.svg
diff --git a/icons/icon_b_t_always_fail.svg b/icons/BTAlwaysFail.svg
similarity index 100%
rename from icons/icon_b_t_always_fail.svg
rename to icons/BTAlwaysFail.svg
diff --git a/icons/icon_b_t_always_succeed.svg b/icons/BTAlwaysSucceed.svg
similarity index 100%
rename from icons/icon_b_t_always_succeed.svg
rename to icons/BTAlwaysSucceed.svg
diff --git a/icons/icon_b_t_condition.svg b/icons/BTCondition.svg
similarity index 100%
rename from icons/icon_b_t_condition.svg
rename to icons/BTCondition.svg
diff --git a/icons/icon_b_t_console_print.svg b/icons/BTConsolePrint.svg
similarity index 100%
rename from icons/icon_b_t_console_print.svg
rename to icons/BTConsolePrint.svg
diff --git a/icons/icon_b_t_cooldown.svg b/icons/BTCooldown.svg
similarity index 100%
rename from icons/icon_b_t_cooldown.svg
rename to icons/BTCooldown.svg
diff --git a/icons/icon_b_t_decorator.svg b/icons/BTDecorator.svg
similarity index 100%
rename from icons/icon_b_t_decorator.svg
rename to icons/BTDecorator.svg
diff --git a/icons/icon_b_t_delay.svg b/icons/BTDelay.svg
similarity index 100%
rename from icons/icon_b_t_delay.svg
rename to icons/BTDelay.svg
diff --git a/icons/icon_b_t_dynamic_selector.svg b/icons/BTDynamicSelector.svg
similarity index 100%
rename from icons/icon_b_t_dynamic_selector.svg
rename to icons/BTDynamicSelector.svg
diff --git a/icons/icon_b_t_dynamic_sequence.svg b/icons/BTDynamicSequence.svg
similarity index 100%
rename from icons/icon_b_t_dynamic_sequence.svg
rename to icons/BTDynamicSequence.svg
diff --git a/icons/icon_b_t_fail.svg b/icons/BTFail.svg
similarity index 100%
rename from icons/icon_b_t_fail.svg
rename to icons/BTFail.svg
diff --git a/icons/icon_b_t_for_each.svg b/icons/BTForEach.svg
similarity index 100%
rename from icons/icon_b_t_for_each.svg
rename to icons/BTForEach.svg
diff --git a/icons/icon_b_t_invert.svg b/icons/BTInvert.svg
similarity index 100%
rename from icons/icon_b_t_invert.svg
rename to icons/BTInvert.svg
diff --git a/icons/icon_b_t_new_scope.svg b/icons/BTNewScope.svg
similarity index 100%
rename from icons/icon_b_t_new_scope.svg
rename to icons/BTNewScope.svg
diff --git a/icons/icon_b_t_parallel.svg b/icons/BTParallel.svg
similarity index 100%
rename from icons/icon_b_t_parallel.svg
rename to icons/BTParallel.svg
diff --git a/icons/icon_b_t_player.svg b/icons/BTPlayer.svg
similarity index 100%
rename from icons/icon_b_t_player.svg
rename to icons/BTPlayer.svg
diff --git a/icons/icon_b_t_probability.svg b/icons/BTProbability.svg
similarity index 100%
rename from icons/icon_b_t_probability.svg
rename to icons/BTProbability.svg
diff --git a/icons/icon_b_t_probability_selector.svg b/icons/BTProbabilitySelector.svg
similarity index 100%
rename from icons/icon_b_t_probability_selector.svg
rename to icons/BTProbabilitySelector.svg
diff --git a/icons/icon_b_t_random_selector.svg b/icons/BTRandomSelector.svg
similarity index 100%
rename from icons/icon_b_t_random_selector.svg
rename to icons/BTRandomSelector.svg
diff --git a/icons/icon_b_t_random_sequence.svg b/icons/BTRandomSequence.svg
similarity index 100%
rename from icons/icon_b_t_random_sequence.svg
rename to icons/BTRandomSequence.svg
diff --git a/icons/icon_b_t_random_wait.svg b/icons/BTRandomWait.svg
similarity index 100%
rename from icons/icon_b_t_random_wait.svg
rename to icons/BTRandomWait.svg
diff --git a/icons/icon_b_t_repeat.svg b/icons/BTRepeat.svg
similarity index 100%
rename from icons/icon_b_t_repeat.svg
rename to icons/BTRepeat.svg
diff --git a/icons/icon_b_t_repeat_until_failure.svg b/icons/BTRepeatUntilFailure.svg
similarity index 100%
rename from icons/icon_b_t_repeat_until_failure.svg
rename to icons/BTRepeatUntilFailure.svg
diff --git a/icons/icon_b_t_repeat_until_success.svg b/icons/BTRepeatUntilSuccess.svg
similarity index 100%
rename from icons/icon_b_t_repeat_until_success.svg
rename to icons/BTRepeatUntilSuccess.svg
diff --git a/icons/icon_b_t_run_limit.svg b/icons/BTRunLimit.svg
similarity index 100%
rename from icons/icon_b_t_run_limit.svg
rename to icons/BTRunLimit.svg
diff --git a/icons/icon_b_t_selector.svg b/icons/BTSelector.svg
similarity index 100%
rename from icons/icon_b_t_selector.svg
rename to icons/BTSelector.svg
diff --git a/icons/icon_b_t_sequence.svg b/icons/BTSequence.svg
similarity index 100%
rename from icons/icon_b_t_sequence.svg
rename to icons/BTSequence.svg
diff --git a/icons/icon_b_t_state.svg b/icons/BTState.svg
similarity index 100%
rename from icons/icon_b_t_state.svg
rename to icons/BTState.svg
diff --git a/icons/icon_b_t_subtree.svg b/icons/BTSubtree.svg
similarity index 100%
rename from icons/icon_b_t_subtree.svg
rename to icons/BTSubtree.svg
diff --git a/icons/icon_b_t_time_limit.svg b/icons/BTTimeLimit.svg
similarity index 100%
rename from icons/icon_b_t_time_limit.svg
rename to icons/BTTimeLimit.svg
diff --git a/icons/icon_b_t_wait.svg b/icons/BTWait.svg
similarity index 100%
rename from icons/icon_b_t_wait.svg
rename to icons/BTWait.svg
diff --git a/icons/icon_b_t_wait_ticks.svg b/icons/BTWaitTicks.svg
similarity index 100%
rename from icons/icon_b_t_wait_ticks.svg
rename to icons/BTWaitTicks.svg
diff --git a/icons/icon_behavior_tree.svg b/icons/BehaviorTree.svg
similarity index 100%
rename from icons/icon_behavior_tree.svg
rename to icons/BehaviorTree.svg
diff --git a/icons/icon_limbo_a_i_editor.svg b/icons/LimboAIEditor.svg
similarity index 100%
rename from icons/icon_limbo_a_i_editor.svg
rename to icons/LimboAIEditor.svg
diff --git a/icons/icon_limbo_h_s_m.svg b/icons/LimboHSM.svg
similarity index 100%
rename from icons/icon_limbo_h_s_m.svg
rename to icons/LimboHSM.svg
diff --git a/icons/icon_limbo_state.svg b/icons/LimboState.svg
similarity index 100%
rename from icons/icon_limbo_state.svg
rename to icons/LimboState.svg
diff --git a/limbo_hsm.cpp b/limbo_hsm.cpp
index f590746..af9e45f 100644
--- a/limbo_hsm.cpp
+++ b/limbo_hsm.cpp
@@ -2,12 +2,12 @@
 
 #include "limbo_hsm.h"
 
-#include "core/class_db.h"
-#include "core/engine.h"
-#include "core/error_macros.h"
-#include "core/object.h"
+#include "core/config/engine.h"
+#include "core/error/error_macros.h"
+#include "core/object/class_db.h"
+#include "core/object/object.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 #include "modules/limboai/blackboard.h"
 #include "modules/limboai/limbo_state.h"
 #include "modules/limboai/limbo_string_names.h"
@@ -95,7 +95,7 @@ void LimboHSM::add_transition(Node *p_from_state, Node *p_to_state, const String
 	ERR_FAIL_COND(p_to_state == nullptr);
 	ERR_FAIL_COND(p_to_state->get_parent() != this);
 	ERR_FAIL_COND(!p_to_state->is_class("LimboState"));
-	ERR_FAIL_COND(p_event.empty());
+	ERR_FAIL_COND(p_event.is_empty());
 
 	uint64_t key = _get_transition_key(p_from_state, p_event);
 	transitions[key] = Object::cast_to<LimboState>(p_to_state);
@@ -119,7 +119,7 @@ void LimboHSM::set_initial_state(Node *p_state) {
 }
 
 bool LimboHSM::dispatch(const String &p_event, const Variant &p_cargo) {
-	ERR_FAIL_COND_V(p_event.empty(), false);
+	ERR_FAIL_COND_V(p_event.is_empty(), false);
 
 	bool event_consumed = false;
 
diff --git a/limbo_hsm.h b/limbo_hsm.h
index 9edac85..530ebc2 100644
--- a/limbo_hsm.h
+++ b/limbo_hsm.h
@@ -3,7 +3,8 @@
 #ifndef LIMBO_HSM_H
 #define LIMBO_HSM_H
 
-#include "core/object.h"
+#include "core/object/object.h"
+#include "core/templates/hash_map.h"
 #include "limbo_state.h"
 
 class LimboHSM : public LimboState {
@@ -20,7 +21,7 @@ private:
 	UpdateMode update_mode;
 	LimboState *initial_state;
 	LimboState *active_state;
-	Map<uint64_t, LimboState *> transitions;
+	HashMap<uint64_t, LimboState *> transitions;
 
 	_FORCE_INLINE_ uint64_t _get_transition_key(Node *p_from_state, const String &p_event) {
 		uint64_t key = hash_djb2_one_64(Variant::OBJECT);
@@ -34,10 +35,10 @@ protected:
 
 	void _notification(int p_what);
 
-	virtual void _initialize(Object *p_agent, const Ref<Blackboard> &p_blackboard);
-	virtual void _enter();
-	virtual void _exit();
-	virtual void _update(float p_delta);
+	virtual void _initialize(Object *p_agent, const Ref<Blackboard> &p_blackboard) override;
+	virtual void _enter() override;
+	virtual void _exit() override;
+	virtual void _update(float p_delta) override;
 
 	void _change_state(LimboState *p_state);
 
@@ -53,7 +54,7 @@ public:
 	LimboState *get_initial_state() const { return initial_state; }
 
 	virtual void initialize(Object *p_agent, const Ref<Blackboard> &p_parent_scope = nullptr);
-	virtual bool dispatch(const String &p_event, const Variant &p_cargo);
+	virtual bool dispatch(const String &p_event, const Variant &p_cargo) override;
 
 	void update(float p_delta) { _update(p_delta); }
 	void add_transition(Node *p_from_state, Node *p_to_state, const String &p_event);
diff --git a/limbo_state.cpp b/limbo_state.cpp
index 1716614..baba2f1 100644
--- a/limbo_state.cpp
+++ b/limbo_state.cpp
@@ -1,12 +1,12 @@
 /* limbo_state.cpp */
 
 #include "limbo_state.h"
-#include "core/array.h"
-#include "core/class_db.h"
-#include "core/error_macros.h"
-#include "core/object.h"
+#include "core/error/error_macros.h"
+#include "core/object/class_db.h"
+#include "core/object/object.h"
 #include "core/typedefs.h"
-#include "core/variant.h"
+#include "core/variant/array.h"
+#include "core/variant/variant.h"
 #include "limbo_string_names.h"
 
 const String LimboState::EVENT_FINISHED = "finished";
@@ -67,7 +67,7 @@ void LimboState::_initialize(Object *p_agent, const Ref<Blackboard> &p_blackboar
 	agent = p_agent;
 
 	if (!p_blackboard.is_null()) {
-		if (!blackboard->get_data().empty()) {
+		if (!blackboard->get_data().is_empty()) {
 			blackboard->set_parent_scope(p_blackboard);
 		} else {
 			blackboard = p_blackboard;
@@ -78,7 +78,7 @@ void LimboState::_initialize(Object *p_agent, const Ref<Blackboard> &p_blackboar
 };
 
 bool LimboState::dispatch(const String &p_event, const Variant &p_cargo) {
-	ERR_FAIL_COND_V(p_event.empty(), false);
+	ERR_FAIL_COND_V(p_event.is_empty(), false);
 	bool result = false;
 	if (handlers.size() > 0 && handlers.has(p_event)) {
 		if (p_cargo.get_type() == Variant::NIL) {
@@ -91,7 +91,7 @@ bool LimboState::dispatch(const String &p_event, const Variant &p_cargo) {
 }
 
 void LimboState::add_event_handler(const String &p_event, const StringName &p_method) {
-	ERR_FAIL_COND(p_event.empty());
+	ERR_FAIL_COND(p_event.is_empty());
 	ERR_FAIL_COND(!has_method(p_method));
 	handlers.insert(p_event, p_method);
 }
@@ -99,21 +99,24 @@ void LimboState::add_event_handler(const String &p_event, const StringName &p_me
 LimboState *LimboState::call_on_enter(Object *p_object, const StringName &p_method) {
 	ERR_FAIL_COND_V(p_object == nullptr, this);
 	ERR_FAIL_COND_V(!p_object->has_method(p_method), this);
-	connect(LimboStringNames::get_singleton()->entered, p_object, p_method);
+	ERR_PRINT("NOT IMPLEMENTED");
+	// connect(LimboStringNames::get_singleton()->entered, p_object, p_method);
 	return this;
 }
 
 LimboState *LimboState::call_on_exit(Object *p_object, const StringName &p_method) {
 	ERR_FAIL_COND_V(p_object == nullptr, this);
 	ERR_FAIL_COND_V(!p_object->has_method(p_method), this);
-	connect(LimboStringNames::get_singleton()->exited, p_object, p_method);
+	ERR_PRINT("NOT IMPLEMENTED");
+	// connect(LimboStringNames::get_singleton()->exited, p_object, p_method);
 	return this;
 }
 
 LimboState *LimboState::call_on_update(Object *p_object, const StringName &p_method) {
 	ERR_FAIL_COND_V(p_object == nullptr, this);
 	ERR_FAIL_COND_V(!p_object->has_method(p_method), this);
-	connect(LimboStringNames::get_singleton()->updated, p_object, p_method);
+	ERR_PRINT("NOT IMPLEMENTED");
+	// connect(LimboStringNames::get_singleton()->updated, p_object, p_method);
 	return this;
 }
 
@@ -166,10 +169,15 @@ void LimboState::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_set_blackboard_data", "p_blackboard"), &LimboState::_set_blackboard_data);
 	ClassDB::bind_method(D_METHOD("_get_blackboard_data"), &LimboState::_get_blackboard_data);
 
-	BIND_VMETHOD(MethodInfo("_setup"));
-	BIND_VMETHOD(MethodInfo("_enter"));
-	BIND_VMETHOD(MethodInfo("_exit"));
-	BIND_VMETHOD(MethodInfo("_update", PropertyInfo(Variant::REAL, "p_delta")));
+	// BIND_VMETHOD(MethodInfo("_setup"));
+	// BIND_VMETHOD(MethodInfo("_enter"));
+	// BIND_VMETHOD(MethodInfo("_exit"));
+	// BIND_VMETHOD(MethodInfo("_update", PropertyInfo(Variant::REAL, "p_delta")));
+
+	GDVIRTUAL_BIND(_setup);
+	GDVIRTUAL_BIND(_enter);
+	GDVIRTUAL_BIND(_exit);
+	GDVIRTUAL_BIND(_update, "p_delta");
 
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "EVENT_FINISHED", PROPERTY_HINT_NONE, "", 0), "", "event_finished");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "agent", PROPERTY_HINT_RESOURCE_TYPE, "Object", 0), "set_agent", "get_agent");
@@ -179,7 +187,7 @@ void LimboState::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("setup"));
 	ADD_SIGNAL(MethodInfo("entered"));
 	ADD_SIGNAL(MethodInfo("exited"));
-	ADD_SIGNAL(MethodInfo("updated", PropertyInfo(Variant::REAL, "p_delta")));
+	ADD_SIGNAL(MethodInfo("updated", PropertyInfo(Variant::FLOAT, "p_delta")));
 };
 
 LimboState::LimboState() {
diff --git a/limbo_state.h b/limbo_state.h
index b44cdd5..f0f8c3b 100644
--- a/limbo_state.h
+++ b/limbo_state.h
@@ -4,11 +4,13 @@
 #define LIMBO_STATE_H
 
 #include "blackboard.h"
-#include "core/class_db.h"
-#include "core/object.h"
-#include "core/string_name.h"
-#include "core/ustring.h"
-#include "core/variant.h"
+#include "core/object/class_db.h"
+#include "core/object/gdvirtual.gen.inc"
+#include "core/object/object.h"
+#include "core/string/string_name.h"
+#include "core/string/ustring.h"
+#include "core/templates/hash_map.h"
+#include "core/variant/variant.h"
 #include "scene/main/node.h"
 
 class LimboHSM;
@@ -25,7 +27,7 @@ private:
 
 	Object *agent;
 	Ref<Blackboard> blackboard;
-	Map<String, StringName> handlers;
+	HashMap<String, StringName> handlers;
 	GuardCallback guard;
 
 protected:
@@ -40,11 +42,17 @@ protected:
 	Dictionary _get_blackboard_data() const { return blackboard->get_data(); }
 
 	virtual void _initialize(Object *p_agent, const Ref<Blackboard> &p_blackboard);
+
 	virtual void _setup();
 	virtual void _enter();
 	virtual void _exit();
 	virtual void _update(float p_delta);
 
+	GDVIRTUAL0(_setup);
+	GDVIRTUAL0(_enter);
+	GDVIRTUAL0(_exit);
+	GDVIRTUAL1(_update, float);
+
 	void add_event_handler(const String &p_event, const StringName &p_method);
 
 public:
diff --git a/limbo_string_names.cpp b/limbo_string_names.cpp
index 492b3fa..acf6b26 100644
--- a/limbo_string_names.cpp
+++ b/limbo_string_names.cpp
@@ -1,7 +1,7 @@
 /* limbo_string_names.cpp */
 
 #include "limbo_string_names.h"
-#include "core/string_name.h"
+#include "core/string/string_name.h"
 
 LimboStringNames *LimboStringNames::singleton = nullptr;
 
diff --git a/limbo_string_names.h b/limbo_string_names.h
index 12abd41..67f3d9b 100644
--- a/limbo_string_names.h
+++ b/limbo_string_names.h
@@ -3,12 +3,13 @@
 #ifndef LIMBO_STRING_NAMES_H
 #define LIMBO_STRING_NAMES_H
 
-#include "core/string_name.h"
+#include "core/string/string_name.h"
 #include "core/typedefs.h"
+#include "modules/register_module_types.h"
 
 class LimboStringNames {
-	friend void register_limboai_types();
-	friend void unregister_limboai_types();
+	friend void initialize_limboai_module(ModuleInitializationLevel p_level);
+	friend void uninitialize_limboai_module(ModuleInitializationLevel p_level);
 
 	static LimboStringNames *singleton;
 
diff --git a/limbo_utility.cpp b/limbo_utility.cpp
index 20f4056..c32f4de 100644
--- a/limbo_utility.cpp
+++ b/limbo_utility.cpp
@@ -2,7 +2,7 @@
 
 #include "limbo_utility.h"
 #include "bt/bt_task.h"
-#include "core/variant.h"
+#include "core/variant/variant.h"
 
 LimboUtility *LimboUtility::singleton = nullptr;
 
@@ -12,7 +12,7 @@ LimboUtility *LimboUtility::get_singleton() {
 
 String LimboUtility::decorate_var(String p_variable) const {
 	String var = p_variable.trim_prefix("$").trim_prefix("\"").trim_suffix("\"");
-	if (var.find(" ") == -1 and not var.empty()) {
+	if (var.find(" ") == -1 and not var.is_empty()) {
 		return vformat("$%s", var);
 	} else {
 		return vformat("$\"%s\"", var);
diff --git a/limbo_utility.h b/limbo_utility.h
index 6a39eb2..fd921fc 100644
--- a/limbo_utility.h
+++ b/limbo_utility.h
@@ -3,7 +3,8 @@
 #ifndef LIMBO_UTILITY_H
 #define LIMBO_UTILITY_H
 
-#include "core/object.h"
+#include "core/object/class_db.h"
+#include "core/object/object.h"
 
 class LimboUtility : public Object {
 	GDCLASS(LimboUtility, Object);
diff --git a/register_types.cpp b/register_types.cpp
index 498c021..9ed6ed3 100644
--- a/register_types.cpp
+++ b/register_types.cpp
@@ -2,7 +2,7 @@
 
 #include "register_types.h"
 
-#include "core/class_db.h"
+#include "core/object/class_db.h"
 
 #include "bb_param/bb_aabb.h"
 #include "bb_param/bb_array.h"
@@ -66,6 +66,7 @@
 #include "bt/decorators/bt_subtree.h"
 #include "bt/decorators/bt_time_limit.h"
 #include "core/os/memory.h"
+#include "core/string/print_string.h"
 #include "limbo_hsm.h"
 #include "limbo_state.h"
 #include "limbo_string_names.h"
@@ -77,92 +78,97 @@
 
 static LimboUtility *_limbo_utility = nullptr;
 
-void register_limboai_types() {
-	ClassDB::register_class<Blackboard>();
+void initialize_limboai_module(ModuleInitializationLevel p_level) {
+	if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
+		ClassDB::register_class<Blackboard>();
 
-	ClassDB::register_class<LimboState>();
-	ClassDB::register_class<LimboHSM>();
+		ClassDB::register_class<LimboState>();
+		ClassDB::register_class<LimboHSM>();
 
-	ClassDB::register_class<BTTask>();
-	ClassDB::register_class<BehaviorTree>();
-	ClassDB::register_class<BTPlayer>();
-	ClassDB::register_class<BTState>();
+		ClassDB::register_class<BTTask>();
+		ClassDB::register_class<BehaviorTree>();
+		ClassDB::register_class<BTPlayer>();
+		ClassDB::register_class<BTState>();
 
-	ClassDB::register_class<BTComposite>();
-	ClassDB::register_class<BTSequence>();
-	ClassDB::register_class<BTDynamicSequence>();
-	ClassDB::register_class<BTDynamicSelector>();
-	ClassDB::register_class<BTSelector>();
-	ClassDB::register_class<BTRandomSelector>();
-	ClassDB::register_class<BTRandomSequence>();
-	ClassDB::register_class<BTSelector>();
-	ClassDB::register_class<BTParallel>();
+		ClassDB::register_class<BTComposite>();
+		ClassDB::register_class<BTSequence>();
+		ClassDB::register_class<BTDynamicSequence>();
+		ClassDB::register_class<BTDynamicSelector>();
+		ClassDB::register_class<BTSelector>();
+		ClassDB::register_class<BTRandomSelector>();
+		ClassDB::register_class<BTRandomSequence>();
+		ClassDB::register_class<BTSelector>();
+		ClassDB::register_class<BTParallel>();
 
-	ClassDB::register_class<BTDecorator>();
-	ClassDB::register_class<BTInvert>();
-	ClassDB::register_class<BTAlwaysFail>();
-	ClassDB::register_class<BTAlwaysSucceed>();
-	ClassDB::register_class<BTDelay>();
-	ClassDB::register_class<BTRepeat>();
-	ClassDB::register_class<BTRepeatUntilFailure>();
-	ClassDB::register_class<BTRepeatUntilSuccess>();
-	ClassDB::register_class<BTRunLimit>();
-	ClassDB::register_class<BTTimeLimit>();
-	ClassDB::register_class<BTCooldown>();
-	ClassDB::register_class<BTProbability>();
-	ClassDB::register_class<BTForEach>();
+		ClassDB::register_class<BTDecorator>();
+		ClassDB::register_class<BTInvert>();
+		ClassDB::register_class<BTAlwaysFail>();
+		ClassDB::register_class<BTAlwaysSucceed>();
+		ClassDB::register_class<BTDelay>();
+		ClassDB::register_class<BTRepeat>();
+		ClassDB::register_class<BTRepeatUntilFailure>();
+		ClassDB::register_class<BTRepeatUntilSuccess>();
+		ClassDB::register_class<BTRunLimit>();
+		ClassDB::register_class<BTTimeLimit>();
+		ClassDB::register_class<BTCooldown>();
+		ClassDB::register_class<BTProbability>();
+		ClassDB::register_class<BTForEach>();
 
-	ClassDB::register_class<BTAction>();
-	ClassDB::register_class<BTFail>();
-	ClassDB::register_class<BTWait>();
-	ClassDB::register_class<BTRandomWait>();
-	ClassDB::register_class<BTWaitTicks>();
-	ClassDB::register_class<BTNewScope>();
-	ClassDB::register_class<BTSubtree>();
-	ClassDB::register_class<BTConsolePrint>();
+		ClassDB::register_class<BTAction>();
+		ClassDB::register_class<BTFail>();
+		ClassDB::register_class<BTWait>();
+		ClassDB::register_class<BTRandomWait>();
+		ClassDB::register_class<BTWaitTicks>();
+		ClassDB::register_class<BTNewScope>();
+		ClassDB::register_class<BTSubtree>();
+		ClassDB::register_class<BTConsolePrint>();
 
-	ClassDB::register_class<BTCondition>();
+		ClassDB::register_class<BTCondition>();
 
-	ClassDB::register_virtual_class<BBParam>();
-	ClassDB::register_class<BBInt>();
-	ClassDB::register_class<BBBool>();
-	ClassDB::register_class<BBFloat>();
-	ClassDB::register_class<BBString>();
-	ClassDB::register_class<BBVector2>();
-	ClassDB::register_class<BBRect2>();
-	ClassDB::register_class<BBVector3>();
-	ClassDB::register_class<BBTransform2D>();
-	ClassDB::register_class<BBPlane>();
-	ClassDB::register_class<BBQuat>();
-	ClassDB::register_class<BBAabb>();
-	ClassDB::register_class<BBBasis>();
-	ClassDB::register_class<BBTransform>();
-	ClassDB::register_class<BBColor>();
-	ClassDB::register_class<BBNode>();
-	ClassDB::register_class<BBDictionary>();
-	ClassDB::register_class<BBArray>();
-	ClassDB::register_class<BBByteArray>();
-	ClassDB::register_class<BBIntArray>();
-	ClassDB::register_class<BBRealArray>();
-	ClassDB::register_class<BBColorArray>();
-	ClassDB::register_class<BBStringArray>();
-	ClassDB::register_class<BBVector2Array>();
-	ClassDB::register_class<BBVector3Array>();
-	ClassDB::register_class<BBVariant>();
+		ClassDB::register_abstract_class<BBParam>();
+		ClassDB::register_class<BBInt>();
+		ClassDB::register_class<BBBool>();
+		ClassDB::register_class<BBFloat>();
+		ClassDB::register_class<BBString>();
+		ClassDB::register_class<BBVector2>();
+		ClassDB::register_class<BBRect2>();
+		ClassDB::register_class<BBVector3>();
+		ClassDB::register_class<BBTransform2D>();
+		ClassDB::register_class<BBPlane>();
+		ClassDB::register_class<BBQuat>();
+		ClassDB::register_class<BBAabb>();
+		ClassDB::register_class<BBBasis>();
+		ClassDB::register_class<BBTransform>();
+		ClassDB::register_class<BBColor>();
+		ClassDB::register_class<BBNode>();
+		ClassDB::register_class<BBDictionary>();
+		ClassDB::register_class<BBArray>();
+		ClassDB::register_class<BBByteArray>();
+		ClassDB::register_class<BBIntArray>();
+		ClassDB::register_class<BBRealArray>();
+		ClassDB::register_class<BBColorArray>();
+		ClassDB::register_class<BBStringArray>();
+		ClassDB::register_class<BBVector2Array>();
+		ClassDB::register_class<BBVector3Array>();
+		ClassDB::register_class<BBVariant>();
 
-	_limbo_utility = memnew(LimboUtility);
-	ClassDB::register_class<LimboUtility>();
+		_limbo_utility = memnew(LimboUtility);
+		ClassDB::register_class<LimboUtility>();
+
+		LimboStringNames::create();
+	}
 
 #ifdef TOOLS_ENABLED
-	Engine::get_singleton()->add_singleton(Engine::Singleton("LimboUtility", LimboUtility::get_singleton()));
-	EditorPlugins::add_by_type<LimboAIEditorPlugin>();
+	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
+		Engine::get_singleton()->add_singleton(Engine::Singleton("LimboUtility", LimboUtility::get_singleton()));
+		EditorPlugins::add_by_type<LimboAIEditorPlugin>();
+	}
 #endif
-
-	LimboStringNames::create();
 }
 
-void unregister_limboai_types() {
-	LimboStringNames::free();
-
-	memdelete(_limbo_utility);
+void uninitialize_limboai_module(ModuleInitializationLevel p_level) {
+	if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
+		LimboStringNames::free();
+		memdelete(_limbo_utility);
+	}
 }
diff --git a/register_types.h b/register_types.h
index b91530c..18febed 100644
--- a/register_types.h
+++ b/register_types.h
@@ -3,7 +3,9 @@
 #ifndef LIMBOAI_REGISTER_TYPES_H
 #define LIMBOAI_REGISTER_TYPES_H
 
-void register_limboai_types();
-void unregister_limboai_types();
+#include "modules/register_module_types.h"
+
+void initialize_limboai_module(ModuleInitializationLevel p_level);
+void uninitialize_limboai_module(ModuleInitializationLevel p_level);
 
 #endif // LIMBOAI_REGISTER_TYPES_H