reorganize 3d models

2022-10-29 21:25:03 -06:00 · 2022-10-29 21:25:03 -06:00 · 437c4ed966
commit 437c4ed966
parent b72b19d555
393 changed files with 134 additions and 134 deletions
--- a/common.pretty/Amphenol_12401832E402A.kicad_mod
+++ b/common.pretty/Amphenol_12401832E402A.kicad_mod
@ -53,7 +53,7 @@
  (pad "B10" smd roundrect (at -2 1.04) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15) (tstamp 10d13852-a6d1-4a1a-bd1d-ca2a0507d1d1))
  (pad "B11" smd roundrect (at -2.5 1.04) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15) (tstamp c105b6a2-debf-4c59-884c-9a65509f962b))
  (pad "B12" smd roundrect (at -3 1.04) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15) (tstamp fb51028a-1a6b-4db7-a51d-31589a28c02e))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Amphenol_12401832E402A.step"
+  (model "step/Amphenol_12401832E402A.step"
    (offset (xyz 0 -9.6 1.5))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 90))
--- a/common.pretty/C0402.kicad_mod
+++ b/common.pretty/C0402.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start -0.51 0.26) (end 0.51 0.26) (layer "F.Fab") (width 0.127) (tstamp 81d231b7-0194-4d7c-8b00-1c7c08ea4a25))
  (pad "1" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 518cf349-2508-4345-83d0-77dbaf0298af))
  (pad "2" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b772a42d-7d91-4e96-9b3b-738f1ace5f2b))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/C0402.step"
+  (model "step/C0402.step"
    (offset (xyz 0 0 0.2539999962))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/C0402_NOSILK.kicad_mod
+++ b/common.pretty/C0402_NOSILK.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start 0.51 -0.26) (end 0.51 0.26) (layer "F.Fab") (width 0.127) (tstamp e307dc91-7aa8-42b2-b4a6-d4760bbfc0de))
  (pad "1" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 6bd726b6-475a-4c1e-a27b-c799f8a18814))
  (pad "2" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 40d40f27-654d-4705-b46e-13cc97dba4fa))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/C0402.step"
+  (model "step/C0402.step"
    (offset (xyz 0 0 0.2539999962))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/C0603.kicad_mod
+++ b/common.pretty/C0603.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start -0.85 -0.45) (end 0.85 -0.45) (layer "F.Fab") (width 0.127) (tstamp e6779a46-cae4-40a6-88c0-5eb7723de3d0))
  (pad "1" smd rect (at -0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ea3d1910-ba90-4193-8bcb-e759bd6a143b))
  (pad "2" smd rect (at 0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ed2c1cee-018a-4d5c-8c70-0267306f1023))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/C0603.step"
+  (model "step/C0603.step"
    (offset (xyz 0 0 0.3809999943))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/C0805.kicad_mod
+++ b/common.pretty/C0805.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start -1 0.625) (end 1 0.625) (layer "F.Fab") (width 0.127) (tstamp dc58328a-ba7d-42e8-9f91-0fe369bd8c98))
  (pad "1" smd rect (at -0.875 0) (size 1.1 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 4bae7519-0d9f-4751-b8c3-0cdeb7ce85ad))
  (pad "2" smd rect (at 0.875 0) (size 1.1 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp dfb0fa00-f2f0-447e-a27c-1978f4540796))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/C0805.step"
+  (model "step/C0805.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/C1206.kicad_mod
+++ b/common.pretty/C1206.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start -1.524 -0.762) (end -1.524 0.762) (layer "F.Fab") (width 0.127) (tstamp ac725cc8-a89d-4d54-a8a1-fb14c5e105c0))
  (pad "1" smd rect (at -1.4478 0) (size 0.889 1.6002) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b787552f-93de-4bac-b94d-b6fedc5b64f2))
  (pad "2" smd rect (at 1.4478 0 180) (size 0.889 1.6002) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 43d8339c-a9a8-4fad-8645-85ee799734e2))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/C1206.step"
+  (model "step/C1206.step"
    (offset (xyz 0 0 0.8636))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/C1210.kicad_mod
+++ b/common.pretty/C1210.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start -1.524 -1.27) (end 1.524 -1.27) (layer "F.Fab") (width 0.127) (tstamp f6a2ab07-bc30-48cf-8b00-2d4c6bc8b88f))
  (pad "1" smd rect (at -1.397 0) (size 1.651 2.794) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp a44e2f8a-cb1c-4e92-a1a2-27607afdecde))
  (pad "2" smd rect (at 1.397 0 180) (size 1.651 2.794) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp bf7a22dd-4a0f-4670-8ef4-c78f050ad406))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/C1210.step"
+  (model "step/C1210.step"
    (offset (xyz 0 0 0.4064))
    (scale (xyz 1 1 1))
    (rotate (xyz 90 0 0))
--- a/common.pretty/CK_1101M2S3CQE2.kicad_mod
+++ b/common.pretty/CK_1101M2S3CQE2.kicad_mod
@ -43,7 +43,7 @@
  (pad "1" thru_hole circle (at 0 -4.699) (size 3.302 3.302) (drill 1.8542) (layers *.Cu *.Mask) (tstamp 3c31662f-1953-4aec-b370-ae0694154760))
  (pad "2" thru_hole circle (at 0 0) (size 3.302 3.302) (drill 1.8542) (layers *.Cu *.Mask) (tstamp cea26aaa-4642-4646-95f8-82b3df42d58a))
  (pad "3" thru_hole circle (at 0 4.699) (size 3.302 3.302) (drill 1.8542) (layers *.Cu *.Mask) (tstamp b71cd586-da5c-43f3-b13f-70d35d3f9d2b))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/CK_1101M2S3CQE2.step"
+  (model "step/CK_1101M2S3CQE2.step"
    (offset (xyz 0 0 2.032))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 -90))
--- a/common.pretty/CK_T101MH9AQE.kicad_mod
+++ b/common.pretty/CK_T101MH9AQE.kicad_mod
@ -34,7 +34,7 @@
  (pad "1" thru_hole circle (at -2.54 5.08) (size 2 2) (drill 1.09) (layers *.Cu *.Mask) (tstamp d34aefeb-782c-4bcd-9e96-926a7deb1cfd))
  (pad "2" thru_hole circle (at 0 5.08) (size 2 2) (drill 1.09) (layers *.Cu *.Mask) (tstamp c472c258-ff91-4b2d-83de-32da048d4a68))
  (pad "3" thru_hole circle (at 2.54 5.08) (size 2 2) (drill 1.09) (layers *.Cu *.Mask) (tstamp fbac3085-f86d-47c3-964e-634abd39b5aa))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/CK_T101MH9AQE.step"
+  (model "step/CK_T101MH9AQE.step"
    (offset (xyz 0 -2.286 3.048))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 180 0))
--- a/common.pretty/CONN_SuperSMA_Amphenol_901-10510-2.kicad_mod
+++ b/common.pretty/CONN_SuperSMA_Amphenol_901-10510-2.kicad_mod
@ -32,7 +32,7 @@
  (pad "0" thru_hole rect (at -1.2192 1.7526) (size 1.27 1.27) (drill 1.143) (layers *.Cu *.Mask) (tstamp eef9f349-602d-4c47-b294-96e24f59c6a2))
  (pad "0" thru_hole rect (at -4.7625 2.794) (size 3.81 5.842) (drill 1.9812) (layers *.Cu *.Mask) (tstamp fa71cc52-3a00-4d52-9460-3e6ae030d8d9))
  (pad "1" smd rect (at 0 0.635) (size 0.254 1.524) (layers "F.Cu" "F.Mask") (tstamp 8b2267dc-4c85-4d03-bbc4-1ea3f80ad33d))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Southwest_SuperSMA.step"
+  (model "step/Southwest_SuperSMA.step"
    (offset (xyz 0 4.2291 0.127))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 180))
--- a/common.pretty/Coilcraft_0402HP.kicad_mod
+++ b/common.pretty/Coilcraft_0402HP.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start 0.5461 0.3556) (end 0.5461 -0.3556) (layer "F.Fab") (width 0.127) (tstamp ca76e289-8cbb-47d7-9df4-9e17c51bf57d))
  (pad "1" smd rect (at -0.4318 0) (size 0.3556 0.6604) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 04ea17fd-0308-4bd3-b107-293624c2290b))
  (pad "2" smd rect (at 0.4318 0) (size 0.3556 0.6604) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1cf8d131-b0f7-4575-b69e-503e16d6bc4b))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_0402HP.step"
