Renamed and moved couple of models

Renamed and moved couple of models and added necessary conversion script. Suggested new version number: 1.4.0