Some restructuring to support more proper well handling, esp. group control and surface rate controls in general.