This is an absolute wreck; I'll clean it up later.
Fix some header style
A bit more mess updating routing
Stub out a user
Move files to make haw happier