Start to refactor simulink importer