ENG-4345 Fixed major agg executor regressions, re-orged source files.