More refactoring: User and Auth completely moved to Mapper, minor bug fixes