diff --git a/.gitignore b/.gitignore
index b93f1396..63a70445 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@ reports/
 *.dblite
 *.exp
 *.lib
-*.obj
\ No newline at end of file
+*.obj
+
+.vs
\ No newline at end of file
diff --git a/SConstruct b/SConstruct
index 28260c61..b176d2ea 100644
--- a/SConstruct
+++ b/SConstruct
@@ -14,7 +14,7 @@ env = SConscript("godot-cpp/SConstruct")
 
 # tweak this if you want to use different folders, or more folders, to store your source code in.
 env.Append(CPPPATH=["extension/src/"])
-sources = Glob("extension/src/*.cpp")
+sources = Glob("extension/src/**/*.cpp")
 
 if env["platform"] == "macos":
     library = env.SharedLibrary(
diff --git a/addons/beehave/libs/windows/beehave.windows.editor.x86_64.dll b/addons/beehave/libs/windows/beehave.windows.editor.x86_64.dll
new file mode 100644
index 00000000..84dee393
Binary files /dev/null and b/addons/beehave/libs/windows/beehave.windows.editor.x86_64.dll differ
diff --git a/extension/src/nodes/blackboard.cpp b/extension/src/nodes/beehave_blackboard.cpp
similarity index 58%
rename from extension/src/nodes/blackboard.cpp
rename to extension/src/nodes/beehave_blackboard.cpp
index 5f38513c..aee3225f 100644
--- a/extension/src/nodes/blackboard.cpp
+++ b/extension/src/nodes/beehave_blackboard.cpp
@@ -1,12 +1,11 @@
-#include "blackboard.h"
-
+#include "beehave_blackboard.h"
 #include <godot_cpp/core/class_db.hpp>
 
 using namespace godot;
 
 BeehaveBlackboard::BeehaveBlackboard()
 {
-    count = 0;
+
 }
 
 BeehaveBlackboard::~BeehaveBlackboard()
@@ -14,7 +13,12 @@ BeehaveBlackboard::~BeehaveBlackboard()
     
 }
 
-void BeehaveBlackboard::_bind_methods()
+void BeehaveBlackboard::test()
 {
+    
+}
 
-}
\ No newline at end of file
+void BeehaveBlackboard::_bind_methods()
+{
+    ClassDB::bind_method(D_METHOD("test"), &BeehaveBlackboard::test);
+}
diff --git a/extension/src/nodes/blackboard.h b/extension/src/nodes/beehave_blackboard.h
similarity index 80%
rename from extension/src/nodes/blackboard.h
rename to extension/src/nodes/beehave_blackboard.h
index 836f65ea..12042a6d 100644
--- a/extension/src/nodes/blackboard.h
+++ b/extension/src/nodes/beehave_blackboard.h
@@ -3,7 +3,7 @@
 
 #include <godot_cpp/classes/node.hpp>
 
-using namespace godot;
+namespace godot {
 
 class BeehaveBlackboard : public Node
 {
@@ -15,6 +15,10 @@ class BeehaveBlackboard : public Node
 public:
     BeehaveBlackboard();
     ~BeehaveBlackboard();
+
+    void test();
 };
 
-#endif // BEEHAVE_BLACKBOARD_H
\ No newline at end of file
+}
+
+#endif // BEEHAVE_BLACKBOARD_H
diff --git a/extension/src/nodes/tree.cpp b/extension/src/nodes/beehave_tree.cpp
similarity index 58%
rename from extension/src/nodes/tree.cpp
rename to extension/src/nodes/beehave_tree.cpp
index 1c256047..b3426b97 100644
--- a/extension/src/nodes/tree.cpp
+++ b/extension/src/nodes/beehave_tree.cpp
@@ -1,12 +1,11 @@
-#include "tree.h"
-
+#include "beehave_tree.h"
 #include <godot_cpp/core/class_db.hpp>
 
 using namespace godot;
 
 BeehaveTree::BeehaveTree()
 {
-    count = 0;
+
 }
 
 BeehaveTree::~BeehaveTree()
@@ -14,7 +13,11 @@ BeehaveTree::~BeehaveTree()
     
 }
 
+void BeehaveTree::test() {
+
+}
+
 void BeehaveTree::_bind_methods()
 {
-
-}
\ No newline at end of file
+    ClassDB::bind_method(D_METHOD("test"), &BeehaveTree::test);
+}
diff --git a/extension/src/nodes/tree.h b/extension/src/nodes/beehave_tree.h
similarity index 79%
rename from extension/src/nodes/tree.h
rename to extension/src/nodes/beehave_tree.h
index 83018027..96af25ec 100644
--- a/extension/src/nodes/tree.h
+++ b/extension/src/nodes/beehave_tree.h
@@ -3,7 +3,7 @@
 
 #include <godot_cpp/classes/node.hpp>
 
