Fixed file reordering