Fix package icons, add class icon
Fix tree elements order