diff --git a/schemas/iso/datetime/2019/date-calendar-basic.json b/schemas/iso/datetime/2019/date/calendar-basic.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-calendar-basic.json
rename to schemas/iso/datetime/2019/date/calendar-basic.json
diff --git a/schemas/iso/datetime/2019/date-calendar-century.json b/schemas/iso/datetime/2019/date/calendar-century.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-calendar-century.json
rename to schemas/iso/datetime/2019/date/calendar-century.json
diff --git a/schemas/iso/datetime/2019/date-calendar-decade.json b/schemas/iso/datetime/2019/date/calendar-decade.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-calendar-decade.json
rename to schemas/iso/datetime/2019/date/calendar-decade.json
diff --git a/schemas/iso/datetime/2019/date-calendar-expanded-basic.json b/schemas/iso/datetime/2019/date/calendar-expanded-basic.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-calendar-expanded-basic.json
rename to schemas/iso/datetime/2019/date/calendar-expanded-basic.json
diff --git a/schemas/iso/datetime/2019/date-calendar-expanded-century.json b/schemas/iso/datetime/2019/date/calendar-expanded-century.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-calendar-expanded-century.json
rename to schemas/iso/datetime/2019/date/calendar-expanded-century.json
diff --git a/schemas/iso/datetime/2019/date-calendar-expanded-decade.json b/schemas/iso/datetime/2019/date/calendar-expanded-decade.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-calendar-expanded-decade.json
rename to schemas/iso/datetime/2019/date/calendar-expanded-decade.json
diff --git a/schemas/iso/datetime/2019/date-calendar-expanded-extended.json b/schemas/iso/datetime/2019/date/calendar-expanded-extended.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-calendar-expanded-extended.json
rename to schemas/iso/datetime/2019/date/calendar-expanded-extended.json
diff --git a/schemas/iso/datetime/2019/date-calendar-expanded-month.json b/schemas/iso/datetime/2019/date/calendar-expanded-month.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-calendar-expanded-month.json
rename to schemas/iso/datetime/2019/date/calendar-expanded-month.json
diff --git a/schemas/iso/datetime/2019/date-calendar-expanded-year.json b/schemas/iso/datetime/2019/date/calendar-expanded-year.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-calendar-expanded-year.json
rename to schemas/iso/datetime/2019/date/calendar-expanded-year.json
diff --git a/schemas/iso/datetime/2019/date-calendar-extended.json b/schemas/iso/datetime/2019/date/calendar-extended.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-calendar-extended.json
rename to schemas/iso/datetime/2019/date/calendar-extended.json
diff --git a/schemas/iso/datetime/2019/date-calendar-month.json b/schemas/iso/datetime/2019/date/calendar-month.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-calendar-month.json
rename to schemas/iso/datetime/2019/date/calendar-month.json
diff --git a/schemas/iso/datetime/2019/date-calendar-year.json b/schemas/iso/datetime/2019/date/calendar-year.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-calendar-year.json
rename to schemas/iso/datetime/2019/date/calendar-year.json
diff --git a/schemas/iso/datetime/2019/date-ordinal-basic.json b/schemas/iso/datetime/2019/date/ordinal-basic.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-ordinal-basic.json
rename to schemas/iso/datetime/2019/date/ordinal-basic.json
diff --git a/schemas/iso/datetime/2019/date-ordinal-expanded-basic.json b/schemas/iso/datetime/2019/date/ordinal-expanded-basic.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-ordinal-expanded-basic.json
rename to schemas/iso/datetime/2019/date/ordinal-expanded-basic.json
diff --git a/schemas/iso/datetime/2019/date-ordinal-expanded-extended.json b/schemas/iso/datetime/2019/date/ordinal-expanded-extended.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-ordinal-expanded-extended.json
rename to schemas/iso/datetime/2019/date/ordinal-expanded-extended.json
diff --git a/schemas/iso/datetime/2019/date-ordinal-extended.json b/schemas/iso/datetime/2019/date/ordinal-extended.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-ordinal-extended.json
rename to schemas/iso/datetime/2019/date/ordinal-extended.json
diff --git a/schemas/iso/datetime/2019/date-week-basic.json b/schemas/iso/datetime/2019/date/week-basic.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-week-basic.json
rename to schemas/iso/datetime/2019/date/week-basic.json
diff --git a/schemas/iso/datetime/2019/date-week-expanded-basic.json b/schemas/iso/datetime/2019/date/week-expanded-basic.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-week-expanded-basic.json
rename to schemas/iso/datetime/2019/date/week-expanded-basic.json
diff --git a/schemas/iso/datetime/2019/date-week-expanded-extended.json b/schemas/iso/datetime/2019/date/week-expanded-extended.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-week-expanded-extended.json
rename to schemas/iso/datetime/2019/date/week-expanded-extended.json
diff --git a/schemas/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/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/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/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/iso/datetime/2019/date-week-extended.json b/schemas/iso/datetime/2019/date/week-extended.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-week-extended.json
rename to schemas/iso/datetime/2019/date/week-extended.json
diff --git a/schemas/iso/datetime/2019/date-week-reduced-basic.json b/schemas/iso/datetime/2019/date/week-reduced-basic.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-week-reduced-basic.json
rename to schemas/iso/datetime/2019/date/week-reduced-basic.json
diff --git a/schemas/iso/datetime/2019/date-week-reduced-extended.json b/schemas/iso/datetime/2019/date/week-reduced-extended.json
similarity index 100%
rename from schemas/iso/datetime/2019/date-week-reduced-extended.json
rename to schemas/iso/datetime/2019/date/week-reduced-extended.json
diff --git a/schemas/iso/datetime/2019/duration-calendar-basic.json b/schemas/iso/datetime/2019/duration/calendar-basic.json
similarity index 100%
rename from schemas/iso/datetime/2019/duration-calendar-basic.json
rename to schemas/iso/datetime/2019/duration/calendar-basic.json
diff --git a/schemas/iso/datetime/2019/duration-calendar-extended.json b/schemas/iso/datetime/2019/duration/calendar-extended.json
similarity index 100%
rename from schemas/iso/datetime/2019/duration-calendar-extended.json
rename to schemas/iso/datetime/2019/duration/calendar-extended.json
diff --git a/schemas/iso/datetime/2019/duration-designator.json b/schemas/iso/datetime/2019/duration/designator.json
similarity index 100%
rename from schemas/iso/datetime/2019/duration-designator.json
rename to schemas/iso/datetime/2019/duration/designator.json
diff --git a/schemas/iso/datetime/2019/duration-ordinal-basic.json b/schemas/iso/datetime/2019/duration/ordinal-basic.json
similarity index 100%
rename from schemas/iso/datetime/2019/duration-ordinal-basic.json
rename to schemas/iso/datetime/2019/duration/ordinal-basic.json
diff --git a/schemas/iso/datetime/2019/duration-ordinal-extended.json b/schemas/iso/datetime/2019/duration/ordinal-extended.json
similarity index 100%
rename from schemas/iso/datetime/2019/duration-ordinal-extended.json
rename to schemas/iso/datetime/2019/duration/ordinal-extended.json
diff --git a/schemas/iso/datetime/2019/duration-weeks.json b/schemas/iso/datetime/2019/duration/weeks.json
similarity index 100%
rename from schemas/iso/datetime/2019/duration-weeks.json
rename to schemas/iso/datetime/2019/duration/weeks.json
diff --git a/test/iso/datetime/2019/date-calendar-basic.test.json b/test/iso/datetime/2019/date/calendar-basic.test.json
similarity index 98%
rename from test/iso/datetime/2019/date-calendar-basic.test.json
rename to test/iso/datetime/2019/date/calendar-basic.test.json
index bd87b9af..85adf669 100644
--- a/test/iso/datetime/2019/date-calendar-basic.test.json
+++ b/test/iso/datetime/2019/date/calendar-basic.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 94%
rename from test/iso/datetime/2019/date-calendar-century.test.json
rename to test/iso/datetime/2019/date/calendar-century.test.json
index d36e21ac..7f642cee 100644
--- a/test/iso/datetime/2019/date-calendar-century.test.json
+++ b/test/iso/datetime/2019/date/calendar-century.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 95%
rename from test/iso/datetime/2019/date-calendar-decade.test.json
rename to test/iso/datetime/2019/date/calendar-decade.test.json
index cba9d78d..af7f4820 100644
--- a/test/iso/datetime/2019/date-calendar-decade.test.json
+++ b/test/iso/datetime/2019/date/calendar-decade.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 97%
rename from test/iso/datetime/2019/date-calendar-expanded-basic.test.json
rename to test/iso/datetime/2019/date/calendar-expanded-basic.test.json
index 1d8516cc..3ca1735a 100644
--- a/test/iso/datetime/2019/date-calendar-expanded-basic.test.json
+++ b/test/iso/datetime/2019/date/calendar-expanded-basic.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 93%
rename from test/iso/datetime/2019/date-calendar-expanded-century.test.json
rename to test/iso/datetime/2019/date/calendar-expanded-century.test.json
index b20a242b..239ce21d 100644
--- a/test/iso/datetime/2019/date-calendar-expanded-century.test.json
+++ b/test/iso/datetime/2019/date/calendar-expanded-century.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 93%
rename from test/iso/datetime/2019/date-calendar-expanded-decade.test.json
rename to test/iso/datetime/2019/date/calendar-expanded-decade.test.json
index 769f95c3..cc4c9153 100644
--- a/test/iso/datetime/2019/date-calendar-expanded-decade.test.json
+++ b/test/iso/datetime/2019/date/calendar-expanded-decade.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 97%
rename from test/iso/datetime/2019/date-calendar-expanded-extended.test.json
rename to test/iso/datetime/2019/date/calendar-expanded-extended.test.json
index 0643a211..9c1fc3b9 100644
--- a/test/iso/datetime/2019/date-calendar-expanded-extended.test.json
+++ b/test/iso/datetime/2019/date/calendar-expanded-extended.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 94%
rename from test/iso/datetime/2019/date-calendar-expanded-month.test.json
rename to test/iso/datetime/2019/date/calendar-expanded-month.test.json
index d9dc0af3..3c4fd30f 100644
--- a/test/iso/datetime/2019/date-calendar-expanded-month.test.json
+++ b/test/iso/datetime/2019/date/calendar-expanded-month.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 94%
rename from test/iso/datetime/2019/date-calendar-expanded-year.test.json
rename to test/iso/datetime/2019/date/calendar-expanded-year.test.json
index d3152499..b85370a0 100644
--- a/test/iso/datetime/2019/date-calendar-expanded-year.test.json
+++ b/test/iso/datetime/2019/date/calendar-expanded-year.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 98%
rename from test/iso/datetime/2019/date-calendar-extended.test.json
rename to test/iso/datetime/2019/date/calendar-extended.test.json
index 7cc2014e..5858fa0c 100644
--- a/test/iso/datetime/2019/date-calendar-extended.test.json
+++ b/test/iso/datetime/2019/date/calendar-extended.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 94%
rename from test/iso/datetime/2019/date-calendar-month.test.json
rename to test/iso/datetime/2019/date/calendar-month.test.json
index a8991028..044119d0 100644
--- a/test/iso/datetime/2019/date-calendar-month.test.json
+++ b/test/iso/datetime/2019/date/calendar-month.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 95%
rename from test/iso/datetime/2019/date-calendar-year.test.json
rename to test/iso/datetime/2019/date/calendar-year.test.json
index 1eca1a73..506a90a8 100644
--- a/test/iso/datetime/2019/date-calendar-year.test.json
+++ b/test/iso/datetime/2019/date/calendar-year.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 98%
rename from test/iso/datetime/2019/date-ordinal-basic.test.json
rename to test/iso/datetime/2019/date/ordinal-basic.test.json
index a11fbcb2..c621abaa 100644
--- a/test/iso/datetime/2019/date-ordinal-basic.test.json
+++ b/test/iso/datetime/2019/date/ordinal-basic.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 96%
rename from test/iso/datetime/2019/date-ordinal-expanded-basic.test.json
rename to test/iso/datetime/2019/date/ordinal-expanded-basic.test.json
index f649775a..6f5c3320 100644
--- a/test/iso/datetime/2019/date-ordinal-expanded-basic.test.json
+++ b/test/iso/datetime/2019/date/ordinal-expanded-basic.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 96%
rename from test/iso/datetime/2019/date-ordinal-expanded-extended.test.json
rename to test/iso/datetime/2019/date/ordinal-expanded-extended.test.json
index f3994bb4..13a0c3b9 100644
--- a/test/iso/datetime/2019/date-ordinal-expanded-extended.test.json
+++ b/test/iso/datetime/2019/date/ordinal-expanded-extended.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 97%
rename from test/iso/datetime/2019/date-ordinal-extended.test.json
rename to test/iso/datetime/2019/date/ordinal-extended.test.json
index 6c01a364..435ee7d4 100644
--- a/test/iso/datetime/2019/date-ordinal-extended.test.json
+++ b/test/iso/datetime/2019/date/ordinal-extended.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 98%
rename from test/iso/datetime/2019/date-week-basic.test.json
rename to test/iso/datetime/2019/date/week-basic.test.json
index e5d8a84f..6827e660 100644
--- a/test/iso/datetime/2019/date-week-basic.test.json
+++ b/test/iso/datetime/2019/date/week-basic.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 96%
rename from test/iso/datetime/2019/date-week-expanded-basic.test.json
rename to test/iso/datetime/2019/date/week-expanded-basic.test.json
index 483039a4..55257895 100644
--- a/test/iso/datetime/2019/date-week-expanded-basic.test.json
+++ b/test/iso/datetime/2019/date/week-expanded-basic.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 96%
rename from test/iso/datetime/2019/date-week-expanded-extended.test.json
rename to test/iso/datetime/2019/date/week-expanded-extended.test.json
index a34d7fe1..ef4c0f0c 100644
--- a/test/iso/datetime/2019/date-week-expanded-extended.test.json
+++ b/test/iso/datetime/2019/date/week-expanded-extended.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 95%
rename from test/iso/datetime/2019/date-week-expanded-reduced-basic.test.json
rename to test/iso/datetime/2019/date/week-expanded-reduced-basic.test.json
index 1d157d76..0ae4a200 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,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 95%
rename from test/iso/datetime/2019/date-week-expanded-reduced-extended.test.json
rename to test/iso/datetime/2019/date/week-expanded-reduced-extended.test.json
index 292d44d3..a4a49bf9 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,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 97%
rename from test/iso/datetime/2019/date-week-extended.test.json
rename to test/iso/datetime/2019/date/week-extended.test.json
index 399e5657..9b4954f7 100644
--- a/test/iso/datetime/2019/date-week-extended.test.json
+++ b/test/iso/datetime/2019/date/week-extended.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 96%
rename from test/iso/datetime/2019/date-week-reduced-basic.test.json
rename to test/iso/datetime/2019/date/week-reduced-basic.test.json
index 598642ed..377d5986 100644
--- a/test/iso/datetime/2019/date-week-reduced-basic.test.json
+++ b/test/iso/datetime/2019/date/week-reduced-basic.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 95%
rename from test/iso/datetime/2019/date-week-reduced-extended.test.json
rename to test/iso/datetime/2019/date/week-reduced-extended.test.json
index 8be0dd7f..93525766 100644
--- a/test/iso/datetime/2019/date-week-reduced-extended.test.json
+++ b/test/iso/datetime/2019/date/week-reduced-extended.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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/duration-calendar-basic.test.json b/test/iso/datetime/2019/duration/calendar-basic.test.json
similarity index 99%
rename from test/iso/datetime/2019/duration-calendar-basic.test.json
rename to test/iso/datetime/2019/duration/calendar-basic.test.json
index b748cb69..c15a30f2 100644
--- a/test/iso/datetime/2019/duration-calendar-basic.test.json
+++ b/test/iso/datetime/2019/duration/calendar-basic.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 99%
rename from test/iso/datetime/2019/duration-calendar-extended.test.json
rename to test/iso/datetime/2019/duration/calendar-extended.test.json
index c770742a..760e04ef 100644
--- a/test/iso/datetime/2019/duration-calendar-extended.test.json
+++ b/test/iso/datetime/2019/duration/calendar-extended.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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.test.json b/test/iso/datetime/2019/duration/designator.test.json
similarity index 98%
rename from test/iso/datetime/2019/duration-designator.test.json
rename to test/iso/datetime/2019/duration/designator.test.json
index 9de07efe..4187315a 100644
--- a/test/iso/datetime/2019/duration-designator.test.json
+++ b/test/iso/datetime/2019/duration/designator.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 98%
rename from test/iso/datetime/2019/duration-ordinal-basic.test.json
rename to test/iso/datetime/2019/duration/ordinal-basic.test.json
index d4e78218..5f1b52e5 100644
--- a/test/iso/datetime/2019/duration-ordinal-basic.test.json
+++ b/test/iso/datetime/2019/duration/ordinal-basic.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 98%
rename from test/iso/datetime/2019/duration-ordinal-extended.test.json
rename to test/iso/datetime/2019/duration/ordinal-extended.test.json
index 14979202..d3bf0d08 100644
--- a/test/iso/datetime/2019/duration-ordinal-extended.test.json
+++ b/test/iso/datetime/2019/duration/ordinal-extended.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/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
similarity index 96%
rename from test/iso/datetime/2019/duration-weeks.test.json
rename to test/iso/datetime/2019/duration/weeks.test.json
index 2395e67c..d6ab303d 100644
--- a/test/iso/datetime/2019/duration-weeks.test.json
+++ b/test/iso/datetime/2019/duration/weeks.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/iso/datetime/2019/duration-weeks.json",
+  "target": "../../../../../schemas/iso/datetime/2019/duration/weeks.json",
   "tests": [
     {
       "description": "Invalid type - integer",