Some restructuring and the AlignmentAssembler class