new models import
new controllers
small model refactor