convert-hf : make model class definitions self-contained

convert-hf : make model class definitions self-contained #2317