Move user stuff to a feature module