Move constants to proper constants file