Refactoring to use a sub module for views