diff --git a/scripts/runner.pl b/scripts/runner.pl
index 45fa51a..1720cab 100644
--- a/scripts/runner.pl
+++ b/scripts/runner.pl
@@ -7,7 +7,7 @@ use diagnostics;
 use FindBin;
 use lib $FindBin::Bin;
 
-use Util qw(notify notify_file execute_query find_subdirs);
+use Util;
 
 use feature 'say';
 
@@ -74,12 +74,12 @@ sub cpu_count {
 #   readdir($dhandle);
 # closedir($dhandle);
 
-my @experiments = find_subdirs($remote_builds_dir);
+my @experiments = Util::find_subdirs($remote_builds_dir);
 
 sub trace {
     my ($experiment) = @_;
 
-    notify("Tracing $experiment...");
+    Util::notify("Tracing $experiment...");
 
     system(
         join " ",
@@ -107,7 +107,7 @@ sub trace {
 sub import_trace {
     my ($experiment) = @_;
 
-    notify("Importing $experiment trace...");
+    Util::notify("Importing $experiment trace...");
 
     system(
         join " ",
@@ -208,7 +208,7 @@ sub inject {
     # my $count = 1;
     my $count = cpu_count();
 
-    notify("Injecting $experiment using $count cores...");
+    Util::notify("Injecting $experiment using $count cores...");
 
     say "Forking...";
     my $pid = fork();
@@ -295,11 +295,11 @@ sub inject {
 sub results {
     my ($experiment) = @_;
 
-    notify("Querying $experiment...");
+    Util::notify("Querying $experiment...");
 
-    execute_query( $experiment, "Results", $remote_db_conf,
+    Util::execute_query( $experiment, "Results", $remote_db_conf,
         $remote_builds_dir );
-    execute_query( $experiment, "FaultsFailed", $remote_db_conf,
+    Util::execute_query( $experiment, "FaultsFailed", $remote_db_conf,
         $remote_builds_dir );
 
 #     my $results_overview_query = "SELECT