diff --git a/www/conservancy/urls.py b/www/conservancy/urls.py
index 7a167d0d271b10e5b70a32a3642d35b0ee0d8623..71b74d81702689c7914ede59827af8b7196bc18b 100644
--- a/www/conservancy/urls.py
+++ b/www/conservancy/urls.py
@@ -17,75 +17,41 @@
 # along with this program in a file in the toplevel directory called
 # "AGPLv3".  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls import patterns, url, include
-from django.contrib import admin
+from django.conf.urls import url, include
+from django.contrib import admin, admindocs
 
-# import conservancy.settings
-from django.conf import settings
-from conservancy.feeds import BlogFeed, PressReleaseFeed, OmnibusFeed
-# from django.views.static import serve
-# from django.conf.urls.static import static
-# from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-# import conservancy.static.overview.views
-
-# handler404 = 'modpythoncustom.view404'
-# handler401 = 'conservancy.static.views.handler401'
-# handler403 = 'conservancy.static.views.handler403'
-handler404 = 'conservancy.static.views.handler404'
-# handler500 = 'conservancy.static.views.handler500'
+from conservancy import feeds, frontpage, sponsors
+import conservancy.apps.fundgoal.views as fundgoal_views
+import conservancy.static.views as static_views
 
 admin.autodiscover()
 
-urlpatterns = patterns('',
-    (r'^$', 'conservancy.frontpage.view'),
-    (r'^sponsors$', 'conservancy.frontpage.view'),
-    (r'^sponsors/$', 'conservancy.sponsors.view'),
-    (r'^sponsors/index.html$', 'conservancy.sponsors.view'),
-    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    (r'^admin/', admin.site.urls),
-    (r'^feeds/blog/?$', BlogFeed()),
-    (r'^feeds/news/?$', PressReleaseFeed()),
-    (r'^feeds/omnibus/?$', OmnibusFeed()),
-    (r'^feeds/?$', 'conservancy.feeds.view'),
-    (r'^news(/|$)', include('conservancy.apps.news.urls')),
-    (r'^blog(/|$)', include('conservancy.apps.blog.urls')),
+urlpatterns = [
+    url(r'^$', frontpage.view),
+    url(r'^sponsors$', frontpage.view),
+    url(r'^sponsors/$', sponsors.view),
+    url(r'^sponsors/index.html$', sponsors.view),
+    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    url(r'^admin/', admin.site.urls),
+    url(r'^feeds/blog/?$', feeds.BlogFeed()),
+    url(r'^feeds/news/?$', feeds.PressReleaseFeed()),
+    url(r'^feeds/omnibus/?$', feeds.OmnibusFeed()),
+    url(r'^feeds/?$', feeds.view),
+    url(r'^news(/|$)', include('conservancy.apps.news.urls')),
+    url(r'^blog(/|$)', include('conservancy.apps.blog.urls')),
     # formerly static templated things... (dirs with templates)
-    (r'^error/(40[134]|500)(?:/index\.html|/|)$', 'conservancy.static.views.handler'),
-    (r'^error', 'conservancy.static.views.index'),
-    (r'^about', 'conservancy.static.views.index'),
-    (r'^donate', 'conservancy.static.views.index'),
-    (r'^copyleft-compliance', 'conservancy.static.views.index',
+    url(r'^error/(40[134]|500)(?:/index\.html|/|)$', static_views.handler),
+    url(r'^error', static_views.index),
+    url(r'^about', static_views.index),
+    url(r'^donate', static_views.index),
+    url(r'^copyleft-compliance', static_views.index,
                            {'fundraiser_sought' : 'vmware-match-0'}),
-    (r'^projects', 'conservancy.static.views.index'),
-    (r'^npoacct', 'conservancy.static.views.index',
+    url(r'^projects', static_views.index),
+    url(r'^npoacct', static_views.index,
                   {'fundraiser_sought' : 'npoacct'}),
-    (r'^contractpatch', include('conservancy.apps.contractpatch.urls')),
-    (r'^overview', 'conservancy.static.views.index'),
-    (r'^privacy-policy', 'conservancy.static.views.index'),
-    (r'^supporter', include('conservancy.apps.supporter.urls')),
-    (r'^fundraiser_data', 'conservancy.apps.fundgoal.views.view'),
-)
-
-# urlpatterns += url(regex  = r'^%s(?P<path>.*)$' % conservancy.settings.STATIC_URL[1:],
-# urlpatterns += url(regex  = r'^/overview',
-#                    view   = 'django.views.static.serve',
-#                    kwargs = {'document_root': conservancy.settings.STATIC_ROOT,
-#                              'show_indexes' : True})
-# urlpatterns += (r'^(?P<path>.*)$', 'django.views.static.serve', 
-# urlpatterns += (r'^overview/$', 'django.views.static.serve', 
-#                 {'document_root': conservancy.settings.STATIC_ROOT,
-#                  'show_indexes' : True})
-
-# https://docs.djangoproject.com/en/1.7/howto/static-files/
-#  + static(conservancy.settings.STATIC_URL, document_root=conservancy.settings.STATIC_ROOT)
-
-# urlpatterns += staticfiles_urlpatterns()
-
-# urlpatterns += static(settings.STATIC_URL, view='django.contrib.staticfiles.views.serve',
-# urlpatterns += static('/', view='django.contrib.staticfiles.views.serve',
-#                       document_root=settings.STATIC_ROOT,
-#                       show_indexes=True)
-
-
-
-
+    url(r'^contractpatch', include('conservancy.apps.contractpatch.urls')),
+    url(r'^overview', static_views.index),
+    url(r'^privacy-policy', static_views.index),
+    url(r'^supporter', include('conservancy.apps.supporter.urls')),
+    url(r'^fundraiser_data', fundgoal_views.view),
+]