Refactored file paths