Better folder management
Merge branch 'master' of https://github.com/rism-ch/muscat