Remove old bundle models and views. Add first-cut integration with bundle service.
Fix test to enable bundle service