Refactoring: Added views package