Space Calendar

Is there any plan for a combined task & project view for the Calendar? We have an annual marketing plan and would like to be able to view all activity within folders as this is the only way to colour code them for easy reference (the Gantt chart isn't suitable as the colours and structure are not non-Wrike-user friendly).

Having both tasks and projects plotted onto one calendar would be extremely helpful.