+  (model "step/Coilcraft_0402HP.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 90))
--- a/common.pretty/Coilcraft_ETH1-460L.kicad_mod
+++ b/common.pretty/Coilcraft_ETH1-460L.kicad_mod
@ -56,7 +56,7 @@
  (pad "22" smd rect (at 7.7597 -4.445) (size 1.778 0.4064) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 66a81dfb-5753-41e8-b6e7-19abe0df468b))
  (pad "23" smd rect (at 7.7597 -5.715) (size 1.778 0.4064) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 095cf05d-f59b-42dd-b662-f22bca498f51))
  (pad "24" smd rect (at 7.7597 -6.985) (size 1.778 0.4064) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c30b123d-c211-422e-baad-0ef95ca4a209))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_ETH1-460L.step"
+  (model "step/Coilcraft_ETH1-460L.step"
    (offset (xyz 0 0 0.254))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 180))
--- a/common.pretty/Coilcraft_LPD5030.kicad_mod
+++ b/common.pretty/Coilcraft_LPD5030.kicad_mod
@ -97,7 +97,7 @@
        (xy 0 0.6096)
      ) (width 0) (fill yes))
    ) (tstamp ddd5d306-17c4-4d55-ac2b-6b4f773b7521))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_LPD5030.step"
+  (model "step/Coilcraft_LPD5030.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 90))
--- a/common.pretty/Coilcraft_LPS3015.kicad_mod
+++ b/common.pretty/Coilcraft_LPS3015.kicad_mod
@ -60,7 +60,7 @@
        (xy -0.381 1.27)
      ) (width 0) (fill yes))
    ) (tstamp 90685c2b-dfb9-4b8e-84b4-c3c2ac16e985))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_LPS3015.step"
+  (model "step/Coilcraft_LPS3015.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Coilcraft_LPS5030.kicad_mod
+++ b/common.pretty/Coilcraft_LPS5030.kicad_mod
@ -60,7 +60,7 @@
        (xy -0.52705 1.7018)
      ) (width 0) (fill yes))
    ) (tstamp 3c8333ee-5d38-4a14-a0c6-11bad246bd27))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_LPS5030.step"
+  (model "step/Coilcraft_LPS5030.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Coilcraft_LPS8045.kicad_mod
+++ b/common.pretty/Coilcraft_LPS8045.kicad_mod
@ -28,7 +28,7 @@
  (fp_line (start 3.302 4.0005) (end -3.302 4.0005) (layer "F.Fab") (width 0.127) (tstamp 8fd3e1fd-72f8-4954-b8b1-66cf8522289f))
  (pad "1" smd rect (at -2.6035 0 180) (size 3.4036 8.6106) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 76d4a675-aa44-40b4-99b5-fa6ca3dcca5a))
  (pad "2" smd rect (at 2.6035 0) (size 3.4036 8.6106) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp d3258bbc-32b9-4c13-ae65-8aa5dbe3aa9d))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_LPS8045B.step"
+  (model "step/Coilcraft_LPS8045B.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Coilcraft_XEL3515.kicad_mod
+++ b/common.pretty/Coilcraft_XEL3515.kicad_mod
@ -19,7 +19,7 @@
  (fp_rect (start -1.6002 -1.7526) (end 1.6002 1.7526) (layer "F.Fab") (width 0.127) (fill none) (tstamp 36d034b6-aa40-4fa1-a9e1-167c7929521a))
  (pad "1" smd rect (at -0.9017 0) (size 0.8128 3.2004) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 2eaa7dca-b4c0-421b-813b-9896cfa8d932))
  (pad "2" smd rect (at 0.9017 0) (size 0.8128 3.2004) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp e2dd7f64-f78f-481f-ab7a-c4c007ec5a58))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_XEL3515.step"
+  (model "step/Coilcraft_XEL3515.step"
    (offset (xyz 0 0 0.0254))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Coilcraft_XEL3520.kicad_mod
+++ b/common.pretty/Coilcraft_XEL3520.kicad_mod
@ -19,7 +19,7 @@
  (fp_rect (start -1.6002 -1.7526) (end 1.6002 1.7526) (layer "F.Fab") (width 0.127) (fill none) (tstamp 4e38c81b-e4e6-4539-aa6b-1d3f8902709b))
  (pad "1" smd rect (at -0.9017 0) (size 0.8128 3.2004) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 3077c384-967b-4120-acd5-0cb158a9bbab))
  (pad "2" smd rect (at 0.9017 0) (size 0.8128 3.2004) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ef35c798-0742-4778-99f0-1fe909e5a689))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_XEL3520.step"
+  (model "step/Coilcraft_XEL3520.step"
    (offset (xyz 0 0 0.0508))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Coilcraft_XEL3530.kicad_mod
+++ b/common.pretty/Coilcraft_XEL3530.kicad_mod
@ -19,7 +19,7 @@
  (fp_rect (start -1.6002 -1.7526) (end 1.6002 1.7526) (layer "F.Fab") (width 0.127) (fill none) (tstamp 36d034b6-aa40-4fa1-a9e1-167c7929521a))
  (pad "1" smd rect (at -0.9017 0) (size 0.8128 3.2004) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 2eaa7dca-b4c0-421b-813b-9896cfa8d932))
  (pad "2" smd rect (at 0.9017 0) (size 0.8128 3.2004) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp e2dd7f64-f78f-481f-ab7a-c4c007ec5a58))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_XEL3530.step"
+  (model "step/Coilcraft_XEL3530.step"
    (offset (xyz 0 0 0.0254))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Coilcraft_XEL5050_510.kicad_mod
+++ b/common.pretty/Coilcraft_XEL5050_510.kicad_mod
@ -19,7 +19,7 @@
  (fp_rect (start -2.7432 -2.7432) (end 2.7432 2.7432) (layer "F.Fab") (width 0.127) (fill none) (tstamp 61f8f454-8fb3-4f4d-ad9e-c50bf3f909b8))
  (pad "1" smd rect (at -1.651 0) (size 1.1684 4.699) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp d5cfd21e-e123-40dd-8d7c-b5fd883ae51c))
  (pad "2" smd rect (at 1.651 0) (size 1.1684 4.699) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 19f4f8bf-8b83-46bd-b42d-3d68404ca984))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_XEL5050_510.step"
+  (model "step/Coilcraft_XEL5050_510.step"
    (offset (xyz 0 0 0.0508))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Coilcraft_XEL5050_520.kicad_mod
+++ b/common.pretty/Coilcraft_XEL5050_520.kicad_mod
@ -19,7 +19,7 @@
  (fp_rect (start -2.7432 -2.7432) (end 2.7432 2.7432) (layer "F.Fab") (width 0.127) (fill none) (tstamp 1c4c83ca-84a0-4224-8ade-e884beed1ef0))
  (pad "1" smd rect (at -1.651 0) (size 1.1684 4.699) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c20f5a3f-fbcd-4ce9-b378-2b15c6e46a8a))
  (pad "2" smd rect (at 1.651 0) (size 1.1684 4.699) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ef0a5636-43e1-4479-ba4d-c3842ce618da))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_XEL5050_520.step"
+  (model "step/Coilcraft_XEL5050_520.step"
    (offset (xyz 0 0 0.0508))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Coilcraft_XEL5050_530.kicad_mod
+++ b/common.pretty/Coilcraft_XEL5050_530.kicad_mod
@ -19,7 +19,7 @@
  (fp_rect (start -2.7432 -2.7432) (end 2.7432 2.7432) (layer "F.Fab") (width 0.127) (fill none) (tstamp a0ba0d99-63f8-4988-88d8-bd7ac2ce3831))
  (pad "1" smd rect (at -1.651 0) (size 1.1684 4.699) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c8178636-ec90-4ac7-b9c0-715db5fc0aba))
  (pad "2" smd rect (at 1.651 0) (size 1.1684 4.699) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 18d85cc0-19df-4a9c-a308-bb488346361a))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_XEL5050_520.step"
