Added Types module. Moved someOr into new Option module.