Fixing the database

Consolidate the database into one mdf file and one context file. Started
the solution from scratch