diff --git a/hardware/avr/pins/mega/pins_arduino.h b/hardware/avr/variants/mega/pins_arduino.h
similarity index 100%
rename from hardware/avr/pins/mega/pins_arduino.h
rename to hardware/avr/variants/mega/pins_arduino.h
diff --git a/hardware/avr/pins/standard/pins_arduino.h b/hardware/avr/variants/standard/pins_arduino.h
similarity index 100%
rename from hardware/avr/pins/standard/pins_arduino.h
rename to hardware/avr/variants/standard/pins_arduino.h
diff --git a/hardware/sam/pins/sam3s-ek/board.h b/hardware/sam/variants/sam3s-ek/board.h
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/board.h
rename to hardware/sam/variants/sam3s-ek/board.h
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/Makefile b/hardware/sam/variants/sam3s-ek/build_gcc/Makefile
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/Makefile
rename to hardware/sam/variants/sam3s-ek/build_gcc/Makefile
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/debug.mk b/hardware/sam/variants/sam3s-ek/build_gcc/debug.mk
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/debug.mk
rename to hardware/sam/variants/sam3s-ek/build_gcc/debug.mk
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/board_cstartup_gnu.o b/hardware/sam/variants/sam3s-ek/build_gcc/debug_sam3s_ek/board_cstartup_gnu.o
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/board_cstartup_gnu.o
rename to hardware/sam/variants/sam3s-ek/build_gcc/debug_sam3s_ek/board_cstartup_gnu.o
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/board_lowlevel.o b/hardware/sam/variants/sam3s-ek/build_gcc/debug_sam3s_ek/board_lowlevel.o
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/board_lowlevel.o
rename to hardware/sam/variants/sam3s-ek/build_gcc/debug_sam3s_ek/board_lowlevel.o
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/syscalls.o b/hardware/sam/variants/sam3s-ek/build_gcc/debug_sam3s_ek/syscalls.o
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/syscalls.o
rename to hardware/sam/variants/sam3s-ek/build_gcc/debug_sam3s_ek/syscalls.o
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/timetick.o b/hardware/sam/variants/sam3s-ek/build_gcc/debug_sam3s_ek/timetick.o
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/debug_sam3s_ek/timetick.o
rename to hardware/sam/variants/sam3s-ek/build_gcc/debug_sam3s_ek/timetick.o
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/gcc.mk b/hardware/sam/variants/sam3s-ek/build_gcc/gcc.mk
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/gcc.mk
rename to hardware/sam/variants/sam3s-ek/build_gcc/gcc.mk
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/release.mk b/hardware/sam/variants/sam3s-ek/build_gcc/release.mk
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/release.mk
rename to hardware/sam/variants/sam3s-ek/build_gcc/release.mk
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/board_cstartup_gnu.o b/hardware/sam/variants/sam3s-ek/build_gcc/release_sam3s_ek/board_cstartup_gnu.o
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/board_cstartup_gnu.o
rename to hardware/sam/variants/sam3s-ek/build_gcc/release_sam3s_ek/board_cstartup_gnu.o
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/board_lowlevel.o b/hardware/sam/variants/sam3s-ek/build_gcc/release_sam3s_ek/board_lowlevel.o
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/board_lowlevel.o
rename to hardware/sam/variants/sam3s-ek/build_gcc/release_sam3s_ek/board_lowlevel.o
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/syscalls.o b/hardware/sam/variants/sam3s-ek/build_gcc/release_sam3s_ek/syscalls.o
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/syscalls.o
rename to hardware/sam/variants/sam3s-ek/build_gcc/release_sam3s_ek/syscalls.o
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/timetick.o b/hardware/sam/variants/sam3s-ek/build_gcc/release_sam3s_ek/timetick.o
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/release_sam3s_ek/timetick.o
rename to hardware/sam/variants/sam3s-ek/build_gcc/release_sam3s_ek/timetick.o
diff --git a/hardware/sam/pins/sam3s-ek/build_gcc/sam3s_ek.mk b/hardware/sam/variants/sam3s-ek/build_gcc/sam3s_ek.mk
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/build_gcc/sam3s_ek.mk
rename to hardware/sam/variants/sam3s-ek/build_gcc/sam3s_ek.mk
diff --git a/hardware/sam/pins/sam3s-ek/include/bitbanding.h b/hardware/sam/variants/sam3s-ek/include/bitbanding.h
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/include/bitbanding.h
rename to hardware/sam/variants/sam3s-ek/include/bitbanding.h
diff --git a/hardware/sam/pins/sam3s-ek/include/board_lowlevel.h b/hardware/sam/variants/sam3s-ek/include/board_lowlevel.h
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/include/board_lowlevel.h
rename to hardware/sam/variants/sam3s-ek/include/board_lowlevel.h
diff --git a/hardware/sam/pins/sam3s-ek/include/syscalls.h b/hardware/sam/variants/sam3s-ek/include/syscalls.h
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/include/syscalls.h
rename to hardware/sam/variants/sam3s-ek/include/syscalls.h
diff --git a/hardware/sam/pins/sam3s-ek/include/timetick.h b/hardware/sam/variants/sam3s-ek/include/timetick.h
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/include/timetick.h
rename to hardware/sam/variants/sam3s-ek/include/timetick.h
diff --git a/hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a b/hardware/sam/variants/sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a
rename to hardware/sam/variants/sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a
diff --git a/hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a.txt b/hardware/sam/variants/sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a.txt
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a.txt
rename to hardware/sam/variants/sam3s-ek/lib/libboard_sam3s_ek_gcc_dbg.a.txt
diff --git a/hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a b/hardware/sam/variants/sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a
rename to hardware/sam/variants/sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a
diff --git a/hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a.txt b/hardware/sam/variants/sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a.txt
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a.txt
rename to hardware/sam/variants/sam3s-ek/lib/libboard_sam3s_ek_gcc_rel.a.txt
diff --git a/hardware/sam/pins/sam3s-ek/pins.txt b/hardware/sam/variants/sam3s-ek/pins.txt
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/pins.txt
rename to hardware/sam/variants/sam3s-ek/pins.txt
diff --git a/hardware/sam/pins/sam3s-ek/pins_arduino.h b/hardware/sam/variants/sam3s-ek/pins_arduino.h
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/pins_arduino.h
rename to hardware/sam/variants/sam3s-ek/pins_arduino.h
diff --git a/hardware/sam/pins/sam3s-ek/sam3s-ek.cpp b/hardware/sam/variants/sam3s-ek/sam3s-ek.cpp
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/sam3s-ek.cpp
rename to hardware/sam/variants/sam3s-ek/sam3s-ek.cpp
diff --git a/hardware/sam/pins/sam3s-ek/sam3s-ek.h b/hardware/sam/variants/sam3s-ek/sam3s-ek.h
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/sam3s-ek.h
rename to hardware/sam/variants/sam3s-ek/sam3s-ek.h
diff --git a/hardware/sam/pins/sam3s-ek/sam3s_ek_flash.gdb b/hardware/sam/variants/sam3s-ek/sam3s_ek_flash.gdb
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/sam3s_ek_flash.gdb
rename to hardware/sam/variants/sam3s-ek/sam3s_ek_flash.gdb
diff --git a/hardware/sam/pins/sam3s-ek/sam3s_ek_flash.ld b/hardware/sam/variants/sam3s-ek/sam3s_ek_flash.ld
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/sam3s_ek_flash.ld
rename to hardware/sam/variants/sam3s-ek/sam3s_ek_flash.ld
diff --git a/hardware/sam/pins/sam3s-ek/sam3s_ek_sram.gdb b/hardware/sam/variants/sam3s-ek/sam3s_ek_sram.gdb
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/sam3s_ek_sram.gdb
rename to hardware/sam/variants/sam3s-ek/sam3s_ek_sram.gdb
diff --git a/hardware/sam/pins/sam3s-ek/sam3s_ek_sram.ld b/hardware/sam/variants/sam3s-ek/sam3s_ek_sram.ld
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/sam3s_ek_sram.ld
rename to hardware/sam/variants/sam3s-ek/sam3s_ek_sram.ld
diff --git a/hardware/sam/pins/sam3s-ek/source/board_cstartup_gnu.c b/hardware/sam/variants/sam3s-ek/source/board_cstartup_gnu.c
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/source/board_cstartup_gnu.c
rename to hardware/sam/variants/sam3s-ek/source/board_cstartup_gnu.c
diff --git a/hardware/sam/pins/sam3s-ek/source/board_lowlevel.c b/hardware/sam/variants/sam3s-ek/source/board_lowlevel.c
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/source/board_lowlevel.c
rename to hardware/sam/variants/sam3s-ek/source/board_lowlevel.c
diff --git a/hardware/sam/pins/sam3s-ek/source/syscalls.c b/hardware/sam/variants/sam3s-ek/source/syscalls.c
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/source/syscalls.c
rename to hardware/sam/variants/sam3s-ek/source/syscalls.c
diff --git a/hardware/sam/pins/sam3s-ek/source/timetick.c b/hardware/sam/variants/sam3s-ek/source/timetick.c
similarity index 100%
rename from hardware/sam/pins/sam3s-ek/source/timetick.c
rename to hardware/sam/variants/sam3s-ek/source/timetick.c