cosmetic changes - simple additions to .cabal and namespace clashes. Definitely need to learn from this.