Trying to avoid circular dependencies by moving around a few functions
Merge pull request #349 from reddmetrics/feature/cleanup-thrift

Trying to avoid circular dependencies by moving around a few functions