diff --git a/sam3s_example/Makefile b/firmware/Makefile
similarity index 100%
rename from sam3s_example/Makefile
rename to firmware/Makefile
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/ads7843.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/ads7843.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/ads7843.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/ads7843.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/at45_spi.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/at45_spi.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/at45_spi.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/at45_spi.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/at45d.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/at45d.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/at45d.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/at45d.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/bitbanding.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/bitbanding.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/bitbanding.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/bitbanding.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/bmp.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/bmp.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/bmp.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/bmp.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/board_lowlevel.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/board_lowlevel.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/board_lowlevel.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/board_lowlevel.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/board_memories.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/board_memories.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/board_memories.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/board_memories.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/clock.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/clock.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/clock.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/clock.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/frame_buffer.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/frame_buffer.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/frame_buffer.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/frame_buffer.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/hamming.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/hamming.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/hamming.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/hamming.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/ili9325.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/ili9325.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/ili9325.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/ili9325.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/iso7816_4.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/iso7816_4.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/iso7816_4.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/iso7816_4.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_color.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_color.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_color.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_color.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_draw.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_draw.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_draw.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_draw.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_font.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_font.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_font.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_font.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_font10x14.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_font10x14.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_font10x14.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_font10x14.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_gimp_image.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_gimp_image.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_gimp_image.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/lcd_gimp_image.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/lcdd.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/lcdd.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/lcdd.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/lcdd.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/led.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/led.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/led.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/led.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/math.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/math.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/math.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/math.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/rand.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/rand.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/rand.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/rand.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/syscalls.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/syscalls.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/syscalls.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/syscalls.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/timetick.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/timetick.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/timetick.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/timetick.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/tsd.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/tsd.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/tsd.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/tsd.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/tsd_ads7843.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/tsd_ads7843.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/tsd_ads7843.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/tsd_ads7843.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/tsd_com.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/tsd_com.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/tsd_com.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/tsd_com.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/uart_console.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/uart_console.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/uart_console.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/uart_console.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/wav.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/wav.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/wav.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/wav.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/wm8731.h b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/wm8731.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/include/wm8731.h
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/include/wm8731.h
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s-ek-flash.mac b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s-ek-flash.mac
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s-ek-flash.mac
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s-ek-flash.mac
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s-ek-sram.mac b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s-ek-sram.mac
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s-ek-sram.mac
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s-ek-sram.mac
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s1/flash.icf b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s1/flash.icf
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s1/flash.icf
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s1/flash.icf
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s1/sram.icf b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s1/sram.icf
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s1/sram.icf
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s1/sram.icf
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s1/sram_flashloader.icf b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s1/sram_flashloader.icf
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s1/sram_flashloader.icf
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s1/sram_flashloader.icf
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s2/flash.icf b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s2/flash.icf
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s2/flash.icf
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s2/flash.icf
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s2/sram.icf b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s2/sram.icf
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s2/sram.icf
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s2/sram.icf
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s2/sram_flashloader.icf b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s2/sram_flashloader.icf
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s2/sram_flashloader.icf
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s2/sram_flashloader.icf
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s4/flash.icf b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s4/flash.icf
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s4/flash.icf
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s4/flash.icf
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s4/sram.icf b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s4/sram.icf
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s4/sram.icf
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s4/sram.icf
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s4/sram_flashloader.icf b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s4/sram_flashloader.icf
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s4/sram_flashloader.icf
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/ewarm/sam3s4/sram_flashloader.icf
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s1/flash.ld b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s1/flash.ld
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s1/flash.ld
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s1/flash.ld
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s1/sram.ld b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s1/sram.ld
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s1/sram.ld
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s1/sram.ld
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s1/sram_samba.lds b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s1/sram_samba.lds
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s1/sram_samba.lds
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s1/sram_samba.lds
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s2/flash.ld b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s2/flash.ld
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s2/flash.ld
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s2/flash.ld
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s2/sram.ld b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s2/sram.ld
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s2/sram.ld
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s2/sram.ld
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s2/sram_samba.lds b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s2/sram_samba.lds
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s2/sram_samba.lds
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s2/sram_samba.lds
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s4/flash.ld b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s4/flash.ld
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s4/flash.ld
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s4/flash.ld
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s4/sram.ld b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s4/sram.ld
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s4/sram.ld
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s4/sram.ld
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s4/sram_samba.lds b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s4/sram_samba.lds
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s4/sram_samba.lds
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s4/sram_samba.lds
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s_ek_flash.gdb b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s_ek_flash.gdb
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s_ek_flash.gdb
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s_ek_flash.gdb
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s_ek_sram.gdb b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s_ek_sram.gdb
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s_ek_sram.gdb
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s_ek_sram.gdb
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s_vb_sram.gdb b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s_vb_sram.gdb
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s_vb_sram.gdb
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/resources/gcc/sam3s_vb_sram.gdb
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/ads7843.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/ads7843.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/ads7843.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/ads7843.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/at45_spi.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/at45_spi.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/at45_spi.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/at45_spi.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/at45d.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/at45d.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/at45d.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/at45d.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/bmp.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/bmp.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/bmp.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/bmp.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/board_cstartup_gnu.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/board_cstartup_gnu.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/board_cstartup_gnu.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/board_cstartup_gnu.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/board_lowlevel.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/board_lowlevel.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/board_lowlevel.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/board_lowlevel.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/board_memories.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/board_memories.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/board_memories.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/board_memories.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/clock.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/clock.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/clock.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/clock.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/frame_buffer.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/frame_buffer.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/frame_buffer.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/frame_buffer.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/hamming.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/hamming.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/hamming.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/hamming.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/ili9325.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/ili9325.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/ili9325.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/ili9325.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/iso7816_4.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/iso7816_4.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/iso7816_4.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/iso7816_4.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/lcd_draw.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/lcd_draw.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/lcd_draw.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/lcd_draw.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/lcd_font.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/lcd_font.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/lcd_font.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/lcd_font.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/lcd_font10x14.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/lcd_font10x14.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/lcd_font10x14.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/lcd_font10x14.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/lcdd.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/lcdd.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/lcdd.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/lcdd.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/led.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/led.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/led.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/led.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/math.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/math.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/math.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/math.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/rand.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/rand.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/rand.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/rand.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/retarget.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/retarget.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/retarget.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/retarget.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/syscalls.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/syscalls.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/syscalls.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/syscalls.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/timetick.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/timetick.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/timetick.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/timetick.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/trace.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/trace.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/trace.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/trace.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/tsd_ads7843.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/tsd_ads7843.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/tsd_ads7843.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/tsd_ads7843.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/tsd_com.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/tsd_com.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/tsd_com.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/tsd_com.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/uart_console.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/uart_console.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/uart_console.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/uart_console.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/wav.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/wav.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/wav.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/wav.c
diff --git a/sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/wm8731.c b/firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/wm8731.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libboard_sam3s-ek/source/wm8731.c
rename to firmware/atmel_softpack_libraries/libboard_sam3s-ek/source/wm8731.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/chip.h b/firmware/atmel_softpack_libraries/libchip_sam3s/chip.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/chip.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/chip.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/cmsis/CMSIS_Core.htm b/firmware/atmel_softpack_libraries/libchip_sam3s/cmsis/CMSIS_Core.htm
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/cmsis/CMSIS_Core.htm
rename to firmware/atmel_softpack_libraries/libchip_sam3s/cmsis/CMSIS_Core.htm
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/cmsis/core_cm3.c b/firmware/atmel_softpack_libraries/libchip_sam3s/cmsis/core_cm3.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/cmsis/core_cm3.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/cmsis/core_cm3.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/cmsis/core_cm3.h b/firmware/atmel_softpack_libraries/libchip_sam3s/cmsis/core_cm3.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/cmsis/core_cm3.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/cmsis/core_cm3.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/SAM3S.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/SAM3S.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/SAM3S.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/SAM3S.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/USBD_Config.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/USBD_Config.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/USBD_Config.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/USBD_Config.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/USBD_LEDs.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/USBD_LEDs.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/USBD_LEDs.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/USBD_LEDs.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/acc.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/acc.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/acc.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/acc.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/adc.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/adc.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/adc.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/adc.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/async.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/async.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/async.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/async.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/crccu.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/crccu.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/crccu.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/crccu.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/dacc.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/dacc.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/dacc.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/dacc.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/efc.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/efc.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/efc.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/efc.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/exceptions.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/exceptions.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/exceptions.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/exceptions.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/flashd.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/flashd.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/flashd.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/flashd.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/hsmci.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/hsmci.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/hsmci.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/hsmci.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/pio.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/pio.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/pio.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/pio.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/pio_capture.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/pio_capture.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/pio_capture.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/pio_capture.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/pio_it.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/pio_it.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/pio_it.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/pio_it.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/pmc.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/pmc.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/pmc.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/pmc.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/pwmc.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/pwmc.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/pwmc.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/pwmc.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/rtc.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/rtc.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/rtc.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/rtc.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/rtt.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/rtt.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/rtt.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/rtt.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/spi.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/spi.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/spi.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/spi.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/spi_pdc.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/spi_pdc.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/spi_pdc.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/spi_pdc.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/ssc.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/ssc.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/ssc.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/ssc.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/supc.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/supc.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/supc.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/supc.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/tc.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/tc.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/tc.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/tc.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/trace.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/trace.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/trace.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/trace.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/twi.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/twi.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/twi.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/twi.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/twid.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/twid.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/twid.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/twid.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/usart.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/usart.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/usart.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/usart.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/wdt.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/wdt.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/include/wdt.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/wdt.h
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_dbg.a b/firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_dbg.a
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_dbg.a
rename to firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_dbg.a
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_dbg.a.txt b/firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_dbg.a.txt
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_dbg.a.txt
rename to firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_dbg.a.txt
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_rel.a b/firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_rel.a
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_rel.a
rename to firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_rel.a
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_rel.a.txt b/firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_rel.a.txt
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_rel.a.txt
rename to firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s1_gcc_rel.a.txt
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_dbg.a b/firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_dbg.a
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_dbg.a
rename to firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_dbg.a
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_dbg.a.txt b/firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_dbg.a.txt
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_dbg.a.txt
rename to firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_dbg.a.txt
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_rel.a b/firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_rel.a
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_rel.a
rename to firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_rel.a
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_rel.a.txt b/firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_rel.a.txt
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_rel.a.txt
rename to firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s2_gcc_rel.a.txt
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_dbg.a b/firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_dbg.a
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_dbg.a
rename to firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_dbg.a
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_dbg.a.txt b/firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_dbg.a.txt
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_dbg.a.txt
rename to firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_dbg.a.txt
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_rel.a b/firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_rel.a
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_rel.a
rename to firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_rel.a
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_rel.a.txt b/firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_rel.a.txt
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_rel.a.txt
rename to firmware/atmel_softpack_libraries/libchip_sam3s/lib/libchip_sam3s4_gcc_rel.a.txt
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/acc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/acc.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/acc.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/acc.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/adc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/adc.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/adc.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/adc.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/async.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/async.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/async.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/async.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/crccu.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/crccu.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/crccu.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/crccu.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/dacc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/dacc.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/dacc.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/dacc.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/efc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/efc.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/flashd.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/flashd.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/hsmci.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/hsmci.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/hsmci.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/hsmci.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/hsmci_pdc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/hsmci_pdc.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/hsmci_pdc.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/hsmci_pdc.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/pio.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/pio.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/pio.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/pio.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/pio_capture.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_capture.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/pio_capture.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_capture.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/pmc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/pmc.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/pmc.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/pmc.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/pwmc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/pwmc.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/pwmc.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/pwmc.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/rtc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/rtc.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/rtc.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/rtc.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/rtt.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/rtt.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/rtt.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/rtt.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/spi.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/spi.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/spi.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/spi.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/spi_pdc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/spi_pdc.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/spi_pdc.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/spi_pdc.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/ssc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/ssc.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/ssc.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/ssc.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/supc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/supc.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/supc.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/supc.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/tc.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/tc.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/tc.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/tc.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/twi.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/twi.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/twi.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/twi.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/twid.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/twid.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/twid.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/twid.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/usart.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/usart.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/usart.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/usart.c
diff --git a/sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/wdt.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/wdt.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/libchip_sam3s/source/wdt.c
rename to firmware/atmel_softpack_libraries/libchip_sam3s/source/wdt.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/USBFrameworkArchitecture.png b/firmware/atmel_softpack_libraries/usb/USBFrameworkArchitecture.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/USBFrameworkArchitecture.png
rename to firmware/atmel_softpack_libraries/usb/USBFrameworkArchitecture.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/common/audio/AUDFeatureUnitRequest.c b/firmware/atmel_softpack_libraries/usb/common/audio/AUDFeatureUnitRequest.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/common/audio/AUDFeatureUnitRequest.c
rename to firmware/atmel_softpack_libraries/usb/common/audio/AUDFeatureUnitRequest.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/common/audio/AUDGenericRequest.c b/firmware/atmel_softpack_libraries/usb/common/audio/AUDGenericRequest.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/common/audio/AUDGenericRequest.c
rename to firmware/atmel_softpack_libraries/usb/common/audio/AUDGenericRequest.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/common/cdc/CDCLineCoding.c b/firmware/atmel_softpack_libraries/usb/common/cdc/CDCLineCoding.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/common/cdc/CDCLineCoding.c
rename to firmware/atmel_softpack_libraries/usb/common/cdc/CDCLineCoding.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/common/cdc/CDCSetControlLineStateRequest.c b/firmware/atmel_softpack_libraries/usb/common/cdc/CDCSetControlLineStateRequest.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/common/cdc/CDCSetControlLineStateRequest.c
rename to firmware/atmel_softpack_libraries/usb/common/cdc/CDCSetControlLineStateRequest.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/common/core/USBDescriptors.c b/firmware/atmel_softpack_libraries/usb/common/core/USBDescriptors.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/common/core/USBDescriptors.c
rename to firmware/atmel_softpack_libraries/usb/common/core/USBDescriptors.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/common/core/USBRequests.c b/firmware/atmel_softpack_libraries/usb/common/core/USBRequests.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/common/core/USBRequests.c
rename to firmware/atmel_softpack_libraries/usb/common/core/USBRequests.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/common/hid/HIDIdleRequest.c b/firmware/atmel_softpack_libraries/usb/common/hid/HIDIdleRequest.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/common/hid/HIDIdleRequest.c
rename to firmware/atmel_softpack_libraries/usb/common/hid/HIDIdleRequest.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/common/hid/HIDKeypad.c b/firmware/atmel_softpack_libraries/usb/common/hid/HIDKeypad.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/common/hid/HIDKeypad.c
rename to firmware/atmel_softpack_libraries/usb/common/hid/HIDKeypad.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/common/hid/HIDReportRequest.c b/firmware/atmel_softpack_libraries/usb/common/hid/HIDReportRequest.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/common/hid/HIDReportRequest.c
rename to firmware/atmel_softpack_libraries/usb/common/hid/HIDReportRequest.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/USBDCallbackInvocationFlowchart.png b/firmware/atmel_softpack_libraries/usb/device/USBDCallbackInvocationFlowchart.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/USBDCallbackInvocationFlowchart.png
rename to firmware/atmel_softpack_libraries/usb/device/USBDCallbackInvocationFlowchart.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/USBDeviceStateDiagram.png b/firmware/atmel_softpack_libraries/usb/device/USBDeviceStateDiagram.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/USBDeviceStateDiagram.png
rename to firmware/atmel_softpack_libraries/usb/device/USBDeviceStateDiagram.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/audio-speaker/AUDDSpeakerDriver.c b/firmware/atmel_softpack_libraries/usb/device/audio-speaker/AUDDSpeakerDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/audio-speaker/AUDDSpeakerDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/audio-speaker/AUDDSpeakerDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/audio-speaker/AUDDSpeakerDriver_Callbacks.c b/firmware/atmel_softpack_libraries/usb/device/audio-speaker/AUDDSpeakerDriver_Callbacks.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/audio-speaker/AUDDSpeakerDriver_Callbacks.c
rename to firmware/atmel_softpack_libraries/usb/device/audio-speaker/AUDDSpeakerDriver_Callbacks.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeaker.png b/firmware/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeaker.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeaker.png
rename to firmware/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeaker.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeakerDescriptors.png b/firmware/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeakerDescriptors.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeakerDescriptors.png
rename to firmware/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeakerDescriptors.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeakerRecorder.png b/firmware/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeakerRecorder.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeakerRecorder.png
rename to firmware/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeakerRecorder.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeakerRecorderDescriptors.png b/firmware/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeakerRecorderDescriptors.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeakerRecorderDescriptors.png
rename to firmware/atmel_softpack_libraries/usb/device/audio-speaker/USBAudioSpeakerRecorderDescriptors.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/audio-speakerphone/AUDDSpeakerPhoneDriver.c b/firmware/atmel_softpack_libraries/usb/device/audio-speakerphone/AUDDSpeakerPhoneDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/audio-speakerphone/AUDDSpeakerPhoneDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/audio-speakerphone/AUDDSpeakerPhoneDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/audio-speakerphone/AUDDSpeakerPhoneDriver_Callbacks.c b/firmware/atmel_softpack_libraries/usb/device/audio-speakerphone/AUDDSpeakerPhoneDriver_Callbacks.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/audio-speakerphone/AUDDSpeakerPhoneDriver_Callbacks.c
rename to firmware/atmel_softpack_libraries/usb/device/audio-speakerphone/AUDDSpeakerPhoneDriver_Callbacks.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/audio-speakerphone/AUDDStream.c b/firmware/atmel_softpack_libraries/usb/device/audio-speakerphone/AUDDStream.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/audio-speakerphone/AUDDStream.c
rename to firmware/atmel_softpack_libraries/usb/device/audio-speakerphone/AUDDStream.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/ccid/cciddriver.c b/firmware/atmel_softpack_libraries/usb/device/ccid/cciddriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/ccid/cciddriver.c
rename to firmware/atmel_softpack_libraries/usb/device/ccid/cciddriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/ccid/cciddriver.h b/firmware/atmel_softpack_libraries/usb/device/ccid/cciddriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/ccid/cciddriver.h
rename to firmware/atmel_softpack_libraries/usb/device/ccid/cciddriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/ccid/cciddriverdescriptors.h b/firmware/atmel_softpack_libraries/usb/device/ccid/cciddriverdescriptors.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/ccid/cciddriverdescriptors.h
rename to firmware/atmel_softpack_libraries/usb/device/ccid/cciddriverdescriptors.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerial.c b/firmware/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerial.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerial.c
rename to firmware/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerial.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerialDriver.c b/firmware/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerialDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerialDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerialDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerialDriver_Callbacks.c b/firmware/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerialDriver_Callbacks.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerialDriver_Callbacks.c
rename to firmware/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerialDriver_Callbacks.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerialPort.c b/firmware/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerialPort.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerialPort.c
rename to firmware/atmel_softpack_libraries/usb/device/cdc-serial/CDCDSerialPort.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/CDCarchitecture.png b/firmware/atmel_softpack_libraries/usb/device/cdc-serial/CDCarchitecture.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/CDCarchitecture.png
rename to firmware/atmel_softpack_libraries/usb/device/cdc-serial/CDCarchitecture.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/USB-SerialConverter.png b/firmware/atmel_softpack_libraries/usb/device/cdc-serial/USB-SerialConverter.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/USB-SerialConverter.png
rename to firmware/atmel_softpack_libraries/usb/device/cdc-serial/USB-SerialConverter.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/drv/6119.inf b/firmware/atmel_softpack_libraries/usb/device/cdc-serial/drv/6119.inf
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/cdc-serial/drv/6119.inf
rename to firmware/atmel_softpack_libraries/usb/device/cdc-serial/drv/6119.inf
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/AUDDFunction.c b/firmware/atmel_softpack_libraries/usb/device/composite/AUDDFunction.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/AUDDFunction.c
rename to firmware/atmel_softpack_libraries/usb/device/composite/AUDDFunction.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/CDCAUDDDriver.c b/firmware/atmel_softpack_libraries/usb/device/composite/CDCAUDDDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/CDCAUDDDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/composite/CDCAUDDDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/CDCHIDDDriver.c b/firmware/atmel_softpack_libraries/usb/device/composite/CDCHIDDDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/CDCHIDDDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/composite/CDCHIDDDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/CDCMSDDriver.c b/firmware/atmel_softpack_libraries/usb/device/composite/CDCMSDDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/CDCMSDDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/composite/CDCMSDDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/DUALCDCDDriver.c b/firmware/atmel_softpack_libraries/usb/device/composite/DUALCDCDDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/DUALCDCDDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/composite/DUALCDCDDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/HIDAUDDDriver.c b/firmware/atmel_softpack_libraries/usb/device/composite/HIDAUDDDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/HIDAUDDDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/composite/HIDAUDDDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/HIDMSDDriver.c b/firmware/atmel_softpack_libraries/usb/device/composite/HIDMSDDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/HIDMSDDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/composite/HIDMSDDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcAudioArch.png b/firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcAudioArch.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcAudioArch.png
rename to firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcAudioArch.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcCdcArch.png b/firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcCdcArch.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcCdcArch.png
rename to firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcCdcArch.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcHidArch.png b/firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcHidArch.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcHidArch.png
rename to firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcHidArch.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcMsdArch.png b/firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcMsdArch.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcMsdArch.png
rename to firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeCdcMsdArch.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeComposition.png b/firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeComposition.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeComposition.png
rename to firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeComposition.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeHidAudioArch.png b/firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeHidAudioArch.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeHidAudioArch.png
rename to firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeHidAudioArch.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeHidMsdArch.png b/firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeHidMsdArch.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeHidMsdArch.png
rename to firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeHidMsdArch.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeMultiIF.png b/firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeMultiIF.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeMultiIF.png
rename to firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeMultiIF.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeRequestHandler.png b/firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeRequestHandler.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeRequestHandler.png
rename to firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeRequestHandler.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeSWArch.png b/firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeSWArch.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeSWArch.png
rename to firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeSWArch.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeSingleIF.png b/firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeSingleIF.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/UsbCompositeSingleIF.png
rename to firmware/atmel_softpack_libraries/usb/device/composite/UsbCompositeSingleIF.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/composite/drv/CompositeCDCSerial.inf b/firmware/atmel_softpack_libraries/usb/device/composite/drv/CompositeCDCSerial.inf
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/composite/drv/CompositeCDCSerial.inf
rename to firmware/atmel_softpack_libraries/usb/device/composite/drv/CompositeCDCSerial.inf
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/core/USBD.c b/firmware/atmel_softpack_libraries/usb/device/core/USBD.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/core/USBD.c
rename to firmware/atmel_softpack_libraries/usb/device/core/USBD.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/core/USBDCallbacks.c b/firmware/atmel_softpack_libraries/usb/device/core/USBDCallbacks.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/core/USBDCallbacks.c
rename to firmware/atmel_softpack_libraries/usb/device/core/USBDCallbacks.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/core/USBDDriver.c b/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/core/USBDDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/core/USBDDriverCallbacks.c b/firmware/atmel_softpack_libraries/usb/device/core/USBDDriverCallbacks.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/core/USBDDriverCallbacks.c
rename to firmware/atmel_softpack_libraries/usb/device/core/USBDDriverCallbacks.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/hid-keyboard/HIDClassArch.png b/firmware/atmel_softpack_libraries/usb/device/hid-keyboard/HIDClassArch.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/hid-keyboard/HIDClassArch.png
rename to firmware/atmel_softpack_libraries/usb/device/hid-keyboard/HIDClassArch.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboard.c b/firmware/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboard.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboard.c
rename to firmware/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboard.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardCallbacks_LedsChanged.c b/firmware/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardCallbacks_LedsChanged.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardCallbacks_LedsChanged.c
rename to firmware/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardCallbacks_LedsChanged.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardDriver.c b/firmware/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardInputReport.c b/firmware/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardInputReport.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardInputReport.c
rename to firmware/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardInputReport.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardOutputReport.c b/firmware/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardOutputReport.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardOutputReport.c
rename to firmware/atmel_softpack_libraries/usb/device/hid-keyboard/HIDDKeyboardOutputReport.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/hid-mouse/HIDDMouseDriver.c b/firmware/atmel_softpack_libraries/usb/device/hid-mouse/HIDDMouseDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/hid-mouse/HIDDMouseDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/hid-mouse/HIDDMouseDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/hid-transfer/HIDDFunction.c b/firmware/atmel_softpack_libraries/usb/device/hid-transfer/HIDDFunction.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/hid-transfer/HIDDFunction.c
rename to firmware/atmel_softpack_libraries/usb/device/hid-transfer/HIDDFunction.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/hid-transfer/HIDDTransferDriver.c b/firmware/atmel_softpack_libraries/usb/device/hid-transfer/HIDDTransferDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/hid-transfer/HIDDTransferDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/hid-transfer/HIDDTransferDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDAppArch.png b/firmware/atmel_softpack_libraries/usb/device/massstorage/MSDAppArch.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDAppArch.png
rename to firmware/atmel_softpack_libraries/usb/device/massstorage/MSDAppArch.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDDStateMachine.c b/firmware/atmel_softpack_libraries/usb/device/massstorage/MSDDStateMachine.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDDStateMachine.c
rename to firmware/atmel_softpack_libraries/usb/device/massstorage/MSDDStateMachine.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDDriver.c b/firmware/atmel_softpack_libraries/usb/device/massstorage/MSDDriver.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDDriver.c
rename to firmware/atmel_softpack_libraries/usb/device/massstorage/MSDDriver.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDDriverArch.png b/firmware/atmel_softpack_libraries/usb/device/massstorage/MSDDriverArch.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDDriverArch.png
rename to firmware/atmel_softpack_libraries/usb/device/massstorage/MSDDriverArch.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDDriverClasses.png b/firmware/atmel_softpack_libraries/usb/device/massstorage/MSDDriverClasses.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDDriverClasses.png
rename to firmware/atmel_softpack_libraries/usb/device/massstorage/MSDDriverClasses.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDDriverStates.png b/firmware/atmel_softpack_libraries/usb/device/massstorage/MSDDriverStates.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDDriverStates.png
rename to firmware/atmel_softpack_libraries/usb/device/massstorage/MSDDriverStates.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDFunction.c b/firmware/atmel_softpack_libraries/usb/device/massstorage/MSDFunction.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDFunction.c
rename to firmware/atmel_softpack_libraries/usb/device/massstorage/MSDFunction.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDIOFifo.c b/firmware/atmel_softpack_libraries/usb/device/massstorage/MSDIOFifo.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDIOFifo.c
rename to firmware/atmel_softpack_libraries/usb/device/massstorage/MSDIOFifo.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDLun.c b/firmware/atmel_softpack_libraries/usb/device/massstorage/MSDLun.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDLun.c
rename to firmware/atmel_softpack_libraries/usb/device/massstorage/MSDLun.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDMediaArch.png b/firmware/atmel_softpack_libraries/usb/device/massstorage/MSDMediaArch.png
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/massstorage/MSDMediaArch.png
rename to firmware/atmel_softpack_libraries/usb/device/massstorage/MSDMediaArch.png
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/massstorage/SBCMethods.c b/firmware/atmel_softpack_libraries/usb/device/massstorage/SBCMethods.c
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/device/massstorage/SBCMethods.c
rename to firmware/atmel_softpack_libraries/usb/device/massstorage/SBCMethods.c
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/AUDDFunction.h b/firmware/atmel_softpack_libraries/usb/include/AUDDFunction.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/AUDDFunction.h
rename to firmware/atmel_softpack_libraries/usb/include/AUDDFunction.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/AUDDSpeakerDriver.h b/firmware/atmel_softpack_libraries/usb/include/AUDDSpeakerDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/AUDDSpeakerDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/AUDDSpeakerDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/AUDDSpeakerPhone.h b/firmware/atmel_softpack_libraries/usb/include/AUDDSpeakerPhone.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/AUDDSpeakerPhone.h
rename to firmware/atmel_softpack_libraries/usb/include/AUDDSpeakerPhone.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/AUDDSpeakerPhoneDriver.h b/firmware/atmel_softpack_libraries/usb/include/AUDDSpeakerPhoneDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/AUDDSpeakerPhoneDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/AUDDSpeakerPhoneDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/AUDDStream.h b/firmware/atmel_softpack_libraries/usb/include/AUDDStream.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/AUDDStream.h
rename to firmware/atmel_softpack_libraries/usb/include/AUDDStream.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/AUDDescriptors.h b/firmware/atmel_softpack_libraries/usb/include/AUDDescriptors.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/AUDDescriptors.h
rename to firmware/atmel_softpack_libraries/usb/include/AUDDescriptors.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/AUDRequests.h b/firmware/atmel_softpack_libraries/usb/include/AUDRequests.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/AUDRequests.h
rename to firmware/atmel_softpack_libraries/usb/include/AUDRequests.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/CDCAUDDDriver.h b/firmware/atmel_softpack_libraries/usb/include/CDCAUDDDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/CDCAUDDDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/CDCAUDDDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/CDCDSerial.h b/firmware/atmel_softpack_libraries/usb/include/CDCDSerial.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/CDCDSerial.h
rename to firmware/atmel_softpack_libraries/usb/include/CDCDSerial.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/CDCDSerialDriver.h b/firmware/atmel_softpack_libraries/usb/include/CDCDSerialDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/CDCDSerialDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/CDCDSerialDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/CDCDSerialPort.h b/firmware/atmel_softpack_libraries/usb/include/CDCDSerialPort.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/CDCDSerialPort.h
rename to firmware/atmel_softpack_libraries/usb/include/CDCDSerialPort.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/CDCDescriptors.h b/firmware/atmel_softpack_libraries/usb/include/CDCDescriptors.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/CDCDescriptors.h
rename to firmware/atmel_softpack_libraries/usb/include/CDCDescriptors.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/CDCHIDDDriver.h b/firmware/atmel_softpack_libraries/usb/include/CDCHIDDDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/CDCHIDDDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/CDCHIDDDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/CDCMSDDriver.h b/firmware/atmel_softpack_libraries/usb/include/CDCMSDDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/CDCMSDDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/CDCMSDDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/CDCNotifications.h b/firmware/atmel_softpack_libraries/usb/include/CDCNotifications.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/CDCNotifications.h
rename to firmware/atmel_softpack_libraries/usb/include/CDCNotifications.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/CDCRequests.h b/firmware/atmel_softpack_libraries/usb/include/CDCRequests.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/CDCRequests.h
rename to firmware/atmel_softpack_libraries/usb/include/CDCRequests.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/DUALCDCDDriver.h b/firmware/atmel_softpack_libraries/usb/include/DUALCDCDDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/DUALCDCDDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/DUALCDCDDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/HIDAUDDDriver.h b/firmware/atmel_softpack_libraries/usb/include/HIDAUDDDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/HIDAUDDDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/HIDAUDDDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/HIDDFunction.h b/firmware/atmel_softpack_libraries/usb/include/HIDDFunction.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/HIDDFunction.h
rename to firmware/atmel_softpack_libraries/usb/include/HIDDFunction.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/HIDDKeyboard.h b/firmware/atmel_softpack_libraries/usb/include/HIDDKeyboard.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/HIDDKeyboard.h
rename to firmware/atmel_softpack_libraries/usb/include/HIDDKeyboard.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/HIDDKeyboardDriver.h b/firmware/atmel_softpack_libraries/usb/include/HIDDKeyboardDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/HIDDKeyboardDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/HIDDKeyboardDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/HIDDMouseDriver.h b/firmware/atmel_softpack_libraries/usb/include/HIDDMouseDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/HIDDMouseDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/HIDDMouseDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/HIDDTransferDriver.h b/firmware/atmel_softpack_libraries/usb/include/HIDDTransferDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/HIDDTransferDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/HIDDTransferDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/HIDDescriptors.h b/firmware/atmel_softpack_libraries/usb/include/HIDDescriptors.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/HIDDescriptors.h
rename to firmware/atmel_softpack_libraries/usb/include/HIDDescriptors.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/HIDMSDDriver.h b/firmware/atmel_softpack_libraries/usb/include/HIDMSDDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/HIDMSDDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/HIDMSDDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/HIDReports.h b/firmware/atmel_softpack_libraries/usb/include/HIDReports.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/HIDReports.h
rename to firmware/atmel_softpack_libraries/usb/include/HIDReports.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/HIDRequests.h b/firmware/atmel_softpack_libraries/usb/include/HIDRequests.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/HIDRequests.h
rename to firmware/atmel_softpack_libraries/usb/include/HIDRequests.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/HIDUsages.h b/firmware/atmel_softpack_libraries/usb/include/HIDUsages.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/HIDUsages.h
rename to firmware/atmel_softpack_libraries/usb/include/HIDUsages.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/MSD.h b/firmware/atmel_softpack_libraries/usb/include/MSD.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/MSD.h
rename to firmware/atmel_softpack_libraries/usb/include/MSD.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/MSDDStateMachine.h b/firmware/atmel_softpack_libraries/usb/include/MSDDStateMachine.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/MSDDStateMachine.h
rename to firmware/atmel_softpack_libraries/usb/include/MSDDStateMachine.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/MSDDriver.h b/firmware/atmel_softpack_libraries/usb/include/MSDDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/MSDDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/MSDDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/MSDFunction.h b/firmware/atmel_softpack_libraries/usb/include/MSDFunction.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/MSDFunction.h
rename to firmware/atmel_softpack_libraries/usb/include/MSDFunction.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/MSDIOFifo.h b/firmware/atmel_softpack_libraries/usb/include/MSDIOFifo.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/MSDIOFifo.h
rename to firmware/atmel_softpack_libraries/usb/include/MSDIOFifo.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/MSDLun.h b/firmware/atmel_softpack_libraries/usb/include/MSDLun.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/MSDLun.h
rename to firmware/atmel_softpack_libraries/usb/include/MSDLun.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/MSDescriptors.h b/firmware/atmel_softpack_libraries/usb/include/MSDescriptors.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/MSDescriptors.h
rename to firmware/atmel_softpack_libraries/usb/include/MSDescriptors.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/SBC.h b/firmware/atmel_softpack_libraries/usb/include/SBC.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/SBC.h
rename to firmware/atmel_softpack_libraries/usb/include/SBC.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/SBCMethods.h b/firmware/atmel_softpack_libraries/usb/include/SBCMethods.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/SBCMethods.h
rename to firmware/atmel_softpack_libraries/usb/include/SBCMethods.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/USBD.h b/firmware/atmel_softpack_libraries/usb/include/USBD.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/USBD.h
rename to firmware/atmel_softpack_libraries/usb/include/USBD.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/USBDDriver.h b/firmware/atmel_softpack_libraries/usb/include/USBDDriver.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/USBDDriver.h
rename to firmware/atmel_softpack_libraries/usb/include/USBDDriver.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/USBD_HAL.h b/firmware/atmel_softpack_libraries/usb/include/USBD_HAL.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/USBD_HAL.h
rename to firmware/atmel_softpack_libraries/usb/include/USBD_HAL.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/USBDescriptors.h b/firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/USBDescriptors.h
rename to firmware/atmel_softpack_libraries/usb/include/USBDescriptors.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/USBLib_Trace.h b/firmware/atmel_softpack_libraries/usb/include/USBLib_Trace.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/USBLib_Trace.h
rename to firmware/atmel_softpack_libraries/usb/include/USBLib_Trace.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/USBLib_Types.h b/firmware/atmel_softpack_libraries/usb/include/USBLib_Types.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/USBLib_Types.h
rename to firmware/atmel_softpack_libraries/usb/include/USBLib_Types.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/include/USBRequests.h b/firmware/atmel_softpack_libraries/usb/include/USBRequests.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/include/USBRequests.h
rename to firmware/atmel_softpack_libraries/usb/include/USBRequests.h
diff --git a/sam3s_example/atmel_softpack_libraries/usb/lib/libusb_sam3s_gcc_dbg.a b/firmware/atmel_softpack_libraries/usb/lib/libusb_sam3s_gcc_dbg.a
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/lib/libusb_sam3s_gcc_dbg.a
rename to firmware/atmel_softpack_libraries/usb/lib/libusb_sam3s_gcc_dbg.a
diff --git a/sam3s_example/atmel_softpack_libraries/usb/lib/libusb_sam3s_gcc_rel.a b/firmware/atmel_softpack_libraries/usb/lib/libusb_sam3s_gcc_rel.a
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/lib/libusb_sam3s_gcc_rel.a
rename to firmware/atmel_softpack_libraries/usb/lib/libusb_sam3s_gcc_rel.a
diff --git a/sam3s_example/atmel_softpack_libraries/usb/usb.h b/firmware/atmel_softpack_libraries/usb/usb.h
similarity index 100%
rename from sam3s_example/atmel_softpack_libraries/usb/usb.h
rename to firmware/atmel_softpack_libraries/usb/usb.h
diff --git a/sam3s_example/cmsis b/firmware/cmsis
similarity index 100%
rename from sam3s_example/cmsis
rename to firmware/cmsis
diff --git a/sam3s_example/flash.ld b/firmware/flash.ld
similarity index 100%
rename from sam3s_example/flash.ld
rename to firmware/flash.ld
diff --git a/sam3s_example/include/board.h b/firmware/include/board.h
similarity index 100%
rename from sam3s_example/include/board.h
rename to firmware/include/board.h
diff --git a/sam3s_example/include/board_lowlevel.h b/firmware/include/board_lowlevel.h
similarity index 100%
rename from sam3s_example/include/board_lowlevel.h
rename to firmware/include/board_lowlevel.h
diff --git a/sam3s_example/include/chip.h b/firmware/include/chip.h
similarity index 100%
rename from sam3s_example/include/chip.h
rename to firmware/include/chip.h
diff --git a/sam3s_example/include_board b/firmware/include_board
similarity index 100%
rename from sam3s_example/include_board
rename to firmware/include_board
diff --git a/sam3s_example/include_sam3s b/firmware/include_sam3s
similarity index 100%
rename from sam3s_example/include_sam3s
rename to firmware/include_sam3s
diff --git a/sam3s_example/openocd/openocd.cfg b/firmware/openocd/openocd.cfg
similarity index 100%
rename from sam3s_example/openocd/openocd.cfg
rename to firmware/openocd/openocd.cfg
diff --git a/sam3s_example/sam3s_examples_include/SAM3S.h b/firmware/sam3s_examples_include/SAM3S.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/SAM3S.h
rename to firmware/sam3s_examples_include/SAM3S.h
diff --git a/sam3s_example/sam3s_examples_include/USBD_Config.h b/firmware/sam3s_examples_include/USBD_Config.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/USBD_Config.h
rename to firmware/sam3s_examples_include/USBD_Config.h
diff --git a/sam3s_example/sam3s_examples_include/USBD_LEDs.h b/firmware/sam3s_examples_include/USBD_LEDs.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/USBD_LEDs.h
rename to firmware/sam3s_examples_include/USBD_LEDs.h
diff --git a/sam3s_example/sam3s_examples_include/acc.h b/firmware/sam3s_examples_include/acc.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/acc.h
rename to firmware/sam3s_examples_include/acc.h
diff --git a/sam3s_example/sam3s_examples_include/adc.h b/firmware/sam3s_examples_include/adc.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/adc.h
rename to firmware/sam3s_examples_include/adc.h
diff --git a/sam3s_example/sam3s_examples_include/async.h b/firmware/sam3s_examples_include/async.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/async.h
rename to firmware/sam3s_examples_include/async.h
diff --git a/sam3s_example/sam3s_examples_include/chip.h b/firmware/sam3s_examples_include/chip.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/chip.h
rename to firmware/sam3s_examples_include/chip.h
diff --git a/sam3s_example/sam3s_examples_include/crccu.h b/firmware/sam3s_examples_include/crccu.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/crccu.h
rename to firmware/sam3s_examples_include/crccu.h
diff --git a/sam3s_example/sam3s_examples_include/dacc.h b/firmware/sam3s_examples_include/dacc.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/dacc.h
rename to firmware/sam3s_examples_include/dacc.h
diff --git a/sam3s_example/sam3s_examples_include/efc.h b/firmware/sam3s_examples_include/efc.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/efc.h
rename to firmware/sam3s_examples_include/efc.h
diff --git a/sam3s_example/sam3s_examples_include/exceptions.h b/firmware/sam3s_examples_include/exceptions.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/exceptions.h
rename to firmware/sam3s_examples_include/exceptions.h
diff --git a/sam3s_example/sam3s_examples_include/flashd.h b/firmware/sam3s_examples_include/flashd.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/flashd.h
rename to firmware/sam3s_examples_include/flashd.h
diff --git a/sam3s_example/sam3s_examples_include/hsmci.h b/firmware/sam3s_examples_include/hsmci.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/hsmci.h
rename to firmware/sam3s_examples_include/hsmci.h
diff --git a/sam3s_example/sam3s_examples_include/pio.h b/firmware/sam3s_examples_include/pio.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/pio.h
rename to firmware/sam3s_examples_include/pio.h
diff --git a/sam3s_example/sam3s_examples_include/pio_capture.h b/firmware/sam3s_examples_include/pio_capture.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/pio_capture.h
rename to firmware/sam3s_examples_include/pio_capture.h
diff --git a/sam3s_example/sam3s_examples_include/pio_it.h b/firmware/sam3s_examples_include/pio_it.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/pio_it.h
rename to firmware/sam3s_examples_include/pio_it.h
diff --git a/sam3s_example/sam3s_examples_include/pmc.h b/firmware/sam3s_examples_include/pmc.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/pmc.h
rename to firmware/sam3s_examples_include/pmc.h
diff --git a/sam3s_example/sam3s_examples_include/pwmc.h b/firmware/sam3s_examples_include/pwmc.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/pwmc.h
rename to firmware/sam3s_examples_include/pwmc.h
diff --git a/sam3s_example/sam3s_examples_include/rtc.h b/firmware/sam3s_examples_include/rtc.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/rtc.h
rename to firmware/sam3s_examples_include/rtc.h
diff --git a/sam3s_example/sam3s_examples_include/rtt.h b/firmware/sam3s_examples_include/rtt.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/rtt.h
rename to firmware/sam3s_examples_include/rtt.h
diff --git a/sam3s_example/sam3s_examples_include/spi.h b/firmware/sam3s_examples_include/spi.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/spi.h
rename to firmware/sam3s_examples_include/spi.h
diff --git a/sam3s_example/sam3s_examples_include/spi_pdc.h b/firmware/sam3s_examples_include/spi_pdc.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/spi_pdc.h
rename to firmware/sam3s_examples_include/spi_pdc.h
diff --git a/sam3s_example/sam3s_examples_include/ssc.h b/firmware/sam3s_examples_include/ssc.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/ssc.h
rename to firmware/sam3s_examples_include/ssc.h
diff --git a/sam3s_example/sam3s_examples_include/supc.h b/firmware/sam3s_examples_include/supc.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/supc.h
rename to firmware/sam3s_examples_include/supc.h
diff --git a/sam3s_example/sam3s_examples_include/tc.h b/firmware/sam3s_examples_include/tc.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/tc.h
rename to firmware/sam3s_examples_include/tc.h
diff --git a/sam3s_example/sam3s_examples_include/trace.h b/firmware/sam3s_examples_include/trace.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/trace.h
rename to firmware/sam3s_examples_include/trace.h
diff --git a/sam3s_example/sam3s_examples_include/twi.h b/firmware/sam3s_examples_include/twi.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/twi.h
rename to firmware/sam3s_examples_include/twi.h
diff --git a/sam3s_example/sam3s_examples_include/twid.h b/firmware/sam3s_examples_include/twid.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/twid.h
rename to firmware/sam3s_examples_include/twid.h
diff --git a/sam3s_example/sam3s_examples_include/usart.h b/firmware/sam3s_examples_include/usart.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/usart.h
rename to firmware/sam3s_examples_include/usart.h
diff --git a/sam3s_example/sam3s_examples_include/wdt.h b/firmware/sam3s_examples_include/wdt.h
similarity index 100%
rename from sam3s_example/sam3s_examples_include/wdt.h
rename to firmware/sam3s_examples_include/wdt.h
diff --git a/sam3s_example/simtrace/ccid.c b/firmware/simtrace/ccid.c
similarity index 100%
rename from sam3s_example/simtrace/ccid.c
rename to firmware/simtrace/ccid.c
diff --git a/sam3s_example/simtrace/cciddriver.c b/firmware/simtrace/cciddriver.c
similarity index 100%
rename from sam3s_example/simtrace/cciddriver.c
rename to firmware/simtrace/cciddriver.c
diff --git a/sam3s_example/simtrace/cciddriver.h b/firmware/simtrace/cciddriver.h
similarity index 100%
rename from sam3s_example/simtrace/cciddriver.h
rename to firmware/simtrace/cciddriver.h
diff --git a/sam3s_example/simtrace/cciddriverdescriptors.h b/firmware/simtrace/cciddriverdescriptors.h
similarity index 100%
rename from sam3s_example/simtrace/cciddriverdescriptors.h
rename to firmware/simtrace/cciddriverdescriptors.h
diff --git a/sam3s_example/simtrace/mitm.c b/firmware/simtrace/mitm.c
similarity index 100%
rename from sam3s_example/simtrace/mitm.c
rename to firmware/simtrace/mitm.c
diff --git a/sam3s_example/simtrace/phone.c b/firmware/simtrace/phone.c
similarity index 100%
rename from sam3s_example/simtrace/phone.c
rename to firmware/simtrace/phone.c
diff --git a/sam3s_example/simtrace/simtrace.h b/firmware/simtrace/simtrace.h
similarity index 100%
rename from sam3s_example/simtrace/simtrace.h
rename to firmware/simtrace/simtrace.h
diff --git a/sam3s_example/simtrace/simtrace_iso7816.c b/firmware/simtrace/simtrace_iso7816.c
similarity index 100%
rename from sam3s_example/simtrace/simtrace_iso7816.c
rename to firmware/simtrace/simtrace_iso7816.c
diff --git a/sam3s_example/simtrace/simtrace_main.c b/firmware/simtrace/simtrace_main.c
similarity index 100%
rename from sam3s_example/simtrace/simtrace_main.c
rename to firmware/simtrace/simtrace_main.c
diff --git a/sam3s_example/simtrace/sniffer.c b/firmware/simtrace/sniffer.c
similarity index 100%
rename from sam3s_example/simtrace/sniffer.c
rename to firmware/simtrace/sniffer.c
diff --git a/sam3s_example/simtrace/tc_etu.c b/firmware/simtrace/tc_etu.c
similarity index 100%
rename from sam3s_example/simtrace/tc_etu.c
rename to firmware/simtrace/tc_etu.c
diff --git a/sam3s_example/simtrace/usb.c b/firmware/simtrace/usb.c
similarity index 100%
rename from sam3s_example/simtrace/usb.c
rename to firmware/simtrace/usb.c
diff --git a/sam3s_example/src_board b/firmware/src_board
similarity index 100%
rename from sam3s_example/src_board
rename to firmware/src_board
diff --git a/sam3s_example/src_sam3s b/firmware/src_sam3s
similarity index 100%
rename from sam3s_example/src_sam3s
rename to firmware/src_sam3s