diff --git a/o365spray/__init__.py b/o365spray/__init__.py
index e150733..3c5aa4c 100644
--- a/o365spray/__init__.py
+++ b/o365spray/__init__.py
@@ -4,3 +4,4 @@
 _V_MIN = 0
 _V_MNT = 4
 __version__ = f"{_V_MAJ}.{_V_MIN}.{_V_MNT}"
+__all__ = ['core']
diff --git a/o365spray/core/__init__.py b/o365spray/core/__init__.py
new file mode 100644
index 0000000..c0cc006
--- /dev/null
+++ b/o365spray/core/__init__.py
@@ -0,0 +1 @@
+__all__ = ['handlers','utils']
diff --git a/o365spray/core/handlers/__init__.py b/o365spray/core/handlers/__init__.py
new file mode 100644
index 0000000..e40865b
--- /dev/null
+++ b/o365spray/core/handlers/__init__.py
@@ -0,0 +1 @@
+__all__ = ['enumerator','sprayer','validator']
diff --git a/o365spray/core/handlers/validator/modules/__init__.py b/o365spray/core/handlers/validator/modules/__init__.py
new file mode 100644
index 0000000..e69de29