Remodeling data for bourbons
Renaming models based new tables
Merge branch 'remodel'