Assembler: Restructuring + updated TODOs