-using namespace godot;
+namespace godot {
 
 class BeehaveTree : public Node
 {
@@ -15,6 +15,10 @@ class BeehaveTree : public Node
 public:
     BeehaveTree();
     ~BeehaveTree();
+
+    void test();
 };
 
-#endif // BEEHAVE_TREE_H
\ No newline at end of file
+}
+
+#endif // BEEHAVE_TREE_H
diff --git a/extension/src/nodes/beehave_tree_node.cpp b/extension/src/nodes/beehave_tree_node.cpp
new file mode 100644
index 00000000..4ed29445
--- /dev/null
+++ b/extension/src/nodes/beehave_tree_node.cpp
@@ -0,0 +1,23 @@
+#include "beehave_tree_node.h"
+#include <godot_cpp/core/class_db.hpp>
+
+using namespace godot;
+
+BeehaveTreeNode::BeehaveTreeNode()
+{
+
+}
+
+BeehaveTreeNode::~BeehaveTreeNode()
+{
+    
+}
+
+void BeehaveTreeNode::test() {
+
+}
+
+void BeehaveTreeNode::_bind_methods()
+{
+    ClassDB::bind_method(D_METHOD("test"), &BeehaveTreeNode::test);
+}
diff --git a/extension/src/nodes/beehave_tree_node.h b/extension/src/nodes/beehave_tree_node.h
new file mode 100644
index 00000000..f6c7d846
--- /dev/null
+++ b/extension/src/nodes/beehave_tree_node.h
@@ -0,0 +1,24 @@
+#ifndef BEEHAVE_TREE_NODE_H
+#define BEEHAVE_TREE_NODE_H
+
+#include <godot_cpp/classes/node.hpp>
+
+namespace godot {
+
+class BeehaveTreeNode : public Node
+{
+    GDCLASS(BeehaveTreeNode, Node);
+
+protected:
+    static void _bind_methods();
+
+public:
+    BeehaveTreeNode();
+    ~BeehaveTreeNode();
+
+    void test();
+};
+
+}
+
+#endif // BEEHAVE_TREE_NODE_H
diff --git a/extension/src/nodes/node.cpp b/extension/src/nodes/node.cpp
deleted file mode 100644
index 0f19c1a1..00000000
--- a/extension/src/nodes/node.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "node.h"
-
-#include <godot_cpp/core/class_db.hpp>
-
-using namespace godot;
-
-BeehaveNode::BeehaveNode()
-{
-
-}
-
-BeehaveNode::~BeehaveNode()
-{
-    
-}
-
-void BeehaveNode::_bind_methods()
-{
-
-}
\ No newline at end of file
diff --git a/extension/src/nodes/node.h b/extension/src/nodes/node.h
deleted file mode 100644
index 7ed41f51..00000000
--- a/extension/src/nodes/node.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef BEEHAVE_NODE_H
-#define BEEHAVE_NODE_H
-
-#include <godot_cpp/classes/node.hpp>
-
-using namespace godot;
-
-class BeehaveNode : public Node
-{
-    GDCLASS(BeehaveNode, Node);
-
-protected:
-    static void _bind_methods();
-
-public:
-    BeehaveNode();
-    ~BeehaveNode();
-};
-
-#endif // BEEHAVE_NODE_H
\ No newline at end of file
diff --git a/extension/src/register_types.cpp b/extension/src/register_types.cpp
index 9e5864f7..0e4e423a 100644
--- a/extension/src/register_types.cpp
+++ b/extension/src/register_types.cpp
@@ -4,8 +4,9 @@
 #include <godot_cpp/core/defs.hpp>
 #include <godot_cpp/godot.hpp>
 
-#include "nodes/tree.h"
-#include "nodes/blackboard.h"
+#include "nodes/beehave_tree.h"
+#include "nodes/beehave_tree_node.h"
+#include "nodes/beehave_blackboard.h"
 
 using namespace godot;
 
@@ -15,6 +16,7 @@ void initialize_beehave_types(ModuleInitializationLevel p_level)
 		return;
 	}
     ClassDB::register_class<BeehaveTree>();
+	ClassDB::register_class<BeehaveTreeNode>();
     ClassDB::register_class<BeehaveBlackboard>();
 }