Refactored file location and extensions