Refactoring the views folder