moved models, modified app
fix merge change.