diff --git a/api/s2_junctions.py b/api/s2_junctions.py
index b5e788d..6c029c0 100644
--- a/api/s2_junctions.py
+++ b/api/s2_junctions.py
@@ -2,7 +2,7 @@ from psycopg.rows import Row
 from .s0_base import *
 from .change_set import ChangeSet
 from .s24_coordinates import *
-import utility
+from .utility import *
 
 
 def add_junction(name: str, id: str, x: float, y: float, elevation: float) -> ChangeSet:
@@ -12,7 +12,7 @@ def add_junction(name: str, id: str, x: float, y: float, elevation: float) -> Ch
 
 
 def _get_junction(name: str, id: str) -> Row | None:
-    return utility.query(name, f"select elevation, demand, pattern from junctions where id = '{id}'")
+    return query(name, f"select elevation, demand, pattern from junctions where id = '{id}'")
 
 
 def delete_junction(name: str, id: str) -> ChangeSet:
@@ -24,8 +24,8 @@ def delete_junction(name: str, id: str) -> ChangeSet:
         return ChangeSet()
 
     elevation = row['elevation']
-    demand = utility.decorate(row['demand'], 'float', True)
-    pattern = utility.decorate(row['pattern'], 'str', True)
+    demand = decorate(row['demand'], 'float', True)
+    pattern = decorate(row['pattern'], 'str', True)
 
     sql = f"delete from junctions where id = '{id}';"
     undo_sql = f'insert into junctions (id, elevation, demand, pattern) values ("{id}", {elevation}, {demand}, {pattern});'
