Rework directory tree
Rework directory tree