Finalized refactor.
Merge branch 'haskell' of https://github.com/nadiasvertex/eon into haskell