More constants moved to appropriate files