Break up the monolith in consolidate_database

[dgets]

Code is way too long and convoluted. This needs to be broken up into more manageable segments.