diff --git a/cpu/sam21_common/Makefile b/cpu/sam0_common/Makefile
similarity index 100%
rename from cpu/sam21_common/Makefile
rename to cpu/sam0_common/Makefile
diff --git a/cpu/sam21_common/Makefile.include b/cpu/sam0_common/Makefile.include
similarity index 69%
rename from cpu/sam21_common/Makefile.include
rename to cpu/sam0_common/Makefile.include
index 04164cf4f7..3bed4f0641 100644
--- a/cpu/sam21_common/Makefile.include
+++ b/cpu/sam0_common/Makefile.include
@@ -5,13 +5,13 @@ CFLAGS += -DCPU_FAM_$(shell echo $(CPU_FAM) | tr 'a-z-' 'A-Z_')
 export CFLAGS += -DDONT_USE_CMSIS_INIT
 
 # for the sam[drl] CPUs we hold all linkerscripts in the sam0 common folder
-export LINKFLAGS += -L$(RIOTCPU)/sam21_common/ldscripts
+export LINKFLAGS += -L$(RIOTCPU)/sam0_common/ldscripts
 
 # use common periph functions
 USEMODULE += periph_common
 
-# include sam21 common periph drivers
-USEMODULE += sam21_common_periph
+# include sam0 common periph drivers
+USEMODULE += sam0_common_periph
 
 # export the common include directory
