Move constants to submodule