Refactoring package