Refactored Thrift server and CLI suites