diff --git a/src/holidata/holidays/ES.py b/src/holidata/holidays/ES/__init__.py
similarity index 65%
rename from src/holidata/holidays/ES.py
rename to src/holidata/holidays/ES/__init__.py
index c6196d4..04f9086 100644
--- a/src/holidata/holidays/ES.py
+++ b/src/holidata/holidays/ES/__init__.py
@@ -1,6 +1,11 @@
 from dateutil.easter import EASTER_WESTERN
 
-from .holidays import Country
+from holidata.holidays.holidays import Country
+
+__all__ = [
+    "ES",
+    "es-ES",
+]
 
 
 class ES(Country):
diff --git a/src/holidata/holidays/es-ES.py b/src/holidata/holidays/ES/es-ES.py
similarity index 99%
rename from src/holidata/holidays/es-ES.py
rename to src/holidata/holidays/ES/es-ES.py
index 2ecb6f5..94cc9f2 100644
--- a/src/holidata/holidays/es-ES.py
+++ b/src/holidata/holidays/ES/es-ES.py
@@ -2,7 +2,7 @@
 from dateutil.easter import EASTER_WESTERN
 
 from holidata.utils import SmartDayArrow, easter
-from .holidays import Locale, Holiday
+from holidata.holidays.holidays import Locale, Holiday
 
 """
 Information taken from government websites around 2020-06
diff --git a/src/holidata/holidays/__init__.py b/src/holidata/holidays/__init__.py
index 3e8f3b9..d07a4ee 100644
--- a/src/holidata/holidays/__init__.py
+++ b/src/holidata/holidays/__init__.py
@@ -1,3 +1,4 @@
+from .ES import *
 from .holidays import Locale, Country
 
 __all__ = [
@@ -13,7 +14,6 @@
     "DE",
     "DK",
     "EE",
-    "ES",
     "FI",
     "FI",
     "FR",
@@ -49,7 +49,6 @@
     "en-US",
     "en-ZA",
     "es-CO",
-    "es-ES",
     "es-US",
     "et-EE",
     "fi-FI",