file locations refactoring