More major reconfiguration of databases

Now there is only one database for the entire program, and some new
tables have been added