Moved several contributions to cabal