Move views to a package file
Split view logic from view creation
Merge pull request #1368 from steventlamb/topic/refactor_views

Topic/refactor views