Moved from thrift/cpp/ to thrift/