diff --git a/src/psimpy/inference/active_learning.py b/src/psimpy/inference/active_learning.py
index 5d58c7fd1694dc929babb8f32064e60ca458bab2..c9893447239fc108c8b1a19b02ac4de4c2bbd4ec 100644
--- a/src/psimpy/inference/active_learning.py
+++ b/src/psimpy/inference/active_learning.py
@@ -1,13 +1,13 @@
-import numpy as np
 import sys
+import numpy as np
 from scipy import optimize
 from typing import Union
 from beartype.typing import Callable
 from beartype import beartype
-from psimpy.simulator.run_simulator import RunSimulator
-from psimpy.sampler.latin import LHS
-from psimpy.emulator.robustgasp import ScalarGaSP
-from psimpy.utility.util_funcs import check_bounds
+from psimpy.simulator import RunSimulator
+from psimpy.sampler import LHS
+from psimpy.emulator import ScalarGaSP
+from psimpy.utility import check_bounds
 
 _min_float = 10**(sys.float_info.min_10_exp)
 
diff --git a/src/psimpy/inference/bayes_inference.py b/src/psimpy/inference/bayes_inference.py
index 68095ddee374d3438b4a2b91ba4ddf3241ec6721..183025fac627a66dcfc862e09892f1ff5b74b9da 100644
--- a/src/psimpy/inference/bayes_inference.py
+++ b/src/psimpy/inference/bayes_inference.py
@@ -1,12 +1,12 @@
-import numpy as np
 import sys
+import numpy as np
 from abc import ABC
 from abc import abstractmethod
-from psimpy.sampler.metropolis_hastings import MetropolisHastings
-from psimpy.utility.util_funcs import check_bounds
 from typing import Union
 from beartype.typing import Callable
 from beartype import beartype
+from psimpy.sampler import MetropolisHastings
+from psimpy.utility import check_bounds
 
 _min_float = 10**(sys.float_info.min_10_exp)
 _max_float = 10**(sys.float_info.max_10_exp)
diff --git a/src/psimpy/sampler/latin.py b/src/psimpy/sampler/latin.py
index 3804d80168e1eb275de39c8590913cf383b4a3fc..05a4da4e4ea05ee5b831f9382c54d7fae4026d43 100644
--- a/src/psimpy/sampler/latin.py
+++ b/src/psimpy/sampler/latin.py
@@ -1,8 +1,8 @@
 import numpy as np
 from scipy.spatial.distance import pdist
-from psimpy.utility.util_funcs import check_bounds, scale_samples
 from typing import Union
 from beartype import beartype
+from psimpy.utility import check_bounds, scale_samples
 
 class LHS:
     
diff --git a/src/psimpy/sampler/metropolis_hastings.py b/src/psimpy/sampler/metropolis_hastings.py
index dfb2d23fc406b867035c43c8c8f3b78d69377b6c..c19438e75796bb164667c55f2cb4538a538ecb16 100644
--- a/src/psimpy/sampler/metropolis_hastings.py
+++ b/src/psimpy/sampler/metropolis_hastings.py
@@ -1,9 +1,9 @@
-import numpy as np
 import sys
-from psimpy.utility.util_funcs import check_bounds
+import numpy as np
 from typing import Union
 from beartype.typing import Callable
 from beartype import beartype
+from psimpy.utility import check_bounds
 
 _min_float = 10**(sys.float_info.min_10_exp)
 
diff --git a/src/psimpy/sampler/saltelli.py b/src/psimpy/sampler/saltelli.py
index f7e1de7cd1db33209b3e4b51d7ce5b9451b0f30b..5d5348671bca6fb7f6966fbf3bf84bce7dcf7e3c 100644
--- a/src/psimpy/sampler/saltelli.py
+++ b/src/psimpy/sampler/saltelli.py
@@ -1,8 +1,8 @@
 from SALib.sample import saltelli
 import numpy as np
-from psimpy.utility.util_funcs import check_bounds
 from typing import Union
 from beartype import beartype
+from psimpy.utility import check_bounds
 
 class Saltelli:
     
diff --git a/src/psimpy/simulator/mass_point_model.py b/src/psimpy/simulator/mass_point_model.py
index 4946421dd214bd3f2091e146aa6fc7de36003134..77fbd5c11415fe2d27c22fb381a685d2208f07ac 100644
--- a/src/psimpy/simulator/mass_point_model.py
+++ b/src/psimpy/simulator/mass_point_model.py
@@ -1,9 +1,9 @@
-import numpy as np
-import linecache
+import os
 import math
+import linecache
+import numpy as np
 from scipy.integrate import ode
 from scipy.interpolate import interp2d
-import os
 from typing import Union
 from beartype import beartype
 
diff --git a/src/psimpy/simulator/ravaflow24.py b/src/psimpy/simulator/ravaflow24.py
index 8262421b648f40b6c2b9a398698e27fd6b7cd5b5..f7106fa8ad29386eda50d9e97e2a942c164d1fe5 100755
--- a/src/psimpy/simulator/ravaflow24.py
+++ b/src/psimpy/simulator/ravaflow24.py
@@ -1,6 +1,6 @@
-import numpy as np
 import os
 import linecache
+import numpy as np
 from scipy.interpolate import interp2d
 from typing import Union
 from beartype import beartype