structure of packages altered, and added functionality in CalendarView.