changed package position of UserModel and updated