Placed connectors and mounting hole footprints into their own RPi_Hat module.

RPi_Hat.cmp

-Cmp-Mod V01 Created by Cvpcb (2015-03-15 BZR 5517)-product   date = 03/28/2015 9:36:24 AM
+Cmp-Mod V01 Created by Cvpcb (2015-03-15 BZR 5517)-product   date = 03/30/2015 1:01:36 PM
 
 BeginCmp
 TimeStamp = /5515D395/5515D39E;
 Reference = J1;
 ValeurCmp = RPi_GPIO;
-IdModule  = XESS:Samtec_HLE-120-02-XXX-DV-BE-XX-XX;
+IdModule  = RPi_Hat:Samtec_HLE-120-02-XXX-DV-BE-XX-XX;
 EndCmp
 
 BeginCmp
 TimeStamp = /5515D395/5516AE26;
 Reference = J2;
 ValeurCmp = RPi_GPIO;
-IdModule  = Pin_Headers:Pin_Header_Straight_2x20;
+IdModule  = RPi_Hat:Pin_Header_Straight_2x20;
 EndCmp
 
 EndListe

RPi_Hat.kicad_pcb

@@ -3,7 +3,7 @@
   (general
     (links 0)
     (no_connects 0)
-    (area -10.496428 -10.7 134.00357 69.25)
+    (area -0.050001 -0.050001 65.050001 56.550001)
     (thickness 1.6)
     (drawings 40)
     (tracks 0)
@@ -266,108 +266,188 @@
     (add_net "Net-(J2-Pad9)")
   )
 
