Clean up urlconf (part of major refactor)
Merge pull request #33 from juancarlospaco/fix/urlconf

[urlconf] Clean up