Renamed the package names so that it matches Java convention.