project simplification effort
moved models and consolidated controllerse