diff --git a/__init__.py b/src/porepy/utils/__init__.py
similarity index 100%
rename from __init__.py
rename to src/porepy/utils/__init__.py
diff --git a/accumarray.py b/src/porepy/utils/accumarray.py
similarity index 100%
rename from accumarray.py
rename to src/porepy/utils/accumarray.py
diff --git a/errors/error.py b/src/porepy/utils/errors/error.py
similarity index 100%
rename from errors/error.py
rename to src/porepy/utils/errors/error.py
diff --git a/graph.py b/src/porepy/utils/graph.py
similarity index 100%
rename from graph.py
rename to src/porepy/utils/graph.py
diff --git a/half_space.py b/src/porepy/utils/half_space.py
similarity index 100%
rename from half_space.py
rename to src/porepy/utils/half_space.py
diff --git a/matrix_compression.py b/src/porepy/utils/matrix_compression.py
similarity index 100%
rename from matrix_compression.py
rename to src/porepy/utils/matrix_compression.py
diff --git a/mcolon.py b/src/porepy/utils/mcolon.py
similarity index 100%
rename from mcolon.py
rename to src/porepy/utils/mcolon.py
diff --git a/permutations.py b/src/porepy/utils/permutations.py
similarity index 100%
rename from permutations.py
rename to src/porepy/utils/permutations.py
diff --git a/setmembership.py b/src/porepy/utils/setmembership.py
similarity index 100%
rename from setmembership.py
rename to src/porepy/utils/setmembership.py
diff --git a/tests/__init__.py b/src/porepy/utils/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to src/porepy/utils/tests/__init__.py
diff --git a/tests/test_graph.py b/src/porepy/utils/tests/test_graph.py
similarity index 100%
rename from tests/test_graph.py
rename to src/porepy/utils/tests/test_graph.py
diff --git a/tests/test_half_space.py b/src/porepy/utils/tests/test_half_space.py
similarity index 100%
rename from tests/test_half_space.py
rename to src/porepy/utils/tests/test_half_space.py
diff --git a/tests/test_mcolon.py b/src/porepy/utils/tests/test_mcolon.py
similarity index 100%
rename from tests/test_mcolon.py
rename to src/porepy/utils/tests/test_mcolon.py
diff --git a/tests/test_permutations.py b/src/porepy/utils/tests/test_permutations.py
similarity index 100%
rename from tests/test_permutations.py
rename to src/porepy/utils/tests/test_permutations.py
diff --git a/tests/test_setmembership.py b/src/porepy/utils/tests/test_setmembership.py
similarity index 100%
rename from tests/test_setmembership.py
rename to src/porepy/utils/tests/test_setmembership.py
diff --git a/unique.py b/src/porepy/utils/unique.py
similarity index 100%
rename from unique.py
rename to src/porepy/utils/unique.py