Consolidate control generator arithmetic into one file pair
Consolidate normal generator arithmetic into one file pair