separating views
Merge branch 'refactor/file-structure'

merging in from refactor