diff --git a/binarycpython/tests/test_ensemble.py b/binarycpython/tests/test_ensemble.py
index 54206a2e927a92c1dde885e8ae6a1b8869726670..1ac6a3bdd9c437e8720d2b80ed59d37bd00a1cc1 100644
--- a/binarycpython/tests/test_ensemble.py
+++ b/binarycpython/tests/test_ensemble.py
@@ -24,7 +24,7 @@ from binarycpython.utils.ensemble import (
     ensemble_file_type,
     open_ensemble,
 )
-from binarycpython import Population
+from binarycpython.utils.population_class import Population
 
 TMP_DIR = temp_dir("tests", "test_ensemble")
 TEST_VERBOSITY = 1
diff --git a/binarycpython/tests/test_grid.py b/binarycpython/tests/test_grid.py
index 77e5e2aad2d48bc48c9ef249c966a6d8e6f66494..97afaec8c9032458be7f0d2eff2f9a71ceb6a40c 100644
--- a/binarycpython/tests/test_grid.py
+++ b/binarycpython/tests/test_grid.py
@@ -36,7 +36,7 @@ from binarycpython.utils.dicts import (
     merge_dicts,
 )
 
-from binarycpython import Population
+from binarycpython.utils.population_class import Population
 
 TMP_DIR = temp_dir("tests", "test_grid")
 shutil.rmtree(TMP_DIR)
diff --git a/binarycpython/tests/tests_population_extensions/test_condor.py b/binarycpython/tests/tests_population_extensions/test_condor.py
index adbb5048cc3853a7ebc33c295d129c7e972004a6..aede2276ae2ac3bd38b9610123fde691c71be719 100644
--- a/binarycpython/tests/tests_population_extensions/test_condor.py
+++ b/binarycpython/tests/tests_population_extensions/test_condor.py
@@ -12,7 +12,7 @@ import shutil
 import unittest
 
 from binarycpython.utils.functions import Capturing, temp_dir
-from binarycpython import Population
+from binarycpython.utils.population_class import Population
 
 TMP_DIR = temp_dir("tests", "test_condor")
 shutil.rmtree(TMP_DIR)
diff --git a/binarycpython/tests/tests_population_extensions/test_distribution_functions.py b/binarycpython/tests/tests_population_extensions/test_distribution_functions.py
index 57c21a7f5937ecb9d5fd2de586b8f877dee5fd78..efad79c728d15d3cf796b9c05d66acb605eb188f 100644
--- a/binarycpython/tests/tests_population_extensions/test_distribution_functions.py
+++ b/binarycpython/tests/tests_population_extensions/test_distribution_functions.py
@@ -32,7 +32,7 @@ import numpy as np
 from binarycpython.utils.useful_funcs import calc_sep_from_period
 from binarycpython.utils.functions import Capturing, temp_dir
 
-from binarycpython import Population
+from binarycpython.utils.population_class import Population
 
 TMP_DIR = temp_dir("tests", "test_distributions")
 
diff --git a/binarycpython/tests/tests_population_extensions/test_gridcode.py b/binarycpython/tests/tests_population_extensions/test_gridcode.py
index 11cc4f94f661092d35162d59ddf4907b109d5cf9..cd163fb6607f71361d0ed25793b27cdc664ec99e 100644
--- a/binarycpython/tests/tests_population_extensions/test_gridcode.py
+++ b/binarycpython/tests/tests_population_extensions/test_gridcode.py
@@ -23,7 +23,7 @@ from binarycpython.utils.functions import (
     Capturing,
 )
 
-from binarycpython import Population
+from binarycpython.utils.population_class import Population
 
 TMP_DIR = temp_dir("tests", "test_gridcode")
 shutil.rmtree(TMP_DIR)
diff --git a/binarycpython/tests/tests_population_extensions/test_slurm.py b/binarycpython/tests/tests_population_extensions/test_slurm.py
index d1748e461297a55b2ebc25844759b2b67311bf11..aa9c254b2b01b8b0106dd5f21d74f1504b8c94f2 100644
--- a/binarycpython/tests/tests_population_extensions/test_slurm.py
+++ b/binarycpython/tests/tests_population_extensions/test_slurm.py
@@ -12,7 +12,7 @@ import shutil
 import unittest
 
 from binarycpython.utils.functions import Capturing, temp_dir
-from binarycpython import Population
+from binarycpython.utils.population_class import Population
 
 TMP_DIR = temp_dir("tests", "test_slurm")
 shutil.rmtree(TMP_DIR)
diff --git a/binarycpython/tests/tests_population_extensions/test_version_info.py b/binarycpython/tests/tests_population_extensions/test_version_info.py
index 7b02b79a80a5a10c84c65ac41fb9e5aa4656019b..14dac8e2a7dfe1cd5747296e71b257d5790b41cb 100644
--- a/binarycpython/tests/tests_population_extensions/test_version_info.py
+++ b/binarycpython/tests/tests_population_extensions/test_version_info.py
@@ -11,7 +11,7 @@ from binarycpython.utils.functions import (
     temp_dir,
     Capturing,
 )
-from binarycpython import Population
+from binarycpython.utils.population_class import Population
 
 TMP_DIR = temp_dir("tests", "test__version_info")
 
diff --git a/binarycpython/utils/functions.py b/binarycpython/utils/functions.py
index f4f4c7276f7ab310c184ea04824af84ab30bf173..c289314df70c7750643194eb93a28f15f1c62b92 100644
--- a/binarycpython/utils/functions.py
+++ b/binarycpython/utils/functions.py
@@ -26,7 +26,7 @@ import sys
 import types
 
 from binarycpython import _binary_c_bindings
-from binarycpython import filter_dict_through_values
+from binarycpython.utils.dicts import filter_dict_through_values
 from colorama import Fore, Back, Style
 from io import StringIO
 from typing import Union
diff --git a/binarycpython/utils/population_extensions/spacing_functions.py b/binarycpython/utils/population_extensions/spacing_functions.py
index 751fbddeaaf05a517217fae51e0c46f9a257e382..ea717f1189b276b9613ba6f67c1d1cf5fea07900 100644
--- a/binarycpython/utils/population_extensions/spacing_functions.py
+++ b/binarycpython/utils/population_extensions/spacing_functions.py
@@ -20,7 +20,7 @@ import numpy as np
 import cachetools
 import diskcache
 
-from binarycpython import Population
+from binarycpython.utils.population_class import Population
 
 import py_rinterpolate