Started fixing Util imports in classes