Move common-material to common-material.core