Cleaned Haskell and added new files