diff --git a/generated.mk b/generated.mk
index 19bd23a7..2d085cfc 100644
--- a/generated.mk
+++ b/generated.mk
@@ -19,11 +19,11 @@ GENERATED += schemas/$1.json
 endef
 
 define MAKE_SCHEMA_UTR
-schemas/2020-12/xbrl/utr/$1.json: templates/schemas/2020-12/xbrl/utr/item-type.jq build/xbrl/utr/utr.json templates/data/xbrl/utr-unit-iris.json | node_modules
+schemas/xbrl/utr/$1.json: templates/schemas/xbrl/utr/item-type.jq build/xbrl/utr/utr.json templates/data/xbrl/utr-unit-iris.json | node_modules
 	$(MKDIRP) $$(dir $$@)
 	$(JQ) --from-file $$< --slurpfile unit_iris $$(word 3,$$^) --arg item_type $2 --arg normative $3 $$(word 2,$$^) > $$@
 	$(NODE) $(JSONSCHEMA) fmt $$@
-GENERATED += schemas/2020-12/xbrl/utr/$1.json
+GENERATED += schemas/xbrl/utr/$1.json
 endef
 
 build/iso/currency/list-%.json: \
@@ -31,23 +31,23 @@ build/iso/currency/list-%.json: \
 	vendor/data/iso/currency/list-%.xml
 	$(PYTHON) $< $(word 2,$^) $@
 
-$(eval $(call MAKE_SCHEMA,2020-12/iso/currency/2015/historical/alpha-code,build/iso/currency/list-three))
-$(eval $(call MAKE_SCHEMA,2020-12/iso/currency/2015/historical/alpha-currency,build/iso/currency/list-three))
-$(eval $(call MAKE_SCHEMA,2020-12/iso/currency/2015/historical/numeric-code,build/iso/currency/list-three))
-$(eval $(call MAKE_SCHEMA,2020-12/iso/currency/2015/historical/numeric-currency,build/iso/currency/list-three))
-$(eval $(call MAKE_SCHEMA_CURRENCY,2020-12/iso/currency/2015/alpha-code,build/iso/currency/list-one))
-$(eval $(call MAKE_SCHEMA_CURRENCY,2020-12/iso/currency/2015/alpha-currency,build/iso/currency/list-one))
-$(eval $(call MAKE_SCHEMA,2020-12/iso/currency/2015/alpha-fund,build/iso/currency/list-one))
-$(eval $(call MAKE_SCHEMA_CURRENCY,2020-12/iso/currency/2015/alpha-precious-metal,build/iso/currency/list-one))
-$(eval $(call MAKE_SCHEMA_CURRENCY,2020-12/iso/currency/2015/alpha-test,build/iso/currency/list-one))
-$(eval $(call MAKE_SCHEMA_CURRENCY,2020-12/iso/currency/2015/alpha-unknown,build/iso/currency/list-one))
-$(eval $(call MAKE_SCHEMA,2020-12/iso/currency/2015/numeric-code-additional,build/iso/currency/list-one))
-$(eval $(call MAKE_SCHEMA_CURRENCY,2020-12/iso/currency/2015/numeric-code,build/iso/currency/list-one))
-$(eval $(call MAKE_SCHEMA_CURRENCY,2020-12/iso/currency/2015/numeric-currency,build/iso/currency/list-one))
-$(eval $(call MAKE_SCHEMA,2020-12/iso/currency/2015/numeric-fund,build/iso/currency/list-one))
-$(eval $(call MAKE_SCHEMA_CURRENCY,2020-12/iso/currency/2015/numeric-precious-metal,build/iso/currency/list-one))
-$(eval $(call MAKE_SCHEMA_CURRENCY,2020-12/iso/currency/2015/numeric-test,build/iso/currency/list-one))
-$(eval $(call MAKE_SCHEMA_CURRENCY,2020-12/iso/currency/2015/numeric-unknown,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA,iso/currency/2015/historical/alpha-code,build/iso/currency/list-three))
+$(eval $(call MAKE_SCHEMA,iso/currency/2015/historical/alpha-currency,build/iso/currency/list-three))
+$(eval $(call MAKE_SCHEMA,iso/currency/2015/historical/numeric-code,build/iso/currency/list-three))
+$(eval $(call MAKE_SCHEMA,iso/currency/2015/historical/numeric-currency,build/iso/currency/list-three))
+$(eval $(call MAKE_SCHEMA_CURRENCY,iso/currency/2015/alpha-code,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA_CURRENCY,iso/currency/2015/alpha-currency,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA,iso/currency/2015/alpha-fund,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA_CURRENCY,iso/currency/2015/alpha-precious-metal,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA_CURRENCY,iso/currency/2015/alpha-test,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA_CURRENCY,iso/currency/2015/alpha-unknown,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA,iso/currency/2015/numeric-code-additional,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA_CURRENCY,iso/currency/2015/numeric-code,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA_CURRENCY,iso/currency/2015/numeric-currency,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA,iso/currency/2015/numeric-fund,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA_CURRENCY,iso/currency/2015/numeric-precious-metal,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA_CURRENCY,iso/currency/2015/numeric-test,build/iso/currency/list-one))
+$(eval $(call MAKE_SCHEMA_CURRENCY,iso/currency/2015/numeric-unknown,build/iso/currency/list-one))
 
 build/xbrl/utr/%.json: scripts/xml2json.py vendor/data/xbrl/utr/%.xml
 	$(PYTHON) $< $(word 2,$^) $@
@@ -105,9 +105,9 @@ $(eval $(call MAKE_SCHEMA_UTR,volume-item-type,volumeItemType,false))
 $(eval $(call MAKE_SCHEMA_UTR,volume-per-monetary-item-type-normative,volumePerMonetaryItemType,true))
 $(eval $(call MAKE_SCHEMA_UTR,volume-per-monetary-item-type,volumePerMonetaryItemType,false))
 
-$(eval $(call MAKE_SCHEMA,2020-12/iso/country/2020/alpha-2,vendor/iso3166/all/all))
-$(eval $(call MAKE_SCHEMA,2020-12/iso/country/2020/alpha-3,vendor/iso3166/all/all))
-$(eval $(call MAKE_SCHEMA,2020-12/iso/country/2020/numeric,vendor/iso3166/all/all))
+$(eval $(call MAKE_SCHEMA,iso/country/2020/alpha-2,vendor/iso3166/all/all))
+$(eval $(call MAKE_SCHEMA,iso/country/2020/alpha-3,vendor/iso3166/all/all))
+$(eval $(call MAKE_SCHEMA,iso/country/2020/numeric,vendor/iso3166/all/all))
 
 build/iso/language/iso-639-2.json: \
 	vendor/data/iso/language/ISO-639-2_utf-8.txt \
@@ -130,8 +130,8 @@ build/iso/language/%.json: \
 	templates/build/iso/language/%.jq
 	$(JQ) --slurpfile iso2 $< --slurpfile iso3 $(word 2,$^) --slurpfile iso5 $(word 3,$^) -n -f $(word 4,$^) > $@
 
-$(eval $(call MAKE_SCHEMA,2020-12/iso/language/2023/set-1,build/iso/language/enriched))
-$(eval $(call MAKE_SCHEMA,2020-12/iso/language/2023/set-2-bibliographic,build/iso/language/enriched))
-$(eval $(call MAKE_SCHEMA,2020-12/iso/language/2023/set-2-terminologic,build/iso/language/enriched))
-$(eval $(call MAKE_SCHEMA,2020-12/iso/language/2023/set-3,build/iso/language/enriched))
-$(eval $(call MAKE_SCHEMA,2020-12/iso/language/2023/set-5,build/iso/language/enriched))
+$(eval $(call MAKE_SCHEMA,iso/language/2023/set-1,build/iso/language/enriched))
+$(eval $(call MAKE_SCHEMA,iso/language/2023/set-2-bibliographic,build/iso/language/enriched))
+$(eval $(call MAKE_SCHEMA,iso/language/2023/set-2-terminologic,build/iso/language/enriched))
+$(eval $(call MAKE_SCHEMA,iso/language/2023/set-3,build/iso/language/enriched))
+$(eval $(call MAKE_SCHEMA,iso/language/2023/set-5,build/iso/language/enriched))
diff --git a/jsonschema.json b/jsonschema.json
index 0a3d2a78..0c2ba54f 100644
--- a/jsonschema.json
+++ b/jsonschema.json
@@ -5,7 +5,7 @@
   "github": "sourcemeta/std",
   "path": "./schemas",
   "resolve": {
-    "urn:sourcemeta:std:ietf:jsonschema:2020-12:dialect:format-assertion": "./schemas/2020-12/ietf/jsonschema/2020-12/dialect/format-assertion.json"
+    "urn:sourcemeta:std:ietf:jsonschema:2020-12:dialect:format-assertion": "./schemas/ietf/jsonschema/2020-12/dialect/format-assertion.json"
   },
   "lint": {
     "rules": [
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/attoampere.json b/schemas/bipm/si/2019/base/prefixed/attoampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/attoampere.json
rename to schemas/bipm/si/2019/base/prefixed/attoampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/attocandela.json b/schemas/bipm/si/2019/base/prefixed/attocandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/attocandela.json
rename to schemas/bipm/si/2019/base/prefixed/attocandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/attogram.json b/schemas/bipm/si/2019/base/prefixed/attogram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/attogram.json
rename to schemas/bipm/si/2019/base/prefixed/attogram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/attokelvin.json b/schemas/bipm/si/2019/base/prefixed/attokelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/attokelvin.json
rename to schemas/bipm/si/2019/base/prefixed/attokelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/attometre.json b/schemas/bipm/si/2019/base/prefixed/attometre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/attometre.json
rename to schemas/bipm/si/2019/base/prefixed/attometre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/attomole.json b/schemas/bipm/si/2019/base/prefixed/attomole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/attomole.json
rename to schemas/bipm/si/2019/base/prefixed/attomole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/attosecond.json b/schemas/bipm/si/2019/base/prefixed/attosecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/attosecond.json
rename to schemas/bipm/si/2019/base/prefixed/attosecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/centiampere.json b/schemas/bipm/si/2019/base/prefixed/centiampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/centiampere.json
rename to schemas/bipm/si/2019/base/prefixed/centiampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/centicandela.json b/schemas/bipm/si/2019/base/prefixed/centicandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/centicandela.json
rename to schemas/bipm/si/2019/base/prefixed/centicandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/centigram.json b/schemas/bipm/si/2019/base/prefixed/centigram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/centigram.json
rename to schemas/bipm/si/2019/base/prefixed/centigram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/centikelvin.json b/schemas/bipm/si/2019/base/prefixed/centikelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/centikelvin.json
rename to schemas/bipm/si/2019/base/prefixed/centikelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/centimetre.json b/schemas/bipm/si/2019/base/prefixed/centimetre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/centimetre.json
rename to schemas/bipm/si/2019/base/prefixed/centimetre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/centimole.json b/schemas/bipm/si/2019/base/prefixed/centimole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/centimole.json
rename to schemas/bipm/si/2019/base/prefixed/centimole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/centisecond.json b/schemas/bipm/si/2019/base/prefixed/centisecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/centisecond.json
rename to schemas/bipm/si/2019/base/prefixed/centisecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decaampere.json b/schemas/bipm/si/2019/base/prefixed/decaampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decaampere.json
rename to schemas/bipm/si/2019/base/prefixed/decaampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decacandela.json b/schemas/bipm/si/2019/base/prefixed/decacandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decacandela.json
rename to schemas/bipm/si/2019/base/prefixed/decacandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decagram.json b/schemas/bipm/si/2019/base/prefixed/decagram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decagram.json
rename to schemas/bipm/si/2019/base/prefixed/decagram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decakelvin.json b/schemas/bipm/si/2019/base/prefixed/decakelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decakelvin.json
rename to schemas/bipm/si/2019/base/prefixed/decakelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decametre.json b/schemas/bipm/si/2019/base/prefixed/decametre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decametre.json
rename to schemas/bipm/si/2019/base/prefixed/decametre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decamole.json b/schemas/bipm/si/2019/base/prefixed/decamole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decamole.json
rename to schemas/bipm/si/2019/base/prefixed/decamole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decasecond.json b/schemas/bipm/si/2019/base/prefixed/decasecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decasecond.json
rename to schemas/bipm/si/2019/base/prefixed/decasecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/deciampere.json b/schemas/bipm/si/2019/base/prefixed/deciampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/deciampere.json
rename to schemas/bipm/si/2019/base/prefixed/deciampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decicandela.json b/schemas/bipm/si/2019/base/prefixed/decicandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decicandela.json
rename to schemas/bipm/si/2019/base/prefixed/decicandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decigram.json b/schemas/bipm/si/2019/base/prefixed/decigram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decigram.json
rename to schemas/bipm/si/2019/base/prefixed/decigram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decikelvin.json b/schemas/bipm/si/2019/base/prefixed/decikelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decikelvin.json
rename to schemas/bipm/si/2019/base/prefixed/decikelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decimetre.json b/schemas/bipm/si/2019/base/prefixed/decimetre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decimetre.json
rename to schemas/bipm/si/2019/base/prefixed/decimetre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decimole.json b/schemas/bipm/si/2019/base/prefixed/decimole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decimole.json
rename to schemas/bipm/si/2019/base/prefixed/decimole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/decisecond.json b/schemas/bipm/si/2019/base/prefixed/decisecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/decisecond.json
rename to schemas/bipm/si/2019/base/prefixed/decisecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/exaampere.json b/schemas/bipm/si/2019/base/prefixed/exaampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/exaampere.json
rename to schemas/bipm/si/2019/base/prefixed/exaampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/exacandela.json b/schemas/bipm/si/2019/base/prefixed/exacandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/exacandela.json
rename to schemas/bipm/si/2019/base/prefixed/exacandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/exagram.json b/schemas/bipm/si/2019/base/prefixed/exagram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/exagram.json
rename to schemas/bipm/si/2019/base/prefixed/exagram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/exakelvin.json b/schemas/bipm/si/2019/base/prefixed/exakelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/exakelvin.json
rename to schemas/bipm/si/2019/base/prefixed/exakelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/exametre.json b/schemas/bipm/si/2019/base/prefixed/exametre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/exametre.json
rename to schemas/bipm/si/2019/base/prefixed/exametre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/examole.json b/schemas/bipm/si/2019/base/prefixed/examole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/examole.json
rename to schemas/bipm/si/2019/base/prefixed/examole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/exasecond.json b/schemas/bipm/si/2019/base/prefixed/exasecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/exasecond.json
rename to schemas/bipm/si/2019/base/prefixed/exasecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/femtoampere.json b/schemas/bipm/si/2019/base/prefixed/femtoampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/femtoampere.json
rename to schemas/bipm/si/2019/base/prefixed/femtoampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/femtocandela.json b/schemas/bipm/si/2019/base/prefixed/femtocandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/femtocandela.json
rename to schemas/bipm/si/2019/base/prefixed/femtocandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/femtogram.json b/schemas/bipm/si/2019/base/prefixed/femtogram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/femtogram.json
rename to schemas/bipm/si/2019/base/prefixed/femtogram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/femtokelvin.json b/schemas/bipm/si/2019/base/prefixed/femtokelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/femtokelvin.json
rename to schemas/bipm/si/2019/base/prefixed/femtokelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/femtometre.json b/schemas/bipm/si/2019/base/prefixed/femtometre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/femtometre.json
rename to schemas/bipm/si/2019/base/prefixed/femtometre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/femtomole.json b/schemas/bipm/si/2019/base/prefixed/femtomole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/femtomole.json
rename to schemas/bipm/si/2019/base/prefixed/femtomole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/femtosecond.json b/schemas/bipm/si/2019/base/prefixed/femtosecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/femtosecond.json
rename to schemas/bipm/si/2019/base/prefixed/femtosecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/gigaampere.json b/schemas/bipm/si/2019/base/prefixed/gigaampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/gigaampere.json
rename to schemas/bipm/si/2019/base/prefixed/gigaampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/gigacandela.json b/schemas/bipm/si/2019/base/prefixed/gigacandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/gigacandela.json
rename to schemas/bipm/si/2019/base/prefixed/gigacandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/gigagram.json b/schemas/bipm/si/2019/base/prefixed/gigagram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/gigagram.json
rename to schemas/bipm/si/2019/base/prefixed/gigagram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/gigakelvin.json b/schemas/bipm/si/2019/base/prefixed/gigakelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/gigakelvin.json
rename to schemas/bipm/si/2019/base/prefixed/gigakelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/gigametre.json b/schemas/bipm/si/2019/base/prefixed/gigametre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/gigametre.json
rename to schemas/bipm/si/2019/base/prefixed/gigametre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/gigamole.json b/schemas/bipm/si/2019/base/prefixed/gigamole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/gigamole.json
rename to schemas/bipm/si/2019/base/prefixed/gigamole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/gigasecond.json b/schemas/bipm/si/2019/base/prefixed/gigasecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/gigasecond.json
rename to schemas/bipm/si/2019/base/prefixed/gigasecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/gram.json b/schemas/bipm/si/2019/base/prefixed/gram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/gram.json
rename to schemas/bipm/si/2019/base/prefixed/gram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/hectoampere.json b/schemas/bipm/si/2019/base/prefixed/hectoampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/hectoampere.json
rename to schemas/bipm/si/2019/base/prefixed/hectoampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/hectocandela.json b/schemas/bipm/si/2019/base/prefixed/hectocandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/hectocandela.json
rename to schemas/bipm/si/2019/base/prefixed/hectocandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/hectogram.json b/schemas/bipm/si/2019/base/prefixed/hectogram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/hectogram.json
rename to schemas/bipm/si/2019/base/prefixed/hectogram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/hectokelvin.json b/schemas/bipm/si/2019/base/prefixed/hectokelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/hectokelvin.json
rename to schemas/bipm/si/2019/base/prefixed/hectokelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/hectometre.json b/schemas/bipm/si/2019/base/prefixed/hectometre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/hectometre.json
rename to schemas/bipm/si/2019/base/prefixed/hectometre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/hectomole.json b/schemas/bipm/si/2019/base/prefixed/hectomole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/hectomole.json
rename to schemas/bipm/si/2019/base/prefixed/hectomole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/hectosecond.json b/schemas/bipm/si/2019/base/prefixed/hectosecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/hectosecond.json
rename to schemas/bipm/si/2019/base/prefixed/hectosecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/kiloampere.json b/schemas/bipm/si/2019/base/prefixed/kiloampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/kiloampere.json
rename to schemas/bipm/si/2019/base/prefixed/kiloampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/kilocandela.json b/schemas/bipm/si/2019/base/prefixed/kilocandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/kilocandela.json
rename to schemas/bipm/si/2019/base/prefixed/kilocandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/kilokelvin.json b/schemas/bipm/si/2019/base/prefixed/kilokelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/kilokelvin.json
rename to schemas/bipm/si/2019/base/prefixed/kilokelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/kilometre.json b/schemas/bipm/si/2019/base/prefixed/kilometre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/kilometre.json
rename to schemas/bipm/si/2019/base/prefixed/kilometre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/kilomole.json b/schemas/bipm/si/2019/base/prefixed/kilomole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/kilomole.json
rename to schemas/bipm/si/2019/base/prefixed/kilomole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/kilosecond.json b/schemas/bipm/si/2019/base/prefixed/kilosecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/kilosecond.json
rename to schemas/bipm/si/2019/base/prefixed/kilosecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/megaampere.json b/schemas/bipm/si/2019/base/prefixed/megaampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/megaampere.json
rename to schemas/bipm/si/2019/base/prefixed/megaampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/megacandela.json b/schemas/bipm/si/2019/base/prefixed/megacandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/megacandela.json
rename to schemas/bipm/si/2019/base/prefixed/megacandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/megagram.json b/schemas/bipm/si/2019/base/prefixed/megagram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/megagram.json
rename to schemas/bipm/si/2019/base/prefixed/megagram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/megakelvin.json b/schemas/bipm/si/2019/base/prefixed/megakelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/megakelvin.json
rename to schemas/bipm/si/2019/base/prefixed/megakelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/megametre.json b/schemas/bipm/si/2019/base/prefixed/megametre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/megametre.json
rename to schemas/bipm/si/2019/base/prefixed/megametre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/megamole.json b/schemas/bipm/si/2019/base/prefixed/megamole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/megamole.json
rename to schemas/bipm/si/2019/base/prefixed/megamole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/megasecond.json b/schemas/bipm/si/2019/base/prefixed/megasecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/megasecond.json
rename to schemas/bipm/si/2019/base/prefixed/megasecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/microampere.json b/schemas/bipm/si/2019/base/prefixed/microampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/microampere.json
rename to schemas/bipm/si/2019/base/prefixed/microampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/microcandela.json b/schemas/bipm/si/2019/base/prefixed/microcandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/microcandela.json
rename to schemas/bipm/si/2019/base/prefixed/microcandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/microgram.json b/schemas/bipm/si/2019/base/prefixed/microgram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/microgram.json
rename to schemas/bipm/si/2019/base/prefixed/microgram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/microkelvin.json b/schemas/bipm/si/2019/base/prefixed/microkelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/microkelvin.json
rename to schemas/bipm/si/2019/base/prefixed/microkelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/micrometre.json b/schemas/bipm/si/2019/base/prefixed/micrometre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/micrometre.json
rename to schemas/bipm/si/2019/base/prefixed/micrometre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/micromole.json b/schemas/bipm/si/2019/base/prefixed/micromole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/micromole.json
rename to schemas/bipm/si/2019/base/prefixed/micromole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/microsecond.json b/schemas/bipm/si/2019/base/prefixed/microsecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/microsecond.json
rename to schemas/bipm/si/2019/base/prefixed/microsecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/milliampere.json b/schemas/bipm/si/2019/base/prefixed/milliampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/milliampere.json
rename to schemas/bipm/si/2019/base/prefixed/milliampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/millicandela.json b/schemas/bipm/si/2019/base/prefixed/millicandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/millicandela.json
rename to schemas/bipm/si/2019/base/prefixed/millicandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/milligram.json b/schemas/bipm/si/2019/base/prefixed/milligram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/milligram.json
rename to schemas/bipm/si/2019/base/prefixed/milligram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/millikelvin.json b/schemas/bipm/si/2019/base/prefixed/millikelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/millikelvin.json
rename to schemas/bipm/si/2019/base/prefixed/millikelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/millimetre.json b/schemas/bipm/si/2019/base/prefixed/millimetre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/millimetre.json
rename to schemas/bipm/si/2019/base/prefixed/millimetre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/millimole.json b/schemas/bipm/si/2019/base/prefixed/millimole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/millimole.json
rename to schemas/bipm/si/2019/base/prefixed/millimole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/millisecond.json b/schemas/bipm/si/2019/base/prefixed/millisecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/millisecond.json
rename to schemas/bipm/si/2019/base/prefixed/millisecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/nanoampere.json b/schemas/bipm/si/2019/base/prefixed/nanoampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/nanoampere.json
rename to schemas/bipm/si/2019/base/prefixed/nanoampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/nanocandela.json b/schemas/bipm/si/2019/base/prefixed/nanocandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/nanocandela.json
rename to schemas/bipm/si/2019/base/prefixed/nanocandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/nanogram.json b/schemas/bipm/si/2019/base/prefixed/nanogram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/nanogram.json
rename to schemas/bipm/si/2019/base/prefixed/nanogram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/nanokelvin.json b/schemas/bipm/si/2019/base/prefixed/nanokelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/nanokelvin.json
rename to schemas/bipm/si/2019/base/prefixed/nanokelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/nanometre.json b/schemas/bipm/si/2019/base/prefixed/nanometre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/nanometre.json
rename to schemas/bipm/si/2019/base/prefixed/nanometre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/nanomole.json b/schemas/bipm/si/2019/base/prefixed/nanomole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/nanomole.json
rename to schemas/bipm/si/2019/base/prefixed/nanomole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/nanosecond.json b/schemas/bipm/si/2019/base/prefixed/nanosecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/nanosecond.json
rename to schemas/bipm/si/2019/base/prefixed/nanosecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/petaampere.json b/schemas/bipm/si/2019/base/prefixed/petaampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/petaampere.json
rename to schemas/bipm/si/2019/base/prefixed/petaampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/petacandela.json b/schemas/bipm/si/2019/base/prefixed/petacandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/petacandela.json
rename to schemas/bipm/si/2019/base/prefixed/petacandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/petagram.json b/schemas/bipm/si/2019/base/prefixed/petagram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/petagram.json
rename to schemas/bipm/si/2019/base/prefixed/petagram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/petakelvin.json b/schemas/bipm/si/2019/base/prefixed/petakelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/petakelvin.json
rename to schemas/bipm/si/2019/base/prefixed/petakelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/petametre.json b/schemas/bipm/si/2019/base/prefixed/petametre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/petametre.json
rename to schemas/bipm/si/2019/base/prefixed/petametre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/petamole.json b/schemas/bipm/si/2019/base/prefixed/petamole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/petamole.json
rename to schemas/bipm/si/2019/base/prefixed/petamole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/petasecond.json b/schemas/bipm/si/2019/base/prefixed/petasecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/petasecond.json
rename to schemas/bipm/si/2019/base/prefixed/petasecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/picoampere.json b/schemas/bipm/si/2019/base/prefixed/picoampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/picoampere.json
rename to schemas/bipm/si/2019/base/prefixed/picoampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/picocandela.json b/schemas/bipm/si/2019/base/prefixed/picocandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/picocandela.json
rename to schemas/bipm/si/2019/base/prefixed/picocandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/picogram.json b/schemas/bipm/si/2019/base/prefixed/picogram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/picogram.json
rename to schemas/bipm/si/2019/base/prefixed/picogram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/picokelvin.json b/schemas/bipm/si/2019/base/prefixed/picokelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/picokelvin.json
rename to schemas/bipm/si/2019/base/prefixed/picokelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/picometre.json b/schemas/bipm/si/2019/base/prefixed/picometre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/picometre.json
rename to schemas/bipm/si/2019/base/prefixed/picometre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/picomole.json b/schemas/bipm/si/2019/base/prefixed/picomole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/picomole.json
rename to schemas/bipm/si/2019/base/prefixed/picomole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/picosecond.json b/schemas/bipm/si/2019/base/prefixed/picosecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/picosecond.json
rename to schemas/bipm/si/2019/base/prefixed/picosecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quectoampere.json b/schemas/bipm/si/2019/base/prefixed/quectoampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quectoampere.json
rename to schemas/bipm/si/2019/base/prefixed/quectoampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quectocandela.json b/schemas/bipm/si/2019/base/prefixed/quectocandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quectocandela.json
rename to schemas/bipm/si/2019/base/prefixed/quectocandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quectogram.json b/schemas/bipm/si/2019/base/prefixed/quectogram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quectogram.json
rename to schemas/bipm/si/2019/base/prefixed/quectogram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quectokelvin.json b/schemas/bipm/si/2019/base/prefixed/quectokelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quectokelvin.json
rename to schemas/bipm/si/2019/base/prefixed/quectokelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quectometre.json b/schemas/bipm/si/2019/base/prefixed/quectometre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quectometre.json
rename to schemas/bipm/si/2019/base/prefixed/quectometre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quectomole.json b/schemas/bipm/si/2019/base/prefixed/quectomole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quectomole.json
rename to schemas/bipm/si/2019/base/prefixed/quectomole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quectosecond.json b/schemas/bipm/si/2019/base/prefixed/quectosecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quectosecond.json
rename to schemas/bipm/si/2019/base/prefixed/quectosecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quettaampere.json b/schemas/bipm/si/2019/base/prefixed/quettaampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quettaampere.json
rename to schemas/bipm/si/2019/base/prefixed/quettaampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quettacandela.json b/schemas/bipm/si/2019/base/prefixed/quettacandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quettacandela.json
rename to schemas/bipm/si/2019/base/prefixed/quettacandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quettagram.json b/schemas/bipm/si/2019/base/prefixed/quettagram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quettagram.json
rename to schemas/bipm/si/2019/base/prefixed/quettagram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quettakelvin.json b/schemas/bipm/si/2019/base/prefixed/quettakelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quettakelvin.json
rename to schemas/bipm/si/2019/base/prefixed/quettakelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quettametre.json b/schemas/bipm/si/2019/base/prefixed/quettametre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quettametre.json
rename to schemas/bipm/si/2019/base/prefixed/quettametre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quettamole.json b/schemas/bipm/si/2019/base/prefixed/quettamole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quettamole.json
rename to schemas/bipm/si/2019/base/prefixed/quettamole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/quettasecond.json b/schemas/bipm/si/2019/base/prefixed/quettasecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/quettasecond.json
rename to schemas/bipm/si/2019/base/prefixed/quettasecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/ronnaampere.json b/schemas/bipm/si/2019/base/prefixed/ronnaampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/ronnaampere.json
rename to schemas/bipm/si/2019/base/prefixed/ronnaampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/ronnacandela.json b/schemas/bipm/si/2019/base/prefixed/ronnacandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/ronnacandela.json
rename to schemas/bipm/si/2019/base/prefixed/ronnacandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/ronnagram.json b/schemas/bipm/si/2019/base/prefixed/ronnagram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/ronnagram.json
rename to schemas/bipm/si/2019/base/prefixed/ronnagram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/ronnakelvin.json b/schemas/bipm/si/2019/base/prefixed/ronnakelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/ronnakelvin.json
rename to schemas/bipm/si/2019/base/prefixed/ronnakelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/ronnametre.json b/schemas/bipm/si/2019/base/prefixed/ronnametre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/ronnametre.json
rename to schemas/bipm/si/2019/base/prefixed/ronnametre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/ronnamole.json b/schemas/bipm/si/2019/base/prefixed/ronnamole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/ronnamole.json
rename to schemas/bipm/si/2019/base/prefixed/ronnamole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/ronnasecond.json b/schemas/bipm/si/2019/base/prefixed/ronnasecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/ronnasecond.json
rename to schemas/bipm/si/2019/base/prefixed/ronnasecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/rontoampere.json b/schemas/bipm/si/2019/base/prefixed/rontoampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/rontoampere.json
rename to schemas/bipm/si/2019/base/prefixed/rontoampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/rontocandela.json b/schemas/bipm/si/2019/base/prefixed/rontocandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/rontocandela.json
rename to schemas/bipm/si/2019/base/prefixed/rontocandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/rontogram.json b/schemas/bipm/si/2019/base/prefixed/rontogram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/rontogram.json
rename to schemas/bipm/si/2019/base/prefixed/rontogram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/rontokelvin.json b/schemas/bipm/si/2019/base/prefixed/rontokelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/rontokelvin.json
rename to schemas/bipm/si/2019/base/prefixed/rontokelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/rontometre.json b/schemas/bipm/si/2019/base/prefixed/rontometre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/rontometre.json
rename to schemas/bipm/si/2019/base/prefixed/rontometre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/rontomole.json b/schemas/bipm/si/2019/base/prefixed/rontomole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/rontomole.json
rename to schemas/bipm/si/2019/base/prefixed/rontomole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/rontosecond.json b/schemas/bipm/si/2019/base/prefixed/rontosecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/rontosecond.json
rename to schemas/bipm/si/2019/base/prefixed/rontosecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/teraampere.json b/schemas/bipm/si/2019/base/prefixed/teraampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/teraampere.json
rename to schemas/bipm/si/2019/base/prefixed/teraampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/teracandela.json b/schemas/bipm/si/2019/base/prefixed/teracandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/teracandela.json
rename to schemas/bipm/si/2019/base/prefixed/teracandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/teragram.json b/schemas/bipm/si/2019/base/prefixed/teragram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/teragram.json
rename to schemas/bipm/si/2019/base/prefixed/teragram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/terakelvin.json b/schemas/bipm/si/2019/base/prefixed/terakelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/terakelvin.json
rename to schemas/bipm/si/2019/base/prefixed/terakelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/terametre.json b/schemas/bipm/si/2019/base/prefixed/terametre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/terametre.json
rename to schemas/bipm/si/2019/base/prefixed/terametre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/teramole.json b/schemas/bipm/si/2019/base/prefixed/teramole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/teramole.json
rename to schemas/bipm/si/2019/base/prefixed/teramole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/terasecond.json b/schemas/bipm/si/2019/base/prefixed/terasecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/terasecond.json
rename to schemas/bipm/si/2019/base/prefixed/terasecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yoctoampere.json b/schemas/bipm/si/2019/base/prefixed/yoctoampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yoctoampere.json
rename to schemas/bipm/si/2019/base/prefixed/yoctoampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yoctocandela.json b/schemas/bipm/si/2019/base/prefixed/yoctocandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yoctocandela.json
rename to schemas/bipm/si/2019/base/prefixed/yoctocandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yoctogram.json b/schemas/bipm/si/2019/base/prefixed/yoctogram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yoctogram.json
rename to schemas/bipm/si/2019/base/prefixed/yoctogram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yoctokelvin.json b/schemas/bipm/si/2019/base/prefixed/yoctokelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yoctokelvin.json
rename to schemas/bipm/si/2019/base/prefixed/yoctokelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yoctometre.json b/schemas/bipm/si/2019/base/prefixed/yoctometre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yoctometre.json
rename to schemas/bipm/si/2019/base/prefixed/yoctometre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yoctomole.json b/schemas/bipm/si/2019/base/prefixed/yoctomole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yoctomole.json
rename to schemas/bipm/si/2019/base/prefixed/yoctomole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yoctosecond.json b/schemas/bipm/si/2019/base/prefixed/yoctosecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yoctosecond.json
rename to schemas/bipm/si/2019/base/prefixed/yoctosecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yottaampere.json b/schemas/bipm/si/2019/base/prefixed/yottaampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yottaampere.json
rename to schemas/bipm/si/2019/base/prefixed/yottaampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yottacandela.json b/schemas/bipm/si/2019/base/prefixed/yottacandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yottacandela.json
rename to schemas/bipm/si/2019/base/prefixed/yottacandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yottagram.json b/schemas/bipm/si/2019/base/prefixed/yottagram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yottagram.json
rename to schemas/bipm/si/2019/base/prefixed/yottagram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yottakelvin.json b/schemas/bipm/si/2019/base/prefixed/yottakelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yottakelvin.json
rename to schemas/bipm/si/2019/base/prefixed/yottakelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yottametre.json b/schemas/bipm/si/2019/base/prefixed/yottametre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yottametre.json
rename to schemas/bipm/si/2019/base/prefixed/yottametre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yottamole.json b/schemas/bipm/si/2019/base/prefixed/yottamole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yottamole.json
rename to schemas/bipm/si/2019/base/prefixed/yottamole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/yottasecond.json b/schemas/bipm/si/2019/base/prefixed/yottasecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/yottasecond.json
rename to schemas/bipm/si/2019/base/prefixed/yottasecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zeptoampere.json b/schemas/bipm/si/2019/base/prefixed/zeptoampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zeptoampere.json
rename to schemas/bipm/si/2019/base/prefixed/zeptoampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zeptocandela.json b/schemas/bipm/si/2019/base/prefixed/zeptocandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zeptocandela.json
rename to schemas/bipm/si/2019/base/prefixed/zeptocandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zeptogram.json b/schemas/bipm/si/2019/base/prefixed/zeptogram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zeptogram.json
rename to schemas/bipm/si/2019/base/prefixed/zeptogram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zeptokelvin.json b/schemas/bipm/si/2019/base/prefixed/zeptokelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zeptokelvin.json
rename to schemas/bipm/si/2019/base/prefixed/zeptokelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zeptometre.json b/schemas/bipm/si/2019/base/prefixed/zeptometre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zeptometre.json
rename to schemas/bipm/si/2019/base/prefixed/zeptometre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zeptomole.json b/schemas/bipm/si/2019/base/prefixed/zeptomole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zeptomole.json
rename to schemas/bipm/si/2019/base/prefixed/zeptomole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zeptosecond.json b/schemas/bipm/si/2019/base/prefixed/zeptosecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zeptosecond.json
rename to schemas/bipm/si/2019/base/prefixed/zeptosecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zettaampere.json b/schemas/bipm/si/2019/base/prefixed/zettaampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zettaampere.json
rename to schemas/bipm/si/2019/base/prefixed/zettaampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zettacandela.json b/schemas/bipm/si/2019/base/prefixed/zettacandela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zettacandela.json
rename to schemas/bipm/si/2019/base/prefixed/zettacandela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zettagram.json b/schemas/bipm/si/2019/base/prefixed/zettagram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zettagram.json
rename to schemas/bipm/si/2019/base/prefixed/zettagram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zettakelvin.json b/schemas/bipm/si/2019/base/prefixed/zettakelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zettakelvin.json
rename to schemas/bipm/si/2019/base/prefixed/zettakelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zettametre.json b/schemas/bipm/si/2019/base/prefixed/zettametre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zettametre.json
rename to schemas/bipm/si/2019/base/prefixed/zettametre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zettamole.json b/schemas/bipm/si/2019/base/prefixed/zettamole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zettamole.json
rename to schemas/bipm/si/2019/base/prefixed/zettamole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/prefixed/zettasecond.json b/schemas/bipm/si/2019/base/prefixed/zettasecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/prefixed/zettasecond.json
rename to schemas/bipm/si/2019/base/prefixed/zettasecond.json
diff --git a/schemas/2020-12/bipm/si/2019/base/quantity/amount-of-substance.json b/schemas/bipm/si/2019/base/quantity/amount-of-substance.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/quantity/amount-of-substance.json
rename to schemas/bipm/si/2019/base/quantity/amount-of-substance.json
diff --git a/schemas/2020-12/bipm/si/2019/base/quantity/electric-current.json b/schemas/bipm/si/2019/base/quantity/electric-current.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/quantity/electric-current.json
rename to schemas/bipm/si/2019/base/quantity/electric-current.json
diff --git a/schemas/2020-12/bipm/si/2019/base/quantity/length.json b/schemas/bipm/si/2019/base/quantity/length.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/quantity/length.json
rename to schemas/bipm/si/2019/base/quantity/length.json
diff --git a/schemas/2020-12/bipm/si/2019/base/quantity/luminous-intensity.json b/schemas/bipm/si/2019/base/quantity/luminous-intensity.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/quantity/luminous-intensity.json
rename to schemas/bipm/si/2019/base/quantity/luminous-intensity.json
diff --git a/schemas/2020-12/bipm/si/2019/base/quantity/mass.json b/schemas/bipm/si/2019/base/quantity/mass.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/quantity/mass.json
rename to schemas/bipm/si/2019/base/quantity/mass.json
diff --git a/schemas/2020-12/bipm/si/2019/base/quantity/thermodynamic-temperature.json b/schemas/bipm/si/2019/base/quantity/thermodynamic-temperature.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/quantity/thermodynamic-temperature.json
rename to schemas/bipm/si/2019/base/quantity/thermodynamic-temperature.json
diff --git a/schemas/2020-12/bipm/si/2019/base/quantity/time.json b/schemas/bipm/si/2019/base/quantity/time.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/quantity/time.json
rename to schemas/bipm/si/2019/base/quantity/time.json
diff --git a/schemas/2020-12/bipm/si/2019/base/symbol.json b/schemas/bipm/si/2019/base/symbol.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/symbol.json
rename to schemas/bipm/si/2019/base/symbol.json
diff --git a/schemas/2020-12/bipm/si/2019/base/unit/ampere.json b/schemas/bipm/si/2019/base/unit/ampere.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/unit/ampere.json
rename to schemas/bipm/si/2019/base/unit/ampere.json
diff --git a/schemas/2020-12/bipm/si/2019/base/unit/candela.json b/schemas/bipm/si/2019/base/unit/candela.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/unit/candela.json
rename to schemas/bipm/si/2019/base/unit/candela.json
diff --git a/schemas/2020-12/bipm/si/2019/base/unit/kelvin.json b/schemas/bipm/si/2019/base/unit/kelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/unit/kelvin.json
rename to schemas/bipm/si/2019/base/unit/kelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/base/unit/kilogram.json b/schemas/bipm/si/2019/base/unit/kilogram.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/unit/kilogram.json
rename to schemas/bipm/si/2019/base/unit/kilogram.json
diff --git a/schemas/2020-12/bipm/si/2019/base/unit/metre.json b/schemas/bipm/si/2019/base/unit/metre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/unit/metre.json
rename to schemas/bipm/si/2019/base/unit/metre.json
diff --git a/schemas/2020-12/bipm/si/2019/base/unit/mole.json b/schemas/bipm/si/2019/base/unit/mole.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/unit/mole.json
rename to schemas/bipm/si/2019/base/unit/mole.json
diff --git a/schemas/2020-12/bipm/si/2019/base/unit/second.json b/schemas/bipm/si/2019/base/unit/second.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/base/unit/second.json
rename to schemas/bipm/si/2019/base/unit/second.json
diff --git a/schemas/2020-12/bipm/si/2019/compound/joule-per-kelvin.json b/schemas/bipm/si/2019/compound/joule-per-kelvin.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/compound/joule-per-kelvin.json
rename to schemas/bipm/si/2019/compound/joule-per-kelvin.json
diff --git a/schemas/2020-12/bipm/si/2019/compound/joule-second.json b/schemas/bipm/si/2019/compound/joule-second.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/compound/joule-second.json
rename to schemas/bipm/si/2019/compound/joule-second.json
diff --git a/schemas/2020-12/bipm/si/2019/compound/lumen-per-watt.json b/schemas/bipm/si/2019/compound/lumen-per-watt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/compound/lumen-per-watt.json
rename to schemas/bipm/si/2019/compound/lumen-per-watt.json
diff --git a/schemas/2020-12/bipm/si/2019/compound/metre-per-second.json b/schemas/bipm/si/2019/compound/metre-per-second.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/compound/metre-per-second.json
rename to schemas/bipm/si/2019/compound/metre-per-second.json
diff --git a/schemas/2020-12/bipm/si/2019/constant/avogadro.json b/schemas/bipm/si/2019/constant/avogadro.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/constant/avogadro.json
rename to schemas/bipm/si/2019/constant/avogadro.json
diff --git a/schemas/2020-12/bipm/si/2019/constant/boltzmann.json b/schemas/bipm/si/2019/constant/boltzmann.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/constant/boltzmann.json
rename to schemas/bipm/si/2019/constant/boltzmann.json
diff --git a/schemas/2020-12/bipm/si/2019/constant/caesium-frequency.json b/schemas/bipm/si/2019/constant/caesium-frequency.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/constant/caesium-frequency.json
rename to schemas/bipm/si/2019/constant/caesium-frequency.json
diff --git a/schemas/2020-12/bipm/si/2019/constant/elementary-charge.json b/schemas/bipm/si/2019/constant/elementary-charge.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/constant/elementary-charge.json
rename to schemas/bipm/si/2019/constant/elementary-charge.json
diff --git a/schemas/2020-12/bipm/si/2019/constant/light-speed.json b/schemas/bipm/si/2019/constant/light-speed.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/constant/light-speed.json
rename to schemas/bipm/si/2019/constant/light-speed.json
diff --git a/schemas/2020-12/bipm/si/2019/constant/luminous-efficacy.json b/schemas/bipm/si/2019/constant/luminous-efficacy.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/constant/luminous-efficacy.json
rename to schemas/bipm/si/2019/constant/luminous-efficacy.json
diff --git a/schemas/2020-12/bipm/si/2019/constant/planck.json b/schemas/bipm/si/2019/constant/planck.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/constant/planck.json
rename to schemas/bipm/si/2019/constant/planck.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attobecquerel.json b/schemas/bipm/si/2019/derived/prefixed/attobecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attobecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/attobecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attocoulomb.json b/schemas/bipm/si/2019/derived/prefixed/attocoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attocoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/attocoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attodegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/attodegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attodegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/attodegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attofarad.json b/schemas/bipm/si/2019/derived/prefixed/attofarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attofarad.json
rename to schemas/bipm/si/2019/derived/prefixed/attofarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attogray.json b/schemas/bipm/si/2019/derived/prefixed/attogray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attogray.json
rename to schemas/bipm/si/2019/derived/prefixed/attogray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attohenry.json b/schemas/bipm/si/2019/derived/prefixed/attohenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attohenry.json
rename to schemas/bipm/si/2019/derived/prefixed/attohenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attohertz.json b/schemas/bipm/si/2019/derived/prefixed/attohertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attohertz.json
rename to schemas/bipm/si/2019/derived/prefixed/attohertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attojoule.json b/schemas/bipm/si/2019/derived/prefixed/attojoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attojoule.json
rename to schemas/bipm/si/2019/derived/prefixed/attojoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attokatal.json b/schemas/bipm/si/2019/derived/prefixed/attokatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attokatal.json
rename to schemas/bipm/si/2019/derived/prefixed/attokatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attolumen.json b/schemas/bipm/si/2019/derived/prefixed/attolumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attolumen.json
rename to schemas/bipm/si/2019/derived/prefixed/attolumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attolux.json b/schemas/bipm/si/2019/derived/prefixed/attolux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attolux.json
rename to schemas/bipm/si/2019/derived/prefixed/attolux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attonewton.json b/schemas/bipm/si/2019/derived/prefixed/attonewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attonewton.json
rename to schemas/bipm/si/2019/derived/prefixed/attonewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attoohm.json b/schemas/bipm/si/2019/derived/prefixed/attoohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attoohm.json
rename to schemas/bipm/si/2019/derived/prefixed/attoohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attopascal.json b/schemas/bipm/si/2019/derived/prefixed/attopascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attopascal.json
rename to schemas/bipm/si/2019/derived/prefixed/attopascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attoradian.json b/schemas/bipm/si/2019/derived/prefixed/attoradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attoradian.json
rename to schemas/bipm/si/2019/derived/prefixed/attoradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attosiemens.json b/schemas/bipm/si/2019/derived/prefixed/attosiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attosiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/attosiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attosievert.json b/schemas/bipm/si/2019/derived/prefixed/attosievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attosievert.json
rename to schemas/bipm/si/2019/derived/prefixed/attosievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attosteradian.json b/schemas/bipm/si/2019/derived/prefixed/attosteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attosteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/attosteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attotesla.json b/schemas/bipm/si/2019/derived/prefixed/attotesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attotesla.json
rename to schemas/bipm/si/2019/derived/prefixed/attotesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attovolt.json b/schemas/bipm/si/2019/derived/prefixed/attovolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attovolt.json
rename to schemas/bipm/si/2019/derived/prefixed/attovolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attowatt.json b/schemas/bipm/si/2019/derived/prefixed/attowatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attowatt.json
rename to schemas/bipm/si/2019/derived/prefixed/attowatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/attoweber.json b/schemas/bipm/si/2019/derived/prefixed/attoweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/attoweber.json
rename to schemas/bipm/si/2019/derived/prefixed/attoweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centibecquerel.json b/schemas/bipm/si/2019/derived/prefixed/centibecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centibecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/centibecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centicoulomb.json b/schemas/bipm/si/2019/derived/prefixed/centicoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centicoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/centicoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centidegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/centidegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centidegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/centidegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centifarad.json b/schemas/bipm/si/2019/derived/prefixed/centifarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centifarad.json
rename to schemas/bipm/si/2019/derived/prefixed/centifarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centigray.json b/schemas/bipm/si/2019/derived/prefixed/centigray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centigray.json
rename to schemas/bipm/si/2019/derived/prefixed/centigray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centihenry.json b/schemas/bipm/si/2019/derived/prefixed/centihenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centihenry.json
rename to schemas/bipm/si/2019/derived/prefixed/centihenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centihertz.json b/schemas/bipm/si/2019/derived/prefixed/centihertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centihertz.json
rename to schemas/bipm/si/2019/derived/prefixed/centihertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centijoule.json b/schemas/bipm/si/2019/derived/prefixed/centijoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centijoule.json
rename to schemas/bipm/si/2019/derived/prefixed/centijoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centikatal.json b/schemas/bipm/si/2019/derived/prefixed/centikatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centikatal.json
rename to schemas/bipm/si/2019/derived/prefixed/centikatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centilumen.json b/schemas/bipm/si/2019/derived/prefixed/centilumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centilumen.json
rename to schemas/bipm/si/2019/derived/prefixed/centilumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centilux.json b/schemas/bipm/si/2019/derived/prefixed/centilux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centilux.json
rename to schemas/bipm/si/2019/derived/prefixed/centilux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centinewton.json b/schemas/bipm/si/2019/derived/prefixed/centinewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centinewton.json
rename to schemas/bipm/si/2019/derived/prefixed/centinewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centiohm.json b/schemas/bipm/si/2019/derived/prefixed/centiohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centiohm.json
rename to schemas/bipm/si/2019/derived/prefixed/centiohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centipascal.json b/schemas/bipm/si/2019/derived/prefixed/centipascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centipascal.json
rename to schemas/bipm/si/2019/derived/prefixed/centipascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centiradian.json b/schemas/bipm/si/2019/derived/prefixed/centiradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centiradian.json
rename to schemas/bipm/si/2019/derived/prefixed/centiradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centisiemens.json b/schemas/bipm/si/2019/derived/prefixed/centisiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centisiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/centisiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centisievert.json b/schemas/bipm/si/2019/derived/prefixed/centisievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centisievert.json
rename to schemas/bipm/si/2019/derived/prefixed/centisievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centisteradian.json b/schemas/bipm/si/2019/derived/prefixed/centisteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centisteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/centisteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centitesla.json b/schemas/bipm/si/2019/derived/prefixed/centitesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centitesla.json
rename to schemas/bipm/si/2019/derived/prefixed/centitesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centivolt.json b/schemas/bipm/si/2019/derived/prefixed/centivolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centivolt.json
rename to schemas/bipm/si/2019/derived/prefixed/centivolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centiwatt.json b/schemas/bipm/si/2019/derived/prefixed/centiwatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centiwatt.json
rename to schemas/bipm/si/2019/derived/prefixed/centiwatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/centiweber.json b/schemas/bipm/si/2019/derived/prefixed/centiweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/centiweber.json
rename to schemas/bipm/si/2019/derived/prefixed/centiweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decabecquerel.json b/schemas/bipm/si/2019/derived/prefixed/decabecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decabecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/decabecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decacoulomb.json b/schemas/bipm/si/2019/derived/prefixed/decacoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decacoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/decacoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decadegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/decadegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decadegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/decadegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decafarad.json b/schemas/bipm/si/2019/derived/prefixed/decafarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decafarad.json
rename to schemas/bipm/si/2019/derived/prefixed/decafarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decagray.json b/schemas/bipm/si/2019/derived/prefixed/decagray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decagray.json
rename to schemas/bipm/si/2019/derived/prefixed/decagray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decahenry.json b/schemas/bipm/si/2019/derived/prefixed/decahenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decahenry.json
rename to schemas/bipm/si/2019/derived/prefixed/decahenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decahertz.json b/schemas/bipm/si/2019/derived/prefixed/decahertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decahertz.json
rename to schemas/bipm/si/2019/derived/prefixed/decahertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decajoule.json b/schemas/bipm/si/2019/derived/prefixed/decajoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decajoule.json
rename to schemas/bipm/si/2019/derived/prefixed/decajoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decakatal.json b/schemas/bipm/si/2019/derived/prefixed/decakatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decakatal.json
rename to schemas/bipm/si/2019/derived/prefixed/decakatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decalumen.json b/schemas/bipm/si/2019/derived/prefixed/decalumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decalumen.json
rename to schemas/bipm/si/2019/derived/prefixed/decalumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decalux.json b/schemas/bipm/si/2019/derived/prefixed/decalux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decalux.json
rename to schemas/bipm/si/2019/derived/prefixed/decalux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decanewton.json b/schemas/bipm/si/2019/derived/prefixed/decanewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decanewton.json
rename to schemas/bipm/si/2019/derived/prefixed/decanewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decaohm.json b/schemas/bipm/si/2019/derived/prefixed/decaohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decaohm.json
rename to schemas/bipm/si/2019/derived/prefixed/decaohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decapascal.json b/schemas/bipm/si/2019/derived/prefixed/decapascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decapascal.json
rename to schemas/bipm/si/2019/derived/prefixed/decapascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decaradian.json b/schemas/bipm/si/2019/derived/prefixed/decaradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decaradian.json
rename to schemas/bipm/si/2019/derived/prefixed/decaradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decasiemens.json b/schemas/bipm/si/2019/derived/prefixed/decasiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decasiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/decasiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decasievert.json b/schemas/bipm/si/2019/derived/prefixed/decasievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decasievert.json
rename to schemas/bipm/si/2019/derived/prefixed/decasievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decasteradian.json b/schemas/bipm/si/2019/derived/prefixed/decasteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decasteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/decasteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decatesla.json b/schemas/bipm/si/2019/derived/prefixed/decatesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decatesla.json
rename to schemas/bipm/si/2019/derived/prefixed/decatesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decavolt.json b/schemas/bipm/si/2019/derived/prefixed/decavolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decavolt.json
rename to schemas/bipm/si/2019/derived/prefixed/decavolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decawatt.json b/schemas/bipm/si/2019/derived/prefixed/decawatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decawatt.json
rename to schemas/bipm/si/2019/derived/prefixed/decawatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decaweber.json b/schemas/bipm/si/2019/derived/prefixed/decaweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decaweber.json
rename to schemas/bipm/si/2019/derived/prefixed/decaweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decibecquerel.json b/schemas/bipm/si/2019/derived/prefixed/decibecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decibecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/decibecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decicoulomb.json b/schemas/bipm/si/2019/derived/prefixed/decicoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decicoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/decicoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decidegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/decidegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decidegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/decidegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decifarad.json b/schemas/bipm/si/2019/derived/prefixed/decifarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decifarad.json
rename to schemas/bipm/si/2019/derived/prefixed/decifarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decigray.json b/schemas/bipm/si/2019/derived/prefixed/decigray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decigray.json
rename to schemas/bipm/si/2019/derived/prefixed/decigray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decihenry.json b/schemas/bipm/si/2019/derived/prefixed/decihenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decihenry.json
rename to schemas/bipm/si/2019/derived/prefixed/decihenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decihertz.json b/schemas/bipm/si/2019/derived/prefixed/decihertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decihertz.json
rename to schemas/bipm/si/2019/derived/prefixed/decihertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decijoule.json b/schemas/bipm/si/2019/derived/prefixed/decijoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decijoule.json
rename to schemas/bipm/si/2019/derived/prefixed/decijoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decikatal.json b/schemas/bipm/si/2019/derived/prefixed/decikatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decikatal.json
rename to schemas/bipm/si/2019/derived/prefixed/decikatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decilumen.json b/schemas/bipm/si/2019/derived/prefixed/decilumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decilumen.json
rename to schemas/bipm/si/2019/derived/prefixed/decilumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decilux.json b/schemas/bipm/si/2019/derived/prefixed/decilux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decilux.json
rename to schemas/bipm/si/2019/derived/prefixed/decilux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decinewton.json b/schemas/bipm/si/2019/derived/prefixed/decinewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decinewton.json
rename to schemas/bipm/si/2019/derived/prefixed/decinewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/deciohm.json b/schemas/bipm/si/2019/derived/prefixed/deciohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/deciohm.json
rename to schemas/bipm/si/2019/derived/prefixed/deciohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decipascal.json b/schemas/bipm/si/2019/derived/prefixed/decipascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decipascal.json
rename to schemas/bipm/si/2019/derived/prefixed/decipascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/deciradian.json b/schemas/bipm/si/2019/derived/prefixed/deciradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/deciradian.json
rename to schemas/bipm/si/2019/derived/prefixed/deciradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decisiemens.json b/schemas/bipm/si/2019/derived/prefixed/decisiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decisiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/decisiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decisievert.json b/schemas/bipm/si/2019/derived/prefixed/decisievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decisievert.json
rename to schemas/bipm/si/2019/derived/prefixed/decisievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decisteradian.json b/schemas/bipm/si/2019/derived/prefixed/decisteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decisteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/decisteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decitesla.json b/schemas/bipm/si/2019/derived/prefixed/decitesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decitesla.json
rename to schemas/bipm/si/2019/derived/prefixed/decitesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/decivolt.json b/schemas/bipm/si/2019/derived/prefixed/decivolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/decivolt.json
rename to schemas/bipm/si/2019/derived/prefixed/decivolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/deciwatt.json b/schemas/bipm/si/2019/derived/prefixed/deciwatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/deciwatt.json
rename to schemas/bipm/si/2019/derived/prefixed/deciwatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/deciweber.json b/schemas/bipm/si/2019/derived/prefixed/deciweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/deciweber.json
rename to schemas/bipm/si/2019/derived/prefixed/deciweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exabecquerel.json b/schemas/bipm/si/2019/derived/prefixed/exabecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exabecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/exabecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exacoulomb.json b/schemas/bipm/si/2019/derived/prefixed/exacoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exacoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/exacoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exadegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/exadegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exadegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/exadegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exafarad.json b/schemas/bipm/si/2019/derived/prefixed/exafarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exafarad.json
rename to schemas/bipm/si/2019/derived/prefixed/exafarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exagray.json b/schemas/bipm/si/2019/derived/prefixed/exagray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exagray.json
rename to schemas/bipm/si/2019/derived/prefixed/exagray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exahenry.json b/schemas/bipm/si/2019/derived/prefixed/exahenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exahenry.json
rename to schemas/bipm/si/2019/derived/prefixed/exahenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exahertz.json b/schemas/bipm/si/2019/derived/prefixed/exahertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exahertz.json
rename to schemas/bipm/si/2019/derived/prefixed/exahertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exajoule.json b/schemas/bipm/si/2019/derived/prefixed/exajoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exajoule.json
rename to schemas/bipm/si/2019/derived/prefixed/exajoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exakatal.json b/schemas/bipm/si/2019/derived/prefixed/exakatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exakatal.json
rename to schemas/bipm/si/2019/derived/prefixed/exakatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exalumen.json b/schemas/bipm/si/2019/derived/prefixed/exalumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exalumen.json
rename to schemas/bipm/si/2019/derived/prefixed/exalumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exalux.json b/schemas/bipm/si/2019/derived/prefixed/exalux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exalux.json
rename to schemas/bipm/si/2019/derived/prefixed/exalux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exanewton.json b/schemas/bipm/si/2019/derived/prefixed/exanewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exanewton.json
rename to schemas/bipm/si/2019/derived/prefixed/exanewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exaohm.json b/schemas/bipm/si/2019/derived/prefixed/exaohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exaohm.json
rename to schemas/bipm/si/2019/derived/prefixed/exaohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exapascal.json b/schemas/bipm/si/2019/derived/prefixed/exapascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exapascal.json
rename to schemas/bipm/si/2019/derived/prefixed/exapascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exaradian.json b/schemas/bipm/si/2019/derived/prefixed/exaradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exaradian.json
rename to schemas/bipm/si/2019/derived/prefixed/exaradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exasiemens.json b/schemas/bipm/si/2019/derived/prefixed/exasiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exasiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/exasiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exasievert.json b/schemas/bipm/si/2019/derived/prefixed/exasievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exasievert.json
rename to schemas/bipm/si/2019/derived/prefixed/exasievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exasteradian.json b/schemas/bipm/si/2019/derived/prefixed/exasteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exasteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/exasteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exatesla.json b/schemas/bipm/si/2019/derived/prefixed/exatesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exatesla.json
rename to schemas/bipm/si/2019/derived/prefixed/exatesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exavolt.json b/schemas/bipm/si/2019/derived/prefixed/exavolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exavolt.json
rename to schemas/bipm/si/2019/derived/prefixed/exavolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exawatt.json b/schemas/bipm/si/2019/derived/prefixed/exawatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exawatt.json
rename to schemas/bipm/si/2019/derived/prefixed/exawatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/exaweber.json b/schemas/bipm/si/2019/derived/prefixed/exaweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/exaweber.json
rename to schemas/bipm/si/2019/derived/prefixed/exaweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtobecquerel.json b/schemas/bipm/si/2019/derived/prefixed/femtobecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtobecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/femtobecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtocoulomb.json b/schemas/bipm/si/2019/derived/prefixed/femtocoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtocoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/femtocoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtodegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/femtodegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtodegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/femtodegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtofarad.json b/schemas/bipm/si/2019/derived/prefixed/femtofarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtofarad.json
rename to schemas/bipm/si/2019/derived/prefixed/femtofarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtogray.json b/schemas/bipm/si/2019/derived/prefixed/femtogray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtogray.json
rename to schemas/bipm/si/2019/derived/prefixed/femtogray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtohenry.json b/schemas/bipm/si/2019/derived/prefixed/femtohenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtohenry.json
rename to schemas/bipm/si/2019/derived/prefixed/femtohenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtohertz.json b/schemas/bipm/si/2019/derived/prefixed/femtohertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtohertz.json
rename to schemas/bipm/si/2019/derived/prefixed/femtohertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtojoule.json b/schemas/bipm/si/2019/derived/prefixed/femtojoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtojoule.json
rename to schemas/bipm/si/2019/derived/prefixed/femtojoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtokatal.json b/schemas/bipm/si/2019/derived/prefixed/femtokatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtokatal.json
rename to schemas/bipm/si/2019/derived/prefixed/femtokatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtolumen.json b/schemas/bipm/si/2019/derived/prefixed/femtolumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtolumen.json
rename to schemas/bipm/si/2019/derived/prefixed/femtolumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtolux.json b/schemas/bipm/si/2019/derived/prefixed/femtolux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtolux.json
rename to schemas/bipm/si/2019/derived/prefixed/femtolux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtonewton.json b/schemas/bipm/si/2019/derived/prefixed/femtonewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtonewton.json
rename to schemas/bipm/si/2019/derived/prefixed/femtonewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtoohm.json b/schemas/bipm/si/2019/derived/prefixed/femtoohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtoohm.json
rename to schemas/bipm/si/2019/derived/prefixed/femtoohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtopascal.json b/schemas/bipm/si/2019/derived/prefixed/femtopascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtopascal.json
rename to schemas/bipm/si/2019/derived/prefixed/femtopascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtoradian.json b/schemas/bipm/si/2019/derived/prefixed/femtoradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtoradian.json
rename to schemas/bipm/si/2019/derived/prefixed/femtoradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtosiemens.json b/schemas/bipm/si/2019/derived/prefixed/femtosiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtosiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/femtosiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtosievert.json b/schemas/bipm/si/2019/derived/prefixed/femtosievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtosievert.json
rename to schemas/bipm/si/2019/derived/prefixed/femtosievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtosteradian.json b/schemas/bipm/si/2019/derived/prefixed/femtosteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtosteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/femtosteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtotesla.json b/schemas/bipm/si/2019/derived/prefixed/femtotesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtotesla.json
rename to schemas/bipm/si/2019/derived/prefixed/femtotesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtovolt.json b/schemas/bipm/si/2019/derived/prefixed/femtovolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtovolt.json
rename to schemas/bipm/si/2019/derived/prefixed/femtovolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtowatt.json b/schemas/bipm/si/2019/derived/prefixed/femtowatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtowatt.json
rename to schemas/bipm/si/2019/derived/prefixed/femtowatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/femtoweber.json b/schemas/bipm/si/2019/derived/prefixed/femtoweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/femtoweber.json
rename to schemas/bipm/si/2019/derived/prefixed/femtoweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigabecquerel.json b/schemas/bipm/si/2019/derived/prefixed/gigabecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigabecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/gigabecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigacoulomb.json b/schemas/bipm/si/2019/derived/prefixed/gigacoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigacoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/gigacoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigadegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/gigadegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigadegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/gigadegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigafarad.json b/schemas/bipm/si/2019/derived/prefixed/gigafarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigafarad.json
rename to schemas/bipm/si/2019/derived/prefixed/gigafarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigagray.json b/schemas/bipm/si/2019/derived/prefixed/gigagray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigagray.json
rename to schemas/bipm/si/2019/derived/prefixed/gigagray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigahenry.json b/schemas/bipm/si/2019/derived/prefixed/gigahenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigahenry.json
rename to schemas/bipm/si/2019/derived/prefixed/gigahenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigahertz.json b/schemas/bipm/si/2019/derived/prefixed/gigahertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigahertz.json
rename to schemas/bipm/si/2019/derived/prefixed/gigahertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigajoule.json b/schemas/bipm/si/2019/derived/prefixed/gigajoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigajoule.json
rename to schemas/bipm/si/2019/derived/prefixed/gigajoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigakatal.json b/schemas/bipm/si/2019/derived/prefixed/gigakatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigakatal.json
rename to schemas/bipm/si/2019/derived/prefixed/gigakatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigalumen.json b/schemas/bipm/si/2019/derived/prefixed/gigalumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigalumen.json
rename to schemas/bipm/si/2019/derived/prefixed/gigalumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigalux.json b/schemas/bipm/si/2019/derived/prefixed/gigalux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigalux.json
rename to schemas/bipm/si/2019/derived/prefixed/gigalux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/giganewton.json b/schemas/bipm/si/2019/derived/prefixed/giganewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/giganewton.json
rename to schemas/bipm/si/2019/derived/prefixed/giganewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigaohm.json b/schemas/bipm/si/2019/derived/prefixed/gigaohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigaohm.json
rename to schemas/bipm/si/2019/derived/prefixed/gigaohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigapascal.json b/schemas/bipm/si/2019/derived/prefixed/gigapascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigapascal.json
rename to schemas/bipm/si/2019/derived/prefixed/gigapascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigaradian.json b/schemas/bipm/si/2019/derived/prefixed/gigaradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigaradian.json
rename to schemas/bipm/si/2019/derived/prefixed/gigaradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigasiemens.json b/schemas/bipm/si/2019/derived/prefixed/gigasiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigasiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/gigasiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigasievert.json b/schemas/bipm/si/2019/derived/prefixed/gigasievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigasievert.json
rename to schemas/bipm/si/2019/derived/prefixed/gigasievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigasteradian.json b/schemas/bipm/si/2019/derived/prefixed/gigasteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigasteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/gigasteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigatesla.json b/schemas/bipm/si/2019/derived/prefixed/gigatesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigatesla.json
rename to schemas/bipm/si/2019/derived/prefixed/gigatesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigavolt.json b/schemas/bipm/si/2019/derived/prefixed/gigavolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigavolt.json
rename to schemas/bipm/si/2019/derived/prefixed/gigavolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigawatt.json b/schemas/bipm/si/2019/derived/prefixed/gigawatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigawatt.json
rename to schemas/bipm/si/2019/derived/prefixed/gigawatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/gigaweber.json b/schemas/bipm/si/2019/derived/prefixed/gigaweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/gigaweber.json
rename to schemas/bipm/si/2019/derived/prefixed/gigaweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectobecquerel.json b/schemas/bipm/si/2019/derived/prefixed/hectobecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectobecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/hectobecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectocoulomb.json b/schemas/bipm/si/2019/derived/prefixed/hectocoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectocoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/hectocoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectodegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/hectodegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectodegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/hectodegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectofarad.json b/schemas/bipm/si/2019/derived/prefixed/hectofarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectofarad.json
rename to schemas/bipm/si/2019/derived/prefixed/hectofarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectogray.json b/schemas/bipm/si/2019/derived/prefixed/hectogray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectogray.json
rename to schemas/bipm/si/2019/derived/prefixed/hectogray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectohenry.json b/schemas/bipm/si/2019/derived/prefixed/hectohenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectohenry.json
rename to schemas/bipm/si/2019/derived/prefixed/hectohenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectohertz.json b/schemas/bipm/si/2019/derived/prefixed/hectohertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectohertz.json
rename to schemas/bipm/si/2019/derived/prefixed/hectohertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectojoule.json b/schemas/bipm/si/2019/derived/prefixed/hectojoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectojoule.json
rename to schemas/bipm/si/2019/derived/prefixed/hectojoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectokatal.json b/schemas/bipm/si/2019/derived/prefixed/hectokatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectokatal.json
rename to schemas/bipm/si/2019/derived/prefixed/hectokatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectolumen.json b/schemas/bipm/si/2019/derived/prefixed/hectolumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectolumen.json
rename to schemas/bipm/si/2019/derived/prefixed/hectolumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectolux.json b/schemas/bipm/si/2019/derived/prefixed/hectolux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectolux.json
rename to schemas/bipm/si/2019/derived/prefixed/hectolux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectonewton.json b/schemas/bipm/si/2019/derived/prefixed/hectonewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectonewton.json
rename to schemas/bipm/si/2019/derived/prefixed/hectonewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectoohm.json b/schemas/bipm/si/2019/derived/prefixed/hectoohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectoohm.json
rename to schemas/bipm/si/2019/derived/prefixed/hectoohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectopascal.json b/schemas/bipm/si/2019/derived/prefixed/hectopascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectopascal.json
rename to schemas/bipm/si/2019/derived/prefixed/hectopascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectoradian.json b/schemas/bipm/si/2019/derived/prefixed/hectoradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectoradian.json
rename to schemas/bipm/si/2019/derived/prefixed/hectoradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectosiemens.json b/schemas/bipm/si/2019/derived/prefixed/hectosiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectosiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/hectosiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectosievert.json b/schemas/bipm/si/2019/derived/prefixed/hectosievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectosievert.json
rename to schemas/bipm/si/2019/derived/prefixed/hectosievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectosteradian.json b/schemas/bipm/si/2019/derived/prefixed/hectosteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectosteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/hectosteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectotesla.json b/schemas/bipm/si/2019/derived/prefixed/hectotesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectotesla.json
rename to schemas/bipm/si/2019/derived/prefixed/hectotesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectovolt.json b/schemas/bipm/si/2019/derived/prefixed/hectovolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectovolt.json
rename to schemas/bipm/si/2019/derived/prefixed/hectovolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectowatt.json b/schemas/bipm/si/2019/derived/prefixed/hectowatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectowatt.json
rename to schemas/bipm/si/2019/derived/prefixed/hectowatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/hectoweber.json b/schemas/bipm/si/2019/derived/prefixed/hectoweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/hectoweber.json
rename to schemas/bipm/si/2019/derived/prefixed/hectoweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilobecquerel.json b/schemas/bipm/si/2019/derived/prefixed/kilobecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilobecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/kilobecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilocoulomb.json b/schemas/bipm/si/2019/derived/prefixed/kilocoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilocoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/kilocoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilodegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/kilodegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilodegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/kilodegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilofarad.json b/schemas/bipm/si/2019/derived/prefixed/kilofarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilofarad.json
rename to schemas/bipm/si/2019/derived/prefixed/kilofarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilogray.json b/schemas/bipm/si/2019/derived/prefixed/kilogray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilogray.json
rename to schemas/bipm/si/2019/derived/prefixed/kilogray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilohenry.json b/schemas/bipm/si/2019/derived/prefixed/kilohenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilohenry.json
rename to schemas/bipm/si/2019/derived/prefixed/kilohenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilohertz.json b/schemas/bipm/si/2019/derived/prefixed/kilohertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilohertz.json
rename to schemas/bipm/si/2019/derived/prefixed/kilohertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilojoule.json b/schemas/bipm/si/2019/derived/prefixed/kilojoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilojoule.json
rename to schemas/bipm/si/2019/derived/prefixed/kilojoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilokatal.json b/schemas/bipm/si/2019/derived/prefixed/kilokatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilokatal.json
rename to schemas/bipm/si/2019/derived/prefixed/kilokatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilolumen.json b/schemas/bipm/si/2019/derived/prefixed/kilolumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilolumen.json
rename to schemas/bipm/si/2019/derived/prefixed/kilolumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilolux.json b/schemas/bipm/si/2019/derived/prefixed/kilolux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilolux.json
rename to schemas/bipm/si/2019/derived/prefixed/kilolux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilonewton.json b/schemas/bipm/si/2019/derived/prefixed/kilonewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilonewton.json
rename to schemas/bipm/si/2019/derived/prefixed/kilonewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kiloohm.json b/schemas/bipm/si/2019/derived/prefixed/kiloohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kiloohm.json
rename to schemas/bipm/si/2019/derived/prefixed/kiloohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilopascal.json b/schemas/bipm/si/2019/derived/prefixed/kilopascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilopascal.json
rename to schemas/bipm/si/2019/derived/prefixed/kilopascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kiloradian.json b/schemas/bipm/si/2019/derived/prefixed/kiloradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kiloradian.json
rename to schemas/bipm/si/2019/derived/prefixed/kiloradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilosiemens.json b/schemas/bipm/si/2019/derived/prefixed/kilosiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilosiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/kilosiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilosievert.json b/schemas/bipm/si/2019/derived/prefixed/kilosievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilosievert.json
rename to schemas/bipm/si/2019/derived/prefixed/kilosievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilosteradian.json b/schemas/bipm/si/2019/derived/prefixed/kilosteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilosteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/kilosteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilotesla.json b/schemas/bipm/si/2019/derived/prefixed/kilotesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilotesla.json
rename to schemas/bipm/si/2019/derived/prefixed/kilotesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilovolt.json b/schemas/bipm/si/2019/derived/prefixed/kilovolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilovolt.json
rename to schemas/bipm/si/2019/derived/prefixed/kilovolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kilowatt.json b/schemas/bipm/si/2019/derived/prefixed/kilowatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kilowatt.json
rename to schemas/bipm/si/2019/derived/prefixed/kilowatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/kiloweber.json b/schemas/bipm/si/2019/derived/prefixed/kiloweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/kiloweber.json
rename to schemas/bipm/si/2019/derived/prefixed/kiloweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megabecquerel.json b/schemas/bipm/si/2019/derived/prefixed/megabecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megabecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/megabecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megacoulomb.json b/schemas/bipm/si/2019/derived/prefixed/megacoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megacoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/megacoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megadegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/megadegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megadegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/megadegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megafarad.json b/schemas/bipm/si/2019/derived/prefixed/megafarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megafarad.json
rename to schemas/bipm/si/2019/derived/prefixed/megafarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megagray.json b/schemas/bipm/si/2019/derived/prefixed/megagray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megagray.json
rename to schemas/bipm/si/2019/derived/prefixed/megagray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megahenry.json b/schemas/bipm/si/2019/derived/prefixed/megahenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megahenry.json
rename to schemas/bipm/si/2019/derived/prefixed/megahenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megahertz.json b/schemas/bipm/si/2019/derived/prefixed/megahertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megahertz.json
rename to schemas/bipm/si/2019/derived/prefixed/megahertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megajoule.json b/schemas/bipm/si/2019/derived/prefixed/megajoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megajoule.json
rename to schemas/bipm/si/2019/derived/prefixed/megajoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megakatal.json b/schemas/bipm/si/2019/derived/prefixed/megakatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megakatal.json
rename to schemas/bipm/si/2019/derived/prefixed/megakatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megalumen.json b/schemas/bipm/si/2019/derived/prefixed/megalumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megalumen.json
rename to schemas/bipm/si/2019/derived/prefixed/megalumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megalux.json b/schemas/bipm/si/2019/derived/prefixed/megalux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megalux.json
rename to schemas/bipm/si/2019/derived/prefixed/megalux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/meganewton.json b/schemas/bipm/si/2019/derived/prefixed/meganewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/meganewton.json
rename to schemas/bipm/si/2019/derived/prefixed/meganewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megaohm.json b/schemas/bipm/si/2019/derived/prefixed/megaohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megaohm.json
rename to schemas/bipm/si/2019/derived/prefixed/megaohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megapascal.json b/schemas/bipm/si/2019/derived/prefixed/megapascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megapascal.json
rename to schemas/bipm/si/2019/derived/prefixed/megapascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megaradian.json b/schemas/bipm/si/2019/derived/prefixed/megaradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megaradian.json
rename to schemas/bipm/si/2019/derived/prefixed/megaradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megasiemens.json b/schemas/bipm/si/2019/derived/prefixed/megasiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megasiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/megasiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megasievert.json b/schemas/bipm/si/2019/derived/prefixed/megasievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megasievert.json
rename to schemas/bipm/si/2019/derived/prefixed/megasievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megasteradian.json b/schemas/bipm/si/2019/derived/prefixed/megasteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megasteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/megasteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megatesla.json b/schemas/bipm/si/2019/derived/prefixed/megatesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megatesla.json
rename to schemas/bipm/si/2019/derived/prefixed/megatesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megavolt.json b/schemas/bipm/si/2019/derived/prefixed/megavolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megavolt.json
rename to schemas/bipm/si/2019/derived/prefixed/megavolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megawatt.json b/schemas/bipm/si/2019/derived/prefixed/megawatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megawatt.json
rename to schemas/bipm/si/2019/derived/prefixed/megawatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/megaweber.json b/schemas/bipm/si/2019/derived/prefixed/megaweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/megaweber.json
rename to schemas/bipm/si/2019/derived/prefixed/megaweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microbecquerel.json b/schemas/bipm/si/2019/derived/prefixed/microbecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microbecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/microbecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microcoulomb.json b/schemas/bipm/si/2019/derived/prefixed/microcoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microcoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/microcoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microdegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/microdegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microdegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/microdegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microfarad.json b/schemas/bipm/si/2019/derived/prefixed/microfarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microfarad.json
rename to schemas/bipm/si/2019/derived/prefixed/microfarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microgray.json b/schemas/bipm/si/2019/derived/prefixed/microgray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microgray.json
rename to schemas/bipm/si/2019/derived/prefixed/microgray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microhenry.json b/schemas/bipm/si/2019/derived/prefixed/microhenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microhenry.json
rename to schemas/bipm/si/2019/derived/prefixed/microhenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microhertz.json b/schemas/bipm/si/2019/derived/prefixed/microhertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microhertz.json
rename to schemas/bipm/si/2019/derived/prefixed/microhertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microjoule.json b/schemas/bipm/si/2019/derived/prefixed/microjoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microjoule.json
rename to schemas/bipm/si/2019/derived/prefixed/microjoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microkatal.json b/schemas/bipm/si/2019/derived/prefixed/microkatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microkatal.json
rename to schemas/bipm/si/2019/derived/prefixed/microkatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microlumen.json b/schemas/bipm/si/2019/derived/prefixed/microlumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microlumen.json
rename to schemas/bipm/si/2019/derived/prefixed/microlumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microlux.json b/schemas/bipm/si/2019/derived/prefixed/microlux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microlux.json
rename to schemas/bipm/si/2019/derived/prefixed/microlux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/micronewton.json b/schemas/bipm/si/2019/derived/prefixed/micronewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/micronewton.json
rename to schemas/bipm/si/2019/derived/prefixed/micronewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microohm.json b/schemas/bipm/si/2019/derived/prefixed/microohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microohm.json
rename to schemas/bipm/si/2019/derived/prefixed/microohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/micropascal.json b/schemas/bipm/si/2019/derived/prefixed/micropascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/micropascal.json
rename to schemas/bipm/si/2019/derived/prefixed/micropascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microradian.json b/schemas/bipm/si/2019/derived/prefixed/microradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microradian.json
rename to schemas/bipm/si/2019/derived/prefixed/microradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microsiemens.json b/schemas/bipm/si/2019/derived/prefixed/microsiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microsiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/microsiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microsievert.json b/schemas/bipm/si/2019/derived/prefixed/microsievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microsievert.json
rename to schemas/bipm/si/2019/derived/prefixed/microsievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microsteradian.json b/schemas/bipm/si/2019/derived/prefixed/microsteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microsteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/microsteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microtesla.json b/schemas/bipm/si/2019/derived/prefixed/microtesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microtesla.json
rename to schemas/bipm/si/2019/derived/prefixed/microtesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microvolt.json b/schemas/bipm/si/2019/derived/prefixed/microvolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microvolt.json
rename to schemas/bipm/si/2019/derived/prefixed/microvolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microwatt.json b/schemas/bipm/si/2019/derived/prefixed/microwatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microwatt.json
rename to schemas/bipm/si/2019/derived/prefixed/microwatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/microweber.json b/schemas/bipm/si/2019/derived/prefixed/microweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/microweber.json
rename to schemas/bipm/si/2019/derived/prefixed/microweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millibecquerel.json b/schemas/bipm/si/2019/derived/prefixed/millibecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millibecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/millibecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millicoulomb.json b/schemas/bipm/si/2019/derived/prefixed/millicoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millicoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/millicoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millidegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/millidegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millidegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/millidegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millifarad.json b/schemas/bipm/si/2019/derived/prefixed/millifarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millifarad.json
rename to schemas/bipm/si/2019/derived/prefixed/millifarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/milligray.json b/schemas/bipm/si/2019/derived/prefixed/milligray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/milligray.json
rename to schemas/bipm/si/2019/derived/prefixed/milligray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millihenry.json b/schemas/bipm/si/2019/derived/prefixed/millihenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millihenry.json
rename to schemas/bipm/si/2019/derived/prefixed/millihenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millihertz.json b/schemas/bipm/si/2019/derived/prefixed/millihertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millihertz.json
rename to schemas/bipm/si/2019/derived/prefixed/millihertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millijoule.json b/schemas/bipm/si/2019/derived/prefixed/millijoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millijoule.json
rename to schemas/bipm/si/2019/derived/prefixed/millijoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millikatal.json b/schemas/bipm/si/2019/derived/prefixed/millikatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millikatal.json
rename to schemas/bipm/si/2019/derived/prefixed/millikatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millilumen.json b/schemas/bipm/si/2019/derived/prefixed/millilumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millilumen.json
rename to schemas/bipm/si/2019/derived/prefixed/millilumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millilux.json b/schemas/bipm/si/2019/derived/prefixed/millilux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millilux.json
rename to schemas/bipm/si/2019/derived/prefixed/millilux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millinewton.json b/schemas/bipm/si/2019/derived/prefixed/millinewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millinewton.json
rename to schemas/bipm/si/2019/derived/prefixed/millinewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/milliohm.json b/schemas/bipm/si/2019/derived/prefixed/milliohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/milliohm.json
rename to schemas/bipm/si/2019/derived/prefixed/milliohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millipascal.json b/schemas/bipm/si/2019/derived/prefixed/millipascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millipascal.json
rename to schemas/bipm/si/2019/derived/prefixed/millipascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/milliradian.json b/schemas/bipm/si/2019/derived/prefixed/milliradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/milliradian.json
rename to schemas/bipm/si/2019/derived/prefixed/milliradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millisiemens.json b/schemas/bipm/si/2019/derived/prefixed/millisiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millisiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/millisiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millisievert.json b/schemas/bipm/si/2019/derived/prefixed/millisievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millisievert.json
rename to schemas/bipm/si/2019/derived/prefixed/millisievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millisteradian.json b/schemas/bipm/si/2019/derived/prefixed/millisteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millisteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/millisteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millitesla.json b/schemas/bipm/si/2019/derived/prefixed/millitesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millitesla.json
rename to schemas/bipm/si/2019/derived/prefixed/millitesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/millivolt.json b/schemas/bipm/si/2019/derived/prefixed/millivolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/millivolt.json
rename to schemas/bipm/si/2019/derived/prefixed/millivolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/milliwatt.json b/schemas/bipm/si/2019/derived/prefixed/milliwatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/milliwatt.json
rename to schemas/bipm/si/2019/derived/prefixed/milliwatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/milliweber.json b/schemas/bipm/si/2019/derived/prefixed/milliweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/milliweber.json
rename to schemas/bipm/si/2019/derived/prefixed/milliweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanobecquerel.json b/schemas/bipm/si/2019/derived/prefixed/nanobecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanobecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/nanobecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanocoulomb.json b/schemas/bipm/si/2019/derived/prefixed/nanocoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanocoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/nanocoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanodegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/nanodegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanodegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/nanodegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanofarad.json b/schemas/bipm/si/2019/derived/prefixed/nanofarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanofarad.json
rename to schemas/bipm/si/2019/derived/prefixed/nanofarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanogray.json b/schemas/bipm/si/2019/derived/prefixed/nanogray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanogray.json
rename to schemas/bipm/si/2019/derived/prefixed/nanogray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanohenry.json b/schemas/bipm/si/2019/derived/prefixed/nanohenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanohenry.json
rename to schemas/bipm/si/2019/derived/prefixed/nanohenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanohertz.json b/schemas/bipm/si/2019/derived/prefixed/nanohertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanohertz.json
rename to schemas/bipm/si/2019/derived/prefixed/nanohertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanojoule.json b/schemas/bipm/si/2019/derived/prefixed/nanojoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanojoule.json
rename to schemas/bipm/si/2019/derived/prefixed/nanojoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanokatal.json b/schemas/bipm/si/2019/derived/prefixed/nanokatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanokatal.json
rename to schemas/bipm/si/2019/derived/prefixed/nanokatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanolumen.json b/schemas/bipm/si/2019/derived/prefixed/nanolumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanolumen.json
rename to schemas/bipm/si/2019/derived/prefixed/nanolumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanolux.json b/schemas/bipm/si/2019/derived/prefixed/nanolux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanolux.json
rename to schemas/bipm/si/2019/derived/prefixed/nanolux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanonewton.json b/schemas/bipm/si/2019/derived/prefixed/nanonewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanonewton.json
rename to schemas/bipm/si/2019/derived/prefixed/nanonewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanoohm.json b/schemas/bipm/si/2019/derived/prefixed/nanoohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanoohm.json
rename to schemas/bipm/si/2019/derived/prefixed/nanoohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanopascal.json b/schemas/bipm/si/2019/derived/prefixed/nanopascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanopascal.json
rename to schemas/bipm/si/2019/derived/prefixed/nanopascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanoradian.json b/schemas/bipm/si/2019/derived/prefixed/nanoradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanoradian.json
rename to schemas/bipm/si/2019/derived/prefixed/nanoradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanosiemens.json b/schemas/bipm/si/2019/derived/prefixed/nanosiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanosiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/nanosiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanosievert.json b/schemas/bipm/si/2019/derived/prefixed/nanosievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanosievert.json
rename to schemas/bipm/si/2019/derived/prefixed/nanosievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanosteradian.json b/schemas/bipm/si/2019/derived/prefixed/nanosteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanosteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/nanosteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanotesla.json b/schemas/bipm/si/2019/derived/prefixed/nanotesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanotesla.json
rename to schemas/bipm/si/2019/derived/prefixed/nanotesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanovolt.json b/schemas/bipm/si/2019/derived/prefixed/nanovolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanovolt.json
rename to schemas/bipm/si/2019/derived/prefixed/nanovolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanowatt.json b/schemas/bipm/si/2019/derived/prefixed/nanowatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanowatt.json
rename to schemas/bipm/si/2019/derived/prefixed/nanowatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/nanoweber.json b/schemas/bipm/si/2019/derived/prefixed/nanoweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/nanoweber.json
rename to schemas/bipm/si/2019/derived/prefixed/nanoweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petabecquerel.json b/schemas/bipm/si/2019/derived/prefixed/petabecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petabecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/petabecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petacoulomb.json b/schemas/bipm/si/2019/derived/prefixed/petacoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petacoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/petacoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petadegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/petadegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petadegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/petadegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petafarad.json b/schemas/bipm/si/2019/derived/prefixed/petafarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petafarad.json
rename to schemas/bipm/si/2019/derived/prefixed/petafarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petagray.json b/schemas/bipm/si/2019/derived/prefixed/petagray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petagray.json
rename to schemas/bipm/si/2019/derived/prefixed/petagray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petahenry.json b/schemas/bipm/si/2019/derived/prefixed/petahenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petahenry.json
rename to schemas/bipm/si/2019/derived/prefixed/petahenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petahertz.json b/schemas/bipm/si/2019/derived/prefixed/petahertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petahertz.json
rename to schemas/bipm/si/2019/derived/prefixed/petahertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petajoule.json b/schemas/bipm/si/2019/derived/prefixed/petajoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petajoule.json
rename to schemas/bipm/si/2019/derived/prefixed/petajoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petakatal.json b/schemas/bipm/si/2019/derived/prefixed/petakatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petakatal.json
rename to schemas/bipm/si/2019/derived/prefixed/petakatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petalumen.json b/schemas/bipm/si/2019/derived/prefixed/petalumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petalumen.json
rename to schemas/bipm/si/2019/derived/prefixed/petalumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petalux.json b/schemas/bipm/si/2019/derived/prefixed/petalux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petalux.json
rename to schemas/bipm/si/2019/derived/prefixed/petalux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petanewton.json b/schemas/bipm/si/2019/derived/prefixed/petanewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petanewton.json
rename to schemas/bipm/si/2019/derived/prefixed/petanewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petaohm.json b/schemas/bipm/si/2019/derived/prefixed/petaohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petaohm.json
rename to schemas/bipm/si/2019/derived/prefixed/petaohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petapascal.json b/schemas/bipm/si/2019/derived/prefixed/petapascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petapascal.json
rename to schemas/bipm/si/2019/derived/prefixed/petapascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petaradian.json b/schemas/bipm/si/2019/derived/prefixed/petaradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petaradian.json
rename to schemas/bipm/si/2019/derived/prefixed/petaradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petasiemens.json b/schemas/bipm/si/2019/derived/prefixed/petasiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petasiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/petasiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petasievert.json b/schemas/bipm/si/2019/derived/prefixed/petasievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petasievert.json
rename to schemas/bipm/si/2019/derived/prefixed/petasievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petasteradian.json b/schemas/bipm/si/2019/derived/prefixed/petasteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petasteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/petasteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petatesla.json b/schemas/bipm/si/2019/derived/prefixed/petatesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petatesla.json
rename to schemas/bipm/si/2019/derived/prefixed/petatesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petavolt.json b/schemas/bipm/si/2019/derived/prefixed/petavolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petavolt.json
rename to schemas/bipm/si/2019/derived/prefixed/petavolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petawatt.json b/schemas/bipm/si/2019/derived/prefixed/petawatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petawatt.json
rename to schemas/bipm/si/2019/derived/prefixed/petawatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/petaweber.json b/schemas/bipm/si/2019/derived/prefixed/petaweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/petaweber.json
rename to schemas/bipm/si/2019/derived/prefixed/petaweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picobecquerel.json b/schemas/bipm/si/2019/derived/prefixed/picobecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picobecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/picobecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picocoulomb.json b/schemas/bipm/si/2019/derived/prefixed/picocoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picocoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/picocoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picodegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/picodegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picodegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/picodegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picofarad.json b/schemas/bipm/si/2019/derived/prefixed/picofarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picofarad.json
rename to schemas/bipm/si/2019/derived/prefixed/picofarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picogray.json b/schemas/bipm/si/2019/derived/prefixed/picogray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picogray.json
rename to schemas/bipm/si/2019/derived/prefixed/picogray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picohenry.json b/schemas/bipm/si/2019/derived/prefixed/picohenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picohenry.json
rename to schemas/bipm/si/2019/derived/prefixed/picohenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picohertz.json b/schemas/bipm/si/2019/derived/prefixed/picohertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picohertz.json
rename to schemas/bipm/si/2019/derived/prefixed/picohertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picojoule.json b/schemas/bipm/si/2019/derived/prefixed/picojoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picojoule.json
rename to schemas/bipm/si/2019/derived/prefixed/picojoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picokatal.json b/schemas/bipm/si/2019/derived/prefixed/picokatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picokatal.json
rename to schemas/bipm/si/2019/derived/prefixed/picokatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picolumen.json b/schemas/bipm/si/2019/derived/prefixed/picolumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picolumen.json
rename to schemas/bipm/si/2019/derived/prefixed/picolumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picolux.json b/schemas/bipm/si/2019/derived/prefixed/picolux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picolux.json
rename to schemas/bipm/si/2019/derived/prefixed/picolux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/piconewton.json b/schemas/bipm/si/2019/derived/prefixed/piconewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/piconewton.json
rename to schemas/bipm/si/2019/derived/prefixed/piconewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picoohm.json b/schemas/bipm/si/2019/derived/prefixed/picoohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picoohm.json
rename to schemas/bipm/si/2019/derived/prefixed/picoohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picopascal.json b/schemas/bipm/si/2019/derived/prefixed/picopascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picopascal.json
rename to schemas/bipm/si/2019/derived/prefixed/picopascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picoradian.json b/schemas/bipm/si/2019/derived/prefixed/picoradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picoradian.json
rename to schemas/bipm/si/2019/derived/prefixed/picoradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picosiemens.json b/schemas/bipm/si/2019/derived/prefixed/picosiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picosiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/picosiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picosievert.json b/schemas/bipm/si/2019/derived/prefixed/picosievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picosievert.json
rename to schemas/bipm/si/2019/derived/prefixed/picosievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picosteradian.json b/schemas/bipm/si/2019/derived/prefixed/picosteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picosteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/picosteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picotesla.json b/schemas/bipm/si/2019/derived/prefixed/picotesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picotesla.json
rename to schemas/bipm/si/2019/derived/prefixed/picotesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picovolt.json b/schemas/bipm/si/2019/derived/prefixed/picovolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picovolt.json
rename to schemas/bipm/si/2019/derived/prefixed/picovolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picowatt.json b/schemas/bipm/si/2019/derived/prefixed/picowatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picowatt.json
rename to schemas/bipm/si/2019/derived/prefixed/picowatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/picoweber.json b/schemas/bipm/si/2019/derived/prefixed/picoweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/picoweber.json
rename to schemas/bipm/si/2019/derived/prefixed/picoweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectobecquerel.json b/schemas/bipm/si/2019/derived/prefixed/quectobecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectobecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/quectobecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectocoulomb.json b/schemas/bipm/si/2019/derived/prefixed/quectocoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectocoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/quectocoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectodegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/quectodegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectodegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/quectodegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectofarad.json b/schemas/bipm/si/2019/derived/prefixed/quectofarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectofarad.json
rename to schemas/bipm/si/2019/derived/prefixed/quectofarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectogray.json b/schemas/bipm/si/2019/derived/prefixed/quectogray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectogray.json
rename to schemas/bipm/si/2019/derived/prefixed/quectogray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectohenry.json b/schemas/bipm/si/2019/derived/prefixed/quectohenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectohenry.json
rename to schemas/bipm/si/2019/derived/prefixed/quectohenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectohertz.json b/schemas/bipm/si/2019/derived/prefixed/quectohertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectohertz.json
rename to schemas/bipm/si/2019/derived/prefixed/quectohertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectojoule.json b/schemas/bipm/si/2019/derived/prefixed/quectojoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectojoule.json
rename to schemas/bipm/si/2019/derived/prefixed/quectojoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectokatal.json b/schemas/bipm/si/2019/derived/prefixed/quectokatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectokatal.json
rename to schemas/bipm/si/2019/derived/prefixed/quectokatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectolumen.json b/schemas/bipm/si/2019/derived/prefixed/quectolumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectolumen.json
rename to schemas/bipm/si/2019/derived/prefixed/quectolumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectolux.json b/schemas/bipm/si/2019/derived/prefixed/quectolux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectolux.json
rename to schemas/bipm/si/2019/derived/prefixed/quectolux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectonewton.json b/schemas/bipm/si/2019/derived/prefixed/quectonewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectonewton.json
rename to schemas/bipm/si/2019/derived/prefixed/quectonewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectoohm.json b/schemas/bipm/si/2019/derived/prefixed/quectoohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectoohm.json
rename to schemas/bipm/si/2019/derived/prefixed/quectoohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectopascal.json b/schemas/bipm/si/2019/derived/prefixed/quectopascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectopascal.json
rename to schemas/bipm/si/2019/derived/prefixed/quectopascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectoradian.json b/schemas/bipm/si/2019/derived/prefixed/quectoradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectoradian.json
rename to schemas/bipm/si/2019/derived/prefixed/quectoradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectosiemens.json b/schemas/bipm/si/2019/derived/prefixed/quectosiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectosiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/quectosiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectosievert.json b/schemas/bipm/si/2019/derived/prefixed/quectosievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectosievert.json
rename to schemas/bipm/si/2019/derived/prefixed/quectosievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectosteradian.json b/schemas/bipm/si/2019/derived/prefixed/quectosteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectosteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/quectosteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectotesla.json b/schemas/bipm/si/2019/derived/prefixed/quectotesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectotesla.json
rename to schemas/bipm/si/2019/derived/prefixed/quectotesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectovolt.json b/schemas/bipm/si/2019/derived/prefixed/quectovolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectovolt.json
rename to schemas/bipm/si/2019/derived/prefixed/quectovolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectowatt.json b/schemas/bipm/si/2019/derived/prefixed/quectowatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectowatt.json
rename to schemas/bipm/si/2019/derived/prefixed/quectowatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quectoweber.json b/schemas/bipm/si/2019/derived/prefixed/quectoweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quectoweber.json
rename to schemas/bipm/si/2019/derived/prefixed/quectoweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettabecquerel.json b/schemas/bipm/si/2019/derived/prefixed/quettabecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettabecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/quettabecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettacoulomb.json b/schemas/bipm/si/2019/derived/prefixed/quettacoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettacoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/quettacoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettadegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/quettadegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettadegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/quettadegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettafarad.json b/schemas/bipm/si/2019/derived/prefixed/quettafarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettafarad.json
rename to schemas/bipm/si/2019/derived/prefixed/quettafarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettagray.json b/schemas/bipm/si/2019/derived/prefixed/quettagray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettagray.json
rename to schemas/bipm/si/2019/derived/prefixed/quettagray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettahenry.json b/schemas/bipm/si/2019/derived/prefixed/quettahenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettahenry.json
rename to schemas/bipm/si/2019/derived/prefixed/quettahenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettahertz.json b/schemas/bipm/si/2019/derived/prefixed/quettahertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettahertz.json
rename to schemas/bipm/si/2019/derived/prefixed/quettahertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettajoule.json b/schemas/bipm/si/2019/derived/prefixed/quettajoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettajoule.json
rename to schemas/bipm/si/2019/derived/prefixed/quettajoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettakatal.json b/schemas/bipm/si/2019/derived/prefixed/quettakatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettakatal.json
rename to schemas/bipm/si/2019/derived/prefixed/quettakatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettalumen.json b/schemas/bipm/si/2019/derived/prefixed/quettalumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettalumen.json
rename to schemas/bipm/si/2019/derived/prefixed/quettalumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettalux.json b/schemas/bipm/si/2019/derived/prefixed/quettalux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettalux.json
rename to schemas/bipm/si/2019/derived/prefixed/quettalux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettanewton.json b/schemas/bipm/si/2019/derived/prefixed/quettanewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettanewton.json
rename to schemas/bipm/si/2019/derived/prefixed/quettanewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettaohm.json b/schemas/bipm/si/2019/derived/prefixed/quettaohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettaohm.json
rename to schemas/bipm/si/2019/derived/prefixed/quettaohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettapascal.json b/schemas/bipm/si/2019/derived/prefixed/quettapascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettapascal.json
rename to schemas/bipm/si/2019/derived/prefixed/quettapascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettaradian.json b/schemas/bipm/si/2019/derived/prefixed/quettaradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettaradian.json
rename to schemas/bipm/si/2019/derived/prefixed/quettaradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettasiemens.json b/schemas/bipm/si/2019/derived/prefixed/quettasiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettasiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/quettasiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettasievert.json b/schemas/bipm/si/2019/derived/prefixed/quettasievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettasievert.json
rename to schemas/bipm/si/2019/derived/prefixed/quettasievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettasteradian.json b/schemas/bipm/si/2019/derived/prefixed/quettasteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettasteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/quettasteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettatesla.json b/schemas/bipm/si/2019/derived/prefixed/quettatesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettatesla.json
rename to schemas/bipm/si/2019/derived/prefixed/quettatesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettavolt.json b/schemas/bipm/si/2019/derived/prefixed/quettavolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettavolt.json
rename to schemas/bipm/si/2019/derived/prefixed/quettavolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettawatt.json b/schemas/bipm/si/2019/derived/prefixed/quettawatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettawatt.json
rename to schemas/bipm/si/2019/derived/prefixed/quettawatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/quettaweber.json b/schemas/bipm/si/2019/derived/prefixed/quettaweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/quettaweber.json
rename to schemas/bipm/si/2019/derived/prefixed/quettaweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnabecquerel.json b/schemas/bipm/si/2019/derived/prefixed/ronnabecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnabecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnabecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnacoulomb.json b/schemas/bipm/si/2019/derived/prefixed/ronnacoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnacoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnacoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnadegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/ronnadegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnadegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnadegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnafarad.json b/schemas/bipm/si/2019/derived/prefixed/ronnafarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnafarad.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnafarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnagray.json b/schemas/bipm/si/2019/derived/prefixed/ronnagray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnagray.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnagray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnahenry.json b/schemas/bipm/si/2019/derived/prefixed/ronnahenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnahenry.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnahenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnahertz.json b/schemas/bipm/si/2019/derived/prefixed/ronnahertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnahertz.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnahertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnajoule.json b/schemas/bipm/si/2019/derived/prefixed/ronnajoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnajoule.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnajoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnakatal.json b/schemas/bipm/si/2019/derived/prefixed/ronnakatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnakatal.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnakatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnalumen.json b/schemas/bipm/si/2019/derived/prefixed/ronnalumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnalumen.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnalumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnalux.json b/schemas/bipm/si/2019/derived/prefixed/ronnalux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnalux.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnalux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnanewton.json b/schemas/bipm/si/2019/derived/prefixed/ronnanewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnanewton.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnanewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnaohm.json b/schemas/bipm/si/2019/derived/prefixed/ronnaohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnaohm.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnaohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnapascal.json b/schemas/bipm/si/2019/derived/prefixed/ronnapascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnapascal.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnapascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnaradian.json b/schemas/bipm/si/2019/derived/prefixed/ronnaradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnaradian.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnaradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnasiemens.json b/schemas/bipm/si/2019/derived/prefixed/ronnasiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnasiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnasiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnasievert.json b/schemas/bipm/si/2019/derived/prefixed/ronnasievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnasievert.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnasievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnasteradian.json b/schemas/bipm/si/2019/derived/prefixed/ronnasteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnasteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnasteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnatesla.json b/schemas/bipm/si/2019/derived/prefixed/ronnatesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnatesla.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnatesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnavolt.json b/schemas/bipm/si/2019/derived/prefixed/ronnavolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnavolt.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnavolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnawatt.json b/schemas/bipm/si/2019/derived/prefixed/ronnawatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnawatt.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnawatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/ronnaweber.json b/schemas/bipm/si/2019/derived/prefixed/ronnaweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/ronnaweber.json
rename to schemas/bipm/si/2019/derived/prefixed/ronnaweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontobecquerel.json b/schemas/bipm/si/2019/derived/prefixed/rontobecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontobecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/rontobecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontocoulomb.json b/schemas/bipm/si/2019/derived/prefixed/rontocoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontocoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/rontocoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontodegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/rontodegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontodegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/rontodegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontofarad.json b/schemas/bipm/si/2019/derived/prefixed/rontofarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontofarad.json
rename to schemas/bipm/si/2019/derived/prefixed/rontofarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontogray.json b/schemas/bipm/si/2019/derived/prefixed/rontogray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontogray.json
rename to schemas/bipm/si/2019/derived/prefixed/rontogray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontohenry.json b/schemas/bipm/si/2019/derived/prefixed/rontohenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontohenry.json
rename to schemas/bipm/si/2019/derived/prefixed/rontohenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontohertz.json b/schemas/bipm/si/2019/derived/prefixed/rontohertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontohertz.json
rename to schemas/bipm/si/2019/derived/prefixed/rontohertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontojoule.json b/schemas/bipm/si/2019/derived/prefixed/rontojoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontojoule.json
rename to schemas/bipm/si/2019/derived/prefixed/rontojoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontokatal.json b/schemas/bipm/si/2019/derived/prefixed/rontokatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontokatal.json
rename to schemas/bipm/si/2019/derived/prefixed/rontokatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontolumen.json b/schemas/bipm/si/2019/derived/prefixed/rontolumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontolumen.json
rename to schemas/bipm/si/2019/derived/prefixed/rontolumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontolux.json b/schemas/bipm/si/2019/derived/prefixed/rontolux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontolux.json
rename to schemas/bipm/si/2019/derived/prefixed/rontolux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontonewton.json b/schemas/bipm/si/2019/derived/prefixed/rontonewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontonewton.json
rename to schemas/bipm/si/2019/derived/prefixed/rontonewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontoohm.json b/schemas/bipm/si/2019/derived/prefixed/rontoohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontoohm.json
rename to schemas/bipm/si/2019/derived/prefixed/rontoohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontopascal.json b/schemas/bipm/si/2019/derived/prefixed/rontopascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontopascal.json
rename to schemas/bipm/si/2019/derived/prefixed/rontopascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontoradian.json b/schemas/bipm/si/2019/derived/prefixed/rontoradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontoradian.json
rename to schemas/bipm/si/2019/derived/prefixed/rontoradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontosiemens.json b/schemas/bipm/si/2019/derived/prefixed/rontosiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontosiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/rontosiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontosievert.json b/schemas/bipm/si/2019/derived/prefixed/rontosievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontosievert.json
rename to schemas/bipm/si/2019/derived/prefixed/rontosievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontosteradian.json b/schemas/bipm/si/2019/derived/prefixed/rontosteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontosteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/rontosteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontotesla.json b/schemas/bipm/si/2019/derived/prefixed/rontotesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontotesla.json
rename to schemas/bipm/si/2019/derived/prefixed/rontotesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontovolt.json b/schemas/bipm/si/2019/derived/prefixed/rontovolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontovolt.json
rename to schemas/bipm/si/2019/derived/prefixed/rontovolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontowatt.json b/schemas/bipm/si/2019/derived/prefixed/rontowatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontowatt.json
rename to schemas/bipm/si/2019/derived/prefixed/rontowatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/rontoweber.json b/schemas/bipm/si/2019/derived/prefixed/rontoweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/rontoweber.json
rename to schemas/bipm/si/2019/derived/prefixed/rontoweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/terabecquerel.json b/schemas/bipm/si/2019/derived/prefixed/terabecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/terabecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/terabecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/teracoulomb.json b/schemas/bipm/si/2019/derived/prefixed/teracoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/teracoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/teracoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/teradegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/teradegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/teradegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/teradegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/terafarad.json b/schemas/bipm/si/2019/derived/prefixed/terafarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/terafarad.json
rename to schemas/bipm/si/2019/derived/prefixed/terafarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/teragray.json b/schemas/bipm/si/2019/derived/prefixed/teragray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/teragray.json
rename to schemas/bipm/si/2019/derived/prefixed/teragray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/terahenry.json b/schemas/bipm/si/2019/derived/prefixed/terahenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/terahenry.json
rename to schemas/bipm/si/2019/derived/prefixed/terahenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/terahertz.json b/schemas/bipm/si/2019/derived/prefixed/terahertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/terahertz.json
rename to schemas/bipm/si/2019/derived/prefixed/terahertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/terajoule.json b/schemas/bipm/si/2019/derived/prefixed/terajoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/terajoule.json
rename to schemas/bipm/si/2019/derived/prefixed/terajoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/terakatal.json b/schemas/bipm/si/2019/derived/prefixed/terakatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/terakatal.json
rename to schemas/bipm/si/2019/derived/prefixed/terakatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/teralumen.json b/schemas/bipm/si/2019/derived/prefixed/teralumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/teralumen.json
rename to schemas/bipm/si/2019/derived/prefixed/teralumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/teralux.json b/schemas/bipm/si/2019/derived/prefixed/teralux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/teralux.json
rename to schemas/bipm/si/2019/derived/prefixed/teralux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/teranewton.json b/schemas/bipm/si/2019/derived/prefixed/teranewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/teranewton.json
rename to schemas/bipm/si/2019/derived/prefixed/teranewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/teraohm.json b/schemas/bipm/si/2019/derived/prefixed/teraohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/teraohm.json
rename to schemas/bipm/si/2019/derived/prefixed/teraohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/terapascal.json b/schemas/bipm/si/2019/derived/prefixed/terapascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/terapascal.json
rename to schemas/bipm/si/2019/derived/prefixed/terapascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/teraradian.json b/schemas/bipm/si/2019/derived/prefixed/teraradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/teraradian.json
rename to schemas/bipm/si/2019/derived/prefixed/teraradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/terasiemens.json b/schemas/bipm/si/2019/derived/prefixed/terasiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/terasiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/terasiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/terasievert.json b/schemas/bipm/si/2019/derived/prefixed/terasievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/terasievert.json
rename to schemas/bipm/si/2019/derived/prefixed/terasievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/terasteradian.json b/schemas/bipm/si/2019/derived/prefixed/terasteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/terasteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/terasteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/teratesla.json b/schemas/bipm/si/2019/derived/prefixed/teratesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/teratesla.json
rename to schemas/bipm/si/2019/derived/prefixed/teratesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/teravolt.json b/schemas/bipm/si/2019/derived/prefixed/teravolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/teravolt.json
rename to schemas/bipm/si/2019/derived/prefixed/teravolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/terawatt.json b/schemas/bipm/si/2019/derived/prefixed/terawatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/terawatt.json
rename to schemas/bipm/si/2019/derived/prefixed/terawatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/teraweber.json b/schemas/bipm/si/2019/derived/prefixed/teraweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/teraweber.json
rename to schemas/bipm/si/2019/derived/prefixed/teraweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctobecquerel.json b/schemas/bipm/si/2019/derived/prefixed/yoctobecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctobecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctobecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctocoulomb.json b/schemas/bipm/si/2019/derived/prefixed/yoctocoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctocoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctocoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctodegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/yoctodegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctodegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctodegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctofarad.json b/schemas/bipm/si/2019/derived/prefixed/yoctofarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctofarad.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctofarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctogray.json b/schemas/bipm/si/2019/derived/prefixed/yoctogray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctogray.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctogray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctohenry.json b/schemas/bipm/si/2019/derived/prefixed/yoctohenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctohenry.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctohenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctohertz.json b/schemas/bipm/si/2019/derived/prefixed/yoctohertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctohertz.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctohertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctojoule.json b/schemas/bipm/si/2019/derived/prefixed/yoctojoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctojoule.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctojoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctokatal.json b/schemas/bipm/si/2019/derived/prefixed/yoctokatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctokatal.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctokatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctolumen.json b/schemas/bipm/si/2019/derived/prefixed/yoctolumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctolumen.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctolumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctolux.json b/schemas/bipm/si/2019/derived/prefixed/yoctolux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctolux.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctolux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctonewton.json b/schemas/bipm/si/2019/derived/prefixed/yoctonewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctonewton.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctonewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctoohm.json b/schemas/bipm/si/2019/derived/prefixed/yoctoohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctoohm.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctoohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctopascal.json b/schemas/bipm/si/2019/derived/prefixed/yoctopascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctopascal.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctopascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctoradian.json b/schemas/bipm/si/2019/derived/prefixed/yoctoradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctoradian.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctoradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctosiemens.json b/schemas/bipm/si/2019/derived/prefixed/yoctosiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctosiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctosiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctosievert.json b/schemas/bipm/si/2019/derived/prefixed/yoctosievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctosievert.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctosievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctosteradian.json b/schemas/bipm/si/2019/derived/prefixed/yoctosteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctosteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctosteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctotesla.json b/schemas/bipm/si/2019/derived/prefixed/yoctotesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctotesla.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctotesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctovolt.json b/schemas/bipm/si/2019/derived/prefixed/yoctovolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctovolt.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctovolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctowatt.json b/schemas/bipm/si/2019/derived/prefixed/yoctowatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctowatt.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctowatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yoctoweber.json b/schemas/bipm/si/2019/derived/prefixed/yoctoweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yoctoweber.json
rename to schemas/bipm/si/2019/derived/prefixed/yoctoweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottabecquerel.json b/schemas/bipm/si/2019/derived/prefixed/yottabecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottabecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/yottabecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottacoulomb.json b/schemas/bipm/si/2019/derived/prefixed/yottacoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottacoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/yottacoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottadegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/yottadegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottadegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/yottadegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottafarad.json b/schemas/bipm/si/2019/derived/prefixed/yottafarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottafarad.json
rename to schemas/bipm/si/2019/derived/prefixed/yottafarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottagray.json b/schemas/bipm/si/2019/derived/prefixed/yottagray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottagray.json
rename to schemas/bipm/si/2019/derived/prefixed/yottagray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottahenry.json b/schemas/bipm/si/2019/derived/prefixed/yottahenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottahenry.json
rename to schemas/bipm/si/2019/derived/prefixed/yottahenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottahertz.json b/schemas/bipm/si/2019/derived/prefixed/yottahertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottahertz.json
rename to schemas/bipm/si/2019/derived/prefixed/yottahertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottajoule.json b/schemas/bipm/si/2019/derived/prefixed/yottajoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottajoule.json
rename to schemas/bipm/si/2019/derived/prefixed/yottajoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottakatal.json b/schemas/bipm/si/2019/derived/prefixed/yottakatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottakatal.json
rename to schemas/bipm/si/2019/derived/prefixed/yottakatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottalumen.json b/schemas/bipm/si/2019/derived/prefixed/yottalumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottalumen.json
rename to schemas/bipm/si/2019/derived/prefixed/yottalumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottalux.json b/schemas/bipm/si/2019/derived/prefixed/yottalux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottalux.json
rename to schemas/bipm/si/2019/derived/prefixed/yottalux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottanewton.json b/schemas/bipm/si/2019/derived/prefixed/yottanewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottanewton.json
rename to schemas/bipm/si/2019/derived/prefixed/yottanewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottaohm.json b/schemas/bipm/si/2019/derived/prefixed/yottaohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottaohm.json
rename to schemas/bipm/si/2019/derived/prefixed/yottaohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottapascal.json b/schemas/bipm/si/2019/derived/prefixed/yottapascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottapascal.json
rename to schemas/bipm/si/2019/derived/prefixed/yottapascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottaradian.json b/schemas/bipm/si/2019/derived/prefixed/yottaradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottaradian.json
rename to schemas/bipm/si/2019/derived/prefixed/yottaradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottasiemens.json b/schemas/bipm/si/2019/derived/prefixed/yottasiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottasiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/yottasiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottasievert.json b/schemas/bipm/si/2019/derived/prefixed/yottasievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottasievert.json
rename to schemas/bipm/si/2019/derived/prefixed/yottasievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottasteradian.json b/schemas/bipm/si/2019/derived/prefixed/yottasteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottasteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/yottasteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottatesla.json b/schemas/bipm/si/2019/derived/prefixed/yottatesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottatesla.json
rename to schemas/bipm/si/2019/derived/prefixed/yottatesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottavolt.json b/schemas/bipm/si/2019/derived/prefixed/yottavolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottavolt.json
rename to schemas/bipm/si/2019/derived/prefixed/yottavolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottawatt.json b/schemas/bipm/si/2019/derived/prefixed/yottawatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottawatt.json
rename to schemas/bipm/si/2019/derived/prefixed/yottawatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/yottaweber.json b/schemas/bipm/si/2019/derived/prefixed/yottaweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/yottaweber.json
rename to schemas/bipm/si/2019/derived/prefixed/yottaweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptobecquerel.json b/schemas/bipm/si/2019/derived/prefixed/zeptobecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptobecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptobecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptocoulomb.json b/schemas/bipm/si/2019/derived/prefixed/zeptocoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptocoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptocoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptodegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/zeptodegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptodegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptodegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptofarad.json b/schemas/bipm/si/2019/derived/prefixed/zeptofarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptofarad.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptofarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptogray.json b/schemas/bipm/si/2019/derived/prefixed/zeptogray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptogray.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptogray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptohenry.json b/schemas/bipm/si/2019/derived/prefixed/zeptohenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptohenry.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptohenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptohertz.json b/schemas/bipm/si/2019/derived/prefixed/zeptohertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptohertz.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptohertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptojoule.json b/schemas/bipm/si/2019/derived/prefixed/zeptojoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptojoule.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptojoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptokatal.json b/schemas/bipm/si/2019/derived/prefixed/zeptokatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptokatal.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptokatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptolumen.json b/schemas/bipm/si/2019/derived/prefixed/zeptolumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptolumen.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptolumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptolux.json b/schemas/bipm/si/2019/derived/prefixed/zeptolux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptolux.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptolux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptonewton.json b/schemas/bipm/si/2019/derived/prefixed/zeptonewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptonewton.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptonewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptoohm.json b/schemas/bipm/si/2019/derived/prefixed/zeptoohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptoohm.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptoohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptopascal.json b/schemas/bipm/si/2019/derived/prefixed/zeptopascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptopascal.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptopascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptoradian.json b/schemas/bipm/si/2019/derived/prefixed/zeptoradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptoradian.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptoradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptosiemens.json b/schemas/bipm/si/2019/derived/prefixed/zeptosiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptosiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptosiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptosievert.json b/schemas/bipm/si/2019/derived/prefixed/zeptosievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptosievert.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptosievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptosteradian.json b/schemas/bipm/si/2019/derived/prefixed/zeptosteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptosteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptosteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptotesla.json b/schemas/bipm/si/2019/derived/prefixed/zeptotesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptotesla.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptotesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptovolt.json b/schemas/bipm/si/2019/derived/prefixed/zeptovolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptovolt.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptovolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptowatt.json b/schemas/bipm/si/2019/derived/prefixed/zeptowatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptowatt.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptowatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zeptoweber.json b/schemas/bipm/si/2019/derived/prefixed/zeptoweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zeptoweber.json
rename to schemas/bipm/si/2019/derived/prefixed/zeptoweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettabecquerel.json b/schemas/bipm/si/2019/derived/prefixed/zettabecquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettabecquerel.json
rename to schemas/bipm/si/2019/derived/prefixed/zettabecquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettacoulomb.json b/schemas/bipm/si/2019/derived/prefixed/zettacoulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettacoulomb.json
rename to schemas/bipm/si/2019/derived/prefixed/zettacoulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettadegree-celsius.json b/schemas/bipm/si/2019/derived/prefixed/zettadegree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettadegree-celsius.json
rename to schemas/bipm/si/2019/derived/prefixed/zettadegree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettafarad.json b/schemas/bipm/si/2019/derived/prefixed/zettafarad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettafarad.json
rename to schemas/bipm/si/2019/derived/prefixed/zettafarad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettagray.json b/schemas/bipm/si/2019/derived/prefixed/zettagray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettagray.json
rename to schemas/bipm/si/2019/derived/prefixed/zettagray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettahenry.json b/schemas/bipm/si/2019/derived/prefixed/zettahenry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettahenry.json
rename to schemas/bipm/si/2019/derived/prefixed/zettahenry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettahertz.json b/schemas/bipm/si/2019/derived/prefixed/zettahertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettahertz.json
rename to schemas/bipm/si/2019/derived/prefixed/zettahertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettajoule.json b/schemas/bipm/si/2019/derived/prefixed/zettajoule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettajoule.json
rename to schemas/bipm/si/2019/derived/prefixed/zettajoule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettakatal.json b/schemas/bipm/si/2019/derived/prefixed/zettakatal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettakatal.json
rename to schemas/bipm/si/2019/derived/prefixed/zettakatal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettalumen.json b/schemas/bipm/si/2019/derived/prefixed/zettalumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettalumen.json
rename to schemas/bipm/si/2019/derived/prefixed/zettalumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettalux.json b/schemas/bipm/si/2019/derived/prefixed/zettalux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettalux.json
rename to schemas/bipm/si/2019/derived/prefixed/zettalux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettanewton.json b/schemas/bipm/si/2019/derived/prefixed/zettanewton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettanewton.json
rename to schemas/bipm/si/2019/derived/prefixed/zettanewton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettaohm.json b/schemas/bipm/si/2019/derived/prefixed/zettaohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettaohm.json
rename to schemas/bipm/si/2019/derived/prefixed/zettaohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettapascal.json b/schemas/bipm/si/2019/derived/prefixed/zettapascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettapascal.json
rename to schemas/bipm/si/2019/derived/prefixed/zettapascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettaradian.json b/schemas/bipm/si/2019/derived/prefixed/zettaradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettaradian.json
rename to schemas/bipm/si/2019/derived/prefixed/zettaradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettasiemens.json b/schemas/bipm/si/2019/derived/prefixed/zettasiemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettasiemens.json
rename to schemas/bipm/si/2019/derived/prefixed/zettasiemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettasievert.json b/schemas/bipm/si/2019/derived/prefixed/zettasievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettasievert.json
rename to schemas/bipm/si/2019/derived/prefixed/zettasievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettasteradian.json b/schemas/bipm/si/2019/derived/prefixed/zettasteradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettasteradian.json
rename to schemas/bipm/si/2019/derived/prefixed/zettasteradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettatesla.json b/schemas/bipm/si/2019/derived/prefixed/zettatesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettatesla.json
rename to schemas/bipm/si/2019/derived/prefixed/zettatesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettavolt.json b/schemas/bipm/si/2019/derived/prefixed/zettavolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettavolt.json
rename to schemas/bipm/si/2019/derived/prefixed/zettavolt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettawatt.json b/schemas/bipm/si/2019/derived/prefixed/zettawatt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettawatt.json
rename to schemas/bipm/si/2019/derived/prefixed/zettawatt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/prefixed/zettaweber.json b/schemas/bipm/si/2019/derived/prefixed/zettaweber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/prefixed/zettaweber.json
rename to schemas/bipm/si/2019/derived/prefixed/zettaweber.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/absorbed-dose.json b/schemas/bipm/si/2019/derived/quantity/absorbed-dose.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/absorbed-dose.json
rename to schemas/bipm/si/2019/derived/quantity/absorbed-dose.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/activity-referred-to-radionuclide.json b/schemas/bipm/si/2019/derived/quantity/activity-referred-to-radionuclide.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/activity-referred-to-radionuclide.json
rename to schemas/bipm/si/2019/derived/quantity/activity-referred-to-radionuclide.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/amount-of-heat.json b/schemas/bipm/si/2019/derived/quantity/amount-of-heat.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/amount-of-heat.json
rename to schemas/bipm/si/2019/derived/quantity/amount-of-heat.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/capacitance.json b/schemas/bipm/si/2019/derived/quantity/capacitance.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/capacitance.json
rename to schemas/bipm/si/2019/derived/quantity/capacitance.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/catalytic-activity.json b/schemas/bipm/si/2019/derived/quantity/catalytic-activity.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/catalytic-activity.json
rename to schemas/bipm/si/2019/derived/quantity/catalytic-activity.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/celsius-temperature.json b/schemas/bipm/si/2019/derived/quantity/celsius-temperature.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/celsius-temperature.json
rename to schemas/bipm/si/2019/derived/quantity/celsius-temperature.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/dose-equivalent.json b/schemas/bipm/si/2019/derived/quantity/dose-equivalent.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/dose-equivalent.json
rename to schemas/bipm/si/2019/derived/quantity/dose-equivalent.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/electric-charge.json b/schemas/bipm/si/2019/derived/quantity/electric-charge.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/electric-charge.json
rename to schemas/bipm/si/2019/derived/quantity/electric-charge.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/electric-conductance.json b/schemas/bipm/si/2019/derived/quantity/electric-conductance.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/electric-conductance.json
rename to schemas/bipm/si/2019/derived/quantity/electric-conductance.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/electric-potential-difference.json b/schemas/bipm/si/2019/derived/quantity/electric-potential-difference.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/electric-potential-difference.json
rename to schemas/bipm/si/2019/derived/quantity/electric-potential-difference.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/electric-resistance.json b/schemas/bipm/si/2019/derived/quantity/electric-resistance.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/electric-resistance.json
rename to schemas/bipm/si/2019/derived/quantity/electric-resistance.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/energy.json b/schemas/bipm/si/2019/derived/quantity/energy.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/energy.json
rename to schemas/bipm/si/2019/derived/quantity/energy.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/force.json b/schemas/bipm/si/2019/derived/quantity/force.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/force.json
rename to schemas/bipm/si/2019/derived/quantity/force.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/frequency.json b/schemas/bipm/si/2019/derived/quantity/frequency.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/frequency.json
rename to schemas/bipm/si/2019/derived/quantity/frequency.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/illuminance.json b/schemas/bipm/si/2019/derived/quantity/illuminance.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/illuminance.json
rename to schemas/bipm/si/2019/derived/quantity/illuminance.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/inductance.json b/schemas/bipm/si/2019/derived/quantity/inductance.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/inductance.json
rename to schemas/bipm/si/2019/derived/quantity/inductance.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/kerma.json b/schemas/bipm/si/2019/derived/quantity/kerma.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/kerma.json
rename to schemas/bipm/si/2019/derived/quantity/kerma.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/luminous-flux.json b/schemas/bipm/si/2019/derived/quantity/luminous-flux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/luminous-flux.json
rename to schemas/bipm/si/2019/derived/quantity/luminous-flux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/magnetic-flux-density.json b/schemas/bipm/si/2019/derived/quantity/magnetic-flux-density.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/magnetic-flux-density.json
rename to schemas/bipm/si/2019/derived/quantity/magnetic-flux-density.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/magnetic-flux.json b/schemas/bipm/si/2019/derived/quantity/magnetic-flux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/magnetic-flux.json
rename to schemas/bipm/si/2019/derived/quantity/magnetic-flux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/plane-angle.json b/schemas/bipm/si/2019/derived/quantity/plane-angle.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/plane-angle.json
rename to schemas/bipm/si/2019/derived/quantity/plane-angle.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/power.json b/schemas/bipm/si/2019/derived/quantity/power.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/power.json
rename to schemas/bipm/si/2019/derived/quantity/power.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/pressure.json b/schemas/bipm/si/2019/derived/quantity/pressure.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/pressure.json
rename to schemas/bipm/si/2019/derived/quantity/pressure.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/radiant-flux.json b/schemas/bipm/si/2019/derived/quantity/radiant-flux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/radiant-flux.json
rename to schemas/bipm/si/2019/derived/quantity/radiant-flux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/solid-angle.json b/schemas/bipm/si/2019/derived/quantity/solid-angle.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/solid-angle.json
rename to schemas/bipm/si/2019/derived/quantity/solid-angle.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/stress.json b/schemas/bipm/si/2019/derived/quantity/stress.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/stress.json
rename to schemas/bipm/si/2019/derived/quantity/stress.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/quantity/work.json b/schemas/bipm/si/2019/derived/quantity/work.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/quantity/work.json
rename to schemas/bipm/si/2019/derived/quantity/work.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/symbol.json b/schemas/bipm/si/2019/derived/symbol.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/symbol.json
rename to schemas/bipm/si/2019/derived/symbol.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/becquerel.json b/schemas/bipm/si/2019/derived/unit/becquerel.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/becquerel.json
rename to schemas/bipm/si/2019/derived/unit/becquerel.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/coulomb.json b/schemas/bipm/si/2019/derived/unit/coulomb.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/coulomb.json
rename to schemas/bipm/si/2019/derived/unit/coulomb.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/degree-celsius.json b/schemas/bipm/si/2019/derived/unit/degree-celsius.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/degree-celsius.json
rename to schemas/bipm/si/2019/derived/unit/degree-celsius.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/farad.json b/schemas/bipm/si/2019/derived/unit/farad.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/farad.json
rename to schemas/bipm/si/2019/derived/unit/farad.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/gray.json b/schemas/bipm/si/2019/derived/unit/gray.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/gray.json
rename to schemas/bipm/si/2019/derived/unit/gray.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/henry.json b/schemas/bipm/si/2019/derived/unit/henry.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/henry.json
rename to schemas/bipm/si/2019/derived/unit/henry.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/hertz.json b/schemas/bipm/si/2019/derived/unit/hertz.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/hertz.json
rename to schemas/bipm/si/2019/derived/unit/hertz.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/joule.json b/schemas/bipm/si/2019/derived/unit/joule.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/joule.json
rename to schemas/bipm/si/2019/derived/unit/joule.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/katal.json b/schemas/bipm/si/2019/derived/unit/katal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/katal.json
rename to schemas/bipm/si/2019/derived/unit/katal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/lumen.json b/schemas/bipm/si/2019/derived/unit/lumen.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/lumen.json
rename to schemas/bipm/si/2019/derived/unit/lumen.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/lux.json b/schemas/bipm/si/2019/derived/unit/lux.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/lux.json
rename to schemas/bipm/si/2019/derived/unit/lux.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/newton.json b/schemas/bipm/si/2019/derived/unit/newton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/newton.json
rename to schemas/bipm/si/2019/derived/unit/newton.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/ohm.json b/schemas/bipm/si/2019/derived/unit/ohm.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/ohm.json
rename to schemas/bipm/si/2019/derived/unit/ohm.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/pascal.json b/schemas/bipm/si/2019/derived/unit/pascal.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/pascal.json
rename to schemas/bipm/si/2019/derived/unit/pascal.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/radian.json b/schemas/bipm/si/2019/derived/unit/radian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/radian.json
rename to schemas/bipm/si/2019/derived/unit/radian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/siemens.json b/schemas/bipm/si/2019/derived/unit/siemens.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/siemens.json
rename to schemas/bipm/si/2019/derived/unit/siemens.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/sievert.json b/schemas/bipm/si/2019/derived/unit/sievert.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/sievert.json
rename to schemas/bipm/si/2019/derived/unit/sievert.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/steradian.json b/schemas/bipm/si/2019/derived/unit/steradian.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/steradian.json
rename to schemas/bipm/si/2019/derived/unit/steradian.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/tesla.json b/schemas/bipm/si/2019/derived/unit/tesla.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/tesla.json
rename to schemas/bipm/si/2019/derived/unit/tesla.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/volt.json b/schemas/bipm/si/2019/derived/unit/volt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/volt.json
rename to schemas/bipm/si/2019/derived/unit/volt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/watt.json b/schemas/bipm/si/2019/derived/unit/watt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/watt.json
rename to schemas/bipm/si/2019/derived/unit/watt.json
diff --git a/schemas/2020-12/bipm/si/2019/derived/unit/weber.json b/schemas/bipm/si/2019/derived/unit/weber.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/derived/unit/weber.json
rename to schemas/bipm/si/2019/derived/unit/weber.json
diff --git a/schemas/2020-12/bipm/si/2019/non-si/unit/arcminute.json b/schemas/bipm/si/2019/non-si/unit/arcminute.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/non-si/unit/arcminute.json
rename to schemas/bipm/si/2019/non-si/unit/arcminute.json
diff --git a/schemas/2020-12/bipm/si/2019/non-si/unit/arcsecond.json b/schemas/bipm/si/2019/non-si/unit/arcsecond.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/non-si/unit/arcsecond.json
rename to schemas/bipm/si/2019/non-si/unit/arcsecond.json
diff --git a/schemas/2020-12/bipm/si/2019/non-si/unit/astronomical-unit.json b/schemas/bipm/si/2019/non-si/unit/astronomical-unit.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/non-si/unit/astronomical-unit.json
rename to schemas/bipm/si/2019/non-si/unit/astronomical-unit.json
diff --git a/schemas/2020-12/bipm/si/2019/non-si/unit/dalton.json b/schemas/bipm/si/2019/non-si/unit/dalton.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/non-si/unit/dalton.json
rename to schemas/bipm/si/2019/non-si/unit/dalton.json
diff --git a/schemas/2020-12/bipm/si/2019/non-si/unit/day.json b/schemas/bipm/si/2019/non-si/unit/day.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/non-si/unit/day.json
rename to schemas/bipm/si/2019/non-si/unit/day.json
diff --git a/schemas/2020-12/bipm/si/2019/non-si/unit/degree.json b/schemas/bipm/si/2019/non-si/unit/degree.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/non-si/unit/degree.json
rename to schemas/bipm/si/2019/non-si/unit/degree.json
diff --git a/schemas/2020-12/bipm/si/2019/non-si/unit/electronvolt.json b/schemas/bipm/si/2019/non-si/unit/electronvolt.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/non-si/unit/electronvolt.json
rename to schemas/bipm/si/2019/non-si/unit/electronvolt.json
diff --git a/schemas/2020-12/bipm/si/2019/non-si/unit/hectare.json b/schemas/bipm/si/2019/non-si/unit/hectare.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/non-si/unit/hectare.json
rename to schemas/bipm/si/2019/non-si/unit/hectare.json
diff --git a/schemas/2020-12/bipm/si/2019/non-si/unit/hour.json b/schemas/bipm/si/2019/non-si/unit/hour.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/non-si/unit/hour.json
rename to schemas/bipm/si/2019/non-si/unit/hour.json
diff --git a/schemas/2020-12/bipm/si/2019/non-si/unit/litre.json b/schemas/bipm/si/2019/non-si/unit/litre.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/non-si/unit/litre.json
rename to schemas/bipm/si/2019/non-si/unit/litre.json
diff --git a/schemas/2020-12/bipm/si/2019/non-si/unit/minute.json b/schemas/bipm/si/2019/non-si/unit/minute.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/non-si/unit/minute.json
rename to schemas/bipm/si/2019/non-si/unit/minute.json
diff --git a/schemas/2020-12/bipm/si/2019/non-si/unit/tonne.json b/schemas/bipm/si/2019/non-si/unit/tonne.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/non-si/unit/tonne.json
rename to schemas/bipm/si/2019/non-si/unit/tonne.json
diff --git a/schemas/2020-12/bipm/si/2019/symbol.json b/schemas/bipm/si/2019/symbol.json
similarity index 100%
rename from schemas/2020-12/bipm/si/2019/symbol.json
rename to schemas/bipm/si/2019/symbol.json
diff --git a/schemas/2020-12/ieee/floating-point/2019/binary16-special.json b/schemas/ieee/floating-point/2019/binary16-special.json
similarity index 100%
rename from schemas/2020-12/ieee/floating-point/2019/binary16-special.json
rename to schemas/ieee/floating-point/2019/binary16-special.json
diff --git a/schemas/2020-12/ieee/floating-point/2019/binary16.json b/schemas/ieee/floating-point/2019/binary16.json
similarity index 100%
rename from schemas/2020-12/ieee/floating-point/2019/binary16.json
rename to schemas/ieee/floating-point/2019/binary16.json
diff --git a/schemas/2020-12/ieee/floating-point/2019/binary32-special.json b/schemas/ieee/floating-point/2019/binary32-special.json
similarity index 100%
rename from schemas/2020-12/ieee/floating-point/2019/binary32-special.json
rename to schemas/ieee/floating-point/2019/binary32-special.json
diff --git a/schemas/2020-12/ieee/floating-point/2019/binary32.json b/schemas/ieee/floating-point/2019/binary32.json
similarity index 100%
rename from schemas/2020-12/ieee/floating-point/2019/binary32.json
rename to schemas/ieee/floating-point/2019/binary32.json
diff --git a/schemas/2020-12/ieee/floating-point/2019/binary64-special.json b/schemas/ieee/floating-point/2019/binary64-special.json
similarity index 100%
rename from schemas/2020-12/ieee/floating-point/2019/binary64-special.json
rename to schemas/ieee/floating-point/2019/binary64-special.json
diff --git a/schemas/2020-12/ieee/floating-point/2019/binary64.json b/schemas/ieee/floating-point/2019/binary64.json
similarity index 100%
rename from schemas/2020-12/ieee/floating-point/2019/binary64.json
rename to schemas/ieee/floating-point/2019/binary64.json
diff --git a/schemas/2020-12/ieee/floating-point/2019/special.json b/schemas/ieee/floating-point/2019/special.json
similarity index 100%
rename from schemas/2020-12/ieee/floating-point/2019/special.json
rename to schemas/ieee/floating-point/2019/special.json
diff --git a/schemas/2020-12/ieee/posix/2017/path-absolute.json b/schemas/ieee/posix/2017/path-absolute.json
similarity index 100%
rename from schemas/2020-12/ieee/posix/2017/path-absolute.json
rename to schemas/ieee/posix/2017/path-absolute.json
diff --git a/schemas/2020-12/ieee/posix/2017/path-relative.json b/schemas/ieee/posix/2017/path-relative.json
similarity index 100%
rename from schemas/2020-12/ieee/posix/2017/path-relative.json
rename to schemas/ieee/posix/2017/path-relative.json
diff --git a/schemas/2020-12/ieee/posix/2017/path.json b/schemas/ieee/posix/2017/path.json
similarity index 100%
rename from schemas/2020-12/ieee/posix/2017/path.json
rename to schemas/ieee/posix/2017/path.json
diff --git a/schemas/2020-12/ietf/email/5321/address.json b/schemas/ietf/email/5321/address.json
similarity index 100%
rename from schemas/2020-12/ietf/email/5321/address.json
rename to schemas/ietf/email/5321/address.json
diff --git a/schemas/2020-12/ietf/encoding/4648/base16.json b/schemas/ietf/encoding/4648/base16.json
similarity index 100%
rename from schemas/2020-12/ietf/encoding/4648/base16.json
rename to schemas/ietf/encoding/4648/base16.json
diff --git a/schemas/2020-12/ietf/encoding/4648/base32.json b/schemas/ietf/encoding/4648/base32.json
similarity index 100%
rename from schemas/2020-12/ietf/encoding/4648/base32.json
rename to schemas/ietf/encoding/4648/base32.json
diff --git a/schemas/2020-12/ietf/encoding/4648/base32hex.json b/schemas/ietf/encoding/4648/base32hex.json
similarity index 100%
rename from schemas/2020-12/ietf/encoding/4648/base32hex.json
rename to schemas/ietf/encoding/4648/base32hex.json
diff --git a/schemas/2020-12/ietf/encoding/4648/base64.json b/schemas/ietf/encoding/4648/base64.json
similarity index 100%
rename from schemas/2020-12/ietf/encoding/4648/base64.json
rename to schemas/ietf/encoding/4648/base64.json
diff --git a/schemas/2020-12/ietf/encoding/4648/base64url.json b/schemas/ietf/encoding/4648/base64url.json
similarity index 100%
rename from schemas/2020-12/ietf/encoding/4648/base64url.json
rename to schemas/ietf/encoding/4648/base64url.json
diff --git a/schemas/2020-12/ietf/geojson/7946/bounding-box.json b/schemas/ietf/geojson/7946/bounding-box.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/bounding-box.json
rename to schemas/ietf/geojson/7946/bounding-box.json
diff --git a/schemas/2020-12/ietf/geojson/7946/feature-collection.json b/schemas/ietf/geojson/7946/feature-collection.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/feature-collection.json
rename to schemas/ietf/geojson/7946/feature-collection.json
diff --git a/schemas/2020-12/ietf/geojson/7946/feature.json b/schemas/ietf/geojson/7946/feature.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/feature.json
rename to schemas/ietf/geojson/7946/feature.json
diff --git a/schemas/2020-12/ietf/geojson/7946/geometry-collection.json b/schemas/ietf/geojson/7946/geometry-collection.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/geometry-collection.json
rename to schemas/ietf/geojson/7946/geometry-collection.json
diff --git a/schemas/2020-12/ietf/geojson/7946/geometry.json b/schemas/ietf/geojson/7946/geometry.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/geometry.json
rename to schemas/ietf/geojson/7946/geometry.json
diff --git a/schemas/2020-12/ietf/geojson/7946/line-string-coordinates.json b/schemas/ietf/geojson/7946/line-string-coordinates.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/line-string-coordinates.json
rename to schemas/ietf/geojson/7946/line-string-coordinates.json
diff --git a/schemas/2020-12/ietf/geojson/7946/line-string.json b/schemas/ietf/geojson/7946/line-string.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/line-string.json
rename to schemas/ietf/geojson/7946/line-string.json
diff --git a/schemas/2020-12/ietf/geojson/7946/linear-ring-coordinates.json b/schemas/ietf/geojson/7946/linear-ring-coordinates.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/linear-ring-coordinates.json
rename to schemas/ietf/geojson/7946/linear-ring-coordinates.json
diff --git a/schemas/2020-12/ietf/geojson/7946/multi-line-string.json b/schemas/ietf/geojson/7946/multi-line-string.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/multi-line-string.json
rename to schemas/ietf/geojson/7946/multi-line-string.json
diff --git a/schemas/2020-12/ietf/geojson/7946/multi-point.json b/schemas/ietf/geojson/7946/multi-point.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/multi-point.json
rename to schemas/ietf/geojson/7946/multi-point.json
diff --git a/schemas/2020-12/ietf/geojson/7946/multi-polygon.json b/schemas/ietf/geojson/7946/multi-polygon.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/multi-polygon.json
rename to schemas/ietf/geojson/7946/multi-polygon.json
diff --git a/schemas/2020-12/ietf/geojson/7946/point-coordinates.json b/schemas/ietf/geojson/7946/point-coordinates.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/point-coordinates.json
rename to schemas/ietf/geojson/7946/point-coordinates.json
diff --git a/schemas/2020-12/ietf/geojson/7946/point.json b/schemas/ietf/geojson/7946/point.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/point.json
rename to schemas/ietf/geojson/7946/point.json
diff --git a/schemas/2020-12/ietf/geojson/7946/polygon-coordinates.json b/schemas/ietf/geojson/7946/polygon-coordinates.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/polygon-coordinates.json
rename to schemas/ietf/geojson/7946/polygon-coordinates.json
diff --git a/schemas/2020-12/ietf/geojson/7946/polygon.json b/schemas/ietf/geojson/7946/polygon.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/polygon.json
rename to schemas/ietf/geojson/7946/polygon.json
diff --git a/schemas/2020-12/ietf/geojson/7946/schema.json b/schemas/ietf/geojson/7946/schema.json
similarity index 100%
rename from schemas/2020-12/ietf/geojson/7946/schema.json
rename to schemas/ietf/geojson/7946/schema.json
diff --git a/schemas/2020-12/ietf/http/9110/etag-strong.json b/schemas/ietf/http/9110/etag-strong.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/etag-strong.json
rename to schemas/ietf/http/9110/etag-strong.json
diff --git a/schemas/2020-12/ietf/http/9110/etag-weak.json b/schemas/ietf/http/9110/etag-weak.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/etag-weak.json
rename to schemas/ietf/http/9110/etag-weak.json
diff --git a/schemas/2020-12/ietf/http/9110/etag.json b/schemas/ietf/http/9110/etag.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/etag.json
rename to schemas/ietf/http/9110/etag.json
diff --git a/schemas/2020-12/ietf/http/9110/http-url.json b/schemas/ietf/http/9110/http-url.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/http-url.json
rename to schemas/ietf/http/9110/http-url.json
diff --git a/schemas/2020-12/ietf/http/9110/https-url.json b/schemas/ietf/http/9110/https-url.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/https-url.json
rename to schemas/ietf/http/9110/https-url.json
diff --git a/schemas/2020-12/ietf/http/9110/method-standard.json b/schemas/ietf/http/9110/method-standard.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/method-standard.json
rename to schemas/ietf/http/9110/method-standard.json
diff --git a/schemas/2020-12/ietf/http/9110/method.json b/schemas/ietf/http/9110/method.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/method.json
rename to schemas/ietf/http/9110/method.json
diff --git a/schemas/2020-12/ietf/http/9110/status-client-error.json b/schemas/ietf/http/9110/status-client-error.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/status-client-error.json
rename to schemas/ietf/http/9110/status-client-error.json
diff --git a/schemas/2020-12/ietf/http/9110/status-informational.json b/schemas/ietf/http/9110/status-informational.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/status-informational.json
rename to schemas/ietf/http/9110/status-informational.json
diff --git a/schemas/2020-12/ietf/http/9110/status-redirection.json b/schemas/ietf/http/9110/status-redirection.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/status-redirection.json
rename to schemas/ietf/http/9110/status-redirection.json
diff --git a/schemas/2020-12/ietf/http/9110/status-server-error.json b/schemas/ietf/http/9110/status-server-error.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/status-server-error.json
rename to schemas/ietf/http/9110/status-server-error.json
diff --git a/schemas/2020-12/ietf/http/9110/status-standard.json b/schemas/ietf/http/9110/status-standard.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/status-standard.json
rename to schemas/ietf/http/9110/status-standard.json
diff --git a/schemas/2020-12/ietf/http/9110/status-successful.json b/schemas/ietf/http/9110/status-successful.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/status-successful.json
rename to schemas/ietf/http/9110/status-successful.json
diff --git a/schemas/2020-12/ietf/http/9110/status.json b/schemas/ietf/http/9110/status.json
similarity index 100%
rename from schemas/2020-12/ietf/http/9110/status.json
rename to schemas/ietf/http/9110/status.json
diff --git a/schemas/2020-12/ietf/ip/v4/address.json b/schemas/ietf/ip/v4/address.json
similarity index 100%
rename from schemas/2020-12/ietf/ip/v4/address.json
rename to schemas/ietf/ip/v4/address.json
diff --git a/schemas/2020-12/ietf/ip/v6/address.json b/schemas/ietf/ip/v6/address.json
similarity index 100%
rename from schemas/2020-12/ietf/ip/v6/address.json
rename to schemas/ietf/ip/v6/address.json
diff --git a/schemas/2020-12/ietf/iri/3987/iri-reference.json b/schemas/ietf/iri/3987/iri-reference.json
similarity index 100%
rename from schemas/2020-12/ietf/iri/3987/iri-reference.json
rename to schemas/ietf/iri/3987/iri-reference.json
diff --git a/schemas/2020-12/ietf/iri/3987/iri.json b/schemas/ietf/iri/3987/iri.json
similarity index 100%
rename from schemas/2020-12/ietf/iri/3987/iri.json
rename to schemas/ietf/iri/3987/iri.json
diff --git a/schemas/2020-12/ietf/jsonpointer/6901/pointer.json b/schemas/ietf/jsonpointer/6901/pointer.json
similarity index 100%
rename from schemas/2020-12/ietf/jsonpointer/6901/pointer.json
rename to schemas/ietf/jsonpointer/6901/pointer.json
diff --git a/schemas/2020-12/ietf/jsonschema/2020-12/dialect/format-assertion.json b/schemas/ietf/jsonschema/2020-12/dialect/format-assertion.json
similarity index 100%
rename from schemas/2020-12/ietf/jsonschema/2020-12/dialect/format-assertion.json
rename to schemas/ietf/jsonschema/2020-12/dialect/format-assertion.json
diff --git a/schemas/2020-12/ietf/language/3066/tag-syntax.json b/schemas/ietf/language/3066/tag-syntax.json
similarity index 100%
rename from schemas/2020-12/ietf/language/3066/tag-syntax.json
rename to schemas/ietf/language/3066/tag-syntax.json
diff --git a/schemas/2020-12/ietf/language/5646/tag-syntax.json b/schemas/ietf/language/5646/tag-syntax.json
similarity index 100%
rename from schemas/2020-12/ietf/language/5646/tag-syntax.json
rename to schemas/ietf/language/5646/tag-syntax.json
diff --git a/schemas/2020-12/ietf/problem-details/9457/problem.json b/schemas/ietf/problem-details/9457/problem.json
similarity index 100%
rename from schemas/2020-12/ietf/problem-details/9457/problem.json
rename to schemas/ietf/problem-details/9457/problem.json
diff --git a/schemas/2020-12/ietf/uri/3986/uri-reference.json b/schemas/ietf/uri/3986/uri-reference.json
similarity index 100%
rename from schemas/2020-12/ietf/uri/3986/uri-reference.json
rename to schemas/ietf/uri/3986/uri-reference.json
diff --git a/schemas/2020-12/ietf/uri/3986/uri-relative.json b/schemas/ietf/uri/3986/uri-relative.json
similarity index 100%
rename from schemas/2020-12/ietf/uri/3986/uri-relative.json
rename to schemas/ietf/uri/3986/uri-relative.json
diff --git a/schemas/2020-12/ietf/uri/3986/uri.json b/schemas/ietf/uri/3986/uri.json
similarity index 100%
rename from schemas/2020-12/ietf/uri/3986/uri.json
rename to schemas/ietf/uri/3986/uri.json
diff --git a/schemas/2020-12/ietf/uri/3986/url.json b/schemas/ietf/uri/3986/url.json
similarity index 100%
rename from schemas/2020-12/ietf/uri/3986/url.json
rename to schemas/ietf/uri/3986/url.json
diff --git a/schemas/2020-12/ietf/urn/8141/urn.json b/schemas/ietf/urn/8141/urn.json
similarity index 100%
rename from schemas/2020-12/ietf/urn/8141/urn.json
rename to schemas/ietf/urn/8141/urn.json
diff --git a/schemas/2020-12/iso/c/2024/bool.json b/schemas/iso/c/2024/bool.json
similarity index 100%
rename from schemas/2020-12/iso/c/2024/bool.json
rename to schemas/iso/c/2024/bool.json
diff --git a/schemas/2020-12/iso/c/2024/double.json b/schemas/iso/c/2024/double.json
similarity index 100%
rename from schemas/2020-12/iso/c/2024/double.json
rename to schemas/iso/c/2024/double.json
diff --git a/schemas/2020-12/iso/c/2024/float-special.json b/schemas/iso/c/2024/float-special.json
similarity index 100%
rename from schemas/2020-12/iso/c/2024/float-special.json
rename to schemas/iso/c/2024/float-special.json
diff --git a/schemas/2020-12/iso/c/2024/float.json b/schemas/iso/c/2024/float.json
similarity index 100%
rename from schemas/2020-12/iso/c/2024/float.json
rename to schemas/iso/c/2024/float.json
diff --git a/schemas/2020-12/iso/c/2024/int16.json b/schemas/iso/c/2024/int16.json
similarity index 100%
rename from schemas/2020-12/iso/c/2024/int16.json
rename to schemas/iso/c/2024/int16.json
diff --git a/schemas/2020-12/iso/c/2024/int32.json b/schemas/iso/c/2024/int32.json
similarity index 100%
rename from schemas/2020-12/iso/c/2024/int32.json
rename to schemas/iso/c/2024/int32.json
diff --git a/schemas/2020-12/iso/c/2024/int64.json b/schemas/iso/c/2024/int64.json
similarity index 100%
rename from schemas/2020-12/iso/c/2024/int64.json
rename to schemas/iso/c/2024/int64.json
diff --git a/schemas/2020-12/iso/c/2024/int8.json b/schemas/iso/c/2024/int8.json
similarity index 100%
rename from schemas/2020-12/iso/c/2024/int8.json
rename to schemas/iso/c/2024/int8.json
diff --git a/schemas/2020-12/iso/c/2024/uint16.json b/schemas/iso/c/2024/uint16.json
similarity index 100%
rename from schemas/2020-12/iso/c/2024/uint16.json
rename to schemas/iso/c/2024/uint16.json
diff --git a/schemas/2020-12/iso/c/2024/uint32.json b/schemas/iso/c/2024/uint32.json
similarity index 100%
rename from schemas/2020-12/iso/c/2024/uint32.json
rename to schemas/iso/c/2024/uint32.json
diff --git a/schemas/2020-12/iso/c/2024/uint64.json b/schemas/iso/c/2024/uint64.json
similarity index 100%
rename from schemas/2020-12/iso/c/2024/uint64.json
rename to schemas/iso/c/2024/uint64.json
diff --git a/schemas/2020-12/iso/c/2024/uint8.json b/schemas/iso/c/2024/uint8.json
similarity index 100%
rename from schemas/2020-12/iso/c/2024/uint8.json
rename to schemas/iso/c/2024/uint8.json
diff --git a/schemas/2020-12/iso/coordinate/2022/altitude.json b/schemas/iso/coordinate/2022/altitude.json
similarity index 100%
rename from schemas/2020-12/iso/coordinate/2022/altitude.json
rename to schemas/iso/coordinate/2022/altitude.json
diff --git a/schemas/2020-12/iso/coordinate/2022/latitude.json b/schemas/iso/coordinate/2022/latitude.json
similarity index 100%
rename from schemas/2020-12/iso/coordinate/2022/latitude.json
rename to schemas/iso/coordinate/2022/latitude.json
diff --git a/schemas/2020-12/iso/coordinate/2022/longitude.json b/schemas/iso/coordinate/2022/longitude.json
similarity index 100%
rename from schemas/2020-12/iso/coordinate/2022/longitude.json
rename to schemas/iso/coordinate/2022/longitude.json
diff --git a/schemas/2020-12/iso/country/2020/alpha-2.json b/schemas/iso/country/2020/alpha-2.json
similarity index 100%
rename from schemas/2020-12/iso/country/2020/alpha-2.json
rename to schemas/iso/country/2020/alpha-2.json
diff --git a/schemas/2020-12/iso/country/2020/alpha-3.json b/schemas/iso/country/2020/alpha-3.json
similarity index 100%
rename from schemas/2020-12/iso/country/2020/alpha-3.json
rename to schemas/iso/country/2020/alpha-3.json
diff --git a/schemas/2020-12/iso/country/2020/alpha-all.json b/schemas/iso/country/2020/alpha-all.json
similarity index 100%
rename from schemas/2020-12/iso/country/2020/alpha-all.json
rename to schemas/iso/country/2020/alpha-all.json
diff --git a/schemas/2020-12/iso/country/2020/numeric.json b/schemas/iso/country/2020/numeric.json
similarity index 100%
rename from schemas/2020-12/iso/country/2020/numeric.json
rename to schemas/iso/country/2020/numeric.json
diff --git a/schemas/2020-12/iso/currency/2015/alpha-code.json b/schemas/iso/currency/2015/alpha-code.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/alpha-code.json
rename to schemas/iso/currency/2015/alpha-code.json
diff --git a/schemas/2020-12/iso/currency/2015/alpha-currency.json b/schemas/iso/currency/2015/alpha-currency.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/alpha-currency.json
rename to schemas/iso/currency/2015/alpha-currency.json
diff --git a/schemas/2020-12/iso/currency/2015/alpha-fund.json b/schemas/iso/currency/2015/alpha-fund.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/alpha-fund.json
rename to schemas/iso/currency/2015/alpha-fund.json
diff --git a/schemas/2020-12/iso/currency/2015/alpha-precious-metal.json b/schemas/iso/currency/2015/alpha-precious-metal.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/alpha-precious-metal.json
rename to schemas/iso/currency/2015/alpha-precious-metal.json
diff --git a/schemas/2020-12/iso/currency/2015/alpha-test.json b/schemas/iso/currency/2015/alpha-test.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/alpha-test.json
rename to schemas/iso/currency/2015/alpha-test.json
diff --git a/schemas/2020-12/iso/currency/2015/alpha-unknown.json b/schemas/iso/currency/2015/alpha-unknown.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/alpha-unknown.json
rename to schemas/iso/currency/2015/alpha-unknown.json
diff --git a/schemas/2020-12/iso/currency/2015/historical/alpha-code.json b/schemas/iso/currency/2015/historical/alpha-code.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/historical/alpha-code.json
rename to schemas/iso/currency/2015/historical/alpha-code.json
diff --git a/schemas/2020-12/iso/currency/2015/historical/alpha-currency.json b/schemas/iso/currency/2015/historical/alpha-currency.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/historical/alpha-currency.json
rename to schemas/iso/currency/2015/historical/alpha-currency.json
diff --git a/schemas/2020-12/iso/currency/2015/historical/numeric-code.json b/schemas/iso/currency/2015/historical/numeric-code.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/historical/numeric-code.json
rename to schemas/iso/currency/2015/historical/numeric-code.json
diff --git a/schemas/2020-12/iso/currency/2015/historical/numeric-currency.json b/schemas/iso/currency/2015/historical/numeric-currency.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/historical/numeric-currency.json
rename to schemas/iso/currency/2015/historical/numeric-currency.json
diff --git a/schemas/2020-12/iso/currency/2015/numeric-code-additional.json b/schemas/iso/currency/2015/numeric-code-additional.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/numeric-code-additional.json
rename to schemas/iso/currency/2015/numeric-code-additional.json
diff --git a/schemas/2020-12/iso/currency/2015/numeric-code.json b/schemas/iso/currency/2015/numeric-code.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/numeric-code.json
rename to schemas/iso/currency/2015/numeric-code.json
diff --git a/schemas/2020-12/iso/currency/2015/numeric-currency.json b/schemas/iso/currency/2015/numeric-currency.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/numeric-currency.json
rename to schemas/iso/currency/2015/numeric-currency.json
diff --git a/schemas/2020-12/iso/currency/2015/numeric-fund.json b/schemas/iso/currency/2015/numeric-fund.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/numeric-fund.json
rename to schemas/iso/currency/2015/numeric-fund.json
diff --git a/schemas/2020-12/iso/currency/2015/numeric-precious-metal.json b/schemas/iso/currency/2015/numeric-precious-metal.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/numeric-precious-metal.json
rename to schemas/iso/currency/2015/numeric-precious-metal.json
diff --git a/schemas/2020-12/iso/currency/2015/numeric-test.json b/schemas/iso/currency/2015/numeric-test.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/numeric-test.json
rename to schemas/iso/currency/2015/numeric-test.json
diff --git a/schemas/2020-12/iso/currency/2015/numeric-unknown.json b/schemas/iso/currency/2015/numeric-unknown.json
similarity index 100%
rename from schemas/2020-12/iso/currency/2015/numeric-unknown.json
rename to schemas/iso/currency/2015/numeric-unknown.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/calendar-basic.json b/schemas/iso/datetime/2019/date/calendar-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/calendar-basic.json
rename to schemas/iso/datetime/2019/date/calendar-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/calendar-century.json b/schemas/iso/datetime/2019/date/calendar-century.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/calendar-century.json
rename to schemas/iso/datetime/2019/date/calendar-century.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/calendar-decade.json b/schemas/iso/datetime/2019/date/calendar-decade.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/calendar-decade.json
rename to schemas/iso/datetime/2019/date/calendar-decade.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/calendar-expanded-basic.json b/schemas/iso/datetime/2019/date/calendar-expanded-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/calendar-expanded-basic.json
rename to schemas/iso/datetime/2019/date/calendar-expanded-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/calendar-expanded-century.json b/schemas/iso/datetime/2019/date/calendar-expanded-century.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/calendar-expanded-century.json
rename to schemas/iso/datetime/2019/date/calendar-expanded-century.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/calendar-expanded-decade.json b/schemas/iso/datetime/2019/date/calendar-expanded-decade.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/calendar-expanded-decade.json
rename to schemas/iso/datetime/2019/date/calendar-expanded-decade.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/calendar-expanded-extended.json b/schemas/iso/datetime/2019/date/calendar-expanded-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/calendar-expanded-extended.json
rename to schemas/iso/datetime/2019/date/calendar-expanded-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/calendar-expanded-month.json b/schemas/iso/datetime/2019/date/calendar-expanded-month.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/calendar-expanded-month.json
rename to schemas/iso/datetime/2019/date/calendar-expanded-month.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/calendar-expanded-year.json b/schemas/iso/datetime/2019/date/calendar-expanded-year.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/calendar-expanded-year.json
rename to schemas/iso/datetime/2019/date/calendar-expanded-year.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/calendar-extended.json b/schemas/iso/datetime/2019/date/calendar-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/calendar-extended.json
rename to schemas/iso/datetime/2019/date/calendar-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/calendar-month.json b/schemas/iso/datetime/2019/date/calendar-month.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/calendar-month.json
rename to schemas/iso/datetime/2019/date/calendar-month.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/calendar-year.json b/schemas/iso/datetime/2019/date/calendar-year.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/calendar-year.json
rename to schemas/iso/datetime/2019/date/calendar-year.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/ordinal-basic.json b/schemas/iso/datetime/2019/date/ordinal-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/ordinal-basic.json
rename to schemas/iso/datetime/2019/date/ordinal-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/ordinal-expanded-basic.json b/schemas/iso/datetime/2019/date/ordinal-expanded-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/ordinal-expanded-basic.json
rename to schemas/iso/datetime/2019/date/ordinal-expanded-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/ordinal-expanded-extended.json b/schemas/iso/datetime/2019/date/ordinal-expanded-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/ordinal-expanded-extended.json
rename to schemas/iso/datetime/2019/date/ordinal-expanded-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/ordinal-extended.json b/schemas/iso/datetime/2019/date/ordinal-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/ordinal-extended.json
rename to schemas/iso/datetime/2019/date/ordinal-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/week-basic.json b/schemas/iso/datetime/2019/date/week-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/week-basic.json
rename to schemas/iso/datetime/2019/date/week-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/week-expanded-basic.json b/schemas/iso/datetime/2019/date/week-expanded-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/week-expanded-basic.json
rename to schemas/iso/datetime/2019/date/week-expanded-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/week-expanded-extended.json b/schemas/iso/datetime/2019/date/week-expanded-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/week-expanded-extended.json
rename to schemas/iso/datetime/2019/date/week-expanded-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/week-expanded-reduced-basic.json b/schemas/iso/datetime/2019/date/week-expanded-reduced-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/week-expanded-reduced-basic.json
rename to schemas/iso/datetime/2019/date/week-expanded-reduced-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/week-expanded-reduced-extended.json b/schemas/iso/datetime/2019/date/week-expanded-reduced-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/week-expanded-reduced-extended.json
rename to schemas/iso/datetime/2019/date/week-expanded-reduced-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/week-extended.json b/schemas/iso/datetime/2019/date/week-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/week-extended.json
rename to schemas/iso/datetime/2019/date/week-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/week-reduced-basic.json b/schemas/iso/datetime/2019/date/week-reduced-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/week-reduced-basic.json
rename to schemas/iso/datetime/2019/date/week-reduced-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/date/week-reduced-extended.json b/schemas/iso/datetime/2019/date/week-reduced-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/date/week-reduced-extended.json
rename to schemas/iso/datetime/2019/date/week-reduced-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/calendar-basic.json b/schemas/iso/datetime/2019/datetime/calendar-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/calendar-basic.json
rename to schemas/iso/datetime/2019/datetime/calendar-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/calendar-extended.json b/schemas/iso/datetime/2019/datetime/calendar-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/calendar-extended.json
rename to schemas/iso/datetime/2019/datetime/calendar-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/calendar-minute-basic.json b/schemas/iso/datetime/2019/datetime/calendar-minute-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/calendar-minute-basic.json
rename to schemas/iso/datetime/2019/datetime/calendar-minute-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/calendar-minute-extended.json b/schemas/iso/datetime/2019/datetime/calendar-minute-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/calendar-minute-extended.json
rename to schemas/iso/datetime/2019/datetime/calendar-minute-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/calendar-shift-basic.json b/schemas/iso/datetime/2019/datetime/calendar-shift-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/calendar-shift-basic.json
rename to schemas/iso/datetime/2019/datetime/calendar-shift-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/calendar-shift-extended.json b/schemas/iso/datetime/2019/datetime/calendar-shift-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/calendar-shift-extended.json
rename to schemas/iso/datetime/2019/datetime/calendar-shift-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/calendar-shifthour-basic.json b/schemas/iso/datetime/2019/datetime/calendar-shifthour-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/calendar-shifthour-basic.json
rename to schemas/iso/datetime/2019/datetime/calendar-shifthour-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/calendar-shifthour-extended.json b/schemas/iso/datetime/2019/datetime/calendar-shifthour-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/calendar-shifthour-extended.json
rename to schemas/iso/datetime/2019/datetime/calendar-shifthour-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/calendar-utc-basic.json b/schemas/iso/datetime/2019/datetime/calendar-utc-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/calendar-utc-basic.json
rename to schemas/iso/datetime/2019/datetime/calendar-utc-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/calendar-utc-extended.json b/schemas/iso/datetime/2019/datetime/calendar-utc-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/calendar-utc-extended.json
rename to schemas/iso/datetime/2019/datetime/calendar-utc-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/ordinal-basic.json b/schemas/iso/datetime/2019/datetime/ordinal-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/ordinal-basic.json
rename to schemas/iso/datetime/2019/datetime/ordinal-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/ordinal-extended.json b/schemas/iso/datetime/2019/datetime/ordinal-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/ordinal-extended.json
rename to schemas/iso/datetime/2019/datetime/ordinal-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/ordinal-minute-utc-basic.json b/schemas/iso/datetime/2019/datetime/ordinal-minute-utc-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/ordinal-minute-utc-basic.json
rename to schemas/iso/datetime/2019/datetime/ordinal-minute-utc-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/ordinal-minute-utc-extended.json b/schemas/iso/datetime/2019/datetime/ordinal-minute-utc-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/ordinal-minute-utc-extended.json
rename to schemas/iso/datetime/2019/datetime/ordinal-minute-utc-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/ordinal-shift-basic.json b/schemas/iso/datetime/2019/datetime/ordinal-shift-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/ordinal-shift-basic.json
rename to schemas/iso/datetime/2019/datetime/ordinal-shift-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/ordinal-shift-extended.json b/schemas/iso/datetime/2019/datetime/ordinal-shift-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/ordinal-shift-extended.json
rename to schemas/iso/datetime/2019/datetime/ordinal-shift-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/ordinal-shifthour-basic.json b/schemas/iso/datetime/2019/datetime/ordinal-shifthour-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/ordinal-shifthour-basic.json
rename to schemas/iso/datetime/2019/datetime/ordinal-shifthour-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/ordinal-shifthour-extended.json b/schemas/iso/datetime/2019/datetime/ordinal-shifthour-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/ordinal-shifthour-extended.json
rename to schemas/iso/datetime/2019/datetime/ordinal-shifthour-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/ordinal-utc-basic.json b/schemas/iso/datetime/2019/datetime/ordinal-utc-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/ordinal-utc-basic.json
rename to schemas/iso/datetime/2019/datetime/ordinal-utc-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/ordinal-utc-extended.json b/schemas/iso/datetime/2019/datetime/ordinal-utc-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/ordinal-utc-extended.json
rename to schemas/iso/datetime/2019/datetime/ordinal-utc-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/week-basic.json b/schemas/iso/datetime/2019/datetime/week-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/week-basic.json
rename to schemas/iso/datetime/2019/datetime/week-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/week-extended.json b/schemas/iso/datetime/2019/datetime/week-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/week-extended.json
rename to schemas/iso/datetime/2019/datetime/week-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/week-minute-shift-basic.json b/schemas/iso/datetime/2019/datetime/week-minute-shift-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/week-minute-shift-basic.json
rename to schemas/iso/datetime/2019/datetime/week-minute-shift-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/week-minute-shift-extended.json b/schemas/iso/datetime/2019/datetime/week-minute-shift-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/week-minute-shift-extended.json
rename to schemas/iso/datetime/2019/datetime/week-minute-shift-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/week-shift-basic.json b/schemas/iso/datetime/2019/datetime/week-shift-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/week-shift-basic.json
rename to schemas/iso/datetime/2019/datetime/week-shift-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/week-shift-extended.json b/schemas/iso/datetime/2019/datetime/week-shift-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/week-shift-extended.json
rename to schemas/iso/datetime/2019/datetime/week-shift-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/week-shifthour-basic.json b/schemas/iso/datetime/2019/datetime/week-shifthour-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/week-shifthour-basic.json
rename to schemas/iso/datetime/2019/datetime/week-shifthour-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/week-shifthour-extended.json b/schemas/iso/datetime/2019/datetime/week-shifthour-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/week-shifthour-extended.json
rename to schemas/iso/datetime/2019/datetime/week-shifthour-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/week-utc-basic.json b/schemas/iso/datetime/2019/datetime/week-utc-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/week-utc-basic.json
rename to schemas/iso/datetime/2019/datetime/week-utc-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/datetime/week-utc-extended.json b/schemas/iso/datetime/2019/datetime/week-utc-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/datetime/week-utc-extended.json
rename to schemas/iso/datetime/2019/datetime/week-utc-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/duration/calendar-basic.json b/schemas/iso/datetime/2019/duration/calendar-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/duration/calendar-basic.json
rename to schemas/iso/datetime/2019/duration/calendar-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/duration/calendar-extended.json b/schemas/iso/datetime/2019/duration/calendar-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/duration/calendar-extended.json
rename to schemas/iso/datetime/2019/duration/calendar-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/duration/designator-extension.json b/schemas/iso/datetime/2019/duration/designator-extension.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/duration/designator-extension.json
rename to schemas/iso/datetime/2019/duration/designator-extension.json
diff --git a/schemas/2020-12/iso/datetime/2019/duration/designator.json b/schemas/iso/datetime/2019/duration/designator.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/duration/designator.json
rename to schemas/iso/datetime/2019/duration/designator.json
diff --git a/schemas/2020-12/iso/datetime/2019/duration/ordinal-basic.json b/schemas/iso/datetime/2019/duration/ordinal-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/duration/ordinal-basic.json
rename to schemas/iso/datetime/2019/duration/ordinal-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/duration/ordinal-extended.json b/schemas/iso/datetime/2019/duration/ordinal-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/duration/ordinal-extended.json
rename to schemas/iso/datetime/2019/duration/ordinal-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/duration/weeks.json b/schemas/iso/datetime/2019/duration/weeks.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/duration/weeks.json
rename to schemas/iso/datetime/2019/duration/weeks.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/duration-end-calendar-basic.json b/schemas/iso/datetime/2019/interval/duration-end-calendar-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/duration-end-calendar-basic.json
rename to schemas/iso/datetime/2019/interval/duration-end-calendar-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/duration-end-calendar-extended.json b/schemas/iso/datetime/2019/interval/duration-end-calendar-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/duration-end-calendar-extended.json
rename to schemas/iso/datetime/2019/interval/duration-end-calendar-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/duration-end-ordinal-basic.json b/schemas/iso/datetime/2019/interval/duration-end-ordinal-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/duration-end-ordinal-basic.json
rename to schemas/iso/datetime/2019/interval/duration-end-ordinal-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/duration-end-ordinal-extended.json b/schemas/iso/datetime/2019/interval/duration-end-ordinal-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/duration-end-ordinal-extended.json
rename to schemas/iso/datetime/2019/interval/duration-end-ordinal-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/duration-end-week-basic.json b/schemas/iso/datetime/2019/interval/duration-end-week-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/duration-end-week-basic.json
rename to schemas/iso/datetime/2019/interval/duration-end-week-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/duration-end-week-extended.json b/schemas/iso/datetime/2019/interval/duration-end-week-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/duration-end-week-extended.json
rename to schemas/iso/datetime/2019/interval/duration-end-week-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/start-duration-calendar-basic.json b/schemas/iso/datetime/2019/interval/start-duration-calendar-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/start-duration-calendar-basic.json
rename to schemas/iso/datetime/2019/interval/start-duration-calendar-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/start-duration-calendar-extended.json b/schemas/iso/datetime/2019/interval/start-duration-calendar-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/start-duration-calendar-extended.json
rename to schemas/iso/datetime/2019/interval/start-duration-calendar-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/start-duration-ordinal-basic.json b/schemas/iso/datetime/2019/interval/start-duration-ordinal-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/start-duration-ordinal-basic.json
rename to schemas/iso/datetime/2019/interval/start-duration-ordinal-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/start-duration-ordinal-extended.json b/schemas/iso/datetime/2019/interval/start-duration-ordinal-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/start-duration-ordinal-extended.json
rename to schemas/iso/datetime/2019/interval/start-duration-ordinal-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/start-duration-week-basic.json b/schemas/iso/datetime/2019/interval/start-duration-week-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/start-duration-week-basic.json
rename to schemas/iso/datetime/2019/interval/start-duration-week-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/start-duration-week-extended.json b/schemas/iso/datetime/2019/interval/start-duration-week-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/start-duration-week-extended.json
rename to schemas/iso/datetime/2019/interval/start-duration-week-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/start-end-calendar-basic.json b/schemas/iso/datetime/2019/interval/start-end-calendar-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/start-end-calendar-basic.json
rename to schemas/iso/datetime/2019/interval/start-end-calendar-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/start-end-calendar-extended.json b/schemas/iso/datetime/2019/interval/start-end-calendar-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/start-end-calendar-extended.json
rename to schemas/iso/datetime/2019/interval/start-end-calendar-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/start-end-ordinal-basic.json b/schemas/iso/datetime/2019/interval/start-end-ordinal-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/start-end-ordinal-basic.json
rename to schemas/iso/datetime/2019/interval/start-end-ordinal-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/start-end-ordinal-extended.json b/schemas/iso/datetime/2019/interval/start-end-ordinal-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/start-end-ordinal-extended.json
rename to schemas/iso/datetime/2019/interval/start-end-ordinal-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/start-end-week-basic.json b/schemas/iso/datetime/2019/interval/start-end-week-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/start-end-week-basic.json
rename to schemas/iso/datetime/2019/interval/start-end-week-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/interval/start-end-week-extended.json b/schemas/iso/datetime/2019/interval/start-end-week-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/interval/start-end-week-extended.json
rename to schemas/iso/datetime/2019/interval/start-end-week-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/duration-end-calendar-basic.json b/schemas/iso/datetime/2019/recurring/duration-end-calendar-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/duration-end-calendar-basic.json
rename to schemas/iso/datetime/2019/recurring/duration-end-calendar-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/duration-end-calendar-extended.json b/schemas/iso/datetime/2019/recurring/duration-end-calendar-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/duration-end-calendar-extended.json
rename to schemas/iso/datetime/2019/recurring/duration-end-calendar-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/duration-end-ordinal-basic.json b/schemas/iso/datetime/2019/recurring/duration-end-ordinal-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/duration-end-ordinal-basic.json
rename to schemas/iso/datetime/2019/recurring/duration-end-ordinal-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/duration-end-ordinal-extended.json b/schemas/iso/datetime/2019/recurring/duration-end-ordinal-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/duration-end-ordinal-extended.json
rename to schemas/iso/datetime/2019/recurring/duration-end-ordinal-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/duration-end-week-basic.json b/schemas/iso/datetime/2019/recurring/duration-end-week-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/duration-end-week-basic.json
rename to schemas/iso/datetime/2019/recurring/duration-end-week-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/duration-end-week-extended.json b/schemas/iso/datetime/2019/recurring/duration-end-week-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/duration-end-week-extended.json
rename to schemas/iso/datetime/2019/recurring/duration-end-week-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/start-duration-calendar-basic.json b/schemas/iso/datetime/2019/recurring/start-duration-calendar-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/start-duration-calendar-basic.json
rename to schemas/iso/datetime/2019/recurring/start-duration-calendar-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/start-duration-calendar-extended.json b/schemas/iso/datetime/2019/recurring/start-duration-calendar-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/start-duration-calendar-extended.json
rename to schemas/iso/datetime/2019/recurring/start-duration-calendar-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/start-duration-ordinal-basic.json b/schemas/iso/datetime/2019/recurring/start-duration-ordinal-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/start-duration-ordinal-basic.json
rename to schemas/iso/datetime/2019/recurring/start-duration-ordinal-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/start-duration-ordinal-extended.json b/schemas/iso/datetime/2019/recurring/start-duration-ordinal-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/start-duration-ordinal-extended.json
rename to schemas/iso/datetime/2019/recurring/start-duration-ordinal-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/start-duration-week-basic.json b/schemas/iso/datetime/2019/recurring/start-duration-week-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/start-duration-week-basic.json
rename to schemas/iso/datetime/2019/recurring/start-duration-week-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/start-duration-week-extended.json b/schemas/iso/datetime/2019/recurring/start-duration-week-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/start-duration-week-extended.json
rename to schemas/iso/datetime/2019/recurring/start-duration-week-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/start-end-calendar-basic.json b/schemas/iso/datetime/2019/recurring/start-end-calendar-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/start-end-calendar-basic.json
rename to schemas/iso/datetime/2019/recurring/start-end-calendar-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/start-end-calendar-extended.json b/schemas/iso/datetime/2019/recurring/start-end-calendar-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/start-end-calendar-extended.json
rename to schemas/iso/datetime/2019/recurring/start-end-calendar-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/start-end-ordinal-basic.json b/schemas/iso/datetime/2019/recurring/start-end-ordinal-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/start-end-ordinal-basic.json
rename to schemas/iso/datetime/2019/recurring/start-end-ordinal-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/start-end-ordinal-extended.json b/schemas/iso/datetime/2019/recurring/start-end-ordinal-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/start-end-ordinal-extended.json
rename to schemas/iso/datetime/2019/recurring/start-end-ordinal-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/start-end-week-basic.json b/schemas/iso/datetime/2019/recurring/start-end-week-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/start-end-week-basic.json
rename to schemas/iso/datetime/2019/recurring/start-end-week-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/recurring/start-end-week-extended.json b/schemas/iso/datetime/2019/recurring/start-end-week-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/recurring/start-end-week-extended.json
rename to schemas/iso/datetime/2019/recurring/start-end-week-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/beginning-day-basic.json b/schemas/iso/datetime/2019/time/beginning-day-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/beginning-day-basic.json
rename to schemas/iso/datetime/2019/time/beginning-day-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/beginning-day-extended.json b/schemas/iso/datetime/2019/time/beginning-day-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/beginning-day-extended.json
rename to schemas/iso/datetime/2019/time/beginning-day-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/decimal-hour-basic.json b/schemas/iso/datetime/2019/time/decimal-hour-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/decimal-hour-basic.json
rename to schemas/iso/datetime/2019/time/decimal-hour-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/decimal-minute-basic.json b/schemas/iso/datetime/2019/time/decimal-minute-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/decimal-minute-basic.json
rename to schemas/iso/datetime/2019/time/decimal-minute-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/decimal-minute-extended.json b/schemas/iso/datetime/2019/time/decimal-minute-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/decimal-minute-extended.json
rename to schemas/iso/datetime/2019/time/decimal-minute-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/decimal-second-basic.json b/schemas/iso/datetime/2019/time/decimal-second-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/decimal-second-basic.json
rename to schemas/iso/datetime/2019/time/decimal-second-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/decimal-second-extended.json b/schemas/iso/datetime/2019/time/decimal-second-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/decimal-second-extended.json
rename to schemas/iso/datetime/2019/time/decimal-second-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/hour-basic.json b/schemas/iso/datetime/2019/time/hour-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/hour-basic.json
rename to schemas/iso/datetime/2019/time/hour-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/hour-minute-basic.json b/schemas/iso/datetime/2019/time/hour-minute-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/hour-minute-basic.json
rename to schemas/iso/datetime/2019/time/hour-minute-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/hour-minute-extended.json b/schemas/iso/datetime/2019/time/hour-minute-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/hour-minute-extended.json
rename to schemas/iso/datetime/2019/time/hour-minute-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/local-day-basic.json b/schemas/iso/datetime/2019/time/local-day-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/local-day-basic.json
rename to schemas/iso/datetime/2019/time/local-day-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/local-day-extended.json b/schemas/iso/datetime/2019/time/local-day-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/local-day-extended.json
rename to schemas/iso/datetime/2019/time/local-day-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/local-day-shift-basic.json b/schemas/iso/datetime/2019/time/local-day-shift-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/local-day-shift-basic.json
rename to schemas/iso/datetime/2019/time/local-day-shift-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/local-day-shift-extended.json b/schemas/iso/datetime/2019/time/local-day-shift-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/local-day-shift-extended.json
rename to schemas/iso/datetime/2019/time/local-day-shift-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/shift-basic.json b/schemas/iso/datetime/2019/time/shift-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/shift-basic.json
rename to schemas/iso/datetime/2019/time/shift-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/shift-extended.json b/schemas/iso/datetime/2019/time/shift-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/shift-extended.json
rename to schemas/iso/datetime/2019/time/shift-extended.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/utc-day-basic.json b/schemas/iso/datetime/2019/time/utc-day-basic.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/utc-day-basic.json
rename to schemas/iso/datetime/2019/time/utc-day-basic.json
diff --git a/schemas/2020-12/iso/datetime/2019/time/utc-day-extended.json b/schemas/iso/datetime/2019/time/utc-day-extended.json
similarity index 100%
rename from schemas/2020-12/iso/datetime/2019/time/utc-day-extended.json
rename to schemas/iso/datetime/2019/time/utc-day-extended.json
diff --git a/schemas/2020-12/iso/it/2015/byte.json b/schemas/iso/it/2015/byte.json
similarity index 100%
rename from schemas/2020-12/iso/it/2015/byte.json
rename to schemas/iso/it/2015/byte.json
diff --git a/schemas/2020-12/iso/language/2023/set-1.json b/schemas/iso/language/2023/set-1.json
similarity index 100%
rename from schemas/2020-12/iso/language/2023/set-1.json
rename to schemas/iso/language/2023/set-1.json
diff --git a/schemas/2020-12/iso/language/2023/set-2-bibliographic.json b/schemas/iso/language/2023/set-2-bibliographic.json
similarity index 100%
rename from schemas/2020-12/iso/language/2023/set-2-bibliographic.json
rename to schemas/iso/language/2023/set-2-bibliographic.json
diff --git a/schemas/2020-12/iso/language/2023/set-2-terminologic.json b/schemas/iso/language/2023/set-2-terminologic.json
similarity index 100%
rename from schemas/2020-12/iso/language/2023/set-2-terminologic.json
rename to schemas/iso/language/2023/set-2-terminologic.json
diff --git a/schemas/2020-12/iso/language/2023/set-3.json b/schemas/iso/language/2023/set-3.json
similarity index 100%
rename from schemas/2020-12/iso/language/2023/set-3.json
rename to schemas/iso/language/2023/set-3.json
diff --git a/schemas/2020-12/iso/language/2023/set-5.json b/schemas/iso/language/2023/set-5.json
similarity index 100%
rename from schemas/2020-12/iso/language/2023/set-5.json
rename to schemas/iso/language/2023/set-5.json
diff --git a/schemas/2020-12/iso/units/2022/percentage.json b/schemas/iso/units/2022/percentage.json
similarity index 100%
rename from schemas/2020-12/iso/units/2022/percentage.json
rename to schemas/iso/units/2022/percentage.json
diff --git a/schemas/2020-12/other/jsonrpc/v2.0/batch-request.json b/schemas/other/jsonrpc/v2.0/batch-request.json
similarity index 100%
rename from schemas/2020-12/other/jsonrpc/v2.0/batch-request.json
rename to schemas/other/jsonrpc/v2.0/batch-request.json
diff --git a/schemas/2020-12/other/jsonrpc/v2.0/batch-response.json b/schemas/other/jsonrpc/v2.0/batch-response.json
similarity index 100%
rename from schemas/2020-12/other/jsonrpc/v2.0/batch-response.json
rename to schemas/other/jsonrpc/v2.0/batch-response.json
diff --git a/schemas/2020-12/other/jsonrpc/v2.0/code-predefined.json b/schemas/other/jsonrpc/v2.0/code-predefined.json
similarity index 100%
rename from schemas/2020-12/other/jsonrpc/v2.0/code-predefined.json
rename to schemas/other/jsonrpc/v2.0/code-predefined.json
diff --git a/schemas/2020-12/other/jsonrpc/v2.0/code.json b/schemas/other/jsonrpc/v2.0/code.json
similarity index 100%
rename from schemas/2020-12/other/jsonrpc/v2.0/code.json
rename to schemas/other/jsonrpc/v2.0/code.json
diff --git a/schemas/2020-12/other/jsonrpc/v2.0/error.json b/schemas/other/jsonrpc/v2.0/error.json
similarity index 100%
rename from schemas/2020-12/other/jsonrpc/v2.0/error.json
rename to schemas/other/jsonrpc/v2.0/error.json
diff --git a/schemas/2020-12/other/jsonrpc/v2.0/identifier.json b/schemas/other/jsonrpc/v2.0/identifier.json
similarity index 100%
rename from schemas/2020-12/other/jsonrpc/v2.0/identifier.json
rename to schemas/other/jsonrpc/v2.0/identifier.json
diff --git a/schemas/2020-12/other/jsonrpc/v2.0/method-internal.json b/schemas/other/jsonrpc/v2.0/method-internal.json
similarity index 100%
rename from schemas/2020-12/other/jsonrpc/v2.0/method-internal.json
rename to schemas/other/jsonrpc/v2.0/method-internal.json
diff --git a/schemas/2020-12/other/jsonrpc/v2.0/method.json b/schemas/other/jsonrpc/v2.0/method.json
similarity index 100%
rename from schemas/2020-12/other/jsonrpc/v2.0/method.json
rename to schemas/other/jsonrpc/v2.0/method.json
diff --git a/schemas/2020-12/other/jsonrpc/v2.0/notification.json b/schemas/other/jsonrpc/v2.0/notification.json
similarity index 100%
rename from schemas/2020-12/other/jsonrpc/v2.0/notification.json
rename to schemas/other/jsonrpc/v2.0/notification.json
diff --git a/schemas/2020-12/other/jsonrpc/v2.0/parameters.json b/schemas/other/jsonrpc/v2.0/parameters.json
similarity index 100%
rename from schemas/2020-12/other/jsonrpc/v2.0/parameters.json
rename to schemas/other/jsonrpc/v2.0/parameters.json
diff --git a/schemas/2020-12/other/jsonrpc/v2.0/request.json b/schemas/other/jsonrpc/v2.0/request.json
similarity index 100%
rename from schemas/2020-12/other/jsonrpc/v2.0/request.json
rename to schemas/other/jsonrpc/v2.0/request.json
diff --git a/schemas/2020-12/other/jsonrpc/v2.0/response.json b/schemas/other/jsonrpc/v2.0/response.json
similarity index 100%
rename from schemas/2020-12/other/jsonrpc/v2.0/response.json
rename to schemas/other/jsonrpc/v2.0/response.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/any-uri.json b/schemas/w3c/xmlschema/2001/any-uri.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/any-uri.json
rename to schemas/w3c/xmlschema/2001/any-uri.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/base64-binary.json b/schemas/w3c/xmlschema/2001/base64-binary.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/base64-binary.json
rename to schemas/w3c/xmlschema/2001/base64-binary.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/boolean.json b/schemas/w3c/xmlschema/2001/boolean.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/boolean.json
rename to schemas/w3c/xmlschema/2001/boolean.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/byte.json b/schemas/w3c/xmlschema/2001/byte.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/byte.json
rename to schemas/w3c/xmlschema/2001/byte.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/date-time.json b/schemas/w3c/xmlschema/2001/date-time.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/date-time.json
rename to schemas/w3c/xmlschema/2001/date-time.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/date.json b/schemas/w3c/xmlschema/2001/date.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/date.json
rename to schemas/w3c/xmlschema/2001/date.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/decimal.json b/schemas/w3c/xmlschema/2001/decimal.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/decimal.json
rename to schemas/w3c/xmlschema/2001/decimal.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/double.json b/schemas/w3c/xmlschema/2001/double.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/double.json
rename to schemas/w3c/xmlschema/2001/double.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/duration.json b/schemas/w3c/xmlschema/2001/duration.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/duration.json
rename to schemas/w3c/xmlschema/2001/duration.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/entities.json b/schemas/w3c/xmlschema/2001/entities.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/entities.json
rename to schemas/w3c/xmlschema/2001/entities.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/entity.json b/schemas/w3c/xmlschema/2001/entity.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/entity.json
rename to schemas/w3c/xmlschema/2001/entity.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/float.json b/schemas/w3c/xmlschema/2001/float.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/float.json
rename to schemas/w3c/xmlschema/2001/float.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/g-day.json b/schemas/w3c/xmlschema/2001/g-day.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/g-day.json
rename to schemas/w3c/xmlschema/2001/g-day.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/g-month-day.json b/schemas/w3c/xmlschema/2001/g-month-day.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/g-month-day.json
rename to schemas/w3c/xmlschema/2001/g-month-day.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/g-month.json b/schemas/w3c/xmlschema/2001/g-month.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/g-month.json
rename to schemas/w3c/xmlschema/2001/g-month.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/g-year-month.json b/schemas/w3c/xmlschema/2001/g-year-month.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/g-year-month.json
rename to schemas/w3c/xmlschema/2001/g-year-month.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/g-year.json b/schemas/w3c/xmlschema/2001/g-year.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/g-year.json
rename to schemas/w3c/xmlschema/2001/g-year.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/hex-binary.json b/schemas/w3c/xmlschema/2001/hex-binary.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/hex-binary.json
rename to schemas/w3c/xmlschema/2001/hex-binary.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/id.json b/schemas/w3c/xmlschema/2001/id.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/id.json
rename to schemas/w3c/xmlschema/2001/id.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/idref.json b/schemas/w3c/xmlschema/2001/idref.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/idref.json
rename to schemas/w3c/xmlschema/2001/idref.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/idrefs.json b/schemas/w3c/xmlschema/2001/idrefs.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/idrefs.json
rename to schemas/w3c/xmlschema/2001/idrefs.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/int.json b/schemas/w3c/xmlschema/2001/int.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/int.json
rename to schemas/w3c/xmlschema/2001/int.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/integer.json b/schemas/w3c/xmlschema/2001/integer.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/integer.json
rename to schemas/w3c/xmlschema/2001/integer.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/language.json b/schemas/w3c/xmlschema/2001/language.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/language.json
rename to schemas/w3c/xmlschema/2001/language.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/long.json b/schemas/w3c/xmlschema/2001/long.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/long.json
rename to schemas/w3c/xmlschema/2001/long.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/name.json b/schemas/w3c/xmlschema/2001/name.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/name.json
rename to schemas/w3c/xmlschema/2001/name.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/ncname.json b/schemas/w3c/xmlschema/2001/ncname.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/ncname.json
rename to schemas/w3c/xmlschema/2001/ncname.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/negative-integer.json b/schemas/w3c/xmlschema/2001/negative-integer.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/negative-integer.json
rename to schemas/w3c/xmlschema/2001/negative-integer.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/nmtoken.json b/schemas/w3c/xmlschema/2001/nmtoken.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/nmtoken.json
rename to schemas/w3c/xmlschema/2001/nmtoken.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/nmtokens.json b/schemas/w3c/xmlschema/2001/nmtokens.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/nmtokens.json
rename to schemas/w3c/xmlschema/2001/nmtokens.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/non-negative-integer.json b/schemas/w3c/xmlschema/2001/non-negative-integer.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/non-negative-integer.json
rename to schemas/w3c/xmlschema/2001/non-negative-integer.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/non-positive-integer.json b/schemas/w3c/xmlschema/2001/non-positive-integer.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/non-positive-integer.json
rename to schemas/w3c/xmlschema/2001/non-positive-integer.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/normalized-string.json b/schemas/w3c/xmlschema/2001/normalized-string.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/normalized-string.json
rename to schemas/w3c/xmlschema/2001/normalized-string.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/notation.json b/schemas/w3c/xmlschema/2001/notation.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/notation.json
rename to schemas/w3c/xmlschema/2001/notation.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/positive-integer.json b/schemas/w3c/xmlschema/2001/positive-integer.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/positive-integer.json
rename to schemas/w3c/xmlschema/2001/positive-integer.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/qname.json b/schemas/w3c/xmlschema/2001/qname.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/qname.json
rename to schemas/w3c/xmlschema/2001/qname.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/short.json b/schemas/w3c/xmlschema/2001/short.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/short.json
rename to schemas/w3c/xmlschema/2001/short.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/string.json b/schemas/w3c/xmlschema/2001/string.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/string.json
rename to schemas/w3c/xmlschema/2001/string.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/time.json b/schemas/w3c/xmlschema/2001/time.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/time.json
rename to schemas/w3c/xmlschema/2001/time.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/token.json b/schemas/w3c/xmlschema/2001/token.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/token.json
rename to schemas/w3c/xmlschema/2001/token.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/unsigned-byte.json b/schemas/w3c/xmlschema/2001/unsigned-byte.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/unsigned-byte.json
rename to schemas/w3c/xmlschema/2001/unsigned-byte.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/unsigned-int.json b/schemas/w3c/xmlschema/2001/unsigned-int.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/unsigned-int.json
rename to schemas/w3c/xmlschema/2001/unsigned-int.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/unsigned-long.json b/schemas/w3c/xmlschema/2001/unsigned-long.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/unsigned-long.json
rename to schemas/w3c/xmlschema/2001/unsigned-long.json
diff --git a/schemas/2020-12/w3c/xmlschema/2001/unsigned-short.json b/schemas/w3c/xmlschema/2001/unsigned-short.json
similarity index 100%
rename from schemas/2020-12/w3c/xmlschema/2001/unsigned-short.json
rename to schemas/w3c/xmlschema/2001/unsigned-short.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/area-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/area-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/area-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/area-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/datetime-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/datetime-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/datetime-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/datetime-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/domain-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/domain-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/domain-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/domain-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/electric-charge-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/electric-charge-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/electric-charge-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/electric-charge-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/electric-current-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/electric-current-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/electric-current-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/electric-current-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/energy-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/energy-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/energy-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/energy-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/energy-per-monetary-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/energy-per-monetary-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/energy-per-monetary-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/energy-per-monetary-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/escaped-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/escaped-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/escaped-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/escaped-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/flow-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/flow-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/flow-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/flow-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/force-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/force-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/force-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/force-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/frequency-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/frequency-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/frequency-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/frequency-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/ghg-emissions-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/ghg-emissions-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/ghg-emissions-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/ghg-emissions-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/ghg-emissions-per-monetary-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/ghg-emissions-per-monetary-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/ghg-emissions-per-monetary-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/ghg-emissions-per-monetary-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/guidance-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/guidance-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/guidance-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/guidance-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/gyear-list-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/gyear-list-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/gyear-list-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/gyear-list-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/insolation-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/insolation-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/insolation-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/insolation-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/irradiance-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/irradiance-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/irradiance-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/irradiance-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/length-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/length-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/length-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/length-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/mass-flow-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/mass-flow-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/mass-flow-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/mass-flow-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/mass-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/mass-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/mass-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/mass-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/memory-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/memory-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/memory-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/memory-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-area-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/monetary-per-area-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-area-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/monetary-per-area-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-duration-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/monetary-per-duration-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-duration-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/monetary-per-duration-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-energy-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/monetary-per-energy-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-energy-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/monetary-per-energy-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-length-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/monetary-per-length-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-length-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/monetary-per-length-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-mass-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/monetary-per-mass-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-mass-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/monetary-per-mass-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-volume-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/monetary-per-volume-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-volume-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/monetary-per-volume-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/no-decimals-monetary-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/no-decimals-monetary-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/no-decimals-monetary-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/no-decimals-monetary-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/no-lang-string-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/no-lang-string-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/no-lang-string-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/no-lang-string-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/no-lang-token-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/no-lang-token-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/no-lang-token-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/no-lang-token-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/non-negative-monetary-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/non-negative-monetary-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/non-negative-monetary-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/non-negative-monetary-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/non-negative-no-decimals-monetary-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/non-negative-no-decimals-monetary-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/non-negative-no-decimals-monetary-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/non-negative-no-decimals-monetary-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/per-share-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/per-share-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/per-share-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/per-share-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/percent-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/percent-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/percent-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/percent-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/plane-angle-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/plane-angle-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/plane-angle-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/plane-angle-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/power-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/power-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/power-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/power-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/prefixed-content-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/prefixed-content-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/prefixed-content-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/prefixed-content-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/pressure-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/pressure-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/pressure-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/pressure-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/speed-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/speed-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/speed-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/speed-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/sqname-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/sqname-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/sqname-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/sqname-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/sqnames-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/sqnames-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/sqnames-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/sqnames-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/temperature-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/temperature-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/temperature-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/temperature-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/text-block-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/text-block-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/text-block-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/text-block-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/voltage-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/voltage-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/voltage-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/voltage-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/volume-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/volume-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/volume-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/volume-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/volume-per-monetary-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/volume-per-monetary-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/volume-per-monetary-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/volume-per-monetary-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/weight-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/weight-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/weight-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/weight-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/xml-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/xml-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/xml-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/xml-item-type.json
diff --git a/schemas/2020-12/xbrl/dtr/type/2024-01-31/xml-nodes-item-type.json b/schemas/xbrl/dtr/type/2024-01-31/xml-nodes-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/dtr/type/2024-01-31/xml-nodes-item-type.json
rename to schemas/xbrl/dtr/type/2024-01-31/xml-nodes-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/any-uri-item-type.json b/schemas/xbrl/instance/2003/any-uri-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/any-uri-item-type.json
rename to schemas/xbrl/instance/2003/any-uri-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/base64-binary-item-type.json b/schemas/xbrl/instance/2003/base64-binary-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/base64-binary-item-type.json
rename to schemas/xbrl/instance/2003/base64-binary-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/boolean-item-type.json b/schemas/xbrl/instance/2003/boolean-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/boolean-item-type.json
rename to schemas/xbrl/instance/2003/boolean-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/byte-item-type.json b/schemas/xbrl/instance/2003/byte-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/byte-item-type.json
rename to schemas/xbrl/instance/2003/byte-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/date-item-type.json b/schemas/xbrl/instance/2003/date-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/date-item-type.json
rename to schemas/xbrl/instance/2003/date-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/date-time-item-type.json b/schemas/xbrl/instance/2003/date-time-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/date-time-item-type.json
rename to schemas/xbrl/instance/2003/date-time-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/decimal-item-type.json b/schemas/xbrl/instance/2003/decimal-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/decimal-item-type.json
rename to schemas/xbrl/instance/2003/decimal-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/double-item-type.json b/schemas/xbrl/instance/2003/double-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/double-item-type.json
rename to schemas/xbrl/instance/2003/double-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/duration-item-type.json b/schemas/xbrl/instance/2003/duration-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/duration-item-type.json
rename to schemas/xbrl/instance/2003/duration-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/float-item-type.json b/schemas/xbrl/instance/2003/float-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/float-item-type.json
rename to schemas/xbrl/instance/2003/float-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/fraction-item-type.json b/schemas/xbrl/instance/2003/fraction-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/fraction-item-type.json
rename to schemas/xbrl/instance/2003/fraction-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/g-day-item-type.json b/schemas/xbrl/instance/2003/g-day-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/g-day-item-type.json
rename to schemas/xbrl/instance/2003/g-day-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/g-month-day-item-type.json b/schemas/xbrl/instance/2003/g-month-day-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/g-month-day-item-type.json
rename to schemas/xbrl/instance/2003/g-month-day-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/g-month-item-type.json b/schemas/xbrl/instance/2003/g-month-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/g-month-item-type.json
rename to schemas/xbrl/instance/2003/g-month-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/g-year-item-type.json b/schemas/xbrl/instance/2003/g-year-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/g-year-item-type.json
rename to schemas/xbrl/instance/2003/g-year-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/g-year-month-item-type.json b/schemas/xbrl/instance/2003/g-year-month-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/g-year-month-item-type.json
rename to schemas/xbrl/instance/2003/g-year-month-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/hex-binary-item-type.json b/schemas/xbrl/instance/2003/hex-binary-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/hex-binary-item-type.json
rename to schemas/xbrl/instance/2003/hex-binary-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/int-item-type.json b/schemas/xbrl/instance/2003/int-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/int-item-type.json
rename to schemas/xbrl/instance/2003/int-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/integer-item-type.json b/schemas/xbrl/instance/2003/integer-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/integer-item-type.json
rename to schemas/xbrl/instance/2003/integer-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/language-item-type.json b/schemas/xbrl/instance/2003/language-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/language-item-type.json
rename to schemas/xbrl/instance/2003/language-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/long-item-type.json b/schemas/xbrl/instance/2003/long-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/long-item-type.json
rename to schemas/xbrl/instance/2003/long-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/monetary-item-type.json b/schemas/xbrl/instance/2003/monetary-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/monetary-item-type.json
rename to schemas/xbrl/instance/2003/monetary-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/name-item-type.json b/schemas/xbrl/instance/2003/name-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/name-item-type.json
rename to schemas/xbrl/instance/2003/name-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/ncname-item-type.json b/schemas/xbrl/instance/2003/ncname-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/ncname-item-type.json
rename to schemas/xbrl/instance/2003/ncname-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/negative-integer-item-type.json b/schemas/xbrl/instance/2003/negative-integer-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/negative-integer-item-type.json
rename to schemas/xbrl/instance/2003/negative-integer-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/non-negative-integer-item-type.json b/schemas/xbrl/instance/2003/non-negative-integer-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/non-negative-integer-item-type.json
rename to schemas/xbrl/instance/2003/non-negative-integer-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/non-positive-integer-item-type.json b/schemas/xbrl/instance/2003/non-positive-integer-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/non-positive-integer-item-type.json
rename to schemas/xbrl/instance/2003/non-positive-integer-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/normalized-string-item-type.json b/schemas/xbrl/instance/2003/normalized-string-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/normalized-string-item-type.json
rename to schemas/xbrl/instance/2003/normalized-string-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/positive-integer-item-type.json b/schemas/xbrl/instance/2003/positive-integer-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/positive-integer-item-type.json
rename to schemas/xbrl/instance/2003/positive-integer-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/pure-item-type.json b/schemas/xbrl/instance/2003/pure-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/pure-item-type.json
rename to schemas/xbrl/instance/2003/pure-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/qname-item-type.json b/schemas/xbrl/instance/2003/qname-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/qname-item-type.json
rename to schemas/xbrl/instance/2003/qname-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/shares-item-type.json b/schemas/xbrl/instance/2003/shares-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/shares-item-type.json
rename to schemas/xbrl/instance/2003/shares-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/short-item-type.json b/schemas/xbrl/instance/2003/short-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/short-item-type.json
rename to schemas/xbrl/instance/2003/short-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/string-item-type.json b/schemas/xbrl/instance/2003/string-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/string-item-type.json
rename to schemas/xbrl/instance/2003/string-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/time-item-type.json b/schemas/xbrl/instance/2003/time-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/time-item-type.json
rename to schemas/xbrl/instance/2003/time-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/token-item-type.json b/schemas/xbrl/instance/2003/token-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/token-item-type.json
rename to schemas/xbrl/instance/2003/token-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/unsigned-byte-item-type.json b/schemas/xbrl/instance/2003/unsigned-byte-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/unsigned-byte-item-type.json
rename to schemas/xbrl/instance/2003/unsigned-byte-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/unsigned-int-item-type.json b/schemas/xbrl/instance/2003/unsigned-int-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/unsigned-int-item-type.json
rename to schemas/xbrl/instance/2003/unsigned-int-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/unsigned-long-item-type.json b/schemas/xbrl/instance/2003/unsigned-long-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/unsigned-long-item-type.json
rename to schemas/xbrl/instance/2003/unsigned-long-item-type.json
diff --git a/schemas/2020-12/xbrl/instance/2003/unsigned-short-item-type.json b/schemas/xbrl/instance/2003/unsigned-short-item-type.json
similarity index 100%
rename from schemas/2020-12/xbrl/instance/2003/unsigned-short-item-type.json
rename to schemas/xbrl/instance/2003/unsigned-short-item-type.json
diff --git a/schemas/2020-12/xbrl/utr/area-item-type-normative.json b/schemas/xbrl/utr/area-item-type-normative.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/area-item-type-normative.json
rename to schemas/xbrl/utr/area-item-type-normative.json
index 54e84d2f..e4661fb1 100644
--- a/schemas/2020-12/xbrl/utr/area-item-type-normative.json
+++ b/schemas/xbrl/utr/area-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "description": "Acre",
diff --git a/schemas/2020-12/xbrl/utr/area-item-type.json b/schemas/xbrl/utr/area-item-type.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/area-item-type.json
rename to schemas/xbrl/utr/area-item-type.json
index c329151c..f3d9135d 100644
--- a/schemas/2020-12/xbrl/utr/area-item-type.json
+++ b/schemas/xbrl/utr/area-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "description": "Acre",
diff --git a/schemas/2020-12/xbrl/utr/duration-item-type-normative.json b/schemas/xbrl/utr/duration-item-type-normative.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/duration-item-type-normative.json
rename to schemas/xbrl/utr/duration-item-type-normative.json
index f7fec0d7..6a672787 100644
--- a/schemas/2020-12/xbrl/utr/duration-item-type-normative.json
+++ b/schemas/xbrl/utr/duration-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Year",
diff --git a/schemas/2020-12/xbrl/utr/duration-item-type.json b/schemas/xbrl/utr/duration-item-type.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/duration-item-type.json
rename to schemas/xbrl/utr/duration-item-type.json
index a1219ac9..2c24dedf 100644
--- a/schemas/2020-12/xbrl/utr/duration-item-type.json
+++ b/schemas/xbrl/utr/duration-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Year",
diff --git a/schemas/2020-12/xbrl/utr/electric-charge-item-type-normative.json b/schemas/xbrl/utr/electric-charge-item-type-normative.json
similarity index 97%
rename from schemas/2020-12/xbrl/utr/electric-charge-item-type-normative.json
rename to schemas/xbrl/utr/electric-charge-item-type-normative.json
index 7a5de6f2..db5c84ab 100644
--- a/schemas/2020-12/xbrl/utr/electric-charge-item-type-normative.json
+++ b/schemas/xbrl/utr/electric-charge-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Ampere Hours",
diff --git a/schemas/2020-12/xbrl/utr/electric-charge-item-type.json b/schemas/xbrl/utr/electric-charge-item-type.json
similarity index 97%
rename from schemas/2020-12/xbrl/utr/electric-charge-item-type.json
rename to schemas/xbrl/utr/electric-charge-item-type.json
index 1dc6fc24..a14772f3 100644
--- a/schemas/2020-12/xbrl/utr/electric-charge-item-type.json
+++ b/schemas/xbrl/utr/electric-charge-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Ampere Hours",
diff --git a/schemas/2020-12/xbrl/utr/electric-current-item-type-normative.json b/schemas/xbrl/utr/electric-current-item-type-normative.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/electric-current-item-type-normative.json
rename to schemas/xbrl/utr/electric-current-item-type-normative.json
index 4ac0cfc2..4b783370 100644
--- a/schemas/2020-12/xbrl/utr/electric-current-item-type-normative.json
+++ b/schemas/xbrl/utr/electric-current-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "description": "Ampere",
diff --git a/schemas/2020-12/xbrl/utr/electric-current-item-type.json b/schemas/xbrl/utr/electric-current-item-type.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/electric-current-item-type.json
rename to schemas/xbrl/utr/electric-current-item-type.json
index bac09328..6feee7d6 100644
--- a/schemas/2020-12/xbrl/utr/electric-current-item-type.json
+++ b/schemas/xbrl/utr/electric-current-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "description": "Ampere",
diff --git a/schemas/2020-12/xbrl/utr/energy-item-type-normative.json b/schemas/xbrl/utr/energy-item-type-normative.json
similarity index 99%
rename from schemas/2020-12/xbrl/utr/energy-item-type-normative.json
rename to schemas/xbrl/utr/energy-item-type-normative.json
index 386836fd..d731c365 100644
--- a/schemas/2020-12/xbrl/utr/energy-item-type-normative.json
+++ b/schemas/xbrl/utr/energy-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "description": "Barrel of Oil Equivalent",
diff --git a/schemas/2020-12/xbrl/utr/energy-item-type.json b/schemas/xbrl/utr/energy-item-type.json
similarity index 99%
rename from schemas/2020-12/xbrl/utr/energy-item-type.json
rename to schemas/xbrl/utr/energy-item-type.json
index dd6d8bce..4e113216 100644
--- a/schemas/2020-12/xbrl/utr/energy-item-type.json
+++ b/schemas/xbrl/utr/energy-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "description": "Barrel of Oil Equivalent",
diff --git a/schemas/2020-12/xbrl/utr/energy-per-monetary-item-type-normative.json b/schemas/xbrl/utr/energy-per-monetary-item-type-normative.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/energy-per-monetary-item-type-normative.json
rename to schemas/xbrl/utr/energy-per-monetary-item-type-normative.json
index a2e91ddd..a5333185 100644
--- a/schemas/2020-12/xbrl/utr/energy-per-monetary-item-type-normative.json
+++ b/schemas/xbrl/utr/energy-per-monetary-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Energy/Monetary",
diff --git a/schemas/2020-12/xbrl/utr/energy-per-monetary-item-type.json b/schemas/xbrl/utr/energy-per-monetary-item-type.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/energy-per-monetary-item-type.json
rename to schemas/xbrl/utr/energy-per-monetary-item-type.json
index a6b655e5..ee3d8078 100644
--- a/schemas/2020-12/xbrl/utr/energy-per-monetary-item-type.json
+++ b/schemas/xbrl/utr/energy-per-monetary-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Energy/Monetary",
diff --git a/schemas/2020-12/xbrl/utr/flow-item-type-normative.json b/schemas/xbrl/utr/flow-item-type-normative.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/flow-item-type-normative.json
rename to schemas/xbrl/utr/flow-item-type-normative.json
index ed97ddd0..2bc77262 100644
--- a/schemas/2020-12/xbrl/utr/flow-item-type-normative.json
+++ b/schemas/xbrl/utr/flow-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Volume/Duration",
diff --git a/schemas/2020-12/xbrl/utr/flow-item-type.json b/schemas/xbrl/utr/flow-item-type.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/flow-item-type.json
rename to schemas/xbrl/utr/flow-item-type.json
index 9b24b6e9..889dd0d8 100644
--- a/schemas/2020-12/xbrl/utr/flow-item-type.json
+++ b/schemas/xbrl/utr/flow-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Volume/Duration",
diff --git a/schemas/2020-12/xbrl/utr/force-item-type-normative.json b/schemas/xbrl/utr/force-item-type-normative.json
similarity index 96%
rename from schemas/2020-12/xbrl/utr/force-item-type-normative.json
rename to schemas/xbrl/utr/force-item-type-normative.json
index d63a2bcf..236b93e0 100644
--- a/schemas/2020-12/xbrl/utr/force-item-type-normative.json
+++ b/schemas/xbrl/utr/force-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Newton",
diff --git a/schemas/2020-12/xbrl/utr/force-item-type.json b/schemas/xbrl/utr/force-item-type.json
similarity index 96%
rename from schemas/2020-12/xbrl/utr/force-item-type.json
rename to schemas/xbrl/utr/force-item-type.json
index 608d455b..21a79c5c 100644
--- a/schemas/2020-12/xbrl/utr/force-item-type.json
+++ b/schemas/xbrl/utr/force-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Newton",
diff --git a/schemas/2020-12/xbrl/utr/frequency-item-type-normative.json b/schemas/xbrl/utr/frequency-item-type-normative.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/frequency-item-type-normative.json
rename to schemas/xbrl/utr/frequency-item-type-normative.json
index 76e9afda..07c3eebd 100644
--- a/schemas/2020-12/xbrl/utr/frequency-item-type-normative.json
+++ b/schemas/xbrl/utr/frequency-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Hertz",
diff --git a/schemas/2020-12/xbrl/utr/frequency-item-type.json b/schemas/xbrl/utr/frequency-item-type.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/frequency-item-type.json
rename to schemas/xbrl/utr/frequency-item-type.json
index eff7a874..36ddf2a5 100644
--- a/schemas/2020-12/xbrl/utr/frequency-item-type.json
+++ b/schemas/xbrl/utr/frequency-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Hertz",
diff --git a/schemas/2020-12/xbrl/utr/ghg-emissions-item-type-normative.json b/schemas/xbrl/utr/ghg-emissions-item-type-normative.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/ghg-emissions-item-type-normative.json
rename to schemas/xbrl/utr/ghg-emissions-item-type-normative.json
index 1bb3f223..0f4e89ec 100644
--- a/schemas/2020-12/xbrl/utr/ghg-emissions-item-type-normative.json
+++ b/schemas/xbrl/utr/ghg-emissions-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Metric tonnes of CO2 equivalent",
diff --git a/schemas/2020-12/xbrl/utr/ghg-emissions-item-type.json b/schemas/xbrl/utr/ghg-emissions-item-type.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/ghg-emissions-item-type.json
rename to schemas/xbrl/utr/ghg-emissions-item-type.json
index fe1a9fd0..68cd7baf 100644
--- a/schemas/2020-12/xbrl/utr/ghg-emissions-item-type.json
+++ b/schemas/xbrl/utr/ghg-emissions-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Metric tonnes of CO2 equivalent",
diff --git a/schemas/2020-12/xbrl/utr/ghg-emissions-per-monetary-item-type-normative.json b/schemas/xbrl/utr/ghg-emissions-per-monetary-item-type-normative.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/ghg-emissions-per-monetary-item-type-normative.json
rename to schemas/xbrl/utr/ghg-emissions-per-monetary-item-type-normative.json
index e8e02e3e..f1b56346 100644
--- a/schemas/2020-12/xbrl/utr/ghg-emissions-per-monetary-item-type-normative.json
+++ b/schemas/xbrl/utr/ghg-emissions-per-monetary-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Emissions/Monetary",
diff --git a/schemas/2020-12/xbrl/utr/ghg-emissions-per-monetary-item-type.json b/schemas/xbrl/utr/ghg-emissions-per-monetary-item-type.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/ghg-emissions-per-monetary-item-type.json
rename to schemas/xbrl/utr/ghg-emissions-per-monetary-item-type.json
index f99dc1d6..8b9b968a 100644
--- a/schemas/2020-12/xbrl/utr/ghg-emissions-per-monetary-item-type.json
+++ b/schemas/xbrl/utr/ghg-emissions-per-monetary-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Emissions/Monetary",
diff --git a/schemas/2020-12/xbrl/utr/length-item-type-normative.json b/schemas/xbrl/utr/length-item-type-normative.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/length-item-type-normative.json
rename to schemas/xbrl/utr/length-item-type-normative.json
index d83f0b1b..9fa272f2 100644
--- a/schemas/2020-12/xbrl/utr/length-item-type-normative.json
+++ b/schemas/xbrl/utr/length-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Foot",
diff --git a/schemas/2020-12/xbrl/utr/length-item-type.json b/schemas/xbrl/utr/length-item-type.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/length-item-type.json
rename to schemas/xbrl/utr/length-item-type.json
index 1c422b61..a15b21d8 100644
--- a/schemas/2020-12/xbrl/utr/length-item-type.json
+++ b/schemas/xbrl/utr/length-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Foot",
diff --git a/schemas/2020-12/xbrl/utr/mass-item-type-normative.json b/schemas/xbrl/utr/mass-item-type-normative.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/mass-item-type-normative.json
rename to schemas/xbrl/utr/mass-item-type-normative.json
index 3a59da0e..92a18503 100644
--- a/schemas/2020-12/xbrl/utr/mass-item-type-normative.json
+++ b/schemas/xbrl/utr/mass-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Pound",
diff --git a/schemas/2020-12/xbrl/utr/mass-item-type.json b/schemas/xbrl/utr/mass-item-type.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/mass-item-type.json
rename to schemas/xbrl/utr/mass-item-type.json
index 8e99d6cb..8627a30a 100644
--- a/schemas/2020-12/xbrl/utr/mass-item-type.json
+++ b/schemas/xbrl/utr/mass-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Pound",
diff --git a/schemas/2020-12/xbrl/utr/memory-item-type-normative.json b/schemas/xbrl/utr/memory-item-type-normative.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/memory-item-type-normative.json
rename to schemas/xbrl/utr/memory-item-type-normative.json
index 6a26b680..fa774e9e 100644
--- a/schemas/2020-12/xbrl/utr/memory-item-type-normative.json
+++ b/schemas/xbrl/utr/memory-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Byte",
diff --git a/schemas/2020-12/xbrl/utr/memory-item-type.json b/schemas/xbrl/utr/memory-item-type.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/memory-item-type.json
rename to schemas/xbrl/utr/memory-item-type.json
index cf66ae08..d9242e44 100644
--- a/schemas/2020-12/xbrl/utr/memory-item-type.json
+++ b/schemas/xbrl/utr/memory-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Byte",
diff --git a/schemas/2020-12/xbrl/utr/monetary-item-type-normative.json b/schemas/xbrl/utr/monetary-item-type-normative.json
similarity index 99%
rename from schemas/2020-12/xbrl/utr/monetary-item-type-normative.json
rename to schemas/xbrl/utr/monetary-item-type-normative.json
index 93292f00..46cedde2 100644
--- a/schemas/2020-12/xbrl/utr/monetary-item-type-normative.json
+++ b/schemas/xbrl/utr/monetary-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "U.A.E. dirham",
diff --git a/schemas/2020-12/xbrl/utr/monetary-item-type.json b/schemas/xbrl/utr/monetary-item-type.json
similarity index 99%
rename from schemas/2020-12/xbrl/utr/monetary-item-type.json
rename to schemas/xbrl/utr/monetary-item-type.json
index 0ae6486c..b4b003ae 100644
--- a/schemas/2020-12/xbrl/utr/monetary-item-type.json
+++ b/schemas/xbrl/utr/monetary-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "U.A.E. dirham",
diff --git a/schemas/2020-12/xbrl/utr/per-share-item-type-normative.json b/schemas/xbrl/utr/per-share-item-type-normative.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/per-share-item-type-normative.json
rename to schemas/xbrl/utr/per-share-item-type-normative.json
index 0207540d..6cbd3e4e 100644
--- a/schemas/2020-12/xbrl/utr/per-share-item-type-normative.json
+++ b/schemas/xbrl/utr/per-share-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Monetary/share",
diff --git a/schemas/2020-12/xbrl/utr/per-share-item-type.json b/schemas/xbrl/utr/per-share-item-type.json
similarity index 94%
rename from schemas/2020-12/xbrl/utr/per-share-item-type.json
rename to schemas/xbrl/utr/per-share-item-type.json
index b68cd3aa..2e706349 100644
--- a/schemas/2020-12/xbrl/utr/per-share-item-type.json
+++ b/schemas/xbrl/utr/per-share-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Monetary/share",
diff --git a/schemas/2020-12/xbrl/utr/per-unit-item-type-normative.json b/schemas/xbrl/utr/per-unit-item-type-normative.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/per-unit-item-type-normative.json
rename to schemas/xbrl/utr/per-unit-item-type-normative.json
index b361de2f..697dad82 100644
--- a/schemas/2020-12/xbrl/utr/per-unit-item-type-normative.json
+++ b/schemas/xbrl/utr/per-unit-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Monetary/Decimal",
diff --git a/schemas/2020-12/xbrl/utr/per-unit-item-type.json b/schemas/xbrl/utr/per-unit-item-type.json
similarity index 94%
rename from schemas/2020-12/xbrl/utr/per-unit-item-type.json
rename to schemas/xbrl/utr/per-unit-item-type.json
index a6813084..f5d6047f 100644
--- a/schemas/2020-12/xbrl/utr/per-unit-item-type.json
+++ b/schemas/xbrl/utr/per-unit-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Monetary/Decimal",
diff --git a/schemas/2020-12/xbrl/utr/plane-angle-item-type-normative.json b/schemas/xbrl/utr/plane-angle-item-type-normative.json
similarity index 97%
rename from schemas/2020-12/xbrl/utr/plane-angle-item-type-normative.json
rename to schemas/xbrl/utr/plane-angle-item-type-normative.json
index d820c0eb..513652cd 100644
--- a/schemas/2020-12/xbrl/utr/plane-angle-item-type-normative.json
+++ b/schemas/xbrl/utr/plane-angle-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Degree",
diff --git a/schemas/2020-12/xbrl/utr/plane-angle-item-type.json b/schemas/xbrl/utr/plane-angle-item-type.json
similarity index 97%
rename from schemas/2020-12/xbrl/utr/plane-angle-item-type.json
rename to schemas/xbrl/utr/plane-angle-item-type.json
index 3bc807ac..4a61e9af 100644
--- a/schemas/2020-12/xbrl/utr/plane-angle-item-type.json
+++ b/schemas/xbrl/utr/plane-angle-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Degree",
diff --git a/schemas/2020-12/xbrl/utr/power-item-type-normative.json b/schemas/xbrl/utr/power-item-type-normative.json
similarity index 99%
rename from schemas/2020-12/xbrl/utr/power-item-type-normative.json
rename to schemas/xbrl/utr/power-item-type-normative.json
index 2260735b..8604044b 100644
--- a/schemas/2020-12/xbrl/utr/power-item-type-normative.json
+++ b/schemas/xbrl/utr/power-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Horsepower",
diff --git a/schemas/2020-12/xbrl/utr/power-item-type.json b/schemas/xbrl/utr/power-item-type.json
similarity index 99%
rename from schemas/2020-12/xbrl/utr/power-item-type.json
rename to schemas/xbrl/utr/power-item-type.json
index 9b17c58a..2c0a51b1 100644
--- a/schemas/2020-12/xbrl/utr/power-item-type.json
+++ b/schemas/xbrl/utr/power-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Horsepower",
diff --git a/schemas/2020-12/xbrl/utr/pressure-item-type-normative.json b/schemas/xbrl/utr/pressure-item-type-normative.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/pressure-item-type-normative.json
rename to schemas/xbrl/utr/pressure-item-type-normative.json
index 756dbe50..5b3e29d1 100644
--- a/schemas/2020-12/xbrl/utr/pressure-item-type-normative.json
+++ b/schemas/xbrl/utr/pressure-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Pascal",
diff --git a/schemas/2020-12/xbrl/utr/pressure-item-type.json b/schemas/xbrl/utr/pressure-item-type.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/pressure-item-type.json
rename to schemas/xbrl/utr/pressure-item-type.json
index a6705bc5..288f2f95 100644
--- a/schemas/2020-12/xbrl/utr/pressure-item-type.json
+++ b/schemas/xbrl/utr/pressure-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Pascal",
diff --git a/schemas/2020-12/xbrl/utr/pure-item-type-normative.json b/schemas/xbrl/utr/pure-item-type-normative.json
similarity index 96%
rename from schemas/2020-12/xbrl/utr/pure-item-type-normative.json
rename to schemas/xbrl/utr/pure-item-type-normative.json
index fd176e2d..28046203 100644
--- a/schemas/2020-12/xbrl/utr/pure-item-type-normative.json
+++ b/schemas/xbrl/utr/pure-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Monetary/Monetary",
diff --git a/schemas/2020-12/xbrl/utr/pure-item-type.json b/schemas/xbrl/utr/pure-item-type.json
similarity index 96%
rename from schemas/2020-12/xbrl/utr/pure-item-type.json
rename to schemas/xbrl/utr/pure-item-type.json
index 30cf2a34..16b25a16 100644
--- a/schemas/2020-12/xbrl/utr/pure-item-type.json
+++ b/schemas/xbrl/utr/pure-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Monetary/Monetary",
diff --git a/schemas/2020-12/xbrl/utr/shares-item-type-normative.json b/schemas/xbrl/utr/shares-item-type-normative.json
similarity index 94%
rename from schemas/2020-12/xbrl/utr/shares-item-type-normative.json
rename to schemas/xbrl/utr/shares-item-type-normative.json
index bf324bc0..372d126f 100644
--- a/schemas/2020-12/xbrl/utr/shares-item-type-normative.json
+++ b/schemas/xbrl/utr/shares-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Share",
diff --git a/schemas/2020-12/xbrl/utr/shares-item-type.json b/schemas/xbrl/utr/shares-item-type.json
similarity index 94%
rename from schemas/2020-12/xbrl/utr/shares-item-type.json
rename to schemas/xbrl/utr/shares-item-type.json
index 11dfb7fa..e4a12eca 100644
--- a/schemas/2020-12/xbrl/utr/shares-item-type.json
+++ b/schemas/xbrl/utr/shares-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Share",
diff --git a/schemas/2020-12/xbrl/utr/temperature-item-type-normative.json b/schemas/xbrl/utr/temperature-item-type-normative.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/temperature-item-type-normative.json
rename to schemas/xbrl/utr/temperature-item-type-normative.json
index 9e2a44e9..bea82f94 100644
--- a/schemas/2020-12/xbrl/utr/temperature-item-type-normative.json
+++ b/schemas/xbrl/utr/temperature-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Celsius",
diff --git a/schemas/2020-12/xbrl/utr/temperature-item-type.json b/schemas/xbrl/utr/temperature-item-type.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/temperature-item-type.json
rename to schemas/xbrl/utr/temperature-item-type.json
index b6d42e4e..ea3c662b 100644
--- a/schemas/2020-12/xbrl/utr/temperature-item-type.json
+++ b/schemas/xbrl/utr/temperature-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Celsius",
diff --git a/schemas/2020-12/xbrl/utr/voltage-item-type-normative.json b/schemas/xbrl/utr/voltage-item-type-normative.json
similarity index 97%
rename from schemas/2020-12/xbrl/utr/voltage-item-type-normative.json
rename to schemas/xbrl/utr/voltage-item-type-normative.json
index d57fe154..77276af4 100644
--- a/schemas/2020-12/xbrl/utr/voltage-item-type-normative.json
+++ b/schemas/xbrl/utr/voltage-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Volt",
diff --git a/schemas/2020-12/xbrl/utr/voltage-item-type.json b/schemas/xbrl/utr/voltage-item-type.json
similarity index 97%
rename from schemas/2020-12/xbrl/utr/voltage-item-type.json
rename to schemas/xbrl/utr/voltage-item-type.json
index cedbc86d..54b6d60d 100644
--- a/schemas/2020-12/xbrl/utr/voltage-item-type.json
+++ b/schemas/xbrl/utr/voltage-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Volt",
diff --git a/schemas/2020-12/xbrl/utr/volume-item-type-normative.json b/schemas/xbrl/utr/volume-item-type-normative.json
similarity index 98%
rename from schemas/2020-12/xbrl/utr/volume-item-type-normative.json
rename to schemas/xbrl/utr/volume-item-type-normative.json
index 758bcd18..b5ef5f68 100644
--- a/schemas/2020-12/xbrl/utr/volume-item-type-normative.json
+++ b/schemas/xbrl/utr/volume-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Barrel",
diff --git a/schemas/2020-12/xbrl/utr/volume-item-type.json b/schemas/xbrl/utr/volume-item-type.json
similarity index 99%
rename from schemas/2020-12/xbrl/utr/volume-item-type.json
rename to schemas/xbrl/utr/volume-item-type.json
index fbd4d3d0..d639e5ed 100644
--- a/schemas/2020-12/xbrl/utr/volume-item-type.json
+++ b/schemas/xbrl/utr/volume-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Barrel",
diff --git a/schemas/2020-12/xbrl/utr/volume-per-monetary-item-type-normative.json b/schemas/xbrl/utr/volume-per-monetary-item-type-normative.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/volume-per-monetary-item-type-normative.json
rename to schemas/xbrl/utr/volume-per-monetary-item-type-normative.json
index d62dd275..1dbcb103 100644
--- a/schemas/2020-12/xbrl/utr/volume-per-monetary-item-type-normative.json
+++ b/schemas/xbrl/utr/volume-per-monetary-item-type-normative.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Volume/Monetary",
diff --git a/schemas/2020-12/xbrl/utr/volume-per-monetary-item-type.json b/schemas/xbrl/utr/volume-per-monetary-item-type.json
similarity index 95%
rename from schemas/2020-12/xbrl/utr/volume-per-monetary-item-type.json
rename to schemas/xbrl/utr/volume-per-monetary-item-type.json
index a18a293d..a60c105c 100644
--- a/schemas/2020-12/xbrl/utr/volume-per-monetary-item-type.json
+++ b/schemas/xbrl/utr/volume-per-monetary-item-type.json
@@ -8,7 +8,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": "2024-10-22",
   "anyOf": [
     {
       "title": "Volume/Monetary",
diff --git a/scripts/quality-schemas-tests-mirror.sh b/scripts/quality-schemas-tests-mirror.sh
index 919696b3..6cba1aa0 100755
--- a/scripts/quality-schemas-tests-mirror.sh
+++ b/scripts/quality-schemas-tests-mirror.sh
@@ -3,7 +3,7 @@
 set -o errexit
 set -o nounset
 
-SCHEMAS_DIR="$(pwd)/schemas/2020-12"
+SCHEMAS_DIR="$(pwd)/schemas"
 TESTS_DIR="$(pwd)/test"
 EXIT_CODE=0
 
diff --git a/templates/schemas/2020-12/iso/country/2020/alpha-2.jq b/templates/schemas/iso/country/2020/alpha-2.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/country/2020/alpha-2.jq
rename to templates/schemas/iso/country/2020/alpha-2.jq
diff --git a/templates/schemas/2020-12/iso/country/2020/alpha-3.jq b/templates/schemas/iso/country/2020/alpha-3.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/country/2020/alpha-3.jq
rename to templates/schemas/iso/country/2020/alpha-3.jq
diff --git a/templates/schemas/2020-12/iso/country/2020/numeric.jq b/templates/schemas/iso/country/2020/numeric.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/country/2020/numeric.jq
rename to templates/schemas/iso/country/2020/numeric.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/alpha-code.jq b/templates/schemas/iso/currency/2015/alpha-code.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/alpha-code.jq
rename to templates/schemas/iso/currency/2015/alpha-code.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/alpha-currency.jq b/templates/schemas/iso/currency/2015/alpha-currency.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/alpha-currency.jq
rename to templates/schemas/iso/currency/2015/alpha-currency.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/alpha-fund.jq b/templates/schemas/iso/currency/2015/alpha-fund.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/alpha-fund.jq
rename to templates/schemas/iso/currency/2015/alpha-fund.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/alpha-precious-metal.jq b/templates/schemas/iso/currency/2015/alpha-precious-metal.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/alpha-precious-metal.jq
rename to templates/schemas/iso/currency/2015/alpha-precious-metal.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/alpha-test.jq b/templates/schemas/iso/currency/2015/alpha-test.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/alpha-test.jq
rename to templates/schemas/iso/currency/2015/alpha-test.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/alpha-unknown.jq b/templates/schemas/iso/currency/2015/alpha-unknown.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/alpha-unknown.jq
rename to templates/schemas/iso/currency/2015/alpha-unknown.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/historical/alpha-code.jq b/templates/schemas/iso/currency/2015/historical/alpha-code.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/historical/alpha-code.jq
rename to templates/schemas/iso/currency/2015/historical/alpha-code.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/historical/alpha-currency.jq b/templates/schemas/iso/currency/2015/historical/alpha-currency.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/historical/alpha-currency.jq
rename to templates/schemas/iso/currency/2015/historical/alpha-currency.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/historical/numeric-code.jq b/templates/schemas/iso/currency/2015/historical/numeric-code.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/historical/numeric-code.jq
rename to templates/schemas/iso/currency/2015/historical/numeric-code.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/historical/numeric-currency.jq b/templates/schemas/iso/currency/2015/historical/numeric-currency.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/historical/numeric-currency.jq
rename to templates/schemas/iso/currency/2015/historical/numeric-currency.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/numeric-code-additional.jq b/templates/schemas/iso/currency/2015/numeric-code-additional.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/numeric-code-additional.jq
rename to templates/schemas/iso/currency/2015/numeric-code-additional.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/numeric-code.jq b/templates/schemas/iso/currency/2015/numeric-code.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/numeric-code.jq
rename to templates/schemas/iso/currency/2015/numeric-code.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/numeric-currency.jq b/templates/schemas/iso/currency/2015/numeric-currency.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/numeric-currency.jq
rename to templates/schemas/iso/currency/2015/numeric-currency.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/numeric-fund.jq b/templates/schemas/iso/currency/2015/numeric-fund.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/numeric-fund.jq
rename to templates/schemas/iso/currency/2015/numeric-fund.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/numeric-precious-metal.jq b/templates/schemas/iso/currency/2015/numeric-precious-metal.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/numeric-precious-metal.jq
rename to templates/schemas/iso/currency/2015/numeric-precious-metal.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/numeric-test.jq b/templates/schemas/iso/currency/2015/numeric-test.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/numeric-test.jq
rename to templates/schemas/iso/currency/2015/numeric-test.jq
diff --git a/templates/schemas/2020-12/iso/currency/2015/numeric-unknown.jq b/templates/schemas/iso/currency/2015/numeric-unknown.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/currency/2015/numeric-unknown.jq
rename to templates/schemas/iso/currency/2015/numeric-unknown.jq
diff --git a/templates/schemas/2020-12/iso/language/2023/set-1.jq b/templates/schemas/iso/language/2023/set-1.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/language/2023/set-1.jq
rename to templates/schemas/iso/language/2023/set-1.jq
diff --git a/templates/schemas/2020-12/iso/language/2023/set-2-bibliographic.jq b/templates/schemas/iso/language/2023/set-2-bibliographic.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/language/2023/set-2-bibliographic.jq
rename to templates/schemas/iso/language/2023/set-2-bibliographic.jq
diff --git a/templates/schemas/2020-12/iso/language/2023/set-2-terminologic.jq b/templates/schemas/iso/language/2023/set-2-terminologic.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/language/2023/set-2-terminologic.jq
rename to templates/schemas/iso/language/2023/set-2-terminologic.jq
diff --git a/templates/schemas/2020-12/iso/language/2023/set-3.jq b/templates/schemas/iso/language/2023/set-3.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/language/2023/set-3.jq
rename to templates/schemas/iso/language/2023/set-3.jq
diff --git a/templates/schemas/2020-12/iso/language/2023/set-5.jq b/templates/schemas/iso/language/2023/set-5.jq
similarity index 100%
rename from templates/schemas/2020-12/iso/language/2023/set-5.jq
rename to templates/schemas/iso/language/2023/set-5.jq
diff --git a/templates/schemas/2020-12/xbrl/utr/item-type.jq b/templates/schemas/xbrl/utr/item-type.jq
similarity index 95%
rename from templates/schemas/2020-12/xbrl/utr/item-type.jq
rename to templates/schemas/xbrl/utr/item-type.jq
index 2fbc9ad5..c85d36e2 100644
--- a/templates/schemas/2020-12/xbrl/utr/item-type.jq
+++ b/templates/schemas/xbrl/utr/item-type.jq
@@ -1,4 +1,3 @@
-.["{http://www.xbrl.org/2009/utr}utr"]["@attributes"].lastUpdated as $date |
 (
   .["{http://www.xbrl.org/2009/utr}utr"]["{http://www.xbrl.org/2009/utr}units"]["{http://www.xbrl.org/2009/utr}unit"]
   | map(select(.["{http://www.xbrl.org/2009/utr}itemType"] == $item_type
@@ -28,7 +27,6 @@
     "https://www.xbrl.org/specification/utr/rec-2013-11-18/utr-rec-2013-11-18-clean.html",
     "https://www.xbrl.org/utr/utr.xml"
   ],
-  "x-registry-date": $date,
   "anyOf": (
     $units
     | map(
diff --git a/test/bipm/si/2019/base/prefixed/attoampere.test.json b/test/bipm/si/2019/base/prefixed/attoampere.test.json
index 70bc0198..c5115895 100644
--- a/test/bipm/si/2019/base/prefixed/attoampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/attoampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/attoampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/attoampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/attocandela.test.json b/test/bipm/si/2019/base/prefixed/attocandela.test.json
index 4a865153..cfebac0b 100644
--- a/test/bipm/si/2019/base/prefixed/attocandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/attocandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/attocandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/attocandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/attogram.test.json b/test/bipm/si/2019/base/prefixed/attogram.test.json
index 03852830..3d102744 100644
--- a/test/bipm/si/2019/base/prefixed/attogram.test.json
+++ b/test/bipm/si/2019/base/prefixed/attogram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/attogram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/attogram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/attokelvin.test.json b/test/bipm/si/2019/base/prefixed/attokelvin.test.json
index 393866e0..fe67418c 100644
--- a/test/bipm/si/2019/base/prefixed/attokelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/attokelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/attokelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/attokelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/attometre.test.json b/test/bipm/si/2019/base/prefixed/attometre.test.json
index a99c7905..75a42212 100644
--- a/test/bipm/si/2019/base/prefixed/attometre.test.json
+++ b/test/bipm/si/2019/base/prefixed/attometre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/attometre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/attometre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/attomole.test.json b/test/bipm/si/2019/base/prefixed/attomole.test.json
index c15e93fc..4d899db6 100644
--- a/test/bipm/si/2019/base/prefixed/attomole.test.json
+++ b/test/bipm/si/2019/base/prefixed/attomole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/attomole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/attomole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/attosecond.test.json b/test/bipm/si/2019/base/prefixed/attosecond.test.json
index 101dcfba..766d844d 100644
--- a/test/bipm/si/2019/base/prefixed/attosecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/attosecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/attosecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/attosecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/centiampere.test.json b/test/bipm/si/2019/base/prefixed/centiampere.test.json
index cd124359..746d74f0 100644
--- a/test/bipm/si/2019/base/prefixed/centiampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/centiampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/centiampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/centiampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/centicandela.test.json b/test/bipm/si/2019/base/prefixed/centicandela.test.json
index 68ebab26..5640f119 100644
--- a/test/bipm/si/2019/base/prefixed/centicandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/centicandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/centicandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/centicandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/centigram.test.json b/test/bipm/si/2019/base/prefixed/centigram.test.json
index 853b8f3c..474f5554 100644
--- a/test/bipm/si/2019/base/prefixed/centigram.test.json
+++ b/test/bipm/si/2019/base/prefixed/centigram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/centigram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/centigram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/centikelvin.test.json b/test/bipm/si/2019/base/prefixed/centikelvin.test.json
index c4662877..34f502f3 100644
--- a/test/bipm/si/2019/base/prefixed/centikelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/centikelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/centikelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/centikelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/centimetre.test.json b/test/bipm/si/2019/base/prefixed/centimetre.test.json
index 896d6708..98c990e7 100644
--- a/test/bipm/si/2019/base/prefixed/centimetre.test.json
+++ b/test/bipm/si/2019/base/prefixed/centimetre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/centimetre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/centimetre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/centimole.test.json b/test/bipm/si/2019/base/prefixed/centimole.test.json
index 92f13931..c2480bf7 100644
--- a/test/bipm/si/2019/base/prefixed/centimole.test.json
+++ b/test/bipm/si/2019/base/prefixed/centimole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/centimole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/centimole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/centisecond.test.json b/test/bipm/si/2019/base/prefixed/centisecond.test.json
index f9978e1e..144edea4 100644
--- a/test/bipm/si/2019/base/prefixed/centisecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/centisecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/centisecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/centisecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/decaampere.test.json b/test/bipm/si/2019/base/prefixed/decaampere.test.json
index b54077f0..8f455037 100644
--- a/test/bipm/si/2019/base/prefixed/decaampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/decaampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decaampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decaampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/decacandela.test.json b/test/bipm/si/2019/base/prefixed/decacandela.test.json
index d72b71d1..9ce1b657 100644
--- a/test/bipm/si/2019/base/prefixed/decacandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/decacandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decacandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decacandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/decagram.test.json b/test/bipm/si/2019/base/prefixed/decagram.test.json
index 37f08ed3..dcc7d447 100644
--- a/test/bipm/si/2019/base/prefixed/decagram.test.json
+++ b/test/bipm/si/2019/base/prefixed/decagram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decagram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decagram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/decakelvin.test.json b/test/bipm/si/2019/base/prefixed/decakelvin.test.json
index 9b7c6c9f..fbc3542d 100644
--- a/test/bipm/si/2019/base/prefixed/decakelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/decakelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decakelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decakelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/decametre.test.json b/test/bipm/si/2019/base/prefixed/decametre.test.json
index b0929a9c..ac51a414 100644
--- a/test/bipm/si/2019/base/prefixed/decametre.test.json
+++ b/test/bipm/si/2019/base/prefixed/decametre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decametre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decametre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/decamole.test.json b/test/bipm/si/2019/base/prefixed/decamole.test.json
index 3295824a..d7c9f355 100644
--- a/test/bipm/si/2019/base/prefixed/decamole.test.json
+++ b/test/bipm/si/2019/base/prefixed/decamole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decamole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decamole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/decasecond.test.json b/test/bipm/si/2019/base/prefixed/decasecond.test.json
index ed265f9d..0a08f488 100644
--- a/test/bipm/si/2019/base/prefixed/decasecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/decasecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decasecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decasecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/deciampere.test.json b/test/bipm/si/2019/base/prefixed/deciampere.test.json
index d1a21e9c..ccbbb065 100644
--- a/test/bipm/si/2019/base/prefixed/deciampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/deciampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/deciampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/deciampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/decicandela.test.json b/test/bipm/si/2019/base/prefixed/decicandela.test.json
index 718b7120..0a13d62e 100644
--- a/test/bipm/si/2019/base/prefixed/decicandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/decicandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decicandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decicandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/decigram.test.json b/test/bipm/si/2019/base/prefixed/decigram.test.json
index 36fac56d..58142740 100644
--- a/test/bipm/si/2019/base/prefixed/decigram.test.json
+++ b/test/bipm/si/2019/base/prefixed/decigram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decigram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decigram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/decikelvin.test.json b/test/bipm/si/2019/base/prefixed/decikelvin.test.json
index 6d530f0a..cc0ae668 100644
--- a/test/bipm/si/2019/base/prefixed/decikelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/decikelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decikelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decikelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/decimetre.test.json b/test/bipm/si/2019/base/prefixed/decimetre.test.json
index 9386465f..5cad3350 100644
--- a/test/bipm/si/2019/base/prefixed/decimetre.test.json
+++ b/test/bipm/si/2019/base/prefixed/decimetre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decimetre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decimetre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/decimole.test.json b/test/bipm/si/2019/base/prefixed/decimole.test.json
index 2219e168..deec149d 100644
--- a/test/bipm/si/2019/base/prefixed/decimole.test.json
+++ b/test/bipm/si/2019/base/prefixed/decimole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decimole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decimole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/decisecond.test.json b/test/bipm/si/2019/base/prefixed/decisecond.test.json
index a777efb8..849c8aaf 100644
--- a/test/bipm/si/2019/base/prefixed/decisecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/decisecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/decisecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/decisecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/exaampere.test.json b/test/bipm/si/2019/base/prefixed/exaampere.test.json
index dc16417a..5fe76109 100644
--- a/test/bipm/si/2019/base/prefixed/exaampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/exaampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/exaampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/exaampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/exacandela.test.json b/test/bipm/si/2019/base/prefixed/exacandela.test.json
index 69a19ccf..0451baac 100644
--- a/test/bipm/si/2019/base/prefixed/exacandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/exacandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/exacandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/exacandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/exagram.test.json b/test/bipm/si/2019/base/prefixed/exagram.test.json
index 71e14d79..ebdfa942 100644
--- a/test/bipm/si/2019/base/prefixed/exagram.test.json
+++ b/test/bipm/si/2019/base/prefixed/exagram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/exagram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/exagram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/exakelvin.test.json b/test/bipm/si/2019/base/prefixed/exakelvin.test.json
index 54d87425..d9b2205a 100644
--- a/test/bipm/si/2019/base/prefixed/exakelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/exakelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/exakelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/exakelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/exametre.test.json b/test/bipm/si/2019/base/prefixed/exametre.test.json
index 403aefff..7b76247e 100644
--- a/test/bipm/si/2019/base/prefixed/exametre.test.json
+++ b/test/bipm/si/2019/base/prefixed/exametre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/exametre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/exametre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/examole.test.json b/test/bipm/si/2019/base/prefixed/examole.test.json
index 035eda47..de2f76ff 100644
--- a/test/bipm/si/2019/base/prefixed/examole.test.json
+++ b/test/bipm/si/2019/base/prefixed/examole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/examole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/examole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/exasecond.test.json b/test/bipm/si/2019/base/prefixed/exasecond.test.json
index 188af862..7a204254 100644
--- a/test/bipm/si/2019/base/prefixed/exasecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/exasecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/exasecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/exasecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/femtoampere.test.json b/test/bipm/si/2019/base/prefixed/femtoampere.test.json
index e676624f..a2946151 100644
--- a/test/bipm/si/2019/base/prefixed/femtoampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/femtoampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/femtoampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/femtoampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/femtocandela.test.json b/test/bipm/si/2019/base/prefixed/femtocandela.test.json
index a98eeece..56be879d 100644
--- a/test/bipm/si/2019/base/prefixed/femtocandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/femtocandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/femtocandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/femtocandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/femtogram.test.json b/test/bipm/si/2019/base/prefixed/femtogram.test.json
index e2b66503..b6816127 100644
--- a/test/bipm/si/2019/base/prefixed/femtogram.test.json
+++ b/test/bipm/si/2019/base/prefixed/femtogram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/femtogram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/femtogram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/femtokelvin.test.json b/test/bipm/si/2019/base/prefixed/femtokelvin.test.json
index 6f446daf..1f9d55f3 100644
--- a/test/bipm/si/2019/base/prefixed/femtokelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/femtokelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/femtokelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/femtokelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/femtometre.test.json b/test/bipm/si/2019/base/prefixed/femtometre.test.json
index f607937d..7fd86889 100644
--- a/test/bipm/si/2019/base/prefixed/femtometre.test.json
+++ b/test/bipm/si/2019/base/prefixed/femtometre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/femtometre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/femtometre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/femtomole.test.json b/test/bipm/si/2019/base/prefixed/femtomole.test.json
index 124b8dc3..64810bf9 100644
--- a/test/bipm/si/2019/base/prefixed/femtomole.test.json
+++ b/test/bipm/si/2019/base/prefixed/femtomole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/femtomole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/femtomole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/femtosecond.test.json b/test/bipm/si/2019/base/prefixed/femtosecond.test.json
index b86ea9dd..10604291 100644
--- a/test/bipm/si/2019/base/prefixed/femtosecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/femtosecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/femtosecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/femtosecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/gigaampere.test.json b/test/bipm/si/2019/base/prefixed/gigaampere.test.json
index 1c644d16..93fcff55 100644
--- a/test/bipm/si/2019/base/prefixed/gigaampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/gigaampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/gigaampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/gigaampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/gigacandela.test.json b/test/bipm/si/2019/base/prefixed/gigacandela.test.json
index 518475fa..629d5b7b 100644
--- a/test/bipm/si/2019/base/prefixed/gigacandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/gigacandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/gigacandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/gigacandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/gigagram.test.json b/test/bipm/si/2019/base/prefixed/gigagram.test.json
index be777319..dd6ae024 100644
--- a/test/bipm/si/2019/base/prefixed/gigagram.test.json
+++ b/test/bipm/si/2019/base/prefixed/gigagram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/gigagram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/gigagram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/gigakelvin.test.json b/test/bipm/si/2019/base/prefixed/gigakelvin.test.json
index e226fc61..03e13862 100644
--- a/test/bipm/si/2019/base/prefixed/gigakelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/gigakelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/gigakelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/gigakelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/gigametre.test.json b/test/bipm/si/2019/base/prefixed/gigametre.test.json
index 58a92895..8d9cb521 100644
--- a/test/bipm/si/2019/base/prefixed/gigametre.test.json
+++ b/test/bipm/si/2019/base/prefixed/gigametre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/gigametre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/gigametre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/gigamole.test.json b/test/bipm/si/2019/base/prefixed/gigamole.test.json
index 28cd13c2..32674965 100644
--- a/test/bipm/si/2019/base/prefixed/gigamole.test.json
+++ b/test/bipm/si/2019/base/prefixed/gigamole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/gigamole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/gigamole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/gigasecond.test.json b/test/bipm/si/2019/base/prefixed/gigasecond.test.json
index c9f6a046..d3b0bde1 100644
--- a/test/bipm/si/2019/base/prefixed/gigasecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/gigasecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/gigasecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/gigasecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/gram.test.json b/test/bipm/si/2019/base/prefixed/gram.test.json
index 11775505..5458ba94 100644
--- a/test/bipm/si/2019/base/prefixed/gram.test.json
+++ b/test/bipm/si/2019/base/prefixed/gram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/gram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/gram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/hectoampere.test.json b/test/bipm/si/2019/base/prefixed/hectoampere.test.json
index 487b22b4..40f1d0ea 100644
--- a/test/bipm/si/2019/base/prefixed/hectoampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/hectoampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/hectoampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/hectoampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/hectocandela.test.json b/test/bipm/si/2019/base/prefixed/hectocandela.test.json
index 3e8b0b6b..9e20b65f 100644
--- a/test/bipm/si/2019/base/prefixed/hectocandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/hectocandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/hectocandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/hectocandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/hectogram.test.json b/test/bipm/si/2019/base/prefixed/hectogram.test.json
index bbe37c28..b5c45732 100644
--- a/test/bipm/si/2019/base/prefixed/hectogram.test.json
+++ b/test/bipm/si/2019/base/prefixed/hectogram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/hectogram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/hectogram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/hectokelvin.test.json b/test/bipm/si/2019/base/prefixed/hectokelvin.test.json
index edcc2fa4..302e38d6 100644
--- a/test/bipm/si/2019/base/prefixed/hectokelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/hectokelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/hectokelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/hectokelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/hectometre.test.json b/test/bipm/si/2019/base/prefixed/hectometre.test.json
index 0728c823..0d771ad5 100644
--- a/test/bipm/si/2019/base/prefixed/hectometre.test.json
+++ b/test/bipm/si/2019/base/prefixed/hectometre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/hectometre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/hectometre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/hectomole.test.json b/test/bipm/si/2019/base/prefixed/hectomole.test.json
index 74ac64f7..736def2c 100644
--- a/test/bipm/si/2019/base/prefixed/hectomole.test.json
+++ b/test/bipm/si/2019/base/prefixed/hectomole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/hectomole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/hectomole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/hectosecond.test.json b/test/bipm/si/2019/base/prefixed/hectosecond.test.json
index df0b94e5..b35c6d9f 100644
--- a/test/bipm/si/2019/base/prefixed/hectosecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/hectosecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/hectosecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/hectosecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/kiloampere.test.json b/test/bipm/si/2019/base/prefixed/kiloampere.test.json
index 66c273ff..930da388 100644
--- a/test/bipm/si/2019/base/prefixed/kiloampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/kiloampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/kiloampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/kiloampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/kilocandela.test.json b/test/bipm/si/2019/base/prefixed/kilocandela.test.json
index 81e08b43..11649d8a 100644
--- a/test/bipm/si/2019/base/prefixed/kilocandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/kilocandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/kilocandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/kilocandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/kilokelvin.test.json b/test/bipm/si/2019/base/prefixed/kilokelvin.test.json
index d8df33fc..6b015813 100644
--- a/test/bipm/si/2019/base/prefixed/kilokelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/kilokelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/kilokelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/kilokelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/kilometre.test.json b/test/bipm/si/2019/base/prefixed/kilometre.test.json
index be38f3d4..84f20c68 100644
--- a/test/bipm/si/2019/base/prefixed/kilometre.test.json
+++ b/test/bipm/si/2019/base/prefixed/kilometre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/kilometre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/kilometre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/kilomole.test.json b/test/bipm/si/2019/base/prefixed/kilomole.test.json
index c00151fe..a8e76b05 100644
--- a/test/bipm/si/2019/base/prefixed/kilomole.test.json
+++ b/test/bipm/si/2019/base/prefixed/kilomole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/kilomole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/kilomole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/kilosecond.test.json b/test/bipm/si/2019/base/prefixed/kilosecond.test.json
index b5d8744e..7c30f61e 100644
--- a/test/bipm/si/2019/base/prefixed/kilosecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/kilosecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/kilosecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/kilosecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/megaampere.test.json b/test/bipm/si/2019/base/prefixed/megaampere.test.json
index 278c9788..93e37d84 100644
--- a/test/bipm/si/2019/base/prefixed/megaampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/megaampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/megaampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/megaampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/megacandela.test.json b/test/bipm/si/2019/base/prefixed/megacandela.test.json
index 73a0135d..ed14164a 100644
--- a/test/bipm/si/2019/base/prefixed/megacandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/megacandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/megacandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/megacandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/megagram.test.json b/test/bipm/si/2019/base/prefixed/megagram.test.json
index f267e97b..79c894d7 100644
--- a/test/bipm/si/2019/base/prefixed/megagram.test.json
+++ b/test/bipm/si/2019/base/prefixed/megagram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/megagram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/megagram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/megakelvin.test.json b/test/bipm/si/2019/base/prefixed/megakelvin.test.json
index 716e9c64..09f884f2 100644
--- a/test/bipm/si/2019/base/prefixed/megakelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/megakelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/megakelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/megakelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/megametre.test.json b/test/bipm/si/2019/base/prefixed/megametre.test.json
index e5c49aa6..d11cf7d7 100644
--- a/test/bipm/si/2019/base/prefixed/megametre.test.json
+++ b/test/bipm/si/2019/base/prefixed/megametre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/megametre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/megametre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/megamole.test.json b/test/bipm/si/2019/base/prefixed/megamole.test.json
index 662abc6b..c6994bea 100644
--- a/test/bipm/si/2019/base/prefixed/megamole.test.json
+++ b/test/bipm/si/2019/base/prefixed/megamole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/megamole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/megamole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/megasecond.test.json b/test/bipm/si/2019/base/prefixed/megasecond.test.json
index dc0ec757..e7bc26af 100644
--- a/test/bipm/si/2019/base/prefixed/megasecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/megasecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/megasecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/megasecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/microampere.test.json b/test/bipm/si/2019/base/prefixed/microampere.test.json
index a3c83569..047c8a64 100644
--- a/test/bipm/si/2019/base/prefixed/microampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/microampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/microampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/microampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/microcandela.test.json b/test/bipm/si/2019/base/prefixed/microcandela.test.json
index da2f52e6..7e8aa918 100644
--- a/test/bipm/si/2019/base/prefixed/microcandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/microcandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/microcandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/microcandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/microgram.test.json b/test/bipm/si/2019/base/prefixed/microgram.test.json
index d2d4d89b..d3106d4f 100644
--- a/test/bipm/si/2019/base/prefixed/microgram.test.json
+++ b/test/bipm/si/2019/base/prefixed/microgram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/microgram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/microgram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/microkelvin.test.json b/test/bipm/si/2019/base/prefixed/microkelvin.test.json
index e351c142..f34e6ac6 100644
--- a/test/bipm/si/2019/base/prefixed/microkelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/microkelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/microkelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/microkelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/micrometre.test.json b/test/bipm/si/2019/base/prefixed/micrometre.test.json
index a1e54c31..f6ed46a2 100644
--- a/test/bipm/si/2019/base/prefixed/micrometre.test.json
+++ b/test/bipm/si/2019/base/prefixed/micrometre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/micrometre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/micrometre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/micromole.test.json b/test/bipm/si/2019/base/prefixed/micromole.test.json
index bf9ba3ef..a46222f0 100644
--- a/test/bipm/si/2019/base/prefixed/micromole.test.json
+++ b/test/bipm/si/2019/base/prefixed/micromole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/micromole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/micromole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/microsecond.test.json b/test/bipm/si/2019/base/prefixed/microsecond.test.json
index b4b5078f..b37bf970 100644
--- a/test/bipm/si/2019/base/prefixed/microsecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/microsecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/microsecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/microsecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/milliampere.test.json b/test/bipm/si/2019/base/prefixed/milliampere.test.json
index 5eb6f7f1..3cd2f6f7 100644
--- a/test/bipm/si/2019/base/prefixed/milliampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/milliampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/milliampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/milliampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/millicandela.test.json b/test/bipm/si/2019/base/prefixed/millicandela.test.json
index 8c4b55d2..14b2ab8f 100644
--- a/test/bipm/si/2019/base/prefixed/millicandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/millicandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/millicandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/millicandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/milligram.test.json b/test/bipm/si/2019/base/prefixed/milligram.test.json
index fcd859a3..13bb9537 100644
--- a/test/bipm/si/2019/base/prefixed/milligram.test.json
+++ b/test/bipm/si/2019/base/prefixed/milligram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/milligram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/milligram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/millikelvin.test.json b/test/bipm/si/2019/base/prefixed/millikelvin.test.json
index d162d187..11997970 100644
--- a/test/bipm/si/2019/base/prefixed/millikelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/millikelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/millikelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/millikelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/millimetre.test.json b/test/bipm/si/2019/base/prefixed/millimetre.test.json
index bd03914f..b867369a 100644
--- a/test/bipm/si/2019/base/prefixed/millimetre.test.json
+++ b/test/bipm/si/2019/base/prefixed/millimetre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/millimetre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/millimetre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/millimole.test.json b/test/bipm/si/2019/base/prefixed/millimole.test.json
index 6836dc5c..87514bb3 100644
--- a/test/bipm/si/2019/base/prefixed/millimole.test.json
+++ b/test/bipm/si/2019/base/prefixed/millimole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/millimole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/millimole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/millisecond.test.json b/test/bipm/si/2019/base/prefixed/millisecond.test.json
index 8dd2a628..316989e0 100644
--- a/test/bipm/si/2019/base/prefixed/millisecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/millisecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/millisecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/millisecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/nanoampere.test.json b/test/bipm/si/2019/base/prefixed/nanoampere.test.json
index 7a165df8..35b43ef5 100644
--- a/test/bipm/si/2019/base/prefixed/nanoampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/nanoampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/nanoampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/nanoampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/nanocandela.test.json b/test/bipm/si/2019/base/prefixed/nanocandela.test.json
index 7eb6e96f..e426a929 100644
--- a/test/bipm/si/2019/base/prefixed/nanocandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/nanocandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/nanocandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/nanocandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/nanogram.test.json b/test/bipm/si/2019/base/prefixed/nanogram.test.json
index 13f22307..682026bb 100644
--- a/test/bipm/si/2019/base/prefixed/nanogram.test.json
+++ b/test/bipm/si/2019/base/prefixed/nanogram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/nanogram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/nanogram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/nanokelvin.test.json b/test/bipm/si/2019/base/prefixed/nanokelvin.test.json
index 06b3d8d6..5180e85b 100644
--- a/test/bipm/si/2019/base/prefixed/nanokelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/nanokelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/nanokelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/nanokelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/nanometre.test.json b/test/bipm/si/2019/base/prefixed/nanometre.test.json
index 91f6be35..91b5cb3d 100644
--- a/test/bipm/si/2019/base/prefixed/nanometre.test.json
+++ b/test/bipm/si/2019/base/prefixed/nanometre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/nanometre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/nanometre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/nanomole.test.json b/test/bipm/si/2019/base/prefixed/nanomole.test.json
index 81edefd0..5b7a37be 100644
--- a/test/bipm/si/2019/base/prefixed/nanomole.test.json
+++ b/test/bipm/si/2019/base/prefixed/nanomole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/nanomole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/nanomole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/nanosecond.test.json b/test/bipm/si/2019/base/prefixed/nanosecond.test.json
index 535cdecc..19dc649f 100644
--- a/test/bipm/si/2019/base/prefixed/nanosecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/nanosecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/nanosecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/nanosecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/petaampere.test.json b/test/bipm/si/2019/base/prefixed/petaampere.test.json
index a766fbf7..c50931ce 100644
--- a/test/bipm/si/2019/base/prefixed/petaampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/petaampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/petaampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/petaampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/petacandela.test.json b/test/bipm/si/2019/base/prefixed/petacandela.test.json
index 304cca43..12fb14d8 100644
--- a/test/bipm/si/2019/base/prefixed/petacandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/petacandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/petacandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/petacandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/petagram.test.json b/test/bipm/si/2019/base/prefixed/petagram.test.json
index 55ce2d93..5f4de478 100644
--- a/test/bipm/si/2019/base/prefixed/petagram.test.json
+++ b/test/bipm/si/2019/base/prefixed/petagram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/petagram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/petagram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/petakelvin.test.json b/test/bipm/si/2019/base/prefixed/petakelvin.test.json
index acf6e21f..143042bf 100644
--- a/test/bipm/si/2019/base/prefixed/petakelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/petakelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/petakelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/petakelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/petametre.test.json b/test/bipm/si/2019/base/prefixed/petametre.test.json
index 9e115c44..3fce2cd0 100644
--- a/test/bipm/si/2019/base/prefixed/petametre.test.json
+++ b/test/bipm/si/2019/base/prefixed/petametre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/petametre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/petametre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/petamole.test.json b/test/bipm/si/2019/base/prefixed/petamole.test.json
index 5f67750d..0ff9a636 100644
--- a/test/bipm/si/2019/base/prefixed/petamole.test.json
+++ b/test/bipm/si/2019/base/prefixed/petamole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/petamole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/petamole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/petasecond.test.json b/test/bipm/si/2019/base/prefixed/petasecond.test.json
index 0a4795f0..7c0a70fc 100644
--- a/test/bipm/si/2019/base/prefixed/petasecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/petasecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/petasecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/petasecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/picoampere.test.json b/test/bipm/si/2019/base/prefixed/picoampere.test.json
index f8a464c5..f0dd042b 100644
--- a/test/bipm/si/2019/base/prefixed/picoampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/picoampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/picoampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/picoampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/picocandela.test.json b/test/bipm/si/2019/base/prefixed/picocandela.test.json
index 3375fef9..b5a0ed65 100644
--- a/test/bipm/si/2019/base/prefixed/picocandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/picocandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/picocandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/picocandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/picogram.test.json b/test/bipm/si/2019/base/prefixed/picogram.test.json
index f8bd2c30..6c63a110 100644
--- a/test/bipm/si/2019/base/prefixed/picogram.test.json
+++ b/test/bipm/si/2019/base/prefixed/picogram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/picogram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/picogram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/picokelvin.test.json b/test/bipm/si/2019/base/prefixed/picokelvin.test.json
index 0fb3c234..00dfe923 100644
--- a/test/bipm/si/2019/base/prefixed/picokelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/picokelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/picokelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/picokelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/picometre.test.json b/test/bipm/si/2019/base/prefixed/picometre.test.json
index 2433687f..35b5ae3b 100644
--- a/test/bipm/si/2019/base/prefixed/picometre.test.json
+++ b/test/bipm/si/2019/base/prefixed/picometre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/picometre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/picometre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/picomole.test.json b/test/bipm/si/2019/base/prefixed/picomole.test.json
index bf187f50..96594eee 100644
--- a/test/bipm/si/2019/base/prefixed/picomole.test.json
+++ b/test/bipm/si/2019/base/prefixed/picomole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/picomole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/picomole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/picosecond.test.json b/test/bipm/si/2019/base/prefixed/picosecond.test.json
index aad1f0e8..be6fe8c1 100644
--- a/test/bipm/si/2019/base/prefixed/picosecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/picosecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/picosecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/picosecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/quectoampere.test.json b/test/bipm/si/2019/base/prefixed/quectoampere.test.json
index 26359e30..d8b603b9 100644
--- a/test/bipm/si/2019/base/prefixed/quectoampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/quectoampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quectoampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quectoampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/quectocandela.test.json b/test/bipm/si/2019/base/prefixed/quectocandela.test.json
index c7354bea..c256549d 100644
--- a/test/bipm/si/2019/base/prefixed/quectocandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/quectocandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quectocandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quectocandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/quectogram.test.json b/test/bipm/si/2019/base/prefixed/quectogram.test.json
index 8ad96e36..91e01edb 100644
--- a/test/bipm/si/2019/base/prefixed/quectogram.test.json
+++ b/test/bipm/si/2019/base/prefixed/quectogram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quectogram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quectogram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/quectokelvin.test.json b/test/bipm/si/2019/base/prefixed/quectokelvin.test.json
index d7fc5de8..3b6991d3 100644
--- a/test/bipm/si/2019/base/prefixed/quectokelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/quectokelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quectokelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quectokelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/quectometre.test.json b/test/bipm/si/2019/base/prefixed/quectometre.test.json
index 54d274b2..c3b3a2dc 100644
--- a/test/bipm/si/2019/base/prefixed/quectometre.test.json
+++ b/test/bipm/si/2019/base/prefixed/quectometre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quectometre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quectometre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/quectomole.test.json b/test/bipm/si/2019/base/prefixed/quectomole.test.json
index 6c96fba0..bfb988b7 100644
--- a/test/bipm/si/2019/base/prefixed/quectomole.test.json
+++ b/test/bipm/si/2019/base/prefixed/quectomole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quectomole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quectomole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/quectosecond.test.json b/test/bipm/si/2019/base/prefixed/quectosecond.test.json
index ccd22dd5..e1189ad5 100644
--- a/test/bipm/si/2019/base/prefixed/quectosecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/quectosecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quectosecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quectosecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/quettaampere.test.json b/test/bipm/si/2019/base/prefixed/quettaampere.test.json
index 566f8afb..3ef1a812 100644
--- a/test/bipm/si/2019/base/prefixed/quettaampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/quettaampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quettaampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quettaampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/quettacandela.test.json b/test/bipm/si/2019/base/prefixed/quettacandela.test.json
index 47126ec6..4474a5e3 100644
--- a/test/bipm/si/2019/base/prefixed/quettacandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/quettacandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quettacandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quettacandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/quettagram.test.json b/test/bipm/si/2019/base/prefixed/quettagram.test.json
index 35c75118..49a79b4c 100644
--- a/test/bipm/si/2019/base/prefixed/quettagram.test.json
+++ b/test/bipm/si/2019/base/prefixed/quettagram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quettagram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quettagram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/quettakelvin.test.json b/test/bipm/si/2019/base/prefixed/quettakelvin.test.json
index 7be7d3a9..5ed3cd20 100644
--- a/test/bipm/si/2019/base/prefixed/quettakelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/quettakelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quettakelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quettakelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/quettametre.test.json b/test/bipm/si/2019/base/prefixed/quettametre.test.json
index 84e86812..e74d04c2 100644
--- a/test/bipm/si/2019/base/prefixed/quettametre.test.json
+++ b/test/bipm/si/2019/base/prefixed/quettametre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quettametre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quettametre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/quettamole.test.json b/test/bipm/si/2019/base/prefixed/quettamole.test.json
index 017ac3d6..f7c0d176 100644
--- a/test/bipm/si/2019/base/prefixed/quettamole.test.json
+++ b/test/bipm/si/2019/base/prefixed/quettamole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quettamole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quettamole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/quettasecond.test.json b/test/bipm/si/2019/base/prefixed/quettasecond.test.json
index 5d6f48dd..a7d43b7d 100644
--- a/test/bipm/si/2019/base/prefixed/quettasecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/quettasecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/quettasecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/quettasecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/ronnaampere.test.json b/test/bipm/si/2019/base/prefixed/ronnaampere.test.json
index 53232596..b465c6a7 100644
--- a/test/bipm/si/2019/base/prefixed/ronnaampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/ronnaampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/ronnaampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/ronnaampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/ronnacandela.test.json b/test/bipm/si/2019/base/prefixed/ronnacandela.test.json
index f0f0d90c..36b6bf17 100644
--- a/test/bipm/si/2019/base/prefixed/ronnacandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/ronnacandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/ronnacandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/ronnacandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/ronnagram.test.json b/test/bipm/si/2019/base/prefixed/ronnagram.test.json
index f97d39cc..a783e1f2 100644
--- a/test/bipm/si/2019/base/prefixed/ronnagram.test.json
+++ b/test/bipm/si/2019/base/prefixed/ronnagram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/ronnagram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/ronnagram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/ronnakelvin.test.json b/test/bipm/si/2019/base/prefixed/ronnakelvin.test.json
index 3ac4f544..557e8206 100644
--- a/test/bipm/si/2019/base/prefixed/ronnakelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/ronnakelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/ronnakelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/ronnakelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/ronnametre.test.json b/test/bipm/si/2019/base/prefixed/ronnametre.test.json
index 1e153afb..767f36be 100644
--- a/test/bipm/si/2019/base/prefixed/ronnametre.test.json
+++ b/test/bipm/si/2019/base/prefixed/ronnametre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/ronnametre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/ronnametre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/ronnamole.test.json b/test/bipm/si/2019/base/prefixed/ronnamole.test.json
index 934a625b..338337db 100644
--- a/test/bipm/si/2019/base/prefixed/ronnamole.test.json
+++ b/test/bipm/si/2019/base/prefixed/ronnamole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/ronnamole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/ronnamole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/ronnasecond.test.json b/test/bipm/si/2019/base/prefixed/ronnasecond.test.json
index 7fb91738..be943f6f 100644
--- a/test/bipm/si/2019/base/prefixed/ronnasecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/ronnasecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/ronnasecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/ronnasecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/rontoampere.test.json b/test/bipm/si/2019/base/prefixed/rontoampere.test.json
index 6839df41..88ce8147 100644
--- a/test/bipm/si/2019/base/prefixed/rontoampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/rontoampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/rontoampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/rontoampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/rontocandela.test.json b/test/bipm/si/2019/base/prefixed/rontocandela.test.json
index 69aabbac..4441affc 100644
--- a/test/bipm/si/2019/base/prefixed/rontocandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/rontocandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/rontocandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/rontocandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/rontogram.test.json b/test/bipm/si/2019/base/prefixed/rontogram.test.json
index 1fdf0ef7..e4b712b1 100644
--- a/test/bipm/si/2019/base/prefixed/rontogram.test.json
+++ b/test/bipm/si/2019/base/prefixed/rontogram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/rontogram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/rontogram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/rontokelvin.test.json b/test/bipm/si/2019/base/prefixed/rontokelvin.test.json
index 9a047c68..f12c70f3 100644
--- a/test/bipm/si/2019/base/prefixed/rontokelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/rontokelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/rontokelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/rontokelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/rontometre.test.json b/test/bipm/si/2019/base/prefixed/rontometre.test.json
index 8ab86130..9a9f5a1d 100644
--- a/test/bipm/si/2019/base/prefixed/rontometre.test.json
+++ b/test/bipm/si/2019/base/prefixed/rontometre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/rontometre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/rontometre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/rontomole.test.json b/test/bipm/si/2019/base/prefixed/rontomole.test.json
index 4ecc5a8f..1c04663f 100644
--- a/test/bipm/si/2019/base/prefixed/rontomole.test.json
+++ b/test/bipm/si/2019/base/prefixed/rontomole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/rontomole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/rontomole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/rontosecond.test.json b/test/bipm/si/2019/base/prefixed/rontosecond.test.json
index 625d25a1..05e25cde 100644
--- a/test/bipm/si/2019/base/prefixed/rontosecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/rontosecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/rontosecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/rontosecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/teraampere.test.json b/test/bipm/si/2019/base/prefixed/teraampere.test.json
index 0eee7d62..315674f5 100644
--- a/test/bipm/si/2019/base/prefixed/teraampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/teraampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/teraampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/teraampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/teracandela.test.json b/test/bipm/si/2019/base/prefixed/teracandela.test.json
index 45359b17..2d074248 100644
--- a/test/bipm/si/2019/base/prefixed/teracandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/teracandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/teracandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/teracandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/teragram.test.json b/test/bipm/si/2019/base/prefixed/teragram.test.json
index 0fbf3a95..944450de 100644
--- a/test/bipm/si/2019/base/prefixed/teragram.test.json
+++ b/test/bipm/si/2019/base/prefixed/teragram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/teragram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/teragram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/terakelvin.test.json b/test/bipm/si/2019/base/prefixed/terakelvin.test.json
index b65d5891..b24964a7 100644
--- a/test/bipm/si/2019/base/prefixed/terakelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/terakelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/terakelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/terakelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/terametre.test.json b/test/bipm/si/2019/base/prefixed/terametre.test.json
index 7e3adc27..0efc5a43 100644
--- a/test/bipm/si/2019/base/prefixed/terametre.test.json
+++ b/test/bipm/si/2019/base/prefixed/terametre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/terametre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/terametre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/teramole.test.json b/test/bipm/si/2019/base/prefixed/teramole.test.json
index f4df5a24..4ee6cfed 100644
--- a/test/bipm/si/2019/base/prefixed/teramole.test.json
+++ b/test/bipm/si/2019/base/prefixed/teramole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/teramole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/teramole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/terasecond.test.json b/test/bipm/si/2019/base/prefixed/terasecond.test.json
index 58514865..7d5d7db1 100644
--- a/test/bipm/si/2019/base/prefixed/terasecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/terasecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/terasecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/terasecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/yoctoampere.test.json b/test/bipm/si/2019/base/prefixed/yoctoampere.test.json
index 632e88ed..0e9ed9ab 100644
--- a/test/bipm/si/2019/base/prefixed/yoctoampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/yoctoampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yoctoampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yoctoampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/yoctocandela.test.json b/test/bipm/si/2019/base/prefixed/yoctocandela.test.json
index 0ef983cd..b1140963 100644
--- a/test/bipm/si/2019/base/prefixed/yoctocandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/yoctocandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yoctocandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yoctocandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/yoctogram.test.json b/test/bipm/si/2019/base/prefixed/yoctogram.test.json
index 75a27fab..facab6c1 100644
--- a/test/bipm/si/2019/base/prefixed/yoctogram.test.json
+++ b/test/bipm/si/2019/base/prefixed/yoctogram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yoctogram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yoctogram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/yoctokelvin.test.json b/test/bipm/si/2019/base/prefixed/yoctokelvin.test.json
index cce6ec3b..1f409395 100644
--- a/test/bipm/si/2019/base/prefixed/yoctokelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/yoctokelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yoctokelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yoctokelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/yoctometre.test.json b/test/bipm/si/2019/base/prefixed/yoctometre.test.json
index 1953fbf4..7921fba5 100644
--- a/test/bipm/si/2019/base/prefixed/yoctometre.test.json
+++ b/test/bipm/si/2019/base/prefixed/yoctometre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yoctometre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yoctometre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/yoctomole.test.json b/test/bipm/si/2019/base/prefixed/yoctomole.test.json
index 4b0e52bc..b48b9351 100644
--- a/test/bipm/si/2019/base/prefixed/yoctomole.test.json
+++ b/test/bipm/si/2019/base/prefixed/yoctomole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yoctomole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yoctomole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/yoctosecond.test.json b/test/bipm/si/2019/base/prefixed/yoctosecond.test.json
index 6d072f62..2e46877e 100644
--- a/test/bipm/si/2019/base/prefixed/yoctosecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/yoctosecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yoctosecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yoctosecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/yottaampere.test.json b/test/bipm/si/2019/base/prefixed/yottaampere.test.json
index 8d68db64..97f07e49 100644
--- a/test/bipm/si/2019/base/prefixed/yottaampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/yottaampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yottaampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yottaampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/yottacandela.test.json b/test/bipm/si/2019/base/prefixed/yottacandela.test.json
index a6ae621d..217faa95 100644
--- a/test/bipm/si/2019/base/prefixed/yottacandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/yottacandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yottacandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yottacandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/yottagram.test.json b/test/bipm/si/2019/base/prefixed/yottagram.test.json
index 89dcbda7..673e69d1 100644
--- a/test/bipm/si/2019/base/prefixed/yottagram.test.json
+++ b/test/bipm/si/2019/base/prefixed/yottagram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yottagram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yottagram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/yottakelvin.test.json b/test/bipm/si/2019/base/prefixed/yottakelvin.test.json
index ee194844..28d01061 100644
--- a/test/bipm/si/2019/base/prefixed/yottakelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/yottakelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yottakelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yottakelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/yottametre.test.json b/test/bipm/si/2019/base/prefixed/yottametre.test.json
index 922852b9..339d54be 100644
--- a/test/bipm/si/2019/base/prefixed/yottametre.test.json
+++ b/test/bipm/si/2019/base/prefixed/yottametre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yottametre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yottametre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/yottamole.test.json b/test/bipm/si/2019/base/prefixed/yottamole.test.json
index 99789eef..56702207 100644
--- a/test/bipm/si/2019/base/prefixed/yottamole.test.json
+++ b/test/bipm/si/2019/base/prefixed/yottamole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yottamole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yottamole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/yottasecond.test.json b/test/bipm/si/2019/base/prefixed/yottasecond.test.json
index 2b7b7a33..ed794789 100644
--- a/test/bipm/si/2019/base/prefixed/yottasecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/yottasecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/yottasecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/yottasecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/zeptoampere.test.json b/test/bipm/si/2019/base/prefixed/zeptoampere.test.json
index da82f060..c951100e 100644
--- a/test/bipm/si/2019/base/prefixed/zeptoampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/zeptoampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zeptoampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zeptoampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/zeptocandela.test.json b/test/bipm/si/2019/base/prefixed/zeptocandela.test.json
index fde84598..b555e831 100644
--- a/test/bipm/si/2019/base/prefixed/zeptocandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/zeptocandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zeptocandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zeptocandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/zeptogram.test.json b/test/bipm/si/2019/base/prefixed/zeptogram.test.json
index e437a823..4ab83915 100644
--- a/test/bipm/si/2019/base/prefixed/zeptogram.test.json
+++ b/test/bipm/si/2019/base/prefixed/zeptogram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zeptogram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zeptogram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/zeptokelvin.test.json b/test/bipm/si/2019/base/prefixed/zeptokelvin.test.json
index 4b4b5dcd..9549cc71 100644
--- a/test/bipm/si/2019/base/prefixed/zeptokelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/zeptokelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zeptokelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zeptokelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/zeptometre.test.json b/test/bipm/si/2019/base/prefixed/zeptometre.test.json
index ca140143..ab964859 100644
--- a/test/bipm/si/2019/base/prefixed/zeptometre.test.json
+++ b/test/bipm/si/2019/base/prefixed/zeptometre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zeptometre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zeptometre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/zeptomole.test.json b/test/bipm/si/2019/base/prefixed/zeptomole.test.json
index e5e9ad85..0f7ed8d4 100644
--- a/test/bipm/si/2019/base/prefixed/zeptomole.test.json
+++ b/test/bipm/si/2019/base/prefixed/zeptomole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zeptomole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zeptomole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/zeptosecond.test.json b/test/bipm/si/2019/base/prefixed/zeptosecond.test.json
index 43fbc2d1..31c443ee 100644
--- a/test/bipm/si/2019/base/prefixed/zeptosecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/zeptosecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zeptosecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zeptosecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/zettaampere.test.json b/test/bipm/si/2019/base/prefixed/zettaampere.test.json
index ca253a86..5e9a451a 100644
--- a/test/bipm/si/2019/base/prefixed/zettaampere.test.json
+++ b/test/bipm/si/2019/base/prefixed/zettaampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zettaampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zettaampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/zettacandela.test.json b/test/bipm/si/2019/base/prefixed/zettacandela.test.json
index 8cc2105f..80d70ba6 100644
--- a/test/bipm/si/2019/base/prefixed/zettacandela.test.json
+++ b/test/bipm/si/2019/base/prefixed/zettacandela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zettacandela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zettacandela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/zettagram.test.json b/test/bipm/si/2019/base/prefixed/zettagram.test.json
index 82aef7f1..b55910a0 100644
--- a/test/bipm/si/2019/base/prefixed/zettagram.test.json
+++ b/test/bipm/si/2019/base/prefixed/zettagram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zettagram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zettagram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/zettakelvin.test.json b/test/bipm/si/2019/base/prefixed/zettakelvin.test.json
index c570cb48..e91ad58d 100644
--- a/test/bipm/si/2019/base/prefixed/zettakelvin.test.json
+++ b/test/bipm/si/2019/base/prefixed/zettakelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zettakelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zettakelvin.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/zettametre.test.json b/test/bipm/si/2019/base/prefixed/zettametre.test.json
index 4f463a95..662b4527 100644
--- a/test/bipm/si/2019/base/prefixed/zettametre.test.json
+++ b/test/bipm/si/2019/base/prefixed/zettametre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zettametre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zettametre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/prefixed/zettamole.test.json b/test/bipm/si/2019/base/prefixed/zettamole.test.json
index 3e482aa1..40f49f32 100644
--- a/test/bipm/si/2019/base/prefixed/zettamole.test.json
+++ b/test/bipm/si/2019/base/prefixed/zettamole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zettamole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zettamole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/prefixed/zettasecond.test.json b/test/bipm/si/2019/base/prefixed/zettasecond.test.json
index 05950eb5..4ddf7653 100644
--- a/test/bipm/si/2019/base/prefixed/zettasecond.test.json
+++ b/test/bipm/si/2019/base/prefixed/zettasecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/prefixed/zettasecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/prefixed/zettasecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/quantity/amount-of-substance.test.json b/test/bipm/si/2019/base/quantity/amount-of-substance.test.json
index 3e323c34..291e65ec 100644
--- a/test/bipm/si/2019/base/quantity/amount-of-substance.test.json
+++ b/test/bipm/si/2019/base/quantity/amount-of-substance.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/quantity/amount-of-substance.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/quantity/amount-of-substance.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/base/quantity/electric-current.test.json b/test/bipm/si/2019/base/quantity/electric-current.test.json
index fac2d580..fc8d4051 100644
--- a/test/bipm/si/2019/base/quantity/electric-current.test.json
+++ b/test/bipm/si/2019/base/quantity/electric-current.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/quantity/electric-current.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/quantity/electric-current.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/base/quantity/length.test.json b/test/bipm/si/2019/base/quantity/length.test.json
index 9e40896b..5be3764b 100644
--- a/test/bipm/si/2019/base/quantity/length.test.json
+++ b/test/bipm/si/2019/base/quantity/length.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/quantity/length.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/quantity/length.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/base/quantity/luminous-intensity.test.json b/test/bipm/si/2019/base/quantity/luminous-intensity.test.json
index 272513a2..f7fb8bf1 100644
--- a/test/bipm/si/2019/base/quantity/luminous-intensity.test.json
+++ b/test/bipm/si/2019/base/quantity/luminous-intensity.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/quantity/luminous-intensity.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/quantity/luminous-intensity.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/base/quantity/mass.test.json b/test/bipm/si/2019/base/quantity/mass.test.json
index 428ba18e..a8dccd5a 100644
--- a/test/bipm/si/2019/base/quantity/mass.test.json
+++ b/test/bipm/si/2019/base/quantity/mass.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/quantity/mass.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/quantity/mass.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/base/quantity/thermodynamic-temperature.test.json b/test/bipm/si/2019/base/quantity/thermodynamic-temperature.test.json
index 0308fa86..bb0b54b2 100644
--- a/test/bipm/si/2019/base/quantity/thermodynamic-temperature.test.json
+++ b/test/bipm/si/2019/base/quantity/thermodynamic-temperature.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/quantity/thermodynamic-temperature.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/quantity/thermodynamic-temperature.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/base/quantity/time.test.json b/test/bipm/si/2019/base/quantity/time.test.json
index 18fc5629..8161c486 100644
--- a/test/bipm/si/2019/base/quantity/time.test.json
+++ b/test/bipm/si/2019/base/quantity/time.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/quantity/time.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/quantity/time.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/base/symbol.test.json b/test/bipm/si/2019/base/symbol.test.json
index c41fe660..f67acc47 100644
--- a/test/bipm/si/2019/base/symbol.test.json
+++ b/test/bipm/si/2019/base/symbol.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/base/symbol.json",
+  "target": "../../../../../schemas/bipm/si/2019/base/symbol.json",
   "tests": [
     {
       "description": "Valid - second",
diff --git a/test/bipm/si/2019/base/unit/ampere.test.json b/test/bipm/si/2019/base/unit/ampere.test.json
index 72259e74..b0fba55e 100644
--- a/test/bipm/si/2019/base/unit/ampere.test.json
+++ b/test/bipm/si/2019/base/unit/ampere.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/unit/ampere.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/unit/ampere.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/unit/candela.test.json b/test/bipm/si/2019/base/unit/candela.test.json
index 5b202fae..cd45dcc4 100644
--- a/test/bipm/si/2019/base/unit/candela.test.json
+++ b/test/bipm/si/2019/base/unit/candela.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/unit/candela.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/unit/candela.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/unit/kelvin.test.json b/test/bipm/si/2019/base/unit/kelvin.test.json
index 610cb2ef..c73682c9 100644
--- a/test/bipm/si/2019/base/unit/kelvin.test.json
+++ b/test/bipm/si/2019/base/unit/kelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/unit/kelvin.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/unit/kelvin.json",
   "tests": [
     {
       "description": "Valid - absolute zero",
diff --git a/test/bipm/si/2019/base/unit/kilogram.test.json b/test/bipm/si/2019/base/unit/kilogram.test.json
index d4c3c7ed..e460e9eb 100644
--- a/test/bipm/si/2019/base/unit/kilogram.test.json
+++ b/test/bipm/si/2019/base/unit/kilogram.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/unit/kilogram.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/unit/kilogram.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/unit/metre.test.json b/test/bipm/si/2019/base/unit/metre.test.json
index 697c254a..8a06dae2 100644
--- a/test/bipm/si/2019/base/unit/metre.test.json
+++ b/test/bipm/si/2019/base/unit/metre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/unit/metre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/unit/metre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/base/unit/mole.test.json b/test/bipm/si/2019/base/unit/mole.test.json
index 03187c6f..0823a08a 100644
--- a/test/bipm/si/2019/base/unit/mole.test.json
+++ b/test/bipm/si/2019/base/unit/mole.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/unit/mole.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/unit/mole.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/base/unit/second.test.json b/test/bipm/si/2019/base/unit/second.test.json
index 89230fa9..2fbff852 100644
--- a/test/bipm/si/2019/base/unit/second.test.json
+++ b/test/bipm/si/2019/base/unit/second.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/base/unit/second.json",
+  "target": "../../../../../../schemas/bipm/si/2019/base/unit/second.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/compound/joule-per-kelvin.test.json b/test/bipm/si/2019/compound/joule-per-kelvin.test.json
index e94aba25..8583ffa7 100644
--- a/test/bipm/si/2019/compound/joule-per-kelvin.test.json
+++ b/test/bipm/si/2019/compound/joule-per-kelvin.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/compound/joule-per-kelvin.json",
+  "target": "../../../../../schemas/bipm/si/2019/compound/joule-per-kelvin.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/compound/joule-second.test.json b/test/bipm/si/2019/compound/joule-second.test.json
index 69033cd0..ffc4557e 100644
--- a/test/bipm/si/2019/compound/joule-second.test.json
+++ b/test/bipm/si/2019/compound/joule-second.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/compound/joule-second.json",
+  "target": "../../../../../schemas/bipm/si/2019/compound/joule-second.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/compound/lumen-per-watt.test.json b/test/bipm/si/2019/compound/lumen-per-watt.test.json
index 2b44a6d5..ff171ad9 100644
--- a/test/bipm/si/2019/compound/lumen-per-watt.test.json
+++ b/test/bipm/si/2019/compound/lumen-per-watt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/compound/lumen-per-watt.json",
+  "target": "../../../../../schemas/bipm/si/2019/compound/lumen-per-watt.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/compound/metre-per-second.test.json b/test/bipm/si/2019/compound/metre-per-second.test.json
index dc188307..01e2e646 100644
--- a/test/bipm/si/2019/compound/metre-per-second.test.json
+++ b/test/bipm/si/2019/compound/metre-per-second.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/compound/metre-per-second.json",
+  "target": "../../../../../schemas/bipm/si/2019/compound/metre-per-second.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/constant/avogadro.test.json b/test/bipm/si/2019/constant/avogadro.test.json
index 843f1e83..07e24e02 100644
--- a/test/bipm/si/2019/constant/avogadro.test.json
+++ b/test/bipm/si/2019/constant/avogadro.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/constant/avogadro.json",
+  "target": "../../../../../schemas/bipm/si/2019/constant/avogadro.json",
   "tests": [
     {
       "description": "Valid - exact value",
diff --git a/test/bipm/si/2019/constant/boltzmann.test.json b/test/bipm/si/2019/constant/boltzmann.test.json
index 76181559..07f744ab 100644
--- a/test/bipm/si/2019/constant/boltzmann.test.json
+++ b/test/bipm/si/2019/constant/boltzmann.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/constant/boltzmann.json",
+  "target": "../../../../../schemas/bipm/si/2019/constant/boltzmann.json",
   "tests": [
     {
       "description": "Valid - exact value",
diff --git a/test/bipm/si/2019/constant/caesium-frequency.test.json b/test/bipm/si/2019/constant/caesium-frequency.test.json
index bc0f8d5c..1c111aae 100644
--- a/test/bipm/si/2019/constant/caesium-frequency.test.json
+++ b/test/bipm/si/2019/constant/caesium-frequency.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/constant/caesium-frequency.json",
+  "target": "../../../../../schemas/bipm/si/2019/constant/caesium-frequency.json",
   "tests": [
     {
       "description": "Valid - exact value",
diff --git a/test/bipm/si/2019/constant/elementary-charge.test.json b/test/bipm/si/2019/constant/elementary-charge.test.json
index a594c81a..c53e75c5 100644
--- a/test/bipm/si/2019/constant/elementary-charge.test.json
+++ b/test/bipm/si/2019/constant/elementary-charge.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/constant/elementary-charge.json",
+  "target": "../../../../../schemas/bipm/si/2019/constant/elementary-charge.json",
   "tests": [
     {
       "description": "Valid - exact value",
diff --git a/test/bipm/si/2019/constant/light-speed.test.json b/test/bipm/si/2019/constant/light-speed.test.json
index c9b0abc4..0816424b 100644
--- a/test/bipm/si/2019/constant/light-speed.test.json
+++ b/test/bipm/si/2019/constant/light-speed.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/constant/light-speed.json",
+  "target": "../../../../../schemas/bipm/si/2019/constant/light-speed.json",
   "tests": [
     {
       "description": "Valid - exact value",
diff --git a/test/bipm/si/2019/constant/luminous-efficacy.test.json b/test/bipm/si/2019/constant/luminous-efficacy.test.json
index cba4698f..e48e57fc 100644
--- a/test/bipm/si/2019/constant/luminous-efficacy.test.json
+++ b/test/bipm/si/2019/constant/luminous-efficacy.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/constant/luminous-efficacy.json",
+  "target": "../../../../../schemas/bipm/si/2019/constant/luminous-efficacy.json",
   "tests": [
     {
       "description": "Valid - exact value",
diff --git a/test/bipm/si/2019/constant/planck.test.json b/test/bipm/si/2019/constant/planck.test.json
index 00ab8c67..63c91473 100644
--- a/test/bipm/si/2019/constant/planck.test.json
+++ b/test/bipm/si/2019/constant/planck.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/constant/planck.json",
+  "target": "../../../../../schemas/bipm/si/2019/constant/planck.json",
   "tests": [
     {
       "description": "Valid - exact value",
diff --git a/test/bipm/si/2019/derived/prefixed/attobecquerel.test.json b/test/bipm/si/2019/derived/prefixed/attobecquerel.test.json
index 7546fdaf..b9d845ca 100644
--- a/test/bipm/si/2019/derived/prefixed/attobecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attobecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attobecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attobecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/attocoulomb.test.json b/test/bipm/si/2019/derived/prefixed/attocoulomb.test.json
index bf65b25f..53297ffa 100644
--- a/test/bipm/si/2019/derived/prefixed/attocoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attocoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attocoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attocoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attodegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/attodegree-celsius.test.json
index f38c54d4..4c688dad 100644
--- a/test/bipm/si/2019/derived/prefixed/attodegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attodegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attodegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attodegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attofarad.test.json b/test/bipm/si/2019/derived/prefixed/attofarad.test.json
index 44577327..8954c1b5 100644
--- a/test/bipm/si/2019/derived/prefixed/attofarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attofarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attofarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attofarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/attogray.test.json b/test/bipm/si/2019/derived/prefixed/attogray.test.json
index 2876b058..8858eedd 100644
--- a/test/bipm/si/2019/derived/prefixed/attogray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attogray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attogray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attogray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attohenry.test.json b/test/bipm/si/2019/derived/prefixed/attohenry.test.json
index cbbf7189..9dce987b 100644
--- a/test/bipm/si/2019/derived/prefixed/attohenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attohenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attohenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attohenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/attohertz.test.json b/test/bipm/si/2019/derived/prefixed/attohertz.test.json
index 8b8b8e1b..78f8d496 100644
--- a/test/bipm/si/2019/derived/prefixed/attohertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attohertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attohertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attohertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/attojoule.test.json b/test/bipm/si/2019/derived/prefixed/attojoule.test.json
index 5069c647..bc43148b 100644
--- a/test/bipm/si/2019/derived/prefixed/attojoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attojoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attojoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attojoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attokatal.test.json b/test/bipm/si/2019/derived/prefixed/attokatal.test.json
index ad4c68fe..c44d7d09 100644
--- a/test/bipm/si/2019/derived/prefixed/attokatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attokatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attokatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attokatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/attolumen.test.json b/test/bipm/si/2019/derived/prefixed/attolumen.test.json
index f0270c50..a8c12508 100644
--- a/test/bipm/si/2019/derived/prefixed/attolumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attolumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attolumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attolumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attolux.test.json b/test/bipm/si/2019/derived/prefixed/attolux.test.json
index f95806e5..653cbc61 100644
--- a/test/bipm/si/2019/derived/prefixed/attolux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attolux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attolux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attolux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attonewton.test.json b/test/bipm/si/2019/derived/prefixed/attonewton.test.json
index 01ad2828..a5694556 100644
--- a/test/bipm/si/2019/derived/prefixed/attonewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attonewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attonewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attonewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attoohm.test.json b/test/bipm/si/2019/derived/prefixed/attoohm.test.json
index 214c7a73..51706145 100644
--- a/test/bipm/si/2019/derived/prefixed/attoohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attoohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attoohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attoohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/attopascal.test.json b/test/bipm/si/2019/derived/prefixed/attopascal.test.json
index bc731511..cd13f4ac 100644
--- a/test/bipm/si/2019/derived/prefixed/attopascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attopascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attopascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attopascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attoradian.test.json b/test/bipm/si/2019/derived/prefixed/attoradian.test.json
index 2147a2ca..299d1f00 100644
--- a/test/bipm/si/2019/derived/prefixed/attoradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attoradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attoradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attoradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attosiemens.test.json b/test/bipm/si/2019/derived/prefixed/attosiemens.test.json
index c4cb429e..427d1c58 100644
--- a/test/bipm/si/2019/derived/prefixed/attosiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attosiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attosiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attosiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/attosievert.test.json b/test/bipm/si/2019/derived/prefixed/attosievert.test.json
index 1d9dec53..d450c2ba 100644
--- a/test/bipm/si/2019/derived/prefixed/attosievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attosievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attosievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attosievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attosteradian.test.json b/test/bipm/si/2019/derived/prefixed/attosteradian.test.json
index 95feb920..92a3b149 100644
--- a/test/bipm/si/2019/derived/prefixed/attosteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attosteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attosteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attosteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attotesla.test.json b/test/bipm/si/2019/derived/prefixed/attotesla.test.json
index cfb3a83b..253e5558 100644
--- a/test/bipm/si/2019/derived/prefixed/attotesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attotesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attotesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attotesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attovolt.test.json b/test/bipm/si/2019/derived/prefixed/attovolt.test.json
index 2fdcdeae..74c486ed 100644
--- a/test/bipm/si/2019/derived/prefixed/attovolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attovolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attovolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attovolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attowatt.test.json b/test/bipm/si/2019/derived/prefixed/attowatt.test.json
index 6e985888..d80b7b43 100644
--- a/test/bipm/si/2019/derived/prefixed/attowatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attowatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attowatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attowatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/attoweber.test.json b/test/bipm/si/2019/derived/prefixed/attoweber.test.json
index 2b06be01..9d29f899 100644
--- a/test/bipm/si/2019/derived/prefixed/attoweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/attoweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/attoweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/attoweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centibecquerel.test.json b/test/bipm/si/2019/derived/prefixed/centibecquerel.test.json
index ce271936..fcb0bfa3 100644
--- a/test/bipm/si/2019/derived/prefixed/centibecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centibecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centibecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centibecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/centicoulomb.test.json b/test/bipm/si/2019/derived/prefixed/centicoulomb.test.json
index 52e58896..b85146e8 100644
--- a/test/bipm/si/2019/derived/prefixed/centicoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centicoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centicoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centicoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centidegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/centidegree-celsius.test.json
index dcdc050b..62a5de3f 100644
--- a/test/bipm/si/2019/derived/prefixed/centidegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centidegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centidegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centidegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centifarad.test.json b/test/bipm/si/2019/derived/prefixed/centifarad.test.json
index 7c0c0255..7250ccd4 100644
--- a/test/bipm/si/2019/derived/prefixed/centifarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centifarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centifarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centifarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/centigray.test.json b/test/bipm/si/2019/derived/prefixed/centigray.test.json
index fc4842a8..aa11cbf6 100644
--- a/test/bipm/si/2019/derived/prefixed/centigray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centigray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centigray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centigray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centihenry.test.json b/test/bipm/si/2019/derived/prefixed/centihenry.test.json
index e58a6fa6..aefc828b 100644
--- a/test/bipm/si/2019/derived/prefixed/centihenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centihenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centihenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centihenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/centihertz.test.json b/test/bipm/si/2019/derived/prefixed/centihertz.test.json
index 467256a9..09e71c4d 100644
--- a/test/bipm/si/2019/derived/prefixed/centihertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centihertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centihertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centihertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/centijoule.test.json b/test/bipm/si/2019/derived/prefixed/centijoule.test.json
index db120fa5..bef60d11 100644
--- a/test/bipm/si/2019/derived/prefixed/centijoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centijoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centijoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centijoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centikatal.test.json b/test/bipm/si/2019/derived/prefixed/centikatal.test.json
index 9f01d0c5..ef98fcab 100644
--- a/test/bipm/si/2019/derived/prefixed/centikatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centikatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centikatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centikatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/centilumen.test.json b/test/bipm/si/2019/derived/prefixed/centilumen.test.json
index 5263ddb6..f99e2175 100644
--- a/test/bipm/si/2019/derived/prefixed/centilumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centilumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centilumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centilumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centilux.test.json b/test/bipm/si/2019/derived/prefixed/centilux.test.json
index 80a46d24..71fd47a8 100644
--- a/test/bipm/si/2019/derived/prefixed/centilux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centilux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centilux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centilux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centinewton.test.json b/test/bipm/si/2019/derived/prefixed/centinewton.test.json
index fd636be8..909322dd 100644
--- a/test/bipm/si/2019/derived/prefixed/centinewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centinewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centinewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centinewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centiohm.test.json b/test/bipm/si/2019/derived/prefixed/centiohm.test.json
index 1ecc512a..0ddb2cbe 100644
--- a/test/bipm/si/2019/derived/prefixed/centiohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centiohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centiohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centiohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/centipascal.test.json b/test/bipm/si/2019/derived/prefixed/centipascal.test.json
index 8a7ebe7d..fc90678a 100644
--- a/test/bipm/si/2019/derived/prefixed/centipascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centipascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centipascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centipascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centiradian.test.json b/test/bipm/si/2019/derived/prefixed/centiradian.test.json
index c6a11486..8014a5d3 100644
--- a/test/bipm/si/2019/derived/prefixed/centiradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centiradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centiradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centiradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centisiemens.test.json b/test/bipm/si/2019/derived/prefixed/centisiemens.test.json
index fc238ef5..2868c96a 100644
--- a/test/bipm/si/2019/derived/prefixed/centisiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centisiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centisiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centisiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/centisievert.test.json b/test/bipm/si/2019/derived/prefixed/centisievert.test.json
index 6f80dd12..3fdd44a6 100644
--- a/test/bipm/si/2019/derived/prefixed/centisievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centisievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centisievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centisievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centisteradian.test.json b/test/bipm/si/2019/derived/prefixed/centisteradian.test.json
index 4c4322ec..82d74e49 100644
--- a/test/bipm/si/2019/derived/prefixed/centisteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centisteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centisteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centisteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centitesla.test.json b/test/bipm/si/2019/derived/prefixed/centitesla.test.json
index 2242fb6b..aa6c333e 100644
--- a/test/bipm/si/2019/derived/prefixed/centitesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centitesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centitesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centitesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centivolt.test.json b/test/bipm/si/2019/derived/prefixed/centivolt.test.json
index 1503893e..d4a2c96a 100644
--- a/test/bipm/si/2019/derived/prefixed/centivolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centivolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centivolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centivolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centiwatt.test.json b/test/bipm/si/2019/derived/prefixed/centiwatt.test.json
index c19fdafe..b37f119c 100644
--- a/test/bipm/si/2019/derived/prefixed/centiwatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centiwatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centiwatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centiwatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/centiweber.test.json b/test/bipm/si/2019/derived/prefixed/centiweber.test.json
index 1d86eb85..b7c22130 100644
--- a/test/bipm/si/2019/derived/prefixed/centiweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/centiweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/centiweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/centiweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decabecquerel.test.json b/test/bipm/si/2019/derived/prefixed/decabecquerel.test.json
index b564b014..19f0ec58 100644
--- a/test/bipm/si/2019/derived/prefixed/decabecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decabecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decabecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decabecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decacoulomb.test.json b/test/bipm/si/2019/derived/prefixed/decacoulomb.test.json
index d2875ea0..791ed6d3 100644
--- a/test/bipm/si/2019/derived/prefixed/decacoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decacoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decacoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decacoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decadegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/decadegree-celsius.test.json
index 734c4331..accd5990 100644
--- a/test/bipm/si/2019/derived/prefixed/decadegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decadegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decadegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decadegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decafarad.test.json b/test/bipm/si/2019/derived/prefixed/decafarad.test.json
index 1b14d4be..cdd45caf 100644
--- a/test/bipm/si/2019/derived/prefixed/decafarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decafarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decafarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decafarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decagray.test.json b/test/bipm/si/2019/derived/prefixed/decagray.test.json
index 5443cedd..015e2108 100644
--- a/test/bipm/si/2019/derived/prefixed/decagray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decagray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decagray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decagray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decahenry.test.json b/test/bipm/si/2019/derived/prefixed/decahenry.test.json
index 72db8ade..ea324cb5 100644
--- a/test/bipm/si/2019/derived/prefixed/decahenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decahenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decahenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decahenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decahertz.test.json b/test/bipm/si/2019/derived/prefixed/decahertz.test.json
index 4b5507cc..dbc395f8 100644
--- a/test/bipm/si/2019/derived/prefixed/decahertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decahertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decahertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decahertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decajoule.test.json b/test/bipm/si/2019/derived/prefixed/decajoule.test.json
index c8d76dd3..0550c5af 100644
--- a/test/bipm/si/2019/derived/prefixed/decajoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decajoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decajoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decajoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decakatal.test.json b/test/bipm/si/2019/derived/prefixed/decakatal.test.json
index 4ea209da..66b3c845 100644
--- a/test/bipm/si/2019/derived/prefixed/decakatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decakatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decakatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decakatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decalumen.test.json b/test/bipm/si/2019/derived/prefixed/decalumen.test.json
index 180679c9..c557e892 100644
--- a/test/bipm/si/2019/derived/prefixed/decalumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decalumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decalumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decalumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decalux.test.json b/test/bipm/si/2019/derived/prefixed/decalux.test.json
index d022c01d..2ef7a97b 100644
--- a/test/bipm/si/2019/derived/prefixed/decalux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decalux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decalux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decalux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decanewton.test.json b/test/bipm/si/2019/derived/prefixed/decanewton.test.json
index cabf2b59..14f68840 100644
--- a/test/bipm/si/2019/derived/prefixed/decanewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decanewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decanewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decanewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decaohm.test.json b/test/bipm/si/2019/derived/prefixed/decaohm.test.json
index b998506b..4fd32b9e 100644
--- a/test/bipm/si/2019/derived/prefixed/decaohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decaohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decaohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decaohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decapascal.test.json b/test/bipm/si/2019/derived/prefixed/decapascal.test.json
index 548ec05c..a62a26c9 100644
--- a/test/bipm/si/2019/derived/prefixed/decapascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decapascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decapascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decapascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decaradian.test.json b/test/bipm/si/2019/derived/prefixed/decaradian.test.json
index f550839f..09ef8dc8 100644
--- a/test/bipm/si/2019/derived/prefixed/decaradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decaradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decaradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decaradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decasiemens.test.json b/test/bipm/si/2019/derived/prefixed/decasiemens.test.json
index 1c1d7182..c049b289 100644
--- a/test/bipm/si/2019/derived/prefixed/decasiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decasiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decasiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decasiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decasievert.test.json b/test/bipm/si/2019/derived/prefixed/decasievert.test.json
index 8fd4ec7d..c6f3c6fe 100644
--- a/test/bipm/si/2019/derived/prefixed/decasievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decasievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decasievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decasievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decasteradian.test.json b/test/bipm/si/2019/derived/prefixed/decasteradian.test.json
index b0b3e47c..c12bf7a0 100644
--- a/test/bipm/si/2019/derived/prefixed/decasteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decasteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decasteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decasteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decatesla.test.json b/test/bipm/si/2019/derived/prefixed/decatesla.test.json
index 03e088ad..ab9f94f5 100644
--- a/test/bipm/si/2019/derived/prefixed/decatesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decatesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decatesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decatesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decavolt.test.json b/test/bipm/si/2019/derived/prefixed/decavolt.test.json
index a140384a..f763d9f4 100644
--- a/test/bipm/si/2019/derived/prefixed/decavolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decavolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decavolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decavolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decawatt.test.json b/test/bipm/si/2019/derived/prefixed/decawatt.test.json
index bd4bb067..f2c9d756 100644
--- a/test/bipm/si/2019/derived/prefixed/decawatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decawatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decawatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decawatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decaweber.test.json b/test/bipm/si/2019/derived/prefixed/decaweber.test.json
index d800407b..d5b54eaf 100644
--- a/test/bipm/si/2019/derived/prefixed/decaweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decaweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decaweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decaweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decibecquerel.test.json b/test/bipm/si/2019/derived/prefixed/decibecquerel.test.json
index bd0dcfc1..c5c0560c 100644
--- a/test/bipm/si/2019/derived/prefixed/decibecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decibecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decibecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decibecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decicoulomb.test.json b/test/bipm/si/2019/derived/prefixed/decicoulomb.test.json
index f80f90bd..27821351 100644
--- a/test/bipm/si/2019/derived/prefixed/decicoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decicoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decicoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decicoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decidegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/decidegree-celsius.test.json
index 5d8b1274..d3b4abf9 100644
--- a/test/bipm/si/2019/derived/prefixed/decidegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decidegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decidegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decidegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decifarad.test.json b/test/bipm/si/2019/derived/prefixed/decifarad.test.json
index 8c0a3cde..f13dc563 100644
--- a/test/bipm/si/2019/derived/prefixed/decifarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decifarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decifarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decifarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decigray.test.json b/test/bipm/si/2019/derived/prefixed/decigray.test.json
index 6b613b66..d336ffd9 100644
--- a/test/bipm/si/2019/derived/prefixed/decigray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decigray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decigray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decigray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decihenry.test.json b/test/bipm/si/2019/derived/prefixed/decihenry.test.json
index 64c41a37..1a94a59a 100644
--- a/test/bipm/si/2019/derived/prefixed/decihenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decihenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decihenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decihenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decihertz.test.json b/test/bipm/si/2019/derived/prefixed/decihertz.test.json
index d0d25e9b..79037cf5 100644
--- a/test/bipm/si/2019/derived/prefixed/decihertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decihertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decihertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decihertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decijoule.test.json b/test/bipm/si/2019/derived/prefixed/decijoule.test.json
index 9ce1a7d8..f34ee7a8 100644
--- a/test/bipm/si/2019/derived/prefixed/decijoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decijoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decijoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decijoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decikatal.test.json b/test/bipm/si/2019/derived/prefixed/decikatal.test.json
index 7dad98ef..a5f4967f 100644
--- a/test/bipm/si/2019/derived/prefixed/decikatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decikatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decikatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decikatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decilumen.test.json b/test/bipm/si/2019/derived/prefixed/decilumen.test.json
index 7b216c64..bd8b68c9 100644
--- a/test/bipm/si/2019/derived/prefixed/decilumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decilumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decilumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decilumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decilux.test.json b/test/bipm/si/2019/derived/prefixed/decilux.test.json
index 5ae2c4cd..9ea9de0f 100644
--- a/test/bipm/si/2019/derived/prefixed/decilux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decilux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decilux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decilux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decinewton.test.json b/test/bipm/si/2019/derived/prefixed/decinewton.test.json
index a91ac3ea..afaf8da7 100644
--- a/test/bipm/si/2019/derived/prefixed/decinewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decinewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decinewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decinewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/deciohm.test.json b/test/bipm/si/2019/derived/prefixed/deciohm.test.json
index 0b81ccea..c9f1770b 100644
--- a/test/bipm/si/2019/derived/prefixed/deciohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/deciohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/deciohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/deciohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decipascal.test.json b/test/bipm/si/2019/derived/prefixed/decipascal.test.json
index 65a16785..1cfd8136 100644
--- a/test/bipm/si/2019/derived/prefixed/decipascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decipascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decipascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decipascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/deciradian.test.json b/test/bipm/si/2019/derived/prefixed/deciradian.test.json
index aaeff678..29d0eded 100644
--- a/test/bipm/si/2019/derived/prefixed/deciradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/deciradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/deciradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/deciradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decisiemens.test.json b/test/bipm/si/2019/derived/prefixed/decisiemens.test.json
index 7c9adcc7..e090bfbb 100644
--- a/test/bipm/si/2019/derived/prefixed/decisiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decisiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decisiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decisiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/decisievert.test.json b/test/bipm/si/2019/derived/prefixed/decisievert.test.json
index 1220ed60..6b5d4e29 100644
--- a/test/bipm/si/2019/derived/prefixed/decisievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decisievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decisievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decisievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decisteradian.test.json b/test/bipm/si/2019/derived/prefixed/decisteradian.test.json
index 81c68edf..c8321c2b 100644
--- a/test/bipm/si/2019/derived/prefixed/decisteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decisteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decisteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decisteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decitesla.test.json b/test/bipm/si/2019/derived/prefixed/decitesla.test.json
index 6b72388e..42e63741 100644
--- a/test/bipm/si/2019/derived/prefixed/decitesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decitesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decitesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decitesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/decivolt.test.json b/test/bipm/si/2019/derived/prefixed/decivolt.test.json
index 423e98ed..e3247f40 100644
--- a/test/bipm/si/2019/derived/prefixed/decivolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/decivolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/decivolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/decivolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/deciwatt.test.json b/test/bipm/si/2019/derived/prefixed/deciwatt.test.json
index c05070a3..6bc83201 100644
--- a/test/bipm/si/2019/derived/prefixed/deciwatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/deciwatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/deciwatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/deciwatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/deciweber.test.json b/test/bipm/si/2019/derived/prefixed/deciweber.test.json
index edc05f25..8fb067a1 100644
--- a/test/bipm/si/2019/derived/prefixed/deciweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/deciweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/deciweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/deciweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exabecquerel.test.json b/test/bipm/si/2019/derived/prefixed/exabecquerel.test.json
index 107749e1..72458925 100644
--- a/test/bipm/si/2019/derived/prefixed/exabecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exabecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exabecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exabecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/exacoulomb.test.json b/test/bipm/si/2019/derived/prefixed/exacoulomb.test.json
index 955c9f94..ebfbd161 100644
--- a/test/bipm/si/2019/derived/prefixed/exacoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exacoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exacoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exacoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exadegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/exadegree-celsius.test.json
index 7467d60b..902fba71 100644
--- a/test/bipm/si/2019/derived/prefixed/exadegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exadegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exadegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exadegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exafarad.test.json b/test/bipm/si/2019/derived/prefixed/exafarad.test.json
index 69ed2327..9ce74102 100644
--- a/test/bipm/si/2019/derived/prefixed/exafarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exafarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exafarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exafarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/exagray.test.json b/test/bipm/si/2019/derived/prefixed/exagray.test.json
index d19c2c53..40c78d6e 100644
--- a/test/bipm/si/2019/derived/prefixed/exagray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exagray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exagray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exagray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exahenry.test.json b/test/bipm/si/2019/derived/prefixed/exahenry.test.json
index 3653ed27..373b2ac8 100644
--- a/test/bipm/si/2019/derived/prefixed/exahenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exahenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exahenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exahenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/exahertz.test.json b/test/bipm/si/2019/derived/prefixed/exahertz.test.json
index 0f7ffac3..831fd0dd 100644
--- a/test/bipm/si/2019/derived/prefixed/exahertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exahertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exahertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exahertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/exajoule.test.json b/test/bipm/si/2019/derived/prefixed/exajoule.test.json
index a34117aa..ef898619 100644
--- a/test/bipm/si/2019/derived/prefixed/exajoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exajoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exajoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exajoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exakatal.test.json b/test/bipm/si/2019/derived/prefixed/exakatal.test.json
index 1531110c..6e64807d 100644
--- a/test/bipm/si/2019/derived/prefixed/exakatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exakatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exakatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exakatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/exalumen.test.json b/test/bipm/si/2019/derived/prefixed/exalumen.test.json
index 9117558e..d73115c7 100644
--- a/test/bipm/si/2019/derived/prefixed/exalumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exalumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exalumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exalumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exalux.test.json b/test/bipm/si/2019/derived/prefixed/exalux.test.json
index 5d8d8826..149e3b3b 100644
--- a/test/bipm/si/2019/derived/prefixed/exalux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exalux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exalux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exalux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exanewton.test.json b/test/bipm/si/2019/derived/prefixed/exanewton.test.json
index e43e71dc..01d1611a 100644
--- a/test/bipm/si/2019/derived/prefixed/exanewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exanewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exanewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exanewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exaohm.test.json b/test/bipm/si/2019/derived/prefixed/exaohm.test.json
index 75450dfe..1f65d01e 100644
--- a/test/bipm/si/2019/derived/prefixed/exaohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exaohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exaohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exaohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/exapascal.test.json b/test/bipm/si/2019/derived/prefixed/exapascal.test.json
index 65b6858f..df669955 100644
--- a/test/bipm/si/2019/derived/prefixed/exapascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exapascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exapascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exapascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exaradian.test.json b/test/bipm/si/2019/derived/prefixed/exaradian.test.json
index 80882181..96e2ac0e 100644
--- a/test/bipm/si/2019/derived/prefixed/exaradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exaradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exaradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exaradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exasiemens.test.json b/test/bipm/si/2019/derived/prefixed/exasiemens.test.json
index e75d032d..65e1c2da 100644
--- a/test/bipm/si/2019/derived/prefixed/exasiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exasiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exasiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exasiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/exasievert.test.json b/test/bipm/si/2019/derived/prefixed/exasievert.test.json
index b6ed74d9..ddcba6ae 100644
--- a/test/bipm/si/2019/derived/prefixed/exasievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exasievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exasievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exasievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exasteradian.test.json b/test/bipm/si/2019/derived/prefixed/exasteradian.test.json
index 6d5fe26d..22f376d8 100644
--- a/test/bipm/si/2019/derived/prefixed/exasteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exasteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exasteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exasteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exatesla.test.json b/test/bipm/si/2019/derived/prefixed/exatesla.test.json
index 76b3593f..1a5238a5 100644
--- a/test/bipm/si/2019/derived/prefixed/exatesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exatesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exatesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exatesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exavolt.test.json b/test/bipm/si/2019/derived/prefixed/exavolt.test.json
index 8dd8fb8c..e891d0ef 100644
--- a/test/bipm/si/2019/derived/prefixed/exavolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exavolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exavolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exavolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exawatt.test.json b/test/bipm/si/2019/derived/prefixed/exawatt.test.json
index 00efb343..824609ce 100644
--- a/test/bipm/si/2019/derived/prefixed/exawatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exawatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exawatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exawatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/exaweber.test.json b/test/bipm/si/2019/derived/prefixed/exaweber.test.json
index 050c4f0e..3391bbff 100644
--- a/test/bipm/si/2019/derived/prefixed/exaweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/exaweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/exaweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/exaweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtobecquerel.test.json b/test/bipm/si/2019/derived/prefixed/femtobecquerel.test.json
index 9cde6247..e78a03e6 100644
--- a/test/bipm/si/2019/derived/prefixed/femtobecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtobecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtobecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtobecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/femtocoulomb.test.json b/test/bipm/si/2019/derived/prefixed/femtocoulomb.test.json
index 6f39eb80..a6c2b6e3 100644
--- a/test/bipm/si/2019/derived/prefixed/femtocoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtocoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtocoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtocoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtodegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/femtodegree-celsius.test.json
index ffd0def8..afa71682 100644
--- a/test/bipm/si/2019/derived/prefixed/femtodegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtodegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtodegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtodegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtofarad.test.json b/test/bipm/si/2019/derived/prefixed/femtofarad.test.json
index fc5f858e..e941f7a0 100644
--- a/test/bipm/si/2019/derived/prefixed/femtofarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtofarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtofarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtofarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/femtogray.test.json b/test/bipm/si/2019/derived/prefixed/femtogray.test.json
index 738e00d5..4675db9a 100644
--- a/test/bipm/si/2019/derived/prefixed/femtogray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtogray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtogray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtogray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtohenry.test.json b/test/bipm/si/2019/derived/prefixed/femtohenry.test.json
index fb8a502c..2b055502 100644
--- a/test/bipm/si/2019/derived/prefixed/femtohenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtohenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtohenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtohenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/femtohertz.test.json b/test/bipm/si/2019/derived/prefixed/femtohertz.test.json
index 5ccf8eb5..28ee1c48 100644
--- a/test/bipm/si/2019/derived/prefixed/femtohertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtohertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtohertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtohertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/femtojoule.test.json b/test/bipm/si/2019/derived/prefixed/femtojoule.test.json
index bac61c04..a1c1f5c3 100644
--- a/test/bipm/si/2019/derived/prefixed/femtojoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtojoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtojoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtojoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtokatal.test.json b/test/bipm/si/2019/derived/prefixed/femtokatal.test.json
index 48fb6f66..2c1c5e31 100644
--- a/test/bipm/si/2019/derived/prefixed/femtokatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtokatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtokatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtokatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/femtolumen.test.json b/test/bipm/si/2019/derived/prefixed/femtolumen.test.json
index 8260ea77..83a953ee 100644
--- a/test/bipm/si/2019/derived/prefixed/femtolumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtolumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtolumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtolumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtolux.test.json b/test/bipm/si/2019/derived/prefixed/femtolux.test.json
index e9a5599c..9e97ab85 100644
--- a/test/bipm/si/2019/derived/prefixed/femtolux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtolux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtolux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtolux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtonewton.test.json b/test/bipm/si/2019/derived/prefixed/femtonewton.test.json
index 0f2ab7fd..b17e1c46 100644
--- a/test/bipm/si/2019/derived/prefixed/femtonewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtonewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtonewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtonewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtoohm.test.json b/test/bipm/si/2019/derived/prefixed/femtoohm.test.json
index 845826ab..ca1d4924 100644
--- a/test/bipm/si/2019/derived/prefixed/femtoohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtoohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtoohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtoohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/femtopascal.test.json b/test/bipm/si/2019/derived/prefixed/femtopascal.test.json
index e198b7b2..dba5d6a4 100644
--- a/test/bipm/si/2019/derived/prefixed/femtopascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtopascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtopascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtopascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtoradian.test.json b/test/bipm/si/2019/derived/prefixed/femtoradian.test.json
index cccdd95b..4b0b1dd4 100644
--- a/test/bipm/si/2019/derived/prefixed/femtoradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtoradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtoradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtoradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtosiemens.test.json b/test/bipm/si/2019/derived/prefixed/femtosiemens.test.json
index a2601c11..43c60528 100644
--- a/test/bipm/si/2019/derived/prefixed/femtosiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtosiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtosiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtosiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/femtosievert.test.json b/test/bipm/si/2019/derived/prefixed/femtosievert.test.json
index ce6996a6..03e9bf61 100644
--- a/test/bipm/si/2019/derived/prefixed/femtosievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtosievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtosievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtosievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtosteradian.test.json b/test/bipm/si/2019/derived/prefixed/femtosteradian.test.json
index 48ee49ec..363537d4 100644
--- a/test/bipm/si/2019/derived/prefixed/femtosteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtosteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtosteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtosteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtotesla.test.json b/test/bipm/si/2019/derived/prefixed/femtotesla.test.json
index c2ebfd78..95b76006 100644
--- a/test/bipm/si/2019/derived/prefixed/femtotesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtotesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtotesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtotesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtovolt.test.json b/test/bipm/si/2019/derived/prefixed/femtovolt.test.json
index ec859882..7721e50a 100644
--- a/test/bipm/si/2019/derived/prefixed/femtovolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtovolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtovolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtovolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtowatt.test.json b/test/bipm/si/2019/derived/prefixed/femtowatt.test.json
index 2a0e8d5c..da7878c7 100644
--- a/test/bipm/si/2019/derived/prefixed/femtowatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtowatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtowatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtowatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/femtoweber.test.json b/test/bipm/si/2019/derived/prefixed/femtoweber.test.json
index 43dee96b..3688bad1 100644
--- a/test/bipm/si/2019/derived/prefixed/femtoweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/femtoweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/femtoweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/femtoweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigabecquerel.test.json b/test/bipm/si/2019/derived/prefixed/gigabecquerel.test.json
index a5aaa8b7..c4925945 100644
--- a/test/bipm/si/2019/derived/prefixed/gigabecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigabecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigabecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigabecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/gigacoulomb.test.json b/test/bipm/si/2019/derived/prefixed/gigacoulomb.test.json
index 595ce8b2..b5a7bd92 100644
--- a/test/bipm/si/2019/derived/prefixed/gigacoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigacoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigacoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigacoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigadegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/gigadegree-celsius.test.json
index be247cfe..e6c6f252 100644
--- a/test/bipm/si/2019/derived/prefixed/gigadegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigadegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigadegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigadegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigafarad.test.json b/test/bipm/si/2019/derived/prefixed/gigafarad.test.json
index 665372a1..4b67b958 100644
--- a/test/bipm/si/2019/derived/prefixed/gigafarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigafarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigafarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigafarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/gigagray.test.json b/test/bipm/si/2019/derived/prefixed/gigagray.test.json
index be10f0e6..ad18c61f 100644
--- a/test/bipm/si/2019/derived/prefixed/gigagray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigagray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigagray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigagray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigahenry.test.json b/test/bipm/si/2019/derived/prefixed/gigahenry.test.json
index 7f57279c..2fe6fac6 100644
--- a/test/bipm/si/2019/derived/prefixed/gigahenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigahenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigahenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigahenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/gigahertz.test.json b/test/bipm/si/2019/derived/prefixed/gigahertz.test.json
index b2e7e9c2..28dc7c3e 100644
--- a/test/bipm/si/2019/derived/prefixed/gigahertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigahertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigahertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigahertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/gigajoule.test.json b/test/bipm/si/2019/derived/prefixed/gigajoule.test.json
index 8d2ab807..7a3bdf63 100644
--- a/test/bipm/si/2019/derived/prefixed/gigajoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigajoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigajoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigajoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigakatal.test.json b/test/bipm/si/2019/derived/prefixed/gigakatal.test.json
index 5e4e25ff..5538220a 100644
--- a/test/bipm/si/2019/derived/prefixed/gigakatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigakatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigakatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigakatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/gigalumen.test.json b/test/bipm/si/2019/derived/prefixed/gigalumen.test.json
index b845a780..faa758ff 100644
--- a/test/bipm/si/2019/derived/prefixed/gigalumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigalumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigalumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigalumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigalux.test.json b/test/bipm/si/2019/derived/prefixed/gigalux.test.json
index c74005f7..eba9e443 100644
--- a/test/bipm/si/2019/derived/prefixed/gigalux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigalux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigalux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigalux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/giganewton.test.json b/test/bipm/si/2019/derived/prefixed/giganewton.test.json
index 9f0e0031..90db878a 100644
--- a/test/bipm/si/2019/derived/prefixed/giganewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/giganewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/giganewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/giganewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigaohm.test.json b/test/bipm/si/2019/derived/prefixed/gigaohm.test.json
index ebc184aa..344feb3d 100644
--- a/test/bipm/si/2019/derived/prefixed/gigaohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigaohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigaohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigaohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/gigapascal.test.json b/test/bipm/si/2019/derived/prefixed/gigapascal.test.json
index 8e1c49b3..c1707593 100644
--- a/test/bipm/si/2019/derived/prefixed/gigapascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigapascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigapascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigapascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigaradian.test.json b/test/bipm/si/2019/derived/prefixed/gigaradian.test.json
index 7e3ebd72..8bcca385 100644
--- a/test/bipm/si/2019/derived/prefixed/gigaradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigaradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigaradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigaradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigasiemens.test.json b/test/bipm/si/2019/derived/prefixed/gigasiemens.test.json
index 3b9a3171..c8f21e41 100644
--- a/test/bipm/si/2019/derived/prefixed/gigasiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigasiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigasiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigasiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/gigasievert.test.json b/test/bipm/si/2019/derived/prefixed/gigasievert.test.json
index 02eb4f51..5fd2e425 100644
--- a/test/bipm/si/2019/derived/prefixed/gigasievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigasievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigasievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigasievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigasteradian.test.json b/test/bipm/si/2019/derived/prefixed/gigasteradian.test.json
index 2cd752ba..7f521e81 100644
--- a/test/bipm/si/2019/derived/prefixed/gigasteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigasteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigasteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigasteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigatesla.test.json b/test/bipm/si/2019/derived/prefixed/gigatesla.test.json
index 9c256afe..af18f7fa 100644
--- a/test/bipm/si/2019/derived/prefixed/gigatesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigatesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigatesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigatesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigavolt.test.json b/test/bipm/si/2019/derived/prefixed/gigavolt.test.json
index c718bd37..558e1418 100644
--- a/test/bipm/si/2019/derived/prefixed/gigavolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigavolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigavolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigavolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigawatt.test.json b/test/bipm/si/2019/derived/prefixed/gigawatt.test.json
index 080a6351..098a3cbe 100644
--- a/test/bipm/si/2019/derived/prefixed/gigawatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigawatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigawatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigawatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/gigaweber.test.json b/test/bipm/si/2019/derived/prefixed/gigaweber.test.json
index 4594a738..27f4bd74 100644
--- a/test/bipm/si/2019/derived/prefixed/gigaweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/gigaweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/gigaweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/gigaweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectobecquerel.test.json b/test/bipm/si/2019/derived/prefixed/hectobecquerel.test.json
index c4f7be23..dc876598 100644
--- a/test/bipm/si/2019/derived/prefixed/hectobecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectobecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectobecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectobecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/hectocoulomb.test.json b/test/bipm/si/2019/derived/prefixed/hectocoulomb.test.json
index ea719f22..739f0295 100644
--- a/test/bipm/si/2019/derived/prefixed/hectocoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectocoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectocoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectocoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectodegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/hectodegree-celsius.test.json
index 1e145470..279d8071 100644
--- a/test/bipm/si/2019/derived/prefixed/hectodegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectodegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectodegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectodegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectofarad.test.json b/test/bipm/si/2019/derived/prefixed/hectofarad.test.json
index 55435d53..14992274 100644
--- a/test/bipm/si/2019/derived/prefixed/hectofarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectofarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectofarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectofarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/hectogray.test.json b/test/bipm/si/2019/derived/prefixed/hectogray.test.json
index c775cf7e..505824b4 100644
--- a/test/bipm/si/2019/derived/prefixed/hectogray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectogray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectogray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectogray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectohenry.test.json b/test/bipm/si/2019/derived/prefixed/hectohenry.test.json
index 588a63e3..58f3f145 100644
--- a/test/bipm/si/2019/derived/prefixed/hectohenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectohenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectohenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectohenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/hectohertz.test.json b/test/bipm/si/2019/derived/prefixed/hectohertz.test.json
index 2cf384cb..235e11a2 100644
--- a/test/bipm/si/2019/derived/prefixed/hectohertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectohertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectohertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectohertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/hectojoule.test.json b/test/bipm/si/2019/derived/prefixed/hectojoule.test.json
index 877762bb..4009ebcf 100644
--- a/test/bipm/si/2019/derived/prefixed/hectojoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectojoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectojoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectojoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectokatal.test.json b/test/bipm/si/2019/derived/prefixed/hectokatal.test.json
index 0e5ae7ec..f080222b 100644
--- a/test/bipm/si/2019/derived/prefixed/hectokatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectokatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectokatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectokatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/hectolumen.test.json b/test/bipm/si/2019/derived/prefixed/hectolumen.test.json
index cd9fc867..19ebd395 100644
--- a/test/bipm/si/2019/derived/prefixed/hectolumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectolumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectolumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectolumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectolux.test.json b/test/bipm/si/2019/derived/prefixed/hectolux.test.json
index 2e686689..0e386e33 100644
--- a/test/bipm/si/2019/derived/prefixed/hectolux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectolux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectolux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectolux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectonewton.test.json b/test/bipm/si/2019/derived/prefixed/hectonewton.test.json
index 0aaeff26..f4737ccf 100644
--- a/test/bipm/si/2019/derived/prefixed/hectonewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectonewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectonewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectonewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectoohm.test.json b/test/bipm/si/2019/derived/prefixed/hectoohm.test.json
index 09daeea7..5d099c5d 100644
--- a/test/bipm/si/2019/derived/prefixed/hectoohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectoohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectoohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectoohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/hectopascal.test.json b/test/bipm/si/2019/derived/prefixed/hectopascal.test.json
index 7c284654..14f33e77 100644
--- a/test/bipm/si/2019/derived/prefixed/hectopascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectopascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectopascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectopascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectoradian.test.json b/test/bipm/si/2019/derived/prefixed/hectoradian.test.json
index 66bb3d71..0dfd7068 100644
--- a/test/bipm/si/2019/derived/prefixed/hectoradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectoradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectoradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectoradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectosiemens.test.json b/test/bipm/si/2019/derived/prefixed/hectosiemens.test.json
index c97419d1..c3b9da1e 100644
--- a/test/bipm/si/2019/derived/prefixed/hectosiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectosiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectosiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectosiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/hectosievert.test.json b/test/bipm/si/2019/derived/prefixed/hectosievert.test.json
index bb33ae4a..08598366 100644
--- a/test/bipm/si/2019/derived/prefixed/hectosievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectosievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectosievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectosievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectosteradian.test.json b/test/bipm/si/2019/derived/prefixed/hectosteradian.test.json
index 8f800317..17351a0d 100644
--- a/test/bipm/si/2019/derived/prefixed/hectosteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectosteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectosteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectosteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectotesla.test.json b/test/bipm/si/2019/derived/prefixed/hectotesla.test.json
index 679a49f8..38c9babb 100644
--- a/test/bipm/si/2019/derived/prefixed/hectotesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectotesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectotesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectotesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectovolt.test.json b/test/bipm/si/2019/derived/prefixed/hectovolt.test.json
index 14a7dda2..37fe95c1 100644
--- a/test/bipm/si/2019/derived/prefixed/hectovolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectovolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectovolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectovolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectowatt.test.json b/test/bipm/si/2019/derived/prefixed/hectowatt.test.json
index 1bb1bab9..dfc05bce 100644
--- a/test/bipm/si/2019/derived/prefixed/hectowatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectowatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectowatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectowatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/hectoweber.test.json b/test/bipm/si/2019/derived/prefixed/hectoweber.test.json
index 350b7075..3bdc4446 100644
--- a/test/bipm/si/2019/derived/prefixed/hectoweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/hectoweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/hectoweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/hectoweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kilobecquerel.test.json b/test/bipm/si/2019/derived/prefixed/kilobecquerel.test.json
index b35ac965..83ab2d97 100644
--- a/test/bipm/si/2019/derived/prefixed/kilobecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilobecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilobecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilobecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/kilocoulomb.test.json b/test/bipm/si/2019/derived/prefixed/kilocoulomb.test.json
index 203be6f7..7df77a1c 100644
--- a/test/bipm/si/2019/derived/prefixed/kilocoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilocoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilocoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilocoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kilodegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/kilodegree-celsius.test.json
index 9374a473..7e192710 100644
--- a/test/bipm/si/2019/derived/prefixed/kilodegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilodegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilodegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilodegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kilofarad.test.json b/test/bipm/si/2019/derived/prefixed/kilofarad.test.json
index 9ce5ac76..a779f7af 100644
--- a/test/bipm/si/2019/derived/prefixed/kilofarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilofarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilofarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilofarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/kilogray.test.json b/test/bipm/si/2019/derived/prefixed/kilogray.test.json
index 500bb620..dd2a6b12 100644
--- a/test/bipm/si/2019/derived/prefixed/kilogray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilogray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilogray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilogray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kilohenry.test.json b/test/bipm/si/2019/derived/prefixed/kilohenry.test.json
index 805a8f3d..cc814f6b 100644
--- a/test/bipm/si/2019/derived/prefixed/kilohenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilohenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilohenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilohenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/kilohertz.test.json b/test/bipm/si/2019/derived/prefixed/kilohertz.test.json
index 3c511cdb..38f34ca8 100644
--- a/test/bipm/si/2019/derived/prefixed/kilohertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilohertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilohertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilohertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/kilojoule.test.json b/test/bipm/si/2019/derived/prefixed/kilojoule.test.json
index 7b9f05ef..05d4e8c0 100644
--- a/test/bipm/si/2019/derived/prefixed/kilojoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilojoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilojoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilojoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kilokatal.test.json b/test/bipm/si/2019/derived/prefixed/kilokatal.test.json
index 309ddf08..d45c68b2 100644
--- a/test/bipm/si/2019/derived/prefixed/kilokatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilokatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilokatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilokatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/kilolumen.test.json b/test/bipm/si/2019/derived/prefixed/kilolumen.test.json
index df1603c7..08e1923c 100644
--- a/test/bipm/si/2019/derived/prefixed/kilolumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilolumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilolumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilolumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kilolux.test.json b/test/bipm/si/2019/derived/prefixed/kilolux.test.json
index 5843aa79..3755eaba 100644
--- a/test/bipm/si/2019/derived/prefixed/kilolux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilolux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilolux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilolux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kilonewton.test.json b/test/bipm/si/2019/derived/prefixed/kilonewton.test.json
index c47a6642..718749f8 100644
--- a/test/bipm/si/2019/derived/prefixed/kilonewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilonewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilonewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilonewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kiloohm.test.json b/test/bipm/si/2019/derived/prefixed/kiloohm.test.json
index d8fb6387..0326b14a 100644
--- a/test/bipm/si/2019/derived/prefixed/kiloohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kiloohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kiloohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kiloohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/kilopascal.test.json b/test/bipm/si/2019/derived/prefixed/kilopascal.test.json
index ee692a08..255779c0 100644
--- a/test/bipm/si/2019/derived/prefixed/kilopascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilopascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilopascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilopascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kiloradian.test.json b/test/bipm/si/2019/derived/prefixed/kiloradian.test.json
index 680eec94..61e2ede3 100644
--- a/test/bipm/si/2019/derived/prefixed/kiloradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kiloradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kiloradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kiloradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kilosiemens.test.json b/test/bipm/si/2019/derived/prefixed/kilosiemens.test.json
index 048ac00b..db10acca 100644
--- a/test/bipm/si/2019/derived/prefixed/kilosiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilosiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilosiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilosiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/kilosievert.test.json b/test/bipm/si/2019/derived/prefixed/kilosievert.test.json
index c14eb998..b18e3f31 100644
--- a/test/bipm/si/2019/derived/prefixed/kilosievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilosievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilosievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilosievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kilosteradian.test.json b/test/bipm/si/2019/derived/prefixed/kilosteradian.test.json
index 02a8f06e..226206fd 100644
--- a/test/bipm/si/2019/derived/prefixed/kilosteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilosteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilosteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilosteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kilotesla.test.json b/test/bipm/si/2019/derived/prefixed/kilotesla.test.json
index 103fec57..6c1e7da6 100644
--- a/test/bipm/si/2019/derived/prefixed/kilotesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilotesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilotesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilotesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kilovolt.test.json b/test/bipm/si/2019/derived/prefixed/kilovolt.test.json
index 190f4dc4..72693617 100644
--- a/test/bipm/si/2019/derived/prefixed/kilovolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilovolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilovolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilovolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kilowatt.test.json b/test/bipm/si/2019/derived/prefixed/kilowatt.test.json
index 3f1765ba..8ff44c27 100644
--- a/test/bipm/si/2019/derived/prefixed/kilowatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kilowatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kilowatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kilowatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/kiloweber.test.json b/test/bipm/si/2019/derived/prefixed/kiloweber.test.json
index c4554ab2..19a36e33 100644
--- a/test/bipm/si/2019/derived/prefixed/kiloweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/kiloweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/kiloweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/kiloweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megabecquerel.test.json b/test/bipm/si/2019/derived/prefixed/megabecquerel.test.json
index 4aca3721..18424315 100644
--- a/test/bipm/si/2019/derived/prefixed/megabecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megabecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megabecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megabecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/megacoulomb.test.json b/test/bipm/si/2019/derived/prefixed/megacoulomb.test.json
index 7ec2e05b..6ece83b2 100644
--- a/test/bipm/si/2019/derived/prefixed/megacoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megacoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megacoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megacoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megadegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/megadegree-celsius.test.json
index 302fd505..53958869 100644
--- a/test/bipm/si/2019/derived/prefixed/megadegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megadegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megadegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megadegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megafarad.test.json b/test/bipm/si/2019/derived/prefixed/megafarad.test.json
index 3010a9b8..b54fdcca 100644
--- a/test/bipm/si/2019/derived/prefixed/megafarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megafarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megafarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megafarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/megagray.test.json b/test/bipm/si/2019/derived/prefixed/megagray.test.json
index 01044870..0a0a4fdb 100644
--- a/test/bipm/si/2019/derived/prefixed/megagray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megagray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megagray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megagray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megahenry.test.json b/test/bipm/si/2019/derived/prefixed/megahenry.test.json
index 63a23881..da5978d2 100644
--- a/test/bipm/si/2019/derived/prefixed/megahenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megahenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megahenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megahenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/megahertz.test.json b/test/bipm/si/2019/derived/prefixed/megahertz.test.json
index 8890efc4..bd21bb8c 100644
--- a/test/bipm/si/2019/derived/prefixed/megahertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megahertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megahertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megahertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/megajoule.test.json b/test/bipm/si/2019/derived/prefixed/megajoule.test.json
index 85f70499..9ecef761 100644
--- a/test/bipm/si/2019/derived/prefixed/megajoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megajoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megajoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megajoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megakatal.test.json b/test/bipm/si/2019/derived/prefixed/megakatal.test.json
index d0f188de..7646ff10 100644
--- a/test/bipm/si/2019/derived/prefixed/megakatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megakatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megakatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megakatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/megalumen.test.json b/test/bipm/si/2019/derived/prefixed/megalumen.test.json
index 85003477..36f270fa 100644
--- a/test/bipm/si/2019/derived/prefixed/megalumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megalumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megalumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megalumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megalux.test.json b/test/bipm/si/2019/derived/prefixed/megalux.test.json
index 8e187510..0e455337 100644
--- a/test/bipm/si/2019/derived/prefixed/megalux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megalux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megalux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megalux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/meganewton.test.json b/test/bipm/si/2019/derived/prefixed/meganewton.test.json
index c6175f28..9ea8b41b 100644
--- a/test/bipm/si/2019/derived/prefixed/meganewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/meganewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/meganewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/meganewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megaohm.test.json b/test/bipm/si/2019/derived/prefixed/megaohm.test.json
index b5293fbf..26d8c432 100644
--- a/test/bipm/si/2019/derived/prefixed/megaohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megaohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megaohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megaohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/megapascal.test.json b/test/bipm/si/2019/derived/prefixed/megapascal.test.json
index 77588051..943dd97e 100644
--- a/test/bipm/si/2019/derived/prefixed/megapascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megapascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megapascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megapascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megaradian.test.json b/test/bipm/si/2019/derived/prefixed/megaradian.test.json
index f8c43939..c3b88a0a 100644
--- a/test/bipm/si/2019/derived/prefixed/megaradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megaradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megaradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megaradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megasiemens.test.json b/test/bipm/si/2019/derived/prefixed/megasiemens.test.json
index b4a47e2c..7fbd6bcc 100644
--- a/test/bipm/si/2019/derived/prefixed/megasiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megasiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megasiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megasiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/megasievert.test.json b/test/bipm/si/2019/derived/prefixed/megasievert.test.json
index 3aef9f3b..275df921 100644
--- a/test/bipm/si/2019/derived/prefixed/megasievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megasievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megasievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megasievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megasteradian.test.json b/test/bipm/si/2019/derived/prefixed/megasteradian.test.json
index 87f786a8..f6c18d8f 100644
--- a/test/bipm/si/2019/derived/prefixed/megasteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megasteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megasteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megasteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megatesla.test.json b/test/bipm/si/2019/derived/prefixed/megatesla.test.json
index 4e6c337c..7209e60d 100644
--- a/test/bipm/si/2019/derived/prefixed/megatesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megatesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megatesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megatesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megavolt.test.json b/test/bipm/si/2019/derived/prefixed/megavolt.test.json
index b93ae221..8c7a6604 100644
--- a/test/bipm/si/2019/derived/prefixed/megavolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megavolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megavolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megavolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megawatt.test.json b/test/bipm/si/2019/derived/prefixed/megawatt.test.json
index c9309976..76d7eea6 100644
--- a/test/bipm/si/2019/derived/prefixed/megawatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megawatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megawatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megawatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/megaweber.test.json b/test/bipm/si/2019/derived/prefixed/megaweber.test.json
index 63beb381..c9e37af5 100644
--- a/test/bipm/si/2019/derived/prefixed/megaweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/megaweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/megaweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/megaweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microbecquerel.test.json b/test/bipm/si/2019/derived/prefixed/microbecquerel.test.json
index 115a5ee3..ff8e4a31 100644
--- a/test/bipm/si/2019/derived/prefixed/microbecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microbecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microbecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microbecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/microcoulomb.test.json b/test/bipm/si/2019/derived/prefixed/microcoulomb.test.json
index c96299b5..f49f1784 100644
--- a/test/bipm/si/2019/derived/prefixed/microcoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microcoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microcoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microcoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microdegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/microdegree-celsius.test.json
index 544a1db3..18725270 100644
--- a/test/bipm/si/2019/derived/prefixed/microdegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microdegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microdegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microdegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microfarad.test.json b/test/bipm/si/2019/derived/prefixed/microfarad.test.json
index d5b016c1..d997f7f9 100644
--- a/test/bipm/si/2019/derived/prefixed/microfarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microfarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microfarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microfarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/microgray.test.json b/test/bipm/si/2019/derived/prefixed/microgray.test.json
index 45104e1a..857f1278 100644
--- a/test/bipm/si/2019/derived/prefixed/microgray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microgray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microgray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microgray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microhenry.test.json b/test/bipm/si/2019/derived/prefixed/microhenry.test.json
index c37e8048..538e59e9 100644
--- a/test/bipm/si/2019/derived/prefixed/microhenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microhenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microhenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microhenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/microhertz.test.json b/test/bipm/si/2019/derived/prefixed/microhertz.test.json
index 1c83f7bf..cf21d49f 100644
--- a/test/bipm/si/2019/derived/prefixed/microhertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microhertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microhertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microhertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/microjoule.test.json b/test/bipm/si/2019/derived/prefixed/microjoule.test.json
index 8007d8c6..72282d2e 100644
--- a/test/bipm/si/2019/derived/prefixed/microjoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microjoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microjoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microjoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microkatal.test.json b/test/bipm/si/2019/derived/prefixed/microkatal.test.json
index 325bd219..9146f4b7 100644
--- a/test/bipm/si/2019/derived/prefixed/microkatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microkatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microkatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microkatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/microlumen.test.json b/test/bipm/si/2019/derived/prefixed/microlumen.test.json
index 5ff6d078..3741f770 100644
--- a/test/bipm/si/2019/derived/prefixed/microlumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microlumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microlumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microlumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microlux.test.json b/test/bipm/si/2019/derived/prefixed/microlux.test.json
index f4a748da..20ca7589 100644
--- a/test/bipm/si/2019/derived/prefixed/microlux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microlux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microlux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microlux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/micronewton.test.json b/test/bipm/si/2019/derived/prefixed/micronewton.test.json
index 417f68fb..7f40cf8d 100644
--- a/test/bipm/si/2019/derived/prefixed/micronewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/micronewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/micronewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/micronewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microohm.test.json b/test/bipm/si/2019/derived/prefixed/microohm.test.json
index 02ecc578..87824329 100644
--- a/test/bipm/si/2019/derived/prefixed/microohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/micropascal.test.json b/test/bipm/si/2019/derived/prefixed/micropascal.test.json
index 423a7432..d5f39ae0 100644
--- a/test/bipm/si/2019/derived/prefixed/micropascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/micropascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/micropascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/micropascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microradian.test.json b/test/bipm/si/2019/derived/prefixed/microradian.test.json
index e77777e6..ccee2369 100644
--- a/test/bipm/si/2019/derived/prefixed/microradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microsiemens.test.json b/test/bipm/si/2019/derived/prefixed/microsiemens.test.json
index d7cbbb5d..71c98b2a 100644
--- a/test/bipm/si/2019/derived/prefixed/microsiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microsiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microsiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microsiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/microsievert.test.json b/test/bipm/si/2019/derived/prefixed/microsievert.test.json
index c94fd140..ae6c41f8 100644
--- a/test/bipm/si/2019/derived/prefixed/microsievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microsievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microsievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microsievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microsteradian.test.json b/test/bipm/si/2019/derived/prefixed/microsteradian.test.json
index 868fdd17..ad841225 100644
--- a/test/bipm/si/2019/derived/prefixed/microsteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microsteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microsteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microsteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microtesla.test.json b/test/bipm/si/2019/derived/prefixed/microtesla.test.json
index 0ba291bb..937aba32 100644
--- a/test/bipm/si/2019/derived/prefixed/microtesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microtesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microtesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microtesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microvolt.test.json b/test/bipm/si/2019/derived/prefixed/microvolt.test.json
index 9617aa8f..4034a25d 100644
--- a/test/bipm/si/2019/derived/prefixed/microvolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microvolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microvolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microvolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microwatt.test.json b/test/bipm/si/2019/derived/prefixed/microwatt.test.json
index b70cc0b7..75b336f1 100644
--- a/test/bipm/si/2019/derived/prefixed/microwatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microwatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microwatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microwatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/microweber.test.json b/test/bipm/si/2019/derived/prefixed/microweber.test.json
index 83c69564..a2147f63 100644
--- a/test/bipm/si/2019/derived/prefixed/microweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/microweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/microweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/microweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/millibecquerel.test.json b/test/bipm/si/2019/derived/prefixed/millibecquerel.test.json
index 7ea884a0..55132c1b 100644
--- a/test/bipm/si/2019/derived/prefixed/millibecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millibecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millibecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millibecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/millicoulomb.test.json b/test/bipm/si/2019/derived/prefixed/millicoulomb.test.json
index f63ffb45..4ae63630 100644
--- a/test/bipm/si/2019/derived/prefixed/millicoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millicoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millicoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millicoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/millidegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/millidegree-celsius.test.json
index c459e3f3..723671b8 100644
--- a/test/bipm/si/2019/derived/prefixed/millidegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millidegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millidegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millidegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/millifarad.test.json b/test/bipm/si/2019/derived/prefixed/millifarad.test.json
index 3cc174a2..18f0a59d 100644
--- a/test/bipm/si/2019/derived/prefixed/millifarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millifarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millifarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millifarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/milligray.test.json b/test/bipm/si/2019/derived/prefixed/milligray.test.json
index 9cd40f5f..606e9d27 100644
--- a/test/bipm/si/2019/derived/prefixed/milligray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/milligray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/milligray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/milligray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/millihenry.test.json b/test/bipm/si/2019/derived/prefixed/millihenry.test.json
index 5b60c7ac..cba1fd5a 100644
--- a/test/bipm/si/2019/derived/prefixed/millihenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millihenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millihenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millihenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/millihertz.test.json b/test/bipm/si/2019/derived/prefixed/millihertz.test.json
index c767fbc7..cb7c63e6 100644
--- a/test/bipm/si/2019/derived/prefixed/millihertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millihertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millihertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millihertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/millijoule.test.json b/test/bipm/si/2019/derived/prefixed/millijoule.test.json
index dc06fa14..83c766bb 100644
--- a/test/bipm/si/2019/derived/prefixed/millijoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millijoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millijoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millijoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/millikatal.test.json b/test/bipm/si/2019/derived/prefixed/millikatal.test.json
index af23a640..45fc93cb 100644
--- a/test/bipm/si/2019/derived/prefixed/millikatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millikatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millikatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millikatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/millilumen.test.json b/test/bipm/si/2019/derived/prefixed/millilumen.test.json
index a77829da..363e80a5 100644
--- a/test/bipm/si/2019/derived/prefixed/millilumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millilumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millilumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millilumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/millilux.test.json b/test/bipm/si/2019/derived/prefixed/millilux.test.json
index 24f7f0f7..1b67a55f 100644
--- a/test/bipm/si/2019/derived/prefixed/millilux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millilux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millilux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millilux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/millinewton.test.json b/test/bipm/si/2019/derived/prefixed/millinewton.test.json
index df0c6f24..39d9d4aa 100644
--- a/test/bipm/si/2019/derived/prefixed/millinewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millinewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millinewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millinewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/milliohm.test.json b/test/bipm/si/2019/derived/prefixed/milliohm.test.json
index 640484c8..81228765 100644
--- a/test/bipm/si/2019/derived/prefixed/milliohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/milliohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/milliohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/milliohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/millipascal.test.json b/test/bipm/si/2019/derived/prefixed/millipascal.test.json
index 6320d9db..bcb59121 100644
--- a/test/bipm/si/2019/derived/prefixed/millipascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millipascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millipascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millipascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/milliradian.test.json b/test/bipm/si/2019/derived/prefixed/milliradian.test.json
index 5b4b431d..8eb63516 100644
--- a/test/bipm/si/2019/derived/prefixed/milliradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/milliradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/milliradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/milliradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/millisiemens.test.json b/test/bipm/si/2019/derived/prefixed/millisiemens.test.json
index f355beba..4145d180 100644
--- a/test/bipm/si/2019/derived/prefixed/millisiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millisiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millisiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millisiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/millisievert.test.json b/test/bipm/si/2019/derived/prefixed/millisievert.test.json
index 3141abf5..37a73449 100644
--- a/test/bipm/si/2019/derived/prefixed/millisievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millisievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millisievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millisievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/millisteradian.test.json b/test/bipm/si/2019/derived/prefixed/millisteradian.test.json
index 75023588..f4e87a18 100644
--- a/test/bipm/si/2019/derived/prefixed/millisteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millisteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millisteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millisteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/millitesla.test.json b/test/bipm/si/2019/derived/prefixed/millitesla.test.json
index b64077f3..4589ece3 100644
--- a/test/bipm/si/2019/derived/prefixed/millitesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millitesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millitesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millitesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/millivolt.test.json b/test/bipm/si/2019/derived/prefixed/millivolt.test.json
index 588e378b..26e0930c 100644
--- a/test/bipm/si/2019/derived/prefixed/millivolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/millivolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/millivolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/millivolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/milliwatt.test.json b/test/bipm/si/2019/derived/prefixed/milliwatt.test.json
index 5972088f..022770cc 100644
--- a/test/bipm/si/2019/derived/prefixed/milliwatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/milliwatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/milliwatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/milliwatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/milliweber.test.json b/test/bipm/si/2019/derived/prefixed/milliweber.test.json
index 9bbee7c0..1f5e005d 100644
--- a/test/bipm/si/2019/derived/prefixed/milliweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/milliweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/milliweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/milliweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanobecquerel.test.json b/test/bipm/si/2019/derived/prefixed/nanobecquerel.test.json
index 4d220aa2..6c75724f 100644
--- a/test/bipm/si/2019/derived/prefixed/nanobecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanobecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanobecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanobecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/nanocoulomb.test.json b/test/bipm/si/2019/derived/prefixed/nanocoulomb.test.json
index fb5a4b57..d1ec7163 100644
--- a/test/bipm/si/2019/derived/prefixed/nanocoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanocoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanocoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanocoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanodegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/nanodegree-celsius.test.json
index f8f04fe7..8fe7e1a4 100644
--- a/test/bipm/si/2019/derived/prefixed/nanodegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanodegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanodegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanodegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanofarad.test.json b/test/bipm/si/2019/derived/prefixed/nanofarad.test.json
index 51580731..e040297f 100644
--- a/test/bipm/si/2019/derived/prefixed/nanofarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanofarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanofarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanofarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/nanogray.test.json b/test/bipm/si/2019/derived/prefixed/nanogray.test.json
index 6d06979d..5763aead 100644
--- a/test/bipm/si/2019/derived/prefixed/nanogray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanogray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanogray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanogray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanohenry.test.json b/test/bipm/si/2019/derived/prefixed/nanohenry.test.json
index 57be569d..aa6ce82a 100644
--- a/test/bipm/si/2019/derived/prefixed/nanohenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanohenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanohenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanohenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/nanohertz.test.json b/test/bipm/si/2019/derived/prefixed/nanohertz.test.json
index 7cbcef9b..e9f4b7f4 100644
--- a/test/bipm/si/2019/derived/prefixed/nanohertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanohertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanohertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanohertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/nanojoule.test.json b/test/bipm/si/2019/derived/prefixed/nanojoule.test.json
index c01a9fdc..a7466120 100644
--- a/test/bipm/si/2019/derived/prefixed/nanojoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanojoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanojoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanojoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanokatal.test.json b/test/bipm/si/2019/derived/prefixed/nanokatal.test.json
index ef9daf64..f43020a3 100644
--- a/test/bipm/si/2019/derived/prefixed/nanokatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanokatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanokatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanokatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/nanolumen.test.json b/test/bipm/si/2019/derived/prefixed/nanolumen.test.json
index 8794d0f2..6d491c57 100644
--- a/test/bipm/si/2019/derived/prefixed/nanolumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanolumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanolumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanolumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanolux.test.json b/test/bipm/si/2019/derived/prefixed/nanolux.test.json
index 6dd0f5c3..7fe6dca9 100644
--- a/test/bipm/si/2019/derived/prefixed/nanolux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanolux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanolux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanolux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanonewton.test.json b/test/bipm/si/2019/derived/prefixed/nanonewton.test.json
index 1450058a..a03eb8b3 100644
--- a/test/bipm/si/2019/derived/prefixed/nanonewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanonewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanonewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanonewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanoohm.test.json b/test/bipm/si/2019/derived/prefixed/nanoohm.test.json
index 5eef2fff..9a03a9f8 100644
--- a/test/bipm/si/2019/derived/prefixed/nanoohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanoohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanoohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanoohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/nanopascal.test.json b/test/bipm/si/2019/derived/prefixed/nanopascal.test.json
index c8aa542a..e804c468 100644
--- a/test/bipm/si/2019/derived/prefixed/nanopascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanopascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanopascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanopascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanoradian.test.json b/test/bipm/si/2019/derived/prefixed/nanoradian.test.json
index 5ead2b63..a5191fd8 100644
--- a/test/bipm/si/2019/derived/prefixed/nanoradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanoradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanoradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanoradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanosiemens.test.json b/test/bipm/si/2019/derived/prefixed/nanosiemens.test.json
index 4f25d405..29ec3553 100644
--- a/test/bipm/si/2019/derived/prefixed/nanosiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanosiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanosiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanosiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/nanosievert.test.json b/test/bipm/si/2019/derived/prefixed/nanosievert.test.json
index efa5752d..d5365fc0 100644
--- a/test/bipm/si/2019/derived/prefixed/nanosievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanosievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanosievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanosievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanosteradian.test.json b/test/bipm/si/2019/derived/prefixed/nanosteradian.test.json
index 76fe1db9..824031d8 100644
--- a/test/bipm/si/2019/derived/prefixed/nanosteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanosteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanosteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanosteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanotesla.test.json b/test/bipm/si/2019/derived/prefixed/nanotesla.test.json
index 0566e557..80260afd 100644
--- a/test/bipm/si/2019/derived/prefixed/nanotesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanotesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanotesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanotesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanovolt.test.json b/test/bipm/si/2019/derived/prefixed/nanovolt.test.json
index 46e7642f..cd13b5b5 100644
--- a/test/bipm/si/2019/derived/prefixed/nanovolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanovolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanovolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanovolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanowatt.test.json b/test/bipm/si/2019/derived/prefixed/nanowatt.test.json
index 8d2cd934..e000bace 100644
--- a/test/bipm/si/2019/derived/prefixed/nanowatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanowatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanowatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanowatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/nanoweber.test.json b/test/bipm/si/2019/derived/prefixed/nanoweber.test.json
index 23eba236..feedc2d9 100644
--- a/test/bipm/si/2019/derived/prefixed/nanoweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/nanoweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/nanoweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/nanoweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petabecquerel.test.json b/test/bipm/si/2019/derived/prefixed/petabecquerel.test.json
index 57e385c5..f3916f1c 100644
--- a/test/bipm/si/2019/derived/prefixed/petabecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petabecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petabecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petabecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/petacoulomb.test.json b/test/bipm/si/2019/derived/prefixed/petacoulomb.test.json
index a1c6603c..ccbb1b13 100644
--- a/test/bipm/si/2019/derived/prefixed/petacoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petacoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petacoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petacoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petadegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/petadegree-celsius.test.json
index eea6f7bc..8354586e 100644
--- a/test/bipm/si/2019/derived/prefixed/petadegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petadegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petadegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petadegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petafarad.test.json b/test/bipm/si/2019/derived/prefixed/petafarad.test.json
index 5f646821..e35a3a33 100644
--- a/test/bipm/si/2019/derived/prefixed/petafarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petafarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petafarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petafarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/petagray.test.json b/test/bipm/si/2019/derived/prefixed/petagray.test.json
index 5c085674..d0f4fe9c 100644
--- a/test/bipm/si/2019/derived/prefixed/petagray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petagray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petagray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petagray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petahenry.test.json b/test/bipm/si/2019/derived/prefixed/petahenry.test.json
index ccfd71af..566cc91d 100644
--- a/test/bipm/si/2019/derived/prefixed/petahenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petahenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petahenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petahenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/petahertz.test.json b/test/bipm/si/2019/derived/prefixed/petahertz.test.json
index d7b04249..d083e8e5 100644
--- a/test/bipm/si/2019/derived/prefixed/petahertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petahertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petahertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petahertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/petajoule.test.json b/test/bipm/si/2019/derived/prefixed/petajoule.test.json
index 2c6492f5..1533dde2 100644
--- a/test/bipm/si/2019/derived/prefixed/petajoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petajoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petajoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petajoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petakatal.test.json b/test/bipm/si/2019/derived/prefixed/petakatal.test.json
index 959adef9..26ab2b0c 100644
--- a/test/bipm/si/2019/derived/prefixed/petakatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petakatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petakatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petakatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/petalumen.test.json b/test/bipm/si/2019/derived/prefixed/petalumen.test.json
index 8860348a..b47c5059 100644
--- a/test/bipm/si/2019/derived/prefixed/petalumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petalumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petalumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petalumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petalux.test.json b/test/bipm/si/2019/derived/prefixed/petalux.test.json
index 3cb20c7c..c908e2fd 100644
--- a/test/bipm/si/2019/derived/prefixed/petalux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petalux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petalux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petalux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petanewton.test.json b/test/bipm/si/2019/derived/prefixed/petanewton.test.json
index b125c16e..9335ebde 100644
--- a/test/bipm/si/2019/derived/prefixed/petanewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petanewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petanewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petanewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petaohm.test.json b/test/bipm/si/2019/derived/prefixed/petaohm.test.json
index 460f44bb..d488bee0 100644
--- a/test/bipm/si/2019/derived/prefixed/petaohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petaohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petaohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petaohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/petapascal.test.json b/test/bipm/si/2019/derived/prefixed/petapascal.test.json
index 47f36e80..1d68c402 100644
--- a/test/bipm/si/2019/derived/prefixed/petapascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petapascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petapascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petapascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petaradian.test.json b/test/bipm/si/2019/derived/prefixed/petaradian.test.json
index bcbc8002..096eb940 100644
--- a/test/bipm/si/2019/derived/prefixed/petaradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petaradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petaradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petaradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petasiemens.test.json b/test/bipm/si/2019/derived/prefixed/petasiemens.test.json
index 5e73da56..e268ef01 100644
--- a/test/bipm/si/2019/derived/prefixed/petasiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petasiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petasiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petasiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/petasievert.test.json b/test/bipm/si/2019/derived/prefixed/petasievert.test.json
index f2a48085..1ac5d449 100644
--- a/test/bipm/si/2019/derived/prefixed/petasievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petasievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petasievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petasievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petasteradian.test.json b/test/bipm/si/2019/derived/prefixed/petasteradian.test.json
index 7c696f44..605c2c1e 100644
--- a/test/bipm/si/2019/derived/prefixed/petasteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petasteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petasteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petasteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petatesla.test.json b/test/bipm/si/2019/derived/prefixed/petatesla.test.json
index 824041b2..9ecc6fce 100644
--- a/test/bipm/si/2019/derived/prefixed/petatesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petatesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petatesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petatesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petavolt.test.json b/test/bipm/si/2019/derived/prefixed/petavolt.test.json
index c666cdab..d817c5f8 100644
--- a/test/bipm/si/2019/derived/prefixed/petavolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petavolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petavolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petavolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petawatt.test.json b/test/bipm/si/2019/derived/prefixed/petawatt.test.json
index dadbf60c..b11c2c35 100644
--- a/test/bipm/si/2019/derived/prefixed/petawatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petawatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petawatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petawatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/petaweber.test.json b/test/bipm/si/2019/derived/prefixed/petaweber.test.json
index 3e1d457d..f77f0009 100644
--- a/test/bipm/si/2019/derived/prefixed/petaweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/petaweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/petaweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/petaweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picobecquerel.test.json b/test/bipm/si/2019/derived/prefixed/picobecquerel.test.json
index fee7e294..e14c8295 100644
--- a/test/bipm/si/2019/derived/prefixed/picobecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picobecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picobecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picobecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/picocoulomb.test.json b/test/bipm/si/2019/derived/prefixed/picocoulomb.test.json
index f9db1ef1..878d4c27 100644
--- a/test/bipm/si/2019/derived/prefixed/picocoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picocoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picocoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picocoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picodegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/picodegree-celsius.test.json
index 2f75bbd4..3fd9f4b0 100644
--- a/test/bipm/si/2019/derived/prefixed/picodegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picodegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picodegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picodegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picofarad.test.json b/test/bipm/si/2019/derived/prefixed/picofarad.test.json
index f5c13471..d5994ca6 100644
--- a/test/bipm/si/2019/derived/prefixed/picofarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picofarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picofarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picofarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/picogray.test.json b/test/bipm/si/2019/derived/prefixed/picogray.test.json
index 4cdb6cf5..bff6e1a5 100644
--- a/test/bipm/si/2019/derived/prefixed/picogray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picogray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picogray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picogray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picohenry.test.json b/test/bipm/si/2019/derived/prefixed/picohenry.test.json
index 70cdaf83..99e58f42 100644
--- a/test/bipm/si/2019/derived/prefixed/picohenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picohenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picohenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picohenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/picohertz.test.json b/test/bipm/si/2019/derived/prefixed/picohertz.test.json
index af605fdc..c9849fc3 100644
--- a/test/bipm/si/2019/derived/prefixed/picohertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picohertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picohertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picohertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/picojoule.test.json b/test/bipm/si/2019/derived/prefixed/picojoule.test.json
index 40113530..bce0b262 100644
--- a/test/bipm/si/2019/derived/prefixed/picojoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picojoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picojoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picojoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picokatal.test.json b/test/bipm/si/2019/derived/prefixed/picokatal.test.json
index 31452984..79ebacef 100644
--- a/test/bipm/si/2019/derived/prefixed/picokatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picokatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picokatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picokatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/picolumen.test.json b/test/bipm/si/2019/derived/prefixed/picolumen.test.json
index a92b477e..062a2ce7 100644
--- a/test/bipm/si/2019/derived/prefixed/picolumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picolumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picolumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picolumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picolux.test.json b/test/bipm/si/2019/derived/prefixed/picolux.test.json
index 2ef4df89..2c24e19b 100644
--- a/test/bipm/si/2019/derived/prefixed/picolux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picolux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picolux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picolux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/piconewton.test.json b/test/bipm/si/2019/derived/prefixed/piconewton.test.json
index b785ba49..6d9c0e7b 100644
--- a/test/bipm/si/2019/derived/prefixed/piconewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/piconewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/piconewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/piconewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picoohm.test.json b/test/bipm/si/2019/derived/prefixed/picoohm.test.json
index bc8da3bf..0b58794c 100644
--- a/test/bipm/si/2019/derived/prefixed/picoohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picoohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picoohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picoohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/picopascal.test.json b/test/bipm/si/2019/derived/prefixed/picopascal.test.json
index 4c88c431..9d35d2bd 100644
--- a/test/bipm/si/2019/derived/prefixed/picopascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picopascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picopascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picopascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picoradian.test.json b/test/bipm/si/2019/derived/prefixed/picoradian.test.json
index 427ece02..19399cfa 100644
--- a/test/bipm/si/2019/derived/prefixed/picoradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picoradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picoradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picoradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picosiemens.test.json b/test/bipm/si/2019/derived/prefixed/picosiemens.test.json
index ed13d6eb..a5e7b84e 100644
--- a/test/bipm/si/2019/derived/prefixed/picosiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picosiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picosiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picosiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/picosievert.test.json b/test/bipm/si/2019/derived/prefixed/picosievert.test.json
index d798eaf5..4e32fe35 100644
--- a/test/bipm/si/2019/derived/prefixed/picosievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picosievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picosievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picosievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picosteradian.test.json b/test/bipm/si/2019/derived/prefixed/picosteradian.test.json
index c5e2b9db..cbd7e8a0 100644
--- a/test/bipm/si/2019/derived/prefixed/picosteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picosteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picosteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picosteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picotesla.test.json b/test/bipm/si/2019/derived/prefixed/picotesla.test.json
index e76f2fb4..cb6b6375 100644
--- a/test/bipm/si/2019/derived/prefixed/picotesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picotesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picotesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picotesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picovolt.test.json b/test/bipm/si/2019/derived/prefixed/picovolt.test.json
index d8c694db..ff0a5bb9 100644
--- a/test/bipm/si/2019/derived/prefixed/picovolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picovolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picovolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picovolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picowatt.test.json b/test/bipm/si/2019/derived/prefixed/picowatt.test.json
index b7fd1b1c..63f37045 100644
--- a/test/bipm/si/2019/derived/prefixed/picowatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picowatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picowatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picowatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/picoweber.test.json b/test/bipm/si/2019/derived/prefixed/picoweber.test.json
index 716a78d9..08849abe 100644
--- a/test/bipm/si/2019/derived/prefixed/picoweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/picoweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/picoweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/picoweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectobecquerel.test.json b/test/bipm/si/2019/derived/prefixed/quectobecquerel.test.json
index e41db9de..61f778d7 100644
--- a/test/bipm/si/2019/derived/prefixed/quectobecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectobecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectobecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectobecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quectocoulomb.test.json b/test/bipm/si/2019/derived/prefixed/quectocoulomb.test.json
index 55b39dd3..2cdb005c 100644
--- a/test/bipm/si/2019/derived/prefixed/quectocoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectocoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectocoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectocoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectodegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/quectodegree-celsius.test.json
index f545791b..e8889048 100644
--- a/test/bipm/si/2019/derived/prefixed/quectodegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectodegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectodegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectodegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectofarad.test.json b/test/bipm/si/2019/derived/prefixed/quectofarad.test.json
index b4df31a7..0ccc4866 100644
--- a/test/bipm/si/2019/derived/prefixed/quectofarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectofarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectofarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectofarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quectogray.test.json b/test/bipm/si/2019/derived/prefixed/quectogray.test.json
index 7d90fb9b..ea289384 100644
--- a/test/bipm/si/2019/derived/prefixed/quectogray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectogray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectogray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectogray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectohenry.test.json b/test/bipm/si/2019/derived/prefixed/quectohenry.test.json
index 36b9dbfd..eed5c213 100644
--- a/test/bipm/si/2019/derived/prefixed/quectohenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectohenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectohenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectohenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quectohertz.test.json b/test/bipm/si/2019/derived/prefixed/quectohertz.test.json
index 964f3688..0c197a0e 100644
--- a/test/bipm/si/2019/derived/prefixed/quectohertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectohertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectohertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectohertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quectojoule.test.json b/test/bipm/si/2019/derived/prefixed/quectojoule.test.json
index 8180965f..e70112a7 100644
--- a/test/bipm/si/2019/derived/prefixed/quectojoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectojoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectojoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectojoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectokatal.test.json b/test/bipm/si/2019/derived/prefixed/quectokatal.test.json
index b90a4c1f..e94c9c99 100644
--- a/test/bipm/si/2019/derived/prefixed/quectokatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectokatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectokatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectokatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quectolumen.test.json b/test/bipm/si/2019/derived/prefixed/quectolumen.test.json
index ba5fa98c..bba56856 100644
--- a/test/bipm/si/2019/derived/prefixed/quectolumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectolumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectolumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectolumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectolux.test.json b/test/bipm/si/2019/derived/prefixed/quectolux.test.json
index 81d592fb..3e4278e4 100644
--- a/test/bipm/si/2019/derived/prefixed/quectolux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectolux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectolux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectolux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectonewton.test.json b/test/bipm/si/2019/derived/prefixed/quectonewton.test.json
index bafbd8ee..e97d1121 100644
--- a/test/bipm/si/2019/derived/prefixed/quectonewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectonewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectonewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectonewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectoohm.test.json b/test/bipm/si/2019/derived/prefixed/quectoohm.test.json
index 59ae2f89..f77147e4 100644
--- a/test/bipm/si/2019/derived/prefixed/quectoohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectoohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectoohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectoohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quectopascal.test.json b/test/bipm/si/2019/derived/prefixed/quectopascal.test.json
index cc06afaa..09800bc8 100644
--- a/test/bipm/si/2019/derived/prefixed/quectopascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectopascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectopascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectopascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectoradian.test.json b/test/bipm/si/2019/derived/prefixed/quectoradian.test.json
index 50cd0c57..d1755725 100644
--- a/test/bipm/si/2019/derived/prefixed/quectoradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectoradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectoradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectoradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectosiemens.test.json b/test/bipm/si/2019/derived/prefixed/quectosiemens.test.json
index d6ee816f..a3feeb32 100644
--- a/test/bipm/si/2019/derived/prefixed/quectosiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectosiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectosiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectosiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quectosievert.test.json b/test/bipm/si/2019/derived/prefixed/quectosievert.test.json
index 0def36a9..eda5a857 100644
--- a/test/bipm/si/2019/derived/prefixed/quectosievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectosievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectosievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectosievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectosteradian.test.json b/test/bipm/si/2019/derived/prefixed/quectosteradian.test.json
index c7f6936c..8c976447 100644
--- a/test/bipm/si/2019/derived/prefixed/quectosteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectosteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectosteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectosteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectotesla.test.json b/test/bipm/si/2019/derived/prefixed/quectotesla.test.json
index 9e521fed..a40b71ec 100644
--- a/test/bipm/si/2019/derived/prefixed/quectotesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectotesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectotesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectotesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectovolt.test.json b/test/bipm/si/2019/derived/prefixed/quectovolt.test.json
index 7c5594f2..5722724e 100644
--- a/test/bipm/si/2019/derived/prefixed/quectovolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectovolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectovolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectovolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectowatt.test.json b/test/bipm/si/2019/derived/prefixed/quectowatt.test.json
index 7ac86d06..745d378a 100644
--- a/test/bipm/si/2019/derived/prefixed/quectowatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectowatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectowatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectowatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quectoweber.test.json b/test/bipm/si/2019/derived/prefixed/quectoweber.test.json
index f33ae93b..b9b2f903 100644
--- a/test/bipm/si/2019/derived/prefixed/quectoweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quectoweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quectoweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quectoweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettabecquerel.test.json b/test/bipm/si/2019/derived/prefixed/quettabecquerel.test.json
index 6df44667..c9f498f1 100644
--- a/test/bipm/si/2019/derived/prefixed/quettabecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettabecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettabecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettabecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quettacoulomb.test.json b/test/bipm/si/2019/derived/prefixed/quettacoulomb.test.json
index 0c607f9e..a2bfc116 100644
--- a/test/bipm/si/2019/derived/prefixed/quettacoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettacoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettacoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettacoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettadegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/quettadegree-celsius.test.json
index 993b4512..7ce4acd5 100644
--- a/test/bipm/si/2019/derived/prefixed/quettadegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettadegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettadegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettadegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettafarad.test.json b/test/bipm/si/2019/derived/prefixed/quettafarad.test.json
index 3b97b017..0fefa455 100644
--- a/test/bipm/si/2019/derived/prefixed/quettafarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettafarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettafarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettafarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quettagray.test.json b/test/bipm/si/2019/derived/prefixed/quettagray.test.json
index cb28c537..a40abdbd 100644
--- a/test/bipm/si/2019/derived/prefixed/quettagray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettagray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettagray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettagray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettahenry.test.json b/test/bipm/si/2019/derived/prefixed/quettahenry.test.json
index f81eeaa5..2e504f01 100644
--- a/test/bipm/si/2019/derived/prefixed/quettahenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettahenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettahenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettahenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quettahertz.test.json b/test/bipm/si/2019/derived/prefixed/quettahertz.test.json
index 01495047..1416f91c 100644
--- a/test/bipm/si/2019/derived/prefixed/quettahertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettahertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettahertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettahertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quettajoule.test.json b/test/bipm/si/2019/derived/prefixed/quettajoule.test.json
index bdc0aa6e..c915471c 100644
--- a/test/bipm/si/2019/derived/prefixed/quettajoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettajoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettajoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettajoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettakatal.test.json b/test/bipm/si/2019/derived/prefixed/quettakatal.test.json
index 77639064..29a3ee4e 100644
--- a/test/bipm/si/2019/derived/prefixed/quettakatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettakatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettakatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettakatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quettalumen.test.json b/test/bipm/si/2019/derived/prefixed/quettalumen.test.json
index 8969e6c2..010f819b 100644
--- a/test/bipm/si/2019/derived/prefixed/quettalumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettalumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettalumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettalumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettalux.test.json b/test/bipm/si/2019/derived/prefixed/quettalux.test.json
index aa7b8ab5..34bbb7a8 100644
--- a/test/bipm/si/2019/derived/prefixed/quettalux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettalux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettalux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettalux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettanewton.test.json b/test/bipm/si/2019/derived/prefixed/quettanewton.test.json
index 9e6c2210..38ac88b0 100644
--- a/test/bipm/si/2019/derived/prefixed/quettanewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettanewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettanewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettanewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettaohm.test.json b/test/bipm/si/2019/derived/prefixed/quettaohm.test.json
index 0ad676fd..1958c3ef 100644
--- a/test/bipm/si/2019/derived/prefixed/quettaohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettaohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettaohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettaohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quettapascal.test.json b/test/bipm/si/2019/derived/prefixed/quettapascal.test.json
index cab7afa4..d0083ceb 100644
--- a/test/bipm/si/2019/derived/prefixed/quettapascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettapascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettapascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettapascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettaradian.test.json b/test/bipm/si/2019/derived/prefixed/quettaradian.test.json
index a0326230..9153e7d9 100644
--- a/test/bipm/si/2019/derived/prefixed/quettaradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettaradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettaradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettaradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettasiemens.test.json b/test/bipm/si/2019/derived/prefixed/quettasiemens.test.json
index ace869b5..fca53896 100644
--- a/test/bipm/si/2019/derived/prefixed/quettasiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettasiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettasiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettasiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/quettasievert.test.json b/test/bipm/si/2019/derived/prefixed/quettasievert.test.json
index d814b63b..024abbf3 100644
--- a/test/bipm/si/2019/derived/prefixed/quettasievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettasievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettasievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettasievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettasteradian.test.json b/test/bipm/si/2019/derived/prefixed/quettasteradian.test.json
index d07d781e..a1797f65 100644
--- a/test/bipm/si/2019/derived/prefixed/quettasteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettasteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettasteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettasteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettatesla.test.json b/test/bipm/si/2019/derived/prefixed/quettatesla.test.json
index a02b791a..730f0405 100644
--- a/test/bipm/si/2019/derived/prefixed/quettatesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettatesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettatesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettatesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettavolt.test.json b/test/bipm/si/2019/derived/prefixed/quettavolt.test.json
index 1a59abaf..281619a1 100644
--- a/test/bipm/si/2019/derived/prefixed/quettavolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettavolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettavolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettavolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettawatt.test.json b/test/bipm/si/2019/derived/prefixed/quettawatt.test.json
index c6eceff5..6d037e5d 100644
--- a/test/bipm/si/2019/derived/prefixed/quettawatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettawatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettawatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettawatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/quettaweber.test.json b/test/bipm/si/2019/derived/prefixed/quettaweber.test.json
index 3cffde2d..758819e6 100644
--- a/test/bipm/si/2019/derived/prefixed/quettaweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/quettaweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/quettaweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/quettaweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnabecquerel.test.json b/test/bipm/si/2019/derived/prefixed/ronnabecquerel.test.json
index 4b1c293a..4994dc01 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnabecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnabecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnabecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnabecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnacoulomb.test.json b/test/bipm/si/2019/derived/prefixed/ronnacoulomb.test.json
index 92525933..b890de1d 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnacoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnacoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnacoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnacoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnadegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/ronnadegree-celsius.test.json
index c81d1ba2..31f9bd68 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnadegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnadegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnadegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnadegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnafarad.test.json b/test/bipm/si/2019/derived/prefixed/ronnafarad.test.json
index 7cbdd8f4..401a82d9 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnafarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnafarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnafarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnafarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnagray.test.json b/test/bipm/si/2019/derived/prefixed/ronnagray.test.json
index f67196fa..6461d380 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnagray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnagray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnagray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnagray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnahenry.test.json b/test/bipm/si/2019/derived/prefixed/ronnahenry.test.json
index a481bd2b..3a113daa 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnahenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnahenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnahenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnahenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnahertz.test.json b/test/bipm/si/2019/derived/prefixed/ronnahertz.test.json
index 3b9dfc2d..9c43f82d 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnahertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnahertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnahertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnahertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnajoule.test.json b/test/bipm/si/2019/derived/prefixed/ronnajoule.test.json
index 2c219096..5e89ff61 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnajoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnajoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnajoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnajoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnakatal.test.json b/test/bipm/si/2019/derived/prefixed/ronnakatal.test.json
index a7aeda8d..b9133f08 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnakatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnakatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnakatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnakatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnalumen.test.json b/test/bipm/si/2019/derived/prefixed/ronnalumen.test.json
index 0d5ff534..894b2b68 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnalumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnalumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnalumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnalumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnalux.test.json b/test/bipm/si/2019/derived/prefixed/ronnalux.test.json
index b7bf3541..e9fccff4 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnalux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnalux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnalux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnalux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnanewton.test.json b/test/bipm/si/2019/derived/prefixed/ronnanewton.test.json
index 11a4d040..48fee161 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnanewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnanewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnanewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnanewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnaohm.test.json b/test/bipm/si/2019/derived/prefixed/ronnaohm.test.json
index ce7cc0fc..bda65fbf 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnaohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnaohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnaohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnaohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnapascal.test.json b/test/bipm/si/2019/derived/prefixed/ronnapascal.test.json
index 2b6a445a..3ea396d3 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnapascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnapascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnapascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnapascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnaradian.test.json b/test/bipm/si/2019/derived/prefixed/ronnaradian.test.json
index 550d2927..e9173338 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnaradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnaradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnaradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnaradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnasiemens.test.json b/test/bipm/si/2019/derived/prefixed/ronnasiemens.test.json
index d92dff98..490791bb 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnasiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnasiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnasiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnasiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnasievert.test.json b/test/bipm/si/2019/derived/prefixed/ronnasievert.test.json
index 01a1dd57..947ea018 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnasievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnasievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnasievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnasievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnasteradian.test.json b/test/bipm/si/2019/derived/prefixed/ronnasteradian.test.json
index d97aa21e..a4740e52 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnasteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnasteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnasteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnasteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnatesla.test.json b/test/bipm/si/2019/derived/prefixed/ronnatesla.test.json
index a9a2a49f..ee5a30a1 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnatesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnatesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnatesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnatesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnavolt.test.json b/test/bipm/si/2019/derived/prefixed/ronnavolt.test.json
index 44c3d0e6..22622b9f 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnavolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnavolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnavolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnavolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnawatt.test.json b/test/bipm/si/2019/derived/prefixed/ronnawatt.test.json
index 37595d72..e026ca6a 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnawatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnawatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnawatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnawatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/ronnaweber.test.json b/test/bipm/si/2019/derived/prefixed/ronnaweber.test.json
index dc0253d2..066195c9 100644
--- a/test/bipm/si/2019/derived/prefixed/ronnaweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/ronnaweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/ronnaweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/ronnaweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontobecquerel.test.json b/test/bipm/si/2019/derived/prefixed/rontobecquerel.test.json
index 3e543ee9..a5f07857 100644
--- a/test/bipm/si/2019/derived/prefixed/rontobecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontobecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontobecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontobecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/rontocoulomb.test.json b/test/bipm/si/2019/derived/prefixed/rontocoulomb.test.json
index e8c926bb..5ffcea5b 100644
--- a/test/bipm/si/2019/derived/prefixed/rontocoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontocoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontocoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontocoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontodegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/rontodegree-celsius.test.json
index e0207573..5af04d99 100644
--- a/test/bipm/si/2019/derived/prefixed/rontodegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontodegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontodegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontodegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontofarad.test.json b/test/bipm/si/2019/derived/prefixed/rontofarad.test.json
index 27d83f62..903d2038 100644
--- a/test/bipm/si/2019/derived/prefixed/rontofarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontofarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontofarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontofarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/rontogray.test.json b/test/bipm/si/2019/derived/prefixed/rontogray.test.json
index 0e7e4c0c..eb3823b5 100644
--- a/test/bipm/si/2019/derived/prefixed/rontogray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontogray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontogray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontogray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontohenry.test.json b/test/bipm/si/2019/derived/prefixed/rontohenry.test.json
index 67ed1dc0..9cbcea0c 100644
--- a/test/bipm/si/2019/derived/prefixed/rontohenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontohenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontohenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontohenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/rontohertz.test.json b/test/bipm/si/2019/derived/prefixed/rontohertz.test.json
index d600c111..cfe34061 100644
--- a/test/bipm/si/2019/derived/prefixed/rontohertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontohertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontohertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontohertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/rontojoule.test.json b/test/bipm/si/2019/derived/prefixed/rontojoule.test.json
index dbb4cf25..b6341a8f 100644
--- a/test/bipm/si/2019/derived/prefixed/rontojoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontojoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontojoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontojoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontokatal.test.json b/test/bipm/si/2019/derived/prefixed/rontokatal.test.json
index 706c0b02..9851afae 100644
--- a/test/bipm/si/2019/derived/prefixed/rontokatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontokatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontokatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontokatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/rontolumen.test.json b/test/bipm/si/2019/derived/prefixed/rontolumen.test.json
index 662a36bd..259460e7 100644
--- a/test/bipm/si/2019/derived/prefixed/rontolumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontolumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontolumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontolumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontolux.test.json b/test/bipm/si/2019/derived/prefixed/rontolux.test.json
index 55c2bb48..0995075b 100644
--- a/test/bipm/si/2019/derived/prefixed/rontolux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontolux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontolux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontolux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontonewton.test.json b/test/bipm/si/2019/derived/prefixed/rontonewton.test.json
index 0cc23dd6..a8414f11 100644
--- a/test/bipm/si/2019/derived/prefixed/rontonewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontonewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontonewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontonewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontoohm.test.json b/test/bipm/si/2019/derived/prefixed/rontoohm.test.json
index cc446071..dc779feb 100644
--- a/test/bipm/si/2019/derived/prefixed/rontoohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontoohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontoohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontoohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/rontopascal.test.json b/test/bipm/si/2019/derived/prefixed/rontopascal.test.json
index 88957aaa..4c51c2c8 100644
--- a/test/bipm/si/2019/derived/prefixed/rontopascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontopascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontopascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontopascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontoradian.test.json b/test/bipm/si/2019/derived/prefixed/rontoradian.test.json
index 3355e619..34da367c 100644
--- a/test/bipm/si/2019/derived/prefixed/rontoradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontoradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontoradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontoradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontosiemens.test.json b/test/bipm/si/2019/derived/prefixed/rontosiemens.test.json
index 15d64e5c..6f623a9a 100644
--- a/test/bipm/si/2019/derived/prefixed/rontosiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontosiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontosiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontosiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/rontosievert.test.json b/test/bipm/si/2019/derived/prefixed/rontosievert.test.json
index 2938271f..7569cbb2 100644
--- a/test/bipm/si/2019/derived/prefixed/rontosievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontosievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontosievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontosievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontosteradian.test.json b/test/bipm/si/2019/derived/prefixed/rontosteradian.test.json
index 22f16695..15894e7d 100644
--- a/test/bipm/si/2019/derived/prefixed/rontosteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontosteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontosteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontosteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontotesla.test.json b/test/bipm/si/2019/derived/prefixed/rontotesla.test.json
index 72a6dd44..d7d90fcd 100644
--- a/test/bipm/si/2019/derived/prefixed/rontotesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontotesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontotesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontotesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontovolt.test.json b/test/bipm/si/2019/derived/prefixed/rontovolt.test.json
index 0247fba2..a1064358 100644
--- a/test/bipm/si/2019/derived/prefixed/rontovolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontovolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontovolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontovolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontowatt.test.json b/test/bipm/si/2019/derived/prefixed/rontowatt.test.json
index 4a3751c4..ea5df1c3 100644
--- a/test/bipm/si/2019/derived/prefixed/rontowatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontowatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontowatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontowatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/rontoweber.test.json b/test/bipm/si/2019/derived/prefixed/rontoweber.test.json
index 01a73133..e1d53898 100644
--- a/test/bipm/si/2019/derived/prefixed/rontoweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/rontoweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/rontoweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/rontoweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/terabecquerel.test.json b/test/bipm/si/2019/derived/prefixed/terabecquerel.test.json
index 75a062ee..6c82b2ef 100644
--- a/test/bipm/si/2019/derived/prefixed/terabecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/terabecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/terabecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/terabecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/teracoulomb.test.json b/test/bipm/si/2019/derived/prefixed/teracoulomb.test.json
index 9f6602ed..99c562dc 100644
--- a/test/bipm/si/2019/derived/prefixed/teracoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/teracoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/teracoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/teracoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/teradegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/teradegree-celsius.test.json
index aaba6118..184fbdaf 100644
--- a/test/bipm/si/2019/derived/prefixed/teradegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/teradegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/teradegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/teradegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/terafarad.test.json b/test/bipm/si/2019/derived/prefixed/terafarad.test.json
index fae34682..dd93883f 100644
--- a/test/bipm/si/2019/derived/prefixed/terafarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/terafarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/terafarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/terafarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/teragray.test.json b/test/bipm/si/2019/derived/prefixed/teragray.test.json
index ecd5d8fe..40e930b4 100644
--- a/test/bipm/si/2019/derived/prefixed/teragray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/teragray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/teragray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/teragray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/terahenry.test.json b/test/bipm/si/2019/derived/prefixed/terahenry.test.json
index af5bfaba..bcf0dc8d 100644
--- a/test/bipm/si/2019/derived/prefixed/terahenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/terahenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/terahenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/terahenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/terahertz.test.json b/test/bipm/si/2019/derived/prefixed/terahertz.test.json
index a2f831a9..246c3c00 100644
--- a/test/bipm/si/2019/derived/prefixed/terahertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/terahertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/terahertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/terahertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/terajoule.test.json b/test/bipm/si/2019/derived/prefixed/terajoule.test.json
index 5569e8b3..785cd129 100644
--- a/test/bipm/si/2019/derived/prefixed/terajoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/terajoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/terajoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/terajoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/terakatal.test.json b/test/bipm/si/2019/derived/prefixed/terakatal.test.json
index 7e5069e7..7e254d02 100644
--- a/test/bipm/si/2019/derived/prefixed/terakatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/terakatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/terakatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/terakatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/teralumen.test.json b/test/bipm/si/2019/derived/prefixed/teralumen.test.json
index eec2485e..f860e399 100644
--- a/test/bipm/si/2019/derived/prefixed/teralumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/teralumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/teralumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/teralumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/teralux.test.json b/test/bipm/si/2019/derived/prefixed/teralux.test.json
index 93696547..379df37d 100644
--- a/test/bipm/si/2019/derived/prefixed/teralux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/teralux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/teralux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/teralux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/teranewton.test.json b/test/bipm/si/2019/derived/prefixed/teranewton.test.json
index 2ffca111..a133379d 100644
--- a/test/bipm/si/2019/derived/prefixed/teranewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/teranewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/teranewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/teranewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/teraohm.test.json b/test/bipm/si/2019/derived/prefixed/teraohm.test.json
index 9f1e7d54..60e4d3bf 100644
--- a/test/bipm/si/2019/derived/prefixed/teraohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/teraohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/teraohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/teraohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/terapascal.test.json b/test/bipm/si/2019/derived/prefixed/terapascal.test.json
index 98c025c6..a6cd12ea 100644
--- a/test/bipm/si/2019/derived/prefixed/terapascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/terapascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/terapascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/terapascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/teraradian.test.json b/test/bipm/si/2019/derived/prefixed/teraradian.test.json
index a1d52e49..201d2d70 100644
--- a/test/bipm/si/2019/derived/prefixed/teraradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/teraradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/teraradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/teraradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/terasiemens.test.json b/test/bipm/si/2019/derived/prefixed/terasiemens.test.json
index 2e6f7205..1bb3a2a1 100644
--- a/test/bipm/si/2019/derived/prefixed/terasiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/terasiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/terasiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/terasiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/terasievert.test.json b/test/bipm/si/2019/derived/prefixed/terasievert.test.json
index 6d4e0041..0d909a88 100644
--- a/test/bipm/si/2019/derived/prefixed/terasievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/terasievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/terasievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/terasievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/terasteradian.test.json b/test/bipm/si/2019/derived/prefixed/terasteradian.test.json
index f928dc91..1a6c2796 100644
--- a/test/bipm/si/2019/derived/prefixed/terasteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/terasteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/terasteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/terasteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/teratesla.test.json b/test/bipm/si/2019/derived/prefixed/teratesla.test.json
index d5817370..56a0df26 100644
--- a/test/bipm/si/2019/derived/prefixed/teratesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/teratesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/teratesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/teratesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/teravolt.test.json b/test/bipm/si/2019/derived/prefixed/teravolt.test.json
index 69cd854d..8e2e0067 100644
--- a/test/bipm/si/2019/derived/prefixed/teravolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/teravolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/teravolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/teravolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/terawatt.test.json b/test/bipm/si/2019/derived/prefixed/terawatt.test.json
index 34db515b..53cc568f 100644
--- a/test/bipm/si/2019/derived/prefixed/terawatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/terawatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/terawatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/terawatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/teraweber.test.json b/test/bipm/si/2019/derived/prefixed/teraweber.test.json
index 765797c1..47290744 100644
--- a/test/bipm/si/2019/derived/prefixed/teraweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/teraweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/teraweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/teraweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctobecquerel.test.json b/test/bipm/si/2019/derived/prefixed/yoctobecquerel.test.json
index 5e627b4b..ac30e515 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctobecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctobecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctobecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctobecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctocoulomb.test.json b/test/bipm/si/2019/derived/prefixed/yoctocoulomb.test.json
index 735620c4..7dbf313c 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctocoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctocoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctocoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctocoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctodegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/yoctodegree-celsius.test.json
index 8b5a3015..0322f250 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctodegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctodegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctodegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctodegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctofarad.test.json b/test/bipm/si/2019/derived/prefixed/yoctofarad.test.json
index 8916cea4..534bf8dc 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctofarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctofarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctofarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctofarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctogray.test.json b/test/bipm/si/2019/derived/prefixed/yoctogray.test.json
index ab12b9b0..b82b2a3f 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctogray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctogray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctogray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctogray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctohenry.test.json b/test/bipm/si/2019/derived/prefixed/yoctohenry.test.json
index 1fe3fdbe..fa03c4c3 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctohenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctohenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctohenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctohenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctohertz.test.json b/test/bipm/si/2019/derived/prefixed/yoctohertz.test.json
index 296e63ce..c099623b 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctohertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctohertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctohertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctohertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctojoule.test.json b/test/bipm/si/2019/derived/prefixed/yoctojoule.test.json
index e1a70c61..c7d01e43 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctojoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctojoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctojoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctojoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctokatal.test.json b/test/bipm/si/2019/derived/prefixed/yoctokatal.test.json
index cc29488d..df835548 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctokatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctokatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctokatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctokatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctolumen.test.json b/test/bipm/si/2019/derived/prefixed/yoctolumen.test.json
index 9643c022..38ea1e65 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctolumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctolumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctolumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctolumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctolux.test.json b/test/bipm/si/2019/derived/prefixed/yoctolux.test.json
index 1b91bc5f..2adadc37 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctolux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctolux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctolux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctolux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctonewton.test.json b/test/bipm/si/2019/derived/prefixed/yoctonewton.test.json
index 580269d0..d94ea5f0 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctonewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctonewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctonewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctonewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctoohm.test.json b/test/bipm/si/2019/derived/prefixed/yoctoohm.test.json
index f527d6a7..9bdc3c6e 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctoohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctoohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctoohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctoohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctopascal.test.json b/test/bipm/si/2019/derived/prefixed/yoctopascal.test.json
index 1cd07b9b..5a946061 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctopascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctopascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctopascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctopascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctoradian.test.json b/test/bipm/si/2019/derived/prefixed/yoctoradian.test.json
index b77a3862..848ec5ad 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctoradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctoradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctoradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctoradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctosiemens.test.json b/test/bipm/si/2019/derived/prefixed/yoctosiemens.test.json
index 406bdef2..714dafd3 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctosiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctosiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctosiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctosiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctosievert.test.json b/test/bipm/si/2019/derived/prefixed/yoctosievert.test.json
index 53834e79..57a4fe74 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctosievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctosievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctosievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctosievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctosteradian.test.json b/test/bipm/si/2019/derived/prefixed/yoctosteradian.test.json
index d8c715c1..c9b7d59f 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctosteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctosteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctosteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctosteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctotesla.test.json b/test/bipm/si/2019/derived/prefixed/yoctotesla.test.json
index 9b242039..45d5dd07 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctotesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctotesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctotesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctotesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctovolt.test.json b/test/bipm/si/2019/derived/prefixed/yoctovolt.test.json
index fe74d228..d284dbad 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctovolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctovolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctovolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctovolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctowatt.test.json b/test/bipm/si/2019/derived/prefixed/yoctowatt.test.json
index c996a407..9477e2c5 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctowatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctowatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctowatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctowatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yoctoweber.test.json b/test/bipm/si/2019/derived/prefixed/yoctoweber.test.json
index cab3d529..f943fc9c 100644
--- a/test/bipm/si/2019/derived/prefixed/yoctoweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yoctoweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yoctoweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yoctoweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottabecquerel.test.json b/test/bipm/si/2019/derived/prefixed/yottabecquerel.test.json
index e9388b39..cd8e7042 100644
--- a/test/bipm/si/2019/derived/prefixed/yottabecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottabecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottabecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottabecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yottacoulomb.test.json b/test/bipm/si/2019/derived/prefixed/yottacoulomb.test.json
index f1f187f3..b4162056 100644
--- a/test/bipm/si/2019/derived/prefixed/yottacoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottacoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottacoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottacoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottadegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/yottadegree-celsius.test.json
index b042bf10..cea7a154 100644
--- a/test/bipm/si/2019/derived/prefixed/yottadegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottadegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottadegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottadegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottafarad.test.json b/test/bipm/si/2019/derived/prefixed/yottafarad.test.json
index e4836c82..01a3fd0c 100644
--- a/test/bipm/si/2019/derived/prefixed/yottafarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottafarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottafarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottafarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yottagray.test.json b/test/bipm/si/2019/derived/prefixed/yottagray.test.json
index 0079b821..512436f5 100644
--- a/test/bipm/si/2019/derived/prefixed/yottagray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottagray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottagray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottagray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottahenry.test.json b/test/bipm/si/2019/derived/prefixed/yottahenry.test.json
index 11998f87..06100f65 100644
--- a/test/bipm/si/2019/derived/prefixed/yottahenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottahenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottahenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottahenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yottahertz.test.json b/test/bipm/si/2019/derived/prefixed/yottahertz.test.json
index 8ad47cf1..fa2ed1ba 100644
--- a/test/bipm/si/2019/derived/prefixed/yottahertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottahertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottahertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottahertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yottajoule.test.json b/test/bipm/si/2019/derived/prefixed/yottajoule.test.json
index 18b8031f..4b78915e 100644
--- a/test/bipm/si/2019/derived/prefixed/yottajoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottajoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottajoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottajoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottakatal.test.json b/test/bipm/si/2019/derived/prefixed/yottakatal.test.json
index 8d7e9076..f7ffa519 100644
--- a/test/bipm/si/2019/derived/prefixed/yottakatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottakatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottakatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottakatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yottalumen.test.json b/test/bipm/si/2019/derived/prefixed/yottalumen.test.json
index 07e03439..c59c6378 100644
--- a/test/bipm/si/2019/derived/prefixed/yottalumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottalumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottalumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottalumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottalux.test.json b/test/bipm/si/2019/derived/prefixed/yottalux.test.json
index 0684102c..5b289c32 100644
--- a/test/bipm/si/2019/derived/prefixed/yottalux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottalux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottalux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottalux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottanewton.test.json b/test/bipm/si/2019/derived/prefixed/yottanewton.test.json
index a1f38477..2a76d06e 100644
--- a/test/bipm/si/2019/derived/prefixed/yottanewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottanewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottanewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottanewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottaohm.test.json b/test/bipm/si/2019/derived/prefixed/yottaohm.test.json
index aab070b1..b7b4cd54 100644
--- a/test/bipm/si/2019/derived/prefixed/yottaohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottaohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottaohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottaohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yottapascal.test.json b/test/bipm/si/2019/derived/prefixed/yottapascal.test.json
index 2dc50f7c..4c039711 100644
--- a/test/bipm/si/2019/derived/prefixed/yottapascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottapascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottapascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottapascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottaradian.test.json b/test/bipm/si/2019/derived/prefixed/yottaradian.test.json
index 377861e3..825cac06 100644
--- a/test/bipm/si/2019/derived/prefixed/yottaradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottaradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottaradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottaradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottasiemens.test.json b/test/bipm/si/2019/derived/prefixed/yottasiemens.test.json
index ff63e4b1..ce1dc58b 100644
--- a/test/bipm/si/2019/derived/prefixed/yottasiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottasiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottasiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottasiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/yottasievert.test.json b/test/bipm/si/2019/derived/prefixed/yottasievert.test.json
index 8fc62358..d8ff58cc 100644
--- a/test/bipm/si/2019/derived/prefixed/yottasievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottasievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottasievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottasievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottasteradian.test.json b/test/bipm/si/2019/derived/prefixed/yottasteradian.test.json
index 09189388..26cda40b 100644
--- a/test/bipm/si/2019/derived/prefixed/yottasteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottasteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottasteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottasteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottatesla.test.json b/test/bipm/si/2019/derived/prefixed/yottatesla.test.json
index 565e1aea..eef9b550 100644
--- a/test/bipm/si/2019/derived/prefixed/yottatesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottatesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottatesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottatesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottavolt.test.json b/test/bipm/si/2019/derived/prefixed/yottavolt.test.json
index 82099ae0..4ee4d09c 100644
--- a/test/bipm/si/2019/derived/prefixed/yottavolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottavolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottavolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottavolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottawatt.test.json b/test/bipm/si/2019/derived/prefixed/yottawatt.test.json
index de859bcc..81df746a 100644
--- a/test/bipm/si/2019/derived/prefixed/yottawatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottawatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottawatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottawatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/yottaweber.test.json b/test/bipm/si/2019/derived/prefixed/yottaweber.test.json
index c91d92b8..53cb7fa8 100644
--- a/test/bipm/si/2019/derived/prefixed/yottaweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/yottaweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/yottaweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/yottaweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptobecquerel.test.json b/test/bipm/si/2019/derived/prefixed/zeptobecquerel.test.json
index 249a5a32..56b9935d 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptobecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptobecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptobecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptobecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptocoulomb.test.json b/test/bipm/si/2019/derived/prefixed/zeptocoulomb.test.json
index 30b266b2..2cf14ed2 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptocoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptocoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptocoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptocoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptodegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/zeptodegree-celsius.test.json
index 4733b9cf..ab358423 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptodegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptodegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptodegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptodegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptofarad.test.json b/test/bipm/si/2019/derived/prefixed/zeptofarad.test.json
index f470d9a3..66cdaf53 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptofarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptofarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptofarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptofarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptogray.test.json b/test/bipm/si/2019/derived/prefixed/zeptogray.test.json
index 8ce9319c..b3b85b07 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptogray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptogray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptogray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptogray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptohenry.test.json b/test/bipm/si/2019/derived/prefixed/zeptohenry.test.json
index 05988282..28b385af 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptohenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptohenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptohenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptohenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptohertz.test.json b/test/bipm/si/2019/derived/prefixed/zeptohertz.test.json
index 3ee0dec3..d9954a77 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptohertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptohertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptohertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptohertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptojoule.test.json b/test/bipm/si/2019/derived/prefixed/zeptojoule.test.json
index 8846b828..224ab775 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptojoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptojoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptojoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptojoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptokatal.test.json b/test/bipm/si/2019/derived/prefixed/zeptokatal.test.json
index 2758668d..491daf1b 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptokatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptokatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptokatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptokatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptolumen.test.json b/test/bipm/si/2019/derived/prefixed/zeptolumen.test.json
index 62efdee9..ae1665db 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptolumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptolumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptolumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptolumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptolux.test.json b/test/bipm/si/2019/derived/prefixed/zeptolux.test.json
index 4ec106c4..66f7e57d 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptolux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptolux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptolux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptolux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptonewton.test.json b/test/bipm/si/2019/derived/prefixed/zeptonewton.test.json
index ef739811..862e5849 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptonewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptonewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptonewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptonewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptoohm.test.json b/test/bipm/si/2019/derived/prefixed/zeptoohm.test.json
index 4915f0e2..464a8f9d 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptoohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptoohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptoohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptoohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptopascal.test.json b/test/bipm/si/2019/derived/prefixed/zeptopascal.test.json
index 24b5ea6d..51fe1733 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptopascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptopascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptopascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptopascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptoradian.test.json b/test/bipm/si/2019/derived/prefixed/zeptoradian.test.json
index 6645b8f0..7049da12 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptoradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptoradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptoradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptoradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptosiemens.test.json b/test/bipm/si/2019/derived/prefixed/zeptosiemens.test.json
index f577d5d7..5a5f3237 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptosiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptosiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptosiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptosiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptosievert.test.json b/test/bipm/si/2019/derived/prefixed/zeptosievert.test.json
index c70502ee..5ace117e 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptosievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptosievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptosievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptosievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptosteradian.test.json b/test/bipm/si/2019/derived/prefixed/zeptosteradian.test.json
index 12f8232b..ea52de50 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptosteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptosteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptosteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptosteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptotesla.test.json b/test/bipm/si/2019/derived/prefixed/zeptotesla.test.json
index 6b943e63..b9f745f2 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptotesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptotesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptotesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptotesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptovolt.test.json b/test/bipm/si/2019/derived/prefixed/zeptovolt.test.json
index 52f9e9ab..fd0abe45 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptovolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptovolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptovolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptovolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptowatt.test.json b/test/bipm/si/2019/derived/prefixed/zeptowatt.test.json
index 633e3e4d..5f83a622 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptowatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptowatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptowatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptowatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zeptoweber.test.json b/test/bipm/si/2019/derived/prefixed/zeptoweber.test.json
index 40c0a28f..5f22d82c 100644
--- a/test/bipm/si/2019/derived/prefixed/zeptoweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zeptoweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zeptoweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zeptoweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettabecquerel.test.json b/test/bipm/si/2019/derived/prefixed/zettabecquerel.test.json
index 7dc8640a..24ff5177 100644
--- a/test/bipm/si/2019/derived/prefixed/zettabecquerel.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettabecquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettabecquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettabecquerel.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zettacoulomb.test.json b/test/bipm/si/2019/derived/prefixed/zettacoulomb.test.json
index 40dcc12c..35879c84 100644
--- a/test/bipm/si/2019/derived/prefixed/zettacoulomb.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettacoulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettacoulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettacoulomb.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettadegree-celsius.test.json b/test/bipm/si/2019/derived/prefixed/zettadegree-celsius.test.json
index 2ac57d39..68b8cba9 100644
--- a/test/bipm/si/2019/derived/prefixed/zettadegree-celsius.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettadegree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettadegree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettadegree-celsius.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettafarad.test.json b/test/bipm/si/2019/derived/prefixed/zettafarad.test.json
index 109f36de..68057d1b 100644
--- a/test/bipm/si/2019/derived/prefixed/zettafarad.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettafarad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettafarad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettafarad.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zettagray.test.json b/test/bipm/si/2019/derived/prefixed/zettagray.test.json
index 12e82c8c..f3f7a5d9 100644
--- a/test/bipm/si/2019/derived/prefixed/zettagray.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettagray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettagray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettagray.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettahenry.test.json b/test/bipm/si/2019/derived/prefixed/zettahenry.test.json
index 3a274b23..73a9ec7c 100644
--- a/test/bipm/si/2019/derived/prefixed/zettahenry.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettahenry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettahenry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettahenry.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zettahertz.test.json b/test/bipm/si/2019/derived/prefixed/zettahertz.test.json
index 7738fc9e..aa17251b 100644
--- a/test/bipm/si/2019/derived/prefixed/zettahertz.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettahertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettahertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettahertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zettajoule.test.json b/test/bipm/si/2019/derived/prefixed/zettajoule.test.json
index 9ac7c532..527bf1df 100644
--- a/test/bipm/si/2019/derived/prefixed/zettajoule.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettajoule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettajoule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettajoule.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettakatal.test.json b/test/bipm/si/2019/derived/prefixed/zettakatal.test.json
index 06570171..a6d071a4 100644
--- a/test/bipm/si/2019/derived/prefixed/zettakatal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettakatal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettakatal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettakatal.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zettalumen.test.json b/test/bipm/si/2019/derived/prefixed/zettalumen.test.json
index aed847ca..67fe5791 100644
--- a/test/bipm/si/2019/derived/prefixed/zettalumen.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettalumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettalumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettalumen.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettalux.test.json b/test/bipm/si/2019/derived/prefixed/zettalux.test.json
index 1209bc83..91935fab 100644
--- a/test/bipm/si/2019/derived/prefixed/zettalux.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettalux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettalux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettalux.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettanewton.test.json b/test/bipm/si/2019/derived/prefixed/zettanewton.test.json
index 909a759d..75e4957a 100644
--- a/test/bipm/si/2019/derived/prefixed/zettanewton.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettanewton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettanewton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettanewton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettaohm.test.json b/test/bipm/si/2019/derived/prefixed/zettaohm.test.json
index 9d8a507b..5b4e4435 100644
--- a/test/bipm/si/2019/derived/prefixed/zettaohm.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettaohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettaohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettaohm.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zettapascal.test.json b/test/bipm/si/2019/derived/prefixed/zettapascal.test.json
index ee0d2bd8..1a9905bc 100644
--- a/test/bipm/si/2019/derived/prefixed/zettapascal.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettapascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettapascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettapascal.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettaradian.test.json b/test/bipm/si/2019/derived/prefixed/zettaradian.test.json
index b009b81a..bc928651 100644
--- a/test/bipm/si/2019/derived/prefixed/zettaradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettaradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettaradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettaradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettasiemens.test.json b/test/bipm/si/2019/derived/prefixed/zettasiemens.test.json
index 707fae23..d9e24ca5 100644
--- a/test/bipm/si/2019/derived/prefixed/zettasiemens.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettasiemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettasiemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettasiemens.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/prefixed/zettasievert.test.json b/test/bipm/si/2019/derived/prefixed/zettasievert.test.json
index b422ef3c..5bc7dbc6 100644
--- a/test/bipm/si/2019/derived/prefixed/zettasievert.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettasievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettasievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettasievert.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettasteradian.test.json b/test/bipm/si/2019/derived/prefixed/zettasteradian.test.json
index 98d78550..cc45f314 100644
--- a/test/bipm/si/2019/derived/prefixed/zettasteradian.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettasteradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettasteradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettasteradian.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettatesla.test.json b/test/bipm/si/2019/derived/prefixed/zettatesla.test.json
index eaa9ea61..523bb6d4 100644
--- a/test/bipm/si/2019/derived/prefixed/zettatesla.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettatesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettatesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettatesla.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettavolt.test.json b/test/bipm/si/2019/derived/prefixed/zettavolt.test.json
index 1aff74ce..93549f24 100644
--- a/test/bipm/si/2019/derived/prefixed/zettavolt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettavolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettavolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettavolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettawatt.test.json b/test/bipm/si/2019/derived/prefixed/zettawatt.test.json
index 0bdd7966..cd74815c 100644
--- a/test/bipm/si/2019/derived/prefixed/zettawatt.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettawatt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettawatt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettawatt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/prefixed/zettaweber.test.json b/test/bipm/si/2019/derived/prefixed/zettaweber.test.json
index 2388a396..968ae507 100644
--- a/test/bipm/si/2019/derived/prefixed/zettaweber.test.json
+++ b/test/bipm/si/2019/derived/prefixed/zettaweber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/prefixed/zettaweber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/prefixed/zettaweber.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/derived/quantity/absorbed-dose.test.json b/test/bipm/si/2019/derived/quantity/absorbed-dose.test.json
index b02b60d1..18a60a32 100644
--- a/test/bipm/si/2019/derived/quantity/absorbed-dose.test.json
+++ b/test/bipm/si/2019/derived/quantity/absorbed-dose.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/absorbed-dose.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/absorbed-dose.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/activity-referred-to-radionuclide.test.json b/test/bipm/si/2019/derived/quantity/activity-referred-to-radionuclide.test.json
index 029023f0..5a53acb6 100644
--- a/test/bipm/si/2019/derived/quantity/activity-referred-to-radionuclide.test.json
+++ b/test/bipm/si/2019/derived/quantity/activity-referred-to-radionuclide.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/activity-referred-to-radionuclide.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/activity-referred-to-radionuclide.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/amount-of-heat.test.json b/test/bipm/si/2019/derived/quantity/amount-of-heat.test.json
index a71243b5..1bde2b30 100644
--- a/test/bipm/si/2019/derived/quantity/amount-of-heat.test.json
+++ b/test/bipm/si/2019/derived/quantity/amount-of-heat.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/amount-of-heat.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/amount-of-heat.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/capacitance.test.json b/test/bipm/si/2019/derived/quantity/capacitance.test.json
index c6787a4c..83457cf4 100644
--- a/test/bipm/si/2019/derived/quantity/capacitance.test.json
+++ b/test/bipm/si/2019/derived/quantity/capacitance.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/capacitance.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/capacitance.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/catalytic-activity.test.json b/test/bipm/si/2019/derived/quantity/catalytic-activity.test.json
index c07cae81..8c8c1b85 100644
--- a/test/bipm/si/2019/derived/quantity/catalytic-activity.test.json
+++ b/test/bipm/si/2019/derived/quantity/catalytic-activity.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/catalytic-activity.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/catalytic-activity.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/celsius-temperature.test.json b/test/bipm/si/2019/derived/quantity/celsius-temperature.test.json
index aa47c9e4..60c33165 100644
--- a/test/bipm/si/2019/derived/quantity/celsius-temperature.test.json
+++ b/test/bipm/si/2019/derived/quantity/celsius-temperature.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/celsius-temperature.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/celsius-temperature.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/dose-equivalent.test.json b/test/bipm/si/2019/derived/quantity/dose-equivalent.test.json
index f61b9243..55cbbcbd 100644
--- a/test/bipm/si/2019/derived/quantity/dose-equivalent.test.json
+++ b/test/bipm/si/2019/derived/quantity/dose-equivalent.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/dose-equivalent.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/dose-equivalent.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/electric-charge.test.json b/test/bipm/si/2019/derived/quantity/electric-charge.test.json
index 97a0889c..ed722ab3 100644
--- a/test/bipm/si/2019/derived/quantity/electric-charge.test.json
+++ b/test/bipm/si/2019/derived/quantity/electric-charge.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/electric-charge.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/electric-charge.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/electric-conductance.test.json b/test/bipm/si/2019/derived/quantity/electric-conductance.test.json
index b884cea9..c9b7afd1 100644
--- a/test/bipm/si/2019/derived/quantity/electric-conductance.test.json
+++ b/test/bipm/si/2019/derived/quantity/electric-conductance.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/electric-conductance.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/electric-conductance.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/electric-potential-difference.test.json b/test/bipm/si/2019/derived/quantity/electric-potential-difference.test.json
index 2382223c..799697e2 100644
--- a/test/bipm/si/2019/derived/quantity/electric-potential-difference.test.json
+++ b/test/bipm/si/2019/derived/quantity/electric-potential-difference.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/electric-potential-difference.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/electric-potential-difference.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/electric-resistance.test.json b/test/bipm/si/2019/derived/quantity/electric-resistance.test.json
index bf2b2595..1f47e3e6 100644
--- a/test/bipm/si/2019/derived/quantity/electric-resistance.test.json
+++ b/test/bipm/si/2019/derived/quantity/electric-resistance.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/electric-resistance.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/electric-resistance.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/energy.test.json b/test/bipm/si/2019/derived/quantity/energy.test.json
index 1ddbaf8b..c0cc869d 100644
--- a/test/bipm/si/2019/derived/quantity/energy.test.json
+++ b/test/bipm/si/2019/derived/quantity/energy.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/energy.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/energy.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/force.test.json b/test/bipm/si/2019/derived/quantity/force.test.json
index ca6c400f..70c5ed9c 100644
--- a/test/bipm/si/2019/derived/quantity/force.test.json
+++ b/test/bipm/si/2019/derived/quantity/force.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/force.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/force.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/frequency.test.json b/test/bipm/si/2019/derived/quantity/frequency.test.json
index a405b3a0..799590d3 100644
--- a/test/bipm/si/2019/derived/quantity/frequency.test.json
+++ b/test/bipm/si/2019/derived/quantity/frequency.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/frequency.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/frequency.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/illuminance.test.json b/test/bipm/si/2019/derived/quantity/illuminance.test.json
index b98ceca1..ccfe417e 100644
--- a/test/bipm/si/2019/derived/quantity/illuminance.test.json
+++ b/test/bipm/si/2019/derived/quantity/illuminance.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/illuminance.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/illuminance.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/inductance.test.json b/test/bipm/si/2019/derived/quantity/inductance.test.json
index 9571556a..3dd15b3b 100644
--- a/test/bipm/si/2019/derived/quantity/inductance.test.json
+++ b/test/bipm/si/2019/derived/quantity/inductance.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/inductance.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/inductance.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/kerma.test.json b/test/bipm/si/2019/derived/quantity/kerma.test.json
index f61d4444..1e1d4982 100644
--- a/test/bipm/si/2019/derived/quantity/kerma.test.json
+++ b/test/bipm/si/2019/derived/quantity/kerma.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/kerma.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/kerma.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/luminous-flux.test.json b/test/bipm/si/2019/derived/quantity/luminous-flux.test.json
index e6f9c747..31bcd924 100644
--- a/test/bipm/si/2019/derived/quantity/luminous-flux.test.json
+++ b/test/bipm/si/2019/derived/quantity/luminous-flux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/luminous-flux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/luminous-flux.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/magnetic-flux-density.test.json b/test/bipm/si/2019/derived/quantity/magnetic-flux-density.test.json
index 48e841be..78ea7478 100644
--- a/test/bipm/si/2019/derived/quantity/magnetic-flux-density.test.json
+++ b/test/bipm/si/2019/derived/quantity/magnetic-flux-density.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/magnetic-flux-density.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/magnetic-flux-density.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/magnetic-flux.test.json b/test/bipm/si/2019/derived/quantity/magnetic-flux.test.json
index 4f8aca52..31cd4333 100644
--- a/test/bipm/si/2019/derived/quantity/magnetic-flux.test.json
+++ b/test/bipm/si/2019/derived/quantity/magnetic-flux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/magnetic-flux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/magnetic-flux.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/plane-angle.test.json b/test/bipm/si/2019/derived/quantity/plane-angle.test.json
index 80fa2c82..33b3706a 100644
--- a/test/bipm/si/2019/derived/quantity/plane-angle.test.json
+++ b/test/bipm/si/2019/derived/quantity/plane-angle.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/plane-angle.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/plane-angle.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/power.test.json b/test/bipm/si/2019/derived/quantity/power.test.json
index f33b418b..11c79cbc 100644
--- a/test/bipm/si/2019/derived/quantity/power.test.json
+++ b/test/bipm/si/2019/derived/quantity/power.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/power.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/power.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/pressure.test.json b/test/bipm/si/2019/derived/quantity/pressure.test.json
index 10da17f0..14c5aeea 100644
--- a/test/bipm/si/2019/derived/quantity/pressure.test.json
+++ b/test/bipm/si/2019/derived/quantity/pressure.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/pressure.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/pressure.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/radiant-flux.test.json b/test/bipm/si/2019/derived/quantity/radiant-flux.test.json
index 6f83fdaf..abc452cc 100644
--- a/test/bipm/si/2019/derived/quantity/radiant-flux.test.json
+++ b/test/bipm/si/2019/derived/quantity/radiant-flux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/radiant-flux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/radiant-flux.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/solid-angle.test.json b/test/bipm/si/2019/derived/quantity/solid-angle.test.json
index d7bfb108..53c34d36 100644
--- a/test/bipm/si/2019/derived/quantity/solid-angle.test.json
+++ b/test/bipm/si/2019/derived/quantity/solid-angle.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/solid-angle.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/solid-angle.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/stress.test.json b/test/bipm/si/2019/derived/quantity/stress.test.json
index d7eef4ef..6a10a570 100644
--- a/test/bipm/si/2019/derived/quantity/stress.test.json
+++ b/test/bipm/si/2019/derived/quantity/stress.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/stress.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/stress.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/quantity/work.test.json b/test/bipm/si/2019/derived/quantity/work.test.json
index 97b0843d..7ea2b96a 100644
--- a/test/bipm/si/2019/derived/quantity/work.test.json
+++ b/test/bipm/si/2019/derived/quantity/work.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/quantity/work.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/quantity/work.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/symbol.test.json b/test/bipm/si/2019/derived/symbol.test.json
index 32346b3f..7e017cdd 100644
--- a/test/bipm/si/2019/derived/symbol.test.json
+++ b/test/bipm/si/2019/derived/symbol.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/bipm/si/2019/derived/symbol.json",
+  "target": "../../../../../schemas/bipm/si/2019/derived/symbol.json",
   "tests": [
     {
       "description": "Valid - hertz",
diff --git a/test/bipm/si/2019/derived/unit/becquerel.test.json b/test/bipm/si/2019/derived/unit/becquerel.test.json
index bbcd7104..f905588f 100644
--- a/test/bipm/si/2019/derived/unit/becquerel.test.json
+++ b/test/bipm/si/2019/derived/unit/becquerel.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/becquerel.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/becquerel.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/coulomb.test.json b/test/bipm/si/2019/derived/unit/coulomb.test.json
index deb6521e..3f86460a 100644
--- a/test/bipm/si/2019/derived/unit/coulomb.test.json
+++ b/test/bipm/si/2019/derived/unit/coulomb.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/coulomb.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/coulomb.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/degree-celsius.test.json b/test/bipm/si/2019/derived/unit/degree-celsius.test.json
index a4b450b2..66757e43 100644
--- a/test/bipm/si/2019/derived/unit/degree-celsius.test.json
+++ b/test/bipm/si/2019/derived/unit/degree-celsius.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/degree-celsius.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/degree-celsius.json",
   "tests": [
     {
       "description": "Valid - absolute zero in Celsius",
diff --git a/test/bipm/si/2019/derived/unit/farad.test.json b/test/bipm/si/2019/derived/unit/farad.test.json
index c8e6520c..57254cbd 100644
--- a/test/bipm/si/2019/derived/unit/farad.test.json
+++ b/test/bipm/si/2019/derived/unit/farad.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/farad.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/farad.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/gray.test.json b/test/bipm/si/2019/derived/unit/gray.test.json
index 94b20170..de5b2f3d 100644
--- a/test/bipm/si/2019/derived/unit/gray.test.json
+++ b/test/bipm/si/2019/derived/unit/gray.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/gray.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/gray.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/henry.test.json b/test/bipm/si/2019/derived/unit/henry.test.json
index 5e035a88..c4cd25ca 100644
--- a/test/bipm/si/2019/derived/unit/henry.test.json
+++ b/test/bipm/si/2019/derived/unit/henry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/henry.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/henry.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/hertz.test.json b/test/bipm/si/2019/derived/unit/hertz.test.json
index d77fc65b..e762722c 100644
--- a/test/bipm/si/2019/derived/unit/hertz.test.json
+++ b/test/bipm/si/2019/derived/unit/hertz.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/hertz.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/hertz.json",
   "tests": [
     {
       "description": "Valid - small positive",
diff --git a/test/bipm/si/2019/derived/unit/joule.test.json b/test/bipm/si/2019/derived/unit/joule.test.json
index dc5f5d75..88244bef 100644
--- a/test/bipm/si/2019/derived/unit/joule.test.json
+++ b/test/bipm/si/2019/derived/unit/joule.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/joule.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/joule.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/katal.test.json b/test/bipm/si/2019/derived/unit/katal.test.json
index 19ae9fab..48d4de50 100644
--- a/test/bipm/si/2019/derived/unit/katal.test.json
+++ b/test/bipm/si/2019/derived/unit/katal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/katal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/katal.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/lumen.test.json b/test/bipm/si/2019/derived/unit/lumen.test.json
index 10330c05..4f65d58c 100644
--- a/test/bipm/si/2019/derived/unit/lumen.test.json
+++ b/test/bipm/si/2019/derived/unit/lumen.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/lumen.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/lumen.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/lux.test.json b/test/bipm/si/2019/derived/unit/lux.test.json
index 7adc7a8d..63086d78 100644
--- a/test/bipm/si/2019/derived/unit/lux.test.json
+++ b/test/bipm/si/2019/derived/unit/lux.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/lux.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/lux.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/newton.test.json b/test/bipm/si/2019/derived/unit/newton.test.json
index d0912587..73c7e6bd 100644
--- a/test/bipm/si/2019/derived/unit/newton.test.json
+++ b/test/bipm/si/2019/derived/unit/newton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/newton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/newton.json",
   "tests": [
     {
       "description": "Valid - zero force",
diff --git a/test/bipm/si/2019/derived/unit/ohm.test.json b/test/bipm/si/2019/derived/unit/ohm.test.json
index 558a618e..44db3cf7 100644
--- a/test/bipm/si/2019/derived/unit/ohm.test.json
+++ b/test/bipm/si/2019/derived/unit/ohm.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/ohm.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/ohm.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/pascal.test.json b/test/bipm/si/2019/derived/unit/pascal.test.json
index e5e915da..3764c0de 100644
--- a/test/bipm/si/2019/derived/unit/pascal.test.json
+++ b/test/bipm/si/2019/derived/unit/pascal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/pascal.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/pascal.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/radian.test.json b/test/bipm/si/2019/derived/unit/radian.test.json
index 7caf4fc1..b0b5e1a1 100644
--- a/test/bipm/si/2019/derived/unit/radian.test.json
+++ b/test/bipm/si/2019/derived/unit/radian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/radian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/radian.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/siemens.test.json b/test/bipm/si/2019/derived/unit/siemens.test.json
index ff8838c3..6d398f16 100644
--- a/test/bipm/si/2019/derived/unit/siemens.test.json
+++ b/test/bipm/si/2019/derived/unit/siemens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/siemens.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/siemens.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/sievert.test.json b/test/bipm/si/2019/derived/unit/sievert.test.json
index 52e3d8c3..e6e1af67 100644
--- a/test/bipm/si/2019/derived/unit/sievert.test.json
+++ b/test/bipm/si/2019/derived/unit/sievert.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/sievert.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/sievert.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/steradian.test.json b/test/bipm/si/2019/derived/unit/steradian.test.json
index ae8307ff..fa1ccd41 100644
--- a/test/bipm/si/2019/derived/unit/steradian.test.json
+++ b/test/bipm/si/2019/derived/unit/steradian.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/steradian.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/steradian.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/tesla.test.json b/test/bipm/si/2019/derived/unit/tesla.test.json
index f1343bc5..9af28ff1 100644
--- a/test/bipm/si/2019/derived/unit/tesla.test.json
+++ b/test/bipm/si/2019/derived/unit/tesla.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/tesla.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/tesla.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/volt.test.json b/test/bipm/si/2019/derived/unit/volt.test.json
index 04c05bf5..4726f00c 100644
--- a/test/bipm/si/2019/derived/unit/volt.test.json
+++ b/test/bipm/si/2019/derived/unit/volt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/volt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/volt.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/watt.test.json b/test/bipm/si/2019/derived/unit/watt.test.json
index ef04837e..dc74c1dd 100644
--- a/test/bipm/si/2019/derived/unit/watt.test.json
+++ b/test/bipm/si/2019/derived/unit/watt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/watt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/watt.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/derived/unit/weber.test.json b/test/bipm/si/2019/derived/unit/weber.test.json
index bd6053a3..c7e75516 100644
--- a/test/bipm/si/2019/derived/unit/weber.test.json
+++ b/test/bipm/si/2019/derived/unit/weber.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/derived/unit/weber.json",
+  "target": "../../../../../../schemas/bipm/si/2019/derived/unit/weber.json",
   "tests": [
     {
       "description": "Valid - positive number",
diff --git a/test/bipm/si/2019/non-si/unit/arcminute.test.json b/test/bipm/si/2019/non-si/unit/arcminute.test.json
index 8712a254..05fc70d4 100644
--- a/test/bipm/si/2019/non-si/unit/arcminute.test.json
+++ b/test/bipm/si/2019/non-si/unit/arcminute.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/non-si/unit/arcminute.json",
+  "target": "../../../../../../schemas/bipm/si/2019/non-si/unit/arcminute.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/non-si/unit/arcsecond.test.json b/test/bipm/si/2019/non-si/unit/arcsecond.test.json
index d1ecbfe8..53b7803d 100644
--- a/test/bipm/si/2019/non-si/unit/arcsecond.test.json
+++ b/test/bipm/si/2019/non-si/unit/arcsecond.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/non-si/unit/arcsecond.json",
+  "target": "../../../../../../schemas/bipm/si/2019/non-si/unit/arcsecond.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/non-si/unit/astronomical-unit.test.json b/test/bipm/si/2019/non-si/unit/astronomical-unit.test.json
index 6c225b59..bebef80d 100644
--- a/test/bipm/si/2019/non-si/unit/astronomical-unit.test.json
+++ b/test/bipm/si/2019/non-si/unit/astronomical-unit.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/non-si/unit/astronomical-unit.json",
+  "target": "../../../../../../schemas/bipm/si/2019/non-si/unit/astronomical-unit.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/non-si/unit/dalton.test.json b/test/bipm/si/2019/non-si/unit/dalton.test.json
index 6a77a3a7..93c88369 100644
--- a/test/bipm/si/2019/non-si/unit/dalton.test.json
+++ b/test/bipm/si/2019/non-si/unit/dalton.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/non-si/unit/dalton.json",
+  "target": "../../../../../../schemas/bipm/si/2019/non-si/unit/dalton.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/non-si/unit/day.test.json b/test/bipm/si/2019/non-si/unit/day.test.json
index 6301a79a..91661b86 100644
--- a/test/bipm/si/2019/non-si/unit/day.test.json
+++ b/test/bipm/si/2019/non-si/unit/day.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/non-si/unit/day.json",
+  "target": "../../../../../../schemas/bipm/si/2019/non-si/unit/day.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/non-si/unit/degree.test.json b/test/bipm/si/2019/non-si/unit/degree.test.json
index ba0f79c6..126d036f 100644
--- a/test/bipm/si/2019/non-si/unit/degree.test.json
+++ b/test/bipm/si/2019/non-si/unit/degree.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/non-si/unit/degree.json",
+  "target": "../../../../../../schemas/bipm/si/2019/non-si/unit/degree.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/non-si/unit/electronvolt.test.json b/test/bipm/si/2019/non-si/unit/electronvolt.test.json
index 8fbbab9f..44414e77 100644
--- a/test/bipm/si/2019/non-si/unit/electronvolt.test.json
+++ b/test/bipm/si/2019/non-si/unit/electronvolt.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/non-si/unit/electronvolt.json",
+  "target": "../../../../../../schemas/bipm/si/2019/non-si/unit/electronvolt.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/non-si/unit/hectare.test.json b/test/bipm/si/2019/non-si/unit/hectare.test.json
index 46991aa2..c59a46b5 100644
--- a/test/bipm/si/2019/non-si/unit/hectare.test.json
+++ b/test/bipm/si/2019/non-si/unit/hectare.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/non-si/unit/hectare.json",
+  "target": "../../../../../../schemas/bipm/si/2019/non-si/unit/hectare.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/non-si/unit/hour.test.json b/test/bipm/si/2019/non-si/unit/hour.test.json
index a42e8a23..a31d99a9 100644
--- a/test/bipm/si/2019/non-si/unit/hour.test.json
+++ b/test/bipm/si/2019/non-si/unit/hour.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/non-si/unit/hour.json",
+  "target": "../../../../../../schemas/bipm/si/2019/non-si/unit/hour.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/non-si/unit/litre.test.json b/test/bipm/si/2019/non-si/unit/litre.test.json
index f577ce7e..7764d7f5 100644
--- a/test/bipm/si/2019/non-si/unit/litre.test.json
+++ b/test/bipm/si/2019/non-si/unit/litre.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/non-si/unit/litre.json",
+  "target": "../../../../../../schemas/bipm/si/2019/non-si/unit/litre.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/non-si/unit/minute.test.json b/test/bipm/si/2019/non-si/unit/minute.test.json
index 9763f607..21f7cbec 100644
--- a/test/bipm/si/2019/non-si/unit/minute.test.json
+++ b/test/bipm/si/2019/non-si/unit/minute.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/non-si/unit/minute.json",
+  "target": "../../../../../../schemas/bipm/si/2019/non-si/unit/minute.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/non-si/unit/tonne.test.json b/test/bipm/si/2019/non-si/unit/tonne.test.json
index fea34f70..e470a22a 100644
--- a/test/bipm/si/2019/non-si/unit/tonne.test.json
+++ b/test/bipm/si/2019/non-si/unit/tonne.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../../schemas/2020-12/bipm/si/2019/non-si/unit/tonne.json",
+  "target": "../../../../../../schemas/bipm/si/2019/non-si/unit/tonne.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/bipm/si/2019/symbol.test.json b/test/bipm/si/2019/symbol.test.json
index f80991d2..a3c39205 100644
--- a/test/bipm/si/2019/symbol.test.json
+++ b/test/bipm/si/2019/symbol.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/bipm/si/2019/symbol.json",
+  "target": "../../../../schemas/bipm/si/2019/symbol.json",
   "tests": [
     {
       "description": "Valid - base unit second",
diff --git a/test/ieee/floating-point/2019/binary16-special.test.json b/test/ieee/floating-point/2019/binary16-special.test.json
index 71ea0099..f00bd47b 100644
--- a/test/ieee/floating-point/2019/binary16-special.test.json
+++ b/test/ieee/floating-point/2019/binary16-special.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ieee/floating-point/2019/binary16-special.json",
+  "target": "../../../../schemas/ieee/floating-point/2019/binary16-special.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/ieee/floating-point/2019/binary16.test.json b/test/ieee/floating-point/2019/binary16.test.json
index 6937fa0e..fde18774 100644
--- a/test/ieee/floating-point/2019/binary16.test.json
+++ b/test/ieee/floating-point/2019/binary16.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ieee/floating-point/2019/binary16.json",
+  "target": "../../../../schemas/ieee/floating-point/2019/binary16.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/ieee/floating-point/2019/binary32-special.test.json b/test/ieee/floating-point/2019/binary32-special.test.json
index 4db84809..ef745e21 100644
--- a/test/ieee/floating-point/2019/binary32-special.test.json
+++ b/test/ieee/floating-point/2019/binary32-special.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ieee/floating-point/2019/binary32-special.json",
+  "target": "../../../../schemas/ieee/floating-point/2019/binary32-special.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/ieee/floating-point/2019/binary32.test.json b/test/ieee/floating-point/2019/binary32.test.json
index 982c19d6..d6b66d9f 100644
--- a/test/ieee/floating-point/2019/binary32.test.json
+++ b/test/ieee/floating-point/2019/binary32.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ieee/floating-point/2019/binary32.json",
+  "target": "../../../../schemas/ieee/floating-point/2019/binary32.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/ieee/floating-point/2019/binary64-special.test.json b/test/ieee/floating-point/2019/binary64-special.test.json
index e0d64c35..4f4e9e76 100644
--- a/test/ieee/floating-point/2019/binary64-special.test.json
+++ b/test/ieee/floating-point/2019/binary64-special.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ieee/floating-point/2019/binary64-special.json",
+  "target": "../../../../schemas/ieee/floating-point/2019/binary64-special.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/ieee/floating-point/2019/binary64.test.json b/test/ieee/floating-point/2019/binary64.test.json
index ca9b8049..b4e0dd6c 100644
--- a/test/ieee/floating-point/2019/binary64.test.json
+++ b/test/ieee/floating-point/2019/binary64.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ieee/floating-point/2019/binary64.json",
+  "target": "../../../../schemas/ieee/floating-point/2019/binary64.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/ieee/floating-point/2019/special.test.json b/test/ieee/floating-point/2019/special.test.json
index abe177c9..4723d432 100644
--- a/test/ieee/floating-point/2019/special.test.json
+++ b/test/ieee/floating-point/2019/special.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ieee/floating-point/2019/special.json",
+  "target": "../../../../schemas/ieee/floating-point/2019/special.json",
   "tests": [
     {
       "description": "Valid - NaN",
diff --git a/test/ieee/posix/2017/path-absolute.test.json b/test/ieee/posix/2017/path-absolute.test.json
index 1a55710d..c7307be6 100644
--- a/test/ieee/posix/2017/path-absolute.test.json
+++ b/test/ieee/posix/2017/path-absolute.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ieee/posix/2017/path-absolute.json",
+  "target": "../../../../schemas/ieee/posix/2017/path-absolute.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ieee/posix/2017/path-relative.test.json b/test/ieee/posix/2017/path-relative.test.json
index c48807fe..40240f72 100644
--- a/test/ieee/posix/2017/path-relative.test.json
+++ b/test/ieee/posix/2017/path-relative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ieee/posix/2017/path-relative.json",
+  "target": "../../../../schemas/ieee/posix/2017/path-relative.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ieee/posix/2017/path.test.json b/test/ieee/posix/2017/path.test.json
index 78adc8ff..f03e59b3 100644
--- a/test/ieee/posix/2017/path.test.json
+++ b/test/ieee/posix/2017/path.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ieee/posix/2017/path.json",
+  "target": "../../../../schemas/ieee/posix/2017/path.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ietf/email/5321/address.test.json b/test/ietf/email/5321/address.test.json
index 86799bcb..f630f6cc 100644
--- a/test/ietf/email/5321/address.test.json
+++ b/test/ietf/email/5321/address.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/email/5321/address.json",
+  "target": "../../../../schemas/ietf/email/5321/address.json",
   "tests": [
     {
       "description": "Invalid type",
diff --git a/test/ietf/encoding/4648/base16.test.json b/test/ietf/encoding/4648/base16.test.json
index 8a29994f..e7c9c929 100644
--- a/test/ietf/encoding/4648/base16.test.json
+++ b/test/ietf/encoding/4648/base16.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/encoding/4648/base16.json",
+  "target": "../../../../schemas/ietf/encoding/4648/base16.json",
   "tests": [
     {
       "description": "Valid - empty string",
diff --git a/test/ietf/encoding/4648/base32.test.json b/test/ietf/encoding/4648/base32.test.json
index ab08f0d8..b838d7f7 100644
--- a/test/ietf/encoding/4648/base32.test.json
+++ b/test/ietf/encoding/4648/base32.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/encoding/4648/base32.json",
+  "target": "../../../../schemas/ietf/encoding/4648/base32.json",
   "tests": [
     {
       "description": "Valid - empty string",
diff --git a/test/ietf/encoding/4648/base32hex.test.json b/test/ietf/encoding/4648/base32hex.test.json
index bbf83a15..b6a2b9f5 100644
--- a/test/ietf/encoding/4648/base32hex.test.json
+++ b/test/ietf/encoding/4648/base32hex.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/encoding/4648/base32hex.json",
+  "target": "../../../../schemas/ietf/encoding/4648/base32hex.json",
   "tests": [
     {
       "description": "Valid - empty string",
diff --git a/test/ietf/encoding/4648/base64.test.json b/test/ietf/encoding/4648/base64.test.json
index 3f9d8d83..7d0a3bfe 100644
--- a/test/ietf/encoding/4648/base64.test.json
+++ b/test/ietf/encoding/4648/base64.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/encoding/4648/base64.json",
+  "target": "../../../../schemas/ietf/encoding/4648/base64.json",
   "tests": [
     {
       "description": "Valid - empty string",
diff --git a/test/ietf/encoding/4648/base64url.test.json b/test/ietf/encoding/4648/base64url.test.json
index b094ac0e..0b612069 100644
--- a/test/ietf/encoding/4648/base64url.test.json
+++ b/test/ietf/encoding/4648/base64url.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/encoding/4648/base64url.json",
+  "target": "../../../../schemas/ietf/encoding/4648/base64url.json",
   "tests": [
     {
       "description": "Valid - empty string",
diff --git a/test/ietf/geojson/7946/bounding-box.test.json b/test/ietf/geojson/7946/bounding-box.test.json
index 97b1b9d4..28cf1d08 100644
--- a/test/ietf/geojson/7946/bounding-box.test.json
+++ b/test/ietf/geojson/7946/bounding-box.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/bounding-box.json",
+  "target": "../../../../schemas/ietf/geojson/7946/bounding-box.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/feature-collection.test.json b/test/ietf/geojson/7946/feature-collection.test.json
index 0d535b90..a963a820 100644
--- a/test/ietf/geojson/7946/feature-collection.test.json
+++ b/test/ietf/geojson/7946/feature-collection.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/feature-collection.json",
+  "target": "../../../../schemas/ietf/geojson/7946/feature-collection.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/feature.test.json b/test/ietf/geojson/7946/feature.test.json
index 53b3f8fb..3e09fb90 100644
--- a/test/ietf/geojson/7946/feature.test.json
+++ b/test/ietf/geojson/7946/feature.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/feature.json",
+  "target": "../../../../schemas/ietf/geojson/7946/feature.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/geometry-collection.test.json b/test/ietf/geojson/7946/geometry-collection.test.json
index 74fadbf5..2edbce61 100644
--- a/test/ietf/geojson/7946/geometry-collection.test.json
+++ b/test/ietf/geojson/7946/geometry-collection.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/geometry-collection.json",
+  "target": "../../../../schemas/ietf/geojson/7946/geometry-collection.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/geometry.test.json b/test/ietf/geojson/7946/geometry.test.json
index 49c0fcfd..8b265004 100644
--- a/test/ietf/geojson/7946/geometry.test.json
+++ b/test/ietf/geojson/7946/geometry.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/geometry.json",
+  "target": "../../../../schemas/ietf/geojson/7946/geometry.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/line-string-coordinates.test.json b/test/ietf/geojson/7946/line-string-coordinates.test.json
index 3e1ebbad..ddd9a238 100644
--- a/test/ietf/geojson/7946/line-string-coordinates.test.json
+++ b/test/ietf/geojson/7946/line-string-coordinates.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/line-string-coordinates.json",
+  "target": "../../../../schemas/ietf/geojson/7946/line-string-coordinates.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/line-string.test.json b/test/ietf/geojson/7946/line-string.test.json
index f4c74df8..f7ed771c 100644
--- a/test/ietf/geojson/7946/line-string.test.json
+++ b/test/ietf/geojson/7946/line-string.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/line-string.json",
+  "target": "../../../../schemas/ietf/geojson/7946/line-string.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/linear-ring-coordinates.test.json b/test/ietf/geojson/7946/linear-ring-coordinates.test.json
index eb9d3c10..6e42a01e 100644
--- a/test/ietf/geojson/7946/linear-ring-coordinates.test.json
+++ b/test/ietf/geojson/7946/linear-ring-coordinates.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/linear-ring-coordinates.json",
+  "target": "../../../../schemas/ietf/geojson/7946/linear-ring-coordinates.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/multi-line-string.test.json b/test/ietf/geojson/7946/multi-line-string.test.json
index 594248c9..eac946ae 100644
--- a/test/ietf/geojson/7946/multi-line-string.test.json
+++ b/test/ietf/geojson/7946/multi-line-string.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/multi-line-string.json",
+  "target": "../../../../schemas/ietf/geojson/7946/multi-line-string.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/multi-point.test.json b/test/ietf/geojson/7946/multi-point.test.json
index 256ba46e..cad609e9 100644
--- a/test/ietf/geojson/7946/multi-point.test.json
+++ b/test/ietf/geojson/7946/multi-point.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/multi-point.json",
+  "target": "../../../../schemas/ietf/geojson/7946/multi-point.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/multi-polygon.test.json b/test/ietf/geojson/7946/multi-polygon.test.json
index 58abf8e3..5118bc93 100644
--- a/test/ietf/geojson/7946/multi-polygon.test.json
+++ b/test/ietf/geojson/7946/multi-polygon.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/multi-polygon.json",
+  "target": "../../../../schemas/ietf/geojson/7946/multi-polygon.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/point-coordinates.test.json b/test/ietf/geojson/7946/point-coordinates.test.json
index 5c9e4765..96223f8c 100644
--- a/test/ietf/geojson/7946/point-coordinates.test.json
+++ b/test/ietf/geojson/7946/point-coordinates.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/point-coordinates.json",
+  "target": "../../../../schemas/ietf/geojson/7946/point-coordinates.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/point.test.json b/test/ietf/geojson/7946/point.test.json
index 85abdb8d..c2ca8fdd 100644
--- a/test/ietf/geojson/7946/point.test.json
+++ b/test/ietf/geojson/7946/point.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/point.json",
+  "target": "../../../../schemas/ietf/geojson/7946/point.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/polygon-coordinates.test.json b/test/ietf/geojson/7946/polygon-coordinates.test.json
index ba15af48..b03ffd38 100644
--- a/test/ietf/geojson/7946/polygon-coordinates.test.json
+++ b/test/ietf/geojson/7946/polygon-coordinates.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/polygon-coordinates.json",
+  "target": "../../../../schemas/ietf/geojson/7946/polygon-coordinates.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/polygon.test.json b/test/ietf/geojson/7946/polygon.test.json
index fbeda196..1f82e1ee 100644
--- a/test/ietf/geojson/7946/polygon.test.json
+++ b/test/ietf/geojson/7946/polygon.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/polygon.json",
+  "target": "../../../../schemas/ietf/geojson/7946/polygon.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/geojson/7946/schema.test.json b/test/ietf/geojson/7946/schema.test.json
index 270e127b..45556608 100644
--- a/test/ietf/geojson/7946/schema.test.json
+++ b/test/ietf/geojson/7946/schema.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/geojson/7946/schema.json",
+  "target": "../../../../schemas/ietf/geojson/7946/schema.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/http/9110/etag-strong.test.json b/test/ietf/http/9110/etag-strong.test.json
index 1398e130..94320a64 100644
--- a/test/ietf/http/9110/etag-strong.test.json
+++ b/test/ietf/http/9110/etag-strong.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/etag-strong.json",
+  "target": "../../../../schemas/ietf/http/9110/etag-strong.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ietf/http/9110/etag-weak.test.json b/test/ietf/http/9110/etag-weak.test.json
index f3749d0d..1d6f1c43 100644
--- a/test/ietf/http/9110/etag-weak.test.json
+++ b/test/ietf/http/9110/etag-weak.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/etag-weak.json",
+  "target": "../../../../schemas/ietf/http/9110/etag-weak.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ietf/http/9110/etag.test.json b/test/ietf/http/9110/etag.test.json
index b1efd36f..5674b771 100644
--- a/test/ietf/http/9110/etag.test.json
+++ b/test/ietf/http/9110/etag.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/etag.json",
+  "target": "../../../../schemas/ietf/http/9110/etag.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ietf/http/9110/http-url.test.json b/test/ietf/http/9110/http-url.test.json
index c18871eb..944d46b4 100644
--- a/test/ietf/http/9110/http-url.test.json
+++ b/test/ietf/http/9110/http-url.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/http-url.json",
+  "target": "../../../../schemas/ietf/http/9110/http-url.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ietf/http/9110/https-url.test.json b/test/ietf/http/9110/https-url.test.json
index 33b618cb..3513a5ae 100644
--- a/test/ietf/http/9110/https-url.test.json
+++ b/test/ietf/http/9110/https-url.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/https-url.json",
+  "target": "../../../../schemas/ietf/http/9110/https-url.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ietf/http/9110/method-standard.test.json b/test/ietf/http/9110/method-standard.test.json
index ff260b22..6ca405ec 100644
--- a/test/ietf/http/9110/method-standard.test.json
+++ b/test/ietf/http/9110/method-standard.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/method-standard.json",
+  "target": "../../../../schemas/ietf/http/9110/method-standard.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ietf/http/9110/method.test.json b/test/ietf/http/9110/method.test.json
index 0a0b9a22..95e13cb7 100644
--- a/test/ietf/http/9110/method.test.json
+++ b/test/ietf/http/9110/method.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/method.json",
+  "target": "../../../../schemas/ietf/http/9110/method.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ietf/http/9110/status-client-error.test.json b/test/ietf/http/9110/status-client-error.test.json
index 120d0ef7..97f3e112 100644
--- a/test/ietf/http/9110/status-client-error.test.json
+++ b/test/ietf/http/9110/status-client-error.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/status-client-error.json",
+  "target": "../../../../schemas/ietf/http/9110/status-client-error.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/http/9110/status-informational.test.json b/test/ietf/http/9110/status-informational.test.json
index 3e1787c6..9e1ec7dd 100644
--- a/test/ietf/http/9110/status-informational.test.json
+++ b/test/ietf/http/9110/status-informational.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/status-informational.json",
+  "target": "../../../../schemas/ietf/http/9110/status-informational.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/http/9110/status-redirection.test.json b/test/ietf/http/9110/status-redirection.test.json
index f660f57b..d92231b8 100644
--- a/test/ietf/http/9110/status-redirection.test.json
+++ b/test/ietf/http/9110/status-redirection.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/status-redirection.json",
+  "target": "../../../../schemas/ietf/http/9110/status-redirection.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/http/9110/status-server-error.test.json b/test/ietf/http/9110/status-server-error.test.json
index fefa4d53..85b59f9d 100644
--- a/test/ietf/http/9110/status-server-error.test.json
+++ b/test/ietf/http/9110/status-server-error.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/status-server-error.json",
+  "target": "../../../../schemas/ietf/http/9110/status-server-error.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/http/9110/status-standard.test.json b/test/ietf/http/9110/status-standard.test.json
index 8c625648..589021e8 100644
--- a/test/ietf/http/9110/status-standard.test.json
+++ b/test/ietf/http/9110/status-standard.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/status-standard.json",
+  "target": "../../../../schemas/ietf/http/9110/status-standard.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/http/9110/status-successful.test.json b/test/ietf/http/9110/status-successful.test.json
index 650884f8..0e9f0898 100644
--- a/test/ietf/http/9110/status-successful.test.json
+++ b/test/ietf/http/9110/status-successful.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/status-successful.json",
+  "target": "../../../../schemas/ietf/http/9110/status-successful.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/http/9110/status.test.json b/test/ietf/http/9110/status.test.json
index 851b1597..c013d3bd 100644
--- a/test/ietf/http/9110/status.test.json
+++ b/test/ietf/http/9110/status.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/http/9110/status.json",
+  "target": "../../../../schemas/ietf/http/9110/status.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/ip/v4/address.test.json b/test/ietf/ip/v4/address.test.json
index b476b5f9..61efd38f 100644
--- a/test/ietf/ip/v4/address.test.json
+++ b/test/ietf/ip/v4/address.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/ip/v4/address.json",
+  "target": "../../../../schemas/ietf/ip/v4/address.json",
   "tests": [
     {
       "data": "0.0.0.0",
diff --git a/test/ietf/ip/v6/address.test.json b/test/ietf/ip/v6/address.test.json
index 3897abbe..97ec594b 100644
--- a/test/ietf/ip/v6/address.test.json
+++ b/test/ietf/ip/v6/address.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/ip/v6/address.json",
+  "target": "../../../../schemas/ietf/ip/v6/address.json",
   "tests": [
     {
       "data": "2001:db8:85a3:0:0:8a2e:370:7334",
diff --git a/test/ietf/iri/3987/iri-reference.test.json b/test/ietf/iri/3987/iri-reference.test.json
index 0829cc8b..c0172194 100644
--- a/test/ietf/iri/3987/iri-reference.test.json
+++ b/test/ietf/iri/3987/iri-reference.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/iri/3987/iri-reference.json",
+  "target": "../../../../schemas/ietf/iri/3987/iri-reference.json",
   "tests": [
     {
       "description": "Plain ASCII absolute URI",
diff --git a/test/ietf/iri/3987/iri.test.json b/test/ietf/iri/3987/iri.test.json
index fe71da59..44db5636 100644
--- a/test/ietf/iri/3987/iri.test.json
+++ b/test/ietf/iri/3987/iri.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/iri/3987/iri.json",
+  "target": "../../../../schemas/ietf/iri/3987/iri.json",
   "tests": [
     {
       "description": "Plain ASCII absolute URI",
diff --git a/test/ietf/jsonpointer/6901/pointer.test.json b/test/ietf/jsonpointer/6901/pointer.test.json
index fb5e4e29..d9d9d4ab 100644
--- a/test/ietf/jsonpointer/6901/pointer.test.json
+++ b/test/ietf/jsonpointer/6901/pointer.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/jsonpointer/6901/pointer.json",
+  "target": "../../../../schemas/ietf/jsonpointer/6901/pointer.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ietf/jsonschema/2020-12/dialect/format-assertion.test.json b/test/ietf/jsonschema/2020-12/dialect/format-assertion.test.json
index 8c9b736d..0f336a70 100644
--- a/test/ietf/jsonschema/2020-12/dialect/format-assertion.test.json
+++ b/test/ietf/jsonschema/2020-12/dialect/format-assertion.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/ietf/jsonschema/2020-12/dialect/format-assertion.json",
+  "target": "../../../../../schemas/ietf/jsonschema/2020-12/dialect/format-assertion.json",
   "tests": [
     {
       "description": "Schema with an asserted format",
diff --git a/test/ietf/language/3066/tag-syntax.test.json b/test/ietf/language/3066/tag-syntax.test.json
index d25738d8..74307f45 100644
--- a/test/ietf/language/3066/tag-syntax.test.json
+++ b/test/ietf/language/3066/tag-syntax.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/language/3066/tag-syntax.json",
+  "target": "../../../../schemas/ietf/language/3066/tag-syntax.json",
   "tests": [
     {
       "description": "Valid - two letter primary tag",
diff --git a/test/ietf/language/5646/tag-syntax.test.json b/test/ietf/language/5646/tag-syntax.test.json
index 4441dcab..9fe9d3c3 100644
--- a/test/ietf/language/5646/tag-syntax.test.json
+++ b/test/ietf/language/5646/tag-syntax.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/language/5646/tag-syntax.json",
+  "target": "../../../../schemas/ietf/language/5646/tag-syntax.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/ietf/problem-details/9457/problem.test.json b/test/ietf/problem-details/9457/problem.test.json
index 5353f2ab..78f51503 100644
--- a/test/ietf/problem-details/9457/problem.test.json
+++ b/test/ietf/problem-details/9457/problem.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/problem-details/9457/problem.json",
+  "target": "../../../../schemas/ietf/problem-details/9457/problem.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/ietf/uri/3986/uri-reference.test.json b/test/ietf/uri/3986/uri-reference.test.json
index cad8e1cd..d952519d 100644
--- a/test/ietf/uri/3986/uri-reference.test.json
+++ b/test/ietf/uri/3986/uri-reference.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/uri/3986/uri-reference.json",
+  "target": "../../../../schemas/ietf/uri/3986/uri-reference.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ietf/uri/3986/uri-relative.test.json b/test/ietf/uri/3986/uri-relative.test.json
index 6181d98f..49f0ce03 100644
--- a/test/ietf/uri/3986/uri-relative.test.json
+++ b/test/ietf/uri/3986/uri-relative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/uri/3986/uri-relative.json",
+  "target": "../../../../schemas/ietf/uri/3986/uri-relative.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ietf/uri/3986/uri.test.json b/test/ietf/uri/3986/uri.test.json
index 1522d761..c8736389 100644
--- a/test/ietf/uri/3986/uri.test.json
+++ b/test/ietf/uri/3986/uri.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/uri/3986/uri.json",
+  "target": "../../../../schemas/ietf/uri/3986/uri.json",
   "tests": [
     {
       "description": "Invalid type - number",
diff --git a/test/ietf/uri/3986/url.test.json b/test/ietf/uri/3986/url.test.json
index b29604ce..d0680145 100644
--- a/test/ietf/uri/3986/url.test.json
+++ b/test/ietf/uri/3986/url.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/uri/3986/url.json",
+  "target": "../../../../schemas/ietf/uri/3986/url.json",
   "tests": [
     {
       "description": "Invalid type",
diff --git a/test/ietf/urn/8141/urn.test.json b/test/ietf/urn/8141/urn.test.json
index cdfddd7b..db13f07b 100644
--- a/test/ietf/urn/8141/urn.test.json
+++ b/test/ietf/urn/8141/urn.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/ietf/urn/8141/urn.json",
+  "target": "../../../../schemas/ietf/urn/8141/urn.json",
   "tests": [
     {
       "description": "Invalid type (non-string)",
diff --git a/test/iso/c/2024/bool.test.json b/test/iso/c/2024/bool.test.json
index 01ded32b..ef2b1387 100644
--- a/test/iso/c/2024/bool.test.json
+++ b/test/iso/c/2024/bool.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/c/2024/bool.json",
+  "target": "../../../../schemas/iso/c/2024/bool.json",
   "tests": [
     {
       "description": "Valid - 0 (false)",
diff --git a/test/iso/c/2024/double.test.json b/test/iso/c/2024/double.test.json
index a076bae6..21830610 100644
--- a/test/iso/c/2024/double.test.json
+++ b/test/iso/c/2024/double.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/c/2024/double.json",
+  "target": "../../../../schemas/iso/c/2024/double.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/float-special.test.json b/test/iso/c/2024/float-special.test.json
index ae00f008..11ab45f3 100644
--- a/test/iso/c/2024/float-special.test.json
+++ b/test/iso/c/2024/float-special.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/c/2024/float-special.json",
+  "target": "../../../../schemas/iso/c/2024/float-special.json",
   "tests": [
     {
       "description": "Valid - NAN",
diff --git a/test/iso/c/2024/float.test.json b/test/iso/c/2024/float.test.json
index 1a26c836..7ddbb518 100644
--- a/test/iso/c/2024/float.test.json
+++ b/test/iso/c/2024/float.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/c/2024/float.json",
+  "target": "../../../../schemas/iso/c/2024/float.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/int16.test.json b/test/iso/c/2024/int16.test.json
index d95fcf58..a2ec798b 100644
--- a/test/iso/c/2024/int16.test.json
+++ b/test/iso/c/2024/int16.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/c/2024/int16.json",
+  "target": "../../../../schemas/iso/c/2024/int16.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/int32.test.json b/test/iso/c/2024/int32.test.json
index a19ce847..75781785 100644
--- a/test/iso/c/2024/int32.test.json
+++ b/test/iso/c/2024/int32.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/c/2024/int32.json",
+  "target": "../../../../schemas/iso/c/2024/int32.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/int64.test.json b/test/iso/c/2024/int64.test.json
index aae2253f..db193c32 100644
--- a/test/iso/c/2024/int64.test.json
+++ b/test/iso/c/2024/int64.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/c/2024/int64.json",
+  "target": "../../../../schemas/iso/c/2024/int64.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/int8.test.json b/test/iso/c/2024/int8.test.json
index b81ae07e..9c9e11cd 100644
--- a/test/iso/c/2024/int8.test.json
+++ b/test/iso/c/2024/int8.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/c/2024/int8.json",
+  "target": "../../../../schemas/iso/c/2024/int8.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/uint16.test.json b/test/iso/c/2024/uint16.test.json
index 15dff031..bcf7e1f2 100644
--- a/test/iso/c/2024/uint16.test.json
+++ b/test/iso/c/2024/uint16.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/c/2024/uint16.json",
+  "target": "../../../../schemas/iso/c/2024/uint16.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/uint32.test.json b/test/iso/c/2024/uint32.test.json
index c2d06075..cfdced99 100644
--- a/test/iso/c/2024/uint32.test.json
+++ b/test/iso/c/2024/uint32.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/c/2024/uint32.json",
+  "target": "../../../../schemas/iso/c/2024/uint32.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/uint64.test.json b/test/iso/c/2024/uint64.test.json
index 759d0761..c1d47793 100644
--- a/test/iso/c/2024/uint64.test.json
+++ b/test/iso/c/2024/uint64.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/c/2024/uint64.json",
+  "target": "../../../../schemas/iso/c/2024/uint64.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/uint8.test.json b/test/iso/c/2024/uint8.test.json
index 5ec7039e..dba77df5 100644
--- a/test/iso/c/2024/uint8.test.json
+++ b/test/iso/c/2024/uint8.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/c/2024/uint8.json",
+  "target": "../../../../schemas/iso/c/2024/uint8.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/coordinate/2022/altitude.test.json b/test/iso/coordinate/2022/altitude.test.json
index 2b93f2e3..d758863e 100644
--- a/test/iso/coordinate/2022/altitude.test.json
+++ b/test/iso/coordinate/2022/altitude.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/coordinate/2022/altitude.json",
+  "target": "../../../../schemas/iso/coordinate/2022/altitude.json",
   "tests": [
     {
       "description": "Valid - sea level",
diff --git a/test/iso/coordinate/2022/latitude.test.json b/test/iso/coordinate/2022/latitude.test.json
index a1481c44..552465ef 100644
--- a/test/iso/coordinate/2022/latitude.test.json
+++ b/test/iso/coordinate/2022/latitude.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/coordinate/2022/latitude.json",
+  "target": "../../../../schemas/iso/coordinate/2022/latitude.json",
   "tests": [
     {
       "description": "Valid - equator",
diff --git a/test/iso/coordinate/2022/longitude.test.json b/test/iso/coordinate/2022/longitude.test.json
index 6c1f3608..dd83b83a 100644
--- a/test/iso/coordinate/2022/longitude.test.json
+++ b/test/iso/coordinate/2022/longitude.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/coordinate/2022/longitude.json",
+  "target": "../../../../schemas/iso/coordinate/2022/longitude.json",
   "tests": [
     {
       "description": "Valid - prime meridian",
diff --git a/test/iso/country/2020/alpha-2.test.json b/test/iso/country/2020/alpha-2.test.json
index 84a47b54..2c1a744d 100644
--- a/test/iso/country/2020/alpha-2.test.json
+++ b/test/iso/country/2020/alpha-2.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/country/2020/alpha-2.json",
+  "target": "../../../../schemas/iso/country/2020/alpha-2.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/country/2020/alpha-3.test.json b/test/iso/country/2020/alpha-3.test.json
index f3d118bd..104dbfa1 100644
--- a/test/iso/country/2020/alpha-3.test.json
+++ b/test/iso/country/2020/alpha-3.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/country/2020/alpha-3.json",
+  "target": "../../../../schemas/iso/country/2020/alpha-3.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/country/2020/alpha-all.test.json b/test/iso/country/2020/alpha-all.test.json
index f32fe233..80cb48be 100644
--- a/test/iso/country/2020/alpha-all.test.json
+++ b/test/iso/country/2020/alpha-all.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/country/2020/alpha-all.json",
+  "target": "../../../../schemas/iso/country/2020/alpha-all.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/country/2020/numeric.test.json b/test/iso/country/2020/numeric.test.json
index a050b4b7..0d82cad9 100644
--- a/test/iso/country/2020/numeric.test.json
+++ b/test/iso/country/2020/numeric.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/country/2020/numeric.json",
+  "target": "../../../../schemas/iso/country/2020/numeric.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/iso/currency/2015/alpha-code.test.json b/test/iso/currency/2015/alpha-code.test.json
index 06ab33e4..eefcb5f2 100644
--- a/test/iso/currency/2015/alpha-code.test.json
+++ b/test/iso/currency/2015/alpha-code.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/alpha-code.json",
+  "target": "../../../../schemas/iso/currency/2015/alpha-code.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/currency/2015/alpha-currency.test.json b/test/iso/currency/2015/alpha-currency.test.json
index 9cd66427..a0dac0ae 100644
--- a/test/iso/currency/2015/alpha-currency.test.json
+++ b/test/iso/currency/2015/alpha-currency.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/alpha-currency.json",
+  "target": "../../../../schemas/iso/currency/2015/alpha-currency.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/currency/2015/alpha-fund.test.json b/test/iso/currency/2015/alpha-fund.test.json
index cacb5828..91ecac30 100644
--- a/test/iso/currency/2015/alpha-fund.test.json
+++ b/test/iso/currency/2015/alpha-fund.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/alpha-fund.json",
+  "target": "../../../../schemas/iso/currency/2015/alpha-fund.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/currency/2015/alpha-precious-metal.test.json b/test/iso/currency/2015/alpha-precious-metal.test.json
index ba60688b..39feb86d 100644
--- a/test/iso/currency/2015/alpha-precious-metal.test.json
+++ b/test/iso/currency/2015/alpha-precious-metal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/alpha-precious-metal.json",
+  "target": "../../../../schemas/iso/currency/2015/alpha-precious-metal.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/currency/2015/alpha-test.test.json b/test/iso/currency/2015/alpha-test.test.json
index 3d3d923a..d836b714 100644
--- a/test/iso/currency/2015/alpha-test.test.json
+++ b/test/iso/currency/2015/alpha-test.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/alpha-test.json",
+  "target": "../../../../schemas/iso/currency/2015/alpha-test.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/currency/2015/alpha-unknown.test.json b/test/iso/currency/2015/alpha-unknown.test.json
index e405038d..44ed0b3f 100644
--- a/test/iso/currency/2015/alpha-unknown.test.json
+++ b/test/iso/currency/2015/alpha-unknown.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/alpha-unknown.json",
+  "target": "../../../../schemas/iso/currency/2015/alpha-unknown.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/currency/2015/historical/alpha-code.test.json b/test/iso/currency/2015/historical/alpha-code.test.json
index 18a842de..78aceb8a 100644
--- a/test/iso/currency/2015/historical/alpha-code.test.json
+++ b/test/iso/currency/2015/historical/alpha-code.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/currency/2015/historical/alpha-code.json",
+  "target": "../../../../../schemas/iso/currency/2015/historical/alpha-code.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/currency/2015/historical/alpha-currency.test.json b/test/iso/currency/2015/historical/alpha-currency.test.json
index ac7b6f97..8db08f8c 100644
--- a/test/iso/currency/2015/historical/alpha-currency.test.json
+++ b/test/iso/currency/2015/historical/alpha-currency.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/currency/2015/historical/alpha-currency.json",
+  "target": "../../../../../schemas/iso/currency/2015/historical/alpha-currency.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/currency/2015/historical/numeric-code.test.json b/test/iso/currency/2015/historical/numeric-code.test.json
index 14b21da8..12e53e97 100644
--- a/test/iso/currency/2015/historical/numeric-code.test.json
+++ b/test/iso/currency/2015/historical/numeric-code.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/currency/2015/historical/numeric-code.json",
+  "target": "../../../../../schemas/iso/currency/2015/historical/numeric-code.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/iso/currency/2015/historical/numeric-currency.test.json b/test/iso/currency/2015/historical/numeric-currency.test.json
index 42509648..006796fe 100644
--- a/test/iso/currency/2015/historical/numeric-currency.test.json
+++ b/test/iso/currency/2015/historical/numeric-currency.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/currency/2015/historical/numeric-currency.json",
+  "target": "../../../../../schemas/iso/currency/2015/historical/numeric-currency.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/iso/currency/2015/numeric-code-additional.test.json b/test/iso/currency/2015/numeric-code-additional.test.json
index 7038cdf2..da79fe76 100644
--- a/test/iso/currency/2015/numeric-code-additional.test.json
+++ b/test/iso/currency/2015/numeric-code-additional.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/numeric-code-additional.json",
+  "target": "../../../../schemas/iso/currency/2015/numeric-code-additional.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/iso/currency/2015/numeric-code.test.json b/test/iso/currency/2015/numeric-code.test.json
index f515b4a4..e977064a 100644
--- a/test/iso/currency/2015/numeric-code.test.json
+++ b/test/iso/currency/2015/numeric-code.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/numeric-code.json",
+  "target": "../../../../schemas/iso/currency/2015/numeric-code.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/iso/currency/2015/numeric-currency.test.json b/test/iso/currency/2015/numeric-currency.test.json
index 580d3700..845b078b 100644
--- a/test/iso/currency/2015/numeric-currency.test.json
+++ b/test/iso/currency/2015/numeric-currency.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/numeric-currency.json",
+  "target": "../../../../schemas/iso/currency/2015/numeric-currency.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/iso/currency/2015/numeric-fund.test.json b/test/iso/currency/2015/numeric-fund.test.json
index b348586b..6d312469 100644
--- a/test/iso/currency/2015/numeric-fund.test.json
+++ b/test/iso/currency/2015/numeric-fund.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/numeric-fund.json",
+  "target": "../../../../schemas/iso/currency/2015/numeric-fund.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/iso/currency/2015/numeric-precious-metal.test.json b/test/iso/currency/2015/numeric-precious-metal.test.json
index c75e58d5..76c8c601 100644
--- a/test/iso/currency/2015/numeric-precious-metal.test.json
+++ b/test/iso/currency/2015/numeric-precious-metal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/numeric-precious-metal.json",
+  "target": "../../../../schemas/iso/currency/2015/numeric-precious-metal.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/iso/currency/2015/numeric-test.test.json b/test/iso/currency/2015/numeric-test.test.json
index ddd10416..ee4d63da 100644
--- a/test/iso/currency/2015/numeric-test.test.json
+++ b/test/iso/currency/2015/numeric-test.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/numeric-test.json",
+  "target": "../../../../schemas/iso/currency/2015/numeric-test.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/iso/currency/2015/numeric-unknown.test.json b/test/iso/currency/2015/numeric-unknown.test.json
index bb30b2d8..9a805c88 100644
--- a/test/iso/currency/2015/numeric-unknown.test.json
+++ b/test/iso/currency/2015/numeric-unknown.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/currency/2015/numeric-unknown.json",
+  "target": "../../../../schemas/iso/currency/2015/numeric-unknown.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/iso/datetime/2019/date/calendar-basic.test.json b/test/iso/datetime/2019/date/calendar-basic.test.json
index 0a7f6a9d..7227adf8 100644
--- a/test/iso/datetime/2019/date/calendar-basic.test.json
+++ b/test/iso/datetime/2019/date/calendar-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/calendar-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/calendar-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/calendar-century.test.json b/test/iso/datetime/2019/date/calendar-century.test.json
index 6638bd56..0637d2ae 100644
--- a/test/iso/datetime/2019/date/calendar-century.test.json
+++ b/test/iso/datetime/2019/date/calendar-century.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/calendar-century.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/calendar-century.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/calendar-decade.test.json b/test/iso/datetime/2019/date/calendar-decade.test.json
index 5b3d1f3a..80804370 100644
--- a/test/iso/datetime/2019/date/calendar-decade.test.json
+++ b/test/iso/datetime/2019/date/calendar-decade.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/calendar-decade.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/calendar-decade.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/calendar-expanded-basic.test.json b/test/iso/datetime/2019/date/calendar-expanded-basic.test.json
index 8df859ed..f5ef87ab 100644
--- a/test/iso/datetime/2019/date/calendar-expanded-basic.test.json
+++ b/test/iso/datetime/2019/date/calendar-expanded-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/calendar-expanded-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/calendar-expanded-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/calendar-expanded-century.test.json b/test/iso/datetime/2019/date/calendar-expanded-century.test.json
index 633bfd64..076a8575 100644
--- a/test/iso/datetime/2019/date/calendar-expanded-century.test.json
+++ b/test/iso/datetime/2019/date/calendar-expanded-century.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/calendar-expanded-century.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/calendar-expanded-century.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/calendar-expanded-decade.test.json b/test/iso/datetime/2019/date/calendar-expanded-decade.test.json
index 0cc1e170..fa6565d9 100644
--- a/test/iso/datetime/2019/date/calendar-expanded-decade.test.json
+++ b/test/iso/datetime/2019/date/calendar-expanded-decade.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/calendar-expanded-decade.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/calendar-expanded-decade.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/calendar-expanded-extended.test.json b/test/iso/datetime/2019/date/calendar-expanded-extended.test.json
index 8bbe27a4..7b7abf15 100644
--- a/test/iso/datetime/2019/date/calendar-expanded-extended.test.json
+++ b/test/iso/datetime/2019/date/calendar-expanded-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/calendar-expanded-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/calendar-expanded-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/calendar-expanded-month.test.json b/test/iso/datetime/2019/date/calendar-expanded-month.test.json
index c8114684..eb5c8d3d 100644
--- a/test/iso/datetime/2019/date/calendar-expanded-month.test.json
+++ b/test/iso/datetime/2019/date/calendar-expanded-month.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/calendar-expanded-month.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/calendar-expanded-month.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/calendar-expanded-year.test.json b/test/iso/datetime/2019/date/calendar-expanded-year.test.json
index 39afb193..8ca4e65c 100644
--- a/test/iso/datetime/2019/date/calendar-expanded-year.test.json
+++ b/test/iso/datetime/2019/date/calendar-expanded-year.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/calendar-expanded-year.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/calendar-expanded-year.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/calendar-extended.test.json b/test/iso/datetime/2019/date/calendar-extended.test.json
index 4013ef90..024fc454 100644
--- a/test/iso/datetime/2019/date/calendar-extended.test.json
+++ b/test/iso/datetime/2019/date/calendar-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/calendar-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/calendar-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/calendar-month.test.json b/test/iso/datetime/2019/date/calendar-month.test.json
index 7199563b..3c380180 100644
--- a/test/iso/datetime/2019/date/calendar-month.test.json
+++ b/test/iso/datetime/2019/date/calendar-month.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/calendar-month.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/calendar-month.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/calendar-year.test.json b/test/iso/datetime/2019/date/calendar-year.test.json
index 37eb04a8..c9e03665 100644
--- a/test/iso/datetime/2019/date/calendar-year.test.json
+++ b/test/iso/datetime/2019/date/calendar-year.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/calendar-year.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/calendar-year.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/ordinal-basic.test.json b/test/iso/datetime/2019/date/ordinal-basic.test.json
index 8d126679..8e12e1b0 100644
--- a/test/iso/datetime/2019/date/ordinal-basic.test.json
+++ b/test/iso/datetime/2019/date/ordinal-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/ordinal-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/ordinal-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/ordinal-expanded-basic.test.json b/test/iso/datetime/2019/date/ordinal-expanded-basic.test.json
index 27e83393..ff89f678 100644
--- a/test/iso/datetime/2019/date/ordinal-expanded-basic.test.json
+++ b/test/iso/datetime/2019/date/ordinal-expanded-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/ordinal-expanded-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/ordinal-expanded-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/ordinal-expanded-extended.test.json b/test/iso/datetime/2019/date/ordinal-expanded-extended.test.json
index 2f300a4b..196d3dbc 100644
--- a/test/iso/datetime/2019/date/ordinal-expanded-extended.test.json
+++ b/test/iso/datetime/2019/date/ordinal-expanded-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/ordinal-expanded-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/ordinal-expanded-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/ordinal-extended.test.json b/test/iso/datetime/2019/date/ordinal-extended.test.json
index 2537f6a1..3c6303c1 100644
--- a/test/iso/datetime/2019/date/ordinal-extended.test.json
+++ b/test/iso/datetime/2019/date/ordinal-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/ordinal-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/ordinal-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/week-basic.test.json b/test/iso/datetime/2019/date/week-basic.test.json
index 36969ad7..a90473c5 100644
--- a/test/iso/datetime/2019/date/week-basic.test.json
+++ b/test/iso/datetime/2019/date/week-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/week-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/week-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/week-expanded-basic.test.json b/test/iso/datetime/2019/date/week-expanded-basic.test.json
index 2909e9d3..04bdd10a 100644
--- a/test/iso/datetime/2019/date/week-expanded-basic.test.json
+++ b/test/iso/datetime/2019/date/week-expanded-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/week-expanded-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/week-expanded-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/week-expanded-extended.test.json b/test/iso/datetime/2019/date/week-expanded-extended.test.json
index 308e4eba..35360b2a 100644
--- a/test/iso/datetime/2019/date/week-expanded-extended.test.json
+++ b/test/iso/datetime/2019/date/week-expanded-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/week-expanded-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/week-expanded-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/week-expanded-reduced-basic.test.json b/test/iso/datetime/2019/date/week-expanded-reduced-basic.test.json
index 4d78ec33..620ec9c2 100644
--- a/test/iso/datetime/2019/date/week-expanded-reduced-basic.test.json
+++ b/test/iso/datetime/2019/date/week-expanded-reduced-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/week-expanded-reduced-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/week-expanded-reduced-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/week-expanded-reduced-extended.test.json b/test/iso/datetime/2019/date/week-expanded-reduced-extended.test.json
index 6e1bdfc2..175d7e30 100644
--- a/test/iso/datetime/2019/date/week-expanded-reduced-extended.test.json
+++ b/test/iso/datetime/2019/date/week-expanded-reduced-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/week-expanded-reduced-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/week-expanded-reduced-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/week-extended.test.json b/test/iso/datetime/2019/date/week-extended.test.json
index 4d25fd33..d0ae4570 100644
--- a/test/iso/datetime/2019/date/week-extended.test.json
+++ b/test/iso/datetime/2019/date/week-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/week-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/week-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/week-reduced-basic.test.json b/test/iso/datetime/2019/date/week-reduced-basic.test.json
index 6e6939f2..9a0789eb 100644
--- a/test/iso/datetime/2019/date/week-reduced-basic.test.json
+++ b/test/iso/datetime/2019/date/week-reduced-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/week-reduced-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/week-reduced-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/date/week-reduced-extended.test.json b/test/iso/datetime/2019/date/week-reduced-extended.test.json
index 0be77765..6cf79baf 100644
--- a/test/iso/datetime/2019/date/week-reduced-extended.test.json
+++ b/test/iso/datetime/2019/date/week-reduced-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/date/week-reduced-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/date/week-reduced-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/calendar-basic.test.json b/test/iso/datetime/2019/datetime/calendar-basic.test.json
index 9cfec30d..d6b783b3 100644
--- a/test/iso/datetime/2019/datetime/calendar-basic.test.json
+++ b/test/iso/datetime/2019/datetime/calendar-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/calendar-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/calendar-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/calendar-extended.test.json b/test/iso/datetime/2019/datetime/calendar-extended.test.json
index 8bc298d8..93c9f669 100644
--- a/test/iso/datetime/2019/datetime/calendar-extended.test.json
+++ b/test/iso/datetime/2019/datetime/calendar-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/calendar-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/calendar-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/calendar-minute-basic.test.json b/test/iso/datetime/2019/datetime/calendar-minute-basic.test.json
index 0aafbb99..a2896a96 100644
--- a/test/iso/datetime/2019/datetime/calendar-minute-basic.test.json
+++ b/test/iso/datetime/2019/datetime/calendar-minute-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/calendar-minute-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/calendar-minute-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/calendar-minute-extended.test.json b/test/iso/datetime/2019/datetime/calendar-minute-extended.test.json
index 960da1e2..7d624d8d 100644
--- a/test/iso/datetime/2019/datetime/calendar-minute-extended.test.json
+++ b/test/iso/datetime/2019/datetime/calendar-minute-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/calendar-minute-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/calendar-minute-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/calendar-shift-basic.test.json b/test/iso/datetime/2019/datetime/calendar-shift-basic.test.json
index 5019a8bd..3a29e211 100644
--- a/test/iso/datetime/2019/datetime/calendar-shift-basic.test.json
+++ b/test/iso/datetime/2019/datetime/calendar-shift-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/calendar-shift-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/calendar-shift-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/calendar-shift-extended.test.json b/test/iso/datetime/2019/datetime/calendar-shift-extended.test.json
index a7bc4a5f..e58acb91 100644
--- a/test/iso/datetime/2019/datetime/calendar-shift-extended.test.json
+++ b/test/iso/datetime/2019/datetime/calendar-shift-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/calendar-shift-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/calendar-shift-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/calendar-shifthour-basic.test.json b/test/iso/datetime/2019/datetime/calendar-shifthour-basic.test.json
index 5bc63a7e..4d3e6134 100644
--- a/test/iso/datetime/2019/datetime/calendar-shifthour-basic.test.json
+++ b/test/iso/datetime/2019/datetime/calendar-shifthour-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/calendar-shifthour-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/calendar-shifthour-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/calendar-shifthour-extended.test.json b/test/iso/datetime/2019/datetime/calendar-shifthour-extended.test.json
index ab574e92..e09a9234 100644
--- a/test/iso/datetime/2019/datetime/calendar-shifthour-extended.test.json
+++ b/test/iso/datetime/2019/datetime/calendar-shifthour-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/calendar-shifthour-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/calendar-shifthour-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/calendar-utc-basic.test.json b/test/iso/datetime/2019/datetime/calendar-utc-basic.test.json
index 0c31e5a4..5a14ae90 100644
--- a/test/iso/datetime/2019/datetime/calendar-utc-basic.test.json
+++ b/test/iso/datetime/2019/datetime/calendar-utc-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/calendar-utc-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/calendar-utc-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/calendar-utc-extended.test.json b/test/iso/datetime/2019/datetime/calendar-utc-extended.test.json
index 79c58765..294a165d 100644
--- a/test/iso/datetime/2019/datetime/calendar-utc-extended.test.json
+++ b/test/iso/datetime/2019/datetime/calendar-utc-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/calendar-utc-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/calendar-utc-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/ordinal-basic.test.json b/test/iso/datetime/2019/datetime/ordinal-basic.test.json
index 7100b489..5e27978b 100644
--- a/test/iso/datetime/2019/datetime/ordinal-basic.test.json
+++ b/test/iso/datetime/2019/datetime/ordinal-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/ordinal-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/ordinal-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/ordinal-extended.test.json b/test/iso/datetime/2019/datetime/ordinal-extended.test.json
index 33bf9a10..a0e2f8ad 100644
--- a/test/iso/datetime/2019/datetime/ordinal-extended.test.json
+++ b/test/iso/datetime/2019/datetime/ordinal-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/ordinal-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/ordinal-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/ordinal-minute-utc-basic.test.json b/test/iso/datetime/2019/datetime/ordinal-minute-utc-basic.test.json
index 156cf8ba..84b0dcda 100644
--- a/test/iso/datetime/2019/datetime/ordinal-minute-utc-basic.test.json
+++ b/test/iso/datetime/2019/datetime/ordinal-minute-utc-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/ordinal-minute-utc-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/ordinal-minute-utc-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/ordinal-minute-utc-extended.test.json b/test/iso/datetime/2019/datetime/ordinal-minute-utc-extended.test.json
index 74bdab8d..a559e641 100644
--- a/test/iso/datetime/2019/datetime/ordinal-minute-utc-extended.test.json
+++ b/test/iso/datetime/2019/datetime/ordinal-minute-utc-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/ordinal-minute-utc-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/ordinal-minute-utc-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/ordinal-shift-basic.test.json b/test/iso/datetime/2019/datetime/ordinal-shift-basic.test.json
index 1957da49..59108dcd 100644
--- a/test/iso/datetime/2019/datetime/ordinal-shift-basic.test.json
+++ b/test/iso/datetime/2019/datetime/ordinal-shift-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/ordinal-shift-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/ordinal-shift-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/ordinal-shift-extended.test.json b/test/iso/datetime/2019/datetime/ordinal-shift-extended.test.json
index 40c2b026..d9337523 100644
--- a/test/iso/datetime/2019/datetime/ordinal-shift-extended.test.json
+++ b/test/iso/datetime/2019/datetime/ordinal-shift-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/ordinal-shift-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/ordinal-shift-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/ordinal-shifthour-basic.test.json b/test/iso/datetime/2019/datetime/ordinal-shifthour-basic.test.json
index 577d1c6e..b08f77df 100644
--- a/test/iso/datetime/2019/datetime/ordinal-shifthour-basic.test.json
+++ b/test/iso/datetime/2019/datetime/ordinal-shifthour-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/ordinal-shifthour-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/ordinal-shifthour-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/ordinal-shifthour-extended.test.json b/test/iso/datetime/2019/datetime/ordinal-shifthour-extended.test.json
index ce316e62..fe0f01a4 100644
--- a/test/iso/datetime/2019/datetime/ordinal-shifthour-extended.test.json
+++ b/test/iso/datetime/2019/datetime/ordinal-shifthour-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/ordinal-shifthour-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/ordinal-shifthour-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/ordinal-utc-basic.test.json b/test/iso/datetime/2019/datetime/ordinal-utc-basic.test.json
index 83d28686..ff7027b8 100644
--- a/test/iso/datetime/2019/datetime/ordinal-utc-basic.test.json
+++ b/test/iso/datetime/2019/datetime/ordinal-utc-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/ordinal-utc-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/ordinal-utc-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/ordinal-utc-extended.test.json b/test/iso/datetime/2019/datetime/ordinal-utc-extended.test.json
index 8a21264c..7db764ca 100644
--- a/test/iso/datetime/2019/datetime/ordinal-utc-extended.test.json
+++ b/test/iso/datetime/2019/datetime/ordinal-utc-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/ordinal-utc-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/ordinal-utc-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/week-basic.test.json b/test/iso/datetime/2019/datetime/week-basic.test.json
index 9752b9b1..3e07707a 100644
--- a/test/iso/datetime/2019/datetime/week-basic.test.json
+++ b/test/iso/datetime/2019/datetime/week-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/week-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/week-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/week-extended.test.json b/test/iso/datetime/2019/datetime/week-extended.test.json
index e27cac55..34a9c90a 100644
--- a/test/iso/datetime/2019/datetime/week-extended.test.json
+++ b/test/iso/datetime/2019/datetime/week-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/week-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/week-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/week-minute-shift-basic.test.json b/test/iso/datetime/2019/datetime/week-minute-shift-basic.test.json
index b00f7504..42f938c1 100644
--- a/test/iso/datetime/2019/datetime/week-minute-shift-basic.test.json
+++ b/test/iso/datetime/2019/datetime/week-minute-shift-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/week-minute-shift-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/week-minute-shift-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/week-minute-shift-extended.test.json b/test/iso/datetime/2019/datetime/week-minute-shift-extended.test.json
index fead72a5..38298164 100644
--- a/test/iso/datetime/2019/datetime/week-minute-shift-extended.test.json
+++ b/test/iso/datetime/2019/datetime/week-minute-shift-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/week-minute-shift-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/week-minute-shift-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/week-shift-basic.test.json b/test/iso/datetime/2019/datetime/week-shift-basic.test.json
index 1bcad678..89101593 100644
--- a/test/iso/datetime/2019/datetime/week-shift-basic.test.json
+++ b/test/iso/datetime/2019/datetime/week-shift-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/week-shift-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/week-shift-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/week-shift-extended.test.json b/test/iso/datetime/2019/datetime/week-shift-extended.test.json
index d63d491f..383004c5 100644
--- a/test/iso/datetime/2019/datetime/week-shift-extended.test.json
+++ b/test/iso/datetime/2019/datetime/week-shift-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/week-shift-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/week-shift-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/week-shifthour-basic.test.json b/test/iso/datetime/2019/datetime/week-shifthour-basic.test.json
index a242d704..0a025a09 100644
--- a/test/iso/datetime/2019/datetime/week-shifthour-basic.test.json
+++ b/test/iso/datetime/2019/datetime/week-shifthour-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/week-shifthour-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/week-shifthour-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/week-shifthour-extended.test.json b/test/iso/datetime/2019/datetime/week-shifthour-extended.test.json
index 58e8d7e0..701d3e36 100644
--- a/test/iso/datetime/2019/datetime/week-shifthour-extended.test.json
+++ b/test/iso/datetime/2019/datetime/week-shifthour-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/week-shifthour-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/week-shifthour-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/week-utc-basic.test.json b/test/iso/datetime/2019/datetime/week-utc-basic.test.json
index ace783cc..8227e6ae 100644
--- a/test/iso/datetime/2019/datetime/week-utc-basic.test.json
+++ b/test/iso/datetime/2019/datetime/week-utc-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/week-utc-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/week-utc-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/datetime/week-utc-extended.test.json b/test/iso/datetime/2019/datetime/week-utc-extended.test.json
index 8bd6e87c..ca7bb357 100644
--- a/test/iso/datetime/2019/datetime/week-utc-extended.test.json
+++ b/test/iso/datetime/2019/datetime/week-utc-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/datetime/week-utc-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/datetime/week-utc-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/duration/calendar-basic.test.json b/test/iso/datetime/2019/duration/calendar-basic.test.json
index 9588d559..33cdbb44 100644
--- a/test/iso/datetime/2019/duration/calendar-basic.test.json
+++ b/test/iso/datetime/2019/duration/calendar-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/duration/calendar-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/duration/calendar-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/duration/calendar-extended.test.json b/test/iso/datetime/2019/duration/calendar-extended.test.json
index 945b8674..8587852b 100644
--- a/test/iso/datetime/2019/duration/calendar-extended.test.json
+++ b/test/iso/datetime/2019/duration/calendar-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/duration/calendar-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/duration/calendar-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/duration/designator-extension.test.json b/test/iso/datetime/2019/duration/designator-extension.test.json
index b298c22d..4f843be0 100644
--- a/test/iso/datetime/2019/duration/designator-extension.test.json
+++ b/test/iso/datetime/2019/duration/designator-extension.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/duration/designator-extension.json",
+  "target": "../../../../../schemas/iso/datetime/2019/duration/designator-extension.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/duration/designator.test.json b/test/iso/datetime/2019/duration/designator.test.json
index 02046ea1..137f6854 100644
--- a/test/iso/datetime/2019/duration/designator.test.json
+++ b/test/iso/datetime/2019/duration/designator.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/duration/designator.json",
+  "target": "../../../../../schemas/iso/datetime/2019/duration/designator.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/duration/ordinal-basic.test.json b/test/iso/datetime/2019/duration/ordinal-basic.test.json
index 04b10c3e..3a0d5097 100644
--- a/test/iso/datetime/2019/duration/ordinal-basic.test.json
+++ b/test/iso/datetime/2019/duration/ordinal-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/duration/ordinal-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/duration/ordinal-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/duration/ordinal-extended.test.json b/test/iso/datetime/2019/duration/ordinal-extended.test.json
index 38cc91e4..00044565 100644
--- a/test/iso/datetime/2019/duration/ordinal-extended.test.json
+++ b/test/iso/datetime/2019/duration/ordinal-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/duration/ordinal-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/duration/ordinal-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/duration/weeks.test.json b/test/iso/datetime/2019/duration/weeks.test.json
index c1dc40d4..f37b0d05 100644
--- a/test/iso/datetime/2019/duration/weeks.test.json
+++ b/test/iso/datetime/2019/duration/weeks.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/duration/weeks.json",
+  "target": "../../../../../schemas/iso/datetime/2019/duration/weeks.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/duration-end-calendar-basic.test.json b/test/iso/datetime/2019/interval/duration-end-calendar-basic.test.json
index 25bc52dc..e1df0b31 100644
--- a/test/iso/datetime/2019/interval/duration-end-calendar-basic.test.json
+++ b/test/iso/datetime/2019/interval/duration-end-calendar-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/duration-end-calendar-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/duration-end-calendar-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/duration-end-calendar-extended.test.json b/test/iso/datetime/2019/interval/duration-end-calendar-extended.test.json
index 9f372121..616ff463 100644
--- a/test/iso/datetime/2019/interval/duration-end-calendar-extended.test.json
+++ b/test/iso/datetime/2019/interval/duration-end-calendar-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/duration-end-calendar-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/duration-end-calendar-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/duration-end-ordinal-basic.test.json b/test/iso/datetime/2019/interval/duration-end-ordinal-basic.test.json
index 54ccd192..e76625fb 100644
--- a/test/iso/datetime/2019/interval/duration-end-ordinal-basic.test.json
+++ b/test/iso/datetime/2019/interval/duration-end-ordinal-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/duration-end-ordinal-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/duration-end-ordinal-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/duration-end-ordinal-extended.test.json b/test/iso/datetime/2019/interval/duration-end-ordinal-extended.test.json
index cf169b52..0724899c 100644
--- a/test/iso/datetime/2019/interval/duration-end-ordinal-extended.test.json
+++ b/test/iso/datetime/2019/interval/duration-end-ordinal-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/duration-end-ordinal-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/duration-end-ordinal-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/duration-end-week-basic.test.json b/test/iso/datetime/2019/interval/duration-end-week-basic.test.json
index 5f8cf8be..f6711f27 100644
--- a/test/iso/datetime/2019/interval/duration-end-week-basic.test.json
+++ b/test/iso/datetime/2019/interval/duration-end-week-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/duration-end-week-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/duration-end-week-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/duration-end-week-extended.test.json b/test/iso/datetime/2019/interval/duration-end-week-extended.test.json
index e8f8c667..fe695aff 100644
--- a/test/iso/datetime/2019/interval/duration-end-week-extended.test.json
+++ b/test/iso/datetime/2019/interval/duration-end-week-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/duration-end-week-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/duration-end-week-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/start-duration-calendar-basic.test.json b/test/iso/datetime/2019/interval/start-duration-calendar-basic.test.json
index 55e11b36..37352ab5 100644
--- a/test/iso/datetime/2019/interval/start-duration-calendar-basic.test.json
+++ b/test/iso/datetime/2019/interval/start-duration-calendar-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/start-duration-calendar-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/start-duration-calendar-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/start-duration-calendar-extended.test.json b/test/iso/datetime/2019/interval/start-duration-calendar-extended.test.json
index 00f50d16..bf4eb66f 100644
--- a/test/iso/datetime/2019/interval/start-duration-calendar-extended.test.json
+++ b/test/iso/datetime/2019/interval/start-duration-calendar-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/start-duration-calendar-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/start-duration-calendar-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/start-duration-ordinal-basic.test.json b/test/iso/datetime/2019/interval/start-duration-ordinal-basic.test.json
index 482585e1..c3fe935c 100644
--- a/test/iso/datetime/2019/interval/start-duration-ordinal-basic.test.json
+++ b/test/iso/datetime/2019/interval/start-duration-ordinal-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/start-duration-ordinal-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/start-duration-ordinal-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/start-duration-ordinal-extended.test.json b/test/iso/datetime/2019/interval/start-duration-ordinal-extended.test.json
index d2122187..dc9b4e56 100644
--- a/test/iso/datetime/2019/interval/start-duration-ordinal-extended.test.json
+++ b/test/iso/datetime/2019/interval/start-duration-ordinal-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/start-duration-ordinal-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/start-duration-ordinal-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/start-duration-week-basic.test.json b/test/iso/datetime/2019/interval/start-duration-week-basic.test.json
index 90fb2939..898ad8a8 100644
--- a/test/iso/datetime/2019/interval/start-duration-week-basic.test.json
+++ b/test/iso/datetime/2019/interval/start-duration-week-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/start-duration-week-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/start-duration-week-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/start-duration-week-extended.test.json b/test/iso/datetime/2019/interval/start-duration-week-extended.test.json
index 418ab0b8..2436f242 100644
--- a/test/iso/datetime/2019/interval/start-duration-week-extended.test.json
+++ b/test/iso/datetime/2019/interval/start-duration-week-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/start-duration-week-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/start-duration-week-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/start-end-calendar-basic.test.json b/test/iso/datetime/2019/interval/start-end-calendar-basic.test.json
index 97e0c8ca..3a7d78c8 100644
--- a/test/iso/datetime/2019/interval/start-end-calendar-basic.test.json
+++ b/test/iso/datetime/2019/interval/start-end-calendar-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/start-end-calendar-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/start-end-calendar-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/start-end-calendar-extended.test.json b/test/iso/datetime/2019/interval/start-end-calendar-extended.test.json
index 02b930af..2dce078e 100644
--- a/test/iso/datetime/2019/interval/start-end-calendar-extended.test.json
+++ b/test/iso/datetime/2019/interval/start-end-calendar-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/start-end-calendar-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/start-end-calendar-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/start-end-ordinal-basic.test.json b/test/iso/datetime/2019/interval/start-end-ordinal-basic.test.json
index 867db988..0f381838 100644
--- a/test/iso/datetime/2019/interval/start-end-ordinal-basic.test.json
+++ b/test/iso/datetime/2019/interval/start-end-ordinal-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/start-end-ordinal-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/start-end-ordinal-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/start-end-ordinal-extended.test.json b/test/iso/datetime/2019/interval/start-end-ordinal-extended.test.json
index c6412a57..de6d07aa 100644
--- a/test/iso/datetime/2019/interval/start-end-ordinal-extended.test.json
+++ b/test/iso/datetime/2019/interval/start-end-ordinal-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/start-end-ordinal-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/start-end-ordinal-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/start-end-week-basic.test.json b/test/iso/datetime/2019/interval/start-end-week-basic.test.json
index 11d14c13..c7b2ee07 100644
--- a/test/iso/datetime/2019/interval/start-end-week-basic.test.json
+++ b/test/iso/datetime/2019/interval/start-end-week-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/start-end-week-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/start-end-week-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/interval/start-end-week-extended.test.json b/test/iso/datetime/2019/interval/start-end-week-extended.test.json
index 30e2fb28..80e42131 100644
--- a/test/iso/datetime/2019/interval/start-end-week-extended.test.json
+++ b/test/iso/datetime/2019/interval/start-end-week-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/interval/start-end-week-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/interval/start-end-week-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/duration-end-calendar-basic.test.json b/test/iso/datetime/2019/recurring/duration-end-calendar-basic.test.json
index 8fa7f846..8564e640 100644
--- a/test/iso/datetime/2019/recurring/duration-end-calendar-basic.test.json
+++ b/test/iso/datetime/2019/recurring/duration-end-calendar-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/duration-end-calendar-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/duration-end-calendar-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/duration-end-calendar-extended.test.json b/test/iso/datetime/2019/recurring/duration-end-calendar-extended.test.json
index 7849fbe9..069c6269 100644
--- a/test/iso/datetime/2019/recurring/duration-end-calendar-extended.test.json
+++ b/test/iso/datetime/2019/recurring/duration-end-calendar-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/duration-end-calendar-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/duration-end-calendar-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/duration-end-ordinal-basic.test.json b/test/iso/datetime/2019/recurring/duration-end-ordinal-basic.test.json
index 67041895..de522dcc 100644
--- a/test/iso/datetime/2019/recurring/duration-end-ordinal-basic.test.json
+++ b/test/iso/datetime/2019/recurring/duration-end-ordinal-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/duration-end-ordinal-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/duration-end-ordinal-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/duration-end-ordinal-extended.test.json b/test/iso/datetime/2019/recurring/duration-end-ordinal-extended.test.json
index 3ac247e1..e5e22e0c 100644
--- a/test/iso/datetime/2019/recurring/duration-end-ordinal-extended.test.json
+++ b/test/iso/datetime/2019/recurring/duration-end-ordinal-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/duration-end-ordinal-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/duration-end-ordinal-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/duration-end-week-basic.test.json b/test/iso/datetime/2019/recurring/duration-end-week-basic.test.json
index b8e27cfe..42c246fb 100644
--- a/test/iso/datetime/2019/recurring/duration-end-week-basic.test.json
+++ b/test/iso/datetime/2019/recurring/duration-end-week-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/duration-end-week-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/duration-end-week-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/duration-end-week-extended.test.json b/test/iso/datetime/2019/recurring/duration-end-week-extended.test.json
index ce8feea8..542ad039 100644
--- a/test/iso/datetime/2019/recurring/duration-end-week-extended.test.json
+++ b/test/iso/datetime/2019/recurring/duration-end-week-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/duration-end-week-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/duration-end-week-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/start-duration-calendar-basic.test.json b/test/iso/datetime/2019/recurring/start-duration-calendar-basic.test.json
index c9127887..59f03360 100644
--- a/test/iso/datetime/2019/recurring/start-duration-calendar-basic.test.json
+++ b/test/iso/datetime/2019/recurring/start-duration-calendar-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/start-duration-calendar-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/start-duration-calendar-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/start-duration-calendar-extended.test.json b/test/iso/datetime/2019/recurring/start-duration-calendar-extended.test.json
index 09d5751a..e24ee292 100644
--- a/test/iso/datetime/2019/recurring/start-duration-calendar-extended.test.json
+++ b/test/iso/datetime/2019/recurring/start-duration-calendar-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/start-duration-calendar-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/start-duration-calendar-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/start-duration-ordinal-basic.test.json b/test/iso/datetime/2019/recurring/start-duration-ordinal-basic.test.json
index 58ece313..daca820a 100644
--- a/test/iso/datetime/2019/recurring/start-duration-ordinal-basic.test.json
+++ b/test/iso/datetime/2019/recurring/start-duration-ordinal-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/start-duration-ordinal-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/start-duration-ordinal-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/start-duration-ordinal-extended.test.json b/test/iso/datetime/2019/recurring/start-duration-ordinal-extended.test.json
index 54e5e7b1..d67ed513 100644
--- a/test/iso/datetime/2019/recurring/start-duration-ordinal-extended.test.json
+++ b/test/iso/datetime/2019/recurring/start-duration-ordinal-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/start-duration-ordinal-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/start-duration-ordinal-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/start-duration-week-basic.test.json b/test/iso/datetime/2019/recurring/start-duration-week-basic.test.json
index 3a49f1ef..dad5357a 100644
--- a/test/iso/datetime/2019/recurring/start-duration-week-basic.test.json
+++ b/test/iso/datetime/2019/recurring/start-duration-week-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/start-duration-week-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/start-duration-week-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/start-duration-week-extended.test.json b/test/iso/datetime/2019/recurring/start-duration-week-extended.test.json
index 6690c405..04fa07be 100644
--- a/test/iso/datetime/2019/recurring/start-duration-week-extended.test.json
+++ b/test/iso/datetime/2019/recurring/start-duration-week-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/start-duration-week-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/start-duration-week-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/start-end-calendar-basic.test.json b/test/iso/datetime/2019/recurring/start-end-calendar-basic.test.json
index 17fff38f..94c5c45d 100644
--- a/test/iso/datetime/2019/recurring/start-end-calendar-basic.test.json
+++ b/test/iso/datetime/2019/recurring/start-end-calendar-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/start-end-calendar-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/start-end-calendar-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/start-end-calendar-extended.test.json b/test/iso/datetime/2019/recurring/start-end-calendar-extended.test.json
index 94981e46..c7333513 100644
--- a/test/iso/datetime/2019/recurring/start-end-calendar-extended.test.json
+++ b/test/iso/datetime/2019/recurring/start-end-calendar-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/start-end-calendar-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/start-end-calendar-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/start-end-ordinal-basic.test.json b/test/iso/datetime/2019/recurring/start-end-ordinal-basic.test.json
index abe46c53..81d84f95 100644
--- a/test/iso/datetime/2019/recurring/start-end-ordinal-basic.test.json
+++ b/test/iso/datetime/2019/recurring/start-end-ordinal-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/start-end-ordinal-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/start-end-ordinal-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/start-end-ordinal-extended.test.json b/test/iso/datetime/2019/recurring/start-end-ordinal-extended.test.json
index f5c02c02..4a8a749a 100644
--- a/test/iso/datetime/2019/recurring/start-end-ordinal-extended.test.json
+++ b/test/iso/datetime/2019/recurring/start-end-ordinal-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/start-end-ordinal-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/start-end-ordinal-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/start-end-week-basic.test.json b/test/iso/datetime/2019/recurring/start-end-week-basic.test.json
index b6494085..530b7ef6 100644
--- a/test/iso/datetime/2019/recurring/start-end-week-basic.test.json
+++ b/test/iso/datetime/2019/recurring/start-end-week-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/start-end-week-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/start-end-week-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/recurring/start-end-week-extended.test.json b/test/iso/datetime/2019/recurring/start-end-week-extended.test.json
index 1d7bbca9..a66828ec 100644
--- a/test/iso/datetime/2019/recurring/start-end-week-extended.test.json
+++ b/test/iso/datetime/2019/recurring/start-end-week-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/recurring/start-end-week-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/recurring/start-end-week-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/beginning-day-basic.test.json b/test/iso/datetime/2019/time/beginning-day-basic.test.json
index bcbca516..235c360a 100644
--- a/test/iso/datetime/2019/time/beginning-day-basic.test.json
+++ b/test/iso/datetime/2019/time/beginning-day-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/beginning-day-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/beginning-day-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/beginning-day-extended.test.json b/test/iso/datetime/2019/time/beginning-day-extended.test.json
index 265bf8e0..bfd0f76a 100644
--- a/test/iso/datetime/2019/time/beginning-day-extended.test.json
+++ b/test/iso/datetime/2019/time/beginning-day-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/beginning-day-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/beginning-day-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/decimal-hour-basic.test.json b/test/iso/datetime/2019/time/decimal-hour-basic.test.json
index 8bb14149..ce8ccf8d 100644
--- a/test/iso/datetime/2019/time/decimal-hour-basic.test.json
+++ b/test/iso/datetime/2019/time/decimal-hour-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/decimal-hour-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/decimal-hour-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/decimal-minute-basic.test.json b/test/iso/datetime/2019/time/decimal-minute-basic.test.json
index a85e5784..fc334ec0 100644
--- a/test/iso/datetime/2019/time/decimal-minute-basic.test.json
+++ b/test/iso/datetime/2019/time/decimal-minute-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/decimal-minute-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/decimal-minute-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/decimal-minute-extended.test.json b/test/iso/datetime/2019/time/decimal-minute-extended.test.json
index ee571c5f..74063dbf 100644
--- a/test/iso/datetime/2019/time/decimal-minute-extended.test.json
+++ b/test/iso/datetime/2019/time/decimal-minute-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/decimal-minute-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/decimal-minute-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/decimal-second-basic.test.json b/test/iso/datetime/2019/time/decimal-second-basic.test.json
index e0f7945a..dd6bccc0 100644
--- a/test/iso/datetime/2019/time/decimal-second-basic.test.json
+++ b/test/iso/datetime/2019/time/decimal-second-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/decimal-second-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/decimal-second-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/decimal-second-extended.test.json b/test/iso/datetime/2019/time/decimal-second-extended.test.json
index 46aa9391..7d4ffe65 100644
--- a/test/iso/datetime/2019/time/decimal-second-extended.test.json
+++ b/test/iso/datetime/2019/time/decimal-second-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/decimal-second-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/decimal-second-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/hour-basic.test.json b/test/iso/datetime/2019/time/hour-basic.test.json
index 9812f5d1..35c4bc54 100644
--- a/test/iso/datetime/2019/time/hour-basic.test.json
+++ b/test/iso/datetime/2019/time/hour-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/hour-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/hour-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/hour-minute-basic.test.json b/test/iso/datetime/2019/time/hour-minute-basic.test.json
index 5402e5a5..603101a4 100644
--- a/test/iso/datetime/2019/time/hour-minute-basic.test.json
+++ b/test/iso/datetime/2019/time/hour-minute-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/hour-minute-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/hour-minute-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/hour-minute-extended.test.json b/test/iso/datetime/2019/time/hour-minute-extended.test.json
index 21f9d360..5d244d0a 100644
--- a/test/iso/datetime/2019/time/hour-minute-extended.test.json
+++ b/test/iso/datetime/2019/time/hour-minute-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/hour-minute-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/hour-minute-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/local-day-basic.test.json b/test/iso/datetime/2019/time/local-day-basic.test.json
index 461aa560..d930ca88 100644
--- a/test/iso/datetime/2019/time/local-day-basic.test.json
+++ b/test/iso/datetime/2019/time/local-day-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/local-day-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/local-day-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/local-day-extended.test.json b/test/iso/datetime/2019/time/local-day-extended.test.json
index 9f27d104..148ba2c3 100644
--- a/test/iso/datetime/2019/time/local-day-extended.test.json
+++ b/test/iso/datetime/2019/time/local-day-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/local-day-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/local-day-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/local-day-shift-basic.test.json b/test/iso/datetime/2019/time/local-day-shift-basic.test.json
index 3a5b2b38..d98a17a2 100644
--- a/test/iso/datetime/2019/time/local-day-shift-basic.test.json
+++ b/test/iso/datetime/2019/time/local-day-shift-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/local-day-shift-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/local-day-shift-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/local-day-shift-extended.test.json b/test/iso/datetime/2019/time/local-day-shift-extended.test.json
index c59e6561..c354ca7f 100644
--- a/test/iso/datetime/2019/time/local-day-shift-extended.test.json
+++ b/test/iso/datetime/2019/time/local-day-shift-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/local-day-shift-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/local-day-shift-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/shift-basic.test.json b/test/iso/datetime/2019/time/shift-basic.test.json
index a06f321c..240adb37 100644
--- a/test/iso/datetime/2019/time/shift-basic.test.json
+++ b/test/iso/datetime/2019/time/shift-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/shift-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/shift-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/shift-extended.test.json b/test/iso/datetime/2019/time/shift-extended.test.json
index 7bdcb5cc..fdd920e0 100644
--- a/test/iso/datetime/2019/time/shift-extended.test.json
+++ b/test/iso/datetime/2019/time/shift-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/shift-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/shift-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/utc-day-basic.test.json b/test/iso/datetime/2019/time/utc-day-basic.test.json
index 7f9dabce..085df99f 100644
--- a/test/iso/datetime/2019/time/utc-day-basic.test.json
+++ b/test/iso/datetime/2019/time/utc-day-basic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/utc-day-basic.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/utc-day-basic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/datetime/2019/time/utc-day-extended.test.json b/test/iso/datetime/2019/time/utc-day-extended.test.json
index 9bda7e25..02bd6d88 100644
--- a/test/iso/datetime/2019/time/utc-day-extended.test.json
+++ b/test/iso/datetime/2019/time/utc-day-extended.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/iso/datetime/2019/time/utc-day-extended.json",
+  "target": "../../../../../schemas/iso/datetime/2019/time/utc-day-extended.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/it/2015/byte.test.json b/test/iso/it/2015/byte.test.json
index 63f1ba17..266a61eb 100644
--- a/test/iso/it/2015/byte.test.json
+++ b/test/iso/it/2015/byte.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/it/2015/byte.json",
+  "target": "../../../../schemas/iso/it/2015/byte.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/iso/language/2023/set-1.test.json b/test/iso/language/2023/set-1.test.json
index 865d9a3b..f87d0c9e 100644
--- a/test/iso/language/2023/set-1.test.json
+++ b/test/iso/language/2023/set-1.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/language/2023/set-1.json",
+  "target": "../../../../schemas/iso/language/2023/set-1.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/language/2023/set-2-bibliographic.test.json b/test/iso/language/2023/set-2-bibliographic.test.json
index d8376050..ce139529 100644
--- a/test/iso/language/2023/set-2-bibliographic.test.json
+++ b/test/iso/language/2023/set-2-bibliographic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/language/2023/set-2-bibliographic.json",
+  "target": "../../../../schemas/iso/language/2023/set-2-bibliographic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/language/2023/set-2-terminologic.test.json b/test/iso/language/2023/set-2-terminologic.test.json
index 1bd38bd9..712ab41d 100644
--- a/test/iso/language/2023/set-2-terminologic.test.json
+++ b/test/iso/language/2023/set-2-terminologic.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/language/2023/set-2-terminologic.json",
+  "target": "../../../../schemas/iso/language/2023/set-2-terminologic.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/language/2023/set-3.test.json b/test/iso/language/2023/set-3.test.json
index 97db38e4..06e77fc5 100644
--- a/test/iso/language/2023/set-3.test.json
+++ b/test/iso/language/2023/set-3.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/language/2023/set-3.json",
+  "target": "../../../../schemas/iso/language/2023/set-3.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/language/2023/set-5.test.json b/test/iso/language/2023/set-5.test.json
index b446458e..e21fd5b5 100644
--- a/test/iso/language/2023/set-5.test.json
+++ b/test/iso/language/2023/set-5.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/language/2023/set-5.json",
+  "target": "../../../../schemas/iso/language/2023/set-5.json",
   "tests": [
     {
       "description": "Invalid type - integer",
diff --git a/test/iso/units/2022/percentage.test.json b/test/iso/units/2022/percentage.test.json
index bc6862f0..25e81613 100644
--- a/test/iso/units/2022/percentage.test.json
+++ b/test/iso/units/2022/percentage.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/iso/units/2022/percentage.json",
+  "target": "../../../../schemas/iso/units/2022/percentage.json",
   "tests": [
     {
       "description": "Invalid type - string",
diff --git a/test/other/jsonrpc/v2.0/batch-request.test.json b/test/other/jsonrpc/v2.0/batch-request.test.json
index 226f9b48..f3acfc39 100644
--- a/test/other/jsonrpc/v2.0/batch-request.test.json
+++ b/test/other/jsonrpc/v2.0/batch-request.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/other/jsonrpc/v2.0/batch-request.json",
+  "target": "../../../../schemas/other/jsonrpc/v2.0/batch-request.json",
   "tests": [
     {
       "data": [
diff --git a/test/other/jsonrpc/v2.0/batch-response.test.json b/test/other/jsonrpc/v2.0/batch-response.test.json
index 622b0e5c..b4c40c4a 100644
--- a/test/other/jsonrpc/v2.0/batch-response.test.json
+++ b/test/other/jsonrpc/v2.0/batch-response.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/other/jsonrpc/v2.0/batch-response.json",
+  "target": "../../../../schemas/other/jsonrpc/v2.0/batch-response.json",
   "tests": [
     {
       "data": [
diff --git a/test/other/jsonrpc/v2.0/code-predefined.test.json b/test/other/jsonrpc/v2.0/code-predefined.test.json
index f2fb0e49..2c434227 100644
--- a/test/other/jsonrpc/v2.0/code-predefined.test.json
+++ b/test/other/jsonrpc/v2.0/code-predefined.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/other/jsonrpc/v2.0/code-predefined.json",
+  "target": "../../../../schemas/other/jsonrpc/v2.0/code-predefined.json",
   "tests": [
     {
       "data": -32700,
diff --git a/test/other/jsonrpc/v2.0/code.test.json b/test/other/jsonrpc/v2.0/code.test.json
index ebe5b166..2dffc287 100644
--- a/test/other/jsonrpc/v2.0/code.test.json
+++ b/test/other/jsonrpc/v2.0/code.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/other/jsonrpc/v2.0/code.json",
+  "target": "../../../../schemas/other/jsonrpc/v2.0/code.json",
   "tests": [
     {
       "data": -32700,
diff --git a/test/other/jsonrpc/v2.0/error.test.json b/test/other/jsonrpc/v2.0/error.test.json
index 79c54590..08586487 100644
--- a/test/other/jsonrpc/v2.0/error.test.json
+++ b/test/other/jsonrpc/v2.0/error.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/other/jsonrpc/v2.0/error.json",
+  "target": "../../../../schemas/other/jsonrpc/v2.0/error.json",
   "tests": [
     {
       "data": {
diff --git a/test/other/jsonrpc/v2.0/identifier.test.json b/test/other/jsonrpc/v2.0/identifier.test.json
index 708b0db1..9815b846 100644
--- a/test/other/jsonrpc/v2.0/identifier.test.json
+++ b/test/other/jsonrpc/v2.0/identifier.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/other/jsonrpc/v2.0/identifier.json",
+  "target": "../../../../schemas/other/jsonrpc/v2.0/identifier.json",
   "tests": [
     {
       "data": "abc123",
diff --git a/test/other/jsonrpc/v2.0/method-internal.test.json b/test/other/jsonrpc/v2.0/method-internal.test.json
index 195028d7..b5c8d2bb 100644
--- a/test/other/jsonrpc/v2.0/method-internal.test.json
+++ b/test/other/jsonrpc/v2.0/method-internal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/other/jsonrpc/v2.0/method-internal.json",
+  "target": "../../../../schemas/other/jsonrpc/v2.0/method-internal.json",
   "tests": [
     {
       "data": "rpc.",
diff --git a/test/other/jsonrpc/v2.0/method.test.json b/test/other/jsonrpc/v2.0/method.test.json
index 0074bb62..53250190 100644
--- a/test/other/jsonrpc/v2.0/method.test.json
+++ b/test/other/jsonrpc/v2.0/method.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/other/jsonrpc/v2.0/method.json",
+  "target": "../../../../schemas/other/jsonrpc/v2.0/method.json",
   "tests": [
     {
       "data": "subtract",
diff --git a/test/other/jsonrpc/v2.0/notification.test.json b/test/other/jsonrpc/v2.0/notification.test.json
index b51a720c..5d923cdc 100644
--- a/test/other/jsonrpc/v2.0/notification.test.json
+++ b/test/other/jsonrpc/v2.0/notification.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/other/jsonrpc/v2.0/notification.json",
+  "target": "../../../../schemas/other/jsonrpc/v2.0/notification.json",
   "tests": [
     {
       "data": {
diff --git a/test/other/jsonrpc/v2.0/parameters.test.json b/test/other/jsonrpc/v2.0/parameters.test.json
index 60be3a94..80de2f42 100644
--- a/test/other/jsonrpc/v2.0/parameters.test.json
+++ b/test/other/jsonrpc/v2.0/parameters.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/other/jsonrpc/v2.0/parameters.json",
+  "target": "../../../../schemas/other/jsonrpc/v2.0/parameters.json",
   "tests": [
     {
       "data": [],
diff --git a/test/other/jsonrpc/v2.0/request.test.json b/test/other/jsonrpc/v2.0/request.test.json
index 0427fe84..a004929d 100644
--- a/test/other/jsonrpc/v2.0/request.test.json
+++ b/test/other/jsonrpc/v2.0/request.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/other/jsonrpc/v2.0/request.json",
+  "target": "../../../../schemas/other/jsonrpc/v2.0/request.json",
   "tests": [
     {
       "data": {
diff --git a/test/other/jsonrpc/v2.0/response.test.json b/test/other/jsonrpc/v2.0/response.test.json
index 52e4c0f2..80c084e9 100644
--- a/test/other/jsonrpc/v2.0/response.test.json
+++ b/test/other/jsonrpc/v2.0/response.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/other/jsonrpc/v2.0/response.json",
+  "target": "../../../../schemas/other/jsonrpc/v2.0/response.json",
   "tests": [
     {
       "data": {
diff --git a/test/w3c/xmlschema/2001/any-uri.test.json b/test/w3c/xmlschema/2001/any-uri.test.json
index 7b331bb8..894b3e85 100644
--- a/test/w3c/xmlschema/2001/any-uri.test.json
+++ b/test/w3c/xmlschema/2001/any-uri.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/any-uri.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/any-uri.json",
   "tests": [
     {
       "description": "Valid - empty string",
diff --git a/test/w3c/xmlschema/2001/base64-binary.test.json b/test/w3c/xmlschema/2001/base64-binary.test.json
index 6a676916..1519b1df 100644
--- a/test/w3c/xmlschema/2001/base64-binary.test.json
+++ b/test/w3c/xmlschema/2001/base64-binary.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/base64-binary.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/base64-binary.json",
   "tests": [
     {
       "description": "Valid - empty string",
diff --git a/test/w3c/xmlschema/2001/boolean.test.json b/test/w3c/xmlschema/2001/boolean.test.json
index 9ef33b03..142addc7 100644
--- a/test/w3c/xmlschema/2001/boolean.test.json
+++ b/test/w3c/xmlschema/2001/boolean.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/boolean.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/boolean.json",
   "tests": [
     {
       "description": "Valid - true",
diff --git a/test/w3c/xmlschema/2001/byte.test.json b/test/w3c/xmlschema/2001/byte.test.json
index 0b0ca679..153ac798 100644
--- a/test/w3c/xmlschema/2001/byte.test.json
+++ b/test/w3c/xmlschema/2001/byte.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/byte.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/byte.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/w3c/xmlschema/2001/date-time.test.json b/test/w3c/xmlschema/2001/date-time.test.json
index d9ee03e4..11f700b1 100644
--- a/test/w3c/xmlschema/2001/date-time.test.json
+++ b/test/w3c/xmlschema/2001/date-time.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/date-time.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/date-time.json",
   "tests": [
     {
       "description": "Valid - basic datetime",
diff --git a/test/w3c/xmlschema/2001/date.test.json b/test/w3c/xmlschema/2001/date.test.json
index 60ae549f..fd76a4a3 100644
--- a/test/w3c/xmlschema/2001/date.test.json
+++ b/test/w3c/xmlschema/2001/date.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/date.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/date.json",
   "tests": [
     {
       "description": "Valid - basic date",
diff --git a/test/w3c/xmlschema/2001/decimal.test.json b/test/w3c/xmlschema/2001/decimal.test.json
index 254ea4aa..2b483f8d 100644
--- a/test/w3c/xmlschema/2001/decimal.test.json
+++ b/test/w3c/xmlschema/2001/decimal.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/decimal.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/decimal.json",
   "tests": [
     {
       "description": "Valid - positive integer",
diff --git a/test/w3c/xmlschema/2001/double.test.json b/test/w3c/xmlschema/2001/double.test.json
index 17b0a051..b1a78726 100644
--- a/test/w3c/xmlschema/2001/double.test.json
+++ b/test/w3c/xmlschema/2001/double.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/double.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/double.json",
   "tests": [
     {
       "description": "Valid - positive double",
diff --git a/test/w3c/xmlschema/2001/duration.test.json b/test/w3c/xmlschema/2001/duration.test.json
index 999b07ce..16a95c17 100644
--- a/test/w3c/xmlschema/2001/duration.test.json
+++ b/test/w3c/xmlschema/2001/duration.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/duration.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/duration.json",
   "tests": [
     {
       "description": "Valid - years only",
diff --git a/test/w3c/xmlschema/2001/entities.test.json b/test/w3c/xmlschema/2001/entities.test.json
index a8edd007..558a68d6 100644
--- a/test/w3c/xmlschema/2001/entities.test.json
+++ b/test/w3c/xmlschema/2001/entities.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/entities.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/entities.json",
   "tests": [
     {
       "description": "Valid - two entities",
diff --git a/test/w3c/xmlschema/2001/entity.test.json b/test/w3c/xmlschema/2001/entity.test.json
index 8ef7452a..50dad235 100644
--- a/test/w3c/xmlschema/2001/entity.test.json
+++ b/test/w3c/xmlschema/2001/entity.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/entity.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/entity.json",
   "tests": [
     {
       "description": "Valid - simple entity",
diff --git a/test/w3c/xmlschema/2001/float.test.json b/test/w3c/xmlschema/2001/float.test.json
index 47c017e7..d308f23e 100644
--- a/test/w3c/xmlschema/2001/float.test.json
+++ b/test/w3c/xmlschema/2001/float.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/float.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/float.json",
   "tests": [
     {
       "description": "Valid - positive float",
diff --git a/test/w3c/xmlschema/2001/g-day.test.json b/test/w3c/xmlschema/2001/g-day.test.json
index 44ead5ed..44cd236c 100644
--- a/test/w3c/xmlschema/2001/g-day.test.json
+++ b/test/w3c/xmlschema/2001/g-day.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/g-day.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/g-day.json",
   "tests": [
     {
       "description": "Valid - basic day",
diff --git a/test/w3c/xmlschema/2001/g-month-day.test.json b/test/w3c/xmlschema/2001/g-month-day.test.json
index 2f115fb2..fccc3190 100644
--- a/test/w3c/xmlschema/2001/g-month-day.test.json
+++ b/test/w3c/xmlschema/2001/g-month-day.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/g-month-day.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/g-month-day.json",
   "tests": [
     {
       "description": "Valid - basic month-day",
diff --git a/test/w3c/xmlschema/2001/g-month.test.json b/test/w3c/xmlschema/2001/g-month.test.json
index 5ec4b615..393d44d3 100644
--- a/test/w3c/xmlschema/2001/g-month.test.json
+++ b/test/w3c/xmlschema/2001/g-month.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/g-month.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/g-month.json",
   "tests": [
     {
       "description": "Valid - basic month",
diff --git a/test/w3c/xmlschema/2001/g-year-month.test.json b/test/w3c/xmlschema/2001/g-year-month.test.json
index 8acf3e01..12bcaa9d 100644
--- a/test/w3c/xmlschema/2001/g-year-month.test.json
+++ b/test/w3c/xmlschema/2001/g-year-month.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/g-year-month.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/g-year-month.json",
   "tests": [
     {
       "description": "Valid - basic year-month",
diff --git a/test/w3c/xmlschema/2001/g-year.test.json b/test/w3c/xmlschema/2001/g-year.test.json
index 9539bde0..30e3fc14 100644
--- a/test/w3c/xmlschema/2001/g-year.test.json
+++ b/test/w3c/xmlschema/2001/g-year.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/g-year.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/g-year.json",
   "tests": [
     {
       "description": "Valid - basic year",
diff --git a/test/w3c/xmlschema/2001/hex-binary.test.json b/test/w3c/xmlschema/2001/hex-binary.test.json
index 4d52a195..21f17e9d 100644
--- a/test/w3c/xmlschema/2001/hex-binary.test.json
+++ b/test/w3c/xmlschema/2001/hex-binary.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/hex-binary.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/hex-binary.json",
   "tests": [
     {
       "description": "Valid - empty string",
diff --git a/test/w3c/xmlschema/2001/id.test.json b/test/w3c/xmlschema/2001/id.test.json
index ea0708ef..b0cfb6dc 100644
--- a/test/w3c/xmlschema/2001/id.test.json
+++ b/test/w3c/xmlschema/2001/id.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/id.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/id.json",
   "tests": [
     {
       "description": "Valid - simple identifier",
diff --git a/test/w3c/xmlschema/2001/idref.test.json b/test/w3c/xmlschema/2001/idref.test.json
index c246a3eb..8911ecab 100644
--- a/test/w3c/xmlschema/2001/idref.test.json
+++ b/test/w3c/xmlschema/2001/idref.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/idref.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/idref.json",
   "tests": [
     {
       "description": "Valid - simple reference",
diff --git a/test/w3c/xmlschema/2001/idrefs.test.json b/test/w3c/xmlschema/2001/idrefs.test.json
index a3fb6662..a27f506f 100644
--- a/test/w3c/xmlschema/2001/idrefs.test.json
+++ b/test/w3c/xmlschema/2001/idrefs.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/idrefs.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/idrefs.json",
   "tests": [
     {
       "description": "Valid - two references",
diff --git a/test/w3c/xmlschema/2001/int.test.json b/test/w3c/xmlschema/2001/int.test.json
index c592a738..0930c439 100644
--- a/test/w3c/xmlschema/2001/int.test.json
+++ b/test/w3c/xmlschema/2001/int.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/int.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/int.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/w3c/xmlschema/2001/integer.test.json b/test/w3c/xmlschema/2001/integer.test.json
index c8d2ae4f..48a8717a 100644
--- a/test/w3c/xmlschema/2001/integer.test.json
+++ b/test/w3c/xmlschema/2001/integer.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/integer.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/integer.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/w3c/xmlschema/2001/language.test.json b/test/w3c/xmlschema/2001/language.test.json
index 267ea459..a1012dba 100644
--- a/test/w3c/xmlschema/2001/language.test.json
+++ b/test/w3c/xmlschema/2001/language.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/language.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/language.json",
   "tests": [
     {
       "description": "Valid - English",
diff --git a/test/w3c/xmlschema/2001/long.test.json b/test/w3c/xmlschema/2001/long.test.json
index a371aea2..6f6d957a 100644
--- a/test/w3c/xmlschema/2001/long.test.json
+++ b/test/w3c/xmlschema/2001/long.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/long.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/long.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/w3c/xmlschema/2001/name.test.json b/test/w3c/xmlschema/2001/name.test.json
index dabf88da..d1d66279 100644
--- a/test/w3c/xmlschema/2001/name.test.json
+++ b/test/w3c/xmlschema/2001/name.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/name.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/name.json",
   "tests": [
     {
       "description": "Valid - simple ASCII letters",
diff --git a/test/w3c/xmlschema/2001/ncname.test.json b/test/w3c/xmlschema/2001/ncname.test.json
index 3c1843ac..cf2acdaa 100644
--- a/test/w3c/xmlschema/2001/ncname.test.json
+++ b/test/w3c/xmlschema/2001/ncname.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/ncname.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/ncname.json",
   "tests": [
     {
       "description": "Valid - simple ASCII element name",
diff --git a/test/w3c/xmlschema/2001/negative-integer.test.json b/test/w3c/xmlschema/2001/negative-integer.test.json
index 6d7425fa..44954fc0 100644
--- a/test/w3c/xmlschema/2001/negative-integer.test.json
+++ b/test/w3c/xmlschema/2001/negative-integer.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/negative-integer.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/negative-integer.json",
   "tests": [
     {
       "description": "Valid - negative one",
diff --git a/test/w3c/xmlschema/2001/nmtoken.test.json b/test/w3c/xmlschema/2001/nmtoken.test.json
index e05caf91..464dd783 100644
--- a/test/w3c/xmlschema/2001/nmtoken.test.json
+++ b/test/w3c/xmlschema/2001/nmtoken.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/nmtoken.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/nmtoken.json",
   "tests": [
     {
       "description": "Valid - simple ASCII letters",
diff --git a/test/w3c/xmlschema/2001/nmtokens.test.json b/test/w3c/xmlschema/2001/nmtokens.test.json
index 1b054164..eab8d79f 100644
--- a/test/w3c/xmlschema/2001/nmtokens.test.json
+++ b/test/w3c/xmlschema/2001/nmtokens.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/nmtokens.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/nmtokens.json",
   "tests": [
     {
       "description": "Valid - two tokens",
diff --git a/test/w3c/xmlschema/2001/non-negative-integer.test.json b/test/w3c/xmlschema/2001/non-negative-integer.test.json
index e34028ff..1a6b1170 100644
--- a/test/w3c/xmlschema/2001/non-negative-integer.test.json
+++ b/test/w3c/xmlschema/2001/non-negative-integer.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/non-negative-integer.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/non-negative-integer.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/w3c/xmlschema/2001/non-positive-integer.test.json b/test/w3c/xmlschema/2001/non-positive-integer.test.json
index d57212fc..488522d8 100644
--- a/test/w3c/xmlschema/2001/non-positive-integer.test.json
+++ b/test/w3c/xmlschema/2001/non-positive-integer.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/non-positive-integer.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/non-positive-integer.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/w3c/xmlschema/2001/normalized-string.test.json b/test/w3c/xmlschema/2001/normalized-string.test.json
index c33ccae1..d3014ae8 100644
--- a/test/w3c/xmlschema/2001/normalized-string.test.json
+++ b/test/w3c/xmlschema/2001/normalized-string.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/normalized-string.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/normalized-string.json",
   "tests": [
     {
       "description": "Valid - empty string",
diff --git a/test/w3c/xmlschema/2001/notation.test.json b/test/w3c/xmlschema/2001/notation.test.json
index 2245c312..1f3f1838 100644
--- a/test/w3c/xmlschema/2001/notation.test.json
+++ b/test/w3c/xmlschema/2001/notation.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/notation.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/notation.json",
   "tests": [
     {
       "description": "Valid - simple unprefixed notation name",
diff --git a/test/w3c/xmlschema/2001/positive-integer.test.json b/test/w3c/xmlschema/2001/positive-integer.test.json
index fe579d19..ab9a1ba8 100644
--- a/test/w3c/xmlschema/2001/positive-integer.test.json
+++ b/test/w3c/xmlschema/2001/positive-integer.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/positive-integer.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/positive-integer.json",
   "tests": [
     {
       "description": "Valid - one",
diff --git a/test/w3c/xmlschema/2001/qname.test.json b/test/w3c/xmlschema/2001/qname.test.json
index d933a824..22694ccc 100644
--- a/test/w3c/xmlschema/2001/qname.test.json
+++ b/test/w3c/xmlschema/2001/qname.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/qname.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/qname.json",
   "tests": [
     {
       "description": "Valid - simple unprefixed ASCII",
diff --git a/test/w3c/xmlschema/2001/short.test.json b/test/w3c/xmlschema/2001/short.test.json
index d9574679..27f2a846 100644
--- a/test/w3c/xmlschema/2001/short.test.json
+++ b/test/w3c/xmlschema/2001/short.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/short.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/short.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/w3c/xmlschema/2001/string.test.json b/test/w3c/xmlschema/2001/string.test.json
index bd4761e1..1dcd8e5a 100644
--- a/test/w3c/xmlschema/2001/string.test.json
+++ b/test/w3c/xmlschema/2001/string.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/string.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/string.json",
   "tests": [
     {
       "description": "Valid - simple string",
diff --git a/test/w3c/xmlschema/2001/time.test.json b/test/w3c/xmlschema/2001/time.test.json
index 1afa5563..d4caa4a6 100644
--- a/test/w3c/xmlschema/2001/time.test.json
+++ b/test/w3c/xmlschema/2001/time.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/time.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/time.json",
   "tests": [
     {
       "description": "Valid - basic time",
diff --git a/test/w3c/xmlschema/2001/token.test.json b/test/w3c/xmlschema/2001/token.test.json
index 0bbb9977..0603689c 100644
--- a/test/w3c/xmlschema/2001/token.test.json
+++ b/test/w3c/xmlschema/2001/token.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/token.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/token.json",
   "tests": [
     {
       "description": "Valid - empty string",
diff --git a/test/w3c/xmlschema/2001/unsigned-byte.test.json b/test/w3c/xmlschema/2001/unsigned-byte.test.json
index 988a9138..14c97790 100644
--- a/test/w3c/xmlschema/2001/unsigned-byte.test.json
+++ b/test/w3c/xmlschema/2001/unsigned-byte.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/unsigned-byte.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/unsigned-byte.json",
   "tests": [
     {
       "description": "Valid - zero (minimum)",
diff --git a/test/w3c/xmlschema/2001/unsigned-int.test.json b/test/w3c/xmlschema/2001/unsigned-int.test.json
index ec979d0d..90e61731 100644
--- a/test/w3c/xmlschema/2001/unsigned-int.test.json
+++ b/test/w3c/xmlschema/2001/unsigned-int.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/unsigned-int.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/unsigned-int.json",
   "tests": [
     {
       "description": "Valid - zero (minimum)",
diff --git a/test/w3c/xmlschema/2001/unsigned-long.test.json b/test/w3c/xmlschema/2001/unsigned-long.test.json
index bdbedea1..1f445ff2 100644
--- a/test/w3c/xmlschema/2001/unsigned-long.test.json
+++ b/test/w3c/xmlschema/2001/unsigned-long.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/unsigned-long.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/unsigned-long.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/w3c/xmlschema/2001/unsigned-short.test.json b/test/w3c/xmlschema/2001/unsigned-short.test.json
index 6fade3e8..b19041d2 100644
--- a/test/w3c/xmlschema/2001/unsigned-short.test.json
+++ b/test/w3c/xmlschema/2001/unsigned-short.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/w3c/xmlschema/2001/unsigned-short.json",
+  "target": "../../../../schemas/w3c/xmlschema/2001/unsigned-short.json",
   "tests": [
     {
       "description": "Valid - zero (minimum)",
diff --git a/test/xbrl/dtr/type/2024-01-31/area-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/area-item-type.test.json
index 48ff840e..467c1ac5 100644
--- a/test/xbrl/dtr/type/2024-01-31/area-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/area-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/area-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/area-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/datetime-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/datetime-item-type.test.json
index 1fb70420..b3182129 100644
--- a/test/xbrl/dtr/type/2024-01-31/datetime-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/datetime-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/datetime-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/datetime-item-type.json",
   "tests": [
     {
       "description": "Valid - datetime with timezone",
diff --git a/test/xbrl/dtr/type/2024-01-31/domain-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/domain-item-type.test.json
index 3cc445d1..f38a8a8c 100644
--- a/test/xbrl/dtr/type/2024-01-31/domain-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/domain-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/domain-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/domain-item-type.json",
   "tests": [
     {
       "description": "Valid - empty string",
diff --git a/test/xbrl/dtr/type/2024-01-31/electric-charge-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/electric-charge-item-type.test.json
index 5aad05da..a516cfb2 100644
--- a/test/xbrl/dtr/type/2024-01-31/electric-charge-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/electric-charge-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/electric-charge-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/electric-charge-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/electric-current-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/electric-current-item-type.test.json
index 57f331e6..ce2740d2 100644
--- a/test/xbrl/dtr/type/2024-01-31/electric-current-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/electric-current-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/electric-current-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/electric-current-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/energy-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/energy-item-type.test.json
index 4351eb16..8d017ae1 100644
--- a/test/xbrl/dtr/type/2024-01-31/energy-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/energy-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/energy-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/energy-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/energy-per-monetary-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/energy-per-monetary-item-type.test.json
index 5d83a86c..eb11f58b 100644
--- a/test/xbrl/dtr/type/2024-01-31/energy-per-monetary-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/energy-per-monetary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/energy-per-monetary-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/energy-per-monetary-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/escaped-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/escaped-item-type.test.json
index 7aae1c46..50a6bb7d 100644
--- a/test/xbrl/dtr/type/2024-01-31/escaped-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/escaped-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/escaped-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/escaped-item-type.json",
   "tests": [
     {
       "description": "Valid - simple string",
diff --git a/test/xbrl/dtr/type/2024-01-31/flow-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/flow-item-type.test.json
index 838e5a11..df15974b 100644
--- a/test/xbrl/dtr/type/2024-01-31/flow-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/flow-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/flow-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/flow-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/force-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/force-item-type.test.json
index fee73eb6..09282808 100644
--- a/test/xbrl/dtr/type/2024-01-31/force-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/force-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/force-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/force-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/frequency-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/frequency-item-type.test.json
index a07c7217..b8e2db07 100644
--- a/test/xbrl/dtr/type/2024-01-31/frequency-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/frequency-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/frequency-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/frequency-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/ghg-emissions-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/ghg-emissions-item-type.test.json
index b93185de..d6f22045 100644
--- a/test/xbrl/dtr/type/2024-01-31/ghg-emissions-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/ghg-emissions-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/ghg-emissions-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/ghg-emissions-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/ghg-emissions-per-monetary-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/ghg-emissions-per-monetary-item-type.test.json
index a9d63328..fdd32f69 100644
--- a/test/xbrl/dtr/type/2024-01-31/ghg-emissions-per-monetary-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/ghg-emissions-per-monetary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/ghg-emissions-per-monetary-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/ghg-emissions-per-monetary-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/guidance-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/guidance-item-type.test.json
index a85d9fd9..252c5fc4 100644
--- a/test/xbrl/dtr/type/2024-01-31/guidance-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/guidance-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/guidance-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/guidance-item-type.json",
   "tests": [
     {
       "description": "Valid - simple string",
diff --git a/test/xbrl/dtr/type/2024-01-31/gyear-list-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/gyear-list-item-type.test.json
index 2fb91784..db09da7e 100644
--- a/test/xbrl/dtr/type/2024-01-31/gyear-list-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/gyear-list-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/gyear-list-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/gyear-list-item-type.json",
   "tests": [
     {
       "description": "Valid - single year",
diff --git a/test/xbrl/dtr/type/2024-01-31/insolation-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/insolation-item-type.test.json
index 1ea9ebb3..b2a68aba 100644
--- a/test/xbrl/dtr/type/2024-01-31/insolation-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/insolation-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/insolation-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/insolation-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/irradiance-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/irradiance-item-type.test.json
index ca6d90bb..40564d51 100644
--- a/test/xbrl/dtr/type/2024-01-31/irradiance-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/irradiance-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/irradiance-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/irradiance-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/length-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/length-item-type.test.json
index c6f2afcc..daf60dd9 100644
--- a/test/xbrl/dtr/type/2024-01-31/length-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/length-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/length-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/length-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/mass-flow-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/mass-flow-item-type.test.json
index ce09b39a..7ff7f37f 100644
--- a/test/xbrl/dtr/type/2024-01-31/mass-flow-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/mass-flow-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/mass-flow-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/mass-flow-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/mass-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/mass-item-type.test.json
index 894d0ad1..205092f9 100644
--- a/test/xbrl/dtr/type/2024-01-31/mass-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/mass-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/mass-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/mass-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/memory-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/memory-item-type.test.json
index 4430da25..b617fd6d 100644
--- a/test/xbrl/dtr/type/2024-01-31/memory-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/memory-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/memory-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/memory-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/monetary-per-area-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/monetary-per-area-item-type.test.json
index 7ea45f59..1ec27845 100644
--- a/test/xbrl/dtr/type/2024-01-31/monetary-per-area-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/monetary-per-area-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-area-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/monetary-per-area-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/monetary-per-duration-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/monetary-per-duration-item-type.test.json
index ab1030a3..c0d50043 100644
--- a/test/xbrl/dtr/type/2024-01-31/monetary-per-duration-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/monetary-per-duration-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-duration-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/monetary-per-duration-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/monetary-per-energy-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/monetary-per-energy-item-type.test.json
index d4b752df..5f5fbf4b 100644
--- a/test/xbrl/dtr/type/2024-01-31/monetary-per-energy-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/monetary-per-energy-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-energy-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/monetary-per-energy-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/monetary-per-length-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/monetary-per-length-item-type.test.json
index 178722b7..6e2a870e 100644
--- a/test/xbrl/dtr/type/2024-01-31/monetary-per-length-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/monetary-per-length-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-length-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/monetary-per-length-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/monetary-per-mass-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/monetary-per-mass-item-type.test.json
index 4c3399bd..0887f77d 100644
--- a/test/xbrl/dtr/type/2024-01-31/monetary-per-mass-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/monetary-per-mass-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-mass-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/monetary-per-mass-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/monetary-per-volume-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/monetary-per-volume-item-type.test.json
index a94a48ad..f37364db 100644
--- a/test/xbrl/dtr/type/2024-01-31/monetary-per-volume-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/monetary-per-volume-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/monetary-per-volume-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/monetary-per-volume-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/no-decimals-monetary-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/no-decimals-monetary-item-type.test.json
index 4a3cbaa6..7ddd0f37 100644
--- a/test/xbrl/dtr/type/2024-01-31/no-decimals-monetary-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/no-decimals-monetary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/no-decimals-monetary-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/no-decimals-monetary-item-type.json",
   "tests": [
     {
       "description": "Valid - positive integer monetary value",
diff --git a/test/xbrl/dtr/type/2024-01-31/no-lang-string-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/no-lang-string-item-type.test.json
index a7609ab0..e2167073 100644
--- a/test/xbrl/dtr/type/2024-01-31/no-lang-string-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/no-lang-string-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/no-lang-string-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/no-lang-string-item-type.json",
   "tests": [
     {
       "description": "Valid - simple string",
diff --git a/test/xbrl/dtr/type/2024-01-31/no-lang-token-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/no-lang-token-item-type.test.json
index 58130e45..3335dc4b 100644
--- a/test/xbrl/dtr/type/2024-01-31/no-lang-token-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/no-lang-token-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/no-lang-token-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/no-lang-token-item-type.json",
   "tests": [
     {
       "description": "Valid - simple token",
diff --git a/test/xbrl/dtr/type/2024-01-31/non-negative-monetary-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/non-negative-monetary-item-type.test.json
index 7c8ac788..f1f12bb0 100644
--- a/test/xbrl/dtr/type/2024-01-31/non-negative-monetary-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/non-negative-monetary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/non-negative-monetary-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/non-negative-monetary-item-type.json",
   "tests": [
     {
       "description": "Valid - positive monetary value",
diff --git a/test/xbrl/dtr/type/2024-01-31/non-negative-no-decimals-monetary-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/non-negative-no-decimals-monetary-item-type.test.json
index 26c0abc4..9d8ec6d6 100644
--- a/test/xbrl/dtr/type/2024-01-31/non-negative-no-decimals-monetary-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/non-negative-no-decimals-monetary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/non-negative-no-decimals-monetary-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/non-negative-no-decimals-monetary-item-type.json",
   "tests": [
     {
       "description": "Valid - positive integer monetary value",
diff --git a/test/xbrl/dtr/type/2024-01-31/per-share-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/per-share-item-type.test.json
index c98d850d..499edff3 100644
--- a/test/xbrl/dtr/type/2024-01-31/per-share-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/per-share-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/per-share-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/per-share-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/percent-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/percent-item-type.test.json
index 97989eb9..bb3c2c66 100644
--- a/test/xbrl/dtr/type/2024-01-31/percent-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/percent-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/percent-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/percent-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/plane-angle-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/plane-angle-item-type.test.json
index d4ea1777..71957afa 100644
--- a/test/xbrl/dtr/type/2024-01-31/plane-angle-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/plane-angle-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/plane-angle-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/plane-angle-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/power-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/power-item-type.test.json
index 8e6e57a7..3d3aa04b 100644
--- a/test/xbrl/dtr/type/2024-01-31/power-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/power-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/power-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/power-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/prefixed-content-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/prefixed-content-item-type.test.json
index 2152fcb7..b64dae88 100644
--- a/test/xbrl/dtr/type/2024-01-31/prefixed-content-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/prefixed-content-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/prefixed-content-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/prefixed-content-item-type.json",
   "tests": [
     {
       "description": "Valid - simple token",
diff --git a/test/xbrl/dtr/type/2024-01-31/pressure-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/pressure-item-type.test.json
index fe440d0a..785a06f4 100644
--- a/test/xbrl/dtr/type/2024-01-31/pressure-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/pressure-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/pressure-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/pressure-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/speed-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/speed-item-type.test.json
index b0624497..34e414a1 100644
--- a/test/xbrl/dtr/type/2024-01-31/speed-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/speed-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/speed-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/speed-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/sqname-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/sqname-item-type.test.json
index d30fdb10..9b21b4d2 100644
--- a/test/xbrl/dtr/type/2024-01-31/sqname-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/sqname-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/sqname-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/sqname-item-type.json",
   "tests": [
     {
       "description": "Valid - simple QName",
diff --git a/test/xbrl/dtr/type/2024-01-31/sqnames-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/sqnames-item-type.test.json
index ba9dd303..dabb6d9c 100644
--- a/test/xbrl/dtr/type/2024-01-31/sqnames-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/sqnames-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/sqnames-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/sqnames-item-type.json",
   "tests": [
     {
       "description": "Valid - single QName",
diff --git a/test/xbrl/dtr/type/2024-01-31/temperature-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/temperature-item-type.test.json
index 0fd8415f..a9cdd641 100644
--- a/test/xbrl/dtr/type/2024-01-31/temperature-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/temperature-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/temperature-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/temperature-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/text-block-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/text-block-item-type.test.json
index d356aa1c..55816b6d 100644
--- a/test/xbrl/dtr/type/2024-01-31/text-block-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/text-block-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/text-block-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/text-block-item-type.json",
   "tests": [
     {
       "description": "Valid - simple string",
diff --git a/test/xbrl/dtr/type/2024-01-31/voltage-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/voltage-item-type.test.json
index 1b8d5078..9ee915c0 100644
--- a/test/xbrl/dtr/type/2024-01-31/voltage-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/voltage-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/voltage-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/voltage-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/volume-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/volume-item-type.test.json
index 43efdfba..0cfd0e7c 100644
--- a/test/xbrl/dtr/type/2024-01-31/volume-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/volume-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/volume-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/volume-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/volume-per-monetary-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/volume-per-monetary-item-type.test.json
index 450360b9..9535bbae 100644
--- a/test/xbrl/dtr/type/2024-01-31/volume-per-monetary-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/volume-per-monetary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/volume-per-monetary-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/volume-per-monetary-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/weight-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/weight-item-type.test.json
index 1cc66103..e342375a 100644
--- a/test/xbrl/dtr/type/2024-01-31/weight-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/weight-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/weight-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/weight-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/dtr/type/2024-01-31/xml-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/xml-item-type.test.json
index c6100675..09d38931 100644
--- a/test/xbrl/dtr/type/2024-01-31/xml-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/xml-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/xml-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/xml-item-type.json",
   "tests": [
     {
       "description": "Valid - simple string",
diff --git a/test/xbrl/dtr/type/2024-01-31/xml-nodes-item-type.test.json b/test/xbrl/dtr/type/2024-01-31/xml-nodes-item-type.test.json
index 86560259..d24bfb73 100644
--- a/test/xbrl/dtr/type/2024-01-31/xml-nodes-item-type.test.json
+++ b/test/xbrl/dtr/type/2024-01-31/xml-nodes-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../../schemas/2020-12/xbrl/dtr/type/2024-01-31/xml-nodes-item-type.json",
+  "target": "../../../../../schemas/xbrl/dtr/type/2024-01-31/xml-nodes-item-type.json",
   "tests": [
     {
       "description": "Valid - simple string",
diff --git a/test/xbrl/instance/2003/any-uri-item-type.test.json b/test/xbrl/instance/2003/any-uri-item-type.test.json
index 04dd898a..baeb6937 100644
--- a/test/xbrl/instance/2003/any-uri-item-type.test.json
+++ b/test/xbrl/instance/2003/any-uri-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/any-uri-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/any-uri-item-type.json",
   "tests": [
     {
       "description": "Valid - http URL",
diff --git a/test/xbrl/instance/2003/base64-binary-item-type.test.json b/test/xbrl/instance/2003/base64-binary-item-type.test.json
index 116e72fa..cd2c6459 100644
--- a/test/xbrl/instance/2003/base64-binary-item-type.test.json
+++ b/test/xbrl/instance/2003/base64-binary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/base64-binary-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/base64-binary-item-type.json",
   "tests": [
     {
       "description": "Valid - base64 encoded string",
diff --git a/test/xbrl/instance/2003/boolean-item-type.test.json b/test/xbrl/instance/2003/boolean-item-type.test.json
index 18e88941..600684b2 100644
--- a/test/xbrl/instance/2003/boolean-item-type.test.json
+++ b/test/xbrl/instance/2003/boolean-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/boolean-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/boolean-item-type.json",
   "tests": [
     {
       "description": "Valid - true",
diff --git a/test/xbrl/instance/2003/byte-item-type.test.json b/test/xbrl/instance/2003/byte-item-type.test.json
index 40de81b9..980daad6 100644
--- a/test/xbrl/instance/2003/byte-item-type.test.json
+++ b/test/xbrl/instance/2003/byte-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/byte-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/byte-item-type.json",
   "tests": [
     {
       "description": "Valid - positive byte",
diff --git a/test/xbrl/instance/2003/date-item-type.test.json b/test/xbrl/instance/2003/date-item-type.test.json
index 7647b95f..7164ba52 100644
--- a/test/xbrl/instance/2003/date-item-type.test.json
+++ b/test/xbrl/instance/2003/date-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/date-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/date-item-type.json",
   "tests": [
     {
       "description": "Valid - basic date",
diff --git a/test/xbrl/instance/2003/date-time-item-type.test.json b/test/xbrl/instance/2003/date-time-item-type.test.json
index 1069d391..70e964e8 100644
--- a/test/xbrl/instance/2003/date-time-item-type.test.json
+++ b/test/xbrl/instance/2003/date-time-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/date-time-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/date-time-item-type.json",
   "tests": [
     {
       "description": "Valid - date format",
diff --git a/test/xbrl/instance/2003/decimal-item-type.test.json b/test/xbrl/instance/2003/decimal-item-type.test.json
index 7df3ab21..47ab38c2 100644
--- a/test/xbrl/instance/2003/decimal-item-type.test.json
+++ b/test/xbrl/instance/2003/decimal-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/decimal-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/decimal-item-type.json",
   "tests": [
     {
       "description": "Valid - positive decimal",
diff --git a/test/xbrl/instance/2003/double-item-type.test.json b/test/xbrl/instance/2003/double-item-type.test.json
index c5e2a351..218f8d2d 100644
--- a/test/xbrl/instance/2003/double-item-type.test.json
+++ b/test/xbrl/instance/2003/double-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/double-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/double-item-type.json",
   "tests": [
     {
       "description": "Valid - positive double",
diff --git a/test/xbrl/instance/2003/duration-item-type.test.json b/test/xbrl/instance/2003/duration-item-type.test.json
index 41fdcdb4..93cb3042 100644
--- a/test/xbrl/instance/2003/duration-item-type.test.json
+++ b/test/xbrl/instance/2003/duration-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/duration-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/duration-item-type.json",
   "tests": [
     {
       "description": "Valid - duration in days",
diff --git a/test/xbrl/instance/2003/float-item-type.test.json b/test/xbrl/instance/2003/float-item-type.test.json
index e1433c45..53818fc7 100644
--- a/test/xbrl/instance/2003/float-item-type.test.json
+++ b/test/xbrl/instance/2003/float-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/float-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/float-item-type.json",
   "tests": [
     {
       "description": "Valid - positive float",
diff --git a/test/xbrl/instance/2003/fraction-item-type.test.json b/test/xbrl/instance/2003/fraction-item-type.test.json
index 897a759d..9b2ede4d 100644
--- a/test/xbrl/instance/2003/fraction-item-type.test.json
+++ b/test/xbrl/instance/2003/fraction-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/fraction-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/fraction-item-type.json",
   "tests": [
     {
       "description": "Valid - positive numerator and positive denominator",
diff --git a/test/xbrl/instance/2003/g-day-item-type.test.json b/test/xbrl/instance/2003/g-day-item-type.test.json
index 35d277f4..3db1f7ab 100644
--- a/test/xbrl/instance/2003/g-day-item-type.test.json
+++ b/test/xbrl/instance/2003/g-day-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/g-day-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/g-day-item-type.json",
   "tests": [
     {
       "description": "Valid - basic day",
diff --git a/test/xbrl/instance/2003/g-month-day-item-type.test.json b/test/xbrl/instance/2003/g-month-day-item-type.test.json
index 765c4a1b..e20a3999 100644
--- a/test/xbrl/instance/2003/g-month-day-item-type.test.json
+++ b/test/xbrl/instance/2003/g-month-day-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/g-month-day-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/g-month-day-item-type.json",
   "tests": [
     {
       "description": "Valid - basic month-day",
diff --git a/test/xbrl/instance/2003/g-month-item-type.test.json b/test/xbrl/instance/2003/g-month-item-type.test.json
index 64993b8b..b391bec2 100644
--- a/test/xbrl/instance/2003/g-month-item-type.test.json
+++ b/test/xbrl/instance/2003/g-month-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/g-month-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/g-month-item-type.json",
   "tests": [
     {
       "description": "Valid - basic month",
diff --git a/test/xbrl/instance/2003/g-year-item-type.test.json b/test/xbrl/instance/2003/g-year-item-type.test.json
index 0e82c657..aed89b51 100644
--- a/test/xbrl/instance/2003/g-year-item-type.test.json
+++ b/test/xbrl/instance/2003/g-year-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/g-year-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/g-year-item-type.json",
   "tests": [
     {
       "description": "Valid - basic year",
diff --git a/test/xbrl/instance/2003/g-year-month-item-type.test.json b/test/xbrl/instance/2003/g-year-month-item-type.test.json
index 35741441..1f8f9ca6 100644
--- a/test/xbrl/instance/2003/g-year-month-item-type.test.json
+++ b/test/xbrl/instance/2003/g-year-month-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/g-year-month-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/g-year-month-item-type.json",
   "tests": [
     {
       "description": "Valid - basic year-month",
diff --git a/test/xbrl/instance/2003/hex-binary-item-type.test.json b/test/xbrl/instance/2003/hex-binary-item-type.test.json
index af3233ea..58d52261 100644
--- a/test/xbrl/instance/2003/hex-binary-item-type.test.json
+++ b/test/xbrl/instance/2003/hex-binary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/hex-binary-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/hex-binary-item-type.json",
   "tests": [
     {
       "description": "Valid - hex binary",
diff --git a/test/xbrl/instance/2003/int-item-type.test.json b/test/xbrl/instance/2003/int-item-type.test.json
index 1531f8e4..afb15421 100644
--- a/test/xbrl/instance/2003/int-item-type.test.json
+++ b/test/xbrl/instance/2003/int-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/int-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/int-item-type.json",
   "tests": [
     {
       "description": "Valid - positive int",
diff --git a/test/xbrl/instance/2003/integer-item-type.test.json b/test/xbrl/instance/2003/integer-item-type.test.json
index ddf947cb..cce8e24f 100644
--- a/test/xbrl/instance/2003/integer-item-type.test.json
+++ b/test/xbrl/instance/2003/integer-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/integer-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/integer-item-type.json",
   "tests": [
     {
       "description": "Valid - positive integer",
diff --git a/test/xbrl/instance/2003/language-item-type.test.json b/test/xbrl/instance/2003/language-item-type.test.json
index 6b6e9480..9c745ad9 100644
--- a/test/xbrl/instance/2003/language-item-type.test.json
+++ b/test/xbrl/instance/2003/language-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/language-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/language-item-type.json",
   "tests": [
     {
       "description": "Valid - simple language code",
diff --git a/test/xbrl/instance/2003/long-item-type.test.json b/test/xbrl/instance/2003/long-item-type.test.json
index 7feba501..d97f5252 100644
--- a/test/xbrl/instance/2003/long-item-type.test.json
+++ b/test/xbrl/instance/2003/long-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/long-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/long-item-type.json",
   "tests": [
     {
       "description": "Valid - positive long",
diff --git a/test/xbrl/instance/2003/monetary-item-type.test.json b/test/xbrl/instance/2003/monetary-item-type.test.json
index b2060ba8..e661a16b 100644
--- a/test/xbrl/instance/2003/monetary-item-type.test.json
+++ b/test/xbrl/instance/2003/monetary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/monetary-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/monetary-item-type.json",
   "tests": [
     {
       "description": "Valid - positive monetary value in USD",
diff --git a/test/xbrl/instance/2003/name-item-type.test.json b/test/xbrl/instance/2003/name-item-type.test.json
index 660f7ba4..c40c24ea 100644
--- a/test/xbrl/instance/2003/name-item-type.test.json
+++ b/test/xbrl/instance/2003/name-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/name-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/name-item-type.json",
   "tests": [
     {
       "description": "Valid - simple name",
diff --git a/test/xbrl/instance/2003/ncname-item-type.test.json b/test/xbrl/instance/2003/ncname-item-type.test.json
index 303247bd..e9998bd4 100644
--- a/test/xbrl/instance/2003/ncname-item-type.test.json
+++ b/test/xbrl/instance/2003/ncname-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/ncname-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/ncname-item-type.json",
   "tests": [
     {
       "description": "Valid - simple NCName",
diff --git a/test/xbrl/instance/2003/negative-integer-item-type.test.json b/test/xbrl/instance/2003/negative-integer-item-type.test.json
index 7bbc89e9..ff7fc4c8 100644
--- a/test/xbrl/instance/2003/negative-integer-item-type.test.json
+++ b/test/xbrl/instance/2003/negative-integer-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/negative-integer-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/negative-integer-item-type.json",
   "tests": [
     {
       "description": "Valid - negative integer",
diff --git a/test/xbrl/instance/2003/non-negative-integer-item-type.test.json b/test/xbrl/instance/2003/non-negative-integer-item-type.test.json
index 8cb46f69..3a4a20a4 100644
--- a/test/xbrl/instance/2003/non-negative-integer-item-type.test.json
+++ b/test/xbrl/instance/2003/non-negative-integer-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/non-negative-integer-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/non-negative-integer-item-type.json",
   "tests": [
     {
       "description": "Valid - positive integer",
diff --git a/test/xbrl/instance/2003/non-positive-integer-item-type.test.json b/test/xbrl/instance/2003/non-positive-integer-item-type.test.json
index eb46558c..31bf808c 100644
--- a/test/xbrl/instance/2003/non-positive-integer-item-type.test.json
+++ b/test/xbrl/instance/2003/non-positive-integer-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/non-positive-integer-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/non-positive-integer-item-type.json",
   "tests": [
     {
       "description": "Valid - negative integer",
diff --git a/test/xbrl/instance/2003/normalized-string-item-type.test.json b/test/xbrl/instance/2003/normalized-string-item-type.test.json
index 373fd2c1..2a50ac04 100644
--- a/test/xbrl/instance/2003/normalized-string-item-type.test.json
+++ b/test/xbrl/instance/2003/normalized-string-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/normalized-string-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/normalized-string-item-type.json",
   "tests": [
     {
       "description": "Valid - simple string",
diff --git a/test/xbrl/instance/2003/positive-integer-item-type.test.json b/test/xbrl/instance/2003/positive-integer-item-type.test.json
index f2c26660..72eb1262 100644
--- a/test/xbrl/instance/2003/positive-integer-item-type.test.json
+++ b/test/xbrl/instance/2003/positive-integer-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/positive-integer-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/positive-integer-item-type.json",
   "tests": [
     {
       "description": "Valid - positive integer",
diff --git a/test/xbrl/instance/2003/pure-item-type.test.json b/test/xbrl/instance/2003/pure-item-type.test.json
index bb987440..0f563581 100644
--- a/test/xbrl/instance/2003/pure-item-type.test.json
+++ b/test/xbrl/instance/2003/pure-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/pure-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/pure-item-type.json",
   "tests": [
     {
       "description": "Valid - pure number as decimal",
diff --git a/test/xbrl/instance/2003/qname-item-type.test.json b/test/xbrl/instance/2003/qname-item-type.test.json
index 427a9560..0ca445c3 100644
--- a/test/xbrl/instance/2003/qname-item-type.test.json
+++ b/test/xbrl/instance/2003/qname-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/qname-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/qname-item-type.json",
   "tests": [
     {
       "description": "Valid - prefixed QName",
diff --git a/test/xbrl/instance/2003/shares-item-type.test.json b/test/xbrl/instance/2003/shares-item-type.test.json
index 8d698706..1c04c4d2 100644
--- a/test/xbrl/instance/2003/shares-item-type.test.json
+++ b/test/xbrl/instance/2003/shares-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/shares-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/shares-item-type.json",
   "tests": [
     {
       "description": "Valid - whole shares",
diff --git a/test/xbrl/instance/2003/short-item-type.test.json b/test/xbrl/instance/2003/short-item-type.test.json
index 97e85394..0788a2fe 100644
--- a/test/xbrl/instance/2003/short-item-type.test.json
+++ b/test/xbrl/instance/2003/short-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/short-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/short-item-type.json",
   "tests": [
     {
       "description": "Valid - positive short",
diff --git a/test/xbrl/instance/2003/string-item-type.test.json b/test/xbrl/instance/2003/string-item-type.test.json
index c6556c0c..fb817a93 100644
--- a/test/xbrl/instance/2003/string-item-type.test.json
+++ b/test/xbrl/instance/2003/string-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/string-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/string-item-type.json",
   "tests": [
     {
       "description": "Valid - simple string",
diff --git a/test/xbrl/instance/2003/time-item-type.test.json b/test/xbrl/instance/2003/time-item-type.test.json
index 38644803..64cc3633 100644
--- a/test/xbrl/instance/2003/time-item-type.test.json
+++ b/test/xbrl/instance/2003/time-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/time-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/time-item-type.json",
   "tests": [
     {
       "description": "Valid - time with seconds",
diff --git a/test/xbrl/instance/2003/token-item-type.test.json b/test/xbrl/instance/2003/token-item-type.test.json
index b663f852..01196142 100644
--- a/test/xbrl/instance/2003/token-item-type.test.json
+++ b/test/xbrl/instance/2003/token-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/token-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/token-item-type.json",
   "tests": [
     {
       "description": "Valid - simple token",
diff --git a/test/xbrl/instance/2003/unsigned-byte-item-type.test.json b/test/xbrl/instance/2003/unsigned-byte-item-type.test.json
index 9abfaf79..96e8ea0a 100644
--- a/test/xbrl/instance/2003/unsigned-byte-item-type.test.json
+++ b/test/xbrl/instance/2003/unsigned-byte-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/unsigned-byte-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/unsigned-byte-item-type.json",
   "tests": [
     {
       "description": "Valid - positive unsigned byte",
diff --git a/test/xbrl/instance/2003/unsigned-int-item-type.test.json b/test/xbrl/instance/2003/unsigned-int-item-type.test.json
index 746c962a..beac235f 100644
--- a/test/xbrl/instance/2003/unsigned-int-item-type.test.json
+++ b/test/xbrl/instance/2003/unsigned-int-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/unsigned-int-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/unsigned-int-item-type.json",
   "tests": [
     {
       "description": "Valid - positive unsigned int",
diff --git a/test/xbrl/instance/2003/unsigned-long-item-type.test.json b/test/xbrl/instance/2003/unsigned-long-item-type.test.json
index ce4c11ce..314eca98 100644
--- a/test/xbrl/instance/2003/unsigned-long-item-type.test.json
+++ b/test/xbrl/instance/2003/unsigned-long-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/unsigned-long-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/unsigned-long-item-type.json",
   "tests": [
     {
       "description": "Valid - positive unsigned long",
diff --git a/test/xbrl/instance/2003/unsigned-short-item-type.test.json b/test/xbrl/instance/2003/unsigned-short-item-type.test.json
index 8230bca9..52d5f79a 100644
--- a/test/xbrl/instance/2003/unsigned-short-item-type.test.json
+++ b/test/xbrl/instance/2003/unsigned-short-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../../schemas/2020-12/xbrl/instance/2003/unsigned-short-item-type.json",
+  "target": "../../../../schemas/xbrl/instance/2003/unsigned-short-item-type.json",
   "tests": [
     {
       "description": "Valid - positive unsigned short",
diff --git a/test/xbrl/utr/area-item-type-normative.test.json b/test/xbrl/utr/area-item-type-normative.test.json
index a67216d1..ee5b5dad 100644
--- a/test/xbrl/utr/area-item-type-normative.test.json
+++ b/test/xbrl/utr/area-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/area-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/area-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - acre (REC)",
diff --git a/test/xbrl/utr/area-item-type.test.json b/test/xbrl/utr/area-item-type.test.json
index 55a0e7b5..a138aee9 100644
--- a/test/xbrl/utr/area-item-type.test.json
+++ b/test/xbrl/utr/area-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/area-item-type.json",
+  "target": "../../../schemas/xbrl/utr/area-item-type.json",
   "tests": [
     {
       "description": "Valid - acre",
diff --git a/test/xbrl/utr/duration-item-type-normative.test.json b/test/xbrl/utr/duration-item-type-normative.test.json
index 19ff2b1d..456cec17 100644
--- a/test/xbrl/utr/duration-item-type-normative.test.json
+++ b/test/xbrl/utr/duration-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/duration-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/duration-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Y (REC)",
diff --git a/test/xbrl/utr/duration-item-type.test.json b/test/xbrl/utr/duration-item-type.test.json
index e20bd451..603c1f09 100644
--- a/test/xbrl/utr/duration-item-type.test.json
+++ b/test/xbrl/utr/duration-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/duration-item-type.json",
+  "target": "../../../schemas/xbrl/utr/duration-item-type.json",
   "tests": [
     {
       "description": "Valid - Y",
diff --git a/test/xbrl/utr/electric-charge-item-type-normative.test.json b/test/xbrl/utr/electric-charge-item-type-normative.test.json
index 1ccbc6bf..d32a90dc 100644
--- a/test/xbrl/utr/electric-charge-item-type-normative.test.json
+++ b/test/xbrl/utr/electric-charge-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/electric-charge-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/electric-charge-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Ah (REC)",
diff --git a/test/xbrl/utr/electric-charge-item-type.test.json b/test/xbrl/utr/electric-charge-item-type.test.json
index 4dee3d1c..f95155f7 100644
--- a/test/xbrl/utr/electric-charge-item-type.test.json
+++ b/test/xbrl/utr/electric-charge-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/electric-charge-item-type.json",
+  "target": "../../../schemas/xbrl/utr/electric-charge-item-type.json",
   "tests": [
     {
       "description": "Valid - Ah",
diff --git a/test/xbrl/utr/electric-current-item-type-normative.test.json b/test/xbrl/utr/electric-current-item-type-normative.test.json
index 995d4644..e095080c 100644
--- a/test/xbrl/utr/electric-current-item-type-normative.test.json
+++ b/test/xbrl/utr/electric-current-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/electric-current-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/electric-current-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - A (REC)",
diff --git a/test/xbrl/utr/electric-current-item-type.test.json b/test/xbrl/utr/electric-current-item-type.test.json
index 979785d0..df4a027b 100644
--- a/test/xbrl/utr/electric-current-item-type.test.json
+++ b/test/xbrl/utr/electric-current-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/electric-current-item-type.json",
+  "target": "../../../schemas/xbrl/utr/electric-current-item-type.json",
   "tests": [
     {
       "description": "Valid - A",
diff --git a/test/xbrl/utr/energy-item-type-normative.test.json b/test/xbrl/utr/energy-item-type-normative.test.json
index 0a76d57d..67bf4f84 100644
--- a/test/xbrl/utr/energy-item-type-normative.test.json
+++ b/test/xbrl/utr/energy-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/energy-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/energy-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Boe (REC)",
diff --git a/test/xbrl/utr/energy-item-type.test.json b/test/xbrl/utr/energy-item-type.test.json
index 8089cffa..15b8f9f6 100644
--- a/test/xbrl/utr/energy-item-type.test.json
+++ b/test/xbrl/utr/energy-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/energy-item-type.json",
+  "target": "../../../schemas/xbrl/utr/energy-item-type.json",
   "tests": [
     {
       "description": "Valid - Boe",
diff --git a/test/xbrl/utr/energy-per-monetary-item-type-normative.test.json b/test/xbrl/utr/energy-per-monetary-item-type-normative.test.json
index 6b4609bb..64ddea8d 100644
--- a/test/xbrl/utr/energy-per-monetary-item-type-normative.test.json
+++ b/test/xbrl/utr/energy-per-monetary-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/energy-per-monetary-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/energy-per-monetary-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Energy_per_Monetary (REC)",
diff --git a/test/xbrl/utr/energy-per-monetary-item-type.test.json b/test/xbrl/utr/energy-per-monetary-item-type.test.json
index 7a713704..974b0bad 100644
--- a/test/xbrl/utr/energy-per-monetary-item-type.test.json
+++ b/test/xbrl/utr/energy-per-monetary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/energy-per-monetary-item-type.json",
+  "target": "../../../schemas/xbrl/utr/energy-per-monetary-item-type.json",
   "tests": [
     {
       "description": "Valid - Energy_per_Monetary",
diff --git a/test/xbrl/utr/flow-item-type-normative.test.json b/test/xbrl/utr/flow-item-type-normative.test.json
index 98c63675..fcf0794e 100644
--- a/test/xbrl/utr/flow-item-type-normative.test.json
+++ b/test/xbrl/utr/flow-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/flow-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/flow-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Volume_per_Duration (REC)",
diff --git a/test/xbrl/utr/flow-item-type.test.json b/test/xbrl/utr/flow-item-type.test.json
index a9ca733f..7aef8a1f 100644
--- a/test/xbrl/utr/flow-item-type.test.json
+++ b/test/xbrl/utr/flow-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/flow-item-type.json",
+  "target": "../../../schemas/xbrl/utr/flow-item-type.json",
   "tests": [
     {
       "description": "Valid - Volume_per_Duration (REC)",
diff --git a/test/xbrl/utr/force-item-type-normative.test.json b/test/xbrl/utr/force-item-type-normative.test.json
index e9c71111..be929acd 100644
--- a/test/xbrl/utr/force-item-type-normative.test.json
+++ b/test/xbrl/utr/force-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/force-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/force-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - N (REC)",
diff --git a/test/xbrl/utr/force-item-type.test.json b/test/xbrl/utr/force-item-type.test.json
index 76e6e39d..5fd9739c 100644
--- a/test/xbrl/utr/force-item-type.test.json
+++ b/test/xbrl/utr/force-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/force-item-type.json",
+  "target": "../../../schemas/xbrl/utr/force-item-type.json",
   "tests": [
     {
       "description": "Valid - N",
diff --git a/test/xbrl/utr/frequency-item-type-normative.test.json b/test/xbrl/utr/frequency-item-type-normative.test.json
index ef95bdbb..e79e350a 100644
--- a/test/xbrl/utr/frequency-item-type-normative.test.json
+++ b/test/xbrl/utr/frequency-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/frequency-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/frequency-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Hz (REC)",
diff --git a/test/xbrl/utr/frequency-item-type.test.json b/test/xbrl/utr/frequency-item-type.test.json
index 9962f7bf..f56adf55 100644
--- a/test/xbrl/utr/frequency-item-type.test.json
+++ b/test/xbrl/utr/frequency-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/frequency-item-type.json",
+  "target": "../../../schemas/xbrl/utr/frequency-item-type.json",
   "tests": [
     {
       "description": "Valid - Hz",
diff --git a/test/xbrl/utr/ghg-emissions-item-type-normative.test.json b/test/xbrl/utr/ghg-emissions-item-type-normative.test.json
index ff5982ba..c6ae81f2 100644
--- a/test/xbrl/utr/ghg-emissions-item-type-normative.test.json
+++ b/test/xbrl/utr/ghg-emissions-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/ghg-emissions-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/ghg-emissions-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - tCO2e (REC)",
diff --git a/test/xbrl/utr/ghg-emissions-item-type.test.json b/test/xbrl/utr/ghg-emissions-item-type.test.json
index a1575cfd..6a259634 100644
--- a/test/xbrl/utr/ghg-emissions-item-type.test.json
+++ b/test/xbrl/utr/ghg-emissions-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/ghg-emissions-item-type.json",
+  "target": "../../../schemas/xbrl/utr/ghg-emissions-item-type.json",
   "tests": [
     {
       "description": "Valid - tCO2e",
diff --git a/test/xbrl/utr/ghg-emissions-per-monetary-item-type-normative.test.json b/test/xbrl/utr/ghg-emissions-per-monetary-item-type-normative.test.json
index 01a1a7bd..071d011f 100644
--- a/test/xbrl/utr/ghg-emissions-per-monetary-item-type-normative.test.json
+++ b/test/xbrl/utr/ghg-emissions-per-monetary-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/ghg-emissions-per-monetary-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/ghg-emissions-per-monetary-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Emissions_per_Monetary (REC)",
diff --git a/test/xbrl/utr/ghg-emissions-per-monetary-item-type.test.json b/test/xbrl/utr/ghg-emissions-per-monetary-item-type.test.json
index e64fb6e2..ca2de8f2 100644
--- a/test/xbrl/utr/ghg-emissions-per-monetary-item-type.test.json
+++ b/test/xbrl/utr/ghg-emissions-per-monetary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/ghg-emissions-per-monetary-item-type.json",
+  "target": "../../../schemas/xbrl/utr/ghg-emissions-per-monetary-item-type.json",
   "tests": [
     {
       "description": "Valid - Emissions_per_Monetary",
diff --git a/test/xbrl/utr/length-item-type-normative.test.json b/test/xbrl/utr/length-item-type-normative.test.json
index 124fae42..09aeddbe 100644
--- a/test/xbrl/utr/length-item-type-normative.test.json
+++ b/test/xbrl/utr/length-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/length-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/length-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - ft (REC)",
diff --git a/test/xbrl/utr/length-item-type.test.json b/test/xbrl/utr/length-item-type.test.json
index c484c88a..825d3bd4 100644
--- a/test/xbrl/utr/length-item-type.test.json
+++ b/test/xbrl/utr/length-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/length-item-type.json",
+  "target": "../../../schemas/xbrl/utr/length-item-type.json",
   "tests": [
     {
       "description": "Valid - ft",
diff --git a/test/xbrl/utr/mass-item-type-normative.test.json b/test/xbrl/utr/mass-item-type-normative.test.json
index c45d460b..c353a8e7 100644
--- a/test/xbrl/utr/mass-item-type-normative.test.json
+++ b/test/xbrl/utr/mass-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/mass-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/mass-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - lb (REC)",
diff --git a/test/xbrl/utr/mass-item-type.test.json b/test/xbrl/utr/mass-item-type.test.json
index 8c4ad9d1..487ceb2f 100644
--- a/test/xbrl/utr/mass-item-type.test.json
+++ b/test/xbrl/utr/mass-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/mass-item-type.json",
+  "target": "../../../schemas/xbrl/utr/mass-item-type.json",
   "tests": [
     {
       "description": "Valid - lb",
diff --git a/test/xbrl/utr/memory-item-type-normative.test.json b/test/xbrl/utr/memory-item-type-normative.test.json
index a65944b9..6d30416b 100644
--- a/test/xbrl/utr/memory-item-type-normative.test.json
+++ b/test/xbrl/utr/memory-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/memory-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/memory-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - B (REC)",
diff --git a/test/xbrl/utr/memory-item-type.test.json b/test/xbrl/utr/memory-item-type.test.json
index f8321c71..e0e8bc5e 100644
--- a/test/xbrl/utr/memory-item-type.test.json
+++ b/test/xbrl/utr/memory-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/memory-item-type.json",
+  "target": "../../../schemas/xbrl/utr/memory-item-type.json",
   "tests": [
     {
       "description": "Valid - B",
diff --git a/test/xbrl/utr/monetary-item-type-normative.test.json b/test/xbrl/utr/monetary-item-type-normative.test.json
index 962f27c8..327a7643 100644
--- a/test/xbrl/utr/monetary-item-type-normative.test.json
+++ b/test/xbrl/utr/monetary-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/monetary-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/monetary-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - USD (REC)",
diff --git a/test/xbrl/utr/monetary-item-type.test.json b/test/xbrl/utr/monetary-item-type.test.json
index 4f32dfbe..fb22acf6 100644
--- a/test/xbrl/utr/monetary-item-type.test.json
+++ b/test/xbrl/utr/monetary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/monetary-item-type.json",
+  "target": "../../../schemas/xbrl/utr/monetary-item-type.json",
   "tests": [
     {
       "description": "Valid - USD",
diff --git a/test/xbrl/utr/per-share-item-type-normative.test.json b/test/xbrl/utr/per-share-item-type-normative.test.json
index 55756edc..a8664d9f 100644
--- a/test/xbrl/utr/per-share-item-type-normative.test.json
+++ b/test/xbrl/utr/per-share-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/per-share-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/per-share-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Monetary_per_Share (REC)",
diff --git a/test/xbrl/utr/per-share-item-type.test.json b/test/xbrl/utr/per-share-item-type.test.json
index 630bc001..3b221dac 100644
--- a/test/xbrl/utr/per-share-item-type.test.json
+++ b/test/xbrl/utr/per-share-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/per-share-item-type.json",
+  "target": "../../../schemas/xbrl/utr/per-share-item-type.json",
   "tests": [
     {
       "description": "Valid - Monetary_per_Share",
diff --git a/test/xbrl/utr/per-unit-item-type-normative.test.json b/test/xbrl/utr/per-unit-item-type-normative.test.json
index cf9ac34d..0830a276 100644
--- a/test/xbrl/utr/per-unit-item-type-normative.test.json
+++ b/test/xbrl/utr/per-unit-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/per-unit-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/per-unit-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Monetary_per_Decimal (REC)",
diff --git a/test/xbrl/utr/per-unit-item-type.test.json b/test/xbrl/utr/per-unit-item-type.test.json
index 7195f337..ee8b7c78 100644
--- a/test/xbrl/utr/per-unit-item-type.test.json
+++ b/test/xbrl/utr/per-unit-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/per-unit-item-type.json",
+  "target": "../../../schemas/xbrl/utr/per-unit-item-type.json",
   "tests": [
     {
       "description": "Valid - Monetary_per_Decimal",
diff --git a/test/xbrl/utr/plane-angle-item-type-normative.test.json b/test/xbrl/utr/plane-angle-item-type-normative.test.json
index c522df0c..a4b2d310 100644
--- a/test/xbrl/utr/plane-angle-item-type-normative.test.json
+++ b/test/xbrl/utr/plane-angle-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/plane-angle-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/plane-angle-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Degree (REC)",
diff --git a/test/xbrl/utr/plane-angle-item-type.test.json b/test/xbrl/utr/plane-angle-item-type.test.json
index 4eec56f9..5694845a 100644
--- a/test/xbrl/utr/plane-angle-item-type.test.json
+++ b/test/xbrl/utr/plane-angle-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/plane-angle-item-type.json",
+  "target": "../../../schemas/xbrl/utr/plane-angle-item-type.json",
   "tests": [
     {
       "description": "Valid - Degree",
diff --git a/test/xbrl/utr/power-item-type-normative.test.json b/test/xbrl/utr/power-item-type-normative.test.json
index 99ac6466..11ef0ed5 100644
--- a/test/xbrl/utr/power-item-type-normative.test.json
+++ b/test/xbrl/utr/power-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/power-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/power-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - hp (REC)",
diff --git a/test/xbrl/utr/power-item-type.test.json b/test/xbrl/utr/power-item-type.test.json
index a40e781f..facfa0fd 100644
--- a/test/xbrl/utr/power-item-type.test.json
+++ b/test/xbrl/utr/power-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/power-item-type.json",
+  "target": "../../../schemas/xbrl/utr/power-item-type.json",
   "tests": [
     {
       "description": "Valid - hp",
diff --git a/test/xbrl/utr/pressure-item-type-normative.test.json b/test/xbrl/utr/pressure-item-type-normative.test.json
index 2c010bac..b7073339 100644
--- a/test/xbrl/utr/pressure-item-type-normative.test.json
+++ b/test/xbrl/utr/pressure-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/pressure-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/pressure-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Pa (REC)",
diff --git a/test/xbrl/utr/pressure-item-type.test.json b/test/xbrl/utr/pressure-item-type.test.json
index efde5a1f..2f6c23d3 100644
--- a/test/xbrl/utr/pressure-item-type.test.json
+++ b/test/xbrl/utr/pressure-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/pressure-item-type.json",
+  "target": "../../../schemas/xbrl/utr/pressure-item-type.json",
   "tests": [
     {
       "description": "Valid - Pa",
diff --git a/test/xbrl/utr/pure-item-type-normative.test.json b/test/xbrl/utr/pure-item-type-normative.test.json
index 24b7f60e..44da9ce6 100644
--- a/test/xbrl/utr/pure-item-type-normative.test.json
+++ b/test/xbrl/utr/pure-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/pure-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/pure-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Monetary_per_Monetary (REC)",
diff --git a/test/xbrl/utr/pure-item-type.test.json b/test/xbrl/utr/pure-item-type.test.json
index 1a774178..b854c929 100644
--- a/test/xbrl/utr/pure-item-type.test.json
+++ b/test/xbrl/utr/pure-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/pure-item-type.json",
+  "target": "../../../schemas/xbrl/utr/pure-item-type.json",
   "tests": [
     {
       "description": "Valid - Monetary_per_Monetary",
diff --git a/test/xbrl/utr/shares-item-type-normative.test.json b/test/xbrl/utr/shares-item-type-normative.test.json
index e3614e9d..b67befdb 100644
--- a/test/xbrl/utr/shares-item-type-normative.test.json
+++ b/test/xbrl/utr/shares-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/shares-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/shares-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - shares (REC)",
diff --git a/test/xbrl/utr/shares-item-type.test.json b/test/xbrl/utr/shares-item-type.test.json
index 38c72464..56be3e18 100644
--- a/test/xbrl/utr/shares-item-type.test.json
+++ b/test/xbrl/utr/shares-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/shares-item-type.json",
+  "target": "../../../schemas/xbrl/utr/shares-item-type.json",
   "tests": [
     {
       "description": "Valid - shares",
diff --git a/test/xbrl/utr/temperature-item-type-normative.test.json b/test/xbrl/utr/temperature-item-type-normative.test.json
index 018f4c78..8618acb4 100644
--- a/test/xbrl/utr/temperature-item-type-normative.test.json
+++ b/test/xbrl/utr/temperature-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/temperature-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/temperature-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Celsius (REC)",
diff --git a/test/xbrl/utr/temperature-item-type.test.json b/test/xbrl/utr/temperature-item-type.test.json
index 5ee6fe27..536d6715 100644
--- a/test/xbrl/utr/temperature-item-type.test.json
+++ b/test/xbrl/utr/temperature-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/temperature-item-type.json",
+  "target": "../../../schemas/xbrl/utr/temperature-item-type.json",
   "tests": [
     {
       "description": "Valid - Celsius",
diff --git a/test/xbrl/utr/voltage-item-type-normative.test.json b/test/xbrl/utr/voltage-item-type-normative.test.json
index 3fa3d07f..849cbf74 100644
--- a/test/xbrl/utr/voltage-item-type-normative.test.json
+++ b/test/xbrl/utr/voltage-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/voltage-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/voltage-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - V (REC)",
diff --git a/test/xbrl/utr/voltage-item-type.test.json b/test/xbrl/utr/voltage-item-type.test.json
index 7c9ea0e0..7b0c6cd0 100644
--- a/test/xbrl/utr/voltage-item-type.test.json
+++ b/test/xbrl/utr/voltage-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/voltage-item-type.json",
+  "target": "../../../schemas/xbrl/utr/voltage-item-type.json",
   "tests": [
     {
       "description": "Valid - V",
diff --git a/test/xbrl/utr/volume-item-type-normative.test.json b/test/xbrl/utr/volume-item-type-normative.test.json
index b54abfc2..bb3aa97b 100644
--- a/test/xbrl/utr/volume-item-type-normative.test.json
+++ b/test/xbrl/utr/volume-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/volume-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/volume-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - bbl (REC)",
diff --git a/test/xbrl/utr/volume-item-type.test.json b/test/xbrl/utr/volume-item-type.test.json
index 6f256924..2ff3a945 100644
--- a/test/xbrl/utr/volume-item-type.test.json
+++ b/test/xbrl/utr/volume-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/volume-item-type.json",
+  "target": "../../../schemas/xbrl/utr/volume-item-type.json",
   "tests": [
     {
       "description": "Valid - bbl",
diff --git a/test/xbrl/utr/volume-per-monetary-item-type-normative.test.json b/test/xbrl/utr/volume-per-monetary-item-type-normative.test.json
index 43468367..04f47a11 100644
--- a/test/xbrl/utr/volume-per-monetary-item-type-normative.test.json
+++ b/test/xbrl/utr/volume-per-monetary-item-type-normative.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/volume-per-monetary-item-type-normative.json",
+  "target": "../../../schemas/xbrl/utr/volume-per-monetary-item-type-normative.json",
   "tests": [
     {
       "description": "Valid - Volume_per_Monetary (REC)",
diff --git a/test/xbrl/utr/volume-per-monetary-item-type.test.json b/test/xbrl/utr/volume-per-monetary-item-type.test.json
index 19e81c88..e429e778 100644
--- a/test/xbrl/utr/volume-per-monetary-item-type.test.json
+++ b/test/xbrl/utr/volume-per-monetary-item-type.test.json
@@ -1,5 +1,5 @@
 {
-  "target": "../../../schemas/2020-12/xbrl/utr/volume-per-monetary-item-type.json",
+  "target": "../../../schemas/xbrl/utr/volume-per-monetary-item-type.json",
   "tests": [
     {
       "description": "Valid - Volume_per_Monetary",