Reorganised Haskell files.