Refactoring of packages for views