Move constants to appropriate class