PHASE 1 - Migrate the db to new BDM structure

Add the migration and model changes

Change-Id: I68e1559ac2c648a73c62c4e9baaf7b979189a287