Move Calendar and Plus service into their own folders