v1: update entities location

vacanza · Jun 6, 2024 · a3fba08 · a3fba08
1 parent 6c80453
commit a3fba08
Show file tree

Hide file tree

Showing 323 changed files with 264 additions and 213 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -19,7 +19,7 @@ repos:
           - rst
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.7
+    rev: v0.4.8
     hooks:
       - id: ruff
       - id: ruff-format

diff --git a/README.rst b/README.rst
@@ -124,7 +124,7 @@ timestamps:
     '1/1/2014' in us_holidays    # True
     1388597445 in us_holidays    # True
 
-Some holidays may be only present in parts of a country:
+Some holidays may be only present in parts of an entity:
 
 .. code-block:: python
 
@@ -138,35 +138,35 @@ Please see the `python-holidays documentation`_ for additional examples and
 detailed information.
 
 
-Available Countries
--------------------
+Available ISO 3166 Entities
+---------------------------
 
 .. _ISO 3166-1 alpha-2 code: https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
 .. _ISO 3166-2 code: https://en.wikipedia.org/wiki/ISO_3166-2
 .. _ISO 639-1 code: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
 .. _ISO 639-2 code: https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes
 
-We currently support 148 country codes. The standard way to refer to a country
+We currently support 148 ISO 3166 entity codes. The standard way to refer to an entity
 is by using its `ISO 3166-1 alpha-2 code`_, the same used for domain names, and
-for a subdivision its `ISO 3166-2 code`_. Some countries have common or foreign
+for a subdivision its `ISO 3166-2 code`_. Some entities have common or foreign
 names or abbreviations as aliases for their subdivisions. These are defined in
 the (optional) ``subdivisions_aliases`` attribute.
-Some of the countries support more than one language for holiday names output.
+Some of the entities support more than one language for holiday names output.
 A default language is defined by ``default_language`` (optional) attribute
 for each entity and is used as a fallback when neither user specified
 language nor user locale language available. The default language code is
-a `ISO 639-1 code`_. A list of all languages supported by country is defined by
+a `ISO 639-1 code`_. A list of all languages supported by entity is defined by
 ``supported_languages`` (optional) attribute. If there is no designated
 `ISO 639-1 code`_ then `ISO 639-2 code`_ can be used.
 
-Many countries have other categories of holidays in addition to common (national-wide) holidays:
+Many entities have other categories of holidays in addition to common (national-wide) holidays:
 bank holidays, school holidays, additional (paid or non-paid) holidays, holidays of state or
 public employees, religious holidays (valid only for these religions followers). A list of all
-categories supported by country is defined by ``supported_categories`` (optional) attribute.
+categories supported by entity is defined by ``supported_categories`` (optional) attribute.
 
-The following is a list of supported countries, their subdivisions followed by their
+The following is a list of supported entities, their subdivisions followed by their
 aliases (if any) in brackets, available languages and additional holiday categories.
-All countries support **PUBLIC** holidays category by default.
+All entities support **PUBLIC** holidays category by default.
 All other default values are highlighted with bold:
 
 
@@ -175,7 +175,7 @@ All other default values are highlighted with bold:
    :header-rows: 1
    :class: tight-table
 
-   * - Country
+   * - Entity
      - Code
      - Subdivisions
      - Supported Languages
@@ -927,14 +927,13 @@ All other default values are highlighted with bold:
      -
 
 
-Available Financial Markets
-===========================
+Available ISO 10383 Entities
+============================
 
 .. _ISO 10383 MIC: https://www.iso20022.org/market-identifier-codes
 
-The standard way to refer to a financial market is to use its `ISO 10383 MIC`_
-(Market Identifier Code) as a "country" code when available. The
-following financial markets are available:
+The standard way to refer to an ISO 10383 entity is to use its `ISO 10383 MIC`_
+(Market Identifier Code). The following ISO 10383 entities are available:
 
 .. list-table::
    :widths: 23 4 83

diff --git a/docs/source/examples.rst b/docs/source/examples.rst
@@ -35,7 +35,7 @@ functions to create the object using a string with the country code:
 .. code-block:: python
 
    >>> us_holidays = holidays.country_holidays('US')
-   >>> nyse_holidays = holidays.financial_holidays('NYSE')
+   >>> nyse_holidays = holidays.entities.iso10383_holidays('NYSE')
 
 Let's print out the holidays in 2014 specific to California, USA:
 
@@ -238,7 +238,7 @@ to override is :py:meth:`_populate`:
 
 .. code-block:: python
 
-   >>> from holidays.countries import US
+   >>> from holidays.entities.iso3166 import US
    >>> class CorporateHolidays(US):
    >>>     def _populate(self, year):
    >>>         # Populate the holiday list with the default US holidays.

diff --git a/docs/source/modules.rst b/docs/source/modules.rst
@@ -5,5 +5,5 @@ Supported Entities
    :toctree: _autosummary
    :recursive:
 
-   holidays.countries
-   holidays.financial
+   holidays.entities.iso3166
+   holidays.entities.iso10383
diff --git a/holidays/__init__.py b/holidays/__init__.py
@@ -26,8 +26,8 @@
 __version__ = "0.51"
 
 
