Index: trunk/core/kernel/startup.php
===================================================================
diff -u -r6428 -r6647
--- trunk/core/kernel/startup.php	(.../startup.php)	(revision 6428)
+++ trunk/core/kernel/startup.php	(.../startup.php)	(revision 6647)
@@ -1,8 +1,10 @@
 <?php
+	define('KERNEL_PATH', FULL_PATH.'/core/kernel');
 
+	if (file_exists(FULL_PATH.'/kernel/kernel4/application.php')) {
+		die('Please remove '.FULL_PATH.'/kernel/kernel4 directiry - it has been moved to '.KERNEL_PATH.'<br/>Don\'t forget to clean Cache table afterwards');
+	}
 
-	define('KERNEL_PATH', FULL_PATH.'/kernel/kernel4');
-
 	if (!function_exists('getmicrotime')) {
 		function getmicrotime()
 		{
@@ -24,13 +26,15 @@
 
 	safeDefine('INPORTAL_TAGS', true);
 	safeDefine('SERVER_NAME', $_SERVER['HTTP_HOST']);
-	safeDefine('KERNEL_PATH', FULL_PATH.'/kernel4');
 
 	$https_mark = getArrayValue($_SERVER, 'HTTPS');
 	safeDefine('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
 
 	$vars = parse_portal_ini(FULL_PATH.'/config.php');
 
+	define('APPLICATION_CLASS', isset($vars['ApplicationClass']) ? $vars['ApplicationClass'] : 'kApplication');
+	define('APPLICATION_PATH', isset($vars['ApplicationPath']) ? $vars['ApplicationPath'] : '/core/kernel/application.php');
+
 	if ($vars === false || count($vars) == 0) {
 		global $rootURL;
 		echo 'In-Portal is probably not installed, or configuration file is missing.<br>';
@@ -88,19 +92,16 @@
 
 	$includes = Array(
 			KERNEL_PATH.'/application.php',
-			MODULES_PATH.'/kernel/units/general/my_application.php',
+			FULL_PATH.APPLICATION_PATH,
 			KERNEL_PATH.'/db/db_connection.php',
 			KERNEL_PATH."/kbase.php",
 			KERNEL_PATH.'/utility/event.php',
 			KERNEL_PATH."/utility/factory.php",
 			KERNEL_PATH."/languages/phrases_cache.php",
 			KERNEL_PATH."/db/dblist.php",
 			KERNEL_PATH."/db/dbitem.php",
-//			KERNEL_PATH.'/processors/tag_processor.php',
-//			KERNEL_PATH."/db/db_tag_processor.php",
 			KERNEL_PATH."/event_handler.php",
 			KERNEL_PATH.'/db/db_event_handler.php',
-			MODULES_PATH.'/kernel/units/general/inp_db_event_handler.php',
 	);
 
 	foreach ($includes as $a_file) {
Index: trunk/admin/install.php
===================================================================
diff -u -r6428 -r6647
--- trunk/admin/install.php	(.../install.php)	(revision 6428)
+++ trunk/admin/install.php	(.../install.php)	(revision 6647)
@@ -620,10 +620,9 @@
 	// K4 applition is now always available during upgrade process
 	if (!defined('FULL_PATH')) {
 		define('FULL_PATH', realpath(dirname(__FILE__).'/..'));
-		define('APPLICATION_CLASS', 'MyApplication');
 	}
 
-	include_once(FULL_PATH.'/kernel/kernel4/startup.php');
+	include_once(FULL_PATH.'/core/kernel/startup.php');
 	$application =& kApplication::Instance();
 	$application->Init();
 
@@ -714,8 +713,7 @@
 
     // compile stylesheets: begin
 	define('FULL_PATH', realpath(dirname(__FILE__).'/..'));
-	define('APPLICATION_CLASS', 'MyApplication');
-	include_once(FULL_PATH.'/kernel/kernel4/startup.php');
+	include_once(FULL_PATH.'/core/kernel/startup.php');
 	$application =& kApplication::Instance();
 	$application->Init();
 
@@ -1391,8 +1389,7 @@
 	{
 		// KERNEL 4 INIT: BEGIN
 		define('FULL_PATH', realpath(dirname(__FILE__).'/..'));
-		define('APPLICATION_CLASS', 'MyApplication');
-		include_once(FULL_PATH.'/kernel/kernel4/startup.php');
+		include_once(FULL_PATH.'/core/kernel/startup.php');
 
 		$application =& kApplication::Instance();
 		$application->Init();
Index: trunk/tools/cron.php
===================================================================
diff -u -r4971 -r6647
--- trunk/tools/cron.php	(.../cron.php)	(revision 4971)
+++ trunk/tools/cron.php	(.../cron.php)	(revision 6647)
@@ -2,10 +2,9 @@
 
 define('FULL_PATH', realpath(dirname(__FILE__).'/..'));
 define('REL_PATH', 'tools/');
-define('APPLICATION_CLASS', 'MyApplication');
 define('ADMIN', 1);
 
-include_once(FULL_PATH.'/kernel/kernel4/startup.php');
+include_once(FULL_PATH.'/core/kernel/startup.php');
 
 $application =& kApplication::Instance();
 $application->Init();
Index: trunk/core/kernel/application.php
===================================================================
diff -u -r6623 -r6647
--- trunk/core/kernel/application.php	(.../application.php)	(revision 6623)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 6647)
@@ -438,7 +438,6 @@
 	*/
 	function RegisterDefaultClasses()
 	{
-
 		$this->registerClass('kTempTablesHandler', KERNEL_PATH.'/utility/temp_handler.php');
 		$this->registerClass('kEventManager', KERNEL_PATH.'/event_manager.php', 'EventManager');
 		$this->registerClass('kUnitConfigReader', KERNEL_PATH.'/utility/unit_config_reader.php');
@@ -457,20 +456,6 @@
 
 		$this->registerClass('Params', KERNEL_PATH.'/utility/params.php', 'kActions');
 
-		/*$this->registerClass('kFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kOptionsFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kUploadFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kPictureFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kDateFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kLEFTFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kMultiLanguage', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kPasswordFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kCCDateFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kUnitFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kFilesizeFormatter', KERNEL_PATH.'/utility/formatters.php');
-		$this->registerClass('kSerializedFormatter', KERNEL_PATH.'/utility/formatters.php');*/
-
-
 		$this->registerClass('kMultipleFilter', KERNEL_PATH.'/utility/filters.php');
 		$this->registerClass('kDBList', KERNEL_PATH.'/db/dblist.php');
 		$this->registerClass('kDBItem', KERNEL_PATH.'/db/dbitem.php');
@@ -492,6 +477,25 @@
 		}
 
 		$this->registerClass('FCKeditor', FULL_PATH.'/admin/editor/cmseditor/fckeditor.php'); // need this?
+
+		/* Moved from MyApplication */
+
+		$this->registerClass('Inp1Parser',KERNEL_PATH.'/../units/general/inp1_parser.php','Inp1Parser');
+
+		$this->registerClass('InpSession',KERNEL_PATH.'/../units/general/inp_ses_storage.php','Session');
+		$this->registerClass('InpSessionStorage',KERNEL_PATH.'/../units/general/inp_ses_storage.php','SessionStorage');
+
+		$this->registerClass('kCatDBItem',KERNEL_PATH.'/../units/general/cat_dbitem.php');
+		$this->registerClass('kCatDBItemExportHelper',KERNEL_PATH.'/../units/general/cat_dbitem_export.php', 'CatItemExportHelper');
+		$this->registerClass('kCatDBList',KERNEL_PATH.'/../units/general/cat_dblist.php');
+		$this->registerClass('kCatDBEventHandler',KERNEL_PATH.'/../units/general/cat_event_handler.php');
+		$this->registerClass('kCatDBTagProcessor',KERNEL_PATH.'/../units/general/cat_tag_processor.php');
+
+		// Do not move to config - this helper is used before configs are read
+		$this->registerClass('kModulesHelper', KERNEL_PATH.'/../units/general/helpers/modules.php', 'ModulesHelper');
+
+		/* End moved */
+
 	}
 
 	function RegisterDefaultBuildEvents()
@@ -2209,6 +2213,33 @@
 		exit;
 	}
 
+
+	/* moved from MyApplication */
+
+	function getUserGroups($user_id)
+	{
+		switch($user_id)
+		{
+			case -1:
+				$user_groups = $this->ConfigValue('User_LoggedInGroup');
+				break;
+			case -2:
+				$user_groups = $this->ConfigValue('User_LoggedInGroup');
+				$user_groups .= ','.$this->ConfigValue('User_GuestGroup');
+				break;
+			default:
+				$sql = 'SELECT GroupId FROM '.TABLE_PREFIX.'UserGroup WHERE PortalUserId = '.$user_id;
+				$res = $this->Conn->GetCol($sql);
+				$user_groups = Array( $this->ConfigValue('User_LoggedInGroup') );
+				if(is_array($res))
+				{
+					$user_groups = array_merge($user_groups, $res);
+				}
+				$user_groups = implode(',', $user_groups);
+		}
+		return $user_groups;
+	}
+
 }
 
 ?>
\ No newline at end of file
Index: trunk/kernel/admin_templates/tree.tpl
===================================================================
diff -u -r5062 -r6647
--- trunk/kernel/admin_templates/tree.tpl	(.../tree.tpl)	(revision 5062)
+++ trunk/kernel/admin_templates/tree.tpl	(.../tree.tpl)	(revision 6647)
@@ -72,9 +72,9 @@
 		<td colspan="2" style="padding: 5px;">
 			<inp2:m_DefineElement name="xml_node">
 				<inp2:m_if check="m_ParamEquals" param="children_count" value="0">
-					<item href="<inp2:m_param name="section_url"/>" onclick="<inp2:m_param name="onclick"/>" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif"><inp2:m_phrase name="$label" escape="1"/></item>
+					<item href="<inp2:m_param name="section_url"/>" onclick="<inp2:m_param name="onclick"/>" icon="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon24_<inp2:m_param name="icon"/>.gif"><inp2:m_phrase name="$label" escape="1"/></item>
 				<inp2:m_else/>
-					<folder href="<inp2:m_param name="section_url"/>" onclick="<inp2:m_param name="onclick"/>" name="<inp2:m_phrase name="$label" escape="1"/>" icon="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif" load_url="<inp2:m_param name="late_load"/>"><inp2:adm_PrintSections render_as="xml_node" section_name="$section_name"/></folder>
+					<folder href="<inp2:m_param name="section_url"/>" onclick="<inp2:m_param name="onclick"/>" name="<inp2:m_phrase name="$label" escape="1"/>" icon="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon24_<inp2:m_param name="icon"/>.gif" load_url="<inp2:m_param name="late_load"/>"><inp2:adm_PrintSections render_as="xml_node" section_name="$section_name"/></folder>
 				</inp2:m_if>
 			</inp2:m_DefineElement>
 
@@ -86,7 +86,7 @@
 				var TREE_ICONS_PATH = 'img/tree'
 
 				<inp2:m_DefineElement name="root_node">
-					var the_tree = new TreeFolder('tree', '<inp2:m_param name="label"/>', '<inp2:m_param name="section_url"/>', '<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif');
+					var the_tree = new TreeFolder('tree', '<inp2:m_param name="label"/>', '<inp2:m_param name="section_url"/>', '<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon24_<inp2:m_param name="icon"/>.gif');
 				</inp2:m_DefineElement>
 				<inp2:adm_PrintSection render_as="root_node" section_name="in-portal:root"/>
 				the_tree.AddFromXML('<tree><inp2:adm_PrintSections render_as="xml_node" section_name="in-portal:root"/></tree>');
@@ -102,7 +102,7 @@
 	var $kf = document.getElementById($form_name);
 	$kf.target = 'main_frame';
 
-	
+
 	function checkCatalog($cat_id) {
 		var $ret = checkEditMode();
 		var $right_frame = window.parent.getFrame('main');
@@ -112,7 +112,7 @@
 		}
 		return $ret;
 	}
-	
+
 	function checkEditMode()
 	{
 		var $phrase = "<inp2:adm_TreeEditWarrning label="la_EditingInProgress" escape="1"/>";
Index: trunk/admin/relation_select.php
===================================================================
diff -u -r4689 -r6647
--- trunk/admin/relation_select.php	(.../relation_select.php)	(revision 4689)
+++ trunk/admin/relation_select.php	(.../relation_select.php)	(revision 6647)
@@ -16,18 +16,17 @@
 
 //KERNEL4 STARTUP - FOR ACTIONS HANDLING
 
-function k4getmicrotime() 
-{ 
-    list($usec, $sec) = explode(" ", microtime()); 
-    return ((float)$usec + (float)$sec); 
-} 
+function k4getmicrotime()
+{
+    list($usec, $sec) = explode(" ", microtime());
+    return ((float)$usec + (float)$sec);
+}
 
 $start = k4getmicrotime();
 
 define('ADMIN', 1);
 define('FULL_PATH', realpath(dirname(__FILE__).'/..'));
-define('APPLICATION_CLASS', 'MyApplication');
-include_once(FULL_PATH."/kernel/kernel4/startup.php");
+include_once(FULL_PATH."/core/kernel/startup.php");
 
 $application =& kApplication::Instance();
 $application->Init();
@@ -131,7 +130,7 @@
 <script language="JavaScript1.2">
 	var enableContextMenus= true;
 	var doubleClickAction = 'select';
-	
+
 	function toggleTabB(tabId, atm)
 	{
     	var hl = document.getElementById("hidden_line");
@@ -151,17 +150,17 @@
 			toolbar.setTab(null);
 			showTab();
    		}
-   		else 
-   		{   
+   		else
+   		{
       		if (activeTab)
-      			toggleTab(tabId, true) 
-      		else 
+      			toggleTab(tabId, true)
+      		else
       			toggleTab(tabId, atm)
       		if (hl) hl.style.display = "none";
    		}
    		tab_hdr = document.getElementById('tab_headers');
-   		if (!tab_hdr) return; 
-		
+   		if (!tab_hdr) return;
+
 		// process all module tabs
 	   	var active_str = '';
    		for(var i = 0; i < tabIDs.length; i++)
@@ -179,15 +178,15 @@
       			var tab = document.getElementById(tabIDs[i]);
       			if (!tab) continue;
 				active_str = (tab.active) ? "tab_active" : "tab_inactive";
-				
+
       			if (TDs[j].getAttribute("tabHeaderOf") == tabId) {
 	      			// module tab is selected
 	      			SetBackground('l_' + tabId, "$imagesURL/itemtabs/" + active_str + "_l.gif");
 	        		SetBackground('m_' + tabId, "$imagesURL/itemtabs/" + active_str + ".gif");
 	      			SetBackground('m1_' + tabId, "$imagesURL/itemtabs/" + active_str + ".gif");
 	        		SetBackground('r_' + tabId, "$imagesURL/itemtabs/" + active_str + "_r.gif");
 	      		}
-	      		else 
+	      		else
 	      		{
 	      			// module tab is not selected
 	      			SetBackground('l_' +tabIDs[i], "$imagesURL/itemtabs/" + active_str + "_l.gif");
@@ -208,13 +207,13 @@
 		var categories = document.getElementById('categories');
 		if (!categories) return;
 		toggleCategories(instant);
-		
+
 		var active_str = '$imagesURL'+'/itemtabs/' + (categories.active ? 'tab_active' : 'tab_inactive');
 		SetBackground('l_cat', active_str + '_l.gif');
 		SetBackground('m_cat', active_str + '.gif');
 		SetBackground('m1_cat', active_str + '.gif');
 		SetBackground('r_cat', active_str + '_r.gif');
-	
+
 	   	var images = tabHeader.getElementsByTagName("IMG");
 	   	if (images.length < 1) return;
 			images[0].src = '$imagesURL'+'/itemtabs/' + ((categories.active) ? "divider_up" : "divider_dn") + ".gif";
@@ -238,7 +237,7 @@
 		    <tb:separator ImagePath="<?php echo $imagesURL."/toolbar/";?>">
       		<tb:button action="upcat" title="<?php echo admin_language("la_ToolTip_Up"); ?>" ImagePath="<?php echo $imagesURL."/toolbar/";?>">
 		    <tb:button action="homecat" title="<?php echo admin_language("la_ToolTip_Home"); ?>" ImagePath="<?php echo $imagesURL."/toolbar/";?>">
-		    <tb:separator ImagePath="<?php echo $imagesURL."/toolbar/";?>">  	   
+		    <tb:separator ImagePath="<?php echo $imagesURL."/toolbar/";?>">
             <tb:button action="view" title="<?php echo admin_language("la_ToolTip_View"); ?>" ImagePath="<?php echo $imagesURL."/toolbar/";?>">
 	    </div>
  	</td>
@@ -283,7 +282,7 @@
           			onmouseover="this.src='<?php echo $imagesURL."/toolbar/";?>/arrow16_f2.gif'"
           			onmouseout="this.src='<?php echo $imagesURL."/toolbar/";?>/arrow16.gif'"
           			style="cursor:hand">-->
-          	
+
           	<img
           			action="search_c"
           			src="<?php echo $imagesURL."/toolbar/";?>/icon16_search_reset.gif"
@@ -309,7 +308,7 @@
  <!-- CATEGORY DIVIDER -->
 <?php
     $objCatList->Clear();
-    $OrderBy = $objCatList->QueryOrderByClause(TRUE,TRUE,TRUE); 
+    $OrderBy = $objCatList->QueryOrderByClause(TRUE,TRUE,TRUE);
     if($SearchType=="categories" || $SearchType="all")
     {
       $list = $objSession->GetVariable('SearchWord');
@@ -392,17 +391,17 @@
 <?php
   if( GetVar('Selector') == 'radio' )
     echo "  var single_select = true;";
-?>   
+?>
    InitPage();
   cats_on = theMainScript.GetCookie('cats_tab_on');
    if (cats_on == 0) {
    	 toggleCategoriesB(document.getElementById('cats_tab'), true);
    }
-   
+
    tabs_on = theMainScript.GetCookie('tabs_on');
    if (tabs_on == '1' || tabs_on == null) {
 	   if(default_tab.length == 0 || default_tab == 'categories' )
-	   { 
+	   {
 	   		cookie_start = theMainScript.GetCookie('active_tab');
 	   		if (cookie_start != null) start_tab = cookie_start;
 	     if(start_tab!=null) {
@@ -416,7 +415,7 @@
 	       toggleTabB(default_tab,true);
 	   }
 	 }
-      
+
    //toggleTabB(start_tab, true);
 </script>
 <?php int_footer(); ?>
Index: trunk/index.php
===================================================================
diff -u -r6428 -r6647
--- trunk/index.php	(.../index.php)	(revision 6428)
+++ trunk/index.php	(.../index.php)	(revision 6647)
@@ -3,9 +3,12 @@
 $start = getmicrotime();
 
 define('FULL_PATH', realpath(dirname(__FILE__)));
-define('APPLICATION_CLASS', 'MyApplication');
-include_once(FULL_PATH.'/kernel/kernel4/startup.php');
 
+if (!file_exists(FULL_PATH.'/core/kernel/application.php')) {
+	die('Please re-checkout _inportal_kernel4 cvs module into the root directory ('.FULL_PATH.') and remove kernel/kernel4 folder');
+}
+include_once(FULL_PATH.'/core/kernel/startup.php');
+
 $application =& kApplication::Instance();
 $application->Init();
 $application->Run();
Index: trunk/admin/index.php
===================================================================
diff -u -r4880 -r6647
--- trunk/admin/index.php	(.../index.php)	(revision 4880)
+++ trunk/admin/index.php	(.../index.php)	(revision 6647)
@@ -4,8 +4,7 @@
 
 define('ADMIN', 1);
 define('FULL_PATH', realpath(dirname(__FILE__).'/..') );
-define('APPLICATION_CLASS', 'MyApplication');
-include_once(FULL_PATH.'/kernel/kernel4/startup.php');
+include_once(FULL_PATH.'/core/kernel/startup.php');
 
 /*
 	kApplication $application
Index: trunk/core/units/admin/admin_config.php
===================================================================
diff -u -r6428 -r6647
--- trunk/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 6428)
+++ trunk/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 6647)
@@ -23,7 +23,7 @@
 					'Sections'			=>	Array(
 													'in-portal:root'	=>	Array(
 																						'parent'		=>	null,
-																						'icon'			=>	'site',
+																						'icon'			=>	'in-portal:site',
 																						'label'			=>	$this->Application->ConfigValue('Site_Name'),
 																						'url'			=>	Array('t' => 'sections_list', 'pass' => 'm', 'pass_section' => true, 'no_amp' => 1),
 																						'permissions'	=>	Array('advanced:admin_login', 'advanced:front_login'),
@@ -34,7 +34,7 @@
 													// "Summary & Logs" section
 													'in-portal:reports'	=>	Array(
 																						'parent'		=>	'in-portal:root',
-																						'icon'			=>	'summary_logs',
+																						'icon'			=>	'in-portal:summary_logs',
 																						'label'			=>	'la_tab_Reports',
 																						'url'			=>	Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -44,7 +44,7 @@
 
 													'in-portal:log_summary'	=>	Array(
 																						'parent'		=>	'in-portal:reports',
-																						'icon'			=>	'summary',
+																						'icon'			=>	'in-portal:summary',
 																						'label'			=>	'la_tab_Summary',
 																						'url'			=>	Array('index_file' => 'logs/summary.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -54,7 +54,7 @@
 
 													'in-portal:searchlog'	=>	Array(
 																						'parent'		=>	'in-portal:reports',
-																						'icon'			=>	'search_log',
+																						'icon'			=>	'in-portal:search_log',
 																						'label'			=>	'la_tab_SearchLog',
 																						'url'			=>	Array('index_file' => 'logs/searchlog.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'delete'),
@@ -64,7 +64,7 @@
 
 													'in-portal:sessionlog'	=>	Array(
 																						'parent'		=>	'in-portal:reports',
-																						'icon'			=>	'sessions_log',
+																						'icon'			=>	'in-portal:sessions_log',
 																						'label'			=>	'la_tab_SessionLog',
 																						'url'			=>	Array('index_file' => 'logs/session_list.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'delete'),
@@ -74,7 +74,7 @@
 
 													'in-portal:emaillog'	=>	Array(
 																						'parent'		=>	'in-portal:reports',
-																						'icon'			=>	'email_log',
+																						'icon'			=>	'in-portal:email_log',
 																						'label'			=>	'la_tab_EmailLog',
 																						'url'			=>	Array('index_file' => 'logs/email_log.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'delete'),
@@ -84,7 +84,7 @@
 
 													'in-portal:visits'	=>	Array(
 																						'parent'		=>	'in-portal:reports',
-																						'icon'			=>	'visits',
+																						'icon'			=>	'in-portal:visits',
 																						'label'			=>	'la_tab_Visits',
 																						'url'			=>	Array('t' => 'visits/visits_list', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'delete'),
@@ -95,7 +95,7 @@
 													// "Configuration" section
 													'in-portal:system'	=>	Array(
 																						'parent'		=>	'in-portal:root',
-																						'icon'			=>	'conf',
+																						'icon'			=>	'in-portal:conf',
 																						'label'			=>	'la_tab_Sys_Config',
 																						'url'			=>	Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -105,9 +105,9 @@
 
 													'in-portal:configure_general'	=>	Array(
 																								'parent'		=>	'in-portal:system',
-																								'icon'			=>	'conf_general',
+																								'icon'			=>	'in-portal:conf_general',
 																								'label'			=>	'la_tab_General',
-																								'url'			=>	Array('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
+																								'url'			=>	Array('t' => 'config/config_universal', 'pass_section' => true, 'module' => 'In-Portal', 'pass' => 'm'),
 																								'permissions'	=>	Array('view', 'edit'),
 																								'priority'		=>	1,
 																								'type'			=>	stTREE,
@@ -116,7 +116,7 @@
 													// "Tools" section
 													'in-portal:tools'	=>	Array(
 																						'parent'		=>	'in-portal:root',
-																						'icon'			=>	'tools',
+																						'icon'			=>	'in-portal:tools',
 																						'label'			=>	'la_tab_Tools',
 																						'url'			=>	Array('t' => 'sections_list', 'pass_section' => true, 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -126,7 +126,7 @@
 
 													'in-portal:backup'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'tool_backup',
+																						'icon'			=>	'in-portal:tool_backup',
 																						'label'			=>	'la_tab_Backup',
 																						'url'			=>	Array('index_file' => 'backup/backup1.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -136,7 +136,7 @@
 
 													'in-portal:restore'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'tool_restore',
+																						'icon'			=>	'in-portal:tool_restore',
 																						'label'			=>	'la_tab_Restore',
 																						'url'			=>	Array('index_file' => 'backup/restore1.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -146,7 +146,7 @@
 
 													'in-portal:main_import'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'tool_import',
+																						'icon'			=>	'in-portal:tool_import',
 																						'label'			=>	'la_tab_ImportData',
 																						'url'			=>	Array('index_file' => 'import/step1.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -156,7 +156,7 @@
 
 													'in-portal:sql_query'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'tool_import',
+																						'icon'			=>	'in-portal:tool_import',
 																						'label'			=>	'la_tab_QueryDB',
 																						'url'			=>	Array('index_file' => 'tools/sql_query.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view', 'edit'),
@@ -166,7 +166,7 @@
 
 													'in-portal:server_info'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'server_info',
+																						'icon'			=>	'in-portal:server_info',
 																						'label'			=>	'la_tab_ServerInfo',
 																						'url'			=>	Array('index_file' => 'tools/server_info.php', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -177,7 +177,7 @@
 													// "Help" section
 													'in-portal:help'	=>	Array(
 																						'parent'		=>	'in-portal:root',
-																						'icon'			=>	'help',
+																						'icon'			=>	'in-portal:help',
 																						'label'			=>	'la_tab_Help',
 																						'url'			=>	Array('index_file' => 'help/manual.pdf', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
@@ -193,7 +193,7 @@
 	if ($application->isDebugMode()) {
 				$config['Sections']['in-portal:service'] = Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'conf_general',
+																						'icon'			=>	'in-portal:conf_general',
 																						'label'			=>	'la_tab_Service',
 																						'url'			=>	Array('t' => 'tools/system_tools', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),
Index: trunk/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r6583 -r6647
--- trunk/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 6583)
+++ trunk/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 6647)
@@ -143,8 +143,14 @@
 
 		function mapEvents()
 		{
-			$events_map = Array('OnRemoveFilters'	=>	'FilterAction',
-								'OnApplyFilters'	=>	'FilterAction');
+			$events_map = Array(
+								'OnRemoveFilters'	=>	'FilterAction',
+								'OnApplyFilters'	=>	'FilterAction',
+								'OnMassApprove'=>'iterateItems',
+								'OnMassDecline'=>'iterateItems',
+								'OnMassMoveUp'=>'iterateItems',
+								'OnMassMoveDown'=>'iterateItems',
+								);
 
 			$this->eventMethods = array_merge($this->eventMethods, $events_map);
 		}
@@ -1188,6 +1194,101 @@
 
 		}
 
+		/**
+		 * Apply same processing to each item beeing selected in grid
+		 *
+		 * @param kEvent $event
+		 * @access private
+		 */
+		function iterateItems(&$event)
+		{
+			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+				return;
+			}
+
+			$object =& $event->getObject( Array('skip_autoload' => true) );
+			$ids = $this->StoreSelectedIDs($event);
+
+			if ($ids) {
+				$status_field = array_shift( $this->Application->getUnitOption($event->Prefix,'StatusField') );
+
+				foreach ($ids as $id) {
+					$object->Load($id);
+
+					switch ($event->Name) {
+						case 'OnMassApprove':
+							$object->SetDBField($status_field, 1);
+							break;
+
+						case 'OnMassDecline':
+							$object->SetDBField($status_field, 0);
+							break;
+
+						case 'OnMassMoveUp':
+							$object->SetDBField('Priority', $object->GetDBField('Priority') + 1);
+							break;
+
+						case 'OnMassMoveDown':
+							$object->SetDBField('Priority', $object->GetDBField('Priority') - 1);
+							break;
+					}
+
+					if ($object->Update()) {
+						$event->status = erSUCCESS;
+					}
+					else {
+						$event->status = erFAIL;
+						$event->redirect = false;
+						break;
+					}
+				}
+			}
+		}
+
+		/**
+		 * Enter description here...
+		 *
+		 * @param kEvent $event
+		 */
+		function OnMassClone(&$event)
+		{
+			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+				return;
+			}
+
+			$event->status = erSUCCESS;
+
+			$temp =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
+
+			$ids = $this->StoreSelectedIDs($event);
+
+			if ($ids) {
+				$temp->CloneItems($event->Prefix, $event->Special, $ids);
+			}
+
+			$this->clearSelectedIDs($event);
+		}
+
+		function check_array($records, $field, $value)
+		{
+			foreach ($records as $record) {
+				if ($record[$field] == $value) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		function OnPreSavePopup(&$event)
+		{
+			$object =& $event->getObject();
+			$this->RemoveRequiredFields($object);
+			$event->CallSubEvent('OnPreSave');
+
+			$this->finalizePopup($event);
+		}
+
+
 /* End of Edit events */
 
 		// III. Events that allow to put some code before and after Update,Load,Create and Delete methods of item
Index: trunk/core/units/admin/admin_events_handler.php
===================================================================
diff -u -r6093 -r6647
--- trunk/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 6093)
+++ trunk/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 6647)
@@ -1,6 +1,6 @@
 <?php
 
-class AdminEventsHandler extends InpDBEventHandler {
+class AdminEventsHandler extends kDBEventHandler {
 
 	function OnResetModRwCache(&$event)
 	{
Index: trunk/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r6583 -r6647
--- trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 6583)
+++ trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 6647)
@@ -632,6 +632,7 @@
 		if (!$this->Application->ModuleInfo) return false;
 
 		if (preg_match('/\/plugins\//', $config_path)) return true;
+		if (preg_match('/\/core\//', $config_path)) return true;
 
 		foreach($this->Application->ModuleInfo as $module_name => $module_info)
 		{
Index: trunk/kernel/startup.php
===================================================================
diff -u -r4885 -r6647
--- trunk/kernel/startup.php	(.../startup.php)	(revision 4885)
+++ trunk/kernel/startup.php	(.../startup.php)	(revision 6647)
@@ -12,10 +12,7 @@
 			define('ADMIN', 1);
 		}
 
-		if ( !defined('APPLICATION_CLASS') ) {
-			define('APPLICATION_CLASS', 'MyApplication');
-		}
-		include_once(FULL_PATH.'/kernel/kernel4/startup.php');
+		include_once(FULL_PATH.'/core/kernel/startup.php');
 
 		$application =& kApplication::Instance();
 		$application->Init();
Index: trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/config.php
===================================================================
diff -u -r5219 -r6647
--- trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/config.php	(.../config.php)	(revision 5219)
+++ trunk/admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php/config.php	(.../config.php)	(revision 6647)
@@ -43,8 +43,7 @@
 	define('FULL_PATH', $fp);
 	define('DEBUG_MODE', 0);
 	define('REL_PATH', 'admin/editor/cmseditor/editor/filemanager/browser/default/connectors/php');
-	define('APPLICATION_CLASS', 'MyApplication');
-	$kernel4_startup = $fp."/kernel/kernel4/startup.php";
+	$kernel4_startup = $fp."/core/kernel/startup.php";
 	$Config['K4Mode'] = 1;
 	include_once($kernel4_startup);
 	$Config['validate_type'] = 'admin';
Index: trunk/kernel/admin_templates/sections_list.tpl
===================================================================
diff -u -r5216 -r6647
--- trunk/kernel/admin_templates/sections_list.tpl	(.../sections_list.tpl)	(revision 5216)
+++ trunk/kernel/admin_templates/sections_list.tpl	(.../sections_list.tpl)	(revision 6647)
@@ -9,14 +9,14 @@
 			<tr style="background: url(<inp2:$SectionPrefix_ModulePath module="#session#"/>img/logo_bg.gif) no-repeat top right;">
 				<td valign="top" class="admintitle" align="left" style="padding-top: 2px; padding-bottom: 2px;">
 					<inp2:m_if check="m_RecallEquals" name="section" value="in-portal:root">
-						<img width="46" height="46" src="<inp2:$SectionPrefix_ModulePath/>img/icons/<inp2:adm_GetSectionIcon icon="icon46_{$icon}"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$label" default="$label"/>">&nbsp;<inp2:adm_GetSectionTitle phrase="$label" default="$label"/>
+						<img width="46" height="46" src="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/<inp2:adm_GetSectionIcon icon="icon46_{$icon}"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$label" default="$label"/>">&nbsp;<inp2:adm_GetSectionTitle phrase="$label" default="$label"/>
 					<inp2:m_else/>
-		    			<img width="46" height="46" src="<inp2:$SectionPrefix_ModulePath/>img/icons/<inp2:adm_GetSectionIcon icon="icon46_{$icon}"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$label"/>">&nbsp;<inp2:adm_GetSectionTitle phrase="$label"/>
+		    			<img width="46" height="46" src="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/<inp2:adm_GetSectionIcon icon="icon46_{$icon}"/>.gif" align="absmiddle" title="<inp2:adm_GetSectionTitle phrase="$label"/>">&nbsp;<inp2:adm_GetSectionTitle phrase="$label"/>
 		    		</inp2:m_if>
 		   		</td>
 			</tr>
 		</table>
-		
+
 		<inp2:m_ParseBlock name="blue_bar" prefix="$SectionPrefix" title_preset="tree_#section#" icon="icon46_{$icon}"/>
 </inp2:m_DefineElement>
 
@@ -29,7 +29,7 @@
 				<inp2:m_DefineElement name="section_element">
 					<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 						<td class="subitem_icon">
-							<img src="<inp2:$SectionPrefix_ModulePath/>img/icons/icon46_list_<inp2:m_param name="icon"/>.gif" border="0" alt="<inp2:m_phrase name="$label"/>" align="absmiddle"/>
+							<img src="<inp2:$SectionPrefix_ModulePath module="$icon_module"/>img/icons/icon46_list_<inp2:m_param name="icon"/>.gif" border="0" alt="<inp2:m_phrase name="$label"/>" align="absmiddle"/>
 						</td>
 						<td class="subitem_description">
 							<a href="<inp2:m_param name="section_url"/>" class="dLink" title="<inp2:m_phrase name="$label"/>" target="main"><inp2:m_phrase name="$label"/></a>
@@ -41,12 +41,12 @@
 						</td>
 					</tr>
 				</inp2:m_DefineElement>
-				
+
 				<inp2:m_set odd_even="table_color1"/>
 				<inp2:adm_PrintSections block="section_element" section_name="#session#"/>
 			</table>
 		</td>
-	
+
 		<td valign="top" align="right">
 			<inp2:adm_ModuleInclude template="summary/#section#"/>
 		</td>