Restructured directory structure