Start of refactoring data sets views.

Move all non sub resources into resource view. All tests passing again.