Refactor package name to follow java conventions.