Object to Entity reverted, new icons added, entities folder is now
displayed with special icon, folder type XSD updated for full support.