diff -r 7358eeae14d8 -r 4e819dd96e1f urls.py
--- a/urls.py	Thu Sep 24 15:20:30 2009 +0530
+++ b/urls.py	Fri Sep 25 00:27:42 2009 +0530
@@ -19,8 +19,8 @@
     # Uncomment the next line to enable the admin:
     # (r'^admin/', include(admin.site.urls)),
     url (r'^$', direct_to_template, {"template": "homepage.html"}, name="home"),
-    (r'^register/','content.views.register'),
-    (r'^logout/','content.views.logout'),
-    (r'^regthank/(?P<id>\d+)/$', 'content.views.regthank'),
-    (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': 'site-content'}),
+    (r'^register/','conference.views.register'),
+    (r'^logout/','conference.views.logout'),
+    (r'^regthank/(?P<id>\d+)/$', 'conference.views.regthank'),
+    (r'^site-content/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
 )