Key refactoring and adding new packages.