Add files from Emilio
Work on the Haskell extraction