Moved thrift files to more appropriate location