Assembler: restructured