Restructuring thrift types so as to reuse types for the two services defined.
The new thrift structure generates these two headers we should track.
Headers modified after changes to Thrift definitions, new structure.