Refactored java packages to be inline with module name changes