Simplified urls file.
Merge pull request #3294 from mmarzantowicz/feature/urls

Simplified urls file.