better organisation of user models and collections