-  (module Pin_Headers:Pin_Header_Straight_2x20 locked (layer F.Cu) (tedit 5516B002) (tstamp 5516AEA0)
-    (at 32.5 4 90)
+  (module RPi_Hat:RPi_Hat_Mounting_Hole locked (layer F.Cu) (tedit 55197E97) (tstamp 5515DEBF)
+    (at 3.5 4)
+    (descr "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
+    (tags "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
+    (fp_text reference REF** (at 0 -4.0005) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value RPi_Hat_Mounting_Hole (at 0.09906 3.59918) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 1.375 0) (layer F.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer F.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer B.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 1.375 0) (layer B.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer F.CrtYd) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer B.CrtYd) (width 0.15))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.75 2.75) (drill 2.75) (layers *.Cu *.Mask)
+      (solder_mask_margin 1.725))
+  )
+
+  (module RPi_Hat:RPi_Hat_Mounting_Hole locked (layer F.Cu) (tedit 55197E97) (tstamp 5515DECC)
+    (at 3.5 53)
+    (descr "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
+    (tags "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
+    (fp_text reference REF** (at 0 -4.0005) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value RPi_Hat_Mounting_Hole (at 0.09906 3.59918) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 1.375 0) (layer F.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer F.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer B.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 1.375 0) (layer B.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer F.CrtYd) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer B.CrtYd) (width 0.15))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.75 2.75) (drill 2.75) (layers *.Cu *.Mask)
+      (solder_mask_margin 1.725))
+  )
+
+  (module RPi_Hat:RPi_Hat_Mounting_Hole locked (layer F.Cu) (tedit 55197E97) (tstamp 55169DC9)
+    (at 61.5 53)
+    (descr "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
+    (tags "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
+    (fp_text reference REF** (at 0 -4.0005) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value RPi_Hat_Mounting_Hole (at 0.09906 3.59918) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 1.375 0) (layer F.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer F.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer B.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 1.375 0) (layer B.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer F.CrtYd) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer B.CrtYd) (width 0.15))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.75 2.75) (drill 2.75) (layers *.Cu *.Mask)
+      (solder_mask_margin 1.725))
+  )
+
+  (module RPi_Hat:RPi_Hat_Mounting_Hole locked (layer F.Cu) (tedit 55197E97) (tstamp 5515DEA9)
+    (at 61.5 4)
+    (descr "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
+    (tags "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
+    (fp_text reference REF** (at 0 -4.0005) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value RPi_Hat_Mounting_Hole (at 0.09906 3.59918) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 1.375 0) (layer F.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer F.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer B.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 1.375 0) (layer B.Fab) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer F.CrtYd) (width 0.15))
+    (fp_circle (center 0 0) (end 3.1 0) (layer B.CrtYd) (width 0.15))
+    (pad "" np_thru_hole circle (at 0 0) (size 2.75 2.75) (drill 2.75) (layers *.Cu *.Mask)
+      (solder_mask_margin 1.725))
+  )
+
+  (module RPi_Hat:Pin_Header_Straight_2x20 locked (layer F.Cu) (tedit 5516B002) (tstamp 5516AEA0)
+    (at 32.5 4)
     (descr "Through hole pin header")
     (tags "pin header")
     (path /5515D395/5516AE26)
-    (fp_text reference J2 (at -5 -21 180) (layer F.SilkS)
+    (fp_text reference J2 (at -21 5 180) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value RPi_GPIO (at -1.27 -27.23 90) (layer F.Fab)
+    (fp_text value RPi_GPIO (at -27.23 1.27 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -3.02 -25.88) (end -3.02 25.92) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.03 -25.88) (end 3.03 25.92) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.02 -25.88) (end 3.03 -25.88) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.02 25.92) (end 3.03 25.92) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.54 25.4) (end 2.54 -25.4) (layer F.SilkS) (width 0.15))
-    (fp_line (start -2.54 -22.86) (end -2.54 25.4) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 25.4) (end -2.54 25.4) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.54 -25.4) (end 0 -25.4) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.27 -25.68) (end -2.82 -25.68) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0 -25.4) (end 0 -22.86) (layer F.SilkS) (width 0.15))
-    (fp_line (start 0 -22.86) (end -2.54 -22.86) (layer F.SilkS) (width 0.15))
-    (fp_line (start -2.82 -25.68) (end -2.82 -24.13) (layer F.SilkS) (width 0.15))
-    (pad 1 thru_hole rect (at -1.27 -24.13 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (fp_line (start -25.88 3.02) (end 25.92 3.02) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -25.88 -3.03) (end 25.92 -3.03) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -25.88 3.02) (end -25.88 -3.03) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 25.92 3.02) (end 25.92 -3.03) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 25.4 -2.54) (end -25.4 -2.54) (layer F.SilkS) (width 0.15))
+    (fp_line (start -22.86 2.54) (end 25.4 2.54) (layer F.SilkS) (width 0.15))
+    (fp_line (start 25.4 -2.54) (end 25.4 2.54) (layer F.SilkS) (width 0.15))
+    (fp_line (start -25.4 -2.54) (end -25.4 0) (layer F.SilkS) (width 0.15))
+    (fp_line (start -25.68 1.27) (end -25.68 2.82) (layer F.SilkS) (width 0.15))
+    (fp_line (start -25.4 0) (end -22.86 0) (layer F.SilkS) (width 0.15))
+    (fp_line (start -22.86 0) (end -22.86 2.54) (layer F.SilkS) (width 0.15))
+    (fp_line (start -25.68 2.82) (end -24.13 2.82) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole rect (at -24.13 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 41 "Net-(J2-Pad1)"))
-    (pad 2 thru_hole oval (at 1.27 -24.13 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 2 thru_hole oval (at -24.13 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 42 "Net-(J2-Pad2)"))
-    (pad 3 thru_hole oval (at -1.27 -21.59 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 3 thru_hole oval (at -21.59 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 43 "Net-(J2-Pad3)"))
-    (pad 4 thru_hole oval (at 1.27 -21.59 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 4 thru_hole oval (at -21.59 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 44 "Net-(J2-Pad4)"))
-    (pad 5 thru_hole oval (at -1.27 -19.05 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 5 thru_hole oval (at -19.05 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 45 "Net-(J2-Pad5)"))
-    (pad 6 thru_hole oval (at 1.27 -19.05 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 6 thru_hole oval (at -19.05 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 46 "Net-(J2-Pad6)"))
-    (pad 7 thru_hole oval (at -1.27 -16.51 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 7 thru_hole oval (at -16.51 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 47 "Net-(J2-Pad7)"))
-    (pad 8 thru_hole oval (at 1.27 -16.51 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 8 thru_hole oval (at -16.51 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 48 "Net-(J2-Pad8)"))
-    (pad 9 thru_hole oval (at -1.27 -13.97 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 9 thru_hole oval (at -13.97 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 49 "Net-(J2-Pad9)"))
-    (pad 10 thru_hole oval (at 1.27 -13.97 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 10 thru_hole oval (at -13.97 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 50 "Net-(J2-Pad10)"))
-    (pad 11 thru_hole oval (at -1.27 -11.43 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 11 thru_hole oval (at -11.43 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 51 "Net-(J2-Pad11)"))
-    (pad 12 thru_hole oval (at 1.27 -11.43 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 12 thru_hole oval (at -11.43 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 52 "Net-(J2-Pad12)"))
-    (pad 13 thru_hole oval (at -1.27 -8.89 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 13 thru_hole oval (at -8.89 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 53 "Net-(J2-Pad13)"))
-    (pad 14 thru_hole oval (at 1.27 -8.89 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 14 thru_hole oval (at -8.89 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 54 "Net-(J2-Pad14)"))
-    (pad 15 thru_hole oval (at -1.27 -6.35 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 15 thru_hole oval (at -6.35 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 55 "Net-(J2-Pad15)"))
-    (pad 16 thru_hole oval (at 1.27 -6.35 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 16 thru_hole oval (at -6.35 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 56 "Net-(J2-Pad16)"))
-    (pad 17 thru_hole oval (at -1.27 -3.81 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 17 thru_hole oval (at -3.81 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 57 "Net-(J2-Pad17)"))
-    (pad 18 thru_hole oval (at 1.27 -3.81 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 18 thru_hole oval (at -3.81 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 58 "Net-(J2-Pad18)"))
-    (pad 19 thru_hole oval (at -1.27 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 19 thru_hole oval (at -1.27 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 59 "Net-(J2-Pad19)"))
-    (pad 20 thru_hole oval (at 1.27 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 20 thru_hole oval (at -1.27 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 60 "Net-(J2-Pad20)"))
-    (pad 21 thru_hole oval (at -1.27 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 21 thru_hole oval (at 1.27 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 61 "Net-(J2-Pad21)"))
-    (pad 22 thru_hole oval (at 1.27 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 22 thru_hole oval (at 1.27 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 62 "Net-(J2-Pad22)"))
-    (pad 23 thru_hole oval (at -1.27 3.81 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 23 thru_hole oval (at 3.81 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 63 "Net-(J2-Pad23)"))
-    (pad 24 thru_hole oval (at 1.27 3.81 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 24 thru_hole oval (at 3.81 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 64 "Net-(J2-Pad24)"))
-    (pad 25 thru_hole oval (at -1.27 6.35 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 25 thru_hole oval (at 6.35 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 65 "Net-(J2-Pad25)"))
-    (pad 26 thru_hole oval (at 1.27 6.35 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 26 thru_hole oval (at 6.35 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 66 "Net-(J2-Pad26)"))
-    (pad 27 thru_hole oval (at -1.27 8.89 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 27 thru_hole oval (at 8.89 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 67 "Net-(J2-Pad27)"))
-    (pad 28 thru_hole oval (at 1.27 8.89 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 28 thru_hole oval (at 8.89 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 68 "Net-(J2-Pad28)"))
-    (pad 29 thru_hole oval (at -1.27 11.43 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 29 thru_hole oval (at 11.43 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 69 "Net-(J2-Pad29)"))
-    (pad 30 thru_hole oval (at 1.27 11.43 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 30 thru_hole oval (at 11.43 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 70 "Net-(J2-Pad30)"))
-    (pad 31 thru_hole oval (at -1.27 13.97 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 31 thru_hole oval (at 13.97 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 71 "Net-(J2-Pad31)"))
-    (pad 32 thru_hole oval (at 1.27 13.97 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 32 thru_hole oval (at 13.97 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 72 "Net-(J2-Pad32)"))
-    (pad 33 thru_hole oval (at -1.27 16.51 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 33 thru_hole oval (at 16.51 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 73 "Net-(J2-Pad33)"))
-    (pad 34 thru_hole oval (at 1.27 16.51 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 34 thru_hole oval (at 16.51 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 74 "Net-(J2-Pad34)"))
-    (pad 35 thru_hole oval (at -1.27 19.05 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 35 thru_hole oval (at 19.05 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 75 "Net-(J2-Pad35)"))
-    (pad 36 thru_hole oval (at 1.27 19.05 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 36 thru_hole oval (at 19.05 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 76 "Net-(J2-Pad36)"))
-    (pad 37 thru_hole oval (at -1.27 21.59 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 37 thru_hole oval (at 21.59 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 77 "Net-(J2-Pad37)"))
-    (pad 38 thru_hole oval (at 1.27 21.59 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 38 thru_hole oval (at 21.59 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 78 "Net-(J2-Pad38)"))
-    (pad 39 thru_hole oval (at -1.27 24.13 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 39 thru_hole oval (at 24.13 1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 79 "Net-(J2-Pad39)"))
-    (pad 40 thru_hole oval (at 1.27 24.13 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 40 thru_hole oval (at 24.13 -1.27 90) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 80 "Net-(J2-Pad40)"))
     (model Pin_Headers.3dshapes/Pin_Header_Straight_2x20.wrl
       (at (xyz 0.05 -0.95 0))
@@ -376,7 +456,7 @@
     )
   )
 
-  (module XESS:Samtec_HLE-120-02-XXX-DV-BE-XX-XX locked (layer F.Cu) (tedit 5515B62B) (tstamp 55174A29)
+  (module RPi_Hat:Samtec_HLE-120-02-XXX-DV-BE-XX-XX locked (layer F.Cu) (tedit 5515B62B) (tstamp 55174A29)
     (at 32.5 4)
     (path /5515D395/5515D39E)
     (fp_text reference J1 (at -24.13 5.08) (layer F.SilkS)
@@ -513,78 +593,6 @@
     (pad "" np_thru_hole circle (at 22.86 0) (size 1.778 1.778) (drill 1.778) (layers *.Cu *.Mask F.SilkS))
   )
 
-  (module XESS:RPi_Hat_Mounting_Hole locked (layer F.Cu) (tedit 55175EFC) (tstamp 5515DEBF)
-    (at 3.5 4)
-    (descr "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
-    (tags "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
-    (fp_text reference REF** (at 0 -4.0005) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value RPi_Hat_Mounting_Hole (at 0.09906 3.59918) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_circle (center 0 0) (end 1.375 0) (layer F.Fab) (width 0.15))
-    (fp_circle (center 0 0) (end 3.1 0) (layer F.Fab) (width 0.15))
-    (fp_circle (center 0 0) (end 3.1 0) (layer B.Fab) (width 0.15))
-    (fp_circle (center 0 0) (end 1.375 0) (layer B.Fab) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 2.75 2.75) (drill 2.75) (layers *.Cu *.Mask)
-      (solder_mask_margin 1.725))
-  )
-
-  (module XESS:RPi_Hat_Mounting_Hole locked (layer F.Cu) (tedit 55175EFC) (tstamp 5515DECC)
-    (at 3.5 53)
-    (descr "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
-    (tags "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
-    (fp_text reference REF** (at 0 -4.0005) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value RPi_Hat_Mounting_Hole (at 0.09906 3.59918) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_circle (center 0 0) (end 1.375 0) (layer F.Fab) (width 0.15))
-    (fp_circle (center 0 0) (end 3.1 0) (layer F.Fab) (width 0.15))
-    (fp_circle (center 0 0) (end 3.1 0) (layer B.Fab) (width 0.15))
-    (fp_circle (center 0 0) (end 1.375 0) (layer B.Fab) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 2.75 2.75) (drill 2.75) (layers *.Cu *.Mask)
-      (solder_mask_margin 1.725))
-  )
-
-  (module XESS:RPi_Hat_Mounting_Hole locked (layer F.Cu) (tedit 55175EFC) (tstamp 55169DC9)
-    (at 61.5 53)
-    (descr "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
-    (tags "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
-    (fp_text reference REF** (at 0 -4.0005) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value RPi_Hat_Mounting_Hole (at 0.09906 3.59918) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_circle (center 0 0) (end 1.375 0) (layer F.Fab) (width 0.15))
-    (fp_circle (center 0 0) (end 3.1 0) (layer F.Fab) (width 0.15))
-    (fp_circle (center 0 0) (end 3.1 0) (layer B.Fab) (width 0.15))
-    (fp_circle (center 0 0) (end 1.375 0) (layer B.Fab) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 2.75 2.75) (drill 2.75) (layers *.Cu *.Mask)
-      (solder_mask_margin 1.725))
-  )
-
-  (module XESS:RPi_Hat_Mounting_Hole locked (layer F.Cu) (tedit 55175EFC) (tstamp 5515DEA9)
-    (at 61.5 4)
-    (descr "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
-    (tags "Mounting hole, Befestigungsbohrung, 2,7mm, No Annular, Kein Restring,")
-    (fp_text reference REF** (at 0 -4.0005) (layer F.SilkS) hide
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value RPi_Hat_Mounting_Hole (at 0.09906 3.59918) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_circle (center 0 0) (end 1.375 0) (layer F.Fab) (width 0.15))
-    (fp_circle (center 0 0) (end 3.1 0) (layer F.Fab) (width 0.15))
-    (fp_circle (center 0 0) (end 3.1 0) (layer B.Fab) (width 0.15))
-    (fp_circle (center 0 0) (end 1.375 0) (layer B.Fab) (width 0.15))
-    (pad "" np_thru_hole circle (at 0 0) (size 2.75 2.75) (drill 2.75) (layers *.Cu *.Mask)
-      (solder_mask_margin 1.725))
-  )
-
   (gr_text "Select one of these board edges depending \nupon the type of socket that is used." (at 82.5 0.5) (layer Cmts.User)
     (effects (font (size 1.5 1.5) (thickness 0.15)) (justify left))
   )