Support extracting from class directories again