-EntityLoader.load("countries", globals())
-EntityLoader.load("financial", globals())
+EntityLoader.load("iso3166", globals())
+EntityLoader.load("iso10383", globals())
 
 warnings.warn(
     FUTURE_INCOMPATIBILITY_WARNING_TEMPLATE.format(version=__version__),

diff --git a/tests/countries/__init__.py → holidays/entities/__init__.py b/tests/countries/__init__.py → holidays/entities/__init__.py
diff --git a/holidays/entities/iso10383/README.md b/holidays/entities/iso10383/README.md
@@ -0,0 +1,10 @@
+
+# [ISO-10383 entities](https://en.wikipedia.org/wiki/Market_Identifier_Code)
+
+ISO 10383 is the ISO standard that specifies a universal method of identifying exchanges, trading platforms and regulated or non-regulated markets as sources of prices and related information in order to facilitate automated processing.
+
+Additional information:
+
+- <https://www.iso20022.org/market-identifier-codes>
+- <https://www.iso.org/standard/61067.html>
+- <https://www.tradinghours.com/mic>
diff --git a/holidays/financial/__init__.py → holidays/entities/iso10383/__init__.py b/holidays/financial/__init__.py → holidays/entities/iso10383/__init__.py
diff --git a/holidays/financial/european_central_bank.py → ...ntities/iso10383/european_central_bank.py b/holidays/financial/european_central_bank.py → ...ntities/iso10383/european_central_bank.py
diff --git a/holidays/financial/ice_futures_europe.py → ...s/entities/iso10383/ice_futures_europe.py b/holidays/financial/ice_futures_europe.py → ...s/entities/iso10383/ice_futures_europe.py
diff --git a/holidays/financial/ny_stock_exchange.py → ...ys/entities/iso10383/ny_stock_exchange.py b/holidays/financial/ny_stock_exchange.py → ...ys/entities/iso10383/ny_stock_exchange.py
diff --git a/holidays/entities/iso3166/README.md b/holidays/entities/iso3166/README.md
@@ -0,0 +1,12 @@
+# [ISO-3166 entities](https://en.wikipedia.org/wiki/ISO_3166)
+
+ISO 3166-1 alpha-2 codes are two-letter country codes defined in ISO 3166-1, part of the ISO 3166 standard[1] published by the International Organization for Standardization (ISO), to represent countries, dependent territories, and special areas of geographical interest. They are the most widely used of the country codes published by ISO (the others being alpha-3 and numeric), and are used most prominently for the Internet's country code top-level domains (with a few exceptions).
+
+ISO 3166-1 alpha-3 codes are three-letter country codes defined in ISO 3166-1, part of the ISO 3166 standard published by the International Organization for Standardization (ISO), to represent countries, dependent territories, and special areas of geographical interest. They allow a better visual association between the codes and the country names than the two-letter alpha-2 codes (the third set of codes is numeric and hence offers no visual association).
+
+ISO 3166-2 is part of the ISO 3166 standard published by the International Organization for Standardization (ISO), and defines codes for identifying the principal subdivisions (e.g., provinces or states) of all countries coded in ISO 3166-1.
+
+Additional information:
+
+- <https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes>
+- <https://www.iso.org/obp/ui/#search>
diff --git a/holidays/countries/__init__.py → holidays/entities/iso3166/__init__.py b/holidays/countries/__init__.py → holidays/entities/iso3166/__init__.py
diff --git a/holidays/countries/albania.py → holidays/entities/iso3166/albania.py b/holidays/countries/albania.py → holidays/entities/iso3166/albania.py
diff --git a/holidays/countries/algeria.py → holidays/entities/iso3166/algeria.py b/holidays/countries/algeria.py → holidays/entities/iso3166/algeria.py
diff --git a/holidays/countries/american_samoa.py → holidays/entities/iso3166/american_samoa.py b/holidays/countries/american_samoa.py → holidays/entities/iso3166/american_samoa.py
@@ -11,7 +11,7 @@
 #  License: MIT (see LICENSE file)
 
 from holidays.constants import PUBLIC, UNOFFICIAL
-from holidays.countries.united_states import US
+from holidays.entities.iso3166.united_states import US
 
 
 class HolidaysAS(US):

diff --git a/holidays/countries/andorra.py → holidays/entities/iso3166/andorra.py b/holidays/countries/andorra.py → holidays/entities/iso3166/andorra.py
diff --git a/holidays/countries/angola.py → holidays/entities/iso3166/angola.py b/holidays/countries/angola.py → holidays/entities/iso3166/angola.py
diff --git a/holidays/countries/argentina.py → holidays/entities/iso3166/argentina.py b/holidays/countries/argentina.py → holidays/entities/iso3166/argentina.py
diff --git a/holidays/countries/armenia.py → holidays/entities/iso3166/armenia.py b/holidays/countries/armenia.py → holidays/entities/iso3166/armenia.py
diff --git a/holidays/countries/aruba.py → holidays/entities/iso3166/aruba.py b/holidays/countries/aruba.py → holidays/entities/iso3166/aruba.py
diff --git a/holidays/countries/australia.py → holidays/entities/iso3166/australia.py b/holidays/countries/australia.py → holidays/entities/iso3166/australia.py
diff --git a/holidays/countries/austria.py → holidays/entities/iso3166/austria.py b/holidays/countries/austria.py → holidays/entities/iso3166/austria.py
diff --git a/holidays/countries/azerbaijan.py → holidays/entities/iso3166/azerbaijan.py b/holidays/countries/azerbaijan.py → holidays/entities/iso3166/azerbaijan.py
diff --git a/holidays/countries/bahamas.py → holidays/entities/iso3166/bahamas.py b/holidays/countries/bahamas.py → holidays/entities/iso3166/bahamas.py
diff --git a/holidays/countries/bahrain.py → holidays/entities/iso3166/bahrain.py b/holidays/countries/bahrain.py → holidays/entities/iso3166/bahrain.py
diff --git a/holidays/countries/bangladesh.py → holidays/entities/iso3166/bangladesh.py b/holidays/countries/bangladesh.py → holidays/entities/iso3166/bangladesh.py
diff --git a/holidays/countries/barbados.py → holidays/entities/iso3166/barbados.py b/holidays/countries/barbados.py → holidays/entities/iso3166/barbados.py
diff --git a/holidays/countries/belarus.py → holidays/entities/iso3166/belarus.py b/holidays/countries/belarus.py → holidays/entities/iso3166/belarus.py
diff --git a/holidays/countries/belgium.py → holidays/entities/iso3166/belgium.py b/holidays/countries/belgium.py → holidays/entities/iso3166/belgium.py
diff --git a/holidays/countries/belize.py → holidays/entities/iso3166/belize.py b/holidays/countries/belize.py → holidays/entities/iso3166/belize.py
diff --git a/holidays/countries/bolivia.py → holidays/entities/iso3166/bolivia.py b/holidays/countries/bolivia.py → holidays/entities/iso3166/bolivia.py
diff --git a/holidays/countries/bosnia_and_herzegovina.py → ...ntities/iso3166/bosnia_and_herzegovina.py b/holidays/countries/bosnia_and_herzegovina.py → ...ntities/iso3166/bosnia_and_herzegovina.py
diff --git a/holidays/countries/botswana.py → holidays/entities/iso3166/botswana.py b/holidays/countries/botswana.py → holidays/entities/iso3166/botswana.py
diff --git a/holidays/countries/brazil.py → holidays/entities/iso3166/brazil.py b/holidays/countries/brazil.py → holidays/entities/iso3166/brazil.py
diff --git a/holidays/countries/brunei.py → holidays/entities/iso3166/brunei.py b/holidays/countries/brunei.py → holidays/entities/iso3166/brunei.py
diff --git a/holidays/countries/bulgaria.py → holidays/entities/iso3166/bulgaria.py b/holidays/countries/bulgaria.py → holidays/entities/iso3166/bulgaria.py
diff --git a/holidays/countries/burkina_faso.py → holidays/entities/iso3166/burkina_faso.py b/holidays/countries/burkina_faso.py → holidays/entities/iso3166/burkina_faso.py
diff --git a/holidays/countries/burundi.py → holidays/entities/iso3166/burundi.py b/holidays/countries/burundi.py → holidays/entities/iso3166/burundi.py
diff --git a/holidays/countries/cambodia.py → holidays/entities/iso3166/cambodia.py b/holidays/countries/cambodia.py → holidays/entities/iso3166/cambodia.py
diff --git a/holidays/countries/cameroon.py → holidays/entities/iso3166/cameroon.py b/holidays/countries/cameroon.py → holidays/entities/iso3166/cameroon.py
diff --git a/holidays/countries/canada.py → holidays/entities/iso3166/canada.py b/holidays/countries/canada.py → holidays/entities/iso3166/canada.py
diff --git a/holidays/countries/chad.py → holidays/entities/iso3166/chad.py b/holidays/countries/chad.py → holidays/entities/iso3166/chad.py
diff --git a/holidays/countries/chile.py → holidays/entities/iso3166/chile.py b/holidays/countries/chile.py → holidays/entities/iso3166/chile.py
diff --git a/holidays/countries/china.py → holidays/entities/iso3166/china.py b/holidays/countries/china.py → holidays/entities/iso3166/china.py
diff --git a/holidays/countries/colombia.py → holidays/entities/iso3166/colombia.py b/holidays/countries/colombia.py → holidays/entities/iso3166/colombia.py
diff --git a/holidays/countries/costa_rica.py → holidays/entities/iso3166/costa_rica.py b/holidays/countries/costa_rica.py → holidays/entities/iso3166/costa_rica.py
diff --git a/holidays/countries/croatia.py → holidays/entities/iso3166/croatia.py b/holidays/countries/croatia.py → holidays/entities/iso3166/croatia.py
diff --git a/holidays/countries/cuba.py → holidays/entities/iso3166/cuba.py b/holidays/countries/cuba.py → holidays/entities/iso3166/cuba.py
diff --git a/holidays/countries/curacao.py → holidays/entities/iso3166/curacao.py b/holidays/countries/curacao.py → holidays/entities/iso3166/curacao.py
diff --git a/holidays/countries/cyprus.py → holidays/entities/iso3166/cyprus.py b/holidays/countries/cyprus.py → holidays/entities/iso3166/cyprus.py
diff --git a/holidays/countries/czechia.py → holidays/entities/iso3166/czechia.py b/holidays/countries/czechia.py → holidays/entities/iso3166/czechia.py
diff --git a/holidays/countries/denmark.py → holidays/entities/iso3166/denmark.py b/holidays/countries/denmark.py → holidays/entities/iso3166/denmark.py
diff --git a/holidays/countries/djibouti.py → holidays/entities/iso3166/djibouti.py b/holidays/countries/djibouti.py → holidays/entities/iso3166/djibouti.py
diff --git a/holidays/countries/dominican_republic.py → ...ys/entities/iso3166/dominican_republic.py b/holidays/countries/dominican_republic.py → ...ys/entities/iso3166/dominican_republic.py
diff --git a/holidays/countries/ecuador.py → holidays/entities/iso3166/ecuador.py b/holidays/countries/ecuador.py → holidays/entities/iso3166/ecuador.py
diff --git a/holidays/countries/egypt.py → holidays/entities/iso3166/egypt.py b/holidays/countries/egypt.py → holidays/entities/iso3166/egypt.py
diff --git a/holidays/countries/el_salvador.py → holidays/entities/iso3166/el_salvador.py b/holidays/countries/el_salvador.py → holidays/entities/iso3166/el_salvador.py
diff --git a/holidays/countries/estonia.py → holidays/entities/iso3166/estonia.py b/holidays/countries/estonia.py → holidays/entities/iso3166/estonia.py
diff --git a/holidays/countries/eswatini.py → holidays/entities/iso3166/eswatini.py b/holidays/countries/eswatini.py → holidays/entities/iso3166/eswatini.py
diff --git a/holidays/countries/ethiopia.py → holidays/entities/iso3166/ethiopia.py b/holidays/countries/ethiopia.py → holidays/entities/iso3166/ethiopia.py
diff --git a/holidays/countries/finland.py → holidays/entities/iso3166/finland.py b/holidays/countries/finland.py → holidays/entities/iso3166/finland.py
diff --git a/holidays/countries/france.py → holidays/entities/iso3166/france.py b/holidays/countries/france.py → holidays/entities/iso3166/france.py
diff --git a/holidays/countries/gabon.py → holidays/entities/iso3166/gabon.py b/holidays/countries/gabon.py → holidays/entities/iso3166/gabon.py
diff --git a/holidays/countries/georgia.py → holidays/entities/iso3166/georgia.py b/holidays/countries/georgia.py → holidays/entities/iso3166/georgia.py
diff --git a/holidays/countries/germany.py → holidays/entities/iso3166/germany.py b/holidays/countries/germany.py → holidays/entities/iso3166/germany.py
diff --git a/holidays/countries/ghana.py → holidays/entities/iso3166/ghana.py b/holidays/countries/ghana.py → holidays/entities/iso3166/ghana.py
diff --git a/holidays/countries/greece.py → holidays/entities/iso3166/greece.py b/holidays/countries/greece.py → holidays/entities/iso3166/greece.py
diff --git a/holidays/countries/greenland.py → holidays/entities/iso3166/greenland.py b/holidays/countries/greenland.py → holidays/entities/iso3166/greenland.py
diff --git a/holidays/countries/guam.py → holidays/entities/iso3166/guam.py b/holidays/countries/guam.py → holidays/entities/iso3166/guam.py
@@ -11,7 +11,7 @@
 #  License: MIT (see LICENSE file)
 
 from holidays.constants import PUBLIC, UNOFFICIAL
-from holidays.countries.united_states import US
+from holidays.entities.iso3166.united_states import US
 
 
 class HolidaysGU(US):

diff --git a/holidays/countries/guatemala.py → holidays/entities/iso3166/guatemala.py b/holidays/countries/guatemala.py → holidays/entities/iso3166/guatemala.py
diff --git a/holidays/countries/honduras.py → holidays/entities/iso3166/honduras.py b/holidays/countries/honduras.py → holidays/entities/iso3166/honduras.py
diff --git a/holidays/countries/hongkong.py → holidays/entities/iso3166/hongkong.py b/holidays/countries/hongkong.py → holidays/entities/iso3166/hongkong.py
diff --git a/holidays/countries/hungary.py → holidays/entities/iso3166/hungary.py b/holidays/countries/hungary.py → holidays/entities/iso3166/hungary.py
diff --git a/holidays/countries/iceland.py → holidays/entities/iso3166/iceland.py b/holidays/countries/iceland.py → holidays/entities/iso3166/iceland.py
diff --git a/holidays/countries/india.py → holidays/entities/iso3166/india.py b/holidays/countries/india.py → holidays/entities/iso3166/india.py
diff --git a/holidays/countries/indonesia.py → holidays/entities/iso3166/indonesia.py b/holidays/countries/indonesia.py → holidays/entities/iso3166/indonesia.py
diff --git a/holidays/countries/iran.py → holidays/entities/iso3166/iran.py b/holidays/countries/iran.py → holidays/entities/iso3166/iran.py
diff --git a/holidays/countries/ireland.py → holidays/entities/iso3166/ireland.py b/holidays/countries/ireland.py → holidays/entities/iso3166/ireland.py
diff --git a/holidays/countries/isle_of_man.py → holidays/entities/iso3166/isle_of_man.py b/holidays/countries/isle_of_man.py → holidays/entities/iso3166/isle_of_man.py
@@ -10,7 +10,7 @@
 #  Website: https://github.com/vacanza/python-holidays
 #  License: MIT (see LICENSE file)
 
-from holidays.countries.united_kingdom import UnitedKingdom, UnitedKingdomStaticHolidays
+from holidays.entities.iso3166.united_kingdom import UnitedKingdom, UnitedKingdomStaticHolidays
 from holidays.groups import ChristianHolidays, InternationalHolidays, StaticHolidays
 from holidays.observed_holiday_base import ObservedHolidayBase, SAT_SUN_TO_NEXT_MON
 

diff --git a/holidays/countries/israel.py → holidays/entities/iso3166/israel.py b/holidays/countries/israel.py → holidays/entities/iso3166/israel.py
diff --git a/holidays/countries/italy.py → holidays/entities/iso3166/italy.py b/holidays/countries/italy.py → holidays/entities/iso3166/italy.py
diff --git a/holidays/countries/jamaica.py → holidays/entities/iso3166/jamaica.py b/holidays/countries/jamaica.py → holidays/entities/iso3166/jamaica.py
diff --git a/holidays/countries/japan.py → holidays/entities/iso3166/japan.py b/holidays/countries/japan.py → holidays/entities/iso3166/japan.py
diff --git a/holidays/countries/jersey.py → holidays/entities/iso3166/jersey.py b/holidays/countries/jersey.py → holidays/entities/iso3166/jersey.py
diff --git a/holidays/countries/jordan.py → holidays/entities/iso3166/jordan.py b/holidays/countries/jordan.py → holidays/entities/iso3166/jordan.py
diff --git a/holidays/countries/kazakhstan.py → holidays/entities/iso3166/kazakhstan.py b/holidays/countries/kazakhstan.py → holidays/entities/iso3166/kazakhstan.py
diff --git a/holidays/countries/kenya.py → holidays/entities/iso3166/kenya.py b/holidays/countries/kenya.py → holidays/entities/iso3166/kenya.py
diff --git a/holidays/countries/kuwait.py → holidays/entities/iso3166/kuwait.py b/holidays/countries/kuwait.py → holidays/entities/iso3166/kuwait.py
diff --git a/holidays/countries/kyrgyzstan.py → holidays/entities/iso3166/kyrgyzstan.py b/holidays/countries/kyrgyzstan.py → holidays/entities/iso3166/kyrgyzstan.py
diff --git a/holidays/countries/laos.py → holidays/entities/iso3166/laos.py b/holidays/countries/laos.py → holidays/entities/iso3166/laos.py
diff --git a/holidays/countries/latvia.py → holidays/entities/iso3166/latvia.py b/holidays/countries/latvia.py → holidays/entities/iso3166/latvia.py
diff --git a/holidays/countries/lesotho.py → holidays/entities/iso3166/lesotho.py b/holidays/countries/lesotho.py → holidays/entities/iso3166/lesotho.py
diff --git a/holidays/countries/liechtenstein.py → holidays/entities/iso3166/liechtenstein.py b/holidays/countries/liechtenstein.py → holidays/entities/iso3166/liechtenstein.py
diff --git a/holidays/countries/lithuania.py → holidays/entities/iso3166/lithuania.py b/holidays/countries/lithuania.py → holidays/entities/iso3166/lithuania.py
diff --git a/holidays/countries/luxembourg.py → holidays/entities/iso3166/luxembourg.py b/holidays/countries/luxembourg.py → holidays/entities/iso3166/luxembourg.py
diff --git a/holidays/countries/madagascar.py → holidays/entities/iso3166/madagascar.py b/holidays/countries/madagascar.py → holidays/entities/iso3166/madagascar.py
diff --git a/holidays/countries/malawi.py → holidays/entities/iso3166/malawi.py b/holidays/countries/malawi.py → holidays/entities/iso3166/malawi.py
diff --git a/holidays/countries/malaysia.py → holidays/entities/iso3166/malaysia.py b/holidays/countries/malaysia.py → holidays/entities/iso3166/malaysia.py
diff --git a/holidays/countries/maldives.py → holidays/entities/iso3166/maldives.py b/holidays/countries/maldives.py → holidays/entities/iso3166/maldives.py
diff --git a/holidays/countries/malta.py → holidays/entities/iso3166/malta.py b/holidays/countries/malta.py → holidays/entities/iso3166/malta.py
diff --git a/holidays/countries/marshall_islands.py → ...days/entities/iso3166/marshall_islands.py b/holidays/countries/marshall_islands.py → ...days/entities/iso3166/marshall_islands.py
diff --git a/holidays/countries/mexico.py → holidays/entities/iso3166/mexico.py b/holidays/countries/mexico.py → holidays/entities/iso3166/mexico.py
diff --git a/holidays/countries/moldova.py → holidays/entities/iso3166/moldova.py b/holidays/countries/moldova.py → holidays/entities/iso3166/moldova.py
diff --git a/holidays/countries/monaco.py → holidays/entities/iso3166/monaco.py b/holidays/countries/monaco.py → holidays/entities/iso3166/monaco.py
diff --git a/holidays/countries/montenegro.py → holidays/entities/iso3166/montenegro.py b/holidays/countries/montenegro.py → holidays/entities/iso3166/montenegro.py
diff --git a/holidays/countries/morocco.py → holidays/entities/iso3166/morocco.py b/holidays/countries/morocco.py → holidays/entities/iso3166/morocco.py
diff --git a/holidays/countries/mozambique.py → holidays/entities/iso3166/mozambique.py b/holidays/countries/mozambique.py → holidays/entities/iso3166/mozambique.py
diff --git a/holidays/countries/namibia.py → holidays/entities/iso3166/namibia.py b/holidays/countries/namibia.py → holidays/entities/iso3166/namibia.py
diff --git a/holidays/countries/netherlands.py → holidays/entities/iso3166/netherlands.py b/holidays/countries/netherlands.py → holidays/entities/iso3166/netherlands.py
diff --git a/holidays/countries/new_zealand.py → holidays/entities/iso3166/new_zealand.py b/holidays/countries/new_zealand.py → holidays/entities/iso3166/new_zealand.py
diff --git a/holidays/countries/nicaragua.py → holidays/entities/iso3166/nicaragua.py b/holidays/countries/nicaragua.py → holidays/entities/iso3166/nicaragua.py
diff --git a/holidays/countries/nigeria.py → holidays/entities/iso3166/nigeria.py b/holidays/countries/nigeria.py → holidays/entities/iso3166/nigeria.py
diff --git a/holidays/countries/north_macedonia.py → holidays/entities/iso3166/north_macedonia.py b/holidays/countries/north_macedonia.py → holidays/entities/iso3166/north_macedonia.py
diff --git a/...ays/countries/northern_mariana_islands.py → ...ities/iso3166/northern_mariana_islands.py b/...ays/countries/northern_mariana_islands.py → ...ities/iso3166/northern_mariana_islands.py
@@ -11,7 +11,7 @@
 #  License: MIT (see LICENSE file)
 
 from holidays.constants import PUBLIC, UNOFFICIAL
-from holidays.countries.united_states import US
+from holidays.entities.iso3166.united_states import US
 
 
 class HolidaysMP(US):

diff --git a/holidays/countries/norway.py → holidays/entities/iso3166/norway.py b/holidays/countries/norway.py → holidays/entities/iso3166/norway.py
diff --git a/holidays/countries/pakistan.py → holidays/entities/iso3166/pakistan.py b/holidays/countries/pakistan.py → holidays/entities/iso3166/pakistan.py
diff --git a/holidays/countries/palau.py → holidays/entities/iso3166/palau.py b/holidays/countries/palau.py → holidays/entities/iso3166/palau.py
diff --git a/holidays/countries/panama.py → holidays/entities/iso3166/panama.py b/holidays/countries/panama.py → holidays/entities/iso3166/panama.py
diff --git a/holidays/countries/papua_new_guinea.py → ...days/entities/iso3166/papua_new_guinea.py b/holidays/countries/papua_new_guinea.py → ...days/entities/iso3166/papua_new_guinea.py
diff --git a/holidays/countries/paraguay.py → holidays/entities/iso3166/paraguay.py b/holidays/countries/paraguay.py → holidays/entities/iso3166/paraguay.py
diff --git a/holidays/countries/peru.py → holidays/entities/iso3166/peru.py b/holidays/countries/peru.py → holidays/entities/iso3166/peru.py
diff --git a/holidays/countries/philippines.py → holidays/entities/iso3166/philippines.py b/holidays/countries/philippines.py → holidays/entities/iso3166/philippines.py
diff --git a/holidays/countries/poland.py → holidays/entities/iso3166/poland.py b/holidays/countries/poland.py → holidays/entities/iso3166/poland.py
diff --git a/holidays/countries/portugal.py → holidays/entities/iso3166/portugal.py b/holidays/countries/portugal.py → holidays/entities/iso3166/portugal.py
diff --git a/holidays/countries/puerto_rico.py → holidays/entities/iso3166/puerto_rico.py b/holidays/countries/puerto_rico.py → holidays/entities/iso3166/puerto_rico.py
@@ -11,7 +11,7 @@
 #  License: MIT (see LICENSE file)
 
 from holidays.constants import PUBLIC, UNOFFICIAL
-from holidays.countries.united_states import US
+from holidays.entities.iso3166.united_states import US
 
 
 class HolidaysPR(US):

diff --git a/holidays/countries/romania.py → holidays/entities/iso3166/romania.py b/holidays/countries/romania.py → holidays/entities/iso3166/romania.py
diff --git a/holidays/countries/russia.py → holidays/entities/iso3166/russia.py b/holidays/countries/russia.py → holidays/entities/iso3166/russia.py
diff --git a/holidays/countries/san_marino.py → holidays/entities/iso3166/san_marino.py b/holidays/countries/san_marino.py → holidays/entities/iso3166/san_marino.py
diff --git a/holidays/countries/saudi_arabia.py → holidays/entities/iso3166/saudi_arabia.py b/holidays/countries/saudi_arabia.py → holidays/entities/iso3166/saudi_arabia.py
diff --git a/holidays/countries/serbia.py → holidays/entities/iso3166/serbia.py b/holidays/countries/serbia.py → holidays/entities/iso3166/serbia.py
diff --git a/holidays/countries/seychelles.py → holidays/entities/iso3166/seychelles.py b/holidays/countries/seychelles.py → holidays/entities/iso3166/seychelles.py
diff --git a/holidays/countries/singapore.py → holidays/entities/iso3166/singapore.py b/holidays/countries/singapore.py → holidays/entities/iso3166/singapore.py
diff --git a/holidays/countries/slovakia.py → holidays/entities/iso3166/slovakia.py b/holidays/countries/slovakia.py → holidays/entities/iso3166/slovakia.py
diff --git a/holidays/countries/slovenia.py → holidays/entities/iso3166/slovenia.py b/holidays/countries/slovenia.py → holidays/entities/iso3166/slovenia.py
diff --git a/holidays/countries/south_africa.py → holidays/entities/iso3166/south_africa.py b/holidays/countries/south_africa.py → holidays/entities/iso3166/south_africa.py
diff --git a/holidays/countries/south_korea.py → holidays/entities/iso3166/south_korea.py b/holidays/countries/south_korea.py → holidays/entities/iso3166/south_korea.py
diff --git a/holidays/countries/spain.py → holidays/entities/iso3166/spain.py b/holidays/countries/spain.py → holidays/entities/iso3166/spain.py
diff --git a/holidays/countries/sweden.py → holidays/entities/iso3166/sweden.py b/holidays/countries/sweden.py → holidays/entities/iso3166/sweden.py
diff --git a/holidays/countries/switzerland.py → holidays/entities/iso3166/switzerland.py b/holidays/countries/switzerland.py → holidays/entities/iso3166/switzerland.py
diff --git a/holidays/countries/taiwan.py → holidays/entities/iso3166/taiwan.py b/holidays/countries/taiwan.py → holidays/entities/iso3166/taiwan.py
diff --git a/holidays/countries/tanzania.py → holidays/entities/iso3166/tanzania.py b/holidays/countries/tanzania.py → holidays/entities/iso3166/tanzania.py
diff --git a/holidays/countries/thailand.py → holidays/entities/iso3166/thailand.py b/holidays/countries/thailand.py → holidays/entities/iso3166/thailand.py
diff --git a/holidays/countries/timor_leste.py → holidays/entities/iso3166/timor_leste.py b/holidays/countries/timor_leste.py → holidays/entities/iso3166/timor_leste.py
diff --git a/holidays/countries/tonga.py → holidays/entities/iso3166/tonga.py b/holidays/countries/tonga.py → holidays/entities/iso3166/tonga.py
diff --git a/holidays/countries/tunisia.py → holidays/entities/iso3166/tunisia.py b/holidays/countries/tunisia.py → holidays/entities/iso3166/tunisia.py
diff --git a/holidays/countries/turkey.py → holidays/entities/iso3166/turkey.py b/holidays/countries/turkey.py → holidays/entities/iso3166/turkey.py
diff --git a/holidays/countries/ukraine.py → holidays/entities/iso3166/ukraine.py b/holidays/countries/ukraine.py → holidays/entities/iso3166/ukraine.py
diff --git a/holidays/countries/united_arab_emirates.py → .../entities/iso3166/united_arab_emirates.py b/holidays/countries/united_arab_emirates.py → .../entities/iso3166/united_arab_emirates.py
diff --git a/holidays/countries/united_kingdom.py → holidays/entities/iso3166/united_kingdom.py b/holidays/countries/united_kingdom.py → holidays/entities/iso3166/united_kingdom.py
diff --git a/holidays/countries/united_states.py → holidays/entities/iso3166/united_states.py b/holidays/countries/united_states.py → holidays/entities/iso3166/united_states.py
diff --git a/...s/united_states_minor_outlying_islands.py → ...6/united_states_minor_outlying_islands.py b/...s/united_states_minor_outlying_islands.py → ...6/united_states_minor_outlying_islands.py
@@ -11,7 +11,7 @@
 #  License: MIT (see LICENSE file)
 
 from holidays.constants import PUBLIC, UNOFFICIAL
-from holidays.countries.united_states import US
+from holidays.entities.iso3166.united_states import US
 
 
 class HolidaysUM(US):

diff --git a/...countries/united_states_virgin_islands.py → ...s/iso3166/united_states_virgin_islands.py b/...countries/united_states_virgin_islands.py → ...s/iso3166/united_states_virgin_islands.py
@@ -11,7 +11,7 @@
 #  License: MIT (see LICENSE file)
 
 from holidays.constants import PUBLIC, UNOFFICIAL
-from holidays.countries.united_states import US
+from holidays.entities.iso3166.united_states import US
 
 
 class HolidaysVI(US):

diff --git a/holidays/countries/uruguay.py → holidays/entities/iso3166/uruguay.py b/holidays/countries/uruguay.py → holidays/entities/iso3166/uruguay.py
diff --git a/holidays/countries/uzbekistan.py → holidays/entities/iso3166/uzbekistan.py b/holidays/countries/uzbekistan.py → holidays/entities/iso3166/uzbekistan.py
diff --git a/holidays/countries/vanuatu.py → holidays/entities/iso3166/vanuatu.py b/holidays/countries/vanuatu.py → holidays/entities/iso3166/vanuatu.py
diff --git a/holidays/countries/vatican_city.py → holidays/entities/iso3166/vatican_city.py b/holidays/countries/vatican_city.py → holidays/entities/iso3166/vatican_city.py
diff --git a/holidays/countries/venezuela.py → holidays/entities/iso3166/venezuela.py b/holidays/countries/venezuela.py → holidays/entities/iso3166/venezuela.py
diff --git a/holidays/countries/vietnam.py → holidays/entities/iso3166/vietnam.py b/holidays/countries/vietnam.py → holidays/entities/iso3166/vietnam.py
diff --git a/holidays/countries/zambia.py → holidays/entities/iso3166/zambia.py b/holidays/countries/zambia.py → holidays/entities/iso3166/zambia.py
diff --git a/holidays/countries/zimbabwe.py → holidays/entities/iso3166/zimbabwe.py b/holidays/countries/zimbabwe.py → holidays/entities/iso3166/zimbabwe.py
diff --git a/holidays/holiday_base.py b/holidays/holiday_base.py
@@ -639,7 +639,7 @@ def __repr__(self) -> str:
 
         parts = []
         if hasattr(self, "market"):
-            parts.append(f"holidays.financial_holidays({self.market!r}")
+            parts.append(f"holidays.entities.iso10383_holidays({self.market!r}")
             parts.append(")")
         elif hasattr(self, "country"):
             parts.append(f"holidays.country_holidays({self.country!r}")

diff --git a/holidays/registry.py b/holidays/registry.py
@@ -198,8 +198,8 @@ def __init__(self, path: str, *args, **kwargs) -> None:
                 "This is a python-holidays entity loader class. "
                 "For entity inheritance purposes please import a class you "
                 "want to derive from directly: e.g., "
-                "`from holidays.countries import Entity` or "
-                "`from holidays.financial import Entity`."
+                "`from holidays.entities.iso3166 import Entity` or "
+                "`from holidays.entities.financial import Entity`."
             )
 
         entity_path = path.split(".")
