diff --git a/sitl_config/models_sitl/3d_gpu_lidar/3d_gpu_lidar.sdf b/sitl_config/models/3d_gpu_lidar/3d_gpu_lidar.sdf
similarity index 100%
rename from sitl_config/models_sitl/3d_gpu_lidar/3d_gpu_lidar.sdf
rename to sitl_config/models/3d_gpu_lidar/3d_gpu_lidar.sdf
diff --git a/sitl_config/models_sitl/3d_gpu_lidar/model.config b/sitl_config/models/3d_gpu_lidar/model.config
similarity index 100%
rename from sitl_config/models_sitl/3d_gpu_lidar/model.config
rename to sitl_config/models/3d_gpu_lidar/model.config
diff --git a/sitl_config/models_sitl/3d_lidar/3d_lidar.sdf b/sitl_config/models/3d_lidar/3d_lidar.sdf
similarity index 100%
rename from sitl_config/models_sitl/3d_lidar/3d_lidar.sdf
rename to sitl_config/models/3d_lidar/3d_lidar.sdf
diff --git a/sitl_config/models_sitl/3d_lidar/model.config b/sitl_config/models/3d_lidar/model.config
similarity index 100%
rename from sitl_config/models_sitl/3d_lidar/model.config
rename to sitl_config/models/3d_lidar/model.config
diff --git a/sitl_config/models_sitl/M100/M100.sdf b/sitl_config/models/M100/M100.sdf
similarity index 100%
rename from sitl_config/models_sitl/M100/M100.sdf
rename to sitl_config/models/M100/M100.sdf
diff --git a/sitl_config/models_sitl/M100/model.config b/sitl_config/models/M100/model.config
similarity index 100%
rename from sitl_config/models_sitl/M100/model.config
rename to sitl_config/models/M100/model.config
diff --git a/sitl_config/models_sitl/hokuyo_lidar/meshes/hokuyo.dae b/sitl_config/models/hokuyo_lidar/meshes/hokuyo.dae
similarity index 100%
rename from sitl_config/models_sitl/hokuyo_lidar/meshes/hokuyo.dae
rename to sitl_config/models/hokuyo_lidar/meshes/hokuyo.dae
diff --git a/sitl_config/models_sitl/hokuyo_lidar/meshes/hokuyo_convex.stl b/sitl_config/models/hokuyo_lidar/meshes/hokuyo_convex.stl
similarity index 100%
rename from sitl_config/models_sitl/hokuyo_lidar/meshes/hokuyo_convex.stl
rename to sitl_config/models/hokuyo_lidar/meshes/hokuyo_convex.stl
diff --git a/sitl_config/models_sitl/hokuyo_lidar/model.config b/sitl_config/models/hokuyo_lidar/model.config
similarity index 100%
rename from sitl_config/models_sitl/hokuyo_lidar/model.config
rename to sitl_config/models/hokuyo_lidar/model.config
diff --git a/sitl_config/models_sitl/hokuyo_lidar/model.sdf b/sitl_config/models/hokuyo_lidar/model.sdf
similarity index 100%
rename from sitl_config/models_sitl/hokuyo_lidar/model.sdf
rename to sitl_config/models/hokuyo_lidar/model.sdf
diff --git a/sitl_config/models_sitl/imu_gazebo/imu_gazebo.sdf b/sitl_config/models/imu_gazebo/imu_gazebo.sdf
similarity index 100%
rename from sitl_config/models_sitl/imu_gazebo/imu_gazebo.sdf
rename to sitl_config/models/imu_gazebo/imu_gazebo.sdf
diff --git a/sitl_config/models_sitl/imu_gazebo/model.config b/sitl_config/models/imu_gazebo/model.config
similarity index 100%
rename from sitl_config/models_sitl/imu_gazebo/model.config
rename to sitl_config/models/imu_gazebo/model.config
diff --git a/sitl_config/models_sitl/iris_2d_lidar/iris_2d_lidar.sdf b/sitl_config/models/iris_2d_lidar/iris_2d_lidar.sdf
similarity index 100%
rename from sitl_config/models_sitl/iris_2d_lidar/iris_2d_lidar.sdf
rename to sitl_config/models/iris_2d_lidar/iris_2d_lidar.sdf
diff --git a/sitl_config/models_sitl/iris_2d_lidar/model.config b/sitl_config/models/iris_2d_lidar/model.config
similarity index 100%
rename from sitl_config/models_sitl/iris_2d_lidar/model.config
rename to sitl_config/models/iris_2d_lidar/model.config
diff --git a/sitl_config/models_sitl/iris_3d_gpu_lidar/iris_3d_gpu_lidar.sdf b/sitl_config/models/iris_3d_gpu_lidar/iris_3d_gpu_lidar.sdf
similarity index 100%
rename from sitl_config/models_sitl/iris_3d_gpu_lidar/iris_3d_gpu_lidar.sdf
rename to sitl_config/models/iris_3d_gpu_lidar/iris_3d_gpu_lidar.sdf
diff --git a/sitl_config/models_sitl/iris_3d_gpu_lidar/model.config b/sitl_config/models/iris_3d_gpu_lidar/model.config
similarity index 100%
rename from sitl_config/models_sitl/iris_3d_gpu_lidar/model.config
rename to sitl_config/models/iris_3d_gpu_lidar/model.config
diff --git a/sitl_config/models_sitl/iris_3d_lidar/iris_3d_lidar.sdf b/sitl_config/models/iris_3d_lidar/iris_3d_lidar.sdf
similarity index 100%
rename from sitl_config/models_sitl/iris_3d_lidar/iris_3d_lidar.sdf
rename to sitl_config/models/iris_3d_lidar/iris_3d_lidar.sdf
diff --git a/sitl_config/models_sitl/iris_3d_lidar/model.config b/sitl_config/models/iris_3d_lidar/model.config
similarity index 100%
rename from sitl_config/models_sitl/iris_3d_lidar/model.config
rename to sitl_config/models/iris_3d_lidar/model.config
diff --git a/sitl_config/models_sitl/iris_arm/iris_arm.sdf b/sitl_config/models/iris_arm/iris_arm.sdf
similarity index 100%
rename from sitl_config/models_sitl/iris_arm/iris_arm.sdf
rename to sitl_config/models/iris_arm/iris_arm.sdf
diff --git a/sitl_config/models_sitl/iris_arm/model.config b/sitl_config/models/iris_arm/model.config
similarity index 100%
rename from sitl_config/models_sitl/iris_arm/model.config
rename to sitl_config/models/iris_arm/model.config
diff --git a/sitl_config/models_sitl/iris_depth/iris_vi_camera.sdf b/sitl_config/models/iris_depth/iris_vi_camera.sdf
similarity index 100%
rename from sitl_config/models_sitl/iris_depth/iris_vi_camera.sdf
rename to sitl_config/models/iris_depth/iris_vi_camera.sdf
diff --git a/sitl_config/models_sitl/iris_depth/model.config b/sitl_config/models/iris_depth/model.config
similarity index 100%
rename from sitl_config/models_sitl/iris_depth/model.config
rename to sitl_config/models/iris_depth/model.config
diff --git a/sitl_config/models_sitl/iris_downward_camera/iris_downward_camera.sdf b/sitl_config/models/iris_downward_camera/iris_downward_camera.sdf
similarity index 100%
rename from sitl_config/models_sitl/iris_downward_camera/iris_downward_camera.sdf
rename to sitl_config/models/iris_downward_camera/iris_downward_camera.sdf
diff --git a/sitl_config/models_sitl/iris_downward_camera/model.config b/sitl_config/models/iris_downward_camera/model.config
similarity index 100%
rename from sitl_config/models_sitl/iris_downward_camera/model.config
rename to sitl_config/models/iris_downward_camera/model.config
diff --git a/sitl_config/models_sitl/iris_gimbal/iris_gimbal.sdf b/sitl_config/models/iris_gimbal/iris_gimbal.sdf
similarity index 100%
rename from sitl_config/models_sitl/iris_gimbal/iris_gimbal.sdf
rename to sitl_config/models/iris_gimbal/iris_gimbal.sdf
diff --git a/sitl_config/models_sitl/iris_gimbal/model.config b/sitl_config/models/iris_gimbal/model.config
similarity index 100%
rename from sitl_config/models_sitl/iris_gimbal/model.config
rename to sitl_config/models/iris_gimbal/model.config
diff --git a/sitl_config/models_sitl/iris_kinect/iris_kinect.sdf b/sitl_config/models/iris_kinect/iris_kinect.sdf
similarity index 100%
rename from sitl_config/models_sitl/iris_kinect/iris_kinect.sdf
rename to sitl_config/models/iris_kinect/iris_kinect.sdf
diff --git a/sitl_config/models_sitl/iris_kinect/model.config b/sitl_config/models/iris_kinect/model.config
similarity index 100%
rename from sitl_config/models_sitl/iris_kinect/model.config
rename to sitl_config/models/iris_kinect/model.config
diff --git a/sitl_config/models_sitl/iris_realsense/iris_realsense.sdf b/sitl_config/models/iris_realsense/iris_realsense.sdf
similarity index 100%
rename from sitl_config/models_sitl/iris_realsense/iris_realsense.sdf
rename to sitl_config/models/iris_realsense/iris_realsense.sdf
diff --git a/sitl_config/models_sitl/iris_realsense/model.config b/sitl_config/models/iris_realsense/model.config
similarity index 100%
rename from sitl_config/models_sitl/iris_realsense/model.config
rename to sitl_config/models/iris_realsense/model.config
diff --git a/sitl_config/models_sitl/iris_stereo_camera/iris_stereo_camera.sdf b/sitl_config/models/iris_stereo_camera/iris_stereo_camera.sdf
similarity index 100%
rename from sitl_config/models_sitl/iris_stereo_camera/iris_stereo_camera.sdf
rename to sitl_config/models/iris_stereo_camera/iris_stereo_camera.sdf
diff --git a/sitl_config/models_sitl/iris_stereo_camera/model.config b/sitl_config/models/iris_stereo_camera/model.config
similarity index 100%
rename from sitl_config/models_sitl/iris_stereo_camera/model.config
rename to sitl_config/models/iris_stereo_camera/model.config
diff --git a/sitl_config/models_sitl/kinect/kinect.sdf b/sitl_config/models/kinect/kinect.sdf
similarity index 100%
rename from sitl_config/models_sitl/kinect/kinect.sdf
rename to sitl_config/models/kinect/kinect.sdf
diff --git a/sitl_config/models_sitl/kinect/materials/textures/kinect.png b/sitl_config/models/kinect/materials/textures/kinect.png
similarity index 100%
rename from sitl_config/models_sitl/kinect/materials/textures/kinect.png
rename to sitl_config/models/kinect/materials/textures/kinect.png
diff --git a/sitl_config/models_sitl/kinect/meshes/kinect.dae b/sitl_config/models/kinect/meshes/kinect.dae
similarity index 100%
rename from sitl_config/models_sitl/kinect/meshes/kinect.dae
rename to sitl_config/models/kinect/meshes/kinect.dae
diff --git a/sitl_config/models_sitl/kinect/model.config b/sitl_config/models/kinect/model.config
similarity index 100%
rename from sitl_config/models_sitl/kinect/model.config
rename to sitl_config/models/kinect/model.config
diff --git a/sitl_config/models_sitl/monocular_camera/model.config b/sitl_config/models/monocular_camera/model.config
similarity index 100%
rename from sitl_config/models_sitl/monocular_camera/model.config
rename to sitl_config/models/monocular_camera/model.config
diff --git a/sitl_config/models_sitl/monocular_camera/monocular_camera.sdf b/sitl_config/models/monocular_camera/monocular_camera.sdf
similarity index 100%
rename from sitl_config/models_sitl/monocular_camera/monocular_camera.sdf
rename to sitl_config/models/monocular_camera/monocular_camera.sdf
diff --git a/sitl_config/models_sitl/rover_with_lidar_stereo/model.config b/sitl_config/models/rover_with_lidar_stereo/model.config
similarity index 100%
rename from sitl_config/models_sitl/rover_with_lidar_stereo/model.config
rename to sitl_config/models/rover_with_lidar_stereo/model.config
diff --git a/sitl_config/models_sitl/rover_with_lidar_stereo/rover_with_lidar_stereo.sdf b/sitl_config/models/rover_with_lidar_stereo/rover_with_lidar_stereo.sdf
similarity index 100%
rename from sitl_config/models_sitl/rover_with_lidar_stereo/rover_with_lidar_stereo.sdf
rename to sitl_config/models/rover_with_lidar_stereo/rover_with_lidar_stereo.sdf
diff --git a/sitl_config/models_sitl/solo_arm/meshes/solo.stl b/sitl_config/models/solo_arm/meshes/solo.stl
similarity index 100%
rename from sitl_config/models_sitl/solo_arm/meshes/solo.stl
rename to sitl_config/models/solo_arm/meshes/solo.stl
diff --git a/sitl_config/models_sitl/solo_arm/meshes/solo_prop_ccw.stl b/sitl_config/models/solo_arm/meshes/solo_prop_ccw.stl
similarity index 100%
rename from sitl_config/models_sitl/solo_arm/meshes/solo_prop_ccw.stl
rename to sitl_config/models/solo_arm/meshes/solo_prop_ccw.stl
diff --git a/sitl_config/models_sitl/solo_arm/meshes/solo_prop_cw.stl b/sitl_config/models/solo_arm/meshes/solo_prop_cw.stl
similarity index 100%
rename from sitl_config/models_sitl/solo_arm/meshes/solo_prop_cw.stl
rename to sitl_config/models/solo_arm/meshes/solo_prop_cw.stl
diff --git a/sitl_config/models_sitl/solo_arm/model.config b/sitl_config/models/solo_arm/model.config
similarity index 100%
rename from sitl_config/models_sitl/solo_arm/model.config
rename to sitl_config/models/solo_arm/model.config
diff --git a/sitl_config/models_sitl/solo_arm/solo.sdf b/sitl_config/models/solo_arm/solo.sdf
similarity index 100%
rename from sitl_config/models_sitl/solo_arm/solo.sdf
rename to sitl_config/models/solo_arm/solo.sdf
diff --git a/sitl_config/models_sitl/solo_gimbal/model.config b/sitl_config/models/solo_gimbal/model.config
similarity index 100%
rename from sitl_config/models_sitl/solo_gimbal/model.config
rename to sitl_config/models/solo_gimbal/model.config
diff --git a/sitl_config/models_sitl/solo_gimbal/solo_gimbal.sdf b/sitl_config/models/solo_gimbal/solo_gimbal.sdf
similarity index 100%
rename from sitl_config/models_sitl/solo_gimbal/solo_gimbal.sdf
rename to sitl_config/models/solo_gimbal/solo_gimbal.sdf
diff --git a/sitl_config/models_sitl/solo_stereo_camera/model.config b/sitl_config/models/solo_stereo_camera/model.config
similarity index 100%
rename from sitl_config/models_sitl/solo_stereo_camera/model.config
rename to sitl_config/models/solo_stereo_camera/model.config
diff --git a/sitl_config/models_sitl/solo_stereo_camera/solo_stereo_camera.sdf b/sitl_config/models/solo_stereo_camera/solo_stereo_camera.sdf
similarity index 100%
rename from sitl_config/models_sitl/solo_stereo_camera/solo_stereo_camera.sdf
rename to sitl_config/models/solo_stereo_camera/solo_stereo_camera.sdf
diff --git a/sitl_config/models_sitl/sonar/model.config b/sitl_config/models/sonar/model.config
similarity index 100%
rename from sitl_config/models_sitl/sonar/model.config
rename to sitl_config/models/sonar/model.config
diff --git a/sitl_config/models_sitl/sonar/model.sdf b/sitl_config/models/sonar/model.sdf
similarity index 100%
rename from sitl_config/models_sitl/sonar/model.sdf
rename to sitl_config/models/sonar/model.sdf
diff --git a/sitl_config/models_sitl/stereo_camera/model.config b/sitl_config/models/stereo_camera/model.config
similarity index 100%
rename from sitl_config/models_sitl/stereo_camera/model.config
rename to sitl_config/models/stereo_camera/model.config
diff --git a/sitl_config/models_sitl/stereo_camera/model.sdf b/sitl_config/models/stereo_camera/model.sdf
similarity index 100%
rename from sitl_config/models_sitl/stereo_camera/model.sdf
rename to sitl_config/models/stereo_camera/model.sdf
diff --git a/sitl_config/models_sitl/typhoon_h480/meshes/cgo3_camera_remeshed_v1.stl b/sitl_config/models/typhoon_h480/meshes/cgo3_camera_remeshed_v1.stl
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480/meshes/cgo3_camera_remeshed_v1.stl
rename to sitl_config/models/typhoon_h480/meshes/cgo3_camera_remeshed_v1.stl
diff --git a/sitl_config/models_sitl/typhoon_h480/meshes/cgo3_horizontal_arm_remeshed_v1.stl b/sitl_config/models/typhoon_h480/meshes/cgo3_horizontal_arm_remeshed_v1.stl
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480/meshes/cgo3_horizontal_arm_remeshed_v1.stl
rename to sitl_config/models/typhoon_h480/meshes/cgo3_horizontal_arm_remeshed_v1.stl
diff --git a/sitl_config/models_sitl/typhoon_h480/meshes/cgo3_mount_remeshed_v1.stl b/sitl_config/models/typhoon_h480/meshes/cgo3_mount_remeshed_v1.stl
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480/meshes/cgo3_mount_remeshed_v1.stl
rename to sitl_config/models/typhoon_h480/meshes/cgo3_mount_remeshed_v1.stl
diff --git a/sitl_config/models_sitl/typhoon_h480/meshes/cgo3_vertical_arm_remeshed_v1.stl b/sitl_config/models/typhoon_h480/meshes/cgo3_vertical_arm_remeshed_v1.stl
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480/meshes/cgo3_vertical_arm_remeshed_v1.stl
rename to sitl_config/models/typhoon_h480/meshes/cgo3_vertical_arm_remeshed_v1.stl
diff --git a/sitl_config/models_sitl/typhoon_h480/meshes/leg1_remeshed_v3.stl b/sitl_config/models/typhoon_h480/meshes/leg1_remeshed_v3.stl
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480/meshes/leg1_remeshed_v3.stl
rename to sitl_config/models/typhoon_h480/meshes/leg1_remeshed_v3.stl
diff --git a/sitl_config/models_sitl/typhoon_h480/meshes/leg2_remeshed_v3.stl b/sitl_config/models/typhoon_h480/meshes/leg2_remeshed_v3.stl
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480/meshes/leg2_remeshed_v3.stl
rename to sitl_config/models/typhoon_h480/meshes/leg2_remeshed_v3.stl
diff --git a/sitl_config/models_sitl/typhoon_h480/meshes/main_body_remeshed_v3.stl b/sitl_config/models/typhoon_h480/meshes/main_body_remeshed_v3.stl
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480/meshes/main_body_remeshed_v3.stl
rename to sitl_config/models/typhoon_h480/meshes/main_body_remeshed_v3.stl
diff --git a/sitl_config/models_sitl/typhoon_h480/meshes/prop_ccw_assembly_remeshed_v3.stl b/sitl_config/models/typhoon_h480/meshes/prop_ccw_assembly_remeshed_v3.stl
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480/meshes/prop_ccw_assembly_remeshed_v3.stl
rename to sitl_config/models/typhoon_h480/meshes/prop_ccw_assembly_remeshed_v3.stl
diff --git a/sitl_config/models_sitl/typhoon_h480/meshes/prop_cw_assembly_remeshed_v3.stl b/sitl_config/models/typhoon_h480/meshes/prop_cw_assembly_remeshed_v3.stl
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480/meshes/prop_cw_assembly_remeshed_v3.stl
rename to sitl_config/models/typhoon_h480/meshes/prop_cw_assembly_remeshed_v3.stl
diff --git a/sitl_config/models_sitl/typhoon_h480/meshes/prop_guard_jybhz.stl b/sitl_config/models/typhoon_h480/meshes/prop_guard_jybhz.stl
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480/meshes/prop_guard_jybhz.stl
rename to sitl_config/models/typhoon_h480/meshes/prop_guard_jybhz.stl
diff --git a/sitl_config/models_sitl/typhoon_h480/model.config b/sitl_config/models/typhoon_h480/model.config
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480/model.config
rename to sitl_config/models/typhoon_h480/model.config
diff --git a/sitl_config/models_sitl/typhoon_h480/typhoon_h480.sdf b/sitl_config/models/typhoon_h480/typhoon_h480.sdf
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480/typhoon_h480.sdf
rename to sitl_config/models/typhoon_h480/typhoon_h480.sdf
diff --git a/sitl_config/models_sitl/typhoon_h480_2d_lidar/model.config b/sitl_config/models/typhoon_h480_2d_lidar/model.config
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480_2d_lidar/model.config
rename to sitl_config/models/typhoon_h480_2d_lidar/model.config
diff --git a/sitl_config/models_sitl/typhoon_h480_2d_lidar/typhoon_h480_2d_lidar.sdf b/sitl_config/models/typhoon_h480_2d_lidar/typhoon_h480_2d_lidar.sdf
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480_2d_lidar/typhoon_h480_2d_lidar.sdf
rename to sitl_config/models/typhoon_h480_2d_lidar/typhoon_h480_2d_lidar.sdf
diff --git a/sitl_config/models_sitl/typhoon_h480_stereo/model.config b/sitl_config/models/typhoon_h480_stereo/model.config
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480_stereo/model.config
rename to sitl_config/models/typhoon_h480_stereo/model.config
diff --git a/sitl_config/models_sitl/typhoon_h480_stereo/typhoon_h480_stereo.sdf b/sitl_config/models/typhoon_h480_stereo/typhoon_h480_stereo.sdf
similarity index 100%
rename from sitl_config/models_sitl/typhoon_h480_stereo/typhoon_h480_stereo.sdf
rename to sitl_config/models/typhoon_h480_stereo/typhoon_h480_stereo.sdf
diff --git a/sitl_config/models_sitl/vi_camera/materials/textures/realsense_diffuse.png b/sitl_config/models/vi_camera/materials/textures/realsense_diffuse.png
similarity index 100%
rename from sitl_config/models_sitl/vi_camera/materials/textures/realsense_diffuse.png
rename to sitl_config/models/vi_camera/materials/textures/realsense_diffuse.png
diff --git a/sitl_config/models_sitl/vi_camera/meshes/realsense.dae b/sitl_config/models/vi_camera/meshes/realsense.dae
similarity index 100%
rename from sitl_config/models_sitl/vi_camera/meshes/realsense.dae
rename to sitl_config/models/vi_camera/meshes/realsense.dae
diff --git a/sitl_config/models_sitl/vi_camera/model.config b/sitl_config/models/vi_camera/model.config
similarity index 100%
rename from sitl_config/models_sitl/vi_camera/model.config
rename to sitl_config/models/vi_camera/model.config
diff --git a/sitl_config/models_sitl/vi_camera/vi_camera.sdf b/sitl_config/models/vi_camera/vi_camera.sdf
similarity index 100%
rename from sitl_config/models_sitl/vi_camera/vi_camera.sdf
rename to sitl_config/models/vi_camera/vi_camera.sdf
diff --git a/sitl_config/models_sitl/walker/casual_female.dae b/sitl_config/models/walker/casual_female.dae
similarity index 100%
rename from sitl_config/models_sitl/walker/casual_female.dae
rename to sitl_config/models/walker/casual_female.dae
diff --git a/sitl_config/models_sitl/walker/color.txt b/sitl_config/models/walker/color.txt
similarity index 100%
rename from sitl_config/models_sitl/walker/color.txt
rename to sitl_config/models/walker/color.txt
diff --git a/sitl_config/models_sitl/walker/model.config b/sitl_config/models/walker/model.config
similarity index 100%
rename from sitl_config/models_sitl/walker/model.config
rename to sitl_config/models/walker/model.config
diff --git a/sitl_config/models_sitl/walker/walk_0.dae b/sitl_config/models/walker/walk_0.dae
similarity index 100%
rename from sitl_config/models_sitl/walker/walk_0.dae
rename to sitl_config/models/walker/walk_0.dae
diff --git a/sitl_config/models_sitl/walker/walk_1.dae b/sitl_config/models/walker/walk_1.dae
similarity index 100%
rename from sitl_config/models_sitl/walker/walk_1.dae
rename to sitl_config/models/walker/walk_1.dae
diff --git a/sitl_config/models_sitl/walker/walk_2.dae b/sitl_config/models/walker/walk_2.dae
similarity index 100%
rename from sitl_config/models_sitl/walker/walk_2.dae
rename to sitl_config/models/walker/walk_2.dae
diff --git a/sitl_config/models_sitl/walker/walk_3.dae b/sitl_config/models/walker/walk_3.dae
similarity index 100%
rename from sitl_config/models_sitl/walker/walk_3.dae
rename to sitl_config/models/walker/walk_3.dae
diff --git a/sitl_config/models_sitl/walker/walk_4.dae b/sitl_config/models/walker/walk_4.dae
similarity index 100%
rename from sitl_config/models_sitl/walker/walk_4.dae
rename to sitl_config/models/walker/walk_4.dae
diff --git a/sitl_config/models_sitl/walker/walk_5.dae b/sitl_config/models/walker/walk_5.dae
similarity index 100%
rename from sitl_config/models_sitl/walker/walk_5.dae
rename to sitl_config/models/walker/walk_5.dae