-export INCLUDES += -I$(RIOTCPU)/sam21_common/include
+export INCLUDES += -I$(RIOTCPU)/sam0_common/include
diff --git a/cpu/sam21_common/include/cmsis/samd21/README.md b/cpu/sam0_common/include/cmsis/samd21/README.md
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/README.md
rename to cpu/sam0_common/include/cmsis/samd21/README.md
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/ac.h b/cpu/sam0_common/include/cmsis/samd21/include/component/ac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/ac.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/ac.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/adc.h b/cpu/sam0_common/include/cmsis/samd21/include/component/adc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/adc.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/adc.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/dac.h b/cpu/sam0_common/include/cmsis/samd21/include/component/dac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/dac.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/dac.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/dmac.h b/cpu/sam0_common/include/cmsis/samd21/include/component/dmac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/dmac.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/dmac.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/dsu.h b/cpu/sam0_common/include/cmsis/samd21/include/component/dsu.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/dsu.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/dsu.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/eic.h b/cpu/sam0_common/include/cmsis/samd21/include/component/eic.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/eic.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/eic.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/evsys.h b/cpu/sam0_common/include/cmsis/samd21/include/component/evsys.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/evsys.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/evsys.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/gclk.h b/cpu/sam0_common/include/cmsis/samd21/include/component/gclk.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/gclk.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/gclk.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/hmatrixb.h b/cpu/sam0_common/include/cmsis/samd21/include/component/hmatrixb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/hmatrixb.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/hmatrixb.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/i2s.h b/cpu/sam0_common/include/cmsis/samd21/include/component/i2s.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/i2s.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/i2s.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/mtb.h b/cpu/sam0_common/include/cmsis/samd21/include/component/mtb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/mtb.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/mtb.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/nvmctrl.h b/cpu/sam0_common/include/cmsis/samd21/include/component/nvmctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/nvmctrl.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/nvmctrl.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/pac.h b/cpu/sam0_common/include/cmsis/samd21/include/component/pac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/pac.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/pac.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/pm.h b/cpu/sam0_common/include/cmsis/samd21/include/component/pm.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/pm.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/pm.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/port.h b/cpu/sam0_common/include/cmsis/samd21/include/component/port.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/port.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/port.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/rtc.h b/cpu/sam0_common/include/cmsis/samd21/include/component/rtc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/rtc.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/rtc.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/sercom.h b/cpu/sam0_common/include/cmsis/samd21/include/component/sercom.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/sercom.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/sercom.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/sysctrl.h b/cpu/sam0_common/include/cmsis/samd21/include/component/sysctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/sysctrl.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/sysctrl.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/tc.h b/cpu/sam0_common/include/cmsis/samd21/include/component/tc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/tc.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/tc.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/tcc.h b/cpu/sam0_common/include/cmsis/samd21/include/component/tcc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/tcc.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/tcc.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/tcc_lighting.h b/cpu/sam0_common/include/cmsis/samd21/include/component/tcc_lighting.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/tcc_lighting.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/tcc_lighting.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/usb.h b/cpu/sam0_common/include/cmsis/samd21/include/component/usb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/usb.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/usb.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/component/wdt.h b/cpu/sam0_common/include/cmsis/samd21/include/component/wdt.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/component/wdt.h
rename to cpu/sam0_common/include/cmsis/samd21/include/component/wdt.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/ac.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/ac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/ac.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/ac.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/ac1.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/ac1.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/ac1.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/ac1.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/adc.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/adc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/adc.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/adc.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/dac.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/dac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/dac.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/dac.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/dmac.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/dmac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/dmac.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/dmac.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/dsu.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/dsu.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/dsu.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/dsu.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/eic.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/eic.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/eic.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/eic.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/evsys.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/evsys.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/evsys.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/evsys.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/gclk.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/gclk.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/gclk.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/gclk.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/i2s.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/i2s.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/i2s.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/i2s.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/mtb.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/mtb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/mtb.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/mtb.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/nvmctrl.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/nvmctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/nvmctrl.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/nvmctrl.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/pac0.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/pac0.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/pac0.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/pac0.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/pac1.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/pac1.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/pac1.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/pac1.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/pac2.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/pac2.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/pac2.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/pac2.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/pm.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/pm.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/pm.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/pm.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/port.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/port.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/port.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/port.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/rtc.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/rtc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/rtc.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/rtc.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/sbmatrix.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/sbmatrix.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/sbmatrix.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/sbmatrix.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/sercom0.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/sercom0.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/sercom0.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/sercom0.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/sercom1.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/sercom1.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/sercom1.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/sercom1.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/sercom2.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/sercom2.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/sercom2.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/sercom2.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/sercom3.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/sercom3.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/sercom3.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/sercom3.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/sercom4.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/sercom4.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/sercom4.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/sercom4.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/sercom5.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/sercom5.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/sercom5.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/sercom5.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/sysctrl.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/sysctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/sysctrl.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/sysctrl.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/tc3.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/tc3.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/tc3.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/tc3.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/tc4.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/tc4.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/tc4.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/tc4.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/tc5.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/tc5.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/tc5.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/tc5.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/tc6.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/tc6.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/tc6.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/tc6.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/tc7.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/tc7.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/tc7.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/tc7.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/tcc0.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/tcc0.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/tcc0.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/tcc0.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/tcc1.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/tcc1.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/tcc1.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/tcc1.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/tcc2.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/tcc2.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/tcc2.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/tcc2.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/usb.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/usb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/usb.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/usb.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/instance/wdt.h b/cpu/sam0_common/include/cmsis/samd21/include/instance/wdt.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/instance/wdt.h
rename to cpu/sam0_common/include/cmsis/samd21/include/instance/wdt.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e15a.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e15a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e15a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e15a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e15b.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e15b.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e15b.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e15b.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e15bu.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e15bu.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e15bu.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e15bu.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e15l.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e15l.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e15l.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e15l.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e16a.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e16a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e16a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e16b.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e16b.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e16b.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e16b.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e16bu.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e16bu.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e16bu.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e16bu.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e16l.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e16l.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e16l.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e16l.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e17a.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e17a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e17a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e18a.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21e18a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21e18a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g15a.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g15a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g15a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g15a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g15b.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g15b.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g15b.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g15b.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g15l.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g15l.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g15l.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g15l.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g16a.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g16a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g16a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g16b.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g16b.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g16b.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g16b.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g16l.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g16l.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g16l.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g16l.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g17a.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g17a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g17a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g17au.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g17au.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g17au.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g17au.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g18a.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g18a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g18a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g18au.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g18au.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21g18au.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21g18au.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21j15a.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21j15a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21j15a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21j15a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21j15b.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21j15b.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21j15b.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21j15b.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21j16a.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21j16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21j16a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21j16a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21j16b.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21j16b.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21j16b.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21j16b.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21j17a.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21j17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21j17a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21j17a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/pio/samd21j18a.h b/cpu/sam0_common/include/cmsis/samd21/include/pio/samd21j18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/pio/samd21j18a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/pio/samd21j18a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21e15a.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21e15a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21e15a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21e15a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21e15b.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21e15b.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21e15b.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21e15b.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21e15bu.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21e15bu.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21e15bu.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21e15bu.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21e15l.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21e15l.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21e15l.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21e15l.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21e16a.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21e16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21e16a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21e16a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21e16b.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21e16b.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21e16b.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21e16b.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21e16bu.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21e16bu.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21e16bu.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21e16bu.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21e16l.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21e16l.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21e16l.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21e16l.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21e17a.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21e17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21e17a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21e17a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21e18a.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21e18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21e18a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21e18a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21g15a.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21g15a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21g15a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21g15a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21g15b.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21g15b.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21g15b.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21g15b.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21g15l.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21g15l.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21g15l.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21g15l.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21g16a.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21g16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21g16a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21g16a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21g16b.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21g16b.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21g16b.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21g16b.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21g16l.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21g16l.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21g16l.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21g16l.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21g17a.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21g17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21g17a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21g17a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21g17au.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21g17au.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21g17au.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21g17au.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21g18a.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21g18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21g18a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21g18a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21g18au.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21g18au.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21g18au.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21g18au.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21j15a.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21j15a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21j15a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21j15a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21j15b.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21j15b.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21j15b.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21j15b.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21j16a.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21j16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21j16a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21j16a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21j16b.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21j16b.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21j16b.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21j16b.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21j17a.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21j17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21j17a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21j17a.h
diff --git a/cpu/sam21_common/include/cmsis/samd21/include/samd21j18a.h b/cpu/sam0_common/include/cmsis/samd21/include/samd21j18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samd21/include/samd21j18a.h
rename to cpu/sam0_common/include/cmsis/samd21/include/samd21j18a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/ac.h b/cpu/sam0_common/include/cmsis/saml21/include/component/ac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/ac.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/ac.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/adc.h b/cpu/sam0_common/include/cmsis/saml21/include/component/adc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/adc.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/adc.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/aes.h b/cpu/sam0_common/include/cmsis/saml21/include/component/aes.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/aes.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/aes.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/ccl.h b/cpu/sam0_common/include/cmsis/saml21/include/component/ccl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/ccl.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/ccl.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/dac.h b/cpu/sam0_common/include/cmsis/saml21/include/component/dac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/dac.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/dac.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/dmac.h b/cpu/sam0_common/include/cmsis/saml21/include/component/dmac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/dmac.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/dmac.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/dsu.h b/cpu/sam0_common/include/cmsis/saml21/include/component/dsu.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/dsu.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/dsu.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/eic.h b/cpu/sam0_common/include/cmsis/saml21/include/component/eic.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/eic.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/eic.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/evsys.h b/cpu/sam0_common/include/cmsis/saml21/include/component/evsys.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/evsys.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/evsys.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/gclk.h b/cpu/sam0_common/include/cmsis/saml21/include/component/gclk.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/gclk.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/gclk.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/mclk.h b/cpu/sam0_common/include/cmsis/saml21/include/component/mclk.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/mclk.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/mclk.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/mtb.h b/cpu/sam0_common/include/cmsis/saml21/include/component/mtb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/mtb.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/mtb.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/nvmctrl.h b/cpu/sam0_common/include/cmsis/saml21/include/component/nvmctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/nvmctrl.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/nvmctrl.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/opamp.h b/cpu/sam0_common/include/cmsis/saml21/include/component/opamp.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/opamp.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/opamp.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/osc32kctrl.h b/cpu/sam0_common/include/cmsis/saml21/include/component/osc32kctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/osc32kctrl.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/osc32kctrl.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/oscctrl.h b/cpu/sam0_common/include/cmsis/saml21/include/component/oscctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/oscctrl.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/oscctrl.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/pac.h b/cpu/sam0_common/include/cmsis/saml21/include/component/pac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/pac.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/pac.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/pm.h b/cpu/sam0_common/include/cmsis/saml21/include/component/pm.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/pm.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/pm.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/port.h b/cpu/sam0_common/include/cmsis/saml21/include/component/port.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/port.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/port.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/rstc.h b/cpu/sam0_common/include/cmsis/saml21/include/component/rstc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/rstc.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/rstc.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/rtc.h b/cpu/sam0_common/include/cmsis/saml21/include/component/rtc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/rtc.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/rtc.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/sercom.h b/cpu/sam0_common/include/cmsis/saml21/include/component/sercom.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/sercom.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/sercom.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/supc.h b/cpu/sam0_common/include/cmsis/saml21/include/component/supc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/supc.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/supc.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/tal.h b/cpu/sam0_common/include/cmsis/saml21/include/component/tal.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/tal.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/tal.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/tc.h b/cpu/sam0_common/include/cmsis/saml21/include/component/tc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/tc.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/tc.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/tcc.h b/cpu/sam0_common/include/cmsis/saml21/include/component/tcc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/tcc.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/tcc.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/trng.h b/cpu/sam0_common/include/cmsis/saml21/include/component/trng.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/trng.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/trng.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/usb.h b/cpu/sam0_common/include/cmsis/saml21/include/component/usb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/usb.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/usb.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/component/wdt.h b/cpu/sam0_common/include/cmsis/saml21/include/component/wdt.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/component/wdt.h
rename to cpu/sam0_common/include/cmsis/saml21/include/component/wdt.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/ac.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/ac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/ac.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/ac.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/adc.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/adc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/adc.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/adc.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/aes.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/aes.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/aes.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/aes.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/ccl.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/ccl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/ccl.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/ccl.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/dac.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/dac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/dac.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/dac.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/dmac.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/dmac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/dmac.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/dmac.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/dsu.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/dsu.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/dsu.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/dsu.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/eic.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/eic.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/eic.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/eic.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/evsys.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/evsys.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/evsys.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/evsys.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/gclk.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/gclk.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/gclk.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/gclk.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/mclk.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/mclk.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/mclk.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/mclk.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/mtb.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/mtb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/mtb.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/mtb.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/nvmctrl.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/nvmctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/nvmctrl.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/nvmctrl.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/opamp.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/opamp.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/opamp.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/opamp.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/osc32kctrl.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/osc32kctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/osc32kctrl.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/osc32kctrl.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/oscctrl.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/oscctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/oscctrl.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/oscctrl.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/pac.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/pac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/pac.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/pac.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/pm.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/pm.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/pm.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/pm.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/port.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/port.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/port.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/port.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/rstc.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/rstc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/rstc.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/rstc.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/rtc.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/rtc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/rtc.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/rtc.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/sercom0.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/sercom0.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/sercom0.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/sercom0.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/sercom1.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/sercom1.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/sercom1.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/sercom1.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/sercom2.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/sercom2.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/sercom2.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/sercom2.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/sercom3.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/sercom3.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/sercom3.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/sercom3.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/sercom4.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/sercom4.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/sercom4.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/sercom4.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/sercom5.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/sercom5.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/sercom5.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/sercom5.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/supc.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/supc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/supc.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/supc.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/tal.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/tal.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/tal.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/tal.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/tc0.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/tc0.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/tc0.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/tc0.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/tc1.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/tc1.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/tc1.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/tc1.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/tc2.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/tc2.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/tc2.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/tc2.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/tc3.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/tc3.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/tc3.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/tc3.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/tc4.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/tc4.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/tc4.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/tc4.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/tcc0.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/tcc0.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/tcc0.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/tcc0.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/tcc1.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/tcc1.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/tcc1.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/tcc1.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/tcc2.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/tcc2.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/tcc2.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/tcc2.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/trng.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/trng.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/trng.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/trng.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/usb.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/usb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/usb.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/usb.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/instance/wdt.h b/cpu/sam0_common/include/cmsis/saml21/include/instance/wdt.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/instance/wdt.h
rename to cpu/sam0_common/include/cmsis/saml21/include/instance/wdt.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/pio/saml21e15a.h b/cpu/sam0_common/include/cmsis/saml21/include/pio/saml21e15a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/pio/saml21e15a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/pio/saml21e15a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/pio/saml21e16a.h b/cpu/sam0_common/include/cmsis/saml21/include/pio/saml21e16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/pio/saml21e16a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/pio/saml21e16a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/pio/saml21e17a.h b/cpu/sam0_common/include/cmsis/saml21/include/pio/saml21e17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/pio/saml21e17a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/pio/saml21e17a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/pio/saml21g16a.h b/cpu/sam0_common/include/cmsis/saml21/include/pio/saml21g16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/pio/saml21g16a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/pio/saml21g16a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/pio/saml21g17a.h b/cpu/sam0_common/include/cmsis/saml21/include/pio/saml21g17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/pio/saml21g17a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/pio/saml21g17a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/pio/saml21g18a.h b/cpu/sam0_common/include/cmsis/saml21/include/pio/saml21g18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/pio/saml21g18a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/pio/saml21g18a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/pio/saml21j16a.h b/cpu/sam0_common/include/cmsis/saml21/include/pio/saml21j16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/pio/saml21j16a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/pio/saml21j16a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/pio/saml21j17a.h b/cpu/sam0_common/include/cmsis/saml21/include/pio/saml21j17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/pio/saml21j17a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/pio/saml21j17a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/pio/saml21j18a.h b/cpu/sam0_common/include/cmsis/saml21/include/pio/saml21j18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/pio/saml21j18a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/pio/saml21j18a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/saml21e15a.h b/cpu/sam0_common/include/cmsis/saml21/include/saml21e15a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/saml21e15a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/saml21e15a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/saml21e16a.h b/cpu/sam0_common/include/cmsis/saml21/include/saml21e16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/saml21e16a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/saml21e16a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/saml21e17a.h b/cpu/sam0_common/include/cmsis/saml21/include/saml21e17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/saml21e17a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/saml21e17a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/saml21g16a.h b/cpu/sam0_common/include/cmsis/saml21/include/saml21g16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/saml21g16a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/saml21g16a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/saml21g17a.h b/cpu/sam0_common/include/cmsis/saml21/include/saml21g17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/saml21g17a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/saml21g17a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/saml21g18a.h b/cpu/sam0_common/include/cmsis/saml21/include/saml21g18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/saml21g18a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/saml21g18a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/saml21j16a.h b/cpu/sam0_common/include/cmsis/saml21/include/saml21j16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/saml21j16a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/saml21j16a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/saml21j17a.h b/cpu/sam0_common/include/cmsis/saml21/include/saml21j17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/saml21j17a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/saml21j17a.h
diff --git a/cpu/sam21_common/include/cmsis/saml21/include/saml21j18a.h b/cpu/sam0_common/include/cmsis/saml21/include/saml21j18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/saml21/include/saml21j18a.h
rename to cpu/sam0_common/include/cmsis/saml21/include/saml21j18a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/README.md b/cpu/sam0_common/include/cmsis/samr21/README.md
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/README.md
rename to cpu/sam0_common/include/cmsis/samr21/README.md
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/ac.h b/cpu/sam0_common/include/cmsis/samr21/include/component/ac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/ac.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/ac.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/adc.h b/cpu/sam0_common/include/cmsis/samr21/include/component/adc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/adc.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/adc.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/dac.h b/cpu/sam0_common/include/cmsis/samr21/include/component/dac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/dac.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/dac.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/dmac.h b/cpu/sam0_common/include/cmsis/samr21/include/component/dmac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/dmac.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/dmac.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/dsu.h b/cpu/sam0_common/include/cmsis/samr21/include/component/dsu.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/dsu.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/dsu.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/eic.h b/cpu/sam0_common/include/cmsis/samr21/include/component/eic.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/eic.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/eic.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/evsys.h b/cpu/sam0_common/include/cmsis/samr21/include/component/evsys.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/evsys.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/evsys.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/gclk.h b/cpu/sam0_common/include/cmsis/samr21/include/component/gclk.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/gclk.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/gclk.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/hmatrixb.h b/cpu/sam0_common/include/cmsis/samr21/include/component/hmatrixb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/hmatrixb.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/hmatrixb.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/i2s.h b/cpu/sam0_common/include/cmsis/samr21/include/component/i2s.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/i2s.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/i2s.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/mtb.h b/cpu/sam0_common/include/cmsis/samr21/include/component/mtb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/mtb.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/mtb.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/nvmctrl.h b/cpu/sam0_common/include/cmsis/samr21/include/component/nvmctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/nvmctrl.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/nvmctrl.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/pac.h b/cpu/sam0_common/include/cmsis/samr21/include/component/pac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/pac.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/pac.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/pm.h b/cpu/sam0_common/include/cmsis/samr21/include/component/pm.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/pm.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/pm.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/port.h b/cpu/sam0_common/include/cmsis/samr21/include/component/port.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/port.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/port.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/rfctrl.h b/cpu/sam0_common/include/cmsis/samr21/include/component/rfctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/rfctrl.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/rfctrl.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/rtc.h b/cpu/sam0_common/include/cmsis/samr21/include/component/rtc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/rtc.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/rtc.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/sercom.h b/cpu/sam0_common/include/cmsis/samr21/include/component/sercom.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/sercom.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/sercom.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/sysctrl.h b/cpu/sam0_common/include/cmsis/samr21/include/component/sysctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/sysctrl.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/sysctrl.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/tc.h b/cpu/sam0_common/include/cmsis/samr21/include/component/tc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/tc.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/tc.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/tcc.h b/cpu/sam0_common/include/cmsis/samr21/include/component/tcc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/tcc.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/tcc.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/usb.h b/cpu/sam0_common/include/cmsis/samr21/include/component/usb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/usb.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/usb.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/component/wdt.h b/cpu/sam0_common/include/cmsis/samr21/include/component/wdt.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/component/wdt.h
rename to cpu/sam0_common/include/cmsis/samr21/include/component/wdt.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/ac.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/ac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/ac.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/ac.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/adc.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/adc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/adc.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/adc.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/dac.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/dac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/dac.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/dac.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/dmac.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/dmac.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/dmac.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/dmac.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/dsu.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/dsu.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/dsu.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/dsu.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/eic.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/eic.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/eic.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/eic.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/evsys.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/evsys.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/evsys.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/evsys.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/gclk.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/gclk.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/gclk.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/gclk.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/i2s.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/i2s.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/i2s.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/i2s.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/mtb.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/mtb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/mtb.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/mtb.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/nvmctrl.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/nvmctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/nvmctrl.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/nvmctrl.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/pac0.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/pac0.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/pac0.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/pac0.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/pac1.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/pac1.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/pac1.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/pac1.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/pac2.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/pac2.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/pac2.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/pac2.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/pm.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/pm.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/pm.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/pm.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/port.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/port.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/port.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/port.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/rfctrl.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/rfctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/rfctrl.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/rfctrl.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/rtc.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/rtc.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/rtc.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/rtc.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/sbmatrix.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/sbmatrix.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/sbmatrix.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/sbmatrix.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/sercom0.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/sercom0.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/sercom0.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/sercom0.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/sercom1.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/sercom1.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/sercom1.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/sercom1.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/sercom2.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/sercom2.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/sercom2.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/sercom2.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/sercom3.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/sercom3.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/sercom3.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/sercom3.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/sercom4.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/sercom4.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/sercom4.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/sercom4.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/sercom5.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/sercom5.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/sercom5.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/sercom5.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/sysctrl.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/sysctrl.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/sysctrl.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/sysctrl.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/tc3.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/tc3.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/tc3.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/tc3.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/tc4.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/tc4.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/tc4.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/tc4.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/tc5.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/tc5.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/tc5.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/tc5.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/tc6.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/tc6.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/tc6.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/tc6.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/tc7.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/tc7.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/tc7.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/tc7.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/tcc0.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/tcc0.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/tcc0.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/tcc0.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/tcc1.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/tcc1.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/tcc1.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/tcc1.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/tcc2.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/tcc2.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/tcc2.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/tcc2.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/usb.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/usb.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/usb.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/usb.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/instance/wdt.h b/cpu/sam0_common/include/cmsis/samr21/include/instance/wdt.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/instance/wdt.h
rename to cpu/sam0_common/include/cmsis/samr21/include/instance/wdt.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/pio/samr21e16a.h b/cpu/sam0_common/include/cmsis/samr21/include/pio/samr21e16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/pio/samr21e16a.h
rename to cpu/sam0_common/include/cmsis/samr21/include/pio/samr21e16a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/pio/samr21e17a.h b/cpu/sam0_common/include/cmsis/samr21/include/pio/samr21e17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/pio/samr21e17a.h
rename to cpu/sam0_common/include/cmsis/samr21/include/pio/samr21e17a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/pio/samr21e18a.h b/cpu/sam0_common/include/cmsis/samr21/include/pio/samr21e18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/pio/samr21e18a.h
rename to cpu/sam0_common/include/cmsis/samr21/include/pio/samr21e18a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/pio/samr21g16a.h b/cpu/sam0_common/include/cmsis/samr21/include/pio/samr21g16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/pio/samr21g16a.h
rename to cpu/sam0_common/include/cmsis/samr21/include/pio/samr21g16a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/pio/samr21g17a.h b/cpu/sam0_common/include/cmsis/samr21/include/pio/samr21g17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/pio/samr21g17a.h
rename to cpu/sam0_common/include/cmsis/samr21/include/pio/samr21g17a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/pio/samr21g18a.h b/cpu/sam0_common/include/cmsis/samr21/include/pio/samr21g18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/pio/samr21g18a.h
rename to cpu/sam0_common/include/cmsis/samr21/include/pio/samr21g18a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/samr21.h b/cpu/sam0_common/include/cmsis/samr21/include/samr21.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/samr21.h
rename to cpu/sam0_common/include/cmsis/samr21/include/samr21.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/samr21e16a.h b/cpu/sam0_common/include/cmsis/samr21/include/samr21e16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/samr21e16a.h
rename to cpu/sam0_common/include/cmsis/samr21/include/samr21e16a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/samr21e17a.h b/cpu/sam0_common/include/cmsis/samr21/include/samr21e17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/samr21e17a.h
rename to cpu/sam0_common/include/cmsis/samr21/include/samr21e17a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/samr21e18a.h b/cpu/sam0_common/include/cmsis/samr21/include/samr21e18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/samr21e18a.h
rename to cpu/sam0_common/include/cmsis/samr21/include/samr21e18a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/samr21g16a.h b/cpu/sam0_common/include/cmsis/samr21/include/samr21g16a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/samr21g16a.h
rename to cpu/sam0_common/include/cmsis/samr21/include/samr21g16a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/samr21g17a.h b/cpu/sam0_common/include/cmsis/samr21/include/samr21g17a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/samr21g17a.h
rename to cpu/sam0_common/include/cmsis/samr21/include/samr21g17a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/include/samr21g18a.h b/cpu/sam0_common/include/cmsis/samr21/include/samr21g18a.h
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/include/samr21g18a.h
rename to cpu/sam0_common/include/cmsis/samr21/include/samr21g18a.h
diff --git a/cpu/sam21_common/include/cmsis/samr21/rename-includes.sh b/cpu/sam0_common/include/cmsis/samr21/rename-includes.sh
similarity index 100%
rename from cpu/sam21_common/include/cmsis/samr21/rename-includes.sh
rename to cpu/sam0_common/include/cmsis/samr21/rename-includes.sh
diff --git a/cpu/sam21_common/include/cpu_conf.h b/cpu/sam0_common/include/cpu_conf.h
similarity index 96%
rename from cpu/sam21_common/include/cpu_conf.h
rename to cpu/sam0_common/include/cpu_conf.h
index dcb7999cd0..ac9390ef64 100644
--- a/cpu/sam21_common/include/cpu_conf.h
+++ b/cpu/sam0_common/include/cpu_conf.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup         cpu_sam21_common
+ * @ingroup         cpu_sam0_common
  * @{
  *
  * @file
diff --git a/cpu/sam21_common/include/periph_cpu_common.h b/cpu/sam0_common/include/periph_cpu_common.h
similarity index 99%
rename from cpu/sam21_common/include/periph_cpu_common.h
rename to cpu/sam0_common/include/periph_cpu_common.h
index 099f78e122..f4968ceeed 100644
--- a/cpu/sam21_common/include/periph_cpu_common.h
+++ b/cpu/sam0_common/include/periph_cpu_common.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup         cpu_sam21_common
+ * @ingroup         cpu_sam0_common
  * @{
  *
  * @file
diff --git a/cpu/sam21_common/include/sam0.h b/cpu/sam0_common/include/sam0.h
similarity index 99%
rename from cpu/sam21_common/include/sam0.h
rename to cpu/sam0_common/include/sam0.h
index 518bd942c6..8b81ca7feb 100644
--- a/cpu/sam21_common/include/sam0.h
+++ b/cpu/sam0_common/include/sam0.h
@@ -8,7 +8,7 @@
  */
 
 /**
- * @ingroup         cpu_sam21_common
+ * @ingroup         cpu_sam0_common
  * @{
  *
  * @file
diff --git a/cpu/sam21_common/ldscripts/samd21g18a.ld b/cpu/sam0_common/ldscripts/samd21g18a.ld
similarity index 100%
rename from cpu/sam21_common/ldscripts/samd21g18a.ld
rename to cpu/sam0_common/ldscripts/samd21g18a.ld
diff --git a/cpu/sam21_common/ldscripts/samd21j18a.ld b/cpu/sam0_common/ldscripts/samd21j18a.ld
similarity index 100%
rename from cpu/sam21_common/ldscripts/samd21j18a.ld
rename to cpu/sam0_common/ldscripts/samd21j18a.ld
diff --git a/cpu/sam21_common/ldscripts/saml21j18a.ld b/cpu/sam0_common/ldscripts/saml21j18a.ld
similarity index 100%
rename from cpu/sam21_common/ldscripts/saml21j18a.ld
rename to cpu/sam0_common/ldscripts/saml21j18a.ld
diff --git a/cpu/sam21_common/ldscripts/samr21e18a.ld b/cpu/sam0_common/ldscripts/samr21e18a.ld
similarity index 100%
rename from cpu/sam21_common/ldscripts/samr21e18a.ld
rename to cpu/sam0_common/ldscripts/samr21e18a.ld
diff --git a/cpu/sam21_common/ldscripts/samr21g18a.ld b/cpu/sam0_common/ldscripts/samr21g18a.ld
similarity index 100%
rename from cpu/sam21_common/ldscripts/samr21g18a.ld
rename to cpu/sam0_common/ldscripts/samr21g18a.ld
diff --git a/cpu/sam21_common/periph/Makefile b/cpu/sam0_common/periph/Makefile
similarity index 54%
rename from cpu/sam21_common/periph/Makefile
rename to cpu/sam0_common/periph/Makefile
index 183380144a..ef117c4179 100644
--- a/cpu/sam21_common/periph/Makefile
+++ b/cpu/sam0_common/periph/Makefile
@@ -1,3 +1,3 @@
-MODULE = sam21_common_periph
+MODULE = sam0_common_periph
 
 include $(RIOTBASE)/Makefile.base
diff --git a/cpu/sam21_common/periph/cpuid.c b/cpu/sam0_common/periph/cpuid.c
similarity index 96%
rename from cpu/sam21_common/periph/cpuid.c
rename to cpu/sam0_common/periph/cpuid.c
index 6c40d267d1..a124d6f647 100644
--- a/cpu/sam21_common/periph/cpuid.c
+++ b/cpu/sam0_common/periph/cpuid.c
@@ -7,7 +7,7 @@
  */
 
 /**
- * @addtogroup  cpu_sam21_common
+ * @addtogroup  cpu_sam0_common
  * @{
  *
  * @file
diff --git a/cpu/sam21_common/periph/i2c.c b/cpu/sam0_common/periph/i2c.c
similarity index 100%
rename from cpu/sam21_common/periph/i2c.c
rename to cpu/sam0_common/periph/i2c.c
diff --git a/cpu/samd21/Makefile b/cpu/samd21/Makefile
index f042e7599c..8794dfbc47 100644
--- a/cpu/samd21/Makefile
+++ b/cpu/samd21/Makefile
@@ -2,7 +2,7 @@
 MODULE = cpu
 
 # add a list of subdirectories, that should also be build
-DIRS = periph $(RIOTCPU)/cortexm_common $(RIOTCPU)/sam21_common
+DIRS = periph $(RIOTCPU)/cortexm_common $(RIOTCPU)/sam0_common
 
 # (file triggers compiler bug. see #5775)
 SRC_NOLTO += vectors.c
diff --git a/cpu/samd21/Makefile.include b/cpu/samd21/Makefile.include
index 491c55c892..30e261c9fd 100644
--- a/cpu/samd21/Makefile.include
+++ b/cpu/samd21/Makefile.include
@@ -1,5 +1,5 @@
 export CPU_ARCH = cortex-m0plus
 export CPU_FAM  = samd21
 
-include $(RIOTCPU)/sam21_common/Makefile.include
+include $(RIOTCPU)/sam0_common/Makefile.include
 include $(RIOTCPU)/Makefile.include.cortexm_common
diff --git a/cpu/saml21/Makefile b/cpu/saml21/Makefile
index f042e7599c..8794dfbc47 100644
--- a/cpu/saml21/Makefile
+++ b/cpu/saml21/Makefile
@@ -2,7 +2,7 @@
 MODULE = cpu
 
 # add a list of subdirectories, that should also be build
-DIRS = periph $(RIOTCPU)/cortexm_common $(RIOTCPU)/sam21_common
+DIRS = periph $(RIOTCPU)/cortexm_common $(RIOTCPU)/sam0_common
 
 # (file triggers compiler bug. see #5775)
 SRC_NOLTO += vectors.c
diff --git a/cpu/saml21/Makefile.include b/cpu/saml21/Makefile.include
index e84f153125..17d168d77d 100644
--- a/cpu/saml21/Makefile.include
+++ b/cpu/saml21/Makefile.include
@@ -1,5 +1,5 @@
 export CPU_ARCH = cortex-m0plus
 export CPU_FAM  = saml21
 
-include $(RIOTCPU)/sam21_common/Makefile.include
+include $(RIOTCPU)/sam0_common/Makefile.include
 include $(RIOTCPU)/Makefile.include.cortexm_common
diff --git a/dist/tools/externc/check.sh b/dist/tools/externc/check.sh
index 9d9cff9348..cff595b2c2 100755
--- a/dist/tools/externc/check.sh
+++ b/dist/tools/externc/check.sh
@@ -28,7 +28,7 @@ else
     FILES="$(git diff --diff-filter=${DIFFFILTER} --name-only ${BRANCH} | grep -E '\.h$')"
 fi
 
-FILES=$(echo "${FILES}" | grep -v -E '^(dist/tools|boards/msba2-common/tools/|cpu/saml21/include/atmel/|cpu/sam21_common/include/cmsis/)')
+FILES=$(echo "${FILES}" | grep -v -E '^(dist/tools|boards/msba2-common/tools/|cpu/saml21/include/atmel/|cpu/sam0_common/include/cmsis/)')
 
 # check files
 for FILE in ${FILES}; do
diff --git a/doc/doxygen/riot.doxyfile b/doc/doxygen/riot.doxyfile
index a3b7962d5d..7e2258eb93 100644
--- a/doc/doxygen/riot.doxyfile
+++ b/doc/doxygen/riot.doxyfile
@@ -821,7 +821,7 @@ EXCLUDE_PATTERNS       = */board/*/tools/* \
                          */cpu/*/include/atmel/* \
                          */cpu/sam3/include/sam3* \
                          */cpu/sam3/include/system_sam*.h \
-                         */cpu/sam21_common/include/cmsis/* \
+                         */cpu/sam0_common/include/cmsis/* \
                          */cpu/lpc*/include/core_cm*.h \
                          */cpu/cortexm_common/include/core_cm*.h \
                          */cpu/stm32f*/include/stm32f* \