Moving user models to model.user-package