new makefile and cml/contrib test location
removing some redundant files