Rename the package
Refactoring
More refactoring work