remove get-file-list
Rearagne directories