Removed Thrift project and moved collector.thrift into the Collector project