Import updated to use new model file structure