restructured directory hierarchy