Refactor Contacts to be directly associated with Users (instead of with Accounts)
Finish User/Contact/Account refactor