Refactoring to change package names

Before it becomes too late changing package names.