Mode stuff around in the cpp module, and renamed it.