Refactor packages
Merge branch 'master' of
https://github.com/valerysamovich/java-tutorial.git