diff --git a/costar_tools/smart_waypoint_manager/CMakeLists.txt b/costar_robot/smart_waypoint_manager/CMakeLists.txt
similarity index 100%
rename from costar_tools/smart_waypoint_manager/CMakeLists.txt
rename to costar_robot/smart_waypoint_manager/CMakeLists.txt
diff --git a/costar_tools/smart_waypoint_manager/package.xml b/costar_robot/smart_waypoint_manager/package.xml
similarity index 100%
rename from costar_tools/smart_waypoint_manager/package.xml
rename to costar_robot/smart_waypoint_manager/package.xml
diff --git a/costar_tools/smart_waypoint_manager/scripts/test_smart_waypoint_manager.py b/costar_robot/smart_waypoint_manager/scripts/test_smart_waypoint_manager.py
similarity index 100%
rename from costar_tools/smart_waypoint_manager/scripts/test_smart_waypoint_manager.py
rename to costar_robot/smart_waypoint_manager/scripts/test_smart_waypoint_manager.py
diff --git a/costar_tools/smart_waypoint_manager/setup.py b/costar_robot/smart_waypoint_manager/setup.py
similarity index 100%
rename from costar_tools/smart_waypoint_manager/setup.py
rename to costar_robot/smart_waypoint_manager/setup.py
diff --git a/costar_tools/smart_waypoint_manager/src/smart_waypoint_manager/__init__.py b/costar_robot/smart_waypoint_manager/src/smart_waypoint_manager/__init__.py
similarity index 100%
rename from costar_tools/smart_waypoint_manager/src/smart_waypoint_manager/__init__.py
rename to costar_robot/smart_waypoint_manager/src/smart_waypoint_manager/__init__.py
diff --git a/costar_tools/smart_waypoint_manager/src/smart_waypoint_manager/smart_waypoint_manager.py b/costar_robot/smart_waypoint_manager/src/smart_waypoint_manager/smart_waypoint_manager.py
similarity index 100%
rename from costar_tools/smart_waypoint_manager/src/smart_waypoint_manager/smart_waypoint_manager.py
rename to costar_robot/smart_waypoint_manager/src/smart_waypoint_manager/smart_waypoint_manager.py