Major directory restructuring.