Moved files

Also replaced c++ expressions