Reorganised.  Use Cabal to build.