re-arrange file resolving