Refactor to including FannieAPI. Solves some double-includes and
class/function re-definition problems.