Improved forming of Files tree.