Improve design of files tree