Move keywords into contrib