Rename util module to fit with namespace