Refactoring packaging system.