Comments and structure update

Changed IEvent to give fewer conflicts in merges and updated spec for
FileMgr.