Changes for changing util/* to utils/util/*
Changes to get both Eclipse and command line unittests to work