Add class loader and util package again, because the last one didn't work