Rearchitect extract and move tasks