Restructured directory structure.