Auth gut, User model
structure cleanup