Refactoring into a views package