+  (model "step/Coilcraft_XEL5050_520.step"
    (offset (xyz 0 0 0.0508))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Coilcraft_XEL6060.kicad_mod
+++ b/common.pretty/Coilcraft_XEL6060.kicad_mod
@ -18,7 +18,7 @@
  (fp_rect (start -3.175 -3.2766) (end 3.175 3.2766) (layer "F.Fab") (width 0.127) (fill none) (tstamp b6f41d5c-9516-472c-8bef-1ee663997f61))
  (pad "1" smd rect (at -2.0193 0) (size 1.4224 5.4864) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1dc79ca2-7f37-45f7-9bfb-37807a37a96e))
  (pad "2" smd rect (at 2.0193 0) (size 1.4224 5.4864) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 07915963-9c45-4ea9-b271-a8473dd807ac))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Coilcraft_XEL6060.step"
+  (model "step/Coilcraft_XEL6060.step"
    (offset (xyz 0 0 0.0254))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Conn_FFC_Molex_5051102291.kicad_mod
+++ b/common.pretty/Conn_FFC_Molex_5051102291.kicad_mod
@ -72,7 +72,7 @@
    (solder_mask_margin 0.0508) (tstamp b92305c6-ef9d-4346-a58a-50eb87c5faaf))
  (pad "22" smd rect (at -5.25 2.05 180) (size 0.3 1) (layers "F.Cu" "F.Paste" "F.Mask")
    (solder_mask_margin 0.0508) (tstamp e67953d7-1a3b-4ca8-9340-bb9e9856721b))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Molex_5051102291.step"
+  (model "step/Molex_5051102291.step"
    (offset (xyz 0 -0.889 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 180))
--- a/common.pretty/Conn_MicroMateNLok_2-1445088-2.kicad_mod
+++ b/common.pretty/Conn_MicroMateNLok_2-1445088-2.kicad_mod
@ -22,7 +22,7 @@
  (pad "0" thru_hole circle (at -3.6463 0) (size 3.81 3.81) (drill 2.413) (layers *.Cu *.Mask) (tstamp 8fdf18e8-fe7b-42f1-96d5-c918ab6988a4))
  (pad "1" thru_hole circle (at -1.5 -4.318) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask) (tstamp 90378aaa-499e-425c-85fc-aa015160c512))
  (pad "1" thru_hole circle (at 1.5 -4.318) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask) (tstamp eb75b49c-50bf-4653-b93b-f3b837f1a1de))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/TE_2-1445088-2.step"
+  (model "step/TE_2-1445088-2.step"
    (offset (xyz 0 -4.6228 2.54))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Conn_MicroMateNLok_3-794679-2.kicad_mod
+++ b/common.pretty/Conn_MicroMateNLok_3-794679-2.kicad_mod
@ -22,7 +22,7 @@
  (pad "0" thru_hole circle (at -2.1463 0) (size 3.81 3.81) (drill 2.413) (layers *.Cu *.Mask) (tstamp e4beff0b-2afb-493f-90ff-6daf2e471945))
  (pad "1" thru_hole circle (at 0 -7.3152) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask) (tstamp 2784b6c3-eb1f-4de2-8696-e580583bfd09))
  (pad "1" thru_hole circle (at 0 -4.318) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask) (tstamp f978b2ac-083b-42ed-af6b-533b094e9ba4))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/TE_3-794679-2.step"
+  (model "step/TE_3-794679-2.step"
    (offset (xyz 0 -4.6228 4.064))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/D0402.kicad_mod
+++ b/common.pretty/D0402.kicad_mod
@ -29,7 +29,7 @@
  (fp_line (start -0.51 0.26) (end 0.51 0.26) (layer "F.Fab") (width 0.127) (tstamp f9bdfb04-d0a2-43e8-8f3b-8072523e76c4))
  (pad "A" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 6732d11c-6504-481e-96a6-13b2dfc9d7a8))
  (pad "K" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 7573cb6d-4c92-47ce-a021-184eb01e2523))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R0402.step"
+  (model "step/R0402.step"
    (offset (xyz 0 0 0.1269999981))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/D0603.kicad_mod
+++ b/common.pretty/D0603.kicad_mod
@ -27,7 +27,7 @@
  (fp_line (start 0.85 -0.45) (end 0.85 0.45) (layer "F.Fab") (width 0.127) (tstamp d0522247-6f03-42fc-b25e-51f6172c276a))
  (pad "A" smd rect (at 0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 81f64bdc-df6b-453e-9119-08af6b7836e7))
  (pad "K" smd rect (at -0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 513ca97f-77af-4603-b3df-e64fefc9fd22))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R0603.step"
+  (model "step/R0603.step"
    (offset (xyz 0 0 0.2032))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/DF40HC(3.0)-100DS-0.4V(58).kicad_mod
+++ b/common.pretty/DF40HC(3.0)-100DS-0.4V(58).kicad_mod
@ -120,7 +120,7 @@
  (pad "98" smd rect (at 9.4 -1.54) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp bec3e531-a4ad-4de1-8b69-7f7e6068e3d1))
  (pad "99" smd rect (at 9.8 1.54) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ab949255-b7d2-4783-9451-4ddbda80e5d9))
  (pad "100" smd rect (at 9.8 -1.54) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp dfd4084a-b982-48e4-b503-4bc4565b6c00))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Hirose_DF40HC(3.0)-100DS-0.4V.step"
+  (model "step/Hirose_DF40HC(3.0)-100DS-0.4V.step"
    (offset (xyz 0 0 1.524))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 90))
--- a/common.pretty/DO-214AB.kicad_mod
+++ b/common.pretty/DO-214AB.kicad_mod
@ -27,7 +27,7 @@
  (fp_rect (start -3.556 -3.10261) (end 3.556 3.1115) (layer "F.Fab") (width 0.127) (fill none) (tstamp a1872eae-e1aa-4ef7-9975-8e4fd381b628))
  (pad "A" smd rect (at 3.2893 0) (size 2.3876 3.2766) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp bcb8e491-6b86-4a91-b04e-eab57e613186))
  (pad "K" smd rect (at -3.2893 0) (size 2.3876 3.2766) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 8fdc91f3-6a7e-48e5-9fe9-daf96fdb4515))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/DO-214AB.step"
+  (model "step/DO-214AB.step"
    (offset (xyz 0 0 1.397))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 -90))
--- a/common.pretty/DO-214AC.kicad_mod
+++ b/common.pretty/DO-214AC.kicad_mod
@ -27,7 +27,7 @@
  (fp_rect (start -2.2987 -1.397) (end -1.905 1.397) (layer "F.Fab") (width 0.127) (fill solid) (tstamp a7183208-16d3-403c-9e81-2940f4628fbe))
  (pad "A" smd rect (at 2.1844 0) (size 2.0828 1.778) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp bcb8e491-6b86-4a91-b04e-eab57e613186))
  (pad "K" smd rect (at -2.1844 0) (size 2.0828 1.778) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 8fdc91f3-6a7e-48e5-9fe9-daf96fdb4515))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/DO-214AC.step"
+  (model "step/DO-214AC.step"
    (offset (xyz 0 0 1.397))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 -90))
--- a/common.pretty/DWM1001C.kicad_mod
+++ b/common.pretty/DWM1001C.kicad_mod
@ -104,7 +104,7 @@
      )
    )
  )
