* deal with changes in the model (folder) correctly