Reorg, AMDify and builder task