More CN prefixing and project clean up.