Modified folder structures in ClicNDone.Core