move collections to lib