Merge pull request #221 from OpenEnergyPlatform/feature-204-folder

Refactor folder structure #204
OpenEnergyPlatform · Nov 14, 2024 · 6d6907e · 6d6907e
2 parents 8bcf4ef + 0247991
commit 6d6907e
Show file tree

Hide file tree

Showing 161 changed files with 78 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Rename URI from `path` to `@id` [(#214)](https://github.com/OpenEnergyPlatform/oemetadata/pull/214)
 - Rename ``source``- ``licenses`` to ``sourceLicenses`` [(#215)](https://github.com/OpenEnergyPlatform/oemetadata/pull/215)
 - Update create template [(#217)](https://github.com/OpenEnergyPlatform/oemetadata/pull/217)
+- Update folder structure [(#221)](https://github.com/OpenEnergyPlatform/oemetadata/pull/221)
 
 ### Removed
 - [(#)]()

diff --git a/REUSE.toml b/REUSE.toml
@@ -77,7 +77,7 @@ SPDX-FileCopyrightText = "Ludwig Hülk <@Ludee> © Reiner Lemoine Institut"
 SPDX-License-Identifier = "CC0-1.0"
 
 [[annotations]]
-path = "metadata/v20/v20/build_source/schemas/*.json"
+path = "metadata/v2/v20/build_source/schemas/*.json"
 precedence = "override"
 SPDX-FileCopyrightText = "Ludwig Hülk <@Ludee> © Reiner Lemoine Institut; Jonas Huber <jh-RLI> © Reiner Lemoine Institut"
 SPDX-License-Identifier = "MIT"

diff --git a/...e/scripts/generate_example_from_schema.py → ...st/build_source/scripts/create_example.py b/...e/scripts/generate_example_from_schema.py → ...st/build_source/scripts/create_example.py
diff --git a/...ild_source/scripts/resolve_schema_refs.py → ...est/build_source/scripts/create_schema.py b/...ild_source/scripts/resolve_schema_refs.py → ...est/build_source/scripts/create_schema.py
diff --git a/.../scripts/generate_template_from_schema.py → ...t/build_source/scripts/create_template.py b/.../scripts/generate_template_from_schema.py → ...t/build_source/scripts/create_template.py
diff --git a/metadata/v10/v130/__init__.py → metadata/v1/v130/__init__.py b/metadata/v10/v130/__init__.py → metadata/v1/v130/__init__.py
diff --git a/metadata/v10/v130/example.json → metadata/v1/v130/example.json b/metadata/v10/v130/example.json → metadata/v1/v130/example.json
diff --git a/metadata/v10/v130/example.json.license → metadata/v1/v130/example.json.license b/metadata/v10/v130/example.json.license → metadata/v1/v130/example.json.license
diff --git a/metadata/v10/v130/example.py → metadata/v1/v130/example.py b/metadata/v10/v130/example.py → metadata/v1/v130/example.py
diff --git a/metadata/v10/v130/schema.json → metadata/v1/v130/schema.json b/metadata/v10/v130/schema.json → metadata/v1/v130/schema.json
diff --git a/metadata/v10/v130/schema.json.license → metadata/v1/v130/schema.json.license b/metadata/v10/v130/schema.json.license → metadata/v1/v130/schema.json.license
diff --git a/metadata/v10/v130/schema.py → metadata/v1/v130/schema.py b/metadata/v10/v130/schema.py → metadata/v1/v130/schema.py
diff --git a/metadata/v10/v130/template.json → metadata/v1/v130/template.json b/metadata/v10/v130/template.json → metadata/v1/v130/template.json
diff --git a/metadata/v10/v130/template.json.license → metadata/v1/v130/template.json.license b/metadata/v10/v130/template.json.license → metadata/v1/v130/template.json.license
diff --git a/metadata/v10/v130/template.py → metadata/v1/v130/template.py b/metadata/v10/v130/template.py → metadata/v1/v130/template.py
diff --git a/metadata/v10/v140/__init__.py → metadata/v1/v140/__init__.py b/metadata/v10/v140/__init__.py → metadata/v1/v140/__init__.py
diff --git a/metadata/v10/v140/example.json → metadata/v1/v140/example.json b/metadata/v10/v140/example.json → metadata/v1/v140/example.json
diff --git a/metadata/v10/v140/example.json.license → metadata/v1/v140/example.json.license b/metadata/v10/v140/example.json.license → metadata/v1/v140/example.json.license
diff --git a/metadata/v10/v140/example.py → metadata/v1/v140/example.py b/metadata/v10/v140/example.py → metadata/v1/v140/example.py
diff --git a/...data/v10/v140/metadata_key_description.md → metadata/v1/v140/metadata_key_description.md b/...data/v10/v140/metadata_key_description.md → metadata/v1/v140/metadata_key_description.md
diff --git a/metadata/v10/v140/schema.json → metadata/v1/v140/schema.json b/metadata/v10/v140/schema.json → metadata/v1/v140/schema.json
diff --git a/metadata/v10/v140/schema.json.license → metadata/v1/v140/schema.json.license b/metadata/v10/v140/schema.json.license → metadata/v1/v140/schema.json.license
diff --git a/metadata/v10/v140/schema.py → metadata/v1/v140/schema.py b/metadata/v10/v140/schema.py → metadata/v1/v140/schema.py
diff --git a/metadata/v10/v140/template.json → metadata/v1/v140/template.json b/metadata/v10/v140/template.json → metadata/v1/v140/template.json
diff --git a/metadata/v10/v140/template.json.license → metadata/v1/v140/template.json.license b/metadata/v10/v140/template.json.license → metadata/v1/v140/template.json.license
diff --git a/metadata/v10/v140/template.py → metadata/v1/v140/template.py b/metadata/v10/v140/template.py → metadata/v1/v140/template.py
diff --git a/metadata/v10/v141/__init__.py → metadata/v1/v141/__init__.py b/metadata/v10/v141/__init__.py → metadata/v1/v141/__init__.py
diff --git a/metadata/v10/v141/example.json → metadata/v1/v141/example.json b/metadata/v10/v141/example.json → metadata/v1/v141/example.json
diff --git a/metadata/v10/v141/example.json.license → metadata/v1/v141/example.json.license b/metadata/v10/v141/example.json.license → metadata/v1/v141/example.json.license
diff --git a/metadata/v10/v141/example.py → metadata/v1/v141/example.py b/metadata/v10/v141/example.py → metadata/v1/v141/example.py
diff --git a/...data/v10/v141/metadata_key_description.md → metadata/v1/v141/metadata_key_description.md b/...data/v10/v141/metadata_key_description.md → metadata/v1/v141/metadata_key_description.md
diff --git a/metadata/v10/v141/schema.json → metadata/v1/v141/schema.json b/metadata/v10/v141/schema.json → metadata/v1/v141/schema.json
diff --git a/metadata/v10/v141/schema.json.license → metadata/v1/v141/schema.json.license b/metadata/v10/v141/schema.json.license → metadata/v1/v141/schema.json.license
diff --git a/metadata/v10/v141/schema.py → metadata/v1/v141/schema.py b/metadata/v10/v141/schema.py → metadata/v1/v141/schema.py
diff --git a/metadata/v10/v141/template.json → metadata/v1/v141/template.json b/metadata/v10/v141/template.json → metadata/v1/v141/template.json
diff --git a/metadata/v10/v141/template.json.license → metadata/v1/v141/template.json.license b/metadata/v10/v141/template.json.license → metadata/v1/v141/template.json.license
diff --git a/metadata/v10/v141/template.py → metadata/v1/v141/template.py b/metadata/v10/v141/template.py → metadata/v1/v141/template.py
diff --git a/metadata/v10/v150/README.md → metadata/v1/v150/README.md b/metadata/v10/v150/README.md → metadata/v1/v150/README.md
diff --git a/metadata/v10/v150/__init__.py → metadata/v1/v150/__init__.py b/metadata/v10/v150/__init__.py → metadata/v1/v150/__init__.py
diff --git a/metadata/v10/v150/context.json → metadata/v1/v150/context.json b/metadata/v10/v150/context.json → metadata/v1/v150/context.json
diff --git a/metadata/v10/v150/context.json.license → metadata/v1/v150/context.json.license b/metadata/v10/v150/context.json.license → metadata/v1/v150/context.json.license
diff --git a/metadata/v10/v150/example.json → metadata/v1/v150/example.json b/metadata/v10/v150/example.json → metadata/v1/v150/example.json
diff --git a/metadata/v10/v150/example.json.license → metadata/v1/v150/example.json.license b/metadata/v10/v150/example.json.license → metadata/v1/v150/example.json.license
diff --git a/metadata/v10/v150/example.py → metadata/v1/v150/example.py b/metadata/v10/v150/example.py → metadata/v1/v150/example.py
diff --git a/...data/v10/v150/metadata_key_description.md → metadata/v1/v150/metadata_key_description.md b/...data/v10/v150/metadata_key_description.md → metadata/v1/v150/metadata_key_description.md
diff --git a/metadata/v10/v150/schema.json → metadata/v1/v150/schema.json b/metadata/v10/v150/schema.json → metadata/v1/v150/schema.json
diff --git a/metadata/v10/v150/schema.json.license → metadata/v1/v150/schema.json.license b/metadata/v10/v150/schema.json.license → metadata/v1/v150/schema.json.license
diff --git a/metadata/v10/v150/schema.py → metadata/v1/v150/schema.py b/metadata/v10/v150/schema.py → metadata/v1/v150/schema.py
diff --git a/metadata/v10/v150/template.json → metadata/v1/v150/template.json b/metadata/v10/v150/template.json → metadata/v1/v150/template.json
diff --git a/metadata/v10/v150/template.json.license → metadata/v1/v150/template.json.license b/metadata/v10/v150/template.json.license → metadata/v1/v150/template.json.license
diff --git a/metadata/v10/v150/template.py → metadata/v1/v150/template.py b/metadata/v10/v150/template.py → metadata/v1/v150/template.py
diff --git a/metadata/v10/v151/README.md → metadata/v1/v151/README.md b/metadata/v10/v151/README.md → metadata/v1/v151/README.md
diff --git a/metadata/v10/v151/__init__.py → metadata/v1/v151/__init__.py b/metadata/v10/v151/__init__.py → metadata/v1/v151/__init__.py
diff --git a/metadata/v10/v151/context.json → metadata/v1/v151/context.json b/metadata/v10/v151/context.json → metadata/v1/v151/context.json
diff --git a/metadata/v10/v151/context.json.license → metadata/v1/v151/context.json.license b/metadata/v10/v151/context.json.license → metadata/v1/v151/context.json.license
diff --git a/metadata/v10/v151/example.json → metadata/v1/v151/example.json b/metadata/v10/v151/example.json → metadata/v1/v151/example.json
diff --git a/metadata/v10/v151/example.json.license → metadata/v1/v151/example.json.license b/metadata/v10/v151/example.json.license → metadata/v1/v151/example.json.license
diff --git a/metadata/v10/v151/example.py → metadata/v1/v151/example.py b/metadata/v10/v151/example.py → metadata/v1/v151/example.py
diff --git a/...data/v10/v151/metadata_key_description.md → metadata/v1/v151/metadata_key_description.md b/...data/v10/v151/metadata_key_description.md → metadata/v1/v151/metadata_key_description.md
diff --git a/metadata/v10/v151/schema.json → metadata/v1/v151/schema.json b/metadata/v10/v151/schema.json → metadata/v1/v151/schema.json
diff --git a/metadata/v10/v151/schema.json.license → metadata/v1/v151/schema.json.license b/metadata/v10/v151/schema.json.license → metadata/v1/v151/schema.json.license
diff --git a/metadata/v10/v151/schema.py → metadata/v1/v151/schema.py b/metadata/v10/v151/schema.py → metadata/v1/v151/schema.py
diff --git a/metadata/v10/v151/template.json → metadata/v1/v151/template.json b/metadata/v10/v151/template.json → metadata/v1/v151/template.json
diff --git a/metadata/v10/v151/template.json.license → metadata/v1/v151/template.json.license b/metadata/v10/v151/template.json.license → metadata/v1/v151/template.json.license
diff --git a/metadata/v10/v151/template.py → metadata/v1/v151/template.py b/metadata/v10/v151/template.py → metadata/v1/v151/template.py
diff --git a/metadata/v10/v152/README.md → metadata/v1/v152/README.md b/metadata/v10/v152/README.md → metadata/v1/v152/README.md
diff --git a/metadata/v10/v152/__init__.py → metadata/v1/v152/__init__.py b/metadata/v10/v152/__init__.py → metadata/v1/v152/__init__.py
diff --git a/metadata/v10/v152/context.json → metadata/v1/v152/context.json b/metadata/v10/v152/context.json → metadata/v1/v152/context.json
diff --git a/metadata/v10/v152/context.json.license → metadata/v1/v152/context.json.license b/metadata/v10/v152/context.json.license → metadata/v1/v152/context.json.license
diff --git a/metadata/v10/v152/example.json → metadata/v1/v152/example.json b/metadata/v10/v152/example.json → metadata/v1/v152/example.json
diff --git a/metadata/v10/v152/example.json.license → metadata/v1/v152/example.json.license b/metadata/v10/v152/example.json.license → metadata/v1/v152/example.json.license
diff --git a/metadata/v10/v152/example.py → metadata/v1/v152/example.py b/metadata/v10/v152/example.py → metadata/v1/v152/example.py
diff --git a/...data/v10/v152/metadata_key_description.md → metadata/v1/v152/metadata_key_description.md b/...data/v10/v152/metadata_key_description.md → metadata/v1/v152/metadata_key_description.md
diff --git a/metadata/v10/v152/schema.json → metadata/v1/v152/schema.json b/metadata/v10/v152/schema.json → metadata/v1/v152/schema.json
diff --git a/metadata/v10/v152/schema.json.license → metadata/v1/v152/schema.json.license b/metadata/v10/v152/schema.json.license → metadata/v1/v152/schema.json.license
diff --git a/metadata/v10/v152/schema.py → metadata/v1/v152/schema.py b/metadata/v10/v152/schema.py → metadata/v1/v152/schema.py
diff --git a/metadata/v10/v152/template.json → metadata/v1/v152/template.json b/metadata/v10/v152/template.json → metadata/v1/v152/template.json
diff --git a/metadata/v10/v152/template.json.license → metadata/v1/v152/template.json.license b/metadata/v10/v152/template.json.license → metadata/v1/v152/template.json.license
diff --git a/metadata/v10/v152/template.py → metadata/v1/v152/template.py b/metadata/v10/v152/template.py → metadata/v1/v152/template.py
diff --git a/metadata/v10/v160/README.md → metadata/v1/v160/README.md b/metadata/v10/v160/README.md → metadata/v1/v160/README.md
diff --git a/metadata/v10/v160/__init__.py → metadata/v1/v160/__init__.py b/metadata/v10/v160/__init__.py → metadata/v1/v160/__init__.py
diff --git a/metadata/v10/v160/context.json → metadata/v1/v160/context.json b/metadata/v10/v160/context.json → metadata/v1/v160/context.json
diff --git a/metadata/v10/v160/context.json.license → metadata/v1/v160/context.json.license b/metadata/v10/v160/context.json.license → metadata/v1/v160/context.json.license
diff --git a/metadata/v10/v160/example.json → metadata/v1/v160/example.json b/metadata/v10/v160/example.json → metadata/v1/v160/example.json
diff --git a/metadata/v10/v160/example.json.license → metadata/v1/v160/example.json.license b/metadata/v10/v160/example.json.license → metadata/v1/v160/example.json.license
diff --git a/metadata/v10/v160/example.py → metadata/v1/v160/example.py b/metadata/v10/v160/example.py → metadata/v1/v160/example.py
diff --git a/...data/v10/v160/metadata_key_description.md → metadata/v1/v160/metadata_key_description.md b/...data/v10/v160/metadata_key_description.md → metadata/v1/v160/metadata_key_description.md
diff --git a/metadata/v10/v160/schema.json → metadata/v1/v160/schema.json b/metadata/v10/v160/schema.json → metadata/v1/v160/schema.json
diff --git a/metadata/v10/v160/schema.json.license → metadata/v1/v160/schema.json.license b/metadata/v10/v160/schema.json.license → metadata/v1/v160/schema.json.license
diff --git a/metadata/v10/v160/schema.py → metadata/v1/v160/schema.py b/metadata/v10/v160/schema.py → metadata/v1/v160/schema.py
diff --git a/metadata/v10/v160/template.json → metadata/v1/v160/template.json b/metadata/v10/v160/template.json → metadata/v1/v160/template.json
diff --git a/metadata/v10/v160/template.json.license → metadata/v1/v160/template.json.license b/metadata/v10/v160/template.json.license → metadata/v1/v160/template.json.license
diff --git a/metadata/v10/v160/template.py → metadata/v1/v160/template.py b/metadata/v10/v160/template.py → metadata/v1/v160/template.py
diff --git a/metadata/v20/v20/README.md → metadata/v2/v20/README.md b/metadata/v20/v20/README.md → metadata/v2/v20/README.md
diff --git a/metadata/v20/v20/__init__.py → metadata/v2/v20/__init__.py b/metadata/v20/v20/__init__.py → metadata/v2/v20/__init__.py
diff --git a/metadata/v20/v20/build_source/README.md → metadata/v2/v20/build_source/README.md b/metadata/v20/v20/build_source/README.md → metadata/v2/v20/build_source/README.md
diff --git a/...20/v20/build_source/schema_structure.json → ...v2/v20/build_source/schema_structure.json b/...20/v20/build_source/schema_structure.json → ...v2/v20/build_source/schema_structure.json
diff --git a/...uild_source/schema_structure.json.license → ...uild_source/schema_structure.json.license b/...uild_source/schema_structure.json.license → ...uild_source/schema_structure.json.license
diff --git a/.../v20/build_source/schemas/collection.json → .../v20/build_source/schemas/collection.json b/.../v20/build_source/schemas/collection.json → .../v20/build_source/schemas/collection.json
diff --git a/...v20/v20/build_source/schemas/context.json → .../v2/v20/build_source/schemas/context.json b/...v20/v20/build_source/schemas/context.json → .../v2/v20/build_source/schemas/context.json
diff --git a/.../v20/v20/build_source/schemas/fields.json → ...a/v2/v20/build_source/schemas/fields.json b/.../v20/v20/build_source/schemas/fields.json → ...a/v2/v20/build_source/schemas/fields.json
diff --git a/...v20/v20/build_source/schemas/general.json → .../v2/v20/build_source/schemas/general.json b/...v20/v20/build_source/schemas/general.json → .../v2/v20/build_source/schemas/general.json
diff --git a/...20/v20/build_source/schemas/licenses.json → ...v2/v20/build_source/schemas/licenses.json b/...20/v20/build_source/schemas/licenses.json → ...v2/v20/build_source/schemas/licenses.json
diff --git a/...v20/build_source/schemas/linked_data.json → ...v20/build_source/schemas/linked_data.json b/...v20/build_source/schemas/linked_data.json → ...v20/build_source/schemas/linked_data.json
diff --git a/...ta/v20/v20/build_source/schemas/meta.json → ...ata/v2/v20/build_source/schemas/meta.json b/...ta/v20/v20/build_source/schemas/meta.json → ...ata/v2/v20/build_source/schemas/meta.json
diff --git a/.../v20/build_source/schemas/provenance.json → .../v20/build_source/schemas/provenance.json b/.../v20/build_source/schemas/provenance.json → .../v20/build_source/schemas/provenance.json
diff --git a/.../v20/v20/build_source/schemas/review.json → ...a/v2/v20/build_source/schemas/review.json b/.../v20/v20/build_source/schemas/review.json → ...a/v2/v20/build_source/schemas/review.json
diff --git a/...v20/v20/build_source/schemas/sources.json → .../v2/v20/build_source/schemas/sources.json b/...v20/v20/build_source/schemas/sources.json → .../v2/v20/build_source/schemas/sources.json
diff --git a/...v20/v20/build_source/schemas/spatial.json → .../v2/v20/build_source/schemas/spatial.json b/...v20/v20/build_source/schemas/spatial.json → .../v2/v20/build_source/schemas/spatial.json
diff --git a/...20/v20/build_source/schemas/temporal.json → ...v2/v20/build_source/schemas/temporal.json b/...20/v20/build_source/schemas/temporal.json → ...v2/v20/build_source/schemas/temporal.json
diff --git a/.../v20/v20/build_source/scripts/__init__.py → ...a/v2/v20/build_source/scripts/__init__.py b/.../v20/v20/build_source/scripts/__init__.py → ...a/v2/v20/build_source/scripts/__init__.py
diff --git a/...e/scripts/generate_example_from_schema.py → ...20/build_source/scripts/create_example.py b/...e/scripts/generate_example_from_schema.py → ...20/build_source/scripts/create_example.py
@@ -211,7 +211,7 @@ def save_json(data: Dict[str, Any], filename: Path) -> None:
 
 def test_oemetadata_schema_should_validate_oemetadata_example(example):
     from jsonschema import validate, ValidationError
-    from metadata.v20.v20.schema import OEMETADATA_V20_SCHEMA
+    from metadata.v2.v20.schema import OEMETADATA_V20_SCHEMA
 
     try:
         validate(example, OEMETADATA_V20_SCHEMA)

diff --git a/...ild_source/scripts/resolve_schema_refs.py → ...v20/build_source/scripts/create_schema.py b/...ild_source/scripts/resolve_schema_refs.py → ...v20/build_source/scripts/create_schema.py
diff --git a/.../scripts/generate_template_from_schema.py → ...0/build_source/scripts/create_template.py b/.../scripts/generate_template_from_schema.py → ...0/build_source/scripts/create_template.py
@@ -96,8 +96,8 @@ def main():
 
 def test_oemetadata_schema_should_validate_oemetadata_template():
     from jsonschema import validate, ValidationError
-    from metadata.v20.v20.template import OEMETADATA_V20_TEMPLATE
-    from metadata.v20.v20.schema import OEMETADATA_V20_SCHEMA
+    from metadata.v2.v20.template import OEMETADATA_V20_TEMPLATE
+    from metadata.v2.v20.schema import OEMETADATA_V20_SCHEMA
 
     try:
         validate(OEMETADATA_V20_TEMPLATE, OEMETADATA_V20_SCHEMA)

diff --git a/.../build_source/scripts/example_fields.json → .../build_source/scripts/example_fields.json b/.../build_source/scripts/example_fields.json → .../build_source/scripts/example_fields.json
diff --git a/...ource/scripts/example_fields.json.license → ...ource/scripts/example_fields.json.license b/...ource/scripts/example_fields.json.license → ...ource/scripts/example_fields.json.license
diff --git a/.../v20/v20/build_source/scripts/settings.py → ...a/v2/v20/build_source/scripts/settings.py b/.../v20/v20/build_source/scripts/settings.py → ...a/v2/v20/build_source/scripts/settings.py
@@ -7,7 +7,7 @@
 
 LOG_FORMAT = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
 
-BASE_PATH = Path("metadata/v20/")
+BASE_PATH = Path("metadata/v2/")
 VERSION = "v20"
 VERSION_PATH = BASE_PATH / VERSION
 SCHEMA_BUILD_PATH = VERSION_PATH / "build_source"

diff --git a/metadata/v20/v20/context.json → metadata/v2/v20/context.json b/metadata/v20/v20/context.json → metadata/v2/v20/context.json
diff --git a/metadata/v20/v20/context.json.license → metadata/v2/v20/context.json.license b/metadata/v20/v20/context.json.license → metadata/v2/v20/context.json.license
diff --git a/metadata/v20/v20/example.json → metadata/v2/v20/example.json b/metadata/v20/v20/example.json → metadata/v2/v20/example.json
diff --git a/metadata/v20/v20/example.json.license → metadata/v2/v20/example.json.license b/metadata/v20/v20/example.json.license → metadata/v2/v20/example.json.license
diff --git a/metadata/v20/v20/example.py → metadata/v2/v20/example.py b/metadata/v20/v20/example.py → metadata/v2/v20/example.py
diff --git a/metadata/v20/v20/metadata_key_description.md → metadata/v2/v20/metadata_key_description.md b/metadata/v20/v20/metadata_key_description.md → metadata/v2/v20/metadata_key_description.md
diff --git a/metadata/v20/v20/schema.json → metadata/v2/v20/schema.json b/metadata/v20/v20/schema.json → metadata/v2/v20/schema.json
diff --git a/metadata/v20/v20/schema.json.license → metadata/v2/v20/schema.json.license b/metadata/v20/v20/schema.json.license → metadata/v2/v20/schema.json.license
diff --git a/metadata/v20/v20/schema.py → metadata/v2/v20/schema.py b/metadata/v20/v20/schema.py → metadata/v2/v20/schema.py
diff --git a/metadata/v20/v20/template.json → metadata/v2/v20/template.json b/metadata/v20/v20/template.json → metadata/v2/v20/template.json
diff --git a/metadata/v20/v20/template.json.license → metadata/v2/v20/template.json.license b/metadata/v20/v20/template.json.license → metadata/v2/v20/template.json.license
diff --git a/metadata/v20/v20/template.py → metadata/v2/v20/template.py b/metadata/v20/v20/template.py → metadata/v2/v20/template.py
diff --git a/tests/metadata/v10/v130/__init__.py → tests/metadata/v1/v130/__init__.py b/tests/metadata/v10/v130/__init__.py → tests/metadata/v1/v130/__init__.py
diff --git a/tests/metadata/v10/v130/test_example.py → tests/metadata/v1/v130/test_example.py b/tests/metadata/v10/v130/test_example.py → tests/metadata/v1/v130/test_example.py
@@ -5,15 +5,15 @@
 
 def test_oemetadata_example_should_load():
     try:
-        from metadata.v10.v130.example import OEMETADATA_V130_EXAMPLE
+        from metadata.v1.v130.example import OEMETADATA_V130_EXAMPLE
     except Warning:
         print("Cannot open OEMetadata Example (v1.3.0)!")
 
 
 def test_oemetadata_schema_should_validate_oemetadata_example():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v130.example import OEMETADATA_V130_EXAMPLE
-    from metadata.v10.v130.schema import OEMETADATA_V130_SCHEMA
+    from metadata.v1.v130.example import OEMETADATA_V130_EXAMPLE
+    from metadata.v1.v130.schema import OEMETADATA_V130_SCHEMA
 
     try:
         validate(OEMETADATA_V130_EXAMPLE, OEMETADATA_V130_SCHEMA)

diff --git a/tests/metadata/v10/v130/test_schema.py → tests/metadata/v1/v130/test_schema.py b/tests/metadata/v10/v130/test_schema.py → tests/metadata/v1/v130/test_schema.py
@@ -5,14 +5,14 @@
 
 def test_oemetadata_schema_should_load():
     try:
-        from metadata.v10.v130.schema import OEMETADATA_V130_SCHEMA
+        from metadata.v1.v130.schema import OEMETADATA_V130_SCHEMA
     except Warning:
         print("Cannot open OEMetadata Schema (v1.3.0)!")
 
 
 def test_jsonschema_should_validate_oemetadata_schema():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v130.schema import OEMETADATA_V130_SCHEMA
+    from metadata.v1.v130.schema import OEMETADATA_V130_SCHEMA
     from metadata.json_schema.draft07.schema \
         import OEMETADATA_JSONSCHEMA_DRAFT07_SCHEMA
 
@@ -24,7 +24,7 @@ def test_jsonschema_should_validate_oemetadata_schema():
 
 
 def test_oemetadata_schema_should_have_correct_path():
-    from metadata.v10.v130.schema import OEMETADATA_V130_SCHEMA
+    from metadata.v1.v130.schema import OEMETADATA_V130_SCHEMA
     import string
 
     def get_string(s):

diff --git a/tests/metadata/v10/v130/test_template.py → tests/metadata/v1/v130/test_template.py b/tests/metadata/v10/v130/test_template.py → tests/metadata/v1/v130/test_template.py
@@ -5,15 +5,15 @@
 
 def test_oemetadata_template_should_load():
     try:
-        from metadata.v10.v130.template import OEMETADATA_V130_TEMPLATE
+        from metadata.v1.v130.template import OEMETADATA_V130_TEMPLATE
     except Warning:
         print("Cannot open OEMetadata Template (v1.3.0)!")
 
 
 def test_oemetadata_schema_should_validate_oemetadata_template():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v130.template import OEMETADATA_V130_TEMPLATE
-    from metadata.v10.v130.schema import OEMETADATA_V130_SCHEMA
+    from metadata.v1.v130.template import OEMETADATA_V130_TEMPLATE
+    from metadata.v1.v130.schema import OEMETADATA_V130_SCHEMA
 
     try:
         validate(OEMETADATA_V130_TEMPLATE, OEMETADATA_V130_SCHEMA)

diff --git a/tests/metadata/v10/v140/__init__.py → tests/metadata/v1/v140/__init__.py b/tests/metadata/v10/v140/__init__.py → tests/metadata/v1/v140/__init__.py
diff --git a/tests/metadata/v10/v140/test_example.py → tests/metadata/v1/v140/test_example.py b/tests/metadata/v10/v140/test_example.py → tests/metadata/v1/v140/test_example.py
@@ -5,15 +5,15 @@
 
 def test_oemetadata_example_should_load():
     try:
-        from metadata.v10.v140.example import OEMETADATA_V140_EXAMPLE
+        from metadata.v1.v140.example import OEMETADATA_V140_EXAMPLE
     except Warning:
         print("Cannot open OEMetadata Example (v1.4.0)!")
 
 
 def test_oemetadata_schema_should_validate_oemetadata_example():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v140.example import OEMETADATA_V140_EXAMPLE
-    from metadata.v10.v140.schema import OEMETADATA_V140_SCHEMA
+    from metadata.v1.v140.example import OEMETADATA_V140_EXAMPLE
+    from metadata.v1.v140.schema import OEMETADATA_V140_SCHEMA
 
     try:
         validate(OEMETADATA_V140_EXAMPLE, OEMETADATA_V140_SCHEMA)

diff --git a/tests/metadata/v10/v140/test_schema.py → tests/metadata/v1/v140/test_schema.py b/tests/metadata/v10/v140/test_schema.py → tests/metadata/v1/v140/test_schema.py
@@ -5,14 +5,14 @@
 
 def test_oemetadata_schema_should_load():
     try:
-        from metadata.v10.v140.schema import OEMETADATA_V140_SCHEMA
+        from metadata.v1.v140.schema import OEMETADATA_V140_SCHEMA
     except Warning:
         print("Cannot open OEMetadata Schema (v1.4.0)!")
 
 
 def test_jsonschema_should_validate_oemetadata_schema():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v140.schema import OEMETADATA_V140_SCHEMA
+    from metadata.v1.v140.schema import OEMETADATA_V140_SCHEMA
     from metadata.json_schema.draft07.schema \
         import OEMETADATA_JSONSCHEMA_DRAFT07_SCHEMA
 
@@ -24,7 +24,7 @@ def test_jsonschema_should_validate_oemetadata_schema():
 
 
 def test_oemetadata_schema_should_have_correct_path():
-    from metadata.v10.v140.schema import OEMETADATA_V140_SCHEMA
+    from metadata.v1.v140.schema import OEMETADATA_V140_SCHEMA
     import string
 
     def get_string(s):

diff --git a/tests/metadata/v10/v140/test_template.py → tests/metadata/v1/v140/test_template.py b/tests/metadata/v10/v140/test_template.py → tests/metadata/v1/v140/test_template.py
@@ -5,15 +5,15 @@
 
 def test_oemetadata_template_should_load():
     try:
-        from metadata.v10.v140.template import OEMETADATA_V140_TEMPLATE
+        from metadata.v1.v140.template import OEMETADATA_V140_TEMPLATE
     except Warning:
         print("Cannot open OEMetadata Template (v1.4.0)!")
 
 
 def test_oemetadata_schema_should_validate_oemetadata_template():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v140.template import OEMETADATA_V140_TEMPLATE
-    from metadata.v10.v140.schema import OEMETADATA_V140_SCHEMA
+    from metadata.v1.v140.template import OEMETADATA_V140_TEMPLATE
+    from metadata.v1.v140.schema import OEMETADATA_V140_SCHEMA
 
     try:
         validate(OEMETADATA_V140_TEMPLATE, OEMETADATA_V140_SCHEMA)

diff --git a/tests/metadata/v10/v141/__init__.py → tests/metadata/v1/v141/__init__.py b/tests/metadata/v10/v141/__init__.py → tests/metadata/v1/v141/__init__.py
diff --git a/tests/metadata/v10/v141/test_example.py → tests/metadata/v1/v141/test_example.py b/tests/metadata/v10/v141/test_example.py → tests/metadata/v1/v141/test_example.py
@@ -5,15 +5,15 @@
 
 def test_oemetadata_example_should_load():
     try:
-        from metadata.v10.v141.example import OEMETADATA_V141_EXAMPLE
+        from metadata.v1.v141.example import OEMETADATA_V141_EXAMPLE
     except Warning:
         print("Cannot open OEMetadata Example (v1.4.1)!")
 
 
 def test_oemetadata_schema_should_validate_oemetadata_example():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v141.example import OEMETADATA_V141_EXAMPLE
-    from metadata.v10.v141.schema import OEMETADATA_V141_SCHEMA
+    from metadata.v1.v141.example import OEMETADATA_V141_EXAMPLE
+    from metadata.v1.v141.schema import OEMETADATA_V141_SCHEMA
 
     try:
         validate(OEMETADATA_V141_EXAMPLE, OEMETADATA_V141_SCHEMA)

diff --git a/tests/metadata/v10/v141/test_schema.py → tests/metadata/v1/v141/test_schema.py b/tests/metadata/v10/v141/test_schema.py → tests/metadata/v1/v141/test_schema.py
@@ -5,14 +5,14 @@
 
 def test_oemetadata_schema_should_load():
     try:
-        from metadata.v10.v141.schema import OEMETADATA_V141_SCHEMA
+        from metadata.v1.v141.schema import OEMETADATA_V141_SCHEMA
     except Warning:
         print("Cannot open OEMetadata Schema (v1.4.1)!")
 
 
 def test_jsonschema_should_validate_oemetadata_schema():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v141.schema import OEMETADATA_V141_SCHEMA
+    from metadata.v1.v141.schema import OEMETADATA_V141_SCHEMA
     from metadata.json_schema.draft07.schema \
         import OEMETADATA_JSONSCHEMA_DRAFT07_SCHEMA
 
@@ -24,7 +24,7 @@ def test_jsonschema_should_validate_oemetadata_schema():
 
 
 def test_oemetadata_schema_should_have_correct_path():
-    from metadata.v10.v141.schema import OEMETADATA_V141_SCHEMA
+    from metadata.v1.v141.schema import OEMETADATA_V141_SCHEMA
     import string
 
     def get_string(s):

diff --git a/tests/metadata/v10/v141/test_template.py → tests/metadata/v1/v141/test_template.py b/tests/metadata/v10/v141/test_template.py → tests/metadata/v1/v141/test_template.py
@@ -5,15 +5,15 @@
 
 def test_oemetadata_template_should_load():
     try:
-        from metadata.v10.v141.template import OEMETADATA_V141_TEMPLATE
+        from metadata.v1.v141.template import OEMETADATA_V141_TEMPLATE
     except Warning:
         print("Cannot open OEMetadata Template (v1.4.1)!")
 
 
 def test_oemetadata_schema_should_validate_oemetadata_template():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v141.template import OEMETADATA_V141_TEMPLATE
-    from metadata.v10.v141.schema import OEMETADATA_V141_SCHEMA
+    from metadata.v1.v141.template import OEMETADATA_V141_TEMPLATE
+    from metadata.v1.v141.schema import OEMETADATA_V141_SCHEMA
 
     try:
         validate(OEMETADATA_V141_TEMPLATE, OEMETADATA_V141_SCHEMA)

diff --git a/tests/metadata/v10/v150/__init__.py → tests/metadata/v1/v150/__init__.py b/tests/metadata/v10/v150/__init__.py → tests/metadata/v1/v150/__init__.py
diff --git a/tests/metadata/v10/v150/test_example.py → tests/metadata/v1/v150/test_example.py b/tests/metadata/v10/v150/test_example.py → tests/metadata/v1/v150/test_example.py
@@ -5,15 +5,15 @@
 
 def test_oemetadata_example_should_load():
     try:
-        from metadata.v10.v150.example import OEMETADATA_V150_EXAMPLE
+        from metadata.v1.v150.example import OEMETADATA_V150_EXAMPLE
     except Warning:
         print("Cannot open OEMetadata Example (v1.5.0)!")
 
 
 def test_oemetadata_schema_should_validate_oemetadata_example():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v150.example import OEMETADATA_V150_EXAMPLE
-    from metadata.v10.v150.schema import OEMETADATA_V150_SCHEMA
+    from metadata.v1.v150.example import OEMETADATA_V150_EXAMPLE
+    from metadata.v1.v150.schema import OEMETADATA_V150_SCHEMA
 
     try:
         validate(OEMETADATA_V150_EXAMPLE, OEMETADATA_V150_SCHEMA)

diff --git a/tests/metadata/v10/v150/test_schema.py → tests/metadata/v1/v150/test_schema.py b/tests/metadata/v10/v150/test_schema.py → tests/metadata/v1/v150/test_schema.py
@@ -5,14 +5,14 @@
 
 def test_oemetadata_schema_should_load():
     try:
-        from metadata.v10.v150.schema import OEMETADATA_V150_SCHEMA
+        from metadata.v1.v150.schema import OEMETADATA_V150_SCHEMA
     except Warning:
         print("Cannot open OEMetadata Schema (v1.5.0)!")
 
 
 def test_jsonschema_should_validate_oemetadata_schema():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v150.schema import OEMETADATA_V150_SCHEMA
+    from metadata.v1.v150.schema import OEMETADATA_V150_SCHEMA
     from metadata.json_schema.draft07.schema \
         import OEMETADATA_JSONSCHEMA_DRAFT07_SCHEMA
 
@@ -24,7 +24,7 @@ def test_jsonschema_should_validate_oemetadata_schema():
 
 
 def test_oemetadata_schema_should_have_correct_path():
-    from metadata.v10.v150.schema import OEMETADATA_V150_SCHEMA
+    from metadata.v1.v150.schema import OEMETADATA_V150_SCHEMA
     import string
 
     def get_string(s):

diff --git a/tests/metadata/v10/v150/test_template.py → tests/metadata/v1/v150/test_template.py b/tests/metadata/v10/v150/test_template.py → tests/metadata/v1/v150/test_template.py
@@ -5,15 +5,15 @@
 
 def test_oemetadata_template_should_load():
     try:
-        from metadata.v10.v150.template import OEMETADATA_V150_TEMPLATE
+        from metadata.v1.v150.template import OEMETADATA_V150_TEMPLATE
     except Warning:
         print("Cannot open OEMetadata Template (v1.5.0)!")
 
 
 def test_oemetadata_schema_should_validate_oemetadata_template():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v150.template import OEMETADATA_V150_TEMPLATE
-    from metadata.v10.v150.schema import OEMETADATA_V150_SCHEMA
+    from metadata.v1.v150.template import OEMETADATA_V150_TEMPLATE
+    from metadata.v1.v150.schema import OEMETADATA_V150_SCHEMA
 
     try:
         validate(OEMETADATA_V150_TEMPLATE, OEMETADATA_V150_SCHEMA)

diff --git a/tests/metadata/v10/v151/__init__.py → tests/metadata/v1/v151/__init__.py b/tests/metadata/v10/v151/__init__.py → tests/metadata/v1/v151/__init__.py
diff --git a/tests/metadata/v10/v151/test_example.py → tests/metadata/v1/v151/test_example.py b/tests/metadata/v10/v151/test_example.py → tests/metadata/v1/v151/test_example.py
@@ -5,15 +5,15 @@
 
 def test_oemetadata_example_should_load():
     try:
-        from metadata.v10.v151.example import OEMETADATA_V151_EXAMPLE
+        from metadata.v1.v151.example import OEMETADATA_V151_EXAMPLE
     except Warning:
         print("Cannot open OEMetadata Example (v1.5.1)!")
 
 
 def test_oemetadata_schema_should_validate_oemetadata_example():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v151.example import OEMETADATA_V151_EXAMPLE
-    from metadata.v10.v151.schema import OEMETADATA_V151_SCHEMA
+    from metadata.v1.v151.example import OEMETADATA_V151_EXAMPLE
+    from metadata.v1.v151.schema import OEMETADATA_V151_SCHEMA
 
     try:
         validate(OEMETADATA_V151_EXAMPLE, OEMETADATA_V151_SCHEMA)

diff --git a/tests/metadata/v10/v151/test_schema.py → tests/metadata/v1/v151/test_schema.py b/tests/metadata/v10/v151/test_schema.py → tests/metadata/v1/v151/test_schema.py
@@ -5,14 +5,14 @@
 
 def test_oemetadata_schema_should_load():
     try:
-        from metadata.v10.v151.schema import OEMETADATA_V151_SCHEMA
+        from metadata.v1.v151.schema import OEMETADATA_V151_SCHEMA
     except Warning:
         print("Cannot open OEMetadata Schema (v1.5.1)!")
 
 
 def test_jsonschema_should_validate_oemetadata_schema():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v151.schema import OEMETADATA_V151_SCHEMA
+    from metadata.v1.v151.schema import OEMETADATA_V151_SCHEMA
     from metadata.json_schema.draft07.schema \
         import OEMETADATA_JSONSCHEMA_DRAFT07_SCHEMA
 
@@ -24,7 +24,7 @@ def test_jsonschema_should_validate_oemetadata_schema():
 
 
 def test_oemetadata_schema_should_have_correct_path():
-    from metadata.v10.v151.schema import OEMETADATA_V151_SCHEMA
+    from metadata.v1.v151.schema import OEMETADATA_V151_SCHEMA
     import string
 
     def get_string(s):

diff --git a/tests/metadata/v10/v151/test_template.py → tests/metadata/v1/v151/test_template.py b/tests/metadata/v10/v151/test_template.py → tests/metadata/v1/v151/test_template.py
@@ -5,15 +5,15 @@
 
 def test_oemetadata_template_should_load():
     try:
-        from metadata.v10.v151.template import OEMETADATA_V151_TEMPLATE
+        from metadata.v1.v151.template import OEMETADATA_V151_TEMPLATE
     except Warning:
         print("Cannot open OEMetadata Template (v1.5.1)!")
 
 
 def test_oemetadata_schema_should_validate_oemetadata_template():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v151.template import OEMETADATA_V151_TEMPLATE
-    from metadata.v10.v151.schema import OEMETADATA_V151_SCHEMA
+    from metadata.v1.v151.template import OEMETADATA_V151_TEMPLATE
+    from metadata.v1.v151.schema import OEMETADATA_V151_SCHEMA
 
     try:
         validate(OEMETADATA_V151_TEMPLATE, OEMETADATA_V151_SCHEMA)

diff --git a/tests/metadata/v10/v152/__init__.py → tests/metadata/v1/v152/__init__.py b/tests/metadata/v10/v152/__init__.py → tests/metadata/v1/v152/__init__.py
diff --git a/tests/metadata/v10/v152/test_example.py → tests/metadata/v1/v152/test_example.py b/tests/metadata/v10/v152/test_example.py → tests/metadata/v1/v152/test_example.py
@@ -5,15 +5,15 @@
 
 def test_oemetadata_example_should_load():
     try:
-        from metadata.v10.v152.example import OEMETADATA_V152_EXAMPLE
+        from metadata.v1.v152.example import OEMETADATA_V152_EXAMPLE
     except Warning:
         print("Cannot open OEMetadata Example (v1.5.2)!")
 
 
 def test_oemetadata_schema_should_validate_oemetadata_example():
     from jsonschema import validate, ValidationError
-    from metadata.v10.v152.example import OEMETADATA_V152_EXAMPLE
-    from metadata.v10.v152.schema import OEMETADATA_V152_SCHEMA
+    from metadata.v1.v152.example import OEMETADATA_V152_EXAMPLE
+    from metadata.v1.v152.schema import OEMETADATA_V152_SCHEMA
 
     try:
         validate(OEMETADATA_V152_EXAMPLE, OEMETADATA_V152_SCHEMA)