Move types out to Types.hs