diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesArray/WithItemDefinition/normalized.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsArray/WithItemDefinition/normalized.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesArray/WithItemDefinition/normalized.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsArray/WithItemDefinition/normalized.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesArray/WithItemDefinition/original.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsArray/WithItemDefinition/original.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesArray/WithItemDefinition/original.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsArray/WithItemDefinition/original.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesArray/WithItemDefinition/schema.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsArray/WithItemDefinition/schema.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesArray/WithItemDefinition/schema.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsArray/WithItemDefinition/schema.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesArray/WithItemDefinition/normalized.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsScalar/WithItemDefinition/normalized.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesArray/WithItemDefinition/normalized.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsScalar/WithItemDefinition/normalized.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesArray/WithItemDefinition/original.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsScalar/WithItemDefinition/original.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesArray/WithItemDefinition/original.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsScalar/WithItemDefinition/original.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesArray/WithItemDefinition/schema.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsScalar/WithItemDefinition/schema.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesArray/WithItemDefinition/schema.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsScalar/WithItemDefinition/schema.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesArray/WithoutItemDefinition/normalized.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsScalar/WithoutItemDefinition/normalized.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesArray/WithoutItemDefinition/normalized.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsScalar/WithoutItemDefinition/normalized.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesArray/WithoutItemDefinition/original.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsScalar/WithoutItemDefinition/original.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesArray/WithoutItemDefinition/original.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsScalar/WithoutItemDefinition/original.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesArray/WithoutItemDefinition/schema.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsScalar/WithoutItemDefinition/schema.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesArray/WithoutItemDefinition/schema.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsArray/Schema/HasType/IsScalar/WithoutItemDefinition/schema.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Reference/normalized.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasReference/normalized.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Reference/normalized.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasReference/normalized.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Reference/original.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasReference/original.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Reference/original.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasReference/original.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Reference/schema.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasReference/schema.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Reference/schema.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasReference/schema.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesObject/WithPropertyDefinitions/normalized.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitions/normalized.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesObject/WithPropertyDefinitions/normalized.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitions/normalized.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesObject/WithPropertyDefinitions/original.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitions/original.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesObject/WithPropertyDefinitions/original.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitions/original.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesObject/WithPropertyDefinitions/schema.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitions/schema.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesObject/WithPropertyDefinitions/schema.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitions/schema.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesObject/WithPropertyDefinitionsAndAdditionalProperties/normalized.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitionsAndAdditionalProperties/normalized.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesObject/WithPropertyDefinitionsAndAdditionalProperties/normalized.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitionsAndAdditionalProperties/normalized.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesObject/WithPropertyDefinitionsAndAdditionalProperties/original.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitionsAndAdditionalProperties/original.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesObject/WithPropertyDefinitionsAndAdditionalProperties/original.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitionsAndAdditionalProperties/original.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesObject/WithPropertyDefinitionsAndAdditionalProperties/schema.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitionsAndAdditionalProperties/schema.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsArray/DescribesObject/WithPropertyDefinitionsAndAdditionalProperties/schema.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsArray/WithPropertyDefinitionsAndAdditionalProperties/schema.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithPropertyDefinitions/normalized.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitions/normalized.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithPropertyDefinitions/normalized.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitions/normalized.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithPropertyDefinitions/original.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitions/original.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithPropertyDefinitions/original.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitions/original.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithPropertyDefinitions/schema.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitions/schema.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithPropertyDefinitions/schema.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitions/schema.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithPropertyDefinitionsAndAdditionalProperties/normalized.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitionsAndAdditionalProperties/normalized.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithPropertyDefinitionsAndAdditionalProperties/normalized.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitionsAndAdditionalProperties/normalized.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithPropertyDefinitionsAndAdditionalProperties/original.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitionsAndAdditionalProperties/original.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithPropertyDefinitionsAndAdditionalProperties/original.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitionsAndAdditionalProperties/original.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithPropertyDefinitionsAndAdditionalProperties/schema.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitionsAndAdditionalProperties/schema.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithPropertyDefinitionsAndAdditionalProperties/schema.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithPropertyDefinitionsAndAdditionalProperties/schema.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/Absent/normalized.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithoutPropertyDefinitions/normalized.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/Absent/normalized.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithoutPropertyDefinitions/normalized.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/Absent/original.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithoutPropertyDefinitions/original.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/Absent/original.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithoutPropertyDefinitions/original.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithoutPropertyDefinitions/schema.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithoutPropertyDefinitions/schema.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithoutPropertyDefinitions/schema.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/HasType/IsScalar/WithoutPropertyDefinitions/schema.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithoutPropertyDefinitions/normalized.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/IsEmpty/normalized.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithoutPropertyDefinitions/normalized.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/IsEmpty/normalized.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithoutPropertyDefinitions/original.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/IsEmpty/original.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/IsScalar/DescribesObject/WithoutPropertyDefinitions/original.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/IsEmpty/original.json
diff --git a/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/Absent/schema.json b/test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/IsEmpty/schema.json
similarity index 100%
rename from test/Fixture/SchemaNormalizer/NormalizeNormalizes/Type/Absent/schema.json
rename to test/Fixture/SchemaNormalizer/NormalizeNormalizes/Data/IsObject/Schema/IsEmpty/schema.json