diff --git a/robot/hardware/CAD/stl/37d_arm.stl b/robot/hardware/CAD/stl/37d_arm.stl
deleted file mode 100644
index c24ba6f..0000000
Binary files a/robot/hardware/CAD/stl/37d_arm.stl and /dev/null differ
diff --git a/robot/hardware/CAD/stl/37d_motor_mount.stl b/robot/hardware/CAD/stl/37d_motor_mount.stl
deleted file mode 100644
index b086e5c..0000000
Binary files a/robot/hardware/CAD/stl/37d_motor_mount.stl and /dev/null differ
diff --git a/robot/hardware/CAD/stl/clamp_assembly/clamp.stl b/robot/hardware/clamp_assembly/clamp.stl
similarity index 100%
rename from robot/hardware/CAD/stl/clamp_assembly/clamp.stl
rename to robot/hardware/clamp_assembly/clamp.stl
diff --git a/robot/hardware/CAD/stl/clamp_assembly/m12_bolt_cap.stl b/robot/hardware/clamp_assembly/m12_bolt_cap.stl
similarity index 100%
rename from robot/hardware/CAD/stl/clamp_assembly/m12_bolt_cap.stl
rename to robot/hardware/clamp_assembly/m12_bolt_cap.stl
diff --git a/robot/hardware/CAD/stl/clamp_assembly/m12_bolt_knob.stl b/robot/hardware/clamp_assembly/m12_bolt_knob.stl
similarity index 100%
rename from robot/hardware/CAD/stl/clamp_assembly/m12_bolt_knob.stl
rename to robot/hardware/clamp_assembly/m12_bolt_knob.stl
diff --git a/robot/hardware/CAD/stl/clamp_assembly/spacer.stl b/robot/hardware/clamp_assembly/spacer.stl
similarity index 100%
rename from robot/hardware/CAD/stl/clamp_assembly/spacer.stl
rename to robot/hardware/clamp_assembly/spacer.stl
diff --git a/robot/hardware/CAD/stl/25d_arm.stl b/robot/hardware/v1/25d_arm.stl
similarity index 100%
rename from robot/hardware/CAD/stl/25d_arm.stl
rename to robot/hardware/v1/25d_arm.stl
diff --git a/robot/hardware/CAD/stl/25d_motor_mount.stl b/robot/hardware/v1/25d_motor_mount.stl
similarity index 100%
rename from robot/hardware/CAD/stl/25d_motor_mount.stl
rename to robot/hardware/v1/25d_motor_mount.stl
diff --git a/robot/hardware/CAD/stl/m10_weight.stl b/robot/hardware/v1/m10_weight.stl
similarity index 100%
rename from robot/hardware/CAD/stl/m10_weight.stl
rename to robot/hardware/v1/m10_weight.stl
diff --git a/robot/hardware/CAD/stl/pendulum_joint.stl b/robot/hardware/v1/pendulum_joint.stl
similarity index 100%
rename from robot/hardware/CAD/stl/pendulum_joint.stl
rename to robot/hardware/v1/pendulum_joint.stl
diff --git a/robot/hardware/CAD/stl/shaft_collar.stl b/robot/hardware/v1/shaft_collar.stl
similarity index 100%
rename from robot/hardware/CAD/stl/shaft_collar.stl
rename to robot/hardware/v1/shaft_collar.stl
diff --git a/robot/hardware/URDF/config.json b/robot/hardware/v2/config.json
similarity index 100%
rename from robot/hardware/URDF/config.json
rename to robot/hardware/v2/config.json
diff --git a/robot/hardware/CAD/furuta_v2.f3z b/robot/hardware/v2/furuta_v2.f3z
similarity index 100%
rename from robot/hardware/CAD/furuta_v2.f3z
rename to robot/hardware/v2/furuta_v2.f3z
diff --git a/robot/hardware/CAD/furuta_v2.step b/robot/hardware/v2/furuta_v2.step
similarity index 98%
rename from robot/hardware/CAD/furuta_v2.step
rename to robot/hardware/v2/furuta_v2.step
index faa2283..a6a9d12 100644
--- a/robot/hardware/CAD/furuta_v2.step
+++ b/robot/hardware/v2/furuta_v2.step
@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 /* Generated by software containing ST-Developer
- * from STEP Tools, Inc. (www.steptools.com) 
+ * from STEP Tools, Inc. (www.steptools.com)
  */
 
 FILE_DESCRIPTION(
diff --git a/robot/hardware/URDF/robot.urdf b/robot/hardware/v2/robot.urdf
similarity index 100%
rename from robot/hardware/URDF/robot.urdf
rename to robot/hardware/v2/robot.urdf
diff --git a/robot/hardware/URDF/STL/big_arm_v30.stl b/robot/hardware/v2/stl/37d_arm.stl
similarity index 100%
rename from robot/hardware/URDF/STL/big_arm_v30.stl
rename to robot/hardware/v2/stl/37d_arm.stl
diff --git a/robot/hardware/URDF/STL/motor_mount.stl b/robot/hardware/v2/stl/37d_motor_mount.stl
similarity index 100%
rename from robot/hardware/URDF/STL/motor_mount.stl
rename to robot/hardware/v2/stl/37d_motor_mount.stl
diff --git a/robot/hardware/URDF/STL/8x22x7_bearing.stl b/robot/hardware/v2/stl/8x22x7_bearing.stl
similarity index 100%
rename from robot/hardware/URDF/STL/8x22x7_bearing.stl
rename to robot/hardware/v2/stl/8x22x7_bearing.stl
diff --git a/robot/hardware/URDF/STL/amt-103-top-cover-rev-i.stl b/robot/hardware/v2/stl/amt-103-top-cover-rev-i.stl
similarity index 100%
rename from robot/hardware/URDF/STL/amt-103-top-cover-rev-i.stl
rename to robot/hardware/v2/stl/amt-103-top-cover-rev-i.stl
diff --git a/robot/hardware/URDF/STL/amt-x03-wide-base_rev_b.stl b/robot/hardware/v2/stl/amt-x03-wide-base_rev_b.stl
similarity index 100%
rename from robot/hardware/URDF/STL/amt-x03-wide-base_rev_b.stl
rename to robot/hardware/v2/stl/amt-x03-wide-base_rev_b.stl
diff --git a/robot/hardware/URDF/STL/m10_nut.stl b/robot/hardware/v2/stl/m10_nut.stl
similarity index 100%
rename from robot/hardware/URDF/STL/m10_nut.stl
rename to robot/hardware/v2/stl/m10_nut.stl
diff --git a/robot/hardware/URDF/STL/m10_weight.stl b/robot/hardware/v2/stl/m10_weight.stl
similarity index 100%
rename from robot/hardware/URDF/STL/m10_weight.stl
rename to robot/hardware/v2/stl/m10_weight.stl
diff --git a/robot/hardware/CAD/stl/m14_weight.stl b/robot/hardware/v2/stl/m14_weight.stl
similarity index 100%
rename from robot/hardware/CAD/stl/m14_weight.stl
rename to robot/hardware/v2/stl/m14_weight.stl
diff --git a/robot/hardware/URDF/STL/pendulum.stl b/robot/hardware/v2/stl/pendulum.stl
similarity index 100%
rename from robot/hardware/URDF/STL/pendulum.stl
rename to robot/hardware/v2/stl/pendulum.stl
diff --git a/robot/hardware/URDF/STL/shaft_collar.stl b/robot/hardware/v2/stl/shaft_collar.stl
similarity index 100%
rename from robot/hardware/URDF/STL/shaft_collar.stl
rename to robot/hardware/v2/stl/shaft_collar.stl