Start of refactoring activities for java package.