Rename Model to Mdl
Build fixes