Model file loader into model extractor and small refactorings