Move collections inside lib