Index: trunk/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r7391 -r7635
--- trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 7391)
+++ trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 7635)
@@ -158,6 +158,10 @@
 		while (($sub_folder = readdir($fh))) {
 			$full_path = FULL_PATH.$folderPath.'/'.$sub_folder;
 			if ($this->isDir($full_path)) {
+				//the following is to exclude OLD, not removed files when upgrading to 'core'
+				if (preg_match('/^\/kernel\/kernel4\//', $folderPath) || ($folderPath == '/kernel/units' && file_exists(FULL_PATH.$this->getConfigName('/core/units/'.$sub_folder)))) {
+					continue;
+				}
 				if (file_exists(FULL_PATH.$this->getConfigName($folderPath.'/'.$sub_folder))) {
 					$this->configFiles[] = $this->getConfigName($folderPath.'/'.$sub_folder);
 				}
@@ -469,7 +473,7 @@
 				$config['BasePath'] = dirname(FULL_PATH.$filename);
 				if (isset($config['AdminTemplatePath'])) {
 					// append template base folder for admin templates path of this prefix
-					$module_templates = $rets[1] == 'kernel' ? '' : $rets[1].'/';
+					$module_templates = $rets[1] == 'core' ? 'in-portal/' : $rets[1].'/';
 					$config['AdminTemplatePath'] = $module_templates.$config['AdminTemplatePath'];
 				}
 				$this->configData[$prefix] = $config;