Refactored URLs and fixed Windows URL handling