Add last Packed classes, general cleanup