bugfix-es regarding directory structure change (and eleminating commonUtil)