diff --git a/rosh/CMakeLists.txt b/tools/rosh/CMakeLists.txt
similarity index 100%
rename from rosh/CMakeLists.txt
rename to tools/rosh/CMakeLists.txt
diff --git a/rosh/Makefile b/tools/rosh/Makefile
similarity index 100%
rename from rosh/Makefile
rename to tools/rosh/Makefile
diff --git a/rosh/manifest.xml b/tools/rosh/manifest.xml
similarity index 100%
rename from rosh/manifest.xml
rename to tools/rosh/manifest.xml
diff --git a/rosh/nodes/roshlet.py b/tools/rosh/nodes/roshlet.py
similarity index 100%
rename from rosh/nodes/roshlet.py
rename to tools/rosh/nodes/roshlet.py
diff --git a/rosh/rosdoc.yaml b/tools/rosh/rosdoc.yaml
similarity index 100%
rename from rosh/rosdoc.yaml
rename to tools/rosh/rosdoc.yaml
diff --git a/rosh/rosh b/tools/rosh/rosh
similarity index 100%
rename from rosh/rosh
rename to tools/rosh/rosh
diff --git a/rosh/roshlets/echolet.py b/tools/rosh/roshlets/echolet.py
similarity index 100%
rename from rosh/roshlets/echolet.py
rename to tools/rosh/roshlets/echolet.py
diff --git a/rosh/shell.py b/tools/rosh/shell.py
similarity index 100%
rename from rosh/shell.py
rename to tools/rosh/shell.py
diff --git a/rosh/src/rosh/__init__.py b/tools/rosh/src/rosh/__init__.py
similarity index 100%
rename from rosh/src/rosh/__init__.py
rename to tools/rosh/src/rosh/__init__.py
diff --git a/rosh/src/rosh/future.py b/tools/rosh/src/rosh/future.py
similarity index 100%
rename from rosh/src/rosh/future.py
rename to tools/rosh/src/rosh/future.py
diff --git a/rosh/src/rosh/impl/__init__.py b/tools/rosh/src/rosh/impl/__init__.py
similarity index 100%
rename from rosh/src/rosh/impl/__init__.py
rename to tools/rosh/src/rosh/impl/__init__.py
diff --git a/rosh/src/rosh/impl/bagy.py b/tools/rosh/src/rosh/impl/bagy.py
similarity index 100%
rename from rosh/src/rosh/impl/bagy.py
rename to tools/rosh/src/rosh/impl/bagy.py
diff --git a/rosh/src/rosh/impl/exceptions.py b/tools/rosh/src/rosh/impl/exceptions.py
similarity index 100%
rename from rosh/src/rosh/impl/exceptions.py
rename to tools/rosh/src/rosh/impl/exceptions.py
diff --git a/rosh/src/rosh/impl/ipy.py b/tools/rosh/src/rosh/impl/ipy.py
similarity index 100%
rename from rosh/src/rosh/impl/ipy.py
rename to tools/rosh/src/rosh/impl/ipy.py
diff --git a/rosh/src/rosh/impl/library.py b/tools/rosh/src/rosh/impl/library.py
similarity index 100%
rename from rosh/src/rosh/impl/library.py
rename to tools/rosh/src/rosh/impl/library.py
diff --git a/rosh/src/rosh/impl/msg.py b/tools/rosh/src/rosh/impl/msg.py
similarity index 100%
rename from rosh/src/rosh/impl/msg.py
rename to tools/rosh/src/rosh/impl/msg.py
diff --git a/rosh/src/rosh/impl/namespace.py b/tools/rosh/src/rosh/impl/namespace.py
similarity index 100%
rename from rosh/src/rosh/impl/namespace.py
rename to tools/rosh/src/rosh/impl/namespace.py
diff --git a/rosh/src/rosh/impl/node.py b/tools/rosh/src/rosh/impl/node.py
similarity index 100%
rename from rosh/src/rosh/impl/node.py
rename to tools/rosh/src/rosh/impl/node.py
diff --git a/rosh/src/rosh/impl/param.py b/tools/rosh/src/rosh/impl/param.py
similarity index 100%
rename from rosh/src/rosh/impl/param.py
rename to tools/rosh/src/rosh/impl/param.py
diff --git a/rosh/src/rosh/impl/proc.py b/tools/rosh/src/rosh/impl/proc.py
similarity index 100%
rename from rosh/src/rosh/impl/proc.py
rename to tools/rosh/src/rosh/impl/proc.py
diff --git a/rosh/src/rosh/impl/props.py b/tools/rosh/src/rosh/impl/props.py
similarity index 100%
rename from rosh/src/rosh/impl/props.py
rename to tools/rosh/src/rosh/impl/props.py
diff --git a/rosh/src/rosh/impl/py_image_view.py b/tools/rosh/src/rosh/impl/py_image_view.py
similarity index 100%
rename from rosh/src/rosh/impl/py_image_view.py
rename to tools/rosh/src/rosh/impl/py_image_view.py
diff --git a/rosh/src/rosh/impl/ros_graph.py b/tools/rosh/src/rosh/impl/ros_graph.py
similarity index 100%
rename from rosh/src/rosh/impl/ros_graph.py
rename to tools/rosh/src/rosh/impl/ros_graph.py
diff --git a/rosh/src/rosh/impl/roshlets.py b/tools/rosh/src/rosh/impl/roshlets.py
similarity index 100%
rename from rosh/src/rosh/impl/roshlets.py
rename to tools/rosh/src/rosh/impl/roshlets.py
diff --git a/rosh/src/rosh/impl/service.py b/tools/rosh/src/rosh/impl/service.py
similarity index 100%
rename from rosh/src/rosh/impl/service.py
rename to tools/rosh/src/rosh/impl/service.py
diff --git a/rosh/src/rosh/impl/show.py b/tools/rosh/src/rosh/impl/show.py
similarity index 100%
rename from rosh/src/rosh/impl/show.py
rename to tools/rosh/src/rosh/impl/show.py
diff --git a/rosh/src/rosh/impl/topic.py b/tools/rosh/src/rosh/impl/topic.py
similarity index 100%
rename from rosh/src/rosh/impl/topic.py
rename to tools/rosh/src/rosh/impl/topic.py
diff --git a/rosh/src/rosh/impl/xdot.py b/tools/rosh/src/rosh/impl/xdot.py
similarity index 100%
rename from rosh/src/rosh/impl/xdot.py
rename to tools/rosh/src/rosh/impl/xdot.py
diff --git a/rosh/src/rosh/plugin.py b/tools/rosh/src/rosh/plugin.py
similarity index 100%
rename from rosh/src/rosh/plugin.py
rename to tools/rosh/src/rosh/plugin.py
diff --git a/rosh/srv/LoadRoshlet.srv b/tools/rosh/srv/LoadRoshlet.srv
similarity index 100%
rename from rosh/srv/LoadRoshlet.srv
rename to tools/rosh/srv/LoadRoshlet.srv
diff --git a/rosh/test/test_rosh_impl_topic.py b/tools/rosh/test/test_rosh_impl_topic.py
similarity index 100%
rename from rosh/test/test_rosh_impl_topic.py
rename to tools/rosh/test/test_rosh_impl_topic.py