Move files from utilities/util/* into utilities/*