move constants to classes that use them