Library Refactor