diff --git a/rbs_mill_assist/bt/config/bt_executor.yaml b/rbs_mill_assist/bt/config/bt_executor.yaml
index 6feace9..069aafc 100644
--- a/rbs_mill_assist/bt/config/bt_executor.yaml
+++ b/rbs_mill_assist/bt/config/bt_executor.yaml
@@ -10,4 +10,5 @@ bt_action_server:
- rbs_bt_executor/bt_plugins
behavior_trees:
- - rbs_mill_assist/xmls
+ - rbs_mill_assist/xmls/moveit
+ - rbs_mill_assist/xmls/no_moveit
diff --git a/rbs_mill_assist/bt/xmls/Grasp.xml b/rbs_mill_assist/bt/xmls/moveit/Grasp.xml
similarity index 100%
rename from rbs_mill_assist/bt/xmls/Grasp.xml
rename to rbs_mill_assist/bt/xmls/moveit/Grasp.xml
diff --git a/rbs_mill_assist/bt/xmls/MainTree.xml b/rbs_mill_assist/bt/xmls/moveit/MainTree.xml
similarity index 100%
rename from rbs_mill_assist/bt/xmls/MainTree.xml
rename to rbs_mill_assist/bt/xmls/moveit/MainTree.xml
diff --git a/rbs_mill_assist/bt/xmls/PickAndPlace.xml b/rbs_mill_assist/bt/xmls/moveit/PickAndPlace.xml
similarity index 100%
rename from rbs_mill_assist/bt/xmls/PickAndPlace.xml
rename to rbs_mill_assist/bt/xmls/moveit/PickAndPlace.xml
diff --git a/rbs_mill_assist/bt/xmls/Place.xml b/rbs_mill_assist/bt/xmls/moveit/Place.xml
similarity index 100%
rename from rbs_mill_assist/bt/xmls/Place.xml
rename to rbs_mill_assist/bt/xmls/moveit/Place.xml
diff --git a/rbs_mill_assist/bt/xmls/btmill.btproj b/rbs_mill_assist/bt/xmls/moveit/btmill.btproj
similarity index 100%
rename from rbs_mill_assist/bt/xmls/btmill.btproj
rename to rbs_mill_assist/bt/xmls/moveit/btmill.btproj
diff --git a/rbs_mill_assist/bt/xmls/no_moveit/FromGraver.xml b/rbs_mill_assist/bt/xmls/no_moveit/FromGraver.xml
new file mode 100644
index 0000000..65e9f5f
--- /dev/null
+++ b/rbs_mill_assist/bt/xmls/no_moveit/FromGraver.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rbs_mill_assist/bt/xmls/no_moveit/GraspNoMoveit.xml b/rbs_mill_assist/bt/xmls/no_moveit/GraspNoMoveit.xml
new file mode 100644
index 0000000..6a5dd36
--- /dev/null
+++ b/rbs_mill_assist/bt/xmls/no_moveit/GraspNoMoveit.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rbs_mill_assist/bt/xmls/no_moveit/MainTree.xml b/rbs_mill_assist/bt/xmls/no_moveit/MainTree.xml
new file mode 100644
index 0000000..86c004b
--- /dev/null
+++ b/rbs_mill_assist/bt/xmls/no_moveit/MainTree.xml
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rbs_mill_assist/bt/xmls/no_moveit/PlaceNoMoveit.xml b/rbs_mill_assist/bt/xmls/no_moveit/PlaceNoMoveit.xml
new file mode 100644
index 0000000..8d6b5e9
--- /dev/null
+++ b/rbs_mill_assist/bt/xmls/no_moveit/PlaceNoMoveit.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rbs_mill_assist/bt/xmls/no_moveit/ToGraver.xml b/rbs_mill_assist/bt/xmls/no_moveit/ToGraver.xml
new file mode 100644
index 0000000..ed2042a
--- /dev/null
+++ b/rbs_mill_assist/bt/xmls/no_moveit/ToGraver.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+