Started building calendar, project structure fixes