@@ -273,11 +273,11 @@ def get_financial_codes(include_aliases: bool = True) -> Iterable[str]:
     @staticmethod
     def load(prefix: str, scope: Dict) -> None:
         """Load country or financial entities."""
-        entity_mapping = COUNTRIES if prefix == "countries" else FINANCIAL
+        entity_mapping = COUNTRIES if prefix == "iso3166" else FINANCIAL
         for module, entities in entity_mapping.items():
             scope.update(
                 {
-                    entity: EntityLoader(f"holidays.{prefix}.{module}.{entity}")
+                    entity: EntityLoader(f"holidays.entities.{prefix}.{module}.{entity}")
                     for entity in entities
                 }
             )
diff --git a/pyproject.toml b/pyproject.toml
@@ -64,7 +64,7 @@ select = ["E4", "E7", "E9", "F", "T"]
 max-string-length = 99
 
 [[tool.mypy.overrides]]
-module = "holidays.countries.*"
+module = "holidays.entities.*"
 disable_error_code = ["override"]
 
 [[tool.mypy.overrides]]

diff --git a/tests/financial/__init__.py → tests/entities/__init__.py b/tests/financial/__init__.py → tests/entities/__init__.py
diff --git a/tests/entities/iso10383/__init__.py b/tests/entities/iso10383/__init__.py
@@ -0,0 +1,11 @@
+#  holidays
+#  --------
+#  A fast, efficient Python library for generating country, province and state
+#  specific sets of holidays on the fly. It aims to make determining whether a
+#  specific date is a holiday as fast and flexible as possible.
+#
+#  Authors: Vacanza Team and individual contributors (see AUTHORS file)
+#           dr-prodigy <dr.prodigy.github@gmail.com> (c) 2017-2023
+#           ryanss <ryanssdev@icloud.com> (c) 2014-2017
+#  Website: https://github.com/vacanza/python-holidays
+#  License: MIT (see LICENSE file)
diff --git a/...s/financial/test_european_central_bank.py → ...es/iso10383/test_european_central_bank.py b/...s/financial/test_european_central_bank.py → ...es/iso10383/test_european_central_bank.py
@@ -12,7 +12,7 @@
 
 from unittest import TestCase
 
