diff --git a/src/hr_selection_function/__init__.py b/src/hr_selection_function/__init__.py
index b272432..45809d1 100644
--- a/src/hr_selection_function/__init__.py
+++ b/src/hr_selection_function/__init__.py
@@ -1,3 +1,7 @@
+from .config import _DEFAULT_DIRECTORY
 from .data import set_data_directory
 from .models import HR24SelectionFunction, NStarsPredictor
 from .gaia import M10Estimator, MSubsampleEstimator, GaiaDensityEstimator
+
+
+set_data_directory(_DEFAULT_DIRECTORY)
diff --git a/src/hr_selection_function/config.py b/src/hr_selection_function/config.py
index e65dc40..78f98a2 100644
--- a/src/hr_selection_function/config.py
+++ b/src/hr_selection_function/config.py
@@ -3,17 +3,14 @@
 import os
 from pathlib import Path
 
-from hr_selection_function.data import set_data_directory
-
 
 # Internal config storage dict (user access not supported!)
 _CONFIG = dict()
 
 # Setup default directory
-directory = os.getenv("HRSF_DATA", None)
-if directory is None:
-    directory = Path.home() / ".hr_selection_function"
-set_data_directory(directory)
+_DEFAULT_DIRECTORY = os.getenv("HRSF_DATA", None)
+if _DEFAULT_DIRECTORY is None:
+    _DEFAULT_DIRECTORY = Path.home() / ".hr_selection_function"
 
 # Some hard defaults
 _CONFIG["data_url"] = "https://example.com"  # Todo