diff --git a/datapackage.json b/datapackage.json
deleted file mode 100644
index a7afdf40..00000000
--- a/datapackage.json
+++ /dev/null
@@ -1,437 +0,0 @@
-{
-  "name": "country-codes",
-  "title": "Comprehensive country codes: ISO 3166, ITU, ISO 4217 currency codes and many more",
-  "format": "csv",
-  "datapackage_version": "1.0.0-beta.13",
-  "last_modified": "2023-09-25",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/datasets/country-codes"
-  },
-  "licenses": [
-    {
-      "name": "ODC-PDDL-1.0",
-      "path": "http://opendatacommons.org/licenses/pddl/",
-      "title": "Open Data Commons Public Domain Dedication and License v1.0"
-    }
-  ],
-  "sources": [
-    {
-      "name": "United Nations Protocol and Liaison Service",
-      "title": "United Nations Protocol and Liaison Service",
-      "path": "https://www.un.org/dgacm/sites/www.un.org.dgacm/files/Documents_Protocol/unterm-efsrca.xlsx"
-    },
-    {
-      "name": "Unicode Common Locale Data Repository (CLDR) Project",
-      "title": "Unicode Common Locale Data Repository (CLDR) Project",
-      "path": "https://github.com/unicode-org/cldr-json/blob/d38478855dd8342749f0494332cc8acc2895d20d/cldr-json/cldr-localenames-full/main/ms/territories.json"
-    },
-    {
-      "name": "United Nations Department of Economic and Social Affairs Statistics Division",
-      "title": "United Nations Department of Economic and Social Affairs Statistics Division",
-      "path": "https://unstats.un.org/unsd/methodology/m49/overview/"
-    },
-    {
-      "name": "SIX Interbank Clearing Ltd (on behalf of ISO)",
-      "title": "SIX Interbank Clearing Ltd (on behalf of ISO)",
-      "path": "https://www.six-group.com/dam/download/financial-information/data-center/iso-currrency/lists/list-one.xml"
-    },
-    {
-      "name": "Statoids",
-      "title": "Statoids",
-      "path": "http://www.statoids.com/wab.html"
-    },
-    {
-      "name": "Geonames",
-      "title": "Geonames",
-      "path": "http://download.geonames.org/export/dump/countryInfo.txt"
-    },
-    {
-      "name": "US Securities and Exchange Commission",
-      "title": "US Securities and Exchange Commission",
-      "path": "https://www.sec.gov/submit-filings/filer-support-resources/edgar-state-country-codes"
-    }
-  ],
-  "resources": [
-    {
-      "name": "country-codes",
-      "format": "csv",
-      "path": "data/country-codes.csv",
-      "schema": {
-        "fields": [
-          {
-            "name": "FIFA",
-            "title": "FIFA code",
-            "description": "Codes assigned by the Fédération Internationale de Football Association",
-            "type": "string"
-          },
-          {
-            "name": "Dial",
-            "title": "telephone dialing code",
-            "description": "Country code from ITU-T recommendation E.164, sometimes followed by area code",
-            "type": "string"
-          },
-          {
-            "name": "ISO3166-1-Alpha-3",
-            "title": "ISO3166-1-Alpha-3",
-            "description": "Alpha-3 codes from ISO 3166-1 (synonymous with World Bank Codes)",
-            "type": "string",
-            "constraints" : {"unique": true, "minLength": 3, "maxLength": 3}
-          },
-          {
-            "name": "MARC",
-            "title": "MARC code",
-            "description": "MAchine-Readable Cataloging codes from the Library of Congress",
-            "type": "string"
-          },
-          {
-            "name": "is_independent",
-            "title": "independent country",
-            "description": "Country status, based on the CIA World Factbook",
-            "type": "string"
-          },
-          {
-            "name": "ISO3166-1-numeric",
-            "title": "ISO3166-1-numeric",
-            "description": "Numeric codes from ISO 3166-1",
-            "type": "string"
-          },
-          {
-            "name": "GAUL",
-            "title": "GAUL code",
-            "description": "Global Administrative Unit Layers from the Food and Agriculture Organization",
-            "type": "string"
-          },
-          {
-            "name": "FIPS",
-            "title": "FIPS code",
-            "description": "Codes from the U.S. standard FIPS PUB 10-4",
-            "type": "string"
-          },
-          {
-            "name": "WMO",
-            "title": "WMO code",
-            "description": "Country abbreviations by the World Meteorological Organization",
-            "type": "string",
-            "constraints" : {"maxLength": 2}
-          },
-          {
-            "name": "ISO3166-1-Alpha-2",
-            "title": "ISO3166-1-Alpha-2",
-            "description": "Alpha-2 codes from ISO 3166-1",
-            "type": "string",
-            "constraints" : {"unique": true, "minLength": 2, "maxLength": 2}
-          },
-          {
-            "name": "ITU",
-            "title": "ITU code",
-            "description": "Codes assigned by the International Telecommunications Union",
-            "type": "string"
-          },
-          {
-            "name": "IOC",
-            "title": "IOC code",
-            "description": "Codes assigned by the International Olympics Committee",
-            "type": "string",
-            "constraints" : {"maxLength": 3}
-          },
-          {
-            "name": "DS",
-            "title": "distinguishing signs of vehicles",
-            "description": "Distinguishing signs of vehicles in international traffic",
-            "type": "string"
-          },
-          {
-            "name": "UNTERM Spanish Formal",
-            "title": "UNTERM Spanish Formal",
-            "description": "Country's formal Spanish name from UN Protocol and Liaison Service",
-            "type": "string"
-          },
-          {
-            "name": "Global Code",
-            "title": "global code",
-            "description": "Country classification from United Nations Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "Intermediate Region Code",
-            "title": "intermediate region code",
-            "description": "Country classification from United Nations Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "official_name_fr",
-            "title": "official name French",
-            "description": "Country or Area official French short name from UN Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "UNTERM French Short",
-            "title": "UNTERM French Short",
-            "description": "Country's short French name from UN Protocol and Liaison Service",
-            "type": "string"
-          },
-          {
-            "name": "ISO4217-currency_name",
-            "title": "ISO4217-currency_name",
-            "description": "ISO 4217 currency name",
-            "type": "string"
-          },
-          {
-            "name": "UNTERM Russian Formal",
-            "title": "UNTERM Russian Formal",
-            "description": "Country's formal Russian name from UN Protocol and Liaison Service",
-            "type": "string"
-          },
-          {
-            "name": "UNTERM English Short",
-            "title": "UNTERM English Short",
-            "description": "Country's short English name from UN Protocol and Liaison Service",
-            "type": "string"
-          },
-          {
-            "name": "ISO4217-currency_alphabetic_code",
-            "title": "ISO4217-currency_alphabetic_code",
-            "description": "ISO 4217 currency alphabetic code",
-            "type": "string"
-          },
-          {
-            "name": "Small Island Developing States (SIDS)",
-            "title": "small island developing state (SIDS)",
-            "description": "Country classification from United Nations Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "UNTERM Spanish Short",
-            "title": "UNTERM Spanish Short",
-            "description": "Country's short Spanish name from UN Protocol and Liaison Service",
-            "type": "string"
-          },
-          {
-            "name": "ISO4217-currency_numeric_code",
-            "title": "ISO4217-currency_numeric_code",
-            "description": "ISO 4217 currency numeric code",
-            "type": "string"
-          },
-          {
-            "name": "UNTERM Chinese Formal",
-            "title": "UNTERM Chinese Formal",
-            "description": "Country's formal Chinese name from UN Protocol and Liaison Service",
-            "type": "string"
-          },
-          {
-            "name": "UNTERM French Formal",
-            "title": "UNTERM French Formal",
-            "description": "Country's formal French name from UN Protocol and Liaison Service",
-            "type": "string"
-          },
-          {
-            "name": "UNTERM Russian Short",
-            "title": "UNTERM Russian Short",
-            "description": "Country's short Russian name from UN Protocol and Liaison Service",
-            "type": "string"
-          },
-          {
-            "name": "M49",
-            "title": "M49",
-            "description": "UN Statistics M49 numeric codes (nearly synonymous with ISO 3166-1 numeric codes, which are based on UN M49. ISO 3166-1 does not include Channel Islands or Sark, for example)",
-            "type": "number",
-            "constraints" : {"unique": true}
-          },
-          {
-            "name": "Sub-region Code",
-            "title": "sub-region code",
-            "description": "Country classification from United Nations Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "Region Code",
-            "title": "region code",
-            "description": "Country classification from United Nations Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "official_name_ar",
-            "title": "official name Arabic",
-            "description": "Country or Area official Arabic short name from UN Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "ISO4217-currency_minor_unit",
-            "title": "ISO4217-currency_minor_unit",
-            "description": "ISO 4217 currency number of minor units",
-            "type": "string"
-          },
-          {
-            "name": "UNTERM Arabic Formal",
-            "title": "UNTERM Arabic Formal",
-            "description": "Country's formal Arabic name from UN Protocol and Liaison Service",
-            "type": "string"
-          },
-          {
-            "name": "UNTERM Chinese Short",
-            "title": "UNTERM Chinese Short",
-            "description": "Country's short Chinese name from UN Protocol and Liaison Service",
-            "type": "string"
-          },
-          {
-            "name": "Land Locked Developing Countries (LLDC)",
-            "title": "land locked developing country (LLDC)",
-            "description": "Country classification from United Nations Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "Intermediate Region Name",
-            "title": "intermediate region name",
-            "description": "Country classification from United Nations Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "official_name_es",
-            "title": "official name Spanish",
-            "description": "Country or Area official Spanish short name from UN Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "UNTERM English Formal",
-            "title": "UNTERM English Formal",
-            "description": "Country's formal English name from UN Protocol and Liaison Service",
-            "type": "string"
-          },
-          {
-            "name": "official_name_cn",
-            "title": "official name Chinese",
-            "description": "Country or Area official Chinese short name from UN Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "official_name_en",
-            "title": "official name English",
-            "description": "Country or Area official English short name from UN Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "ISO4217-currency_country_name",
-            "title": "ISO4217-currency_country_name",
-            "description": "ISO 4217 country name",
-            "type": "string"
-          },
-          {
-            "name": "Least Developed Countries (LDC)",
-            "title": "least developed country (LDC)",
-            "description": "Country classification from United Nations Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "Region Name",
-            "title": "region name",
-            "description": "Country classification from United Nations Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "UNTERM Arabic Short",
-            "title": "UNTERM Arabic Short",
-            "description": "Country's short Arabic name from UN Protocol and Liaison Service",
-            "type": "string"
-          },
-          {
-            "name": "Sub-region Name",
-            "title": "sub-region name",
-            "description": "Country classification from United Nations Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "official_name_ru",
-            "title": "official name Russian",
-            "description": "Country or Area official Russian short name from UN Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "Global Name",
-            "title": "global name",
-            "description": "Country classification from United Nations Statistics Division",
-            "type": "string"
-          },
-          {
-            "name": "Capital",
-            "title": "capital city",
-            "description": "Capital city from Geonames",
-            "type": "string"
-          },
-          {
-            "name": "Continent",
-            "title": "continent",
-            "description": "Continent from Geonames",
-            "type": "string",
-            "constraints" : {"minLength": 2, "maxLength": 2}
-          },
-          {
-            "name": "TLD",
-            "title": "TLD",
-            "description": "Top level domain from Geonames",
-            "type": "string"
-          },
-          {
-            "name": "Languages",
-            "title": "languages",
-            "description": "Languages from Geonames",
-            "type": "string"
-          },
-          {
-            "name": "Geoname ID",
-            "title": "Geoname ID",
-            "description": "Geoname ID",
-            "type": "number",
-            "constraints" : {"unique": true}
-          },
-          {
-            "name": "CLDR display name",
-            "title": "CLDR display name",
-            "description": "Country's customary English short name (CLDR)",
-            "type": "string"
-          },
-          {
-            "name": "EDGAR",
-            "title": "EDGAR code",
-            "description": "EDGAR country code from SEC",
-            "type": "string",
-            "constraints" : {"maxLength": 2}
-          }
-        ]
-      }
-    }
-  ],
-  "contributors": [
-    {
-     "title": "Evan Wheeler",
-     "path": "https://github.com/datasets/country-codes",
-     "role": "maintainer"
-    }
-  ],
-  "related": [
-    {
-      "title": "Country list",
-      "path": "/core/country-list",
-      "publisher": "core",
-      "formats": ["CSV", "JSON"]
-    },
-    {
-      "title": "Language codes",
-      "path": "/core/language-codes",
-      "publisher": "core",
-      "formats": ["CSV", "JSON"]
-    },
-    {
-      "title": "Airport codes",
-      "path": "/core/airport-codes",
-      "publisher": "core",
-      "formats": ["CSV", "JSON"]
-    },
-    {
-      "title": "Continent codes",
-      "path": "/core/continent-codes",
-      "publisher": "core",
-      "formats": ["CSV", "JSON"]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/datapackage.yml b/datapackage.yml
new file mode 100644
index 00000000..2492bfae
--- /dev/null
+++ b/datapackage.yml
@@ -0,0 +1,310 @@
+name: country-codes
+title: Comprehensive country codes: ISO 3166, ITU, ISO 4217 currency codes and many more
+format: csv
+datapackage_version: 1.0.0-beta.13
+last_modified: 2023-09-25
+repository:
+  type: git
+  url: https://github.com/datasets/country-codes
+licenses:
+  - name: ODC-PDDL-1.0
+    path: http://opendatacommons.org/licenses/pddl/
+    title: Open Data Commons Public Domain Dedication and License v1.0
+sources:
+  - name: United Nations Protocol and Liaison Service
+    title: United Nations Protocol and Liaison Service
+    path: https://www.un.org/dgacm/sites/www.un.org.dgacm/files/Documents_Protocol/unterm-efsrca.xlsx
+  - name: Unicode Common Locale Data Repository (CLDR) Project
+    title: Unicode Common Locale Data Repository (CLDR) Project
+    path: https://github.com/unicode-org/cldr-json/blob/d38478855dd8342749f0494332cc8acc2895d20d/cldr-json/cldr-localenames-full/main/ms/territories.json
+  - name: United Nations Department of Economic and Social Affairs Statistics Division
+    title: United Nations Department of Economic and Social Affairs Statistics Division
+    path: https://unstats.un.org/unsd/methodology/m49/overview/
+  - name: SIX Interbank Clearing Ltd (on behalf of ISO)
+    title: SIX Interbank Clearing Ltd (on behalf of ISO)
+    path: https://www.six-group.com/dam/download/financial-information/data-center/iso-currrency/lists/list-one.xml
+  - name: Statoids
+    title: Statoids
+    path: http://www.statoids.com/wab.html
+  - name: Geonames
+    title: Geonames
+    path: http://download.geonames.org/export/dump/countryInfo.txt
+  - name: US Securities and Exchange Commission
+    title: US Securities and Exchange Commission
+    path: https://www.sec.gov/submit-filings/filer-support-resources/edgar-state-country-codes
+resources:
+  - name: country-codes
+    format: csv
+    path: data/country-codes.csv
+    schema:
+      fields:
+        - name: FIFA
+          title: FIFA code
+          description: Codes assigned by the Fédération Internationale de Football Association
+          type: string
+        - name: Dial
+          title: telephone dialing code
+          description: Country code from ITU-T recommendation E.164, sometimes followed by area code
+          type: string
+        - name: ISO3166-1-Alpha-3
+          title: ISO3166-1-Alpha-3
+          description: Alpha-3 codes from ISO 3166-1 (synonymous with World Bank Codes)
+          type: string
+          constraints:
+            unique: true
+            minLength: 3
+            maxLength: 3
+        - name: MARC
+          title: MARC code
+          description: MAchine-Readable Cataloging codes from the Library of Congress
+          type: string
+        - name: is_independent
+          title: independent country
+          description: Country status, based on the CIA World Factbook
+          type: string
+        - name: ISO3166-1-numeric
+          title: ISO3166-1-numeric
+          description: Numeric codes from ISO 3166-1
+          type: string
+        - name: GAUL
+          title: GAUL code
+          description: Global Administrative Unit Layers from the Food and Agriculture Organization
+          type: string
+        - name: FIPS
+          title: FIPS code
+          description: Codes from the U.S. standard FIPS PUB 10-4
+          type: string
+        - name: WMO
+          title: WMO code
+          description: Country abbreviations by the World Meteorological Organization
+          type: string
+          constraints:
+            maxLength: 2
+        - name: ISO3166-1-Alpha-2
+          title: ISO3166-1-Alpha-2
+          description: Alpha-2 codes from ISO 3166-1
+          type: string
+          constraints:
+            unique: true
+            minLength: 2
+            maxLength: 2
+        - name: ITU
+          title: ITU code
+          description: Codes assigned by the International Telecommunications Union
+          type: string
+        - name: IOC
+          title: IOC code
+          description: Codes assigned by the International Olympics Committee
+          type: string
+          constraints:
+            maxLength: 3
+        - name: DS
+          title: distinguishing signs of vehicles
+          description: Distinguishing signs of vehicles in international traffic
+          type: string
+        - name: UNTERM Spanish Formal
+          title: UNTERM Spanish Formal
+          description: Country's formal Spanish name from UN Protocol and Liaison Service
+          type: string
+        - name: Global Code
+          title: global code
+          description: Country classification from United Nations Statistics Division
+          type: string
+        - name: Intermediate Region Code
+          title: intermediate region code
+          description: Country classification from United Nations Statistics Division
+          type: string
+        - name: official_name_fr
+          title: official name French
+          description: Country or Area official French short name from UN Statistics Division
+          type: string
+        - name: UNTERM French Short
+          title: UNTERM French Short
+          description: Country's short French name from UN Protocol and Liaison Service
+          type: string
+        - name: ISO4217-currency_name
+          title: ISO4217-currency_name
+          description: ISO 4217 currency name
+          type: string
+        - name: UNTERM Russian Formal
+          title: UNTERM Russian Formal
+          description: Country's formal Russian name from UN Protocol and Liaison Service
+          type: string
+        - name: UNTERM English Short
+          title: UNTERM English Short
+          description: Country's short English name from UN Protocol and Liaison Service
+          type: string
+        - name: ISO4217-currency_alphabetic_code
+          title: ISO4217-currency_alphabetic_code
+          description: ISO 4217 currency alphabetic code
+          type: string
+        - name: Small Island Developing States (SIDS)
+          title: small island developing state (SIDS)
+          description: Country classification from United Nations Statistics Division
+          type: string
+        - name: UNTERM Spanish Short
+          title: UNTERM Spanish Short
+          description: Country's short Spanish name from UN Protocol and Liaison Service
+          type: string
+        - name: ISO4217-currency_numeric_code
+          title: ISO4217-currency_numeric_code
+          description: ISO 4217 currency numeric code
+          type: string
+        - name: UNTERM Chinese Formal
+          title: UNTERM Chinese Formal
+          description: Country's formal Chinese name from UN Protocol and Liaison Service
+          type: string
+        - name: UNTERM French Formal
+          title: UNTERM French Formal
+          description: Country's formal French name from UN Protocol and Liaison Service
+          type: string
+        - name: UNTERM Russian Short
+          title: UNTERM Russian Short
+          description: Country's short Russian name from UN Protocol and Liaison Service
+          type: string
+        - name: M49
+          title: M49
+          description: UN Statistics M49 numeric codes (nearly synonymous with ISO 3166-1 numeric codes, which are based on UN M49. ISO 3166-1 does not include Channel Islands or Sark, for example)
+          type: number
+          constraints:
+            unique: true
+        - name: Sub-region Code
+          title: sub-region code
+          description: Country classification from United Nations Statistics Division
+          type: string
+        - name: Region Code
+          title: region code
+          description: Country classification from United Nations Statistics Division
+          type: string
+        - name: official_name_ar
+          title: official name Arabic
+          description: Country or Area official Arabic short name from UN Statistics Division
+          type: string
+        - name: ISO4217-currency_minor_unit
+          title: ISO4217-currency_minor_unit
+          description: ISO 4217 currency number of minor units
+          type: string
+        - name: UNTERM Arabic Formal
+          title: UNTERM Arabic Formal
+          description: Country's formal Arabic name from UN Protocol and Liaison Service
+          type: string
+        - name: UNTERM Chinese Short
+          title: UNTERM Chinese Short
+          description: Country's short Chinese name from UN Protocol and Liaison Service
+          type: string
+        - name: Land Locked Developing Countries (LLDC)
+          title: land locked developing country (LLDC)
+          description: Country classification from United Nations Statistics Division
+          type: string
+        - name: Intermediate Region Name
+          title: intermediate region name
+          description: Country classification from United Nations Statistics Division
+          type: string
+        - name: official_name_es
+          title: official name Spanish
+          description: Country or Area official Spanish short name from UN Statistics Division
+          type: string
+        - name: UNTERM English Formal
+          title: UNTERM English Formal
+          description: Country's formal English name from UN Protocol and Liaison Service
+          type: string
+        - name: official_name_cn
+          title: official name Chinese
+          description: Country or Area official Chinese short name from UN Statistics Division
+          type: string
+        - name: official_name_en
+          title: official name English
+          description: Country or Area official English short name from UN Statistics Division
+          type: string
+        - name: ISO4217-currency_country_name
+          title: ISO4217-currency_country_name
+          description: ISO 4217 country name
+          type: string
+        - name: Least Developed Countries (LDC)
+          title: least developed country (LDC)
+          description: Country classification from United Nations Statistics Division
+          type: string
+        - name: Region Name
+          title: region name
+          description: Country classification from United Nations Statistics Division
+          type: string
+        - name: UNTERM Arabic Short
+          title: UNTERM Arabic Short
+          description: Country's short Arabic name from UN Protocol and Liaison Service
+          type: string
+        - name: Sub-region Name
+          title: sub-region name
+          description: Country classification from United Nations Statistics Division
+          type: string
+        - name: official_name_ru
+          title: official name Russian
+          description: Country or Area official Russian short name from UN Statistics Division
+          type: string
+        - name: Global Name
+          title: global name
+          description: Country classification from United Nations Statistics Division
+          type: string
+        - name: Capital
+          title: capital city
+          description: Capital city from Geonames
+          type: string
+        - name: Continent
+          title: continent
+          description: Continent from Geonames
+          type: string
+          constraints:
+            minLength: 2
+            maxLength: 2
+        - name: TLD
+          title: TLD
+          description: Top level domain from Geonames
+          type: string
+        - name: Languages
+          title: languages
+          description: Languages from Geonames
+          type: string
+        - name: Geoname ID
+          title: Geoname ID
+          description: Geoname ID
+          type: number
+          constraints:
+            unique: true
+        - name: CLDR display name
+          title: CLDR display name
+          description: Country's customary English short name (CLDR)
+          type: string
+        - name: EDGAR
+          title: EDGAR code
+          description: EDGAR country code from SEC
+          type: string
+          constraints:
+            maxLength: 2
+contributors:
+  - title: Evan Wheeler
+    path: https://github.com/datasets/country-codes
+    role: maintainer
+related:
+  - title: Country list
+    path: /core/country-list
+    publisher: core
+    formats:
+      - CSV
+      - JSON
+  - title: Language codes
+    path: /core/language-codes
+    publisher: core
+    formats:
+      - CSV
+      - JSON
+  - title: Airport codes
+    path: /core/airport-codes
+    publisher: core
+    formats:
+      - CSV
+      - JSON
+  - title: Continent codes
+    path: /core/continent-codes
+    publisher: core
+    formats:
+      - CSV
+      - JSON