Refactoring the views into separate files