Renaming simulator to cpp, and test commit