Refactor Library and more...