Rename Java packages to be in-line with the actual package name