code-reorg: mv lib/util/util.go under lib/controller