Move constants to constants