moving thrift to main src