[urlconf] Clean up  

Clean up urlconf (part of major refactor)