A bit of re-organization
More re-organization fixes