Restructured directory layout