Cleanup and re-ordering for urls.py