Insp pays attention to these new.cpp files... moved them to root dir