refactoting calendar folder structure