Updated the user state, moved the associated files.
Continuation of moving things around and reworking how things work so we don't duplicate states.