Reorg construction into tasks
Reorg