Separated out Content from Calendar definitions

I needed this separated out for Drupal