Move collections to lib