Add support for creating file models and fix some path issues
Merge branch 'release/1.1.0' into develop