Fixed model file folder structure