Update before using new DB Scheme

Switching some tables up, committing before a lot of the code gets
changed.