Artifact models in development lead to conflicts in ibpsa merge

The current development has artifacts which seems to come from changing "store as one file" to "store as directory". The old package.mo which where stored in one file still exist but also new directorys which are not linked correctly. This leads to the creation of false entries in package.order when running the ibpsa merge script. Find a screenshot attached:

• We need to clear this first by convert all "stored as one file" correctly to directories