files location refactoring