Fixing bugs in schema
Converting source code to amalgamated database design [WIP]