More rearrangement. Some work on run targets.