Library Refactoring