Tidy up model classes.
Update visual fields service with latest conventions.
Update for new BETC interface.