Major update to structure.  Moved events to it's own collection