Calendar and Mail class have been moved