move constants to their appropriate places