Restructured internal directory tree