Finished refactoring packaging