Reorganizing, adding hashing && UserModel