Index: branches/5.0.x/core/kernel/application.php
===================================================================
diff -u -r12299 -r12312
--- branches/5.0.x/core/kernel/application.php	(.../application.php)	(revision 12299)
+++ branches/5.0.x/core/kernel/application.php	(.../application.php)	(revision 12312)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: application.php 12312 2009-08-17 03:55:27Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -636,9 +636,10 @@
 		$this->registerClass('kMainTagProcessor', KERNEL_PATH.'/processors/main_processor.php','m_TagProcessor', 'kTagProcessor');
 		$this->registerClass('kDBTagProcessor', KERNEL_PATH.'/db/db_tag_processor.php', null, 'kTagProcessor');
 
-		$this->registerClass('TemplatesCache', KERNEL_PATH.'/parser/template.php',null, 'kDBTagProcessor');
-		$this->registerClass('Template', KERNEL_PATH.'/parser/template.php');
-		$this->registerClass('TemplateParser', KERNEL_PATH.'/parser/template_parser.php',null, 'kDBTagProcessor');
+
+		$this->registerClass('TemplatesCache', KERNEL_PATH.'/nparser/template.php',null, 'kDBTagProcessor');
+		$this->registerClass('Template', KERNEL_PATH.'/nparser/template.php');
+
 		$this->registerClass('NParser', KERNEL_PATH.'/nparser/nparser.php');
 
 		$this->registerClass('kEmailSendingHelper', KERNEL_PATH.'/utility/email_send.php', 'EmailSender', Array('kHelper'));
@@ -652,8 +653,6 @@
 
 		/* 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');
 
@@ -664,7 +663,7 @@
 		$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');
+		$this->registerClass('kModulesHelper', KERNEL_PATH.'/../units/helpers/modules.php', 'ModulesHelper');
 
 		/* End moved */