--- a/src/ldt/ldt/ldt_utils/urls.py	Fri Dec 30 18:16:44 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/urls.py	Mon Jan 02 15:57:32 2012 +0100
@@ -6,40 +6,40 @@
 # admin.autodiscover()
 
 urlpatterns = patterns('ldt.ldt_utils',
-    url(r'^searchInit/(?P<field>.*)/(?P<query>.*)$', 'views.search_init'),
-    url(r'^searchForm/$', 'views.search_form'),
-    url(r'^published/$', 'views.published_project'),
-    url(r'^groups/$', 'views.groups'),
-    url(r'^get_group_projects/$', 'views.get_group_projects'),
-    url(r'^search/$', 'views.search_index'),
-    url(r'^searchListing', 'views.search_listing'),
-    url(r'^search/(?P<field>.*)/(?P<query>.*)$', 'views.search_index_get'),
-    url(r'^searchLdt/(?P<field>.*)/(?P<query>.*)$', 'views.search_ldt'),
-    url(r'^searchSeg/(?P<field>.*)/(?P<query>.*)$', 'views.search_segments'),
-    url(r'^index/(?P<url>.*)$', 'views.index'),
-    url(r'^init/(?P<method>.*)/(?P<url>.*)$', 'views.init', name='ldt_init'),
-    url(r'^ldt/(?P<url>.*)$', 'views.ldt'),
-    url(r'^search/loading/$', 'views.loading'),
-    url(r'^create/(?P<iri_id>.*)$', 'views.create_project'),
-    url(r'^copy/(?P<ldt_id>.*)/(?P<group_id>.*)$', 'views.copy_project'),
-    url(r'^copy/(?P<ldt_id>.*)$', 'views.copy_project'),
-    url(r'^update/(?P<ldt_id>.*)$', 'views.update_project'),
-    url(r'^cljson/id/(?P<id>.*)$', 'views.project_json_id'),
-    url(r'^cljson/externalid/(?P<id>.*)$', 'views.project_json_externalid'),
-    url(r'^rdf/id/(?P<ldt_id>.*)$', 'views.project_annotations_rdf'),
-    url(r'^/?$', "views.workspace", name="root-view"),
-    url(r'^filterprojects/_(?P<filter>[\w\%\_\-\+]*?)/(?P<is_owner>true|false)/(?P<status>\d)$', "views.projects_filter",),
-    url(r'^filterprojects/_(?P<filter>[\w\%\_\-\+]*?)/(?P<is_owner>true|false)/(?P<status>\d)/(?P<id_group>.*)$', "views.projects_filter",),
-    url(r'^filtercontents/_(?P<filter>[\w\%\_\-\+]*?)/$', "views.contents_filter",),
-    url(r'^filtergroups/_(?P<filter>[\w\%\_\-\+]*?)/$', "views.groups_filter",),
-    url(r'filtershare/_(?P<filter>[\w\%\_\-\+]*?)/(?P<use_groups>true|false)$', "views.share_filter"),
-    (r'^embedpopup/?$', "views.popup_embed"),
-    url(r'^segment/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.index_segment'),
-    url(r'^segmentInit/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.init_segment'),
-    url(r'^segmentLdt/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.ldt_segment'),
-    url(r'^segmentHighlight/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.highlight_segment'),
-    url(r'^createGroup/$', 'views.create_group'),
-    url(r'^updateGroup/(?P<group_id>.*)$', 'views.update_group'),
+    url(r'^searchInit/(?P<field>.*)/(?P<query>.*)$', 'views.lignesdetemps.search_init'),
+    url(r'^searchForm/$', 'views.workspace.search_form'),
+    url(r'^published/$', 'views.workspace.published_project'),
+    url(r'^groups/$', 'views.workspace.groups'),
+    url(r'^get_group_projects/$', 'views.group.get_group_projects'),
+    url(r'^search/$', 'views.workspace.search_index'),
+    url(r'^searchListing', 'views.workspace.search_listing'),
+    url(r'^search/(?P<field>.*)/(?P<query>.*)$', 'views.lignesdetemps.search_index_get'),
+    url(r'^searchLdt/(?P<field>.*)/(?P<query>.*)$', 'views.lignesdetemps.search_ldt'),
+    url(r'^searchSeg/(?P<field>.*)/(?P<query>.*)$', 'views.lignesdetemps.search_segments'),
+    url(r'^index/(?P<url>.*)$', 'views.lignesdetemps.index'),
+    url(r'^init/(?P<method>.*)/(?P<url>.*)$', 'views.lignesdetemps.init', name='ldt_init'),
+    url(r'^ldt/(?P<url>.*)$', 'views.lignesdetemps.ldt'),
+    url(r'^search/loading/$', 'views.workspace.loading'),
+    url(r'^create/(?P<iri_id>.*)$', 'views.project.create_project'),
+    url(r'^copy/(?P<ldt_id>.*)/(?P<group_id>.*)$', 'views.project.copy_project'),
+    url(r'^copy/(?P<ldt_id>.*)$', 'views.project.copy_project'),
+    url(r'^update/(?P<ldt_id>.*)$', 'views.project.update_project'),
+    url(r'^cljson/id/(?P<id>.*)$', 'views.json.project_json_id'),
+    url(r'^cljson/externalid/(?P<id>.*)$', 'views.json.project_json_externalid'),
+    url(r'^rdf/id/(?P<ldt_id>.*)$', 'views.rdf.project_annotations_rdf'),
+    url(r'^/?$', "views.workspace.home", name="root-view"),
+    url(r'^filterprojects/_(?P<filter>[\w\%\_\-\+]*?)/(?P<is_owner>true|false)/(?P<status>\d)$', "views.project.projects_filter",),
+    url(r'^filterprojects/_(?P<filter>[\w\%\_\-\+]*?)/(?P<is_owner>true|false)/(?P<status>\d)/(?P<id_group>.*)$', "views.project.projects_filter",),
+    url(r'^filtercontents/_(?P<filter>[\w\%\_\-\+]*?)/$', "views.content.contents_filter",),
+    url(r'^filtergroups/_(?P<filter>[\w\%\_\-\+]*?)/$', "views.group.groups_filter",),
+    url(r'filtershare/_(?P<filter>[\w\%\_\-\+]*?)/(?P<use_groups>true|false)$', "views.workspace.share_filter"),
+    (r'^embedpopup/?$', "views.workspace.popup_embed"),
+    url(r'^segment/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.lignesdetemps.index_segment'),
+    url(r'^segmentInit/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.lignesdetemps.init_segment'),
+    url(r'^segmentLdt/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.lignesdetemps.ldt_segment'),
+    url(r'^segmentHighlight/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.lignesdetemps.highlight_segment'),
+    url(r'^createGroup/$', 'views.group.create_group'),
+    url(r'^updateGroup/(?P<group_id>.*)$', 'views.group.update_group'),
 )
 
 urlpatterns += patterns('',
@@ -49,21 +49,21 @@
 
 if test_ldt():
     urlpatterns += patterns('ldt.ldt_utils',
-        url(r'^space/content/$', 'views.list_content'),
-        url(r'^space/content/create/$', 'views.write_content'),
-        url(r'^space/content/update/(?P<iri_id>[\w-]+)$', 'views.write_content'),
-        url(r'^space/ldt/$', 'views.list_ldt'),
-        url(r'^space/ldt/indexproject/(?P<id>.*)$', 'views.index_project', name='index_project'),
-        url(r'^space/ldt/indexprojectfull/(?P<id>.*)$', 'views.index_project', {'full': True}, name='index_project_full'),
-        url(r'^space/ldt/init/(?P<method>.*)/(?P<url>.+)$', 'views.init', name='space_ldt_init'),
-        url(r'^space/ldt/project/(?P<id>.*)$', 'views.ldt_project'),
-        url(r'^space/ldt/create/$', 'views.create_ldt_view'),
-        url(r'^space/ldt/created_done/$', 'views.created_ldt'),
-        url(r'^space/ldt/save/$', 'views.save_ldt_project'),
-        url(r'^space/ldt/publish/(?P<id>[\w-]*)(?:/(?P<redirect>true|false))?$', 'views.publish'),
-        url(r'^space/ldt/unpublish/(?P<id>[\w-]*)(?:/(?P<redirect>true|false))?$', 'views.unpublish'),
-        url(r'^space/upload/$', 'views.upload'),
-        url(r'^space/removetempfile/$', 'views.remove_temp_file'),
-        url(r'^space/getduration/$', 'views.get_duration'),
+        #url(r'^space/content/$', 'views.list_content'),
+        url(r'^space/content/create/$', 'views.content.write_content'),
+        url(r'^space/content/update/(?P<iri_id>[\w-]+)$', 'views.content.write_content'),
+        #url(r'^space/ldt/$', 'views.list_ldt'),
+        url(r'^space/ldt/indexproject/(?P<id>.*)$', 'views.lignesdetemps.index_project', name='index_project'),
+        url(r'^space/ldt/indexprojectfull/(?P<id>.*)$', 'views.lignesdetemps.index_project', {'full': True}, name='index_project_full'),
+        url(r'^space/ldt/init/(?P<method>.*)/(?P<url>.+)$', 'views.lignesdetemps.init', name='space_ldt_init'),
+        url(r'^space/ldt/project/(?P<id>.*)$', 'views.lignesdetemps.ldt_project'),
+        url(r'^space/ldt/create/$', 'views.project.create_ldt_view'),
+        url(r'^space/ldt/created_done/$', 'views.project.created_ldt'),
+        url(r'^space/ldt/save/$', 'views.lignesdetemps.save_ldt_project'),
+        url(r'^space/ldt/publish/(?P<id>[\w-]*)(?:/(?P<redirect>true|false))?$', 'views.project.publish'),
+        url(r'^space/ldt/unpublish/(?P<id>[\w-]*)(?:/(?P<redirect>true|false))?$', 'views.project.unpublish'),
+        url(r'^space/upload/$', 'views.content.upload'),
+        url(r'^space/removetempfile/$', 'views.content.remove_temp_file'),
+        url(r'^space/getduration/$', 'views.content.get_duration'),
 
 )