Move user store to atlas-persistence
Tidy up user finder