Some small changes to namespacing. Bumped cabal file a bit