Restructured directory.