refactor views folder