Restructure groups to fix intraday epoch requests