5 files changed, 6 insertions, 4 deletions
diff --git a/fg21sim/extragalactic/clusters/emission.py b/fg21sim/extragalactic/clusters/emission.py
index e71632b..1374b52 100644
--- a/fg21sim/extragalactic/clusters/emission.py
+++ b/fg21sim/extragalactic/clusters/emission.py
@@ -11,7 +11,7 @@ import numpy as np
 import scipy.integrate
 import scipy.special
 
-from .units import (Units as AU, Constants as AC)
+from ...utils.units import (Units as AU, Constants as AC)
 
 
 logger = logging.getLogger(__name__)
diff --git a/fg21sim/extragalactic/clusters/formation.py b/fg21sim/extragalactic/clusters/formation.py
index f8c6d3a..1f48433 100644
--- a/fg21sim/extragalactic/clusters/formation.py
+++ b/fg21sim/extragalactic/clusters/formation.py
@@ -20,8 +20,8 @@ import scipy.integrate
 import scipy.special
 import scipy.optimize
 
-from .cosmology import Cosmology
 from .mergertree import MergerTree
+from ...utils.cosmology import Cosmology
 
 
 logger = logging.getLogger(__name__)
diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py
index a6d5a20..02bd74b 100644
--- a/fg21sim/extragalactic/clusters/halo.py
+++ b/fg21sim/extragalactic/clusters/halo.py
@@ -18,10 +18,12 @@ import scipy.interpolate
 import scipy.integrate
 import scipy.optimize
 
-from .cosmology import Cosmology
 from .formation import ClusterFormation
 from .solver import FokkerPlanckSolver
-from .units import (Units as AU, UnitConversions as AUC, Constants as AC)
+from ...utils.cosmology import Cosmology
+from ...utils.units import (Units as AU,
+                            UnitConversions as AUC,
+                            Constants as AC)
 
 
 logger = logging.getLogger(__name__)
diff --git a/fg21sim/extragalactic/clusters/cosmology.py b/fg21sim/utils/cosmology.py
index 12e581a..12e581a 100644
--- a/fg21sim/extragalactic/clusters/cosmology.py
+++ b/fg21sim/utils/cosmology.py
diff --git a/fg21sim/extragalactic/clusters/units.py b/fg21sim/utils/units.py
index a7e4ef5..a7e4ef5 100644
--- a/fg21sim/extragalactic/clusters/units.py
+++ b/fg21sim/utils/units.py