Restructured directory format