re-organised assembly subdirs