Made sure the mapping actually typechecks
Added structure check code for analyzing models
Migrated import to new module name