Moving templates to their dir.
Query result rendering specialization

- Results can now have content type specific.  For now leave this as a
  dict of expected content types.