Move extract thrift definition to storage.thrift