Refactor URLs into the model

No one else needs them