diff --git a/cpu/sam3x8e/Makefile b/cpu/sam3/Makefile
similarity index 100%
rename from cpu/sam3x8e/Makefile
rename to cpu/sam3/Makefile
diff --git a/cpu/sam3x8e/Makefile.include b/cpu/sam3/Makefile.include
similarity index 100%
rename from cpu/sam3x8e/Makefile.include
rename to cpu/sam3/Makefile.include
diff --git a/cpu/sam3x8e/cpu.c b/cpu/sam3/cpu.c
similarity index 100%
rename from cpu/sam3x8e/cpu.c
rename to cpu/sam3/cpu.c
diff --git a/cpu/sam3x8e/doc.txt b/cpu/sam3/doc.txt
similarity index 100%
rename from cpu/sam3x8e/doc.txt
rename to cpu/sam3/doc.txt
diff --git a/cpu/sam3x8e/hwtimer_arch.c b/cpu/sam3/hwtimer_arch.c
similarity index 100%
rename from cpu/sam3x8e/hwtimer_arch.c
rename to cpu/sam3/hwtimer_arch.c
diff --git a/cpu/sam3x8e/include/component/component_adc.h b/cpu/sam3/include/component/component_adc.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_adc.h
rename to cpu/sam3/include/component/component_adc.h
diff --git a/cpu/sam3x8e/include/component/component_can.h b/cpu/sam3/include/component/component_can.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_can.h
rename to cpu/sam3/include/component/component_can.h
diff --git a/cpu/sam3x8e/include/component/component_chipid.h b/cpu/sam3/include/component/component_chipid.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_chipid.h
rename to cpu/sam3/include/component/component_chipid.h
diff --git a/cpu/sam3x8e/include/component/component_dacc.h b/cpu/sam3/include/component/component_dacc.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_dacc.h
rename to cpu/sam3/include/component/component_dacc.h
diff --git a/cpu/sam3x8e/include/component/component_dmac.h b/cpu/sam3/include/component/component_dmac.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_dmac.h
rename to cpu/sam3/include/component/component_dmac.h
diff --git a/cpu/sam3x8e/include/component/component_efc.h b/cpu/sam3/include/component/component_efc.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_efc.h
rename to cpu/sam3/include/component/component_efc.h
diff --git a/cpu/sam3x8e/include/component/component_emac.h b/cpu/sam3/include/component/component_emac.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_emac.h
rename to cpu/sam3/include/component/component_emac.h
diff --git a/cpu/sam3x8e/include/component/component_gpbr.h b/cpu/sam3/include/component/component_gpbr.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_gpbr.h
rename to cpu/sam3/include/component/component_gpbr.h
diff --git a/cpu/sam3x8e/include/component/component_hsmci.h b/cpu/sam3/include/component/component_hsmci.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_hsmci.h
rename to cpu/sam3/include/component/component_hsmci.h
diff --git a/cpu/sam3x8e/include/component/component_matrix.h b/cpu/sam3/include/component/component_matrix.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_matrix.h
rename to cpu/sam3/include/component/component_matrix.h
diff --git a/cpu/sam3x8e/include/component/component_pdc.h b/cpu/sam3/include/component/component_pdc.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_pdc.h
rename to cpu/sam3/include/component/component_pdc.h
diff --git a/cpu/sam3x8e/include/component/component_pio.h b/cpu/sam3/include/component/component_pio.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_pio.h
rename to cpu/sam3/include/component/component_pio.h
diff --git a/cpu/sam3x8e/include/component/component_pmc.h b/cpu/sam3/include/component/component_pmc.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_pmc.h
rename to cpu/sam3/include/component/component_pmc.h
diff --git a/cpu/sam3x8e/include/component/component_pwm.h b/cpu/sam3/include/component/component_pwm.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_pwm.h
rename to cpu/sam3/include/component/component_pwm.h
diff --git a/cpu/sam3x8e/include/component/component_rstc.h b/cpu/sam3/include/component/component_rstc.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_rstc.h
rename to cpu/sam3/include/component/component_rstc.h
diff --git a/cpu/sam3x8e/include/component/component_rtc.h b/cpu/sam3/include/component/component_rtc.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_rtc.h
rename to cpu/sam3/include/component/component_rtc.h
diff --git a/cpu/sam3x8e/include/component/component_rtt.h b/cpu/sam3/include/component/component_rtt.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_rtt.h
rename to cpu/sam3/include/component/component_rtt.h
diff --git a/cpu/sam3x8e/include/component/component_sdramc.h b/cpu/sam3/include/component/component_sdramc.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_sdramc.h
rename to cpu/sam3/include/component/component_sdramc.h
diff --git a/cpu/sam3x8e/include/component/component_smc.h b/cpu/sam3/include/component/component_smc.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_smc.h
rename to cpu/sam3/include/component/component_smc.h
diff --git a/cpu/sam3x8e/include/component/component_spi.h b/cpu/sam3/include/component/component_spi.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_spi.h
rename to cpu/sam3/include/component/component_spi.h
diff --git a/cpu/sam3x8e/include/component/component_ssc.h b/cpu/sam3/include/component/component_ssc.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_ssc.h
rename to cpu/sam3/include/component/component_ssc.h
diff --git a/cpu/sam3x8e/include/component/component_supc.h b/cpu/sam3/include/component/component_supc.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_supc.h
rename to cpu/sam3/include/component/component_supc.h
diff --git a/cpu/sam3x8e/include/component/component_tc.h b/cpu/sam3/include/component/component_tc.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_tc.h
rename to cpu/sam3/include/component/component_tc.h
diff --git a/cpu/sam3x8e/include/component/component_trng.h b/cpu/sam3/include/component/component_trng.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_trng.h
rename to cpu/sam3/include/component/component_trng.h
diff --git a/cpu/sam3x8e/include/component/component_twi.h b/cpu/sam3/include/component/component_twi.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_twi.h
rename to cpu/sam3/include/component/component_twi.h
diff --git a/cpu/sam3x8e/include/component/component_uart.h b/cpu/sam3/include/component/component_uart.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_uart.h
rename to cpu/sam3/include/component/component_uart.h
diff --git a/cpu/sam3x8e/include/component/component_uotghs.h b/cpu/sam3/include/component/component_uotghs.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_uotghs.h
rename to cpu/sam3/include/component/component_uotghs.h
diff --git a/cpu/sam3x8e/include/component/component_usart.h b/cpu/sam3/include/component/component_usart.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_usart.h
rename to cpu/sam3/include/component/component_usart.h
diff --git a/cpu/sam3x8e/include/component/component_wdt.h b/cpu/sam3/include/component/component_wdt.h
similarity index 100%
rename from cpu/sam3x8e/include/component/component_wdt.h
rename to cpu/sam3/include/component/component_wdt.h
diff --git a/cpu/sam3x8e/include/component/doc.txt b/cpu/sam3/include/component/doc.txt
similarity index 100%
rename from cpu/sam3x8e/include/component/doc.txt
rename to cpu/sam3/include/component/doc.txt
diff --git a/cpu/sam3x8e/include/cpu_conf.h b/cpu/sam3/include/cpu_conf.h
similarity index 100%
rename from cpu/sam3x8e/include/cpu_conf.h
rename to cpu/sam3/include/cpu_conf.h
diff --git a/cpu/sam3x8e/include/hwtimer_cpu.h b/cpu/sam3/include/hwtimer_cpu.h
similarity index 100%
rename from cpu/sam3x8e/include/hwtimer_cpu.h
rename to cpu/sam3/include/hwtimer_cpu.h
diff --git a/cpu/sam3x8e/include/instance/instance_adc.h b/cpu/sam3/include/instance/instance_adc.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_adc.h
rename to cpu/sam3/include/instance/instance_adc.h
diff --git a/cpu/sam3x8e/include/instance/instance_can0.h b/cpu/sam3/include/instance/instance_can0.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_can0.h
rename to cpu/sam3/include/instance/instance_can0.h
diff --git a/cpu/sam3x8e/include/instance/instance_can1.h b/cpu/sam3/include/instance/instance_can1.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_can1.h
rename to cpu/sam3/include/instance/instance_can1.h
diff --git a/cpu/sam3x8e/include/instance/instance_chipid.h b/cpu/sam3/include/instance/instance_chipid.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_chipid.h
rename to cpu/sam3/include/instance/instance_chipid.h
diff --git a/cpu/sam3x8e/include/instance/instance_dacc.h b/cpu/sam3/include/instance/instance_dacc.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_dacc.h
rename to cpu/sam3/include/instance/instance_dacc.h
diff --git a/cpu/sam3x8e/include/instance/instance_dmac.h b/cpu/sam3/include/instance/instance_dmac.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_dmac.h
rename to cpu/sam3/include/instance/instance_dmac.h
diff --git a/cpu/sam3x8e/include/instance/instance_efc0.h b/cpu/sam3/include/instance/instance_efc0.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_efc0.h
rename to cpu/sam3/include/instance/instance_efc0.h
diff --git a/cpu/sam3x8e/include/instance/instance_efc1.h b/cpu/sam3/include/instance/instance_efc1.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_efc1.h
rename to cpu/sam3/include/instance/instance_efc1.h
diff --git a/cpu/sam3x8e/include/instance/instance_emac.h b/cpu/sam3/include/instance/instance_emac.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_emac.h
rename to cpu/sam3/include/instance/instance_emac.h
diff --git a/cpu/sam3x8e/include/instance/instance_gpbr.h b/cpu/sam3/include/instance/instance_gpbr.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_gpbr.h
rename to cpu/sam3/include/instance/instance_gpbr.h
diff --git a/cpu/sam3x8e/include/instance/instance_hsmci.h b/cpu/sam3/include/instance/instance_hsmci.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_hsmci.h
rename to cpu/sam3/include/instance/instance_hsmci.h
diff --git a/cpu/sam3x8e/include/instance/instance_matrix.h b/cpu/sam3/include/instance/instance_matrix.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_matrix.h
rename to cpu/sam3/include/instance/instance_matrix.h
diff --git a/cpu/sam3x8e/include/instance/instance_pioa.h b/cpu/sam3/include/instance/instance_pioa.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_pioa.h
rename to cpu/sam3/include/instance/instance_pioa.h
diff --git a/cpu/sam3x8e/include/instance/instance_piob.h b/cpu/sam3/include/instance/instance_piob.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_piob.h
rename to cpu/sam3/include/instance/instance_piob.h
diff --git a/cpu/sam3x8e/include/instance/instance_pioc.h b/cpu/sam3/include/instance/instance_pioc.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_pioc.h
rename to cpu/sam3/include/instance/instance_pioc.h
diff --git a/cpu/sam3x8e/include/instance/instance_piod.h b/cpu/sam3/include/instance/instance_piod.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_piod.h
rename to cpu/sam3/include/instance/instance_piod.h
diff --git a/cpu/sam3x8e/include/instance/instance_pioe.h b/cpu/sam3/include/instance/instance_pioe.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_pioe.h
rename to cpu/sam3/include/instance/instance_pioe.h
diff --git a/cpu/sam3x8e/include/instance/instance_piof.h b/cpu/sam3/include/instance/instance_piof.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_piof.h
rename to cpu/sam3/include/instance/instance_piof.h
diff --git a/cpu/sam3x8e/include/instance/instance_pmc.h b/cpu/sam3/include/instance/instance_pmc.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_pmc.h
rename to cpu/sam3/include/instance/instance_pmc.h
diff --git a/cpu/sam3x8e/include/instance/instance_pwm.h b/cpu/sam3/include/instance/instance_pwm.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_pwm.h
rename to cpu/sam3/include/instance/instance_pwm.h
diff --git a/cpu/sam3x8e/include/instance/instance_rstc.h b/cpu/sam3/include/instance/instance_rstc.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_rstc.h
rename to cpu/sam3/include/instance/instance_rstc.h
diff --git a/cpu/sam3x8e/include/instance/instance_rtc.h b/cpu/sam3/include/instance/instance_rtc.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_rtc.h
rename to cpu/sam3/include/instance/instance_rtc.h
diff --git a/cpu/sam3x8e/include/instance/instance_rtt.h b/cpu/sam3/include/instance/instance_rtt.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_rtt.h
rename to cpu/sam3/include/instance/instance_rtt.h
diff --git a/cpu/sam3x8e/include/instance/instance_sdramc.h b/cpu/sam3/include/instance/instance_sdramc.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_sdramc.h
rename to cpu/sam3/include/instance/instance_sdramc.h
diff --git a/cpu/sam3x8e/include/instance/instance_smc.h b/cpu/sam3/include/instance/instance_smc.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_smc.h
rename to cpu/sam3/include/instance/instance_smc.h
diff --git a/cpu/sam3x8e/include/instance/instance_spi0.h b/cpu/sam3/include/instance/instance_spi0.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_spi0.h
rename to cpu/sam3/include/instance/instance_spi0.h
diff --git a/cpu/sam3x8e/include/instance/instance_spi1.h b/cpu/sam3/include/instance/instance_spi1.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_spi1.h
rename to cpu/sam3/include/instance/instance_spi1.h
diff --git a/cpu/sam3x8e/include/instance/instance_ssc.h b/cpu/sam3/include/instance/instance_ssc.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_ssc.h
rename to cpu/sam3/include/instance/instance_ssc.h
diff --git a/cpu/sam3x8e/include/instance/instance_supc.h b/cpu/sam3/include/instance/instance_supc.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_supc.h
rename to cpu/sam3/include/instance/instance_supc.h
diff --git a/cpu/sam3x8e/include/instance/instance_tc0.h b/cpu/sam3/include/instance/instance_tc0.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_tc0.h
rename to cpu/sam3/include/instance/instance_tc0.h
diff --git a/cpu/sam3x8e/include/instance/instance_tc1.h b/cpu/sam3/include/instance/instance_tc1.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_tc1.h
rename to cpu/sam3/include/instance/instance_tc1.h
diff --git a/cpu/sam3x8e/include/instance/instance_tc2.h b/cpu/sam3/include/instance/instance_tc2.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_tc2.h
rename to cpu/sam3/include/instance/instance_tc2.h
diff --git a/cpu/sam3x8e/include/instance/instance_trng.h b/cpu/sam3/include/instance/instance_trng.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_trng.h
rename to cpu/sam3/include/instance/instance_trng.h
diff --git a/cpu/sam3x8e/include/instance/instance_twi0.h b/cpu/sam3/include/instance/instance_twi0.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_twi0.h
rename to cpu/sam3/include/instance/instance_twi0.h
diff --git a/cpu/sam3x8e/include/instance/instance_twi1.h b/cpu/sam3/include/instance/instance_twi1.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_twi1.h
rename to cpu/sam3/include/instance/instance_twi1.h
diff --git a/cpu/sam3x8e/include/instance/instance_uart.h b/cpu/sam3/include/instance/instance_uart.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_uart.h
rename to cpu/sam3/include/instance/instance_uart.h
diff --git a/cpu/sam3x8e/include/instance/instance_uotghs.h b/cpu/sam3/include/instance/instance_uotghs.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_uotghs.h
rename to cpu/sam3/include/instance/instance_uotghs.h
diff --git a/cpu/sam3x8e/include/instance/instance_usart0.h b/cpu/sam3/include/instance/instance_usart0.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_usart0.h
rename to cpu/sam3/include/instance/instance_usart0.h
diff --git a/cpu/sam3x8e/include/instance/instance_usart1.h b/cpu/sam3/include/instance/instance_usart1.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_usart1.h
rename to cpu/sam3/include/instance/instance_usart1.h
diff --git a/cpu/sam3x8e/include/instance/instance_usart2.h b/cpu/sam3/include/instance/instance_usart2.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_usart2.h
rename to cpu/sam3/include/instance/instance_usart2.h
diff --git a/cpu/sam3x8e/include/instance/instance_usart3.h b/cpu/sam3/include/instance/instance_usart3.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_usart3.h
rename to cpu/sam3/include/instance/instance_usart3.h
diff --git a/cpu/sam3x8e/include/instance/instance_wdt.h b/cpu/sam3/include/instance/instance_wdt.h
similarity index 100%
rename from cpu/sam3x8e/include/instance/instance_wdt.h
rename to cpu/sam3/include/instance/instance_wdt.h
diff --git a/cpu/sam3x8e/include/periph_cpu.h b/cpu/sam3/include/periph_cpu.h
similarity index 100%
rename from cpu/sam3x8e/include/periph_cpu.h
rename to cpu/sam3/include/periph_cpu.h
diff --git a/cpu/sam3x8e/include/pio/pio_sam3x8e.h b/cpu/sam3/include/pio/pio_sam3x8e.h
similarity index 100%
rename from cpu/sam3x8e/include/pio/pio_sam3x8e.h
rename to cpu/sam3/include/pio/pio_sam3x8e.h
diff --git a/cpu/sam3x8e/include/sam3x8e.h b/cpu/sam3/include/sam3x8e.h
similarity index 100%
rename from cpu/sam3x8e/include/sam3x8e.h
rename to cpu/sam3/include/sam3x8e.h
diff --git a/cpu/sam3x8e/include/system_sam3xa.h b/cpu/sam3/include/system_sam3xa.h
similarity index 100%
rename from cpu/sam3x8e/include/system_sam3xa.h
rename to cpu/sam3/include/system_sam3xa.h
diff --git a/cpu/sam3x8e/ldscripts/sam3x8e.ld b/cpu/sam3/ldscripts/sam3x8e.ld
similarity index 100%
rename from cpu/sam3x8e/ldscripts/sam3x8e.ld
rename to cpu/sam3/ldscripts/sam3x8e.ld
diff --git a/cpu/sam3x8e/lpm_arch.c b/cpu/sam3/lpm_arch.c
similarity index 100%
rename from cpu/sam3x8e/lpm_arch.c
rename to cpu/sam3/lpm_arch.c
diff --git a/cpu/sam3x8e/periph/Makefile b/cpu/sam3/periph/Makefile
similarity index 100%
rename from cpu/sam3x8e/periph/Makefile
rename to cpu/sam3/periph/Makefile
diff --git a/cpu/sam3x8e/periph/gpio.c b/cpu/sam3/periph/gpio.c
similarity index 100%
rename from cpu/sam3x8e/periph/gpio.c
rename to cpu/sam3/periph/gpio.c
diff --git a/cpu/sam3x8e/periph/random.c b/cpu/sam3/periph/random.c
similarity index 100%
rename from cpu/sam3x8e/periph/random.c
rename to cpu/sam3/periph/random.c
diff --git a/cpu/sam3x8e/periph/spi.c b/cpu/sam3/periph/spi.c
similarity index 100%
rename from cpu/sam3x8e/periph/spi.c
rename to cpu/sam3/periph/spi.c
diff --git a/cpu/sam3x8e/periph/timer.c b/cpu/sam3/periph/timer.c
similarity index 100%
rename from cpu/sam3x8e/periph/timer.c
rename to cpu/sam3/periph/timer.c
diff --git a/cpu/sam3x8e/periph/uart.c b/cpu/sam3/periph/uart.c
similarity index 100%
rename from cpu/sam3x8e/periph/uart.c
rename to cpu/sam3/periph/uart.c
diff --git a/cpu/sam3x8e/startup.c b/cpu/sam3/startup.c
similarity index 100%
rename from cpu/sam3x8e/startup.c
rename to cpu/sam3/startup.c