Restructuring for NASM & GAS support