keeping up with the reorganization that happened in general and haskell