Types.hs and Decode.hs
removing Map.