Added missing competition structure classes and started refining Match class.