-from holidays.financial.european_central_bank import EuropeanCentralBank, ECB, TAR
+from holidays.entities.iso10383.european_central_bank import EuropeanCentralBank, ECB, TAR
 from tests.common import CommonFinancialTests
 
 

diff --git a/tests/financial/test_ice_futures_europe.py → ...ities/iso10383/test_ice_futures_europe.py b/tests/financial/test_ice_futures_europe.py → ...ities/iso10383/test_ice_futures_europe.py
@@ -12,7 +12,7 @@
 
 from unittest import TestCase
 
-from holidays.financial.ice_futures_europe import ICEFuturesEurope, IFEU
+from holidays.entities.iso10383.ice_futures_europe import ICEFuturesEurope, IFEU
 from tests.common import CommonFinancialTests
 
 

diff --git a/tests/financial/test_ny_stock_exchange.py → ...tities/iso10383/test_ny_stock_exchange.py b/tests/financial/test_ny_stock_exchange.py → ...tities/iso10383/test_ny_stock_exchange.py
@@ -31,7 +31,7 @@
     SAT,
     SUN,
 )
-from holidays.financial.ny_stock_exchange import NewYorkStockExchange, NYSE, XNYS
+from holidays.entities.iso10383.ny_stock_exchange import NewYorkStockExchange, NYSE, XNYS
 from tests.common import CommonFinancialTests
 
 

