Refactored import organization into the java package.