Index: branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -N -r11107 -r11110
--- branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11107)
+++ branches/RC/core/admin_templates/catalog/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11110)
@@ -35,7 +35,7 @@
 		</tr>
 </table>
 
-<inp2:m_set t="in-portal/xml/categories_list"/>
+<inp2:m_set t="categories/xml/categories_list"/>
 <inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" class="tableborder_full_a">
 	<tr bgcolor="#e0e0da" height="20">
@@ -61,7 +61,7 @@
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
+<div id="categories_div" prefix="c" view_template="categories/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
 <inp2:m_set t="in-portal/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
Index: branches/RC/core/units/sections/sections_config.php
===================================================================
diff -u -N -r11100 -r11110
--- branches/RC/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 11100)
+++ branches/RC/core/units/sections/sections_config.php	(.../sections_config.php)	(revision 11110)
@@ -34,7 +34,7 @@
 				'icon'			=>	'in-portal:catalog', // 'proj-cms:structure'
 				'label'			=>	'la_tab_Browse',
 				'url'			=>	Array ('t' => 'in-portal/catalog', 'pass' => 'm'),
-				'late_load'		=>	Array ('t' => 'in-portal/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
+				'late_load'		=>	Array ('t' => 'categories/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
 				'onclick'		=>	'checkCatalog(0)',
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	1,
Index: branches/RC/core/units/categories/categories_config.php
===================================================================
diff -u -N -r10729 -r11110
--- branches/RC/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 10729)
+++ branches/RC/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 11110)
@@ -135,7 +135,7 @@
 																							'icon'			=>	'catalog',
 																							'label'			=>	'la_tab_Browse',
 																							'url'			=>	Array('t' => 'in-portal/catalog', 'pass' => 'm'),
-																							'late_load'		=>	Array('t' => 'in-portal/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
+																							'late_load'		=>	Array('t' => 'categories/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
 																							'onclick'		=>	'checkCatalog(0)',
 																							'permissions'	=>	Array('view'),
 																							'priority'		=>	0.1,
Index: branches/RC/kernel/admin_templates/item_selector/item_selector_catalog.tpl
===================================================================
diff -u -N -r11107 -r11110
--- branches/RC/kernel/admin_templates/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11107)
+++ branches/RC/kernel/admin_templates/item_selector/item_selector_catalog.tpl	(.../item_selector_catalog.tpl)	(revision 11110)
@@ -35,7 +35,7 @@
 		</tr>
 </table>
 
-<inp2:m_set t="in-portal/xml/categories_list"/>
+<inp2:m_set t="categories/xml/categories_list"/>
 <inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <table class="toolbar" cellspacing="0" cellpadding="2" width="100%" border="0" class="tableborder_full_a">
 	<tr bgcolor="#e0e0da" height="20">
@@ -61,7 +61,7 @@
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
+<div id="categories_div" prefix="c" view_template="categories/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
 <inp2:m_set t="in-portal/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
Index: branches/RC/kernel/units/sections/sections_config.php
===================================================================
diff -u -N -r11100 -r11110
--- branches/RC/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 11100)
+++ branches/RC/kernel/units/sections/sections_config.php	(.../sections_config.php)	(revision 11110)
@@ -34,7 +34,7 @@
 				'icon'			=>	'in-portal:catalog', // 'proj-cms:structure'
 				'label'			=>	'la_tab_Browse',
 				'url'			=>	Array ('t' => 'in-portal/catalog', 'pass' => 'm'),
-				'late_load'		=>	Array ('t' => 'in-portal/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
+				'late_load'		=>	Array ('t' => 'categories/xml/tree_categories', 'pass' => 'm', 'm_cat_id' => 0),
 				'onclick'		=>	'checkCatalog(0)',
 				'permissions'	=>	Array ('view'),
 				'priority'		=>	1,
Index: branches/RC/core/admin_templates/categories/cache_updater.tpl
===================================================================
diff -u -N -r8929 -r11110
--- branches/RC/core/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 8929)
+++ branches/RC/core/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 11110)
@@ -39,7 +39,7 @@
 			redirect('<inp2:m_t t="in-portal/catalog" pass="m"/>');
 		}
 
-		$CacheUpdater = new AjaxProgressBar('<inp2:m_t t="in-portal/xml/cache_updater" continue="2" no_amp="1"/>');
+		$CacheUpdater = new AjaxProgressBar('<inp2:m_t t="categories/xml/cache_updater" continue="2" no_amp="1"/>');
 	</script>
 </inp2:m_if>
 
Index: branches/RC/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -N -r11107 -r11110
--- branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 11107)
+++ branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 11110)
@@ -192,7 +192,7 @@
 		</tr>
 </table>
 
-<inp2:m_set t="in-portal/xml/categories_list"/>
+<inp2:m_set t="categories/xml/categories_list"/>
 <inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <table class="toolbar" cellspacing="0" cellpadding="0" width="100%" border="0" style="border-top-width: 0px;">
 	<tr bgcolor="#e0e0da">
@@ -218,7 +218,7 @@
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
+<div id="categories_div" prefix="c" view_template="categories/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
 <inp2:m_set t="in-portal/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>
Index: branches/RC/kernel/admin_templates/categories/cache_updater.tpl
===================================================================
diff -u -N -r8929 -r11110
--- branches/RC/kernel/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 8929)
+++ branches/RC/kernel/admin_templates/categories/cache_updater.tpl	(.../cache_updater.tpl)	(revision 11110)
@@ -39,7 +39,7 @@
 			redirect('<inp2:m_t t="in-portal/catalog" pass="m"/>');
 		}
 
-		$CacheUpdater = new AjaxProgressBar('<inp2:m_t t="in-portal/xml/cache_updater" continue="2" no_amp="1"/>');
+		$CacheUpdater = new AjaxProgressBar('<inp2:m_t t="categories/xml/cache_updater" continue="2" no_amp="1"/>');
 	</script>
 </inp2:m_if>
 
Index: branches/RC/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -N -r11107 -r11110
--- branches/RC/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 11107)
+++ branches/RC/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 11110)
@@ -192,7 +192,7 @@
 		</tr>
 </table>
 
-<inp2:m_set t="in-portal/xml/categories_list"/>
+<inp2:m_set t="categories/xml/categories_list"/>
 <inp2:m_RenderElement name="kernel_form" form_name="categories_form"/>
 <table class="toolbar" cellspacing="0" cellpadding="0" width="100%" border="0" style="border-top-width: 0px;">
 	<tr bgcolor="#e0e0da">
@@ -218,7 +218,7 @@
 	</tr>
 </table>
 
-<div id="categories_div" prefix="c" view_template="in-portal/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
+<div id="categories_div" prefix="c" view_template="categories/xml/categories_list" edit_template="categories/categories_edit" dep_buttons="" class="catalog-tab" style="display: block;"></div>
 <inp2:m_RenderElement name="kernel_form_end"/>
 <inp2:m_set t="in-portal/catalog"/>
 <script type="text/javascript">$Catalog.registerTab('categories');</script>