move top-level URLs into top-level urls.py

apps/b2g/urls.py

@@ -2,7 +2,7 @@ from django.conf.urls.defaults import *
 from views import b2g, about, faq
 
 urlpatterns = patterns('',
-    (r'^b2g/faq/$', faq),
-    (r'^b2g/about/$', about),
-    (r'^b2g/$', b2g),
+    (r'^faq/$', faq),
+    (r'^about/$', about),
+    (r'^$', b2g),
 )

apps/marketplace/urls.py

@@ -2,5 +2,5 @@ from django.conf.urls.defaults import *
 from views import marketplace
 
 urlpatterns = patterns('',
-    (r'^apps/', marketplace),
+    (r'^$', marketplace),
 )

apps/persona/urls.py

@@ -2,9 +2,9 @@ from django.conf.urls.defaults import *
 from views import persona, about, developerfaq, termsofservice, privacypolicy
 
 urlpatterns = patterns('',
-    (r'^persona/developer-faq/$', developerfaq),
-    (r'^persona/terms-of-service/$', termsofservice),
-    (r'^persona/privacy-policy/$', privacypolicy),
-    (r'^persona/about/$', about),
-    (r'^persona/$', persona),
+    (r'^developer-faq/$', developerfaq),
+    (r'^terms-of-service/$', termsofservice),
+    (r'^privacy-policy/$', privacypolicy),
+    (r'^about/$', about),
+    (r'^$', persona),
 )

urls.py

@@ -8,10 +8,10 @@ from django.conf.urls.defaults import *
 
 urlpatterns = patterns('',
     # Main pages
-    (r'', include('b2g.urls')),
-    (r'', include('marketplace.urls')),
+    (r'^b2g/', include('b2g.urls')),
+    (r'^apps/', include('marketplace.urls')),
+    (r'^persona/', include('persona.urls')),
     (r'', include('mozorg.urls')),
-    (r'', include('persona.urls')),
     (r'', include('research.urls')),
 
     # L10n example.