Refactor views to package view