restructured thrift files