Views package refactoring