#18 Refactor view folders structure