Moved constant class out to its own header