add more thrift stuff
delete moved files