Clean up Haskell imports, split and merge Haskell modules