Relocated simple calendar files into his folder, and other changes