global fix imports; moved models into app root directory