Update makefile and remove files moved to cpp-common