added C++ file, renamed/fixed java file