Move CPA to an external dep, fix #75