Added new C++ files, modified others