Merge pull request #65 from OpenTreeOfLife/old-refactor

Old refactor
Merge branch 'master' into ott