From 19d585255a3ec68d79ef8ca91ec160624ab40ddb Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Fri, 10 Feb 2017 14:49:16 +0000
Subject: [PATCH] Django 1.10 does not permit the view argument to url() to be
 a string any more. Changed all cases view arguments to url() which were
 strings to instead reference the actual imported function.  - Legacy-Id:
 12815

---
 ietf/community/urls.py           | 16 ++++----
 ietf/dbtemplate/urls.py          |  6 ++-
 ietf/doc/urls.py                 |  8 ++--
 ietf/doc/urls_charter.py         | 26 +++++++------
 ietf/doc/urls_conflict_review.py | 16 ++++----
 ietf/doc/urls_material.py        |  4 +-
 ietf/doc/urls_status_change.py   | 20 +++++-----
 ietf/group/urls.py               | 22 ++++++-----
 ietf/group/urls_info.py          |  2 +-
 ietf/group/urls_info_details.py  | 59 +++++++++++++++--------------
 ietf/help/urls.py                |  8 ++--
 ietf/iesg/urls.py                | 28 +++++++-------
 ietf/ipr/urls.py                 | 38 ++++++++++---------
 ietf/liaisons/urls.py            | 34 +++++++++--------
 ietf/mailinglists/urls.py        |  4 +-
 ietf/mailtrigger/urls.py         | 10 +++--
 ietf/nomcom/urls.py              | 65 ++++++++++++++++----------------
 ietf/person/urls.py              |  2 +-
 ietf/redirects/urls.py           |  4 +-
 ietf/release/urls.py             |  6 ++-
 ietf/secr/announcement/urls.py   |  6 ++-
 ietf/secr/areas/urls.py          | 18 +++++----
 ietf/secr/console/urls.py        |  4 +-
 ietf/secr/drafts/urls.py         | 42 +++++++++++----------
 ietf/secr/groups/urls.py         | 26 +++++++------
 ietf/secr/meetings/urls.py       | 44 ++++++++++-----------
 ietf/secr/proceedings/urls.py    | 16 ++++----
 ietf/secr/roles/urls.py          |  8 ++--
 ietf/secr/rolodex/urls.py        | 14 ++++---
 ietf/secr/sreq/urls.py           | 24 ++++++------
 ietf/secr/telechat/urls.py       | 20 +++++-----
 ietf/stats/urls.py               |  6 +--
 ietf/sync/urls.py                |  8 ++--
 ietf/urls.py                     | 25 ++++++------
 ietf/utils/urls.py               |  4 +-
 35 files changed, 352 insertions(+), 291 deletions(-)

diff --git a/ietf/community/urls.py b/ietf/community/urls.py
index 999512f76..d07c37475 100644
--- a/ietf/community/urls.py
+++ b/ietf/community/urls.py
@@ -1,12 +1,14 @@
 from django.conf.urls import url
 
 
+from ietf.community import views
+
 urlpatterns = [
-    url(r'^personal/(?P<username>[^/]+)/$', 'ietf.community.views.view_list'),
-    url(r'^personal/(?P<username>[^/]+)/manage/$', 'ietf.community.views.manage_list'),
-    url(r'^personal/(?P<username>[^/]+)/trackdocument/(?P<name>[^/]+)/$', 'ietf.community.views.track_document'),
-    url(r'^personal/(?P<username>[^/]+)/untrackdocument/(?P<name>[^/]+)/$', 'ietf.community.views.untrack_document'),
-    url(r'^personal/(?P<username>[^/]+)/csv/$', 'ietf.community.views.export_to_csv'),
-    url(r'^personal/(?P<username>[^/]+)/feed/$', 'ietf.community.views.feed'),
-    url(r'^personal/(?P<username>[^/]+)/subscription/$', 'ietf.community.views.subscription'),
+    url(r'^personal/(?P<username>[^/]+)/$', views.view_list),
+    url(r'^personal/(?P<username>[^/]+)/manage/$', views.manage_list),
+    url(r'^personal/(?P<username>[^/]+)/trackdocument/(?P<name>[^/]+)/$', views.track_document),
+    url(r'^personal/(?P<username>[^/]+)/untrackdocument/(?P<name>[^/]+)/$', views.untrack_document),
+    url(r'^personal/(?P<username>[^/]+)/csv/$', views.export_to_csv),
+    url(r'^personal/(?P<username>[^/]+)/feed/$', views.feed),
+    url(r'^personal/(?P<username>[^/]+)/subscription/$', views.subscription),
 ]
diff --git a/ietf/dbtemplate/urls.py b/ietf/dbtemplate/urls.py
index 7a9a8bd51..3d878422a 100644
--- a/ietf/dbtemplate/urls.py
+++ b/ietf/dbtemplate/urls.py
@@ -1,7 +1,9 @@
 from django.conf.urls import url
 
 
+from ietf.dbtemplate import views
+
 urlpatterns = [
-    url(r'^(?P<acronym>[-a-z0-9]+)/$', 'ietf.dbtemplate.views.template_list', name='template_list'),
-    url(r'^(?P<acronym>[-a-z0-9]+)/(?P<template_id>[\d]+)/$', 'ietf.dbtemplate.views.template_edit', name='template_edit'),
+    url(r'^(?P<acronym>[-a-z0-9]+)/$', views.template_list, name='template_list'),
+    url(r'^(?P<acronym>[-a-z0-9]+)/(?P<template_id>[\d]+)/$', views.template_edit, name='template_edit'),
 ]
diff --git a/ietf/doc/urls.py b/ietf/doc/urls.py
index d9fba0082..cacb9c44d 100644
--- a/ietf/doc/urls.py
+++ b/ietf/doc/urls.py
@@ -34,7 +34,7 @@ from django.conf.urls import url, include
 from django.views.generic import RedirectView
 from django.conf import settings
 
