Restructure into separate AVR & ARM sections