rename views -> view package
Merge branch 'refactoring'