Move user related stuff into its own module