Revert "Revert "Url changes""

This reverts commit 7f2a20a713047b42af2f221a0532505cc95029fb.
Revert "Change urls"

This reverts commit 8579475d91908265638d846ad5f8deb359b5bec7.