remake auth classes