improve order of file references