diff --git a/common/docs/ROS Setup for mmWave User's Guide.pdf b/autonomous_robotics_ros/docs/common/ROS Setup for mmWave User's Guide.pdf
similarity index 100%
rename from common/docs/ROS Setup for mmWave User's Guide.pdf
rename to autonomous_robotics_ros/docs/common/ROS Setup for mmWave User's Guide.pdf
diff --git a/common/docs/Turtlebot_HWSW_setup.html b/autonomous_robotics_ros/docs/common/Turtlebot_HWSW_setup.html
similarity index 100%
rename from common/docs/Turtlebot_HWSW_setup.html
rename to autonomous_robotics_ros/docs/common/Turtlebot_HWSW_setup.html
diff --git a/autonomous_robotics_ros/docs/images/iwr6843_silicon_revision.png b/autonomous_robotics_ros/docs/common/images/iwr6843_silicon_revision.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/iwr6843_silicon_revision.png
rename to autonomous_robotics_ros/docs/common/images/iwr6843_silicon_revision.png
diff --git a/autonomous_robotics_ros/docs/images/iwr6843aopevm1.png b/autonomous_robotics_ros/docs/common/images/iwr6843aopevm1.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/iwr6843aopevm1.png
rename to autonomous_robotics_ros/docs/common/images/iwr6843aopevm1.png
diff --git a/common/docs/images/setup/Turtlebot2_front.png b/autonomous_robotics_ros/docs/common/images/setup/Turtlebot2_front.png
similarity index 100%
rename from common/docs/images/setup/Turtlebot2_front.png
rename to autonomous_robotics_ros/docs/common/images/setup/Turtlebot2_front.png
diff --git a/common/docs/images/setup/Turtlebot2_quad_iso.jpg b/autonomous_robotics_ros/docs/common/images/setup/Turtlebot2_quad_iso.jpg
similarity index 100%
rename from common/docs/images/setup/Turtlebot2_quad_iso.jpg
rename to autonomous_robotics_ros/docs/common/images/setup/Turtlebot2_quad_iso.jpg
diff --git a/common/docs/images/setup/Turtlebot2_quad_top.jpg b/autonomous_robotics_ros/docs/common/images/setup/Turtlebot2_quad_top.jpg
similarity index 100%
rename from common/docs/images/setup/Turtlebot2_quad_top.jpg
rename to autonomous_robotics_ros/docs/common/images/setup/Turtlebot2_quad_top.jpg
diff --git a/safety_bubble/docs/Safety_Bubble_with_ROS_for_mmWave_release_notes.html b/autonomous_robotics_ros/docs/safety_bubble/Safety_Bubble_with_ROS_for_mmWave_release_notes.html
similarity index 100%
rename from safety_bubble/docs/Safety_Bubble_with_ROS_for_mmWave_release_notes.html
rename to autonomous_robotics_ros/docs/safety_bubble/Safety_Bubble_with_ROS_for_mmWave_release_notes.html
diff --git a/safety_bubble/docs/Safety_Bubble_with_ROS_for_mmWave_release_notes.pdf b/autonomous_robotics_ros/docs/safety_bubble/Safety_Bubble_with_ROS_for_mmWave_release_notes.pdf
similarity index 100%
rename from safety_bubble/docs/Safety_Bubble_with_ROS_for_mmWave_release_notes.pdf
rename to autonomous_robotics_ros/docs/safety_bubble/Safety_Bubble_with_ROS_for_mmWave_release_notes.pdf
diff --git a/safety_bubble/docs/Safety_Bubble_with_ROS_for_mmWave_user_guide.html b/autonomous_robotics_ros/docs/safety_bubble/Safety_Bubble_with_ROS_for_mmWave_user_guide.html
similarity index 100%
rename from safety_bubble/docs/Safety_Bubble_with_ROS_for_mmWave_user_guide.html
rename to autonomous_robotics_ros/docs/safety_bubble/Safety_Bubble_with_ROS_for_mmWave_user_guide.html
diff --git a/safety_bubble/docs/Safety_Bubble_with_ROS_for_mmWave_user_guide.pdf b/autonomous_robotics_ros/docs/safety_bubble/Safety_Bubble_with_ROS_for_mmWave_user_guide.pdf
similarity index 100%
rename from safety_bubble/docs/Safety_Bubble_with_ROS_for_mmWave_user_guide.pdf
rename to autonomous_robotics_ros/docs/safety_bubble/Safety_Bubble_with_ROS_for_mmWave_user_guide.pdf
diff --git a/safety_bubble/docs/images/DemoDesc.PNG b/autonomous_robotics_ros/docs/safety_bubble/images/DemoDesc.PNG
similarity index 100%
rename from safety_bubble/docs/images/DemoDesc.PNG
rename to autonomous_robotics_ros/docs/safety_bubble/images/DemoDesc.PNG
diff --git a/autonomous_robotics_ros/docs/images/intro_senseavoid.gif b/autonomous_robotics_ros/docs/safety_bubble/images/intro_senseavoid.gif
similarity index 100%
rename from autonomous_robotics_ros/docs/images/intro_senseavoid.gif
rename to autonomous_robotics_ros/docs/safety_bubble/images/intro_senseavoid.gif
diff --git a/common/docs/images/iwr6843_silicon_revision.png b/autonomous_robotics_ros/docs/safety_bubble/images/iwr6843_silicon_revision.png
similarity index 100%
rename from common/docs/images/iwr6843_silicon_revision.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/iwr6843_silicon_revision.png
diff --git a/common/docs/images/iwr6843aopevm1.png b/autonomous_robotics_ros/docs/safety_bubble/images/iwr6843aopevm1.png
similarity index 100%
rename from common/docs/images/iwr6843aopevm1.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/iwr6843aopevm1.png
diff --git a/autonomous_robotics_ros/docs/images/mmwave_demo_visualizer_connected.png b/autonomous_robotics_ros/docs/safety_bubble/images/mmwave_demo_visualizer_connected.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/mmwave_demo_visualizer_connected.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/mmwave_demo_visualizer_connected.png
diff --git a/autonomous_robotics_ros/docs/images/mmwave_demo_visualizer_ports.png b/autonomous_robotics_ros/docs/safety_bubble/images/mmwave_demo_visualizer_ports.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/mmwave_demo_visualizer_ports.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/mmwave_demo_visualizer_ports.png
diff --git a/safety_bubble/docs/images/setup/Turtlebot2_quad_iso.jpg b/autonomous_robotics_ros/docs/safety_bubble/images/setup/Turtlebot2_quad_iso.jpg
similarity index 100%
rename from safety_bubble/docs/images/setup/Turtlebot2_quad_iso.jpg
rename to autonomous_robotics_ros/docs/safety_bubble/images/setup/Turtlebot2_quad_iso.jpg
diff --git a/safety_bubble/docs/images/setup/Turtlebot2_quad_top.jpg b/autonomous_robotics_ros/docs/safety_bubble/images/setup/Turtlebot2_quad_top.jpg
similarity index 100%
rename from safety_bubble/docs/images/setup/Turtlebot2_quad_top.jpg
rename to autonomous_robotics_ros/docs/safety_bubble/images/setup/Turtlebot2_quad_top.jpg
diff --git a/autonomous_robotics_ros/docs/images/setup/turtlebot2_1443.png b/autonomous_robotics_ros/docs/safety_bubble/images/setup/turtlebot2_1443.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/setup/turtlebot2_1443.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/setup/turtlebot2_1443.png
diff --git a/autonomous_robotics_ros/docs/images/setup/turtlebot2_front.png b/autonomous_robotics_ros/docs/safety_bubble/images/setup/turtlebot2_front.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/setup/turtlebot2_front.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/setup/turtlebot2_front.png
diff --git a/autonomous_robotics_ros/docs/images/setup/turtlebot2_side.png b/autonomous_robotics_ros/docs/safety_bubble/images/setup/turtlebot2_side.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/setup/turtlebot2_side.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/setup/turtlebot2_side.png
diff --git a/autonomous_robotics_ros/docs/images/setup_sw/download_lab.png b/autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/download_lab.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/setup_sw/download_lab.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/download_lab.png
diff --git a/autonomous_robotics_ros/docs/images/setup_sw/ros_nodes.png b/autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/ros_nodes.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/setup_sw/ros_nodes.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/ros_nodes.png
diff --git a/safety_bubble/docs/images/setup_sw/ros_pkg_dest.png b/autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/ros_pkg_dest.png
similarity index 100%
rename from safety_bubble/docs/images/setup_sw/ros_pkg_dest.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/ros_pkg_dest.png
diff --git a/safety_bubble/docs/images/setup_sw/ros_pkg_in_src.png b/autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/ros_pkg_in_src.png
similarity index 100%
rename from safety_bubble/docs/images/setup_sw/ros_pkg_in_src.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/ros_pkg_in_src.png
diff --git a/safety_bubble/docs/images/setup_sw/ros_pkg_source.png b/autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/ros_pkg_source.png
similarity index 100%
rename from safety_bubble/docs/images/setup_sw/ros_pkg_source.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/ros_pkg_source.png
diff --git a/autonomous_robotics_ros/docs/images/setup_sw/ros_processing_graph.png b/autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/ros_processing_graph.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/setup_sw/ros_processing_graph.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/ros_processing_graph.png
diff --git a/autonomous_robotics_ros/docs/images/setup_sw/turtlebot_sense_avoid_setup.png b/autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/turtlebot_sense_avoid_setup.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/setup_sw/turtlebot_sense_avoid_setup.png
rename to autonomous_robotics_ros/docs/safety_bubble/images/setup_sw/turtlebot_sense_avoid_setup.png
diff --git a/autonomous_robotics_ros/docs/Autonomous_Robotics_with_ROS_for_mmWave_Release_Notes.pdf b/autonomous_robotics_ros/docs/sense_and_avoid/Autonomous_Robotics_with_ROS_for_mmWave_Release_Notes.pdf
similarity index 100%
rename from autonomous_robotics_ros/docs/Autonomous_Robotics_with_ROS_for_mmWave_Release_Notes.pdf
rename to autonomous_robotics_ros/docs/sense_and_avoid/Autonomous_Robotics_with_ROS_for_mmWave_Release_Notes.pdf
diff --git a/autonomous_robotics_ros/docs/Autonomous_Robotics_with_ROS_for_mmWave_Users_Guide.pdf b/autonomous_robotics_ros/docs/sense_and_avoid/Autonomous_Robotics_with_ROS_for_mmWave_Users_Guide.pdf
similarity index 100%
rename from autonomous_robotics_ros/docs/Autonomous_Robotics_with_ROS_for_mmWave_Users_Guide.pdf
rename to autonomous_robotics_ros/docs/sense_and_avoid/Autonomous_Robotics_with_ROS_for_mmWave_Users_Guide.pdf
diff --git a/autonomous_robotics_ros/docs/Autonomous_Robotics_with_ROS_for_mmWave_release_notes.html b/autonomous_robotics_ros/docs/sense_and_avoid/Autonomous_Robotics_with_ROS_for_mmWave_release_notes.html
similarity index 100%
rename from autonomous_robotics_ros/docs/Autonomous_Robotics_with_ROS_for_mmWave_release_notes.html
rename to autonomous_robotics_ros/docs/sense_and_avoid/Autonomous_Robotics_with_ROS_for_mmWave_release_notes.html
diff --git a/autonomous_robotics_ros/docs/Autonomous_Robotics_with_ROS_for_mmWave_user_guide.html b/autonomous_robotics_ros/docs/sense_and_avoid/Autonomous_Robotics_with_ROS_for_mmWave_user_guide.html
similarity index 100%
rename from autonomous_robotics_ros/docs/Autonomous_Robotics_with_ROS_for_mmWave_user_guide.html
rename to autonomous_robotics_ros/docs/sense_and_avoid/Autonomous_Robotics_with_ROS_for_mmWave_user_guide.html
diff --git a/safety_bubble/docs/images/iwr6843_silicon_revision.png b/autonomous_robotics_ros/docs/sense_and_avoid/images/iwr6843_silicon_revision.png
similarity index 100%
rename from safety_bubble/docs/images/iwr6843_silicon_revision.png
rename to autonomous_robotics_ros/docs/sense_and_avoid/images/iwr6843_silicon_revision.png
diff --git a/autonomous_robotics_ros/docs/images/setup_sw/ros_pkg_dest.png b/autonomous_robotics_ros/docs/sense_and_avoid/images/setup_sw/ros_pkg_dest.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/setup_sw/ros_pkg_dest.png
rename to autonomous_robotics_ros/docs/sense_and_avoid/images/setup_sw/ros_pkg_dest.png
diff --git a/autonomous_robotics_ros/docs/images/setup_sw/ros_pkg_in_src.png b/autonomous_robotics_ros/docs/sense_and_avoid/images/setup_sw/ros_pkg_in_src.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/setup_sw/ros_pkg_in_src.png
rename to autonomous_robotics_ros/docs/sense_and_avoid/images/setup_sw/ros_pkg_in_src.png
diff --git a/autonomous_robotics_ros/docs/images/setup_sw/ros_pkg_source.png b/autonomous_robotics_ros/docs/sense_and_avoid/images/setup_sw/ros_pkg_source.png
similarity index 100%
rename from autonomous_robotics_ros/docs/images/setup_sw/ros_pkg_source.png
rename to autonomous_robotics_ros/docs/sense_and_avoid/images/setup_sw/ros_pkg_source.png
diff --git a/safety_bubble/ti_mmwave_ros_safety_bubble_v1p0.tar.gz b/safety_bubble/ti_mmwave_ros_safety_bubble_v1p0.tar.gz
deleted file mode 100644
index 33f067b..0000000
Binary files a/safety_bubble/ti_mmwave_ros_safety_bubble_v1p0.tar.gz and /dev/null differ