Moving to a common package for constants