overhaul of document tree organization