Clarify and move some URLs
Clarify and move some URLs