@@ -66,7 +66,7 @@ def _set_junction(name: str, id: str, key: str, key_type: str, value: str, optio
     if row == None:
         return ChangeSet()
 
-    return utility.update(name, JUNCTION, 'junctions', 'id', id, key, key_type, row[key], value, optional)
+    return update(name, JUNCTION, 'junctions', 'id', id, key, key_type, row[key], value, optional)
 
 
 def set_junction_elevation(name: str, id: str, elevation: float) -> ChangeSet:
diff --git a/api/s3_reservoirs.py b/api/s3_reservoirs.py
index 3b48bff..7eb58bc 100644
--- a/api/s3_reservoirs.py
+++ b/api/s3_reservoirs.py
@@ -2,7 +2,7 @@ from psycopg.rows import Row
 from .s0_base import *
 from .change_set import ChangeSet
 from .s24_coordinates import *
-import utility
+from .utility import *
 
 
 def add_reservoir(name: str, id: str, x: float, y: float, head: float) -> ChangeSet:
@@ -12,7 +12,7 @@ def add_reservoir(name: str, id: str, x: float, y: float, head: float) -> Change
 
 
 def _get_reservoir(name: str, id: str) -> Row | None:
-    return utility.query(name, f"select head, pattern from reservoirs where id = '{id}'")
+    return query(name, f"select head, pattern from reservoirs where id = '{id}'")
 
 
 def delete_reservoir(name: str, id: str) -> ChangeSet:
@@ -24,7 +24,7 @@ def delete_reservoir(name: str, id: str) -> ChangeSet:
         return ChangeSet()
 
     head = row['head']
-    pattern = utility.decorate(row['pattern'], 'str', True)
+    pattern = decorate(row['pattern'], 'str', True)
 
     sql = f"delete from reservoirs where id = '{id}';"
     undo_sql = f'insert into reservoirs (id, head, pattern) values ("{id}", {head}, {pattern});'
@@ -57,7 +57,7 @@ def _set_reservoir(name: str, id: str, key: str, key_type: str, value: str, opti
     if row == None:
         return ChangeSet()
 
-    return utility.update(name, RESERVOIR, 'reservoirs', 'id', id, key, key_type, row[key], value, optional)
+    return update(name, RESERVOIR, 'reservoirs', 'id', id, key, key_type, row[key], value, optional)
 
 
 def set_reservoir_head(name: str, id: str, head: float) -> ChangeSet:
diff --git a/api/s4_tanks.py b/api/s4_tanks.py
index 2a76002..1707172 100644
--- a/api/s4_tanks.py
+++ b/api/s4_tanks.py
@@ -2,7 +2,7 @@ from psycopg.rows import Row
 from .s0_base import *
 from .change_set import ChangeSet
 from .s24_coordinates import *
-import utility
+from .utility import *
 
 
 OVERFLOW_YES = 'yes'
@@ -16,7 +16,7 @@ def add_tank(name: str, id: str, x: float, y: float, elevation: float, init_leve
 
 
 def _get_tank(name: str, id: str) -> Row | None:
-    return utility.query(name, f"select elevation, init_level, min_level, max_level, diameter, min_vol, vol_curve, overflow from tanks where id = '{id}'")
+    return query(name, f"select elevation, init_level, min_level, max_level, diameter, min_vol, vol_curve, overflow from tanks where id = '{id}'")
 
 
 def delete_tank(name: str, id: str) -> ChangeSet:
@@ -33,8 +33,8 @@ def delete_tank(name: str, id: str) -> ChangeSet:
     max_level = row['max_level']
     diameter = row['diameter']
     min_vol = row['min_vol']
-    vol_curve = utility.decorate(row['vol_curve'], 'str', True)
-    overflow = utility.decorate(row['overflow'], 'str', True)
+    vol_curve = decorate(row['vol_curve'], 'str', True)
+    overflow = decorate(row['overflow'], 'str', True)
 
     sql = f"delete from tanks where id = '{id}';"
     undo_sql = f'insert into tanks (id, elevation, init_level, min_level, max_level, diameter, min_vol, vol_curve, overflow) values ("{id}", {elevation}, {init_level}, {min_level}, {max_level}, {diameter}, {min_vol}, {vol_curve}, {overflow});'
@@ -100,7 +100,7 @@ def _set_tank(name: str, id: str, key: str, key_type: str, value: str, optional:
     if row == None:
         return ChangeSet()
 
-    return utility.update(name, TANK, 'tanks', 'id', id, key, key_type, row[key], value, optional)
+    return update(name, TANK, 'tanks', 'id', id, key, key_type, row[key], value, optional)
 
 
 def set_tank_elevation(name: str, id: str, elevation: float) -> ChangeSet:
diff --git a/api/s5_pipes.py b/api/s5_pipes.py
index 0c50527..f9ca77c 100644
--- a/api/s5_pipes.py
+++ b/api/s5_pipes.py
@@ -1,7 +1,7 @@
 from psycopg.rows import Row
 from .s0_base import *
 from .change_set import ChangeSet
-import utility
+from .utility import *
 
 
 PIPE_STATUS_OPEN = 'open'
@@ -21,7 +21,7 @@ def add_pipe(name: str, id: str, node1: str, node2: str, length: float = 0, diam
 
 
 def _get_pipe(name: str, id: str) -> Row | None:
-    return utility.query(name, f"select node1, node2, length, diameter, roughness, minor_loss, status from pipes where id = '{id}'")
+    return query(name, f"select node1, node2, length, diameter, roughness, minor_loss, status from pipes where id = '{id}'")
 
 
 def delete_pipe(name: str, id: str) -> ChangeSet:
@@ -83,7 +83,7 @@ def _set_pipe(name: str, id: str, key: str, key_type: str, value: str, optional:
     if row == None:
         return ChangeSet()
 
-    return utility.update(name, PIPE, 'pipes', 'id', id, key, key_type, row[key], value, optional)
+    return update(name, PIPE, 'pipes', 'id', id, key, key_type, row[key], value, optional)
 
 
 def set_pipe_node1(name: str, id: str, node1: str) -> ChangeSet:
diff --git a/api/s6_pumps.py b/api/s6_pumps.py
index 8e997ab..6e7aefc 100644
--- a/api/s6_pumps.py
+++ b/api/s6_pumps.py
@@ -1,7 +1,7 @@
 from psycopg.rows import Row
 from .s0_base import *
 from .change_set import ChangeSet
-import utility
+from .utility import *
 
 
 def add_pump(name: str, id: str, node1: str, node2: str) -> ChangeSet:
@@ -16,7 +16,7 @@ def add_pump(name: str, id: str, node1: str, node2: str) -> ChangeSet:
 
 
 def _get_pump(name: str, id: str) -> Row | None:
-    return utility.query(name, f"select node1, node2 from pumps where id = '{id}'")
+    return query(name, f"select node1, node2 from pumps where id = '{id}'")
 
 
 def delete_pump(name: str, id: str) -> ChangeSet:
@@ -59,7 +59,7 @@ def _set_pump(name: str, id: str, key: str, key_type: str, value: str, optional:
     if row == None:
         return ChangeSet()
 
-    return utility.update(name, PUMP, 'pumps', 'id', id, key, key_type, row[key], value, optional)
+    return update(name, PUMP, 'pumps', 'id', id, key, key_type, row[key], value, optional)
 
 
 def set_pump_node1(name: str, id: str, node1: str) -> ChangeSet:
diff --git a/api/s7_valves.py b/api/s7_valves.py
index 139606b..496045c 100644
--- a/api/s7_valves.py
+++ b/api/s7_valves.py
@@ -1,7 +1,7 @@
 from psycopg.rows import Row
 from .s0_base import *
 from .change_set import ChangeSet
-import utility
+from .utility import *
 
 
 VALVES_TYPE_PRV = 'prv'
@@ -24,7 +24,7 @@ def add_valve(name: str, id: str, node1: str, node2: str, diameter: float = 0, t
 
 
 def _get_valve(name: str, id: str) -> Row | None:
-    return utility.query(name, f"select node1, node2, diameter, type, setting, minor_loss from valves where id = '{id}'")
+    return query(name, f"select node1, node2, diameter, type, setting, minor_loss from valves where id = '{id}'")
 
 
 def delete_valve(name: str, id: str) -> ChangeSet:
@@ -81,7 +81,7 @@ def _set_valve(name: str, id: str, key: str, key_type: str, value: str, optional
     if row == None:
         return
 
-    return utility.update(name, VALVE, 'valves', 'id', id, key, key_type, row[key], value, optional)
+    return update(name, VALVE, 'valves', 'id', id, key, key_type, row[key], value, optional)
 
 
 def set_valve_node1(name: str, id: str, node1: str) -> ChangeSet: