modeltypes: move to include/ dir, for now