-  (model "/home/brendan/Documents/projects/motion_tracker/hardware/common_libraries/common.3dshapes/DWM1001_v2.step"
+  (model "step/DWM1001_v2.step"
    (offset (xyz 0 -4.6 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/Deltron_571-0100_Black.kicad_mod
+++ b/common.pretty/Deltron_571-0100_Black.kicad_mod
@ -35,7 +35,7 @@
  (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
  (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0100.step"
+  (model "step/Deltron_571-0100.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 -90))
--- a/common.pretty/Deltron_571-0200_Blue.kicad_mod
+++ b/common.pretty/Deltron_571-0200_Blue.kicad_mod
@ -35,7 +35,7 @@
  (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
  (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0200.step"
+  (model "step/Deltron_571-0200.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 -90))
--- a/common.pretty/Deltron_571-0300_Brown.kicad_mod
+++ b/common.pretty/Deltron_571-0300_Brown.kicad_mod
@ -35,7 +35,7 @@
  (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
  (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0300.step"
+  (model "step/Deltron_571-0300.step"
    (offset (xyz -18.6944 -4.8514 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Deltron_571-0400_Green.kicad_mod
+++ b/common.pretty/Deltron_571-0400_Green.kicad_mod
@ -35,7 +35,7 @@
  (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
  (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0400.step"
+  (model "step/Deltron_571-0400.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 -90))
--- a/common.pretty/Deltron_571-0500_Red.kicad_mod
+++ b/common.pretty/Deltron_571-0500_Red.kicad_mod
@ -35,7 +35,7 @@
  (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
  (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0500.step"
+  (model "step/Deltron_571-0500.step"
    (offset (xyz -18.6944 -4.8514 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Deltron_571-0600_White.kicad_mod
+++ b/common.pretty/Deltron_571-0600_White.kicad_mod
@ -35,7 +35,7 @@
  (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
  (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0600.step"
+  (model "step/Deltron_571-0600.step"
    (offset (xyz -18.6944 -4.8514 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Deltron_571-0700_Yellow.kicad_mod
+++ b/common.pretty/Deltron_571-0700_Yellow.kicad_mod
@ -35,7 +35,7 @@
  (fp_rect (start -15.9385 -5.461) (end -15.0495 -4.953) (layer "F.Fab") (width 0.127) (fill solid) (tstamp 8b6238cd-31c8-4d14-8d40-901382ce34a2))
  (pad "1" thru_hole circle (at -15.3 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp b0bc43d5-14ce-4c64-ae01-361c85767bde))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.94) (layers *.Cu *.Mask) (tstamp bd1679be-6b6e-4a32-8a90-faf77247fd3f))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Deltron_571-0700.step"
+  (model "step/Deltron_571-0700.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 -90))
--- a/common.pretty/EVP-AEDB2A.kicad_mod
+++ b/common.pretty/EVP-AEDB2A.kicad_mod
@ -31,7 +31,7 @@
  (pad "1" smd rect (at -1.15 -2.375) (size 0.8 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 708da6fd-0448-49b7-b081-3c0d9c8986a9))
  (pad "1" smd rect (at 1.15 -2.375) (size 0.8 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c17b22f3-fe9b-40ed-bdf8-8136a5a056a9))
  (pad "2" smd rect (at 0 -2.375) (size 0.8 1.25) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 3484dae1-2bac-470c-a354-94caa1cf23e5))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Panasonic_EVP-AEBB2A.step"
+  (model "step/Panasonic_EVP-AEBB2A.step"
    (offset (xyz 0 1.397 -0.6096))
    (scale (xyz 1 1 1))
    (rotate (xyz 180 0 0))
--- a/common.pretty/HSEC8-120-01-L-DV-A-WT-TR.kicad_mod
+++ b/common.pretty/HSEC8-120-01-L-DV-A-WT-TR.kicad_mod
@ -62,7 +62,7 @@
  (pad "38" smd rect (at 6.8 -1.7) (size 0.5 1.2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 19dddb2a-71a7-40d3-ae86-8d4a037ea719))
  (pad "39" smd rect (at 7.6 1.7) (size 0.5 1.2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp fe6b7586-8708-463a-88db-4af98595b617))
  (pad "40" smd rect (at 7.6 -1.7) (size 0.5 1.2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp e79f1b25-97e8-49c0-aed8-cfd632eb9105))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_HSEC8-120-01-L-DV-A-WT.step"
+  (model "step/Samtec_HSEC8-120-01-L-DV-A-WT.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/HSEC8-120-01-L-RA.kicad_mod
+++ b/common.pretty/HSEC8-120-01-L-RA.kicad_mod
@ -68,7 +68,7 @@
  (pad "38" smd rect (at 6.8 -0.925) (size 0.5 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 4fda990b-7c4d-4ff6-b437-b3125222506f))
  (pad "39" smd rect (at 7.6 1.075) (size 0.5 1.35) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1fb40c6d-64a3-49c9-a0bc-65c7a72fdaf7))
  (pad "40" smd rect (at 7.6 -0.925) (size 0.5 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp cd87fa89-c71f-4cb0-a5d1-65623b0df230))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_HSEC8-120-01-L-RA.step"
+  (model "step/Samtec_HSEC8-120-01-L-RA.step"
    (offset (xyz 0 -1.524 3.048))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Header_1_1.kicad_mod
+++ b/common.pretty/Header_1_1.kicad_mod
@ -15,7 +15,7 @@
  (fp_line (start 1.27 1.27) (end -1.27 1.27) (layer "F.SilkS") (width 0.1778) (tstamp 9afc40b5-fd38-4fdd-81a8-ba4bbdb683ae))
  (fp_line (start -1.27 -1.27) (end 1.27 -1.27) (layer "F.SilkS") (width 0.1778) (tstamp b0bb00d6-845f-41a0-a720-1077986d3e60))
  (pad "1" thru_hole rect (at 0 0) (size 1.778 1.778) (drill 0.9906) (layers *.Cu *.Mask) (tstamp ef5f1c5a-98ae-4700-be80-618880b98ed3))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_TSW-101-07-G-S.step"
+  (model "step/Samtec_TSW-101-07-G-S.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/JST_S4B-XH-SM4-TB.kicad_mod
+++ b/common.pretty/JST_S4B-XH-SM4-TB.kicad_mod
@ -29,7 +29,7 @@
  (pad "2" smd roundrect (at -1.25 -8.75) (size 1.3 4.500001) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1) (tstamp 2da48ce0-712e-4c21-b856-50203802f98b))
  (pad "3" smd roundrect (at 1.25 -8.75) (size 1.3 4.500001) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1) (tstamp 4c6e627b-75f2-4f1a-8e2e-01f7bd75b675))
  (pad "4" smd roundrect (at 3.75 -8.75) (size 1.3 4.500001) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1) (tstamp 1ec77267-df5c-434c-b64e-ac03e5f528e8))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/JST_S4B-XH-SM4-TB.step"
+  (model "step/JST_S4B-XH-SM4-TB.step"
    (offset (xyz 0 4.953 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Keystone_1043.kicad_mod
+++ b/common.pretty/Keystone_1043.kicad_mod
@ -31,7 +31,7 @@
  (pad "" np_thru_hole circle (at -8.001 -27.6225) (size 3.556 3.556) (drill 3.556) (layers *.Cu *.Mask) (tstamp 6acccc2d-e5da-403d-9277-8b24fad18252))
  (pad "1" thru_hole circle (at 0 -36.1315) (size 3.81 3.81) (drill 1.6256) (layers *.Cu *.Mask) (tstamp ab73cab2-d26e-4e8f-9d0c-bfde9f49cf97))
  (pad "2" thru_hole circle (at 0 36.1315) (size 3.81 3.81) (drill 1.6256) (layers *.Cu *.Mask) (tstamp a5822e5c-659d-4562-98e5-954e92ff2968))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_1043.step"
+  (model "step/Keystone_1043.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 180))
--- a/common.pretty/Keystone_5005_Red.kicad_mod
+++ b/common.pretty/Keystone_5005_Red.kicad_mod
@ -17,7 +17,7 @@
  (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
  (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp 49590010-7a45-410c-8756-1237127c0c5c))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5005.step"
+  (model "step/Keystone_5005.step"
    (offset (xyz -0.508 0.254 2.3622))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Keystone_5006_Black.kicad_mod
+++ b/common.pretty/Keystone_5006_Black.kicad_mod
@ -17,7 +17,7 @@
  (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
  (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp a365f7ad-6bb6-446e-b1e1-686de23af021))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5006.step"
+  (model "step/Keystone_5006.step"
    (offset (xyz -0.508 0.254 2.3622))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Keystone_5007_White.kicad_mod
+++ b/common.pretty/Keystone_5007_White.kicad_mod
@ -17,7 +17,7 @@
  (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
  (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp 47e5d966-6d8b-4689-91ec-61359066b0c3))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5007.step"
+  (model "step/Keystone_5007.step"
    (offset (xyz -0.508 0.254 2.3622))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Keystone_5008_Orange.kicad_mod
+++ b/common.pretty/Keystone_5008_Orange.kicad_mod
@ -17,7 +17,7 @@
  (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
  (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp fb652b97-c8c7-4804-b3fa-7377e18280ae))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5008.step"
+  (model "step/Keystone_5008.step"
    (offset (xyz -0.508 0.254 2.3622))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Keystone_5009_Yellow.kicad_mod
+++ b/common.pretty/Keystone_5009_Yellow.kicad_mod
@ -17,7 +17,7 @@
  (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
  (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp 3a22fad2-ecd6-4f64-a5d1-af6e32ba19a6))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5009.step"
+  (model "step/Keystone_5009.step"
    (offset (xyz -0.508 0.254 2.3622))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Keystone_5010_Red.kicad_mod
+++ b/common.pretty/Keystone_5010_Red.kicad_mod
@ -16,7 +16,7 @@
  (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
  (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp 2e03a5c3-1c90-4ced-9108-4405283b33ce))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5010.step"
+  (model "step/Keystone_5010.step"
    (offset (xyz -0.0129032 0.0064516 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Keystone_5011_Black.kicad_mod
+++ b/common.pretty/Keystone_5011_Black.kicad_mod
@ -16,7 +16,7 @@
  (fp_circle (center 0 0) (end 1.905 0) (layer "F.SilkS") (width 0.1778) (fill none) (tstamp 969e5992-6a42-405e-992a-12babdbc7a16))
  (fp_circle (center 0 0) (end 1.5875 0) (layer "F.Fab") (width 0.127) (fill none) (tstamp f1dd22de-6f4c-4d96-8376-649f0eb10f2f))
  (pad "1" thru_hole circle (at 0 0) (size 3.175 3.175) (drill 1.6002) (layers *.Cu *.Mask) (tstamp 9b190774-ae4b-4638-a6b0-aeed4e19b526))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Keystone_5011.step"
+  (model "step/Keystone_5011.step"
    (offset (xyz -0.0129032 0.0064516 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/LED0402.kicad_mod
+++ b/common.pretty/LED0402.kicad_mod
@ -29,7 +29,7 @@
  (fp_line (start 0.51 -0.26) (end 0.51 0.26) (layer "F.Fab") (width 0.127) (tstamp 7ba07a8e-500a-4f07-bee2-ec4f910e643c))
  (pad "A" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c3fe9190-4b76-45a0-9af5-623aa09bd045))
  (pad "K" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ab20e7b5-2838-408b-920c-c9c36e3eddf4))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/LED0402_red.step"
+  (model "step/LED0402_red.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/LED0603.kicad_mod
+++ b/common.pretty/LED0603.kicad_mod
@ -27,7 +27,7 @@
  (fp_line (start -0.85 -0.45) (end -0.85 0.45) (layer "F.Fab") (width 0.127) (tstamp 7632e9f1-7024-4df9-b5db-ce9bc7f30789))
  (pad "A" smd rect (at 0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 9e955bce-a5e5-48f2-8009-1b0b8e796406))
  (pad "K" smd rect (at -0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp d55dcc18-aa59-4a4b-b99b-bb024214f364))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/LED0603_red.step"
+  (model "step/LED0603_red.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/LGA10-BMP388.kicad_mod
+++ b/common.pretty/LGA10-BMP388.kicad_mod
@ -37,7 +37,7 @@
    (thermal_bridge_angle 45) (tstamp 267d51e4-f429-43c8-b858-684ec06046be))
  (pad "10" smd rect (at -0.5 -0.7625) (size 0.25 0.275) (layers "F.Cu" "F.Paste" "F.Mask")
    (thermal_bridge_angle 45) (tstamp d1dc4cdf-a801-4365-a15a-b7e7e6a645ed))
-  (model "/home/brendan/Documents/projects/motion_tracker/hardware/common_libraries/common.3dshapes/BMP388.step"
+  (model "step/BMP388.step"
    (offset (xyz 1 1 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 90))
--- a/common.pretty/LSHM-150-03.0-L-DV-A-S-TR.kicad_mod
+++ b/common.pretty/LSHM-150-03.0-L-DV-A-S-TR.kicad_mod
@ -129,7 +129,7 @@
  (pad "98" smd rect (at -11.75 -1.8669) (size 0.3048 1.4986) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp ee2b864a-6f12-41e2-b7d4-7ba105a5064b))
  (pad "99" smd rect (at -12.25 1.8415) (size 0.3048 1.4986) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 86c9d74e-d970-4c69-a72d-7c6aec501c99))
  (pad "100" smd rect (at -12.25 -1.8669) (size 0.3048 1.4986) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b94f531c-c19c-4de5-9a94-5cd9501aad6a))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_LSHM-150-03.0-L-DV-A-S-TR.step"
+  (model "step/Samtec_LSHM-150-03.0-L-DV-A-S-TR.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/LSHM-150-03.0-L-DV-A-S-TR_DUAL.kicad_mod
+++ b/common.pretty/LSHM-150-03.0-L-DV-A-S-TR_DUAL.kicad_mod
@ -133,7 +133,7 @@
  (pad "98" smd rect (at -11.750001 -1.8669) (size 0.3048 1.4986) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 4a0d7cfc-85cf-4c03-907d-6d8f470a161e))
  (pad "99" smd rect (at -12.250001 1.8415) (size 0.3048 1.4986) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 53966937-0fb5-4ed4-af7e-edf26974e595))
  (pad "100" smd rect (at -12.250001 -1.8669) (size 0.3048 1.4986) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp adec755d-42c1-4379-a2d8-2e993ff78559))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_LSHM-150-03.0-L-DV-A-S-TR.step"
+  (model "step/Samtec_LSHM-150-03.0-L-DV-A-S-TR.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/MPD_BK-335-SM.kicad_mod
+++ b/common.pretty/MPD_BK-335-SM.kicad_mod
@ -26,7 +26,7 @@
  (pad "2" smd rect (at 3.43 0) (size 1.52 3.05) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1ecb28f5-f651-4f39-b39e-fd8f5b145d58))
  (pad "2" smd rect (at -3.43 0) (size 1.52 3.05) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 8e25543f-a685-4cb9-b6a9-4f3d9cfbcb49))
  (pad "2" smd rect (at 2.4 3 35.5) (size 1.78 1.64) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 95f5b494-23b0-46b6-ac38-ff93fcaed9b1))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/MPD_BK-335-SM.step"
+  (model "step/MPD_BK-335-SM.step"
    (offset (xyz 0 -0.7619999886 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/MYBSP01201ABF.kicad_mod
+++ b/common.pretty/MYBSP01201ABF.kicad_mod
@ -33,7 +33,7 @@
      )
    )
  )
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Murata_MYBSP01201ABF.step"
+  (model "step/Murata_MYBSP01201ABF.step"
    (offset (xyz -7.4 -13 4.5974))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/MiniCircuits_JC0603-1_Filter.kicad_mod
+++ b/common.pretty/MiniCircuits_JC0603-1_Filter.kicad_mod
@ -25,7 +25,7 @@
  (pad "0" smd roundrect (at 0 0.5588) (size 0.8128 0.7112) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.107) (tstamp d11f278d-4ba9-4053-a1c1-5887806ecb14))
  (pad "1" smd roundrect (at -0.9398 0) (size 0.6604 0.3048) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ae7d6328-2d21-4328-99f3-bf6fa84adc36))
  (pad "2" smd roundrect (at 0.9398 0) (size 0.6604 0.3048) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 377c111a-0cc9-4efb-b97e-5e1c23776122))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/MiniCircuits_JC0603-1.step"
+  (model "step/MiniCircuits_JC0603-1.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/Molex_430450207.kicad_mod
+++ b/common.pretty/Molex_430450207.kicad_mod
@ -54,7 +54,7 @@
      )
    )
  )
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Molex_430450207.stp"
+  (model "step/Molex_430450207.stp"
    (offset (xyz 0 0.3556 3.9624))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Molex_5022505191.kicad_mod
+++ b/common.pretty/Molex_5022505191.kicad_mod
@ -81,7 +81,7 @@
  (pad "49" smd rect locked (at 6.9 -0.4) (size 0.26 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 00000000-0000-0000-0000-000000000000))
  (pad "50" smd rect locked (at 7.2 -3.275) (size 0.26 0.65) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 00000000-0000-0000-0000-000000000000))
  (pad "51" smd rect locked (at 7.5 -0.4) (size 0.26 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 00000000-0000-0000-0000-000000000000))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Molex_5051102291.step"
+  (model "step/Molex_5051102291.step"
    (offset (xyz 0 2.032 0.4318))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/PinHeader_2x02_P1.27mm_Vertical-Samtec_FTSH-102-01-F-D.kicad_mod
+++ b/common.pretty/PinHeader_2x02_P1.27mm_Vertical-Samtec_FTSH-102-01-F-D.kicad_mod
@ -23,7 +23,7 @@
  (pad "2" thru_hole oval (at 0.635 -0.635) (size 1.016 1.016) (drill 0.6604) (layers *.Cu *.Mask) (tstamp d2b576b0-f8d4-4226-b8d3-659b1b7cd15a))
  (pad "3" thru_hole oval (at -0.635 0.635) (size 1.016 1.016) (drill 0.6604) (layers *.Cu *.Mask) (tstamp 70308bbd-bcd0-4598-a2f7-16d7fe29d581))
  (pad "4" thru_hole oval (at 0.635 0.635) (size 1.016 1.016) (drill 0.6604) (layers *.Cu *.Mask) (tstamp e8a21baf-372d-4b93-9fcd-ac725128968a))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_FTSH-102-01-F-D.step"
+  (model "step/Samtec_FTSH-102-01-F-D.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 90))
--- a/common.pretty/PinHeader_2x05_P1.27mm_Vertical-Samtec_FTSH-105-01-F-DV-K-A.kicad_mod
+++ b/common.pretty/PinHeader_2x05_P1.27mm_Vertical-Samtec_FTSH-105-01-F-DV-K-A.kicad_mod
@ -53,7 +53,7 @@
  (pad "8" smd rect (at 2.032 1.27) (size 2.794 0.7366) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 95970073-91f5-4c00-af9e-6c6aaeb1a98f))
  (pad "9" smd rect (at -2.032 2.54) (size 2.794 0.7366) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp eb3e1bf9-efea-400c-b9a9-7884848c1fdb))
  (pad "10" smd rect (at 2.032 2.54) (size 2.794 0.7366) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 73c80792-92c8-46cf-964d-aa3afe90942c))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_FTSH-105-01-F-DV-K-A.step"
+  (model "step/Samtec_FTSH-105-01-F-DV-K-A.step"
    (offset (xyz 0 0 0.381))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 90))
--- a/common.pretty/PinHeader_2x05_P1.27mm_Vertical-Samtec_FTSH-105-01-L-D-K.kicad_mod
+++ b/common.pretty/PinHeader_2x05_P1.27mm_Vertical-Samtec_FTSH-105-01-L-D-K.kicad_mod
@ -47,7 +47,7 @@
  (pad "8" thru_hole oval (at 0.635 1.27) (size 1.016 1.016) (drill 0.6604) (layers *.Cu *.Mask) (tstamp ae0de3e1-4034-4ccd-b0f8-64637b1b410a))
  (pad "9" thru_hole oval (at -0.635 2.54) (size 1.016 1.016) (drill 0.6604) (layers *.Cu *.Mask) (tstamp bc363fbd-cae1-44fa-9528-d37bba8bad12))
  (pad "10" thru_hole oval (at 0.635 2.54) (size 1.016 1.016) (drill 0.6604) (layers *.Cu *.Mask) (tstamp 43fd0b08-85a1-4154-b987-6e52fff9c5dd))
-  (model "${KICAD_USER_MOD}/connector.3dshapes/Samtec-FTSH-105-01-L-D-K.stp"
+  (model "step/Samtec-FTSH-105-01-L-D-K.stp"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 90))
--- a/common.pretty/PinHeader_3x4_P2.54mm_Vertical.kicad_mod
+++ b/common.pretty/PinHeader_3x4_P2.54mm_Vertical.kicad_mod
@ -27,7 +27,7 @@
  (pad "10" thru_hole circle (at 7.62 0) (size 1.778 1.778) (drill 0.9906) (layers *.Cu *.Mask) (tstamp 7be3c60b-c12e-472b-9539-cbc9061f6041))
  (pad "11" thru_hole circle (at 7.62 2.54) (size 1.778 1.778) (drill 0.9906) (layers *.Cu *.Mask) (tstamp e352245f-2b5c-492d-ba57-2f32a6974986))
  (pad "12" thru_hole circle (at 7.62 5.08) (size 1.778 1.778) (drill 0.9906) (layers *.Cu *.Mask) (tstamp 2a77345b-8ada-4941-9161-d24b54f8cd6b))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_TSW-104-05-G-T.step"
+  (model "step/Samtec_TSW-104-05-G-T.step"
    (offset (xyz 3.81 -2.54 2.54))
    (scale (xyz 1 1 1))
    (rotate (xyz 90 0 0))
--- a/common.pretty/QFN40P400X400X80-32P.kicad_mod
+++ b/common.pretty/QFN40P400X400X80-32P.kicad_mod
@ -62,7 +62,7 @@
  (pad "30" smd roundrect (at -0.6 -2 90) (size 0.8 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 83eec9aa-380c-4140-8735-c0fb337cc3fc))
  (pad "31" smd roundrect (at -1 -2 90) (size 0.8 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2005366a-4bd9-41e1-9a33-a4e17926c67b))
  (pad "32" smd roundrect (at -1.4 -2 90) (size 0.8 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 2c53a9d1-5fcc-43da-b9dd-dd9be792c326))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/QFN40P400X400X80-32P_TI_RSN0032B.step"
+  (model "step/QFN40P400X400X80-32P_TI_RSN0032B.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/R0402.kicad_mod
+++ b/common.pretty/R0402.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start -0.51 -0.26) (end -0.51 0.26) (layer "F.Fab") (width 0.127) (tstamp e3c3ec5e-87fe-4aa4-9a0f-fcdd75bd2bf7))
  (pad "1" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 823e5625-983f-454e-a16c-2e6f10f730e8))
  (pad "2" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp e7b1c9f3-3865-42db-813a-ced7b1bf1ad0))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R0402.step"
+  (model "step/R0402.step"
    (offset (xyz 0 0 0.1269999981))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/R0402_NOSILK.kicad_mod
+++ b/common.pretty/R0402_NOSILK.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start 0.889 0.508) (end 0.889 -0.508) (layer "F.Fab") (width 0.1778) (tstamp ee952dfe-ddf7-4284-9a01-dd1db090899b))
  (pad "1" smd rect (at -0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 685cba04-af75-4b5a-8500-842a7f3cd3de))
  (pad "2" smd rect (at 0.425 0) (size 0.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp fec9425c-c3d7-4869-b776-0407ea174cb5))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R0402.step"
+  (model "step/R0402.step"
    (offset (xyz 0 0 0.1269999981))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/R0603.kicad_mod
+++ b/common.pretty/R0603.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start -0.85 0.45) (end 0.85 0.45) (layer "F.Fab") (width 0.127) (tstamp a2909340-5464-42e5-9c63-8262b960fc0f))
  (pad "1" smd rect (at -0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 4b4aa2df-d0cd-4d05-ba6a-79ee766f172e))
  (pad "2" smd rect (at 0.725 0) (size 0.95 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp f3380bb1-00b8-43ad-aee0-a23229b40bb2))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R0603.step"
+  (model "step/R0603.step"
    (offset (xyz 0 0 0.2031999969))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/R0805.kicad_mod
+++ b/common.pretty/R0805.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start -1 0.625) (end 1 0.625) (layer "F.Fab") (width 0.127) (tstamp f94c0d94-a696-4fac-8813-76e7743481e5))
  (pad "1" smd rect (at -0.875 0) (size 1.1 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp e5507807-11a3-4e77-9ff4-3467001035c3))
  (pad "2" smd rect (at 0.875 0) (size 1.1 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp d0905a64-390b-4fee-b906-7a756e2ec4c0))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R0805.step"
+  (model "step/R0805.step"
    (offset (xyz 0 0 0.2031999969))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/R1206.kicad_mod
+++ b/common.pretty/R1206.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start 1.524 0.762) (end 1.524 -0.762) (layer "F.Fab") (width 0.127) (tstamp c3b0511f-78e2-4762-a5a3-ec12f0b6bef7))
  (pad "1" smd rect (at -1.4478 0) (size 0.889 1.6002) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1d575180-2fd5-44bb-9bf5-0873a8f9d573))
  (pad "2" smd rect (at 1.4478 0 180) (size 0.889 1.6002) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 2eb6fe5d-32ca-4879-9de4-4b12615dc315))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R1206.step"
+  (model "step/R1206.step"
    (offset (xyz 0 0 0.2667))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/R1210.kicad_mod
+++ b/common.pretty/R1210.kicad_mod
@ -24,7 +24,7 @@
  (fp_line (start -1.524 -1.27) (end 1.524 -1.27) (layer "F.Fab") (width 0.127) (tstamp add09646-f0c5-4791-8a2c-b21230921106))
  (pad "1" smd rect (at -1.397 0) (size 1.651 2.794) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 3a9da9ef-54a5-4a25-a8c6-14d269b36ba7))
  (pad "2" smd rect (at 1.397 0 180) (size 1.651 2.794) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp cee6d469-554f-4715-83be-36ad744ee341))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/R1210.step"
+  (model "step/R1210.step"
    (offset (xyz 0 0 0.2667))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/RaspberryPi-CM4.kicad_mod
+++ b/common.pretty/RaspberryPi-CM4.kicad_mod
@ -30,7 +30,7 @@
  (pad "" smd circle (at -2.5 -17) (size 0.127 0.127) (layers "F.Mask") (tstamp a2115eca-f98f-4b59-9a56-86c1599a0aa7))
  (pad "" smd circle (at -2.5 17) (size 0.127 0.127) (layers "F.Mask") (tstamp c3e53664-28c1-4dcc-ae47-e1c4dd0a37bf))
  (pad "" thru_hole circle (at 24 -16.5) (size 5.08 5.08) (drill 2.899999) (layers *.Cu *.Mask) (tstamp e1b1f92f-811c-4ba4-a48f-159d4f65c955))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/RaspberryPi_CM4.step"
+  (model "step/RaspberryPi_CM4.step"
    (offset (xyz -27.5 -36 3))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/SOD-123.kicad_mod
+++ b/common.pretty/SOD-123.kicad_mod
@ -37,7 +37,7 @@
  (fp_line (start -1.425 -0.85) (end 1.425 -0.85) (layer "F.Fab") (width 0.127) (tstamp f69bd0de-0f96-4e9f-8e21-ad915405e2b9))
  (pad "A" smd rect (at 1.575 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp af710587-e9dc-4657-95ba-ce357b3225fd))
  (pad "K" smd rect (at -1.575 0) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp db3835f4-bed6-4c3a-9f0b-996ec8bb1b98))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/SOD-123.step"
+  (model "step/SOD-123.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/SOD-323.kicad_mod
+++ b/common.pretty/SOD-323.kicad_mod
@ -38,7 +38,7 @@
  (fp_line (start 0.9 -0.7) (end 0.9 0.7) (layer "F.Fab") (width 0.127) (tstamp de711e45-c7f1-47e4-bd4a-f0702fb375be))
  (pad "A" smd rect (at 1.055 0) (size 0.59 0.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1eb922cf-c509-459c-af37-e84c17971891))
  (pad "K" smd rect (at -1.055 0) (size 0.59 0.45) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 87483fb1-d05c-4a5a-81d9-0ca915380f48))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/SOD-323.step"
+  (model "step/SOD-323.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/SOIC127P600X175-8.kicad_mod
+++ b/common.pretty/SOIC127P600X175-8.kicad_mod
@ -43,7 +43,7 @@
  (pad "6" smd roundrect (at 2.75 0.635) (size 1.4 0.762) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 04cc1ee4-5746-43a3-aff1-79ec1954bdcb))
  (pad "7" smd roundrect (at 2.75 -0.635) (size 1.4 0.762) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 9bfcf6b7-cb8f-4117-bab8-757094e3ceb0))
  (pad "8" smd roundrect (at 2.75 -1.905) (size 1.4 0.762) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f6b2746c-0439-4711-99db-255aaf99387a))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/SOIC127P600X175-8.step"
+  (model "step/SOIC127P600X175-8.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 90))
--- a/common.pretty/SOP50P490X110-10N.kicad_mod
+++ b/common.pretty/SOP50P490X110-10N.kicad_mod
@ -39,7 +39,7 @@
  (pad "8" smd roundrect (at 2.2 0) (size 1.45 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.167) (tstamp 52c93e3f-50ae-4813-9f04-dd19053f699f))
  (pad "9" smd roundrect (at 2.2 -0.5) (size 1.45 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.167) (tstamp cbc82fa3-3743-4fdf-8624-f47bc30abce3))
  (pad "10" smd roundrect (at 2.2 -1) (size 1.45 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.167) (tstamp d2f21e85-7e62-407c-869e-a2c13b598dc2))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/SOP50X490X110-10N_TI_DGS0010A.step"
+  (model "step/SOP50X490X110-10N_TI_DGS0010A.step"
    (offset (xyz 0 0 0.6858))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 90))
--- a/common.pretty/SOT-223.kicad_mod
+++ b/common.pretty/SOT-223.kicad_mod
@ -24,7 +24,7 @@
  (pad "2" smd rect (at -2.899999 0) (size 2.1 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 4c9ef08b-8765-421c-9ceb-1d55895df5b6))
  (pad "3" smd rect (at -2.899999 2.3) (size 2.1 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 6acc4c89-9521-406e-bbb1-f00413158be4))
  (pad "4" smd rect (at 2.899999 0) (size 2.1 3.250001) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 267c6434-d712-4f49-ad37-62c8d45e8d45))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/SOT-223_TI_DCY0004A.step"
+  (model "step/SOT-223_TI_DCY0004A.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/SOT-23-5.kicad_mod
+++ b/common.pretty/SOT-23-5.kicad_mod
@ -37,7 +37,7 @@
  (pad "3" smd roundrect (at -1.3 0.95) (size 1.1 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.083) (tstamp d6b60e4e-2649-4ce1-a3b8-31390d94fc26))
  (pad "4" smd roundrect (at 1.3 0.95) (size 1.1 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.083) (tstamp 312c8771-ee43-4d42-b9b6-3b6eb8d397cb))
  (pad "5" smd roundrect (at 1.3 -0.95) (size 1.1 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.083) (tstamp 2af9b705-5167-4597-a90f-b025e2e48a29))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/SOT-23-5_TI_DBV0005A.step"
+  (model "step/SOT-23-5_TI_DBV0005A.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/SOT-23-6.kicad_mod
+++ b/common.pretty/SOT-23-6.kicad_mod
@ -38,7 +38,7 @@
  (pad "4" smd roundrect (at 1.3 0.95) (size 1.1 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.083) (tstamp 704490ea-f4cc-4d7f-8e0f-ac6af8eeebc7))
  (pad "5" smd roundrect (at 1.3 0) (size 1.1 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.083) (tstamp d354a8bd-33ec-494b-82d4-2f8f24302e16))
  (pad "6" smd roundrect (at 1.3 -0.95) (size 1.1 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.083) (tstamp 8a535345-b362-4a6c-aef5-9da10fc49a66))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/SOT-23-6_TI_DBV0006A.step"
+  (model "step/SOT-23-6_TI_DBV0006A.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/SOT-323.kicad_mod
+++ b/common.pretty/SOT-323.kicad_mod
@ -28,7 +28,7 @@
  (pad "1" smd roundrect (at -1.1 -0.65) (size 0.95 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.125) (tstamp bb3d8667-5460-4763-aa0f-2c3dc21b2c5e))
  (pad "2" smd roundrect (at -1.1 0.65) (size 0.95 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.125) (tstamp 78125f04-0d06-4fb3-ba92-19b26669fc7f))
  (pad "3" smd roundrect (at 1.1 0) (size 0.95 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.125) (tstamp d2692c44-645b-4d45-8112-a35c9c34b2a8))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/SOT-323_TI_DCK0003A.step"
+  (model "step/SOT-323_TI_DCK0003A.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/SOT-353.kicad_mod
+++ b/common.pretty/SOT-353.kicad_mod
@ -35,7 +35,7 @@
  (pad "3" smd roundrect (at -1.1 0.65) (size 0.9 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.125) (tstamp fc6bcdde-5a6f-41c7-8034-da923821b710))
  (pad "4" smd roundrect (at 1.1 0.65) (size 0.9 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.125) (tstamp 30207260-b93c-486d-a294-ea704770ff49))
  (pad "5" smd roundrect (at 1.1 -0.65) (size 0.9 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.125) (tstamp 3bc712e0-6a94-4cc8-9049-880de54ca720))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/SOT-353_TI_DCK0005A.step"
+  (model "step/SOT-353_TI_DCK0005A.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/SOT-363.kicad_mod
+++ b/common.pretty/SOT-363.kicad_mod
@ -36,7 +36,7 @@
  (pad "4" smd roundrect (at 1.1 0.65) (size 0.9 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.125) (tstamp a61f742a-f4e1-4894-868a-c05868b9c2eb))
  (pad "5" smd roundrect (at 1.1 0) (size 0.9 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.125) (tstamp 046c2aa4-f9a8-44c0-84fc-38fe006d9b22))
  (pad "6" smd roundrect (at 1.1 -0.65) (size 0.9 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.125) (tstamp ed7bb6e8-347b-424a-9fcc-8d084d5ba8da))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/SOT-353_TI_DCK0005A.step"
+  (model "step/SOT-353_TI_DCK0005A.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/SOT-553.kicad_mod
+++ b/common.pretty/SOT-553.kicad_mod
@ -31,7 +31,7 @@
  (pad "3" smd roundrect (at -0.74 0.5) (size 0.67 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.167) (tstamp 6761dab3-3ce2-42bd-8156-c14e2bd0afaf))
  (pad "4" smd roundrect (at 0.74 0.5) (size 0.67 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.167) (tstamp 3ce12a35-644c-4464-9cbc-dcf775fc3fef))
  (pad "5" smd roundrect (at 0.74 -0.5) (size 0.67 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.167) (tstamp c48ecd62-892c-4781-801a-8f6051b9c032))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/SOT-553_TI_DRL0005A.step"
+  (model "step/SOT-553_TI_DRL0005A.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/SOT-563.kicad_mod
+++ b/common.pretty/SOT-563.kicad_mod
@ -32,7 +32,7 @@
  (pad "4" smd roundrect (at 0.74 0.5) (size 0.67 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.167) (tstamp 3ce12a35-644c-4464-9cbc-dcf775fc3fef))
  (pad "5" smd roundrect (at 0.74 0) (size 0.67 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.167) (tstamp 5fcc2eaf-5555-4494-805d-ea351f88f92e))
  (pad "6" smd roundrect (at 0.74 -0.5) (size 0.67 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.167) (tstamp c48ecd62-892c-4781-801a-8f6051b9c032))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/SOT-563_TI_DRL0006A.step"
+  (model "step/SOT-563_TI_DRL0006A.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/SPST_SKQG.kicad_mod
+++ b/common.pretty/SPST_SKQG.kicad_mod
@ -44,7 +44,7 @@
  (pad "1" smd rect (at 3.1 -1.85) (size 1.8 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c3d28473-9aa1-4ef8-85f6-c11c789bb6e4))
  (pad "2" smd rect (at -3.1 1.85) (size 1.8 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 83d6b4bd-903f-4df8-b1fc-ae863481951a))
  (pad "2" smd rect (at 3.1 1.85) (size 1.8 1.1) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b9670e4b-69e7-4efb-9de2-29876767aa33))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/CK_PTS525SM15SMTR2LFS.step"
+  (model "step/CK_PTS525SM15SMTR2LFS.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 90 0))
--- a/common.pretty/Samtec_MUSB-05-F-B-SM-A.kicad_mod
+++ b/common.pretty/Samtec_MUSB-05-F-B-SM-A.kicad_mod
@ -33,7 +33,7 @@
  (pad "3" smd rect (at 0 -2.695) (size 0.5 2.25) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp e0c78473-08c6-4578-a648-77de90281c3c))
  (pad "4" smd rect (at 0.8 -2.695) (size 0.5 2.25) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 1ddaa4af-5492-4c65-a870-5364e4e449ab))
  (pad "5" smd rect (at 1.6 -2.695) (size 0.5 2.25) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 7488e14d-a0cc-4fc0-bd00-d052033a96a1))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_MUSB-05-F-B-SM-A.step"
+  (model "step/Samtec_MUSB-05-F-B-SM-A.step"
    (offset (xyz 0 -4.064 0))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Samtec_SMH-105-02-G-D.kicad_mod
+++ b/common.pretty/Samtec_SMH-105-02-G-D.kicad_mod
@ -41,7 +41,7 @@
  (pad "8" smd rect (at -2.54 -3.8608) (size 1.4224 1.7272) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 74d3a29d-6a25-4a5b-a081-651543df35b4))
  (pad "9" smd rect (at -5.08 0) (size 1.4224 1.7272) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 2b780352-1b20-40c9-9f0d-b680574f254e))
  (pad "10" smd rect (at -5.08 -3.8608) (size 1.4224 1.7272) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp efd08cd6-0cba-4392-81a6-5465db6d369f))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Samtec_SMH-105-02-G-D.step"
+  (model "step/Samtec_SMH-105-02-G-D.step"
    (offset (xyz 0 -2.921 2.54))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/TE_2337857-1.kicad_mod
+++ b/common.pretty/TE_2337857-1.kicad_mod
@ -51,7 +51,7 @@
  (pad "B10" smd roundrect (at -1.75 2.3) (size 0.25 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp a281d6c5-3c08-4c5c-bf08-2c0a31a982af))
  (pad "B11" smd roundrect (at -2.25 2.3) (size 0.25 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 37313054-b77b-4e9e-a51c-3c46603a4468))
  (pad "B12" smd roundrect (at -2.75 2.3) (size 0.25 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 13acc5d2-63c2-4d16-92e0-bf166df070d5))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/TE_2337857-1.step"
+  (model "step/TE_2337857-1.step"
    (offset (xyz 0 0 12))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/TE_6116075-1.kicad_mod
+++ b/common.pretty/TE_6116075-1.kicad_mod
@ -36,7 +36,7 @@
  (pad "10" thru_hole circle locked (at 4.572 -9.144) (size 1.524 1.524) (drill 0.889) (layers *.Cu *.Mask) (tstamp ef7d7d97-bbcb-49b9-b9e0-77f827c6e5ce))
  (pad "11" thru_hole circle locked (at -4.572 -9.144) (size 1.524 1.524) (drill 0.889) (layers *.Cu *.Mask) (tstamp 5819f04d-f4be-4a4c-b8c3-74b33da6377b))
  (pad "12" thru_hole circle locked (at -6.858 -9.144) (size 1.524 1.524) (drill 0.889) (layers *.Cu *.Mask) (tstamp 279e4e22-f4bf-4e35-a8ce-0d5148b250d0))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/TE_6116075-1.step"
+  (model "step/TE_6116075-1.step"
    (offset (xyz 0 -5 0.2))
    (scale (xyz 1 1 1))
    (rotate (xyz -90 0 0))
--- a/common.pretty/Vicor_PI31xx-0x-HVIZ.kicad_mod
+++ b/common.pretty/Vicor_PI31xx-0x-HVIZ.kicad_mod
@ -33,7 +33,7 @@
  (pad "SGND" smd rect (at -10.4394 0) (size 1.3716 1.3208) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 8a455e50-bfbc-4a65-a18b-b2eaae2d726f))
  (pad "TM" smd rect (at -8.5598 0.9906) (size 1.3716 1.3208) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 2b219428-9b3c-430f-b82c-7dd4ff5db483))
  (pad "TRIM/SS" smd rect (at -10.4394 2.0066) (size 1.3716 1.3208) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp df8a377a-f033-408e-8bfa-13bdcef2801b))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/Synqor_PI31xx.step"
+  (model "step/Synqor_PI31xx.step"
    (offset (xyz 0 0 0))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/XT60_Male.kicad_mod
+++ b/common.pretty/XT60_Male.kicad_mod
@ -23,7 +23,7 @@
  (pad "1" thru_hole rect (at -3.6 0) (size 5.969 5.969) (drill 4.572) (layers *.Cu *.Mask) (tstamp cf8ed7e3-f396-4afe-af81-923802577479))
  (pad "2" thru_hole roundrect (at 3.6 0) (size 5.969 5.969) (drill 4.572) (layers *.Cu *.Mask) (roundrect_rratio 0)
    (chamfer_ratio 0.2) (chamfer top_right bottom_right) (tstamp 571302dc-97a6-4f80-b524-58dc9ec70314))
-  (model "${KICAD_BHLIB_DIR}/common.3dshapes/XT60_Male.step"
+  (model "step/XT60_Male.step"
    (offset (xyz -7.62 0 16.51))
    (scale (xyz 1 1 1))
    (rotate (xyz 0 0 0))
--- a/common.pretty/step/43045-0207_stp.zip
+++ b/common.pretty/step/43045-0207_stp.zip
--- a/common.pretty/step/AlpsAlpine_SKQGAF.step
+++ b/common.pretty/step/AlpsAlpine_SKQGAF.step
--- a/common.pretty/step/Amphenol_12401832E402A.step
+++ b/common.pretty/step/Amphenol_12401832E402A.step
--- a/common.pretty/step/BMP388.step
+++ b/common.pretty/step/BMP388.step
--- a/common.pretty/step/C0201.step
+++ b/common.pretty/step/C0201.step
--- a/common.pretty/step/C0402.step
+++ b/common.pretty/step/C0402.step
--- a/common.pretty/step/C0603.step
+++ b/common.pretty/step/C0603.step
--- a/Show More
+++ b/Show More