- restructured directory layout