#18 Refactor view folders structures