diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/Makefile b/hardware/sam/system/libsam/build_gcc/Makefile similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/Makefile rename to hardware/sam/system/libsam/build_gcc/Makefile diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug.mk b/hardware/sam/system/libsam/build_gcc/debug.mk similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug.mk rename to hardware/sam/system/libsam/build_gcc/debug.mk diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/acc.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/acc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/acc.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/acc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/adc.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/adc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/adc.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/adc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/async.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/async.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/async.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/async.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/core_cm3.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/core_cm3.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/core_cm3.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/core_cm3.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/crccu.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/crccu.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/crccu.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/crccu.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/dacc.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/dacc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/dacc.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/dacc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/efc.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/efc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/efc.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/efc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/exceptions.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/exceptions.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/exceptions.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/exceptions.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/flashd.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/flashd.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/flashd.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/flashd.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pio.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/pio.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pio.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/pio.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pio_capture.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/pio_capture.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pio_capture.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/pio_capture.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pmc.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/pmc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pmc.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/pmc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pwmc.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/pwmc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/pwmc.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/pwmc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/rtc.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/rtc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/rtc.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/rtc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/rtt.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/rtt.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/rtt.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/rtt.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/spi.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/spi.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/spi.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/spi.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/spi_pdc.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/spi_pdc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/spi_pdc.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/spi_pdc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/ssc.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/ssc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/ssc.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/ssc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/tc.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/tc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/tc.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/tc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/twi.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/twi.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/twi.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/twi.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/twid.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/twid.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/twid.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/twid.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/usart.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/usart.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/usart.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/usart.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/wdt.o b/hardware/sam/system/libsam/build_gcc/debug_sam3s4/wdt.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/debug_sam3s4/wdt.o rename to hardware/sam/system/libsam/build_gcc/debug_sam3s4/wdt.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/gcc.mk b/hardware/sam/system/libsam/build_gcc/gcc.mk similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/gcc.mk rename to hardware/sam/system/libsam/build_gcc/gcc.mk diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release.mk b/hardware/sam/system/libsam/build_gcc/release.mk similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release.mk rename to hardware/sam/system/libsam/build_gcc/release.mk diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/acc.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/acc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/acc.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/acc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/adc.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/adc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/adc.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/adc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/async.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/async.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/async.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/async.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/core_cm3.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/core_cm3.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/core_cm3.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/core_cm3.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/crccu.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/crccu.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/crccu.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/crccu.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/dacc.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/dacc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/dacc.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/dacc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/efc.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/efc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/efc.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/efc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/exceptions.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/exceptions.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/exceptions.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/exceptions.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/flashd.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/flashd.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/flashd.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/flashd.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pio.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/pio.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pio.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/pio.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pio_capture.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/pio_capture.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pio_capture.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/pio_capture.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pmc.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/pmc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pmc.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/pmc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pwmc.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/pwmc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/pwmc.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/pwmc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/rtc.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/rtc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/rtc.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/rtc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/rtt.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/rtt.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/rtt.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/rtt.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/spi.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/spi.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/spi.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/spi.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/spi_pdc.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/spi_pdc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/spi_pdc.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/spi_pdc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/ssc.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/ssc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/ssc.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/ssc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/tc.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/tc.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/tc.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/tc.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/twi.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/twi.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/twi.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/twi.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/twid.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/twid.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/twid.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/twid.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/usart.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/usart.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/usart.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/usart.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/wdt.o b/hardware/sam/system/libsam/build_gcc/release_sam3s4/wdt.o similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/release_sam3s4/wdt.o rename to hardware/sam/system/libsam/build_gcc/release_sam3s4/wdt.o diff --git a/hardware/sam/cores/sam/sam3s/build_gcc/sam3s.mk b/hardware/sam/system/libsam/build_gcc/sam3s.mk similarity index 100% rename from hardware/sam/cores/sam/sam3s/build_gcc/sam3s.mk rename to hardware/sam/system/libsam/build_gcc/sam3s.mk diff --git a/hardware/sam/cores/sam/sam3s/chip.h b/hardware/sam/system/libsam/chip.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/chip.h rename to hardware/sam/system/libsam/chip.h diff --git a/hardware/sam/cores/sam/sam3s/cmsis/core_cm3.c b/hardware/sam/system/libsam/cmsis/core_cm3.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/cmsis/core_cm3.c rename to hardware/sam/system/libsam/cmsis/core_cm3.c diff --git a/hardware/sam/cores/sam/sam3s/cmsis/core_cm3.h b/hardware/sam/system/libsam/cmsis/core_cm3.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/cmsis/core_cm3.h rename to hardware/sam/system/libsam/cmsis/core_cm3.h diff --git a/hardware/sam/cores/sam/sam3s/cmsis/core_cmFunc.h b/hardware/sam/system/libsam/cmsis/core_cmFunc.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/cmsis/core_cmFunc.h rename to hardware/sam/system/libsam/cmsis/core_cmFunc.h diff --git a/hardware/sam/cores/sam/sam3s/cmsis/core_cmInstr.h b/hardware/sam/system/libsam/cmsis/core_cmInstr.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/cmsis/core_cmInstr.h rename to hardware/sam/system/libsam/cmsis/core_cmInstr.h diff --git a/hardware/sam/cores/sam/sam3s/include/SAM3S.h b/hardware/sam/system/libsam/include/SAM3S.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/SAM3S.h rename to hardware/sam/system/libsam/include/SAM3S.h diff --git a/hardware/sam/cores/sam/sam3s/include/acc.h b/hardware/sam/system/libsam/include/acc.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/acc.h rename to hardware/sam/system/libsam/include/acc.h diff --git a/hardware/sam/cores/sam/sam3s/include/adc.h b/hardware/sam/system/libsam/include/adc.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/adc.h rename to hardware/sam/system/libsam/include/adc.h diff --git a/hardware/sam/cores/sam/sam3s/include/async.h b/hardware/sam/system/libsam/include/async.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/async.h rename to hardware/sam/system/libsam/include/async.h diff --git a/hardware/sam/cores/sam/sam3s/include/crccu.h b/hardware/sam/system/libsam/include/crccu.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/crccu.h rename to hardware/sam/system/libsam/include/crccu.h diff --git a/hardware/sam/cores/sam/sam3s/include/dacc.h b/hardware/sam/system/libsam/include/dacc.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/dacc.h rename to hardware/sam/system/libsam/include/dacc.h diff --git a/hardware/sam/cores/sam/sam3s/include/efc.h b/hardware/sam/system/libsam/include/efc.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/efc.h rename to hardware/sam/system/libsam/include/efc.h diff --git a/hardware/sam/cores/sam/sam3s/include/exceptions.h b/hardware/sam/system/libsam/include/exceptions.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/exceptions.h rename to hardware/sam/system/libsam/include/exceptions.h diff --git a/hardware/sam/cores/sam/sam3s/include/flashd.h b/hardware/sam/system/libsam/include/flashd.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/flashd.h rename to hardware/sam/system/libsam/include/flashd.h diff --git a/hardware/sam/cores/sam/sam3s/include/pio.h b/hardware/sam/system/libsam/include/pio.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/pio.h rename to hardware/sam/system/libsam/include/pio.h diff --git a/hardware/sam/cores/sam/sam3s/include/pio_capture.h b/hardware/sam/system/libsam/include/pio_capture.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/pio_capture.h rename to hardware/sam/system/libsam/include/pio_capture.h diff --git a/hardware/sam/cores/sam/sam3s/include/pio_it.h b/hardware/sam/system/libsam/include/pio_it.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/pio_it.h rename to hardware/sam/system/libsam/include/pio_it.h diff --git a/hardware/sam/cores/sam/sam3s/include/pmc.h b/hardware/sam/system/libsam/include/pmc.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/pmc.h rename to hardware/sam/system/libsam/include/pmc.h diff --git a/hardware/sam/cores/sam/sam3s/include/pwmc.h b/hardware/sam/system/libsam/include/pwmc.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/pwmc.h rename to hardware/sam/system/libsam/include/pwmc.h diff --git a/hardware/sam/cores/sam/sam3s/include/rtc.h b/hardware/sam/system/libsam/include/rtc.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/rtc.h rename to hardware/sam/system/libsam/include/rtc.h diff --git a/hardware/sam/cores/sam/sam3s/include/rtt.h b/hardware/sam/system/libsam/include/rtt.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/rtt.h rename to hardware/sam/system/libsam/include/rtt.h diff --git a/hardware/sam/cores/sam/sam3s/include/spi.h b/hardware/sam/system/libsam/include/spi.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/spi.h rename to hardware/sam/system/libsam/include/spi.h diff --git a/hardware/sam/cores/sam/sam3s/include/spi_pdc.h b/hardware/sam/system/libsam/include/spi_pdc.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/spi_pdc.h rename to hardware/sam/system/libsam/include/spi_pdc.h diff --git a/hardware/sam/cores/sam/sam3s/include/ssc.h b/hardware/sam/system/libsam/include/ssc.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/ssc.h rename to hardware/sam/system/libsam/include/ssc.h diff --git a/hardware/sam/cores/sam/sam3s/include/tc.h b/hardware/sam/system/libsam/include/tc.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/tc.h rename to hardware/sam/system/libsam/include/tc.h diff --git a/hardware/sam/cores/sam/sam3s/include/twi.h b/hardware/sam/system/libsam/include/twi.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/twi.h rename to hardware/sam/system/libsam/include/twi.h diff --git a/hardware/sam/cores/sam/sam3s/include/twid.h b/hardware/sam/system/libsam/include/twid.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/twid.h rename to hardware/sam/system/libsam/include/twid.h diff --git a/hardware/sam/cores/sam/sam3s/include/usart.h b/hardware/sam/system/libsam/include/usart.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/usart.h rename to hardware/sam/system/libsam/include/usart.h diff --git a/hardware/sam/cores/sam/sam3s/include/wdt.h b/hardware/sam/system/libsam/include/wdt.h similarity index 100% rename from hardware/sam/cores/sam/sam3s/include/wdt.h rename to hardware/sam/system/libsam/include/wdt.h diff --git a/hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_dbg.a b/hardware/sam/system/libsam/lib/libchip_sam3s4_gcc_dbg.a similarity index 100% rename from hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_dbg.a rename to hardware/sam/system/libsam/lib/libchip_sam3s4_gcc_dbg.a diff --git a/hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_dbg.a.txt b/hardware/sam/system/libsam/lib/libchip_sam3s4_gcc_dbg.a.txt similarity index 100% rename from hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_dbg.a.txt rename to hardware/sam/system/libsam/lib/libchip_sam3s4_gcc_dbg.a.txt diff --git a/hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_rel.a b/hardware/sam/system/libsam/lib/libchip_sam3s4_gcc_rel.a similarity index 100% rename from hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_rel.a rename to hardware/sam/system/libsam/lib/libchip_sam3s4_gcc_rel.a diff --git a/hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_rel.a.txt b/hardware/sam/system/libsam/lib/libchip_sam3s4_gcc_rel.a.txt similarity index 100% rename from hardware/sam/cores/sam/sam3s/lib/libchip_sam3s4_gcc_rel.a.txt rename to hardware/sam/system/libsam/lib/libchip_sam3s4_gcc_rel.a.txt diff --git a/hardware/sam/cores/sam/sam3s/source/acc.c b/hardware/sam/system/libsam/source/acc.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/acc.c rename to hardware/sam/system/libsam/source/acc.c diff --git a/hardware/sam/cores/sam/sam3s/source/adc.c b/hardware/sam/system/libsam/source/adc.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/adc.c rename to hardware/sam/system/libsam/source/adc.c diff --git a/hardware/sam/cores/sam/sam3s/source/async.c b/hardware/sam/system/libsam/source/async.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/async.c rename to hardware/sam/system/libsam/source/async.c diff --git a/hardware/sam/cores/sam/sam3s/source/crccu.c b/hardware/sam/system/libsam/source/crccu.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/crccu.c rename to hardware/sam/system/libsam/source/crccu.c diff --git a/hardware/sam/cores/sam/sam3s/source/dacc.c b/hardware/sam/system/libsam/source/dacc.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/dacc.c rename to hardware/sam/system/libsam/source/dacc.c diff --git a/hardware/sam/cores/sam/sam3s/source/efc.c b/hardware/sam/system/libsam/source/efc.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/efc.c rename to hardware/sam/system/libsam/source/efc.c diff --git a/hardware/sam/cores/sam/sam3s/source/exceptions.c b/hardware/sam/system/libsam/source/exceptions.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/exceptions.c rename to hardware/sam/system/libsam/source/exceptions.c diff --git a/hardware/sam/cores/sam/sam3s/source/flashd.c b/hardware/sam/system/libsam/source/flashd.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/flashd.c rename to hardware/sam/system/libsam/source/flashd.c diff --git a/hardware/sam/cores/sam/sam3s/source/pio.c b/hardware/sam/system/libsam/source/pio.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/pio.c rename to hardware/sam/system/libsam/source/pio.c diff --git a/hardware/sam/cores/sam/sam3s/source/pio_capture.c b/hardware/sam/system/libsam/source/pio_capture.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/pio_capture.c rename to hardware/sam/system/libsam/source/pio_capture.c diff --git a/hardware/sam/cores/sam/sam3s/source/pio_it.c b/hardware/sam/system/libsam/source/pio_it.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/pio_it.c rename to hardware/sam/system/libsam/source/pio_it.c diff --git a/hardware/sam/cores/sam/sam3s/source/pmc.c b/hardware/sam/system/libsam/source/pmc.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/pmc.c rename to hardware/sam/system/libsam/source/pmc.c diff --git a/hardware/sam/cores/sam/sam3s/source/pwmc.c b/hardware/sam/system/libsam/source/pwmc.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/pwmc.c rename to hardware/sam/system/libsam/source/pwmc.c diff --git a/hardware/sam/cores/sam/sam3s/source/rtc.c b/hardware/sam/system/libsam/source/rtc.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/rtc.c rename to hardware/sam/system/libsam/source/rtc.c diff --git a/hardware/sam/cores/sam/sam3s/source/rtt.c b/hardware/sam/system/libsam/source/rtt.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/rtt.c rename to hardware/sam/system/libsam/source/rtt.c diff --git a/hardware/sam/cores/sam/sam3s/source/spi.c b/hardware/sam/system/libsam/source/spi.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/spi.c rename to hardware/sam/system/libsam/source/spi.c diff --git a/hardware/sam/cores/sam/sam3s/source/spi_pdc.c b/hardware/sam/system/libsam/source/spi_pdc.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/spi_pdc.c rename to hardware/sam/system/libsam/source/spi_pdc.c diff --git a/hardware/sam/cores/sam/sam3s/source/ssc.c b/hardware/sam/system/libsam/source/ssc.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/ssc.c rename to hardware/sam/system/libsam/source/ssc.c diff --git a/hardware/sam/cores/sam/sam3s/source/tc.c b/hardware/sam/system/libsam/source/tc.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/tc.c rename to hardware/sam/system/libsam/source/tc.c diff --git a/hardware/sam/cores/sam/sam3s/source/twi.c b/hardware/sam/system/libsam/source/twi.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/twi.c rename to hardware/sam/system/libsam/source/twi.c diff --git a/hardware/sam/cores/sam/sam3s/source/twid.c b/hardware/sam/system/libsam/source/twid.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/twid.c rename to hardware/sam/system/libsam/source/twid.c diff --git a/hardware/sam/cores/sam/sam3s/source/usart.c b/hardware/sam/system/libsam/source/usart.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/usart.c rename to hardware/sam/system/libsam/source/usart.c diff --git a/hardware/sam/cores/sam/sam3s/source/wdt.c b/hardware/sam/system/libsam/source/wdt.c similarity index 100% rename from hardware/sam/cores/sam/sam3s/source/wdt.c rename to hardware/sam/system/libsam/source/wdt.c