Adding CPP files in tools