diff --git a/lib/README b/lib/README
index ff6c1f7a..a89cfeaf 100644
--- a/lib/README
+++ b/lib/README
@@ -11,6 +11,15 @@ Atmel.SAM3X_DFP.1.0.50.atpack zip file found at:
 version 1.0.50 (extracted on 20180725). It has been modified to
 compile with gcc's LTO feature. See sam3x.patch for the modifications.
 
+The sam4e directory contains code from the
+Atmel.SAM4E_DFP.1.1.57.atpack zip file found at:
+  http://packs.download.atmel.com/
+version 1.1.57 (extracted on 20180806). It has been modified to
+compile with gcc's LTO feature. Also, some AFEC register RW accesses
+have been modified to comply with the SAM4E datasheet. Finally, the
+interrupt vector table has been slightly modified to allow the code to
+run. See cmsis-sam4e8e.patch for the modifications.
+
 The samd21 directory contains code from the
 Atmel.SAMD21_DFP.1.3.304.atpack zip file found at:
   http://packs.download.atmel.com/
@@ -18,14 +27,6 @@ version 1.3.304 (extracted on 20180725). It has been modified to
 compile with gcc's LTO feature and to work with chips that have a
 bootloader. See samd21.patch for the modifications.
 
-The cmsis-sam4e8e directory contains code from the
-Atmel.SAM4E_DFP.1.1.57.atpack zip file found at:
-  http://packs.download.atmel.com/
-version 1.1.57 (extracted on 20180806). It has been modified to compile
-with gcc's LTO feature. Also, some AFEC register RW accesses have been modified
-to comply with the SAM4E datasheet. Finally, the interrupt vector table has
-been slightly modified to allow the code to run. See cmsis-sam4e8e.patch for the modifications.
-
 The lpc176x directory contains code from the mbed project:
   https://github.com/ARMmbed/mbed-os
 version mbed-os-5.8.3 (c05d72c3c005fbb7e92c3994c32bda45218ae7fe).
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e16c_flash.ld b/lib/sam4e/gcc/gcc/sam4e16c_flash.ld
similarity index 100%
rename from lib/cmsis-sam4e/gcc/gcc/sam4e16c_flash.ld
rename to lib/sam4e/gcc/gcc/sam4e16c_flash.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e16c_sram.ld b/lib/sam4e/gcc/gcc/sam4e16c_sram.ld
similarity index 100%
rename from lib/cmsis-sam4e/gcc/gcc/sam4e16c_sram.ld
rename to lib/sam4e/gcc/gcc/sam4e16c_sram.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e16e_flash.ld b/lib/sam4e/gcc/gcc/sam4e16e_flash.ld
similarity index 100%
rename from lib/cmsis-sam4e/gcc/gcc/sam4e16e_flash.ld
rename to lib/sam4e/gcc/gcc/sam4e16e_flash.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e16e_sram.ld b/lib/sam4e/gcc/gcc/sam4e16e_sram.ld
similarity index 100%
rename from lib/cmsis-sam4e/gcc/gcc/sam4e16e_sram.ld
rename to lib/sam4e/gcc/gcc/sam4e16e_sram.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e8c_flash.ld b/lib/sam4e/gcc/gcc/sam4e8c_flash.ld
similarity index 100%
rename from lib/cmsis-sam4e/gcc/gcc/sam4e8c_flash.ld
rename to lib/sam4e/gcc/gcc/sam4e8c_flash.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e8c_sram.ld b/lib/sam4e/gcc/gcc/sam4e8c_sram.ld
similarity index 100%
rename from lib/cmsis-sam4e/gcc/gcc/sam4e8c_sram.ld
rename to lib/sam4e/gcc/gcc/sam4e8c_sram.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e8e_flash.ld b/lib/sam4e/gcc/gcc/sam4e8e_flash.ld
similarity index 100%
rename from lib/cmsis-sam4e/gcc/gcc/sam4e8e_flash.ld
rename to lib/sam4e/gcc/gcc/sam4e8e_flash.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e8e_sram.ld b/lib/sam4e/gcc/gcc/sam4e8e_sram.ld
similarity index 100%
rename from lib/cmsis-sam4e/gcc/gcc/sam4e8e_sram.ld
rename to lib/sam4e/gcc/gcc/sam4e8e_sram.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e_flash.ld b/lib/sam4e/gcc/gcc/sam4e_flash.ld
similarity index 100%
rename from lib/cmsis-sam4e/gcc/gcc/sam4e_flash.ld
rename to lib/sam4e/gcc/gcc/sam4e_flash.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e_sram.ld b/lib/sam4e/gcc/gcc/sam4e_sram.ld
similarity index 100%
rename from lib/cmsis-sam4e/gcc/gcc/sam4e_sram.ld
rename to lib/sam4e/gcc/gcc/sam4e_sram.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/startup_sam4e.c b/lib/sam4e/gcc/gcc/startup_sam4e.c
similarity index 100%
rename from lib/cmsis-sam4e/gcc/gcc/startup_sam4e.c
rename to lib/sam4e/gcc/gcc/startup_sam4e.c
diff --git a/lib/cmsis-sam4e/gcc/system_sam4e.c b/lib/sam4e/gcc/system_sam4e.c
similarity index 100%
rename from lib/cmsis-sam4e/gcc/system_sam4e.c
rename to lib/sam4e/gcc/system_sam4e.c
diff --git a/lib/cmsis-sam4e/include/component/acc.h b/lib/sam4e/include/component/acc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/acc.h
rename to lib/sam4e/include/component/acc.h
diff --git a/lib/cmsis-sam4e/include/component/aes.h b/lib/sam4e/include/component/aes.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/aes.h
rename to lib/sam4e/include/component/aes.h
diff --git a/lib/cmsis-sam4e/include/component/afec.h b/lib/sam4e/include/component/afec.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/afec.h
rename to lib/sam4e/include/component/afec.h
diff --git a/lib/cmsis-sam4e/include/component/can.h b/lib/sam4e/include/component/can.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/can.h
rename to lib/sam4e/include/component/can.h
diff --git a/lib/cmsis-sam4e/include/component/chipid.h b/lib/sam4e/include/component/chipid.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/chipid.h
rename to lib/sam4e/include/component/chipid.h
diff --git a/lib/cmsis-sam4e/include/component/cmcc.h b/lib/sam4e/include/component/cmcc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/cmcc.h
rename to lib/sam4e/include/component/cmcc.h
diff --git a/lib/cmsis-sam4e/include/component/crccu.h b/lib/sam4e/include/component/crccu.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/crccu.h
rename to lib/sam4e/include/component/crccu.h
diff --git a/lib/cmsis-sam4e/include/component/dacc.h b/lib/sam4e/include/component/dacc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/dacc.h
rename to lib/sam4e/include/component/dacc.h
diff --git a/lib/cmsis-sam4e/include/component/dmac.h b/lib/sam4e/include/component/dmac.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/dmac.h
rename to lib/sam4e/include/component/dmac.h
diff --git a/lib/cmsis-sam4e/include/component/efc.h b/lib/sam4e/include/component/efc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/efc.h
rename to lib/sam4e/include/component/efc.h
diff --git a/lib/cmsis-sam4e/include/component/gmac.h b/lib/sam4e/include/component/gmac.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/gmac.h
rename to lib/sam4e/include/component/gmac.h
diff --git a/lib/cmsis-sam4e/include/component/gpbr.h b/lib/sam4e/include/component/gpbr.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/gpbr.h
rename to lib/sam4e/include/component/gpbr.h
diff --git a/lib/cmsis-sam4e/include/component/hsmci.h b/lib/sam4e/include/component/hsmci.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/hsmci.h
rename to lib/sam4e/include/component/hsmci.h
diff --git a/lib/cmsis-sam4e/include/component/matrix.h b/lib/sam4e/include/component/matrix.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/matrix.h
rename to lib/sam4e/include/component/matrix.h
diff --git a/lib/cmsis-sam4e/include/component/pdc.h b/lib/sam4e/include/component/pdc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/pdc.h
rename to lib/sam4e/include/component/pdc.h
diff --git a/lib/cmsis-sam4e/include/component/pio.h b/lib/sam4e/include/component/pio.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/pio.h
rename to lib/sam4e/include/component/pio.h
diff --git a/lib/cmsis-sam4e/include/component/pmc.h b/lib/sam4e/include/component/pmc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/pmc.h
rename to lib/sam4e/include/component/pmc.h
diff --git a/lib/cmsis-sam4e/include/component/pwm.h b/lib/sam4e/include/component/pwm.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/pwm.h
rename to lib/sam4e/include/component/pwm.h
diff --git a/lib/cmsis-sam4e/include/component/rstc.h b/lib/sam4e/include/component/rstc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/rstc.h
rename to lib/sam4e/include/component/rstc.h
diff --git a/lib/cmsis-sam4e/include/component/rtc.h b/lib/sam4e/include/component/rtc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/rtc.h
rename to lib/sam4e/include/component/rtc.h
diff --git a/lib/cmsis-sam4e/include/component/rtt.h b/lib/sam4e/include/component/rtt.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/rtt.h
rename to lib/sam4e/include/component/rtt.h
diff --git a/lib/cmsis-sam4e/include/component/smc.h b/lib/sam4e/include/component/smc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/smc.h
rename to lib/sam4e/include/component/smc.h
diff --git a/lib/cmsis-sam4e/include/component/spi.h b/lib/sam4e/include/component/spi.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/spi.h
rename to lib/sam4e/include/component/spi.h
diff --git a/lib/cmsis-sam4e/include/component/supc.h b/lib/sam4e/include/component/supc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/supc.h
rename to lib/sam4e/include/component/supc.h
diff --git a/lib/cmsis-sam4e/include/component/tc.h b/lib/sam4e/include/component/tc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/tc.h
rename to lib/sam4e/include/component/tc.h
diff --git a/lib/cmsis-sam4e/include/component/twi.h b/lib/sam4e/include/component/twi.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/twi.h
rename to lib/sam4e/include/component/twi.h
diff --git a/lib/cmsis-sam4e/include/component/uart.h b/lib/sam4e/include/component/uart.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/uart.h
rename to lib/sam4e/include/component/uart.h
diff --git a/lib/cmsis-sam4e/include/component/udp.h b/lib/sam4e/include/component/udp.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/udp.h
rename to lib/sam4e/include/component/udp.h
diff --git a/lib/cmsis-sam4e/include/component/usart.h b/lib/sam4e/include/component/usart.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/usart.h
rename to lib/sam4e/include/component/usart.h
diff --git a/lib/cmsis-sam4e/include/component/wdt.h b/lib/sam4e/include/component/wdt.h
similarity index 100%
rename from lib/cmsis-sam4e/include/component/wdt.h
rename to lib/sam4e/include/component/wdt.h
diff --git a/lib/cmsis-sam4e/include/instance/acc.h b/lib/sam4e/include/instance/acc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/acc.h
rename to lib/sam4e/include/instance/acc.h
diff --git a/lib/cmsis-sam4e/include/instance/aes.h b/lib/sam4e/include/instance/aes.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/aes.h
rename to lib/sam4e/include/instance/aes.h
diff --git a/lib/cmsis-sam4e/include/instance/afec0.h b/lib/sam4e/include/instance/afec0.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/afec0.h
rename to lib/sam4e/include/instance/afec0.h
diff --git a/lib/cmsis-sam4e/include/instance/afec1.h b/lib/sam4e/include/instance/afec1.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/afec1.h
rename to lib/sam4e/include/instance/afec1.h
diff --git a/lib/cmsis-sam4e/include/instance/can0.h b/lib/sam4e/include/instance/can0.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/can0.h
rename to lib/sam4e/include/instance/can0.h
diff --git a/lib/cmsis-sam4e/include/instance/can1.h b/lib/sam4e/include/instance/can1.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/can1.h
rename to lib/sam4e/include/instance/can1.h
diff --git a/lib/cmsis-sam4e/include/instance/chipid.h b/lib/sam4e/include/instance/chipid.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/chipid.h
rename to lib/sam4e/include/instance/chipid.h
diff --git a/lib/cmsis-sam4e/include/instance/cmcc.h b/lib/sam4e/include/instance/cmcc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/cmcc.h
rename to lib/sam4e/include/instance/cmcc.h
diff --git a/lib/cmsis-sam4e/include/instance/crccu.h b/lib/sam4e/include/instance/crccu.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/crccu.h
rename to lib/sam4e/include/instance/crccu.h
diff --git a/lib/cmsis-sam4e/include/instance/dacc.h b/lib/sam4e/include/instance/dacc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/dacc.h
rename to lib/sam4e/include/instance/dacc.h
diff --git a/lib/cmsis-sam4e/include/instance/dmac.h b/lib/sam4e/include/instance/dmac.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/dmac.h
rename to lib/sam4e/include/instance/dmac.h
diff --git a/lib/cmsis-sam4e/include/instance/efc.h b/lib/sam4e/include/instance/efc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/efc.h
rename to lib/sam4e/include/instance/efc.h
diff --git a/lib/cmsis-sam4e/include/instance/gmac.h b/lib/sam4e/include/instance/gmac.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/gmac.h
rename to lib/sam4e/include/instance/gmac.h
diff --git a/lib/cmsis-sam4e/include/instance/gpbr.h b/lib/sam4e/include/instance/gpbr.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/gpbr.h
rename to lib/sam4e/include/instance/gpbr.h
diff --git a/lib/cmsis-sam4e/include/instance/hsmci.h b/lib/sam4e/include/instance/hsmci.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/hsmci.h
rename to lib/sam4e/include/instance/hsmci.h
diff --git a/lib/cmsis-sam4e/include/instance/matrix.h b/lib/sam4e/include/instance/matrix.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/matrix.h
rename to lib/sam4e/include/instance/matrix.h
diff --git a/lib/cmsis-sam4e/include/instance/pioa.h b/lib/sam4e/include/instance/pioa.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/pioa.h
rename to lib/sam4e/include/instance/pioa.h
diff --git a/lib/cmsis-sam4e/include/instance/piob.h b/lib/sam4e/include/instance/piob.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/piob.h
rename to lib/sam4e/include/instance/piob.h
diff --git a/lib/cmsis-sam4e/include/instance/pioc.h b/lib/sam4e/include/instance/pioc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/pioc.h
rename to lib/sam4e/include/instance/pioc.h
diff --git a/lib/cmsis-sam4e/include/instance/piod.h b/lib/sam4e/include/instance/piod.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/piod.h
rename to lib/sam4e/include/instance/piod.h
diff --git a/lib/cmsis-sam4e/include/instance/pioe.h b/lib/sam4e/include/instance/pioe.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/pioe.h
rename to lib/sam4e/include/instance/pioe.h
diff --git a/lib/cmsis-sam4e/include/instance/pmc.h b/lib/sam4e/include/instance/pmc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/pmc.h
rename to lib/sam4e/include/instance/pmc.h
diff --git a/lib/cmsis-sam4e/include/instance/pwm.h b/lib/sam4e/include/instance/pwm.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/pwm.h
rename to lib/sam4e/include/instance/pwm.h
diff --git a/lib/cmsis-sam4e/include/instance/rstc.h b/lib/sam4e/include/instance/rstc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/rstc.h
rename to lib/sam4e/include/instance/rstc.h
diff --git a/lib/cmsis-sam4e/include/instance/rtc.h b/lib/sam4e/include/instance/rtc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/rtc.h
rename to lib/sam4e/include/instance/rtc.h
diff --git a/lib/cmsis-sam4e/include/instance/rtt.h b/lib/sam4e/include/instance/rtt.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/rtt.h
rename to lib/sam4e/include/instance/rtt.h
diff --git a/lib/cmsis-sam4e/include/instance/smc.h b/lib/sam4e/include/instance/smc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/smc.h
rename to lib/sam4e/include/instance/smc.h
diff --git a/lib/cmsis-sam4e/include/instance/spi.h b/lib/sam4e/include/instance/spi.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/spi.h
rename to lib/sam4e/include/instance/spi.h
diff --git a/lib/cmsis-sam4e/include/instance/supc.h b/lib/sam4e/include/instance/supc.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/supc.h
rename to lib/sam4e/include/instance/supc.h
diff --git a/lib/cmsis-sam4e/include/instance/tc0.h b/lib/sam4e/include/instance/tc0.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/tc0.h
rename to lib/sam4e/include/instance/tc0.h
diff --git a/lib/cmsis-sam4e/include/instance/tc1.h b/lib/sam4e/include/instance/tc1.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/tc1.h
rename to lib/sam4e/include/instance/tc1.h
diff --git a/lib/cmsis-sam4e/include/instance/tc2.h b/lib/sam4e/include/instance/tc2.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/tc2.h
rename to lib/sam4e/include/instance/tc2.h
diff --git a/lib/cmsis-sam4e/include/instance/twi0.h b/lib/sam4e/include/instance/twi0.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/twi0.h
rename to lib/sam4e/include/instance/twi0.h
diff --git a/lib/cmsis-sam4e/include/instance/twi1.h b/lib/sam4e/include/instance/twi1.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/twi1.h
rename to lib/sam4e/include/instance/twi1.h
diff --git a/lib/cmsis-sam4e/include/instance/uart0.h b/lib/sam4e/include/instance/uart0.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/uart0.h
rename to lib/sam4e/include/instance/uart0.h
diff --git a/lib/cmsis-sam4e/include/instance/uart1.h b/lib/sam4e/include/instance/uart1.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/uart1.h
rename to lib/sam4e/include/instance/uart1.h
diff --git a/lib/cmsis-sam4e/include/instance/udp.h b/lib/sam4e/include/instance/udp.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/udp.h
rename to lib/sam4e/include/instance/udp.h
diff --git a/lib/cmsis-sam4e/include/instance/usart0.h b/lib/sam4e/include/instance/usart0.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/usart0.h
rename to lib/sam4e/include/instance/usart0.h
diff --git a/lib/cmsis-sam4e/include/instance/usart1.h b/lib/sam4e/include/instance/usart1.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/usart1.h
rename to lib/sam4e/include/instance/usart1.h
diff --git a/lib/cmsis-sam4e/include/instance/wdt.h b/lib/sam4e/include/instance/wdt.h
similarity index 100%
rename from lib/cmsis-sam4e/include/instance/wdt.h
rename to lib/sam4e/include/instance/wdt.h
diff --git a/lib/cmsis-sam4e/include/pio/sam4e16c.h b/lib/sam4e/include/pio/sam4e16c.h
similarity index 100%
rename from lib/cmsis-sam4e/include/pio/sam4e16c.h
rename to lib/sam4e/include/pio/sam4e16c.h
diff --git a/lib/cmsis-sam4e/include/pio/sam4e16e.h b/lib/sam4e/include/pio/sam4e16e.h
similarity index 100%
rename from lib/cmsis-sam4e/include/pio/sam4e16e.h
rename to lib/sam4e/include/pio/sam4e16e.h
diff --git a/lib/cmsis-sam4e/include/pio/sam4e8c.h b/lib/sam4e/include/pio/sam4e8c.h
similarity index 100%
rename from lib/cmsis-sam4e/include/pio/sam4e8c.h
rename to lib/sam4e/include/pio/sam4e8c.h
diff --git a/lib/cmsis-sam4e/include/pio/sam4e8e.h b/lib/sam4e/include/pio/sam4e8e.h
similarity index 100%
rename from lib/cmsis-sam4e/include/pio/sam4e8e.h
rename to lib/sam4e/include/pio/sam4e8e.h
diff --git a/lib/cmsis-sam4e/include/sam4e.h b/lib/sam4e/include/sam4e.h
similarity index 100%
rename from lib/cmsis-sam4e/include/sam4e.h
rename to lib/sam4e/include/sam4e.h
diff --git a/lib/cmsis-sam4e/include/sam4e16c.h b/lib/sam4e/include/sam4e16c.h
similarity index 100%
rename from lib/cmsis-sam4e/include/sam4e16c.h
rename to lib/sam4e/include/sam4e16c.h
diff --git a/lib/cmsis-sam4e/include/sam4e16e.h b/lib/sam4e/include/sam4e16e.h
similarity index 100%
rename from lib/cmsis-sam4e/include/sam4e16e.h
rename to lib/sam4e/include/sam4e16e.h
diff --git a/lib/cmsis-sam4e/include/sam4e8c.h b/lib/sam4e/include/sam4e8c.h
similarity index 100%
rename from lib/cmsis-sam4e/include/sam4e8c.h
rename to lib/sam4e/include/sam4e8c.h
diff --git a/lib/cmsis-sam4e/include/sam4e8e.h b/lib/sam4e/include/sam4e8e.h
similarity index 100%
rename from lib/cmsis-sam4e/include/sam4e8e.h
rename to lib/sam4e/include/sam4e8e.h
diff --git a/lib/cmsis-sam4e/include/system_sam4e.h b/lib/sam4e/include/system_sam4e.h
similarity index 100%
rename from lib/cmsis-sam4e/include/system_sam4e.h
rename to lib/sam4e/include/system_sam4e.h
diff --git a/lib/cmsis-sam4e/cmsis-sam4e.patch b/lib/sam4e/sam4e.patch
similarity index 90%
rename from lib/cmsis-sam4e/cmsis-sam4e.patch
rename to lib/sam4e/sam4e.patch
index f69edfb2..6e4d7b9b 100644
--- a/lib/cmsis-sam4e/cmsis-sam4e.patch
+++ b/lib/sam4e/sam4e.patch
@@ -1,5 +1,5 @@
---- a/lib/cmsis-sam4e/gcc/gcc/startup_sam4e.c
-+++ b/lib/cmsis-sam4e/gcc/gcc/startup_sam4e.c
+--- a/lib/sam4e/gcc/gcc/startup_sam4e.c
++++ b/lib/sam4e/gcc/gcc/startup_sam4e.c
 @@ -104,7 +105,7 @@ void GMAC_Handler   ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
  void UART1_Handler  ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 
