Move constants to proper location