Refactoring packages
Merge branch 'refactoring'