Mor refactorings regarding file resolving