diff --git a/tests/entities/iso3166/__init__.py b/tests/entities/iso3166/__init__.py
@@ -0,0 +1,11 @@
+#  holidays
+#  --------
+#  A fast, efficient Python library for generating country, province and state
+#  specific sets of holidays on the fly. It aims to make determining whether a
+#  specific date is a holiday as fast and flexible as possible.
+#
+#  Authors: Vacanza Team and individual contributors (see AUTHORS file)
+#           dr-prodigy <dr.prodigy.github@gmail.com> (c) 2017-2023
+#           ryanss <ryanssdev@icloud.com> (c) 2014-2017
+#  Website: https://github.com/vacanza/python-holidays
+#  License: MIT (see LICENSE file)
diff --git a/tests/countries/test_albania.py → tests/entities/iso3166/test_albania.py b/tests/countries/test_albania.py → tests/entities/iso3166/test_albania.py
@@ -12,7 +12,7 @@
 
 from unittest import TestCase
 
-from holidays.countries.albania import Albania, AL, ALB
+from holidays.entities.iso3166.albania import Albania, AL, ALB
 from tests.common import CommonCountryTests
 
 

diff --git a/tests/countries/test_algeria.py → tests/entities/iso3166/test_algeria.py b/tests/countries/test_algeria.py → tests/entities/iso3166/test_algeria.py
@@ -12,7 +12,7 @@
 
 from unittest import TestCase
 
