major dir tree overhaul