Refactor Library/Collection stuff.