diff --git a/ros2_control_demo_robot/description/rrbot_system_multi_interface.urdf.xacro b/ros2_control_demo_robot/description/rrbot_system_multi_interface.urdf.xacro
index 6a330bb4c..368751415 100644
--- a/ros2_control_demo_robot/description/rrbot_system_multi_interface.urdf.xacro
+++ b/ros2_control_demo_robot/description/rrbot_system_multi_interface.urdf.xacro
@@ -7,15 +7,15 @@ https://github.com/ros-simulation/gazebo_ros_demos/blob/kinetic-devel/rrbot_desc
 <robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="2dof_robot">
 
   <!-- Import RRBot macro -->
-  <xacro:include filename="rrbot/rrbot.urdf.xacro" />
+  <xacro:include filename="rrbot/urdf/rrbot.urdf.xacro" />
   <!-- <xacro:include filename="$(find ros2_control_demo_robot)/description/rrbot/rrbot.urdf.xacro" /> -->
 
   <!-- Import all Gazebo-customization elements, including Gazebo colors -->
-  <xacro:include filename="rrbot/rrbot.gazebo.xacro" />
+  <xacro:include filename="rrbot/gazebo/rrbot.gazebo.xacro" />
   <!-- <xacro:include filename="$(find ros2_control_demo_robot)/description/rrbot/rrbot.gazebo.xacro" /> -->
 
   <!-- Import Rviz colors -->
-  <xacro:include filename="rrbot/rrbot.materials.xacro" />
+  <xacro:include filename="rrbot/gazebo/rrbot.materials.xacro" />
   <!-- <xacro:include filename="$(find ros2_control_demo_robot)/description/rrbot/rrbot.materials.xacro" /> -->
 
   <!-- Import RRBot ros2_control description -->