Renaming of packages, refactoring