Reposition URL pattern to align with Evernote

This eases picking their changes
Cleanup: unified and cleaned URLs