Restructured directory tree and files