Updated files not to use package Utils anymore