Added modules.hs and types.hs