MDL-18375 calendar: moved the calendar systems location to a sub-folder in the calendar directory