disagg_main refactor and renaming