Project structure updated for different Haskell implementations