Added CalStruct class to manage controlled and unified access to cal structs of old-style and new-style formats.