diff --git a/Makefile b/Makefile
index 64c45991..5998e8ed 100644
--- a/Makefile
+++ b/Makefile
@@ -30,12 +30,12 @@ image-update:
 .PHONY: sick-driver
 sick-driver:
 	vcs import < repos/dsc.repos
-	./scripts/sick_driver.sh
+	./tools/scripts/sick_driver.sh
 	
 .PHONY: livox-driver
 livox-driver:
 	vcs import < repos/livox.repos
-	./scripts/livox_driver.sh
+	./tools/scripts/livox_driver.sh
 
 .PHONY: racer
 racer:
@@ -44,7 +44,7 @@ racer:
 .PHONY: gb_opt
 gb_opt:
 	chmod +x scripts/gb_opt_setup.sh
-	./scripts/gb_opt_setup.sh
+	./tools/scripts/gb_opt_setup.sh
 
 .PHONY: sim
 sim:
diff --git a/scripts/gb_opt_setup.sh b/scripts/gb_opt_setup.sh
deleted file mode 100755
index 422d4616..00000000
--- a/scripts/gb_opt_setup.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/bash
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-echo $SCRIPT_DIR
-cd $SCRIPT_DIR && pip3 install -e ../src/external/planner/global_race_planner/global_planner/global_planner/global_racetrajectory_optimization/
\ No newline at end of file
diff --git a/Groot.sh b/tools/scripts/Groot.sh
similarity index 100%
rename from Groot.sh
rename to tools/scripts/Groot.sh
diff --git a/scripts/bashrc.sh b/tools/scripts/bashrc.sh
similarity index 100%
rename from scripts/bashrc.sh
rename to tools/scripts/bashrc.sh
diff --git a/docker.sh b/tools/scripts/docker.sh
similarity index 100%
rename from docker.sh
rename to tools/scripts/docker.sh
diff --git a/docker_sim.sh b/tools/scripts/docker_sim.sh
similarity index 100%
rename from docker_sim.sh
rename to tools/scripts/docker_sim.sh
diff --git a/tools/scripts/gb_opt_setup.sh b/tools/scripts/gb_opt_setup.sh
new file mode 100755
index 00000000..301ec281
--- /dev/null
+++ b/tools/scripts/gb_opt_setup.sh
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+echo $SCRIPT_DIR
+cd $SCRIPT_DIR && pip3 install -e $WORKSPACE/src/external/planner/global_race_planner/global_planner/global_planner/global_racetrajectory_optimization/
diff --git a/scripts/livox_driver.sh b/tools/scripts/livox_driver.sh
similarity index 66%
rename from scripts/livox_driver.sh
rename to tools/scripts/livox_driver.sh
index c5ac7ad0..06c1ef17 100755
--- a/scripts/livox_driver.sh
+++ b/tools/scripts/livox_driver.sh
@@ -2,7 +2,7 @@
 
 pushd `pwd` > /dev/null
 
-LIVOX_SDK=src/external/sensors/lidar/livox/livox-SDK2
+LIVOX_SDK=$WORKSPACE/src/external/sensors/lidar/livox/livox-SDK2
 if [ -d $LIVOX_SDK ]; then
 	cd $LIVOX_SDK
 	mkdir build
@@ -15,7 +15,7 @@ popd > /dev/null
 
 pushd `pwd` > /dev/null
 
-LIVOX_ROS_DRIVER=src/external/sensors/lidar/livox/livox_ros_driver2
+LIVOX_ROS_DRIVER=$WORKSPACE/src/external/sensors/lidar/livox/livox_ros_driver2
 if [ -d $LIVOX_ROS_DRIVER ]; then
 	cd $LIVOX_ROS_DRIVER
 	./build.sh ROS2
diff --git a/scripts/sick_driver.sh b/tools/scripts/sick_driver.sh
similarity index 100%
rename from scripts/sick_driver.sh
rename to tools/scripts/sick_driver.sh
diff --git a/source_ros2.sh b/tools/scripts/source_ros2.sh
similarity index 97%
rename from source_ros2.sh
rename to tools/scripts/source_ros2.sh
index 55f2de69..1d921837 100755
--- a/source_ros2.sh
+++ b/tools/scripts/source_ros2.sh
@@ -12,6 +12,7 @@ then
   return
 fi
 
+export WORKSPACE=/home/jetson/projects/robocar/
 export ROS_DISTRO=foxy
 # sudo apt update && sudo apt upgrade
 sudo apt install ros-$ROS_DISTRO-rmw-cyclonedds-cpp -y