util module name changed!!!
 - "util" -> "util.base"
 - code refactorings...