Move collections to own file