Collapse the numerous constants files into a few less