A rename of files... And some thrift stuff

Thrift not working. May us Corey's idea after all.