First step of re-organizing modules, we're passing tests, but not everything has been moved over
Merge branch 'master' of https://github.com/knagra/farnsworth