ROOMS-289: Refactor Calendar and Event classes architecture