Move Calendar out of add on and into product