Move units "collectors" section into right position

Easier to see that way, and there is not much need for this grouping.
units: Only define unique id once (in constants)

See 2013.3-220-gee66cb8 (ee66cb8e71ed708342dd08afd6ceda64263c4247).