Start of refactoring activities for java package.
No comment
Merge remote branch 'upstream/master'