Undo package refactoring