diff --git a/DGC.schema-combined.json b/DGC.schema-combined.json
deleted file mode 100644
index 71aa0f9..0000000
--- a/DGC.schema-combined.json
+++ /dev/null
@@ -1,274 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://id.uvci.eu/DGC.schema-combined.json",
-  "title": "EU DGC",
-  "description": "EU Digital Green Certificate Value Set Data Types",
-  "$defs": {
-    "disease-agent-targeted": {
-      "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.1",
-      "type": "string",
-      "valueset-uri": "valuesets/disease-agent-targeted.json"
-    },
-    "vaccine-prophylaxis": {
-      "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.2",
-      "type": "string",
-      "valueset-uri": "valuesets/vaccine-prophylaxis.json"
-    },
-    "vaccine-medicinal-product": {
-      "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.3",
-      "type": "string",
-      "valueset-uri": "valuesets/vaccine-medicinal-product.json"
-    },
-    "vaccine-mah-manf": {
-      "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.4",
-      "type": "string",
-      "valueset-uri": "valuesets/vaccine-mah-manf.json"
-    },
-    "test-manf": {
-      "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.8",
-      "type": "string",
-      "valueset-uri": "valuesets/test-manf.json"
-    },
-    "test-result": {
-      "description": "EU eHealthNetwork: Value Sets for Digital Green Certificates. version 1.0, 2021-04-16, section 2.9",
-      "type": "string",
-      "valueset-uri": "valuesets/test-results.json"
-    },
-    "dose_posint": {
-      "description": "Dose Number / Total doses in Series: positive integer, range: [1,9]",
-      "type": "integer",
-      "minimum": 1,
-      "maximum": 9
-    },
-    "country_vt": {
-      "description": "Country of Vaccination / Test, ISO 3166 where possible",
-      "type": "string",
-      "pattern": "[A-Z]{1,10}"
-    },
-    "issuer": {
-      "description": "Certificate Issuer",
-      "type": "string",
-      "maxLength": 50
-    },
-    "person_name": {
-      "description": "Person name: Surname(s), given name(s) - in that order",
-      "required": [
-        "fnt"
-      ],
-      "type": "object",
-      "properties": {
-        "fn": {
-          "title": "Family name",
-          "description": "The family or primary name(s) of the person addressed in the certificate",
-          "type": "string",
-          "maxLength": 50,
-          "examples": [
-            "d'Červenková Panklová"
-          ]
-        },
-        "fnt": {
-          "title": "Standardised family name",
-          "description": "The family name(s) of the person transliterated",
-          "type": "string",
-          "pattern": "^[A-Z<]*$",
-          "maxLength": 50,
-          "examples": [
-            "DCERVENKOVA<PANKLOVA"
-          ]
-        },
-        "gn": {
-          "title": "Given name",
-          "description": "The given name(s) of the person addressed in the certificate",
-          "type": "string",
-          "maxLength": 50,
-          "examples": [
-            "Jiřina-Maria Alena"
-          ]
-        },
-        "gnt": {
-          "title": "Standardised given name",
-          "description": "The given name(s) of the person transliterated",
-          "type": "string",
-          "pattern": "^[A-Z<]*$",
-          "maxLength": 50,
-          "$comment": "SematicSG: ICAO transliterated has max length of?",
-          "examples": [
-            "JIRINA<MARIA<ALENA"
-          ]
-        }
-      }
-    },
-    "certificate_id": {
-      "description": "Certificate Identifier, UVCI",
-      "type": "string",
-      "maxLength": 50
-    },
-    "vaccination_entry": {
-      "description": "Vaccination Entry",
-      "required": [
-        "tg",
-        "vp",
-        "mp",
-        "ma",
-        "dn",
-        "sd",
-        "dt",
-        "co",
-        "is",
-        "ci"
-      ],
-      "type": "object",
-      "properties": {
-        "tg": {
-          "description": "disease or agent targeted",
-          "$ref": "#/$defs/disease-agent-targeted"
-        },
-        "vp": {
-          "description": "vaccine or prophylaxis",
-          "$ref": "#/$defs/vaccine-prophylaxis"
-        },
-        "mp": {
-          "description": "vaccine medicinal product",
-          "$ref": "#/$defs/vaccine-medicinal-product"
-        },
-        "ma": {
-          "description": "Marketing Authorization Holder - if no MAH present, then manufacturer",
-          "$ref": "#/$defs/vaccine-mah-manf"
-        },
-        "dn": {
-          "description": "Dose Number",
-          "$ref": "#/$defs/dose_posint"
-        },
-        "sd": {
-          "description": "Total Series of Doses",
-          "$ref": "#/$defs/dose_posint"
-        },
-        "dt": {
-          "description": "Date of Vaccination",
-          "type": "string",
-          "format": "date",
-          "$comment": "SemanticSG: constrain to specific date range?"
-        },
-        "co": {
-          "description": "Country of Vaccination",
-          "$ref": "#/$defs/country_vt"
-        },
-        "is": {
-          "description": "Certificate Issuer",
-          "$ref": "#/$defs/issuer"
-        },
-        "ci": {
-          "description": "Unique Certificate Identifier: UVCI",
-          "$ref": "#/$defs/certificate_id"
-        }
-      }
-    },
-    "test_entry": {
-      "description": "Test Entry",
-      "required": [
-        "tg",
-        "tt",
-        "sc",
-        "tr",
-        "tc",
-        "co",
-        "is",
-        "ci"
-      ],
-      "type": "object",
-      "properties": {
-        "tg": {
-          "$ref": "#/$defs/disease-agent-targeted"
-        },
-        "tt": {
-          "description": "Type of Test",
-          "type": "string"
-        },
-        "nm": {
-          "description": "NAA Test Name",
-          "type": "string"
-        },
-        "ma": {
-          "description": "RAT Test name and manufacturer",
-          "$ref": "#/$defs/test-manf"
-        },
-        "sc": {
-          "description": "Date/Time of Sample Collection",
-          "type": "string",
-          "format": "date-time"
-        },
-        "dr": {
-          "description": "Date/Time of Test Result",
-          "type": "string",
-          "format": "date-time"
-        },
-        "tr": {
-          "description": "Test Result",
-          "$ref": "#/$defs/test-result"
-        },
-        "tc": {
-          "description": "Testing Centre",
-          "type": "string",
-          "maxLength": 50
-        },
-        "co": {
-          "description": "Country of Test",
-          "$ref": "#/$defs/country_vt"
-        },
-        "is": {
-          "description": "Certificate Issuer",
-          "$ref": "#/$defs/issuer"
-        },
-        "ci": {
-          "description": "Unique Certificate Identifier, UVCI",
-          "$ref": "#/$defs/certificate_id"
-        }
-      }
-    },
-    "recovery_entry": {
-      "description": "Recovery Entry",
-      "required": [
-        "tg",
-        "fr",
-        "co",
-        "is",
-        "df",
-        "du",
-        "ci"
-      ],
-      "type": "object",
-      "properties": {
-        "tg": {
-          "$ref": "#/$defs/disease-agent-targeted"
-        },
-        "fr": {
-          "description": "ISO 8601 Date of First Positive Test Result",
-          "type": "string",
-          "format": "date"
-        },
-        "co": {
-          "description": "Country of Test",
-          "$ref": "#/$defs/country_vt"
-        },
-        "is": {
-          "description": "Certificate Issuer",
-          "$ref": "#/$defs/issuer"
-        },
-        "df": {
-          "description": "ISO 8601 Date: Certificate Valid From",
-          "type": "string",
-          "format": "date"
-        },
-        "du": {
-          "description": "Certificate Valid Until",
-          "type": "string",
-          "format": "date"
-        },
-        "ci": {
-          "description": "Unique Certificate Identifier, UVCI",
-          "$ref": "#/$defs/certificate_id"
-        }
-      }
-    }
-  }
-}
diff --git a/README.md b/README.md
index 656aaad..d86cfa3 100644
--- a/README.md
+++ b/README.md
@@ -18,13 +18,13 @@ With the defintions in:
 
 For easy testing - they are combined in:
 
-- DGC-all-schemas-combined.json (not built automatically yet)
+- DGC.combined-schema.json
 
 But the above 4 files are always leading.
 
 The files:
 
-- example*.json
+- examples/*.json
 
 are examples created in vitro & very artificial.