Move more functions into the util namespace
Depluralize util namespace