Correcting wrong imports due to change in naming conventions with _model
and _run convention added.
Merge branch 'master' of https://github.com/gcallah/Indra