more refactoring to support new domain model
updated views to work with new domain model structure