Index: trunk/core/kernel/startup.php
===================================================================
diff -u -N -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) {