Start on cleanup.
Removed cruft.
Move users out to its own file, update README.
Update tasks.