Move constants to distinct file.
Merge constant changes for future feature branches.