more file location refactorings