Merge "Relocate common Calendar classes"