diff --git a/shell/lisa_shell b/shell/lisa_shell
index 99bd89acfd3585341b2fce3ed68446955a3612f0..cc1a949c2719dfd2ea243fe12b780e2b6a67c147 100755
--- a/shell/lisa_shell
+++ b/shell/lisa_shell
@@ -416,18 +416,6 @@ function lisa-wltest-series {
     $WLTEST_HOME/test_series "$@"
 }
 
-################################################################################
-# LISA Shell buildroot rootfs generation functions
-################################################################################
-
-function lisa-buildroot-create-rootfs {
-    "$LISA_HOME/shell/lisa_buildroot_create_rootfs" "$@"
-}
-
-function lisa-buildroot-update-kernel-config {
-    "$LISA_HOME/shell/lisa_buildroot_update_kernel_config" "$@"
-}
-
 ################################################################################
 # LISA Shell MAIN
 ################################################################################
diff --git a/shell/for-each-subtree.py b/tools/for-each-subtree.py
similarity index 100%
rename from shell/for-each-subtree.py
rename to tools/for-each-subtree.py
diff --git a/shell/lisa_buildroot_create_rootfs b/tools/lisa-buildroot-create-rootfs
similarity index 100%
rename from shell/lisa_buildroot_create_rootfs
rename to tools/lisa-buildroot-create-rootfs
diff --git a/shell/lisa_buildroot_update_kernel_config b/tools/lisa-buildroot-update-kernel-config
similarity index 100%
rename from shell/lisa_buildroot_update_kernel_config
rename to tools/lisa-buildroot-update-kernel-config