Remove content package inside util
Rewrite methods and method attributes to have underscore format