-from ietf.doc import views_search, views_draft, views_ballot, views_status_change, views_doc, views_stats
+from ietf.doc import views_search, views_draft, views_ballot, views_status_change, views_doc, views_stats, views_help
 
 session_patterns = [
     url(r'^add$', views_doc.add_sessionpresentation),
@@ -116,9 +116,9 @@ urlpatterns = [
     url(r'^%(name)s/edit/approveballot/$' % settings.URL_REGEXPS, views_ballot.approve_ballot, name='doc_approve_ballot'),
     url(r'^%(name)s/edit/makelastcall/$' % settings.URL_REGEXPS, views_ballot.make_last_call, name='doc_make_last_call'),
 
-    url(r'^help/state/(?P<type>[\w-]+)/$', 'ietf.doc.views_help.state_help', name="state_help"),
-    url(r'^help/relationships/$', 'ietf.doc.views_help.relationship_help', name="relationship_help"),
-    url(r'^help/relationships/(?P<subset>\w+)/$', 'ietf.doc.views_help.relationship_help', name="relationship_subset_help"),
+    url(r'^help/state/(?P<type>[\w-]+)/$', views_help.state_help, name="state_help"),
+    url(r'^help/relationships/$', views_help.relationship_help, name="relationship_help"),
+    url(r'^help/relationships/(?P<subset>\w+)/$', views_help.relationship_help, name="relationship_subset_help"),
 
     url(r'^%(name)s/meetings/?$' % settings.URL_REGEXPS, views_doc.all_presentations),
 
diff --git a/ietf/doc/urls_charter.py b/ietf/doc/urls_charter.py
index f298b7ced..ce3448d85 100644
--- a/ietf/doc/urls_charter.py
+++ b/ietf/doc/urls_charter.py
@@ -3,17 +3,19 @@
 from django.conf.urls import url
 from django.conf import settings
 
+from ietf.doc import views_charter, views_doc
+
 urlpatterns = [
-    url(r'^state/$', "ietf.doc.views_charter.change_state", name='charter_change_state'),
-    url(r'^title/$', "ietf.doc.views_charter.change_title", name='charter_change_title'),
-    url(r'^(?P<option>initcharter|recharter|abandon)/$', "ietf.doc.views_charter.change_state", name='charter_startstop_process'),
-    url(r'^telechat/$', "ietf.doc.views_doc.telechat_date", name='charter_telechat_date'),
-    url(r'^notify/$', "ietf.doc.views_doc.edit_notify", name='charter_edit_notify'),
-    url(r'^ad/$', "ietf.doc.views_charter.edit_ad", name='charter_edit_ad'),
-    url(r'^action/$', "ietf.doc.views_charter.action_announcement_text"),
-    url(r'^review/$', "ietf.doc.views_charter.review_announcement_text"),
-    url(r'^ballotwriteupnotes/$', "ietf.doc.views_charter.ballot_writeupnotes"),
-    url(r'^approve/$', "ietf.doc.views_charter.approve", name='charter_approve'),
-    url(r'^submit/(?:(?P<option>initcharter|recharter)/)?$', "ietf.doc.views_charter.submit", name='charter_submit'),
-    url(r'^withmilestones-%(rev)s.txt$' % settings.URL_REGEXPS, "ietf.doc.views_charter.charter_with_milestones_txt", name='charter_with_milestones_txt'),
+    url(r'^state/$', views_charter.change_state, name='charter_change_state'),
+    url(r'^title/$', views_charter.change_title, name='charter_change_title'),
+    url(r'^(?P<option>initcharter|recharter|abandon)/$', views_charter.change_state, name='charter_startstop_process'),
+    url(r'^telechat/$', views_doc.telechat_date, name='charter_telechat_date'),
+    url(r'^notify/$', views_doc.edit_notify, name='charter_edit_notify'),
+    url(r'^ad/$', views_charter.edit_ad, name='charter_edit_ad'),
+    url(r'^action/$', views_charter.action_announcement_text),
+    url(r'^review/$', views_charter.review_announcement_text),
+    url(r'^ballotwriteupnotes/$', views_charter.ballot_writeupnotes),
+    url(r'^approve/$', views_charter.approve, name='charter_approve'),
+    url(r'^submit/(?:(?P<option>initcharter|recharter)/)?$', views_charter.submit, name='charter_submit'),
+    url(r'^withmilestones-%(rev)s.txt$' % settings.URL_REGEXPS, views_charter.charter_with_milestones_txt, name='charter_with_milestones_txt'),
 ]
diff --git a/ietf/doc/urls_conflict_review.py b/ietf/doc/urls_conflict_review.py
index 1434cd3ea..4125b3dd8 100644
--- a/ietf/doc/urls_conflict_review.py
+++ b/ietf/doc/urls_conflict_review.py
@@ -1,13 +1,15 @@
 from django.conf.urls import url
 
+from ietf.doc import views_conflict_review, views_doc
+
 urlpatterns = [
-    url(r'^state/$',                 "ietf.doc.views_conflict_review.change_state",  name='conflict_review_change_state'),
-    url(r'^submit/$',                "ietf.doc.views_conflict_review.submit",        name='conflict_review_submit'),
-    url(r'^ad/$',                    "ietf.doc.views_conflict_review.edit_ad",       name='conflict_review_ad'),
-    url(r'^approve/$',               "ietf.doc.views_conflict_review.approve",       name='conflict_review_approve'),
-    url(r'^start_conflict_review/$', "ietf.doc.views_conflict_review.start_review",  name='conflict_review_start'),
-    url(r'^telechat/$',              "ietf.doc.views_doc.telechat_date", name='conflict_review_telechat_date'),
-    url(r'^notices/$',               "ietf.doc.views_doc.edit_notify",  name='conflict_review_notices'),
+    url(r'^state/$',                 views_conflict_review.change_state,  name='conflict_review_change_state'),
+    url(r'^submit/$',                views_conflict_review.submit,        name='conflict_review_submit'),
+    url(r'^ad/$',                    views_conflict_review.edit_ad,       name='conflict_review_ad'),
+    url(r'^approve/$',               views_conflict_review.approve,       name='conflict_review_approve'),
+    url(r'^start_conflict_review/$', views_conflict_review.start_review,  name='conflict_review_start'),
+    url(r'^telechat/$',              views_doc.telechat_date, name='conflict_review_telechat_date'),
+    url(r'^notices/$',               views_doc.edit_notify,  name='conflict_review_notices'),
 ]
 
 
diff --git a/ietf/doc/urls_material.py b/ietf/doc/urls_material.py
index e9c649f5b..97942bc31 100644
--- a/ietf/doc/urls_material.py
+++ b/ietf/doc/urls_material.py
@@ -1,6 +1,8 @@
 from django.conf.urls import url
 
+from ietf.doc import views_material
+
 urlpatterns = [
-    url(r'^(?P<action>state|title|abstract|revise)/$', "ietf.doc.views_material.edit_material", name="material_edit"),
+    url(r'^(?P<action>state|title|abstract|revise)/$', views_material.edit_material, name="material_edit"),
 ]
 
diff --git a/ietf/doc/urls_status_change.py b/ietf/doc/urls_status_change.py
index cd474932c..278adb101 100644
--- a/ietf/doc/urls_status_change.py
+++ b/ietf/doc/urls_status_change.py
@@ -1,15 +1,17 @@
 from django.conf.urls import url
 
+from ietf.doc import views_status_change, views_doc
+
 urlpatterns = [
-    url(r'^state/$',                 "ietf.doc.views_status_change.change_state",   name='status_change_change_state'),
-    url(r'^submit/$',                "ietf.doc.views_status_change.submit",         name='status_change_submit'),
-    url(r'^ad/$',                    "ietf.doc.views_status_change.edit_ad",        name='status_change_ad'),
-    url(r'^title/$',                 "ietf.doc.views_status_change.edit_title",     name='status_change_title'),
-    url(r'^approve/$',               "ietf.doc.views_status_change.approve",        name='status_change_approve'),
-    url(r'^relations/$',             "ietf.doc.views_status_change.edit_relations", name='status_change_relations'),
-    url(r'^last-call/$',             "ietf.doc.views_status_change.last_call",      name='status_change_last_call'),
-    url(r'^telechat/$',              "ietf.doc.views_doc.telechat_date",  name='status_change_telechat_date'),
-    url(r'^notices/$',               "ietf.doc.views_doc.edit_notify",   name='status_change_notices'),
+    url(r'^state/$',                 views_status_change.change_state,   name='status_change_change_state'),
+    url(r'^submit/$',                views_status_change.submit,         name='status_change_submit'),
+    url(r'^ad/$',                    views_status_change.edit_ad,        name='status_change_ad'),
+    url(r'^title/$',                 views_status_change.edit_title,     name='status_change_title'),
+    url(r'^approve/$',               views_status_change.approve,        name='status_change_approve'),
+    url(r'^relations/$',             views_status_change.edit_relations, name='status_change_relations'),
+    url(r'^last-call/$',             views_status_change.last_call,      name='status_change_last_call'),
+    url(r'^telechat/$',              views_doc.telechat_date,  name='status_change_telechat_date'),
+    url(r'^notices/$',               views_doc.edit_notify,   name='status_change_notices'),
 ]
 
 
diff --git a/ietf/group/urls.py b/ietf/group/urls.py
index 9a0983d22..3ccf275bf 100644
--- a/ietf/group/urls.py
+++ b/ietf/group/urls.py
@@ -3,16 +3,18 @@
 from django.conf.urls import url, include
 from django.conf import settings
 
-urlpatterns = [
-    url(r'^$', 'ietf.group.views.active_groups'), 
-    url(r'^groupmenu.json', 'ietf.group.views_ajax.group_menu_data', None, "group_menu_data"),
-    url(r'^%(acronym)s.json$' % settings.URL_REGEXPS, 'ietf.group.views_ajax.group_json'),
-    url(r'^chartering/$', 'ietf.group.views.chartering_groups'),
-    url(r'^chartering/create/(?P<group_type>(wg|rg))/$', 'ietf.group.views_edit.edit', {'action': "charter"}, "group_create"),
-    url(r'^concluded/$', 'ietf.group.views.concluded_groups'),
-    url(r'^email-aliases/$', 'ietf.group.views.email_aliases'),
-    url(r'^all-status/$', 'ietf.group.views.all_status'),
+from ietf.group import views, views_ajax, views_edit
 
-    url(r'^%(acronym)s/$' % settings.URL_REGEXPS, 'ietf.group.views.group_home', None, "group_home"),
+urlpatterns = [
+    url(r'^$', views.active_groups), 
+    url(r'^groupmenu.json', views_ajax.group_menu_data, None, "group_menu_data"),
+    url(r'^%(acronym)s.json$' % settings.URL_REGEXPS, views_ajax.group_json),
+    url(r'^chartering/$', views.chartering_groups),
+    url(r'^chartering/create/(?P<group_type>(wg|rg))/$', views_edit.edit, {'action': "charter"}, "group_create"),
+    url(r'^concluded/$', views.concluded_groups),
+    url(r'^email-aliases/$', views.email_aliases),
+    url(r'^all-status/$', views.all_status),
+
+    url(r'^%(acronym)s/$' % settings.URL_REGEXPS, views.group_home, None, "group_home"),
     url(r'^%(acronym)s/' % settings.URL_REGEXPS, include('ietf.group.urls_info_details')),
 ]
diff --git a/ietf/group/urls_info.py b/ietf/group/urls_info.py
index 9f9dfd4ea..7b5ce3f76 100644
--- a/ietf/group/urls_info.py
+++ b/ietf/group/urls_info.py
@@ -18,7 +18,7 @@ urlpatterns = [
     url(r'^chartering/$', RedirectView.as_view(url='/group/chartering/', permanent=True)),
     url(r'^chartering/create/$', RedirectView.as_view(url='/group/chartering/create/%(group_type)s/', permanent=True)),
     url(r'^bofs/$', views.bofs),
-    url(r'^email-aliases/$', 'ietf.group.views.email_aliases'),
+    url(r'^email-aliases/$', views.email_aliases),
     url(r'^bofs/create/$', views_edit.edit, {'action': "create", }, "bof_create"),
     url(r'^photos/$', views.chair_photos),
     url(r'^%(acronym)s/' % settings.URL_REGEXPS, include('ietf.group.urls_info_details')),
diff --git a/ietf/group/urls_info_details.py b/ietf/group/urls_info_details.py
index 3ddb89f68..d2ef10e76 100644
--- a/ietf/group/urls_info_details.py
+++ b/ietf/group/urls_info_details.py
@@ -1,34 +1,37 @@
 from django.conf.urls import url
 from django.views.generic import RedirectView
-from ietf.group import views, views_review
+
+from ietf.community import views as community_views
+from ietf.doc import views_material as material_views
+from ietf.group import views, views_edit, views_review, milestones as milestone_views
 
 urlpatterns = [
-    url(r'^$', 'ietf.group.views.group_home', None, "group_home"),
-    url(r'^documents/txt/$', 'ietf.group.views.group_documents_txt'),
-    url(r'^documents/$', 'ietf.group.views.group_documents', None, "group_docs"),
-    url(r'^documents/manage/$', 'ietf.community.views.manage_list'),
-    url(r'^documents/csv/$', 'ietf.community.views.export_to_csv'),
-    url(r'^documents/feed/$', 'ietf.community.views.feed'),
-    url(r'^documents/subscription/$', 'ietf.community.views.subscription'),
-    url(r'^charter/$', 'ietf.group.views.group_about', None, 'group_charter'),
-    url(r'^about/$', 'ietf.group.views.group_about', None, 'group_about'),
-    url(r'^about/status/$', 'ietf.group.views.group_about_status'),
-    url(r'^about/status/edit/$', 'ietf.group.views.group_about_status_edit'),
-    url(r'^about/status/meeting/(?P<num>\d+)/$', 'ietf.group.views.group_about_status_meeting'),
-    url(r'^history/$','ietf.group.views.history'),
-    url(r'^email/$', 'ietf.group.views.email'),
-    url(r'^deps/(?P<output_type>[\w-]+)/$', 'ietf.group.views.dependencies'),
-    url(r'^meetings/$', 'ietf.group.views.meetings'),
-    url(r'^edit/$', 'ietf.group.views_edit.edit', {'action': "edit"}, "group_edit"),
-    url(r'^conclude/$', 'ietf.group.views_edit.conclude'),
-    url(r'^milestones/$', 'ietf.group.milestones.edit_milestones', {'milestone_set': "current"}, "group_edit_milestones"),
-    url(r'^milestones/charter/$', 'ietf.group.milestones.edit_milestones', {'milestone_set': "charter"}, "group_edit_charter_milestones"),
-    url(r'^milestones/charter/reset/$', 'ietf.group.milestones.reset_charter_milestones', None, "group_reset_charter_milestones"),
-    url(r'^workflow/$', 'ietf.group.views_edit.customize_workflow'),
-    url(r'^materials/$', 'ietf.group.views.materials', None, "group_materials"),
-    url(r'^materials/new/$', 'ietf.doc.views_material.choose_material_type'),
-    url(r'^materials/new/(?P<doc_type>[\w-]+)/$', 'ietf.doc.views_material.edit_material', { 'action': "new" }, "group_new_material"),
-    url(r'^archives/$', 'ietf.group.views.derived_archives'),
+    url(r'^$', views.group_home, None, "group_home"),
+    url(r'^documents/txt/$', views.group_documents_txt),
+    url(r'^documents/$', views.group_documents, None, "group_docs"),
+    url(r'^documents/manage/$', community_views.manage_list),
+    url(r'^documents/csv/$', community_views.export_to_csv),
+    url(r'^documents/feed/$', community_views.feed),
+    url(r'^documents/subscription/$', community_views.subscription),
+    url(r'^charter/$', views.group_about, None, 'group_charter'),
+    url(r'^about/$', views.group_about, None, 'group_about'),
+    url(r'^about/status/$', views.group_about_status),
+    url(r'^about/status/edit/$', views.group_about_status_edit),
+    url(r'^about/status/meeting/(?P<num>\d+)/$', views.group_about_status_meeting),
+    url(r'^history/$',views.history),
+    url(r'^email/$', views.email),
+    url(r'^deps/(?P<output_type>[\w-]+)/$', views.dependencies),
+    url(r'^meetings/$', views.meetings),
+    url(r'^edit/$', views_edit.edit, {'action': "edit"}, "group_edit"),
+    url(r'^conclude/$', views_edit.conclude),
+    url(r'^milestones/$', milestone_views.edit_milestones, {'milestone_set': "current"}, "group_edit_milestones"),
+    url(r'^milestones/charter/$', milestone_views.edit_milestones, {'milestone_set': "charter"}, "group_edit_charter_milestones"),
+    url(r'^milestones/charter/reset/$', milestone_views.reset_charter_milestones, None, "group_reset_charter_milestones"),
+    url(r'^workflow/$', views_edit.customize_workflow),
+    url(r'^materials/$', views.materials, None, "group_materials"),
+    url(r'^materials/new/$', material_views.choose_material_type),
+    url(r'^materials/new/(?P<doc_type>[\w-]+)/$', material_views.edit_material, { 'action': "new" }, "group_new_material"),
+    url(r'^archives/$', views.derived_archives),
     url(r'^photos/$', views.group_photos),
     url(r'^reviews/$', views_review.review_requests),
     url(r'^reviews/manage/(?P<assignment_status>assigned|unassigned)/$', views_review.manage_review_requests),
@@ -36,5 +39,5 @@ urlpatterns = [
     url(r'^reviewers/$', views_review.reviewer_overview),
     url(r'^reviewers/(?P<reviewer_email>[\w%+-.@]+)/settings/$', views_review.change_reviewer_settings),
     url(r'^secretarysettings/$', views_review.change_review_secretary_settings),
-    url(r'^email-aliases/$', RedirectView.as_view(pattern_name='ietf.group.views.email',permanent=False),name='old_group_email_aliases'),
+    url(r'^email-aliases/$', RedirectView.as_view(pattern_name=views.email,permanent=False),name='old_group_email_aliases'),
 ]
diff --git a/ietf/help/urls.py b/ietf/help/urls.py
index a12cbc84b..48f92576e 100644
--- a/ietf/help/urls.py
+++ b/ietf/help/urls.py
@@ -1,8 +1,10 @@
 from django.conf.urls import url
 
+from ietf.help import views
+
 urlpatterns = [
-    url(r'^state/(?P<doc>[-\w]+)/(?P<type>[-\w]+)/?$', 'ietf.help.views.state'),
-    url(r'^state/(?P<doc>[-\w]+)/?$', 'ietf.help.views.state'),
-    url(r'^state/?$', 'ietf.help.views.state_index'),
+    url(r'^state/(?P<doc>[-\w]+)/(?P<type>[-\w]+)/?$', views.state),
+    url(r'^state/(?P<doc>[-\w]+)/?$', views.state),
+    url(r'^state/?$', views.state_index),
 ]
 
diff --git a/ietf/iesg/urls.py b/ietf/iesg/urls.py
index 91571e113..fdcb2b8b3 100644
--- a/ietf/iesg/urls.py
+++ b/ietf/iesg/urls.py
@@ -36,23 +36,25 @@ from django.conf.urls import url
 from django.views.generic import RedirectView
 from django.conf import settings
 
+from ietf.iesg import views
+
 urlpatterns = [
     url(r'^telechat/.*$', RedirectView.as_view(url='https://www.ietf.org/iesg/minutes.html', permanent=True)),
     url(r'^ann/(?:ind|new|prev)/$', RedirectView.as_view(url="/iesg/decisions/", permanent=True)),
     url(r'^telechatdates/$', RedirectView.as_view(url='/admin/iesg/telechatdate/', permanent=True)),
 
-    url(r'^decisions/(?:(?P<year>[0-9]{4})/)?$', "ietf.iesg.views.review_decisions"),
-    url(r'^agenda/(?:%(date)s/)?$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda"),
-    url(r'^agenda/(?:%(date)s/)?agenda.txt$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda_txt"),
-    url(r'^agenda/(?:%(date)s/)?agenda.json$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda_json"),
-    url(r'^agenda/(?:%(date)s/)?scribe_template.html$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda_scribe_template"),
-    url(r'^agenda/(?:%(date)s/)?moderator_package.html$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda_moderator_package"),
-    url(r'^agenda/(?:%(date)s/)?agenda_package.txt$' % settings.URL_REGEXPS, "ietf.iesg.views.agenda_package"),
+    url(r'^decisions/(?:(?P<year>[0-9]{4})/)?$', views.review_decisions),
+    url(r'^agenda/(?:%(date)s/)?$' % settings.URL_REGEXPS, views.agenda),
+    url(r'^agenda/(?:%(date)s/)?agenda.txt$' % settings.URL_REGEXPS, views.agenda_txt),
+    url(r'^agenda/(?:%(date)s/)?agenda.json$' % settings.URL_REGEXPS, views.agenda_json),
+    url(r'^agenda/(?:%(date)s/)?scribe_template.html$' % settings.URL_REGEXPS, views.agenda_scribe_template),
+    url(r'^agenda/(?:%(date)s/)?moderator_package.html$' % settings.URL_REGEXPS, views.agenda_moderator_package),
+    url(r'^agenda/(?:%(date)s/)?agenda_package.txt$' % settings.URL_REGEXPS, views.agenda_package),
 
-    url(r'^agenda/documents.txt$', "ietf.iesg.views.agenda_documents_txt"),
-    url(r'^agenda/documents/$', "ietf.iesg.views.agenda_documents"),
-    url(r'^agenda/telechat-(?:%(date)s-)?docs.tgz' % settings.URL_REGEXPS, "ietf.iesg.views.telechat_docs_tarfile"),
-    url(r'^discusses/$', "ietf.iesg.views.discusses"),
-    url(r'^milestones/$', "ietf.iesg.views.milestones_needing_review"),
-    url(r'^photos/$', "ietf.iesg.views.photos"),
+    url(r'^agenda/documents.txt$', views.agenda_documents_txt),
+    url(r'^agenda/documents/$', views.agenda_documents),
+    url(r'^agenda/telechat-(?:%(date)s-)?docs.tgz' % settings.URL_REGEXPS, views.telechat_docs_tarfile),
+    url(r'^discusses/$', views.discusses),
+    url(r'^milestones/$', views.milestones_needing_review),
+    url(r'^photos/$', views.photos),
 ]
diff --git a/ietf/ipr/urls.py b/ietf/ipr/urls.py
index 26eb08e4b..856170159 100644
--- a/ietf/ipr/urls.py
+++ b/ietf/ipr/urls.py
@@ -4,25 +4,27 @@ from django.conf.urls import url
 from django.views.generic import RedirectView
 from django.core.urlresolvers import reverse_lazy
 
+from ietf.ipr import views
+
 urlpatterns = [
-    url(r'^$', 'ietf.ipr.views.showlist', name='ipr_showlist'),
-    url(r'^about/$', 'ietf.ipr.views.about'),
+    url(r'^$', views.showlist, name='ipr_showlist'),
+    url(r'^about/$', views.about),
     url(r'^admin/$', RedirectView.as_view(url=reverse_lazy('ipr_admin',kwargs={'state':'pending'}), permanent=True),name="ipr_admin_main"),
-    url(r'^admin/(?P<state>pending|removed|parked)/$', 'ietf.ipr.views.admin', name='ipr_admin'),
-    url(r'^ajax/search/$', 'ietf.ipr.views.ajax_search', name='ipr_ajax_search'),
-    url(r'^by-draft/$', 'ietf.ipr.views.by_draft_txt'),
-    url(r'^by-draft-recursive/$', 'ietf.ipr.views.by_draft_recursive_txt'),
-    url(r'^(?P<id>\d+)/$', 'ietf.ipr.views.show', name='ipr_show'),
-    url(r'^(?P<id>\d+)/addcomment/$', 'ietf.ipr.views.add_comment', name='ipr_add_comment'),
-    url(r'^(?P<id>\d+)/addemail/$', 'ietf.ipr.views.add_email', name='ipr_add_email'),
-    url(r'^(?P<id>\d+)/edit/$', 'ietf.ipr.views.edit', name='ipr_edit'),
-    url(r'^(?P<id>\d+)/email/$', 'ietf.ipr.views.email', name='ipr_email'),
-    url(r'^(?P<id>\d+)/history/$', 'ietf.ipr.views.history', name='ipr_history'),
-    url(r'^(?P<id>\d+)/notify/(?P<type>update|posted)/$', 'ietf.ipr.views.notify', name='ipr_notify'),
-    url(r'^(?P<id>\d+)/post/$', 'ietf.ipr.views.post', name='ipr_post'),
-    url(r'^(?P<id>\d+)/state/$', 'ietf.ipr.views.state', name='ipr_state'),
+    url(r'^admin/(?P<state>pending|removed|parked)/$', views.admin, name='ipr_admin'),
+    url(r'^ajax/search/$', views.ajax_search, name='ipr_ajax_search'),
+    url(r'^by-draft/$', views.by_draft_txt),
+    url(r'^by-draft-recursive/$', views.by_draft_recursive_txt),
+    url(r'^(?P<id>\d+)/$', views.show, name='ipr_show'),
+    url(r'^(?P<id>\d+)/addcomment/$', views.add_comment, name='ipr_add_comment'),
+    url(r'^(?P<id>\d+)/addemail/$', views.add_email, name='ipr_add_email'),
+    url(r'^(?P<id>\d+)/edit/$', views.edit, name='ipr_edit'),
+    url(r'^(?P<id>\d+)/email/$', views.email, name='ipr_email'),
+    url(r'^(?P<id>\d+)/history/$', views.history, name='ipr_history'),
+    url(r'^(?P<id>\d+)/notify/(?P<type>update|posted)/$', views.notify, name='ipr_notify'),
+    url(r'^(?P<id>\d+)/post/$', views.post, name='ipr_post'),
+    url(r'^(?P<id>\d+)/state/$', views.state, name='ipr_state'),
     url(r'^update/$', RedirectView.as_view(url=reverse_lazy('ipr_showlist'), permanent=True)),
-    url(r'^update/(?P<id>\d+)/$', 'ietf.ipr.views.update', name='ipr_update'),
-    url(r'^new-(?P<type>(specific|generic|third-party))/$', 'ietf.ipr.views.new', name='ipr_new'),
-    url(r'^search/$', 'ietf.ipr.views.search', name="ipr_search"),
+    url(r'^update/(?P<id>\d+)/$', views.update, name='ipr_update'),
+    url(r'^new-(?P<type>(specific|generic|third-party))/$', views.new, name='ipr_new'),
+    url(r'^search/$', views.search, name="ipr_search"),
 ]
diff --git a/ietf/liaisons/urls.py b/ietf/liaisons/urls.py
index 8e242d5f9..33dabbb9e 100644
--- a/ietf/liaisons/urls.py
+++ b/ietf/liaisons/urls.py
@@ -3,6 +3,8 @@
 from django.conf.urls import url
 from django.views.generic import RedirectView, TemplateView
 
+from ietf.liaisons import views
+
 urlpatterns = [
     url(r'^help/$', TemplateView.as_view(template_name='liaisons/help.html')),
     url(r'^help/fields/$', TemplateView.as_view(template_name='liaisons/field_help.html'), name='liaisons_field_help'),
@@ -13,26 +15,26 @@ urlpatterns = [
 
 # AJAX views
 urlpatterns += [ 
-    url(r'^ajax/get_info/$', 'ietf.liaisons.views.ajax_get_liaison_info'),
-    url(r'^ajax/select2search/$', 'ietf.liaisons.views.ajax_select2_search_liaison_statements'),
+    url(r'^ajax/get_info/$', views.ajax_get_liaison_info),
+    url(r'^ajax/select2search/$', views.ajax_select2_search_liaison_statements),
 ]
 
 # Views
 urlpatterns += [ 
-    url(r'^$', 'ietf.liaisons.views.liaison_list'),
-    url(r'^(?P<state>(posted|pending|dead))/', 'ietf.liaisons.views.liaison_list'),
-    url(r'^(?P<object_id>\d+)/$', 'ietf.liaisons.views.liaison_detail'),
-    url(r'^(?P<object_id>\d+)/addcomment/$', 'ietf.liaisons.views.add_comment'),
-    url(r'^(?P<object_id>\d+)/edit/$', 'ietf.liaisons.views.liaison_edit'),
-    url(r'^(?P<object_id>\d+)/edit-attachment/(?P<doc_id>[A-Za-z0-9._+-]+)$', 'ietf.liaisons.views.liaison_edit_attachment'),
-    url(r'^(?P<object_id>\d+)/delete-attachment/(?P<attach_id>[A-Za-z0-9._+-]+)$', 'ietf.liaisons.views.liaison_delete_attachment'),
-    url(r'^(?P<object_id>\d+)/history/$', 'ietf.liaisons.views.liaison_history'),
-    url(r'^(?P<object_id>\d+)/reply/$', 'ietf.liaisons.views.liaison_reply'),
-    url(r'^(?P<object_id>\d+)/resend/$', 'ietf.liaisons.views.liaison_resend'),
-    url(r'^add/(?P<type>(incoming|outgoing))/$', 'ietf.liaisons.views.liaison_add'),
+    url(r'^$', views.liaison_list),
+    url(r'^(?P<state>(posted|pending|dead))/', views.liaison_list),
+    url(r'^(?P<object_id>\d+)/$', views.liaison_detail),
+    url(r'^(?P<object_id>\d+)/addcomment/$', views.add_comment),
+    url(r'^(?P<object_id>\d+)/edit/$', views.liaison_edit),
+    url(r'^(?P<object_id>\d+)/edit-attachment/(?P<doc_id>[A-Za-z0-9._+-]+)$', views.liaison_edit_attachment),
+    url(r'^(?P<object_id>\d+)/delete-attachment/(?P<attach_id>[A-Za-z0-9._+-]+)$', views.liaison_delete_attachment),
+    url(r'^(?P<object_id>\d+)/history/$', views.liaison_history),
+    url(r'^(?P<object_id>\d+)/reply/$', views.liaison_reply),
+    url(r'^(?P<object_id>\d+)/resend/$', views.liaison_resend),
+    url(r'^add/(?P<type>(incoming|outgoing))/$', views.liaison_add),
 
     # Redirects for backwards compatibility
-    url(r'^add/$', 'ietf.liaisons.views.redirect_add'),
-    url(r'^for_approval/$', 'ietf.liaisons.views.redirect_for_approval'),
-    url(r'^for_approval/(?P<object_id>\d+)/$', 'ietf.liaisons.views.redirect_for_approval'),
+    url(r'^add/$', views.redirect_add),
+    url(r'^for_approval/$', views.redirect_for_approval),
+    url(r'^for_approval/(?P<object_id>\d+)/$', views.redirect_for_approval),
 ]
\ No newline at end of file
diff --git a/ietf/mailinglists/urls.py b/ietf/mailinglists/urls.py
index ae25392c5..3671d7ebc 100644
--- a/ietf/mailinglists/urls.py
+++ b/ietf/mailinglists/urls.py
@@ -3,8 +3,10 @@
 from django.conf.urls import url
 from django.views.generic import RedirectView
 
+from ietf.mailinglists import views
+
 urlpatterns = [
-    url(r'^wg/$', 'ietf.mailinglists.views.groups'),
+    url(r'^wg/$', views.groups),
     url(r'^nonwg/$', RedirectView.as_view(url='https://www.ietf.org/list/nonwg.html', permanent=True)),
     url(r'^nonwg/update/$', RedirectView.as_view(url='https://www.ietf.org/list/nonwg.html', permanent=True)),
     url(r'^request/$', RedirectView.as_view(url='https://www.ietf.org/list/request.html', permanent=True)),
diff --git a/ietf/mailtrigger/urls.py b/ietf/mailtrigger/urls.py
index ff8aee33a..037ce3355 100644
--- a/ietf/mailtrigger/urls.py
+++ b/ietf/mailtrigger/urls.py
@@ -2,10 +2,12 @@ from django.conf.urls import url
 from django.views.generic import RedirectView
 from django.core.urlresolvers import reverse_lazy
 
+from ietf.mailtrigger import views
+
 urlpatterns = [
     url(r'^$', RedirectView.as_view(url=reverse_lazy('mailtrigger_show_triggers'), permanent=True)),
-    url(r'^name/$', 'ietf.mailtrigger.views.show_triggers',  name='mailtrigger_show_triggers' ),
-    url(r'^name/(?P<mailtrigger_slug>[-\w]+)/$', 'ietf.mailtrigger.views.show_triggers' ),
-    url(r'^recipient/$', 'ietf.mailtrigger.views.show_recipients' ),
-    url(r'^recipient/(?P<recipient_slug>[-\w]+)/$', 'ietf.mailtrigger.views.show_recipients' ),
+    url(r'^name/$', views.show_triggers,  name='mailtrigger_show_triggers' ),
+    url(r'^name/(?P<mailtrigger_slug>[-\w]+)/$', views.show_triggers ),
+    url(r'^recipient/$', views.show_recipients ),
+    url(r'^recipient/(?P<recipient_slug>[-\w]+)/$', views.show_recipients ),
 ]
diff --git a/ietf/nomcom/urls.py b/ietf/nomcom/urls.py
index 1136515fe..6bbed45ae 100644
--- a/ietf/nomcom/urls.py
+++ b/ietf/nomcom/urls.py
@@ -2,44 +2,45 @@ from django.conf.urls import url
 
 from ietf.nomcom.forms import EditMembersForm, EditMembersFormPreview
 from ietf.nomcom import views
+from ietf.message import views as message_views
 
 urlpatterns = [
-    url(r'^$', 'ietf.nomcom.views.index'),
-    url(r'^ann/$', 'ietf.nomcom.views.announcements'),
-    url(r'^(?P<year>\d{4})/private/$', 'ietf.nomcom.views.private_index', name='nomcom_private_index'),
-    url(r'^(?P<year>\d{4})/private/key/$', 'ietf.nomcom.views.private_key', name='nomcom_private_key'),
-    url(r'^(?P<year>\d{4})/private/help/$', 'ietf.nomcom.views.configuration_help', name='nomcom_chair_help'),
-    url(r'^(?P<year>\d{4})/private/nominate/$', 'ietf.nomcom.views.private_nominate', name='nomcom_private_nominate'),
-    url(r'^(?P<year>\d{4})/private/nominate/newperson$', 'ietf.nomcom.views.private_nominate_newperson', name='nomcom_private_nominate_newperson'),
-    url(r'^(?P<year>\d{4})/private/feedback/$', 'ietf.nomcom.views.private_feedback', name='nomcom_private_feedback'),
-    url(r'^(?P<year>\d{4})/private/feedback-email/$', 'ietf.nomcom.views.private_feedback_email', name='nomcom_private_feedback_email'),
-    url(r'^(?P<year>\d{4})/private/questionnaire-response/$', 'ietf.nomcom.views.private_questionnaire', name='nomcom_private_questionnaire'),
-    url(r'^(?P<year>\d{4})/private/view-feedback/$', 'ietf.nomcom.views.view_feedback', name='nomcom_view_feedback'),
-    url(r'^(?P<year>\d{4})/private/view-feedback/unrelated/$', 'ietf.nomcom.views.view_feedback_unrelated', name='nomcom_view_feedback_unrelated'),
-    url(r'^(?P<year>\d{4})/private/view-feedback/pending/$', 'ietf.nomcom.views.view_feedback_pending', name='nomcom_view_feedback_pending'),
-    url(r'^(?P<year>\d{4})/private/view-feedback/nominee/(?P<nominee_id>\d+)$', 'ietf.nomcom.views.view_feedback_nominee', name='nomcom_view_feedback_nominee'),
-    url(r'^(?P<year>\d{4})/private/edit/nominee/(?P<nominee_id>\d+)$', 'ietf.nomcom.views.edit_nominee', name='nomcom_edit_nominee'),
+    url(r'^$', views.index),
+    url(r'^ann/$', views.announcements),
+    url(r'^(?P<year>\d{4})/private/$', views.private_index, name='nomcom_private_index'),
+    url(r'^(?P<year>\d{4})/private/key/$', views.private_key, name='nomcom_private_key'),
+    url(r'^(?P<year>\d{4})/private/help/$', views.configuration_help, name='nomcom_chair_help'),
+    url(r'^(?P<year>\d{4})/private/nominate/$', views.private_nominate, name='nomcom_private_nominate'),
+    url(r'^(?P<year>\d{4})/private/nominate/newperson$', views.private_nominate_newperson, name='nomcom_private_nominate_newperson'),
+    url(r'^(?P<year>\d{4})/private/feedback/$', views.private_feedback, name='nomcom_private_feedback'),
+    url(r'^(?P<year>\d{4})/private/feedback-email/$', views.private_feedback_email, name='nomcom_private_feedback_email'),
+    url(r'^(?P<year>\d{4})/private/questionnaire-response/$', views.private_questionnaire, name='nomcom_private_questionnaire'),
+    url(r'^(?P<year>\d{4})/private/view-feedback/$', views.view_feedback, name='nomcom_view_feedback'),
+    url(r'^(?P<year>\d{4})/private/view-feedback/unrelated/$', views.view_feedback_unrelated, name='nomcom_view_feedback_unrelated'),
+    url(r'^(?P<year>\d{4})/private/view-feedback/pending/$', views.view_feedback_pending, name='nomcom_view_feedback_pending'),
+    url(r'^(?P<year>\d{4})/private/view-feedback/nominee/(?P<nominee_id>\d+)$', views.view_feedback_nominee, name='nomcom_view_feedback_nominee'),
+    url(r'^(?P<year>\d{4})/private/edit/nominee/(?P<nominee_id>\d+)$', views.edit_nominee, name='nomcom_edit_nominee'),
     url(r'^(?P<year>\d{4})/private/merge-nominee/?$', views.private_merge_nominee),
     url(r'^(?P<year>\d{4})/private/merge-person/?$', views.private_merge_person),
 #    url(r'^(?P<year>\d{4})/private/send-reminder-mail/$', RedirectView.as_view(url=reverse_lazy('nomcom_send_reminder_mail',kwargs={'year':year,'type':'accept'}))),
-    url(r'^(?P<year>\d{4})/private/send-reminder-mail/(?P<type>\w+)/$', 'ietf.nomcom.views.send_reminder_mail', name='nomcom_send_reminder_mail'),
+    url(r'^(?P<year>\d{4})/private/send-reminder-mail/(?P<type>\w+)/$', views.send_reminder_mail, name='nomcom_send_reminder_mail'),
     url(r'^(?P<year>\d{4})/private/edit-members/$', EditMembersFormPreview(EditMembersForm), name='nomcom_edit_members'),
-    url(r'^(?P<year>\d{4})/private/edit-nomcom/$', 'ietf.nomcom.views.edit_nomcom', name='nomcom_edit_nomcom'),
-    url(r'^(?P<year>\d{4})/private/chair/templates/$', 'ietf.nomcom.views.list_templates', name='nomcom_list_templates'),
-    url(r'^(?P<year>\d{4})/private/chair/templates/(?P<template_id>\d+)/$', 'ietf.nomcom.views.edit_template', name='nomcom_edit_template'),
-    url(r'^(?P<year>\d{4})/private/chair/position/$', 'ietf.nomcom.views.list_positions', name='nomcom_list_positions'),
-    url(r'^(?P<year>\d{4})/private/chair/position/add/$', 'ietf.nomcom.views.edit_position', name='nomcom_add_position'),
-    url(r'^(?P<year>\d{4})/private/chair/position/(?P<position_id>\d+)/$', 'ietf.nomcom.views.edit_position', name='nomcom_edit_position'),
-    url(r'^(?P<year>\d{4})/private/chair/position/(?P<position_id>\d+)/remove/$', 'ietf.nomcom.views.remove_position', name='nomcom_remove_position'),
+    url(r'^(?P<year>\d{4})/private/edit-nomcom/$', views.edit_nomcom, name='nomcom_edit_nomcom'),
+    url(r'^(?P<year>\d{4})/private/chair/templates/$', views.list_templates, name='nomcom_list_templates'),
+    url(r'^(?P<year>\d{4})/private/chair/templates/(?P<template_id>\d+)/$', views.edit_template, name='nomcom_edit_template'),
+    url(r'^(?P<year>\d{4})/private/chair/position/$', views.list_positions, name='nomcom_list_positions'),
+    url(r'^(?P<year>\d{4})/private/chair/position/add/$', views.edit_position, name='nomcom_add_position'),
+    url(r'^(?P<year>\d{4})/private/chair/position/(?P<position_id>\d+)/$', views.edit_position, name='nomcom_edit_position'),
+    url(r'^(?P<year>\d{4})/private/chair/position/(?P<position_id>\d+)/remove/$', views.remove_position, name='nomcom_remove_position'),
 
-    url(r'^(?P<year>\d{4})/$', 'ietf.nomcom.views.year_index', name='nomcom_year_index'),
-    url(r'^(?P<year>\d{4})/requirements/$', 'ietf.nomcom.views.requirements', name='nomcom_requirements'),
-    url(r'^(?P<year>\d{4})/expertise/$', 'ietf.nomcom.views.requirements', name='nomcom_requirements'),
-    url(r'^(?P<year>\d{4})/questionnaires/$', 'ietf.nomcom.views.questionnaires', name='nomcom_questionnaires'),
-    url(r'^(?P<year>\d{4})/feedback/$', 'ietf.nomcom.views.public_feedback', name='nomcom_public_feedback'),
-    url(r'^(?P<year>\d{4})/nominate/$', 'ietf.nomcom.views.public_nominate', name='nomcom_public_nominate'),
-    url(r'^(?P<year>\d{4})/nominate/newperson$', 'ietf.nomcom.views.public_nominate_newperson', name='nomcom_public_nominate_newperson'),
-    url(r'^(?P<year>\d{4})/process-nomination-status/(?P<nominee_position_id>\d+)/(?P<state>[\w]+)/(?P<date>[\d]+)/(?P<hash>[a-f0-9]+)/$', 'ietf.nomcom.views.process_nomination_status', name='nomcom_process_nomination_status'),
+    url(r'^(?P<year>\d{4})/$', views.year_index, name='nomcom_year_index'),
+    url(r'^(?P<year>\d{4})/requirements/$', views.requirements, name='nomcom_requirements'),
+    url(r'^(?P<year>\d{4})/expertise/$', views.requirements, name='nomcom_requirements'),
+    url(r'^(?P<year>\d{4})/questionnaires/$', views.questionnaires, name='nomcom_questionnaires'),
+    url(r'^(?P<year>\d{4})/feedback/$', views.public_feedback, name='nomcom_public_feedback'),
+    url(r'^(?P<year>\d{4})/nominate/$', views.public_nominate, name='nomcom_public_nominate'),
+    url(r'^(?P<year>\d{4})/nominate/newperson$', views.public_nominate_newperson, name='nomcom_public_nominate_newperson'),
+    url(r'^(?P<year>\d{4})/process-nomination-status/(?P<nominee_position_id>\d+)/(?P<state>[\w]+)/(?P<date>[\d]+)/(?P<hash>[a-f0-9]+)/$', views.process_nomination_status, name='nomcom_process_nomination_status'),
 # use the generic view from message
-    url(r'^ann/(?P<message_id>\d+)/$', 'ietf.message.views.message', {'group_type': "nomcom" }, "nomcom_announcement"),
+    url(r'^ann/(?P<message_id>\d+)/$', message_views.message, {'group_type': "nomcom" }, "nomcom_announcement"),
 ]
diff --git a/ietf/person/urls.py b/ietf/person/urls.py
index a89d5b974..0c8a7da91 100644
--- a/ietf/person/urls.py
+++ b/ietf/person/urls.py
@@ -2,7 +2,7 @@ from django.conf.urls import url
 from ietf.person import views, ajax
 
 urlpatterns = [
-    url(r'^search/(?P<model_name>(person|email))/$', "ietf.person.views.ajax_select2_search", None, 'ajax_select2_search_person_email'),
+    url(r'^search/(?P<model_name>(person|email))/$', views.ajax_select2_search, None, 'ajax_select2_search_person_email'),
     url(r'^(?P<personid>[a-z0-9]+).json$', ajax.person_json),
     url(ur'^(?P<email_or_name>[-\w\s\']+)', views.profile),
 ]
diff --git a/ietf/redirects/urls.py b/ietf/redirects/urls.py
index b6d64ad73..fa78dd600 100644
--- a/ietf/redirects/urls.py
+++ b/ietf/redirects/urls.py
@@ -2,6 +2,8 @@
 
 from django.conf.urls import url
 
+from ietf.redirects import views
+
 urlpatterns = [
-    url(r'^(?P<script>.*?\.cgi)(/.*)?$', 'ietf.redirects.views.redirect'),
+    url(r'^(?P<script>.*?\.cgi)(/.*)?$', views.redirect),
 ]
diff --git a/ietf/release/urls.py b/ietf/release/urls.py
index 260c17235..3e993bef7 100644
--- a/ietf/release/urls.py
+++ b/ietf/release/urls.py
@@ -1,9 +1,11 @@
 from django.conf.urls import url
 from django.views.generic import TemplateView
 
+from ietf.release import views
+
 urlpatterns = [
-    url(r'^$',  'ietf.release.views.release'),
-    url(r'^(?P<version>[0-9.]+.*)/$',  'ietf.release.views.release'),
+    url(r'^$',  views.release),
+    url(r'^(?P<version>[0-9.]+.*)/$',  views.release),
     url(r'^about/?$',  TemplateView.as_view(template_name='release/about.html')),
     url(r'^todo/?$',  TemplateView.as_view(template_name='release/todo.html')),
 ]
diff --git a/ietf/secr/announcement/urls.py b/ietf/secr/announcement/urls.py
index 76d864f66..dd308b72e 100644
--- a/ietf/secr/announcement/urls.py
+++ b/ietf/secr/announcement/urls.py
@@ -1,6 +1,8 @@
 from django.conf.urls import url
 
+from ietf.secr.announcement import views
+
 urlpatterns = [
-    url(r'^$', 'ietf.secr.announcement.views.main', name='announcement'),
-    url(r'^confirm/$', 'ietf.secr.announcement.views.confirm', name='announcement_confirm'),
+    url(r'^$', views.main, name='announcement'),
+    url(r'^confirm/$', views.confirm, name='announcement_confirm'),
 ]
diff --git a/ietf/secr/areas/urls.py b/ietf/secr/areas/urls.py
index 63c7630ba..bb75daeda 100644
--- a/ietf/secr/areas/urls.py
+++ b/ietf/secr/areas/urls.py
@@ -1,12 +1,14 @@
 from django.conf.urls import url
 
+from ietf.secr.areas import views
+
 urlpatterns = [
-    url(r'^$', 'ietf.secr.areas.views.list_areas', name='areas'),
-    url(r'^add/$', 'ietf.secr.areas.views.add', name='areas_add'),
-    url(r'^getemails', 'ietf.secr.areas.views.getemails', name='areas_emails'),
-    url(r'^getpeople', 'ietf.secr.areas.views.getpeople', name='areas_getpeople'),
-    url(r'^(?P<name>[A-Za-z0-9.-]+)/$', 'ietf.secr.areas.views.view', name='areas_view'),
-    url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/$', 'ietf.secr.areas.views.edit', name='areas_edit'),
-    url(r'^(?P<name>[A-Za-z0-9.-]+)/people/$', 'ietf.secr.areas.views.people', name='areas_people'),
-    url(r'^(?P<name>[A-Za-z0-9.-]+)/people/modify/$', 'ietf.secr.areas.views.modify', name='areas_modify'),
+    url(r'^$', views.list_areas, name='areas'),
+    url(r'^add/$', views.add, name='areas_add'),
+    url(r'^getemails', views.getemails, name='areas_emails'),
+    url(r'^getpeople', views.getpeople, name='areas_getpeople'),
+    url(r'^(?P<name>[A-Za-z0-9.-]+)/$', views.view, name='areas_view'),
+    url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/$', views.edit, name='areas_edit'),
+    url(r'^(?P<name>[A-Za-z0-9.-]+)/people/$', views.people, name='areas_people'),
+    url(r'^(?P<name>[A-Za-z0-9.-]+)/people/modify/$', views.modify, name='areas_modify'),
 ]
diff --git a/ietf/secr/console/urls.py b/ietf/secr/console/urls.py
index 776755f48..e2e6a7501 100644
--- a/ietf/secr/console/urls.py
+++ b/ietf/secr/console/urls.py
@@ -1,5 +1,7 @@
 from django.conf.urls import url
 
+from ietf.secr.console import views
+
 urlpatterns = [
-    url(r'^$', 'ietf.secr.console.views.main', name='console'),
+    url(r'^$', views.main, name='console'),
 ]
diff --git a/ietf/secr/drafts/urls.py b/ietf/secr/drafts/urls.py
index 7031b032a..0d1efdf5b 100644
--- a/ietf/secr/drafts/urls.py
+++ b/ietf/secr/drafts/urls.py
@@ -1,24 +1,26 @@
 from django.conf.urls import url
 
+from ietf.secr.drafts import views
+
 urlpatterns = [
-    url(r'^$', 'ietf.secr.drafts.views.search', name='drafts'),
-    url(r'^add/$', 'ietf.secr.drafts.views.add', name='drafts_add'),
-    url(r'^approvals/$', 'ietf.secr.drafts.views.approvals', name='drafts_approvals'),
-    url(r'^dates/$', 'ietf.secr.drafts.views.dates', name='drafts_dates'),
-    url(r'^nudge-report/$', 'ietf.secr.drafts.views.nudge_report', name='drafts_nudge_report'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/$', 'ietf.secr.drafts.views.view', name='drafts_view'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/abstract/$', 'ietf.secr.drafts.views.abstract', name='drafts_abstract'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/announce/$', 'ietf.secr.drafts.views.announce', name='drafts_announce'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/authors/$', 'ietf.secr.drafts.views.authors', name='drafts_authors'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/author_delete/(?P<oid>\d{1,6})$', 'ietf.secr.drafts.views.author_delete', name='drafts_author_delete'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/confirm/$', 'ietf.secr.drafts.views.confirm', name='drafts_confirm'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/edit/$', 'ietf.secr.drafts.views.edit', name='drafts_edit'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/extend/$', 'ietf.secr.drafts.views.extend', name='drafts_extend'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/email/$', 'ietf.secr.drafts.views.email', name='drafts_email'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/makerfc/$', 'ietf.secr.drafts.views.makerfc', name='drafts_makerfc'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/replace/$', 'ietf.secr.drafts.views.replace', name='drafts_replace'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/resurrect/$', 'ietf.secr.drafts.views.resurrect', name='drafts_resurrect'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/revision/$', 'ietf.secr.drafts.views.revision', name='drafts_revision'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/update/$', 'ietf.secr.drafts.views.update', name='drafts_update'),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/withdraw/$', 'ietf.secr.drafts.views.withdraw', name='drafts_withdraw'),
+    url(r'^$', views.search, name='drafts'),
+    url(r'^add/$', views.add, name='drafts_add'),
+    url(r'^approvals/$', views.approvals, name='drafts_approvals'),
+    url(r'^dates/$', views.dates, name='drafts_dates'),
+    url(r'^nudge-report/$', views.nudge_report, name='drafts_nudge_report'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/$', views.view, name='drafts_view'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/abstract/$', views.abstract, name='drafts_abstract'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/announce/$', views.announce, name='drafts_announce'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/authors/$', views.authors, name='drafts_authors'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/author_delete/(?P<oid>\d{1,6})$', views.author_delete, name='drafts_author_delete'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/confirm/$', views.confirm, name='drafts_confirm'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/edit/$', views.edit, name='drafts_edit'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/extend/$', views.extend, name='drafts_extend'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/email/$', views.email, name='drafts_email'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/makerfc/$', views.makerfc, name='drafts_makerfc'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/replace/$', views.replace, name='drafts_replace'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/resurrect/$', views.resurrect, name='drafts_resurrect'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/revision/$', views.revision, name='drafts_revision'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/update/$', views.update, name='drafts_update'),
+    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/withdraw/$', views.withdraw, name='drafts_withdraw'),
 ]
\ No newline at end of file
diff --git a/ietf/secr/groups/urls.py b/ietf/secr/groups/urls.py
index d5914f90a..060c67be3 100644
--- a/ietf/secr/groups/urls.py
+++ b/ietf/secr/groups/urls.py
@@ -1,17 +1,19 @@
 from django.conf.urls import url
 from django.conf import settings
 
+from ietf.secr.groups import views
+
 urlpatterns = [
-    url(r'^$', 'ietf.secr.groups.views.search', name='groups'),
-    url(r'^add/$', 'ietf.secr.groups.views.add', name='groups_add'),
-    url(r'^blue-dot-report/$', 'ietf.secr.groups.views.blue_dot', name='groups_blue_dot'),
-    url(r'^search/$', 'ietf.secr.groups.views.search', name='groups_search'),
-    #(r'^ajax/get_ads/$', 'ietf.secr.groups.views.get_ads'),
-    url(r'^%(acronym)s/$' % settings.URL_REGEXPS, 'ietf.secr.groups.views.view', name='groups_view'),
-    url(r'^%(acronym)s/delete/(?P<id>\d{1,6})/$' % settings.URL_REGEXPS, 'ietf.secr.groups.views.delete_role', name='groups_delete_role'),
-    url(r'^%(acronym)s/charter/$' % settings.URL_REGEXPS, 'ietf.secr.groups.views.charter', name='groups_charter'),
-    url(r'^%(acronym)s/edit/$' % settings.URL_REGEXPS, 'ietf.secr.groups.views.edit', name='groups_edit'),
-    url(r'^%(acronym)s/gm/$' % settings.URL_REGEXPS, 'ietf.secr.groups.views.view_gm', name='groups_view_gm'),
-    url(r'^%(acronym)s/gm/edit/$' % settings.URL_REGEXPS, 'ietf.secr.groups.views.edit_gm', name='groups_edit_gm'),
-    url(r'^%(acronym)s/people/$' % settings.URL_REGEXPS, 'ietf.secr.groups.views.people', name='groups_people'),
+    url(r'^$', views.search, name='groups'),
+    url(r'^add/$', views.add, name='groups_add'),
+    url(r'^blue-dot-report/$', views.blue_dot, name='groups_blue_dot'),
+    url(r'^search/$', views.search, name='groups_search'),
+    #(r'^ajax/get_ads/$', views.get_ads),
+    url(r'^%(acronym)s/$' % settings.URL_REGEXPS, views.view, name='groups_view'),
+    url(r'^%(acronym)s/delete/(?P<id>\d{1,6})/$' % settings.URL_REGEXPS, views.delete_role, name='groups_delete_role'),
+    url(r'^%(acronym)s/charter/$' % settings.URL_REGEXPS, views.charter, name='groups_charter'),
+    url(r'^%(acronym)s/edit/$' % settings.URL_REGEXPS, views.edit, name='groups_edit'),
+    url(r'^%(acronym)s/gm/$' % settings.URL_REGEXPS, views.view_gm, name='groups_view_gm'),
+    url(r'^%(acronym)s/gm/edit/$' % settings.URL_REGEXPS, views.edit_gm, name='groups_edit_gm'),
+    url(r'^%(acronym)s/people/$' % settings.URL_REGEXPS, views.people, name='groups_people'),
 ]
diff --git a/ietf/secr/meetings/urls.py b/ietf/secr/meetings/urls.py
index c42ca0c47..1eb863daf 100644
--- a/ietf/secr/meetings/urls.py
+++ b/ietf/secr/meetings/urls.py
@@ -1,25 +1,27 @@
 from django.conf.urls import url
 
+from ietf.secr.meetings import views
+
 urlpatterns = [
-    url(r'^$', 'ietf.secr.meetings.views.main', name='meetings'),
-    url(r'^add/$', 'ietf.secr.meetings.views.add', name='meetings_add'),
-    url(r'^ajax/get-times/(?P<meeting_id>\d{1,6})/(?P<day>\d)/$', 'ietf.secr.meetings.views.ajax_get_times', name='meetings_ajax_get_times'),
-    url(r'^blue_sheet/$', 'ietf.secr.meetings.views.blue_sheet_redirect', name='meetings_blue_sheet_redirect'),
-    url(r'^(?P<meeting_id>\d{1,6})/$', 'ietf.secr.meetings.views.view', name='meetings_view'),
-    url(r'^(?P<meeting_id>\d{1,6})/blue_sheet/$', 'ietf.secr.meetings.views.blue_sheet', name='meetings_blue_sheet'),
-    url(r'^(?P<meeting_id>\d{1,6})/blue_sheet/generate/$', 'ietf.secr.meetings.views.blue_sheet_generate', name='meetings_blue_sheet_generate'),
-    url(r'^(?P<meeting_id>\d{1,6})/edit/$', 'ietf.secr.meetings.views.edit_meeting', name='meetings_edit_meeting'),
-    url(r'^(?P<meeting_id>\d{1,6})/notifications/$', 'ietf.secr.meetings.views.notifications', name='meetings_notifications'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/$', 'ietf.secr.meetings.views.select', name='meetings_select'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/non_session/$', 'ietf.secr.meetings.views.non_session', name='meetings_non_session'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/non_session/edit/(?P<slot_id>\d{1,6})/$', 'ietf.secr.meetings.views.non_session_edit', name='meetings_non_session_edit'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/non_session/delete/(?P<slot_id>\d{1,6})/$', 'ietf.secr.meetings.views.non_session_delete', name='meetings_non_session_delete'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/rooms/$', 'ietf.secr.meetings.views.rooms', name='meetings_rooms'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/select/$', 'ietf.secr.meetings.views.select_group', name='meetings_select_group'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/times/$', 'ietf.secr.meetings.views.times', name='meetings_times'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/times/delete/(?P<time>[0-9\:]+)/$', 'ietf.secr.meetings.views.times_delete', name='meetings_times_delete'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/times/edit/(?P<time>[0-9\:]+)/$', 'ietf.secr.meetings.views.times_edit', name='meetings_times_edit'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/unschedule/(?P<session_id>\d{1,6})/$', 'ietf.secr.meetings.views.unschedule', name='meetings_unschedule'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/(?P<acronym>[-a-z0-9]+)/schedule/$', 'ietf.secr.meetings.views.schedule', name='meetings_schedule'),
-    url(r'^(?P<meeting_id>\d{1,6})/(?P<acronym>[-a-z0-9]+)/remove/$', 'ietf.secr.meetings.views.remove_session', name='meetings_remove_session'),
+    url(r'^$', views.main, name='meetings'),
+    url(r'^add/$', views.add, name='meetings_add'),
+    url(r'^ajax/get-times/(?P<meeting_id>\d{1,6})/(?P<day>\d)/$', views.ajax_get_times, name='meetings_ajax_get_times'),
+    url(r'^blue_sheet/$', views.blue_sheet_redirect, name='meetings_blue_sheet_redirect'),
+    url(r'^(?P<meeting_id>\d{1,6})/$', views.view, name='meetings_view'),
+    url(r'^(?P<meeting_id>\d{1,6})/blue_sheet/$', views.blue_sheet, name='meetings_blue_sheet'),
+    url(r'^(?P<meeting_id>\d{1,6})/blue_sheet/generate/$', views.blue_sheet_generate, name='meetings_blue_sheet_generate'),
+    url(r'^(?P<meeting_id>\d{1,6})/edit/$', views.edit_meeting, name='meetings_edit_meeting'),
+    url(r'^(?P<meeting_id>\d{1,6})/notifications/$', views.notifications, name='meetings_notifications'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/$', views.select, name='meetings_select'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/non_session/$', views.non_session, name='meetings_non_session'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/non_session/edit/(?P<slot_id>\d{1,6})/$', views.non_session_edit, name='meetings_non_session_edit'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/non_session/delete/(?P<slot_id>\d{1,6})/$', views.non_session_delete, name='meetings_non_session_delete'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/rooms/$', views.rooms, name='meetings_rooms'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/select/$', views.select_group, name='meetings_select_group'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/times/$', views.times, name='meetings_times'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/times/delete/(?P<time>[0-9\:]+)/$', views.times_delete, name='meetings_times_delete'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/times/edit/(?P<time>[0-9\:]+)/$', views.times_edit, name='meetings_times_edit'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/unschedule/(?P<session_id>\d{1,6})/$', views.unschedule, name='meetings_unschedule'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<schedule_name>[A-Za-z0-9_\-]+)/(?P<acronym>[-a-z0-9]+)/schedule/$', views.schedule, name='meetings_schedule'),
+    url(r'^(?P<meeting_id>\d{1,6})/(?P<acronym>[-a-z0-9]+)/remove/$', views.remove_session, name='meetings_remove_session'),
 ]
diff --git a/ietf/secr/proceedings/urls.py b/ietf/secr/proceedings/urls.py
index 03c1623b6..59553c772 100644
--- a/ietf/secr/proceedings/urls.py
+++ b/ietf/secr/proceedings/urls.py
@@ -2,15 +2,17 @@ from django.conf.urls import url
 from django.conf import settings
 from ietf.meeting.views import OldUploadRedirect
 
+from ietf.secr.proceedings import views
+
 urlpatterns = [
-    url(r'^$', 'ietf.secr.proceedings.views.main', name='proceedings'),
-    url(r'^ajax/generate-proceedings/(?P<meeting_num>\d{1,3})/$', 'ietf.secr.proceedings.views.ajax_generate_proceedings', name='proceedings_ajax_generate_proceedings'),
+    url(r'^$', views.main, name='proceedings'),
+    url(r'^ajax/generate-proceedings/(?P<meeting_num>\d{1,3})/$', views.ajax_generate_proceedings, name='proceedings_ajax_generate_proceedings'),
     # special offline URL for testing proceedings build
-    url(r'^process-pdfs/(?P<meeting_num>\d{1,3})/$', 'ietf.secr.proceedings.views.process_pdfs', name='proceedings_process_pdfs'),
-    url(r'^progress-report/(?P<meeting_num>\d{1,3})/$', 'ietf.secr.proceedings.views.progress_report', name='proceedings_progress_report'),
-    url(r'^(?P<meeting_num>\d{1,3})/$', 'ietf.secr.proceedings.views.select', name='proceedings_select'),
-    url(r'^(?P<meeting_num>\d{1,3})/recording/$', 'ietf.secr.proceedings.views.recording', name='proceedings_recording'),
-    url(r'^(?P<meeting_num>\d{1,3})/recording/edit/(?P<name>[A-Za-z0-9_\-\+]+)$', 'ietf.secr.proceedings.views.recording_edit', name='proceedings_recording_edit'),
+    url(r'^process-pdfs/(?P<meeting_num>\d{1,3})/$', views.process_pdfs, name='proceedings_process_pdfs'),
+    url(r'^progress-report/(?P<meeting_num>\d{1,3})/$', views.progress_report, name='proceedings_progress_report'),
+    url(r'^(?P<meeting_num>\d{1,3})/$', views.select, name='proceedings_select'),
+    url(r'^(?P<meeting_num>\d{1,3})/recording/$', views.recording, name='proceedings_recording'),
+    url(r'^(?P<meeting_num>\d{1,3})/recording/edit/(?P<name>[A-Za-z0-9_\-\+]+)$', views.recording_edit, name='proceedings_recording_edit'),
     url(r'^(?P<num>\d{1,3}|interim-\d{4}-[A-Za-z0-9_\-\+]+)/%(acronym)s/$' % settings.URL_REGEXPS,
          OldUploadRedirect.as_view(permanent=True)),
 ]
diff --git a/ietf/secr/roles/urls.py b/ietf/secr/roles/urls.py
index c0ca352f2..545afdaf0 100644
--- a/ietf/secr/roles/urls.py
+++ b/ietf/secr/roles/urls.py
@@ -1,8 +1,10 @@
 from django.conf.urls import url
 from django.conf import settings
 
+from ietf.secr.roles import views
+
 urlpatterns = [
-    url(r'^$', 'ietf.secr.roles.views.main', name='roles'),
-    url(r'^ajax/get-roles/%(acronym)s/$' % settings.URL_REGEXPS, 'ietf.secr.roles.views.ajax_get_roles', name='roles_ajax_get_roles'),
-    url(r'^%(acronym)s/delete/(?P<id>\d{1,6})/$' % settings.URL_REGEXPS, 'ietf.secr.roles.views.delete_role', name='roles_delete_role'),
+    url(r'^$', views.main, name='roles'),
+    url(r'^ajax/get-roles/%(acronym)s/$' % settings.URL_REGEXPS, views.ajax_get_roles, name='roles_ajax_get_roles'),
+    url(r'^%(acronym)s/delete/(?P<id>\d{1,6})/$' % settings.URL_REGEXPS, views.delete_role, name='roles_delete_role'),
 ]
diff --git a/ietf/secr/rolodex/urls.py b/ietf/secr/rolodex/urls.py
index 7c3a7ba37..24779d97e 100644
--- a/ietf/secr/rolodex/urls.py
+++ b/ietf/secr/rolodex/urls.py
@@ -1,10 +1,12 @@
 from django.conf.urls import url
 
+from ietf.secr.rolodex import views
+
 urlpatterns = [
-    url(r'^$', 'ietf.secr.rolodex.views.search', name='rolodex'),
-    url(r'^add/$', 'ietf.secr.rolodex.views.add', name='rolodex_add'),
-    url(r'^add-proceed/$', 'ietf.secr.rolodex.views.add_proceed', name='rolodex_add_proceed'),
-    url(r'^(?P<id>\d{1,6})/edit/$', 'ietf.secr.rolodex.views.edit', name='rolodex_edit'),
-    #url(r'^(?P<id>\d{1,6})/delete/$', 'ietf.secr.rolodex.views.delete', name='rolodex_delete'),
-    url(r'^(?P<id>\d{1,6})/$', 'ietf.secr.rolodex.views.view', name='rolodex_view'),
+    url(r'^$', views.search, name='rolodex'),
+    url(r'^add/$', views.add, name='rolodex_add'),
+    url(r'^add-proceed/$', views.add_proceed, name='rolodex_add_proceed'),
+    url(r'^(?P<id>\d{1,6})/edit/$', views.edit, name='rolodex_edit'),
+    #url(r'^(?P<id>\d{1,6})/delete/$', views.delete, name='rolodex_delete'),
+    url(r'^(?P<id>\d{1,6})/$', views.view, name='rolodex_view'),
 ]
diff --git a/ietf/secr/sreq/urls.py b/ietf/secr/sreq/urls.py
index f42ea6cc5..bb9bcede8 100644
--- a/ietf/secr/sreq/urls.py
+++ b/ietf/secr/sreq/urls.py
@@ -1,16 +1,18 @@
 from django.conf.urls import url
 from django.conf import settings
 
+from ietf.secr.sreq import views
+
 urlpatterns = [
-    url(r'^$', 'ietf.secr.sreq.views.main', name='sessions'),
-    url(r'^status/$', 'ietf.secr.sreq.views.tool_status', name='sessions_tool_status'),
-    url(r'^%(acronym)s/$' % settings.URL_REGEXPS, 'ietf.secr.sreq.views.view', name='sessions_view'),
-    url(r'^(?P<num>[A-Za-z0-9_\-\+]+)/%(acronym)s/view/$' % settings.URL_REGEXPS, 'ietf.secr.sreq.views.view', name='sessions_view'),
-    url(r'^%(acronym)s/approve/$' % settings.URL_REGEXPS, 'ietf.secr.sreq.views.approve', name='sessions_approve'),
-    url(r'^%(acronym)s/cancel/$' % settings.URL_REGEXPS, 'ietf.secr.sreq.views.cancel', name='sessions_cancel'),
-    url(r'^%(acronym)s/confirm/$' % settings.URL_REGEXPS, 'ietf.secr.sreq.views.confirm', name='sessions_confirm'),
-    url(r'^%(acronym)s/edit/$' % settings.URL_REGEXPS, 'ietf.secr.sreq.views.edit', name='sessions_edit'),
-    url(r'^%(acronym)s/new/$' % settings.URL_REGEXPS, 'ietf.secr.sreq.views.new', name='sessions_new'),
-    url(r'^%(acronym)s/no_session/$' % settings.URL_REGEXPS, 'ietf.secr.sreq.views.no_session', name='sessions_no_session'),
-    url(r'^(?P<num>[A-Za-z0-9_\-\+]+)/%(acronym)s/edit/$' % settings.URL_REGEXPS, 'ietf.secr.sreq.views.edit_mtg', name='sessions_edit'),
+    url(r'^$', views.main, name='sessions'),
+    url(r'^status/$', views.tool_status, name='sessions_tool_status'),
+    url(r'^%(acronym)s/$' % settings.URL_REGEXPS, views.view, name='sessions_view'),
+    url(r'^(?P<num>[A-Za-z0-9_\-\+]+)/%(acronym)s/view/$' % settings.URL_REGEXPS, views.view, name='sessions_view'),
+    url(r'^%(acronym)s/approve/$' % settings.URL_REGEXPS, views.approve, name='sessions_approve'),
+    url(r'^%(acronym)s/cancel/$' % settings.URL_REGEXPS, views.cancel, name='sessions_cancel'),
+    url(r'^%(acronym)s/confirm/$' % settings.URL_REGEXPS, views.confirm, name='sessions_confirm'),
+    url(r'^%(acronym)s/edit/$' % settings.URL_REGEXPS, views.edit, name='sessions_edit'),
+    url(r'^%(acronym)s/new/$' % settings.URL_REGEXPS, views.new, name='sessions_new'),
+    url(r'^%(acronym)s/no_session/$' % settings.URL_REGEXPS, views.no_session, name='sessions_no_session'),
+    url(r'^(?P<num>[A-Za-z0-9_\-\+]+)/%(acronym)s/edit/$' % settings.URL_REGEXPS, views.edit_mtg, name='sessions_edit'),
 ]
diff --git a/ietf/secr/telechat/urls.py b/ietf/secr/telechat/urls.py
index d9295bbd9..ab92a7e36 100644
--- a/ietf/secr/telechat/urls.py
+++ b/ietf/secr/telechat/urls.py
@@ -1,14 +1,16 @@
 from django.conf.urls import url
 
+from ietf.secr.telechat import views
+
 urlpatterns = [
-    url(r'^$', 'ietf.secr.telechat.views.main', name='telechat'),
-    url(r'^(?P<date>[0-9\-]+)/bash/$', 'ietf.secr.telechat.views.bash', name='telechat_bash'),
-    url(r'^(?P<date>[0-9\-]+)/doc/$', 'ietf.secr.telechat.views.doc', name='telechat_doc'),
-    url(r'^(?P<date>[0-9\-]+)/doc/(?P<name>[A-Za-z0-9.-]+)/$', 'ietf.secr.telechat.views.doc_detail', name='telechat_doc_detail'),
-    url(r'^(?P<date>[0-9\-]+)/doc/(?P<name>[A-Za-z0-9.-]+)/(?P<nav>next|previous)/$', 'ietf.secr.telechat.views.doc_navigate',
+    url(r'^$', views.main, name='telechat'),
+    url(r'^(?P<date>[0-9\-]+)/bash/$', views.bash, name='telechat_bash'),
+    url(r'^(?P<date>[0-9\-]+)/doc/$', views.doc, name='telechat_doc'),
+    url(r'^(?P<date>[0-9\-]+)/doc/(?P<name>[A-Za-z0-9.-]+)/$', views.doc_detail, name='telechat_doc_detail'),
+    url(r'^(?P<date>[0-9\-]+)/doc/(?P<name>[A-Za-z0-9.-]+)/(?P<nav>next|previous)/$', views.doc_navigate,
         name='telechat_doc_navigate'),
-    url(r'^(?P<date>[0-9\-]+)/management/$', 'ietf.secr.telechat.views.management', name='telechat_management'),
-    url(r'^(?P<date>[0-9\-]+)/minutes/$', 'ietf.secr.telechat.views.minutes', name='telechat_minutes'),
-    url(r'^(?P<date>[0-9\-]+)/roll-call/$', 'ietf.secr.telechat.views.roll_call', name='telechat_roll_call'),
-    url(r'^new/$', 'ietf.secr.telechat.views.new', name='telechat_new'),
+    url(r'^(?P<date>[0-9\-]+)/management/$', views.management, name='telechat_management'),
+    url(r'^(?P<date>[0-9\-]+)/minutes/$', views.minutes, name='telechat_minutes'),
+    url(r'^(?P<date>[0-9\-]+)/roll-call/$', views.roll_call, name='telechat_roll_call'),
+    url(r'^new/$', views.new, name='telechat_new'),
 ]
diff --git a/ietf/stats/urls.py b/ietf/stats/urls.py
index 9f9979a3e..f19c313c0 100644
--- a/ietf/stats/urls.py
+++ b/ietf/stats/urls.py
@@ -1,9 +1,9 @@
 from django.conf import settings
 
-import ietf.stats.views
+from ietf.stats import views
 from ietf.utils.urls  import url
 
 urlpatterns = [
-    url("^$", ietf.stats.views.stats_index),
-    url("^review/(?:(?P<stats_type>completion|results|states|time)/)?(?:%(acronym)s/)?$" % settings.URL_REGEXPS, ietf.stats.views.review_stats),
+    url("^$", views.stats_index),
+    url("^review/(?:(?P<stats_type>completion|results|states|time)/)?(?:%(acronym)s/)?$" % settings.URL_REGEXPS, views.review_stats),
 ]
diff --git a/ietf/sync/urls.py b/ietf/sync/urls.py
index e1a095f55..bfd05bc67 100644
--- a/ietf/sync/urls.py
+++ b/ietf/sync/urls.py
@@ -1,8 +1,10 @@
 from django.conf.urls import url
 
+from ietf.sync import views
+
 urlpatterns = [
-    url(r'^discrepancies/$', 'ietf.sync.views.discrepancies'),
-    url(r'^(?P<org>\w+)/notify/(?P<notification>\w+)/$', 'ietf.sync.views.notify'),
-    url(r'^rfceditor/undo/', 'ietf.sync.views.rfceditor_undo')
+    url(r'^discrepancies/$', views.discrepancies),
+    url(r'^(?P<org>\w+)/notify/(?P<notification>\w+)/$', views.notify),
+    url(r'^rfceditor/undo/', views.rfceditor_undo)
 ]
 
diff --git a/ietf/urls.py b/ietf/urls.py
index d39e5d388..c56e771c7 100644
--- a/ietf/urls.py
+++ b/ietf/urls.py
@@ -2,18 +2,21 @@
 
 from django.conf import settings
 from django.conf.urls import include
-from django.conf.urls.static import static
+from django.conf.urls.static import static as static_url
 from django.contrib import admin
-from django.views.generic import TemplateView
+from django.contrib.sitemaps import views as sitemap_views
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.views import static as static_view
+from django.views.generic import TemplateView
 
 import debug                            # pyflakes:ignore
 
-from ietf.doc import views_search
-from ietf.liaisons.sitemaps import LiaisonMap
-from ietf.ipr.sitemaps import IPRMap
-from ietf.utils.urls import url
 from ietf import api
+from ietf.doc import views_search
+from ietf.help import views as help_views
+from ietf.ipr.sitemaps import IPRMap
+from ietf.liaisons.sitemaps import LiaisonMap
+from ietf.utils.urls import url
 
 admin.autodiscover()
 api.autodiscover()
@@ -54,8 +57,8 @@ urlpatterns = [
     url(r'^person/', include('ietf.person.urls')),
     url(r'^release/', include('ietf.release.urls')),
     url(r'^secr/', include('ietf.secr.urls')),
-    url(r'^sitemap-(?P<section>.+).xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps}),
-    url(r'^sitemap.xml$', 'django.contrib.sitemaps.views.index', { 'sitemaps': sitemaps}),
+    url(r'^sitemap-(?P<section>.+).xml$', sitemap_views.sitemap, {'sitemaps': sitemaps}),
+    url(r'^sitemap.xml$', sitemap_views.index, { 'sitemaps': sitemaps}),
     url(r'^stats/', include('ietf.stats.urls')),
     url(r'^stream/', include('ietf.group.urls_stream')),
     url(r'^submit/', include('ietf.submit.urls')),
@@ -86,10 +89,10 @@ if settings.SERVER_MODE in ('development', 'test'):
     urlpatterns += staticfiles_urlpatterns()
     urlpatterns += [
             url(r'^_test500/$', lambda x: None),
-            url(r'^environment/$', 'ietf.help.views.environment'),
+            url(r'^environment/$', help_views.environment),
             ## maybe preserve some static legacy URLs ?
-            url(r'^(?P<path>(?:images|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT+'ietf/'}),
+            url(r'^(?P<path>(?:images|css|js)/.*)$', static_view.serve, {'document_root': settings.STATIC_ROOT+'ietf/'}),
         ]
-    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    urlpatterns += static_url(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
     settings.DEBUG = save_debug
 
diff --git a/ietf/utils/urls.py b/ietf/utils/urls.py
index 1efa9fa13..195dcc070 100644
--- a/ietf/utils/urls.py
+++ b/ietf/utils/urls.py
@@ -6,7 +6,7 @@ from inspect import isclass
 
 from django.conf.urls import url as django_url
 
-def url(regex, view, kwargs=None, name=None, prefix=''):
+def url(regex, view, kwargs=None, name=None):
     if isinstance(view, (list, tuple)):
         pass                            # use the name passed in
     elif isinstance(view, six.string_types):
@@ -23,5 +23,5 @@ def url(regex, view, kwargs=None, name=None, prefix=''):
     if name:
         #debug.show('name')
         pass
-    return django_url(regex, view, kwargs=kwargs, name=name, prefix=prefix)
+    return django_url(regex, view, kwargs=kwargs, name=name)
     
\ No newline at end of file