Append directory files after main files are ordered correctly.
Merge branch 'subdir-ordering'