changed folder structure and added year calendar