@@ -37,10 +37,10 @@
 
          /* Branch to main function */
          main();
-diff --git a/lib/cmsis-sam4e/include/component/afec.h b/lib/cmsis-sam4e/include/component/afec.h
+diff --git a/lib/sam4e/include/component/afec.h b/lib/sam4e/include/component/afec.h
 index 34c4e61d..9a4f8f96 100644
---- a/lib/cmsis-sam4e/include/component/afec.h
-+++ b/lib/cmsis-sam4e/include/component/afec.h
+--- a/lib/sam4e/include/component/afec.h
++++ b/lib/sam4e/include/component/afec.h
 @@ -59,9 +59,9 @@ typedef struct {
    RoReg Reserved2[1];
    RwReg AFE_CDOR;      /**< \brief (Afec Offset: 0x5C) Channel DC Offset Register */
diff --git a/src/sam4e8e/Makefile b/src/sam4e8e/Makefile
index 4eda793d..a80741bf 100644
--- a/src/sam4e8e/Makefile
+++ b/src/sam4e8e/Makefile
@@ -7,16 +7,13 @@ dirs-y += src/sam4e8e src/generic
 CFLAGS += -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
 CFLAGS += -D__SAM4E8E__
 
-CFLAGS_klipper.elf += -L lib/cmsis-sam4e/gcc/gcc
-CFLAGS_klipper.elf += -T lib/cmsis-sam4e/gcc/gcc/sam4e8e_flash.ld
+CFLAGS_klipper.elf += -L lib/sam4e/gcc/gcc
+CFLAGS_klipper.elf += -T lib/sam4e/gcc/gcc/sam4e8e_flash.ld
 CFLAGS_klipper.elf += --specs=nano.specs --specs=nosys.specs
 
-dirs-y += lib/cmsis-sam4e/gcc \
-		  lib/cmsis-sam4e/gcc/gcc
-CFLAGS += -Ilib/cmsis-sam4e/include \
-		  -Ilib/cmsis-core
-src-y +=  ../lib/cmsis-sam4e/gcc/system_sam4e.c \
-		  ../lib/cmsis-sam4e/gcc/gcc/startup_sam4e.c
+dirs-y += lib/sam4e/gcc lib/sam4e/gcc/gcc
+CFLAGS += -Ilib/sam4e/include -Ilib/cmsis-core
+src-y += ../lib/sam4e/gcc/system_sam4e.c ../lib/sam4e/gcc/gcc/startup_sam4e.c
 
 src-$(CONFIG_HAVE_GPIO_SPI) += sam4e8e/spi.c
 src-$(CONFIG_HAVE_GPIO_I2C) += sam4e8e/i2c.c