Refactor urlconf
Start with a bit of admin tinkering