Index: custom/install.php
===================================================================
--- custom/install.php	(revision 13106)
+++ custom/install.php	(working copy)
@@ -1,12 +1,12 @@
 <?php
-	$module_folder = 'custom';
+	$module_folder = 'modules/custom';
 
 	if (!defined('IS_INSTALL')) {
 		// separate module install
 		define('IS_INSTALL', 1);
 		define('ADMIN', 1);
 		define('REL_PATH', $module_folder);
-		define('FULL_PATH', realpath(dirname(__FILE__) . '/..') );
+		define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
 
 		include_once(FULL_PATH . '/core/kernel/startup.php');
 		require_once FULL_PATH . '/core/install/install_toolkit.php';
@@ -30,4 +30,4 @@
 	$toolkit->RunSQL('/' . $module_folder  .'/install/install_data.sql');
 	$toolkit->ImportLanguage('/' . $module_folder  .'/install/english');
 
-	$toolkit->finalizeModuleInstall($module_folder, false);
\ No newline at end of file
+	$toolkit->finalizeModuleInstall(basename($module_folder), false);
\ No newline at end of file
Index: in-auction/install.php
===================================================================
--- in-auction/install.php	(revision 13106)
+++ in-auction/install.php	(working copy)
@@ -10,14 +10,14 @@
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
-	$module_folder = 'in-auction';
+	$module_folder = 'modules/in-auction';
 
 	if (!defined('IS_INSTALL')) {
 		// separate module install
 		define('IS_INSTALL', 1);
 		define('ADMIN', 1);
 		define('REL_PATH', $module_folder);
-		define('FULL_PATH', realpath(dirname(__FILE__) . '/..') );
+		define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
 
 		include_once(FULL_PATH . '/core/kernel/startup.php');
 		require_once FULL_PATH . '/core/install/install_toolkit.php';
@@ -41,4 +41,4 @@
 	$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql');
 	$toolkit->ImportLanguage('/' . $module_folder . '/install/english');
 
-	$toolkit->finalizeModuleInstall($module_folder, false);
\ No newline at end of file
+	$toolkit->finalizeModuleInstall(basename($module_folder), false);
\ No newline at end of file
Index: in-bulletin/install.php
===================================================================
--- in-bulletin/install.php	(revision 13106)
+++ in-bulletin/install.php	(working copy)
@@ -11,14 +11,14 @@
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
-	$module_folder = 'in-bulletin';
+	$module_folder = 'modules/in-bulletin';
 
 	if (!defined('IS_INSTALL')) {
 		// separate module install
 		define('IS_INSTALL', 1);
 		define('ADMIN', 1);
 		define('REL_PATH', $module_folder);
-		define('FULL_PATH', realpath(dirname(__FILE__) . '/..') );
+		define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
 
 		include_once(FULL_PATH . '/core/kernel/startup.php');
 		require_once FULL_PATH . '/core/install/install_toolkit.php';
@@ -44,10 +44,10 @@
 	$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{TopicCatId}', $category->GetID());
 	$toolkit->ImportLanguage('/' . $module_folder . '/install/english');
 
-	$toolkit->SetModuleRootCategory($module_folder, $category->GetID());
+	$toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID());
 
-//	$toolkit->linkCustomFields($module_folder, 'bb', 3); // to create Custom Fields for Topics
+//	$toolkit->linkCustomFields(basename($module_folder), 'bb', 3); // to create Custom Fields for Topics
 	$toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field
 	$toolkit->setModuleItemTemplate($category, 'bb', '#in-bulletin/item_design#');
 
-	$toolkit->finalizeModuleInstall($module_folder, true);
\ No newline at end of file
+	$toolkit->finalizeModuleInstall(basename($module_folder), true);
\ No newline at end of file
Index: in-commerce/install.php
===================================================================
--- in-commerce/install.php	(revision 13106)
+++ in-commerce/install.php	(working copy)
@@ -10,14 +10,14 @@
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
-	$module_folder = 'in-commerce';
+	$module_folder = 'modules/in-commerce';
 
 	if (!defined('IS_INSTALL')) {
 		// separate module install
 		define('IS_INSTALL', 1);
 		define('ADMIN', 1);
 		define('REL_PATH', $module_folder);
-		define('FULL_PATH', realpath(dirname(__FILE__) . '/..') );
+		define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
 
 		include_once(FULL_PATH . '/core/kernel/startup.php');
 		require_once FULL_PATH . '/core/install/install_toolkit.php';
@@ -43,11 +43,11 @@
 	$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{ProductCatId}', $category->GetID());
 	$toolkit->ImportLanguage('/' . $module_folder . '/install/english');
 
-	$toolkit->SetModuleRootCategory($module_folder, $category->GetID());
+	$toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID());
 
-	$toolkit->linkCustomFields($module_folder, 'p', 11); // to create Custom Fields for Products
+	$toolkit->linkCustomFields(basename($module_folder), 'p', 11); // to create Custom Fields for Products
 	$toolkit->linkCustomFields('KERNEL', 'u', 6); // to create shipping related Custom Fields for Users
 	$toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field
 	$toolkit->setModuleItemTemplate($category, 'p', '#in-commerce/item_design#');
 
-	$toolkit->finalizeModuleInstall($module_folder, true);
\ No newline at end of file
+	$toolkit->finalizeModuleInstall(basename($module_folder), true);
\ No newline at end of file
Index: in-link/install.php
===================================================================
--- in-link/install.php	(revision 13106)
+++ in-link/install.php	(working copy)
@@ -11,14 +11,14 @@
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
-	$module_folder = 'in-link';
+	$module_folder = 'modules/in-link';
 
 	if (!defined('IS_INSTALL')) {
 		// separate module install
 		define('IS_INSTALL', 1);
 		define('ADMIN', 1);
 		define('REL_PATH', $module_folder);
-		define('FULL_PATH', realpath(dirname(__FILE__) . '/..') );
+		define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
 
 		include_once(FULL_PATH . '/core/kernel/startup.php');
 		require_once FULL_PATH . '/core/install/install_toolkit.php';
@@ -44,10 +44,10 @@
 	$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{LinkCatId}', $category->GetID());
 	$toolkit->ImportLanguage('/' . $module_folder . '/install/english');
 
-	$toolkit->SetModuleRootCategory($module_folder, $category->GetID());
+	$toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID());
 
-	$toolkit->linkCustomFields($module_folder, 'l', 4); // to create Custom Fields for Links
+	$toolkit->linkCustomFields(basename($module_folder), 'l', 4); // to create Custom Fields for Links
 	$toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field
 	$toolkit->setModuleItemTemplate($category, 'l', '#in-link/item_design#');
 
-	$toolkit->finalizeModuleInstall($module_folder, true);
\ No newline at end of file
+	$toolkit->finalizeModuleInstall(basename($module_folder), true);
\ No newline at end of file
Index: in-news/install.php
===================================================================
--- in-news/install.php	(revision 13106)
+++ in-news/install.php	(working copy)
@@ -11,14 +11,14 @@
 * or other free or open source software licenses.
 * See http://www.in-portal.org/license for copyright notices and details.
 */
-	$module_folder = 'in-news';
+	$module_folder = 'modules/in-news';
 
 	if (!defined('IS_INSTALL')) {
 		// separate module install
 		define('IS_INSTALL', 1);
 		define('ADMIN', 1);
 		define('REL_PATH', $module_folder);
-		define('FULL_PATH', realpath(dirname(__FILE__) . '/..') );
+		define('FULL_PATH', realpath(dirname(__FILE__) . '/../..') );
 
 		include_once(FULL_PATH . '/core/kernel/startup.php');
 		require_once FULL_PATH . '/core/install/install_toolkit.php';
@@ -44,10 +44,10 @@
 	$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{NewsCatId}', $category->GetID());
 	$toolkit->ImportLanguage('/' . $module_folder . '/install/english');
 
-	$toolkit->SetModuleRootCategory($module_folder, $category->GetID());
+	$toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID());
 
-	$toolkit->linkCustomFields($module_folder, 'n', 2); // to create Custom Fields for News
+	$toolkit->linkCustomFields(basename($module_folder), 'n', 2); // to create Custom Fields for News
 	$toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field
 	$toolkit->setModuleItemTemplate($category, 'n', '#in-news/item_design#');
 
-	$toolkit->finalizeModuleInstall($module_folder, true);
\ No newline at end of file
+	$toolkit->finalizeModuleInstall(basename($module_folder), true);
\ No newline at end of file