Got rid of CPP folder and moved stuff