diff --git a/benchmark/job/cli.py b/benchmark/job/cli.py
index fc205194..af7ac775 100644
--- a/benchmark/job/cli.py
+++ b/benchmark/job/cli.py
@@ -8,9 +8,9 @@
     get_workload_suffix,
     name_to_linkname,
 )
+from gymlib.shell import subprocess_run
 
 from benchmark.constants import DEFAULT_SCALE_FACTOR
-from util.shell import subprocess_run
 from util.workspace import DBGymWorkspace, fully_resolve_path
 
 JOB_TABLES_URL = "https://event.cwi.nl/da/job/imdb.tgz"
diff --git a/benchmark/tpch/cli.py b/benchmark/tpch/cli.py
index 78feb734..bca80859 100644
--- a/benchmark/tpch/cli.py
+++ b/benchmark/tpch/cli.py
@@ -10,10 +10,10 @@
     linkname_to_name,
     name_to_linkname,
 )
+from gymlib.shell import subprocess_run
 
 from benchmark.constants import DEFAULT_SCALE_FACTOR
 from benchmark.tpch.constants import DEFAULT_TPCH_SEED, NUM_TPCH_QUERIES
-from util.shell import subprocess_run
 from util.workspace import DBGymWorkspace, fully_resolve_path, is_fully_resolved
 
 TPCH_KIT_DIRNAME = "tpch-kit"
diff --git a/dbms/postgres/cli.py b/dbms/postgres/cli.py
index 6cdacdf4..9e3d0a16 100644
--- a/dbms/postgres/cli.py
+++ b/dbms/postgres/cli.py
@@ -16,6 +16,7 @@
     get_repo_symlink_path,
     linkname_to_name,
 )
+from gymlib.shell import subprocess_run
 
 from benchmark.constants import DEFAULT_SCALE_FACTOR
 from benchmark.job.load_info import JobLoadInfo
@@ -32,7 +33,6 @@
     sql_file_execute,
     sqlalchemy_conn_execute,
 )
-from util.shell import subprocess_run
 from util.workspace import (
     WORKSPACE_PATH_PLACEHOLDER,
     DBGymWorkspace,
diff --git a/gymlib_package/gymlib/__init__.py b/gymlib_package/gymlib/__init__.py
index 00aab463..436cb092 100644
--- a/gymlib_package/gymlib/__init__.py
+++ b/gymlib_package/gymlib/__init__.py
@@ -1,2 +1,5 @@
+# Everything at the "core" of gymlib will be imported directly (e.g. `from .[module] import *`).
+# Everything not as important will be only be imported as a module (e.g. `from . import [module]`).
+from . import shell
 from .magic import *
 from .symlinks_paths import *
diff --git a/util/shell.py b/gymlib_package/gymlib/shell.py
similarity index 100%
rename from util/shell.py
rename to gymlib_package/gymlib/shell.py