Reworked URL schema

(Sorry for those linking my documents, this is just cleaner)