Repacker refactoring done