Re-organizing the files in the trees implementation