Re-organize delegation specs.