Refactored views into a package with modules