cleanup

models created, moved away from controllers and services.