-from holidays.countries.algeria import Algeria, DZ, DZA
+from holidays.entities.iso3166.algeria import Algeria, DZ, DZA
 from tests.common import CommonCountryTests
 
 

diff --git a/tests/countries/test_american_samoa.py → ...s/entities/iso3166/test_american_samoa.py b/tests/countries/test_american_samoa.py → ...s/entities/iso3166/test_american_samoa.py
@@ -15,7 +15,7 @@
 
 from holidays.calendars.gregorian import DEC
 from holidays.constants import UNOFFICIAL
-from holidays.countries.american_samoa import HolidaysAS, AS, ASM
+from holidays.entities.iso3166.american_samoa import HolidaysAS, AS, ASM
 from tests.common import CommonCountryTests
 
 

diff --git a/tests/countries/test_andorra.py → tests/entities/iso3166/test_andorra.py b/tests/countries/test_andorra.py → tests/entities/iso3166/test_andorra.py
@@ -12,7 +12,7 @@
 
 from unittest import TestCase
 
-from holidays.countries.andorra import Andorra, AD, AND
+from holidays.entities.iso3166.andorra import Andorra, AD, AND
 from tests.common import CommonCountryTests
 
 

diff --git a/tests/countries/test_angola.py → tests/entities/iso3166/test_angola.py b/tests/countries/test_angola.py → tests/entities/iso3166/test_angola.py
@@ -12,7 +12,7 @@
 
 from unittest import TestCase
 
-from holidays.countries.angola import Angola, AO, AGO
+from holidays.entities.iso3166.angola import Angola, AO, AGO
 from tests.common import CommonCountryTests
 
 

diff --git a/tests/countries/test_argentina.py → tests/entities/iso3166/test_argentina.py b/tests/countries/test_argentina.py → tests/entities/iso3166/test_argentina.py
@@ -12,7 +12,7 @@
 
 from unittest import TestCase
 
-from holidays.countries.argentina import Argentina, AR, ARG
+from holidays.entities.iso3166.argentina import Argentina, AR, ARG
 from tests.common import CommonCountryTests
 
 

diff --git a/tests/countries/test_armenia.py → tests/entities/iso3166/test_armenia.py b/tests/countries/test_armenia.py → tests/entities/iso3166/test_armenia.py
@@ -12,7 +12,7 @@
 
 from unittest import TestCase
 
-from holidays.countries.armenia import Armenia, AM, ARM
+from holidays.entities.iso3166.armenia import Armenia, AM, ARM
 from tests.common import CommonCountryTests
 
 

diff --git a/tests/countries/test_aruba.py → tests/entities/iso3166/test_aruba.py b/tests/countries/test_aruba.py → tests/entities/iso3166/test_aruba.py
@@ -12,7 +12,7 @@
 
 from unittest import TestCase
 
-from holidays.countries.aruba import Aruba, AW, ABW
+from holidays.entities.iso3166.aruba import Aruba, AW, ABW
 from tests.common import CommonCountryTests
 
 

diff --git a/tests/countries/test_australia.py → tests/entities/iso3166/test_australia.py b/tests/countries/test_australia.py → tests/entities/iso3166/test_australia.py
@@ -15,7 +15,7 @@
 
 from holidays.calendars.gregorian import JAN, MAR, APR, MAY, JUN, AUG, SEP, OCT, NOV, DEC
 from holidays.constants import BANK, HALF_DAY, PUBLIC
-from holidays.countries.australia import Australia, AU, AUS
+from holidays.entities.iso3166.australia import Australia, AU, AUS
 from tests.common import CommonCountryTests
 
 

diff --git a/tests/countries/test_austria.py → tests/entities/iso3166/test_austria.py b/tests/countries/test_austria.py → tests/entities/iso3166/test_austria.py
@@ -13,7 +13,7 @@
 from unittest import TestCase
 
 from holidays.constants import BANK
-from holidays.countries.austria import Austria, AT, AUT
+from holidays.entities.iso3166.austria import Austria, AT, AUT
 from tests.common import CommonCountryTests