Fixed URLs changed due to structure refactoring