Refactored package structure.
Merge branch 'master' of https://github.com/h-shra/java