Index: branches/5.1.x/core/install/steps_db.xml
===================================================================
diff -u -N -r13086 -r13392
--- branches/5.1.x/core/install/steps_db.xml	(.../steps_db.xml)	(revision 13086)
+++ branches/5.1.x/core/install/steps_db.xml	(.../steps_db.xml)	(revision 13392)
@@ -74,9 +74,9 @@
 		<p>In case if you see a <strong>Failure notice</strong> saying that In-Portal Installation cannot continue until all permissions are set correctly please continue reading below.</p>
 
 		<p><strong>Permissions can be set</strong> by using <a href="http://www.google.com/search?q=free+ftp+program" target="_blank">FTP program</a> or directly in <i>shell</i> running "chmod" command. Please refer to the following <a href="http://www.stadtaus.com/en/tutorials/chmod-ftp-file-permissions.php" target="_blank">guide</a> to learn how to set permissions using your FTP program. In case if you have access to <i>shell</i> in your account you can simply run fix_perms.sh files located in /tools folder or do <br/><br/>
-		&nbsp;&nbsp;&nbsp;# chmod -R 777 ../system ../themes ../config.php</p>
+		&nbsp;&nbsp;&nbsp;# chmod -R 777 ../system ../themes ../system/config.php</p>
 
-		<p><strong>Security reasons</strong> you will be asked to change permissions back to 755 on /config.php file and root / folder of In-Portal on the last step of this installation process!</p>
+		<p><strong>Security reasons</strong> you will be asked to change permissions back to 755 on /system/config.php file and root / folder of In-Portal on the last step of this installation process!</p>
 		]]>
 	</step>
 	<step name="post_config" title="Basic Configuration">
Index: branches/5.1.x/core/install/install_toolkit.php
===================================================================
diff -u -N -r13370 -r13392
--- branches/5.1.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 13370)
+++ branches/5.1.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 13392)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install_toolkit.php 13370 2010-04-11 13:06:01Z alex $
+* @version	$Id: install_toolkit.php 13392 2010-04-24 20:21:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -75,6 +75,13 @@
 		var $systemConfig = Array ();
 
 		/**
+		 * Path, used by system to store data on filesystem
+		 *
+		 * @var string
+		 */
+		var $defaultWritablePath = '';
+
+		/**
 		 * Installator instance
 		 *
 		 * @var kInstallator
@@ -83,13 +90,15 @@
 
 		function kInstallToolkit()
 		{
+			$this->defaultWritablePath = DIRECTORY_SEPARATOR . 'system';
+
 			if (class_exists('kApplication')) {
 				// auto-setup in case of separate module install
 				$this->Application =& kApplication::Instance();
 				$this->Conn =& $this->Application->GetADODBConnection();
 			}
 
-			$this->INIFile = FULL_PATH . DIRECTORY_SEPARATOR . 'config.php';
+			$this->INIFile = FULL_PATH . $this->defaultWritablePath . DIRECTORY_SEPARATOR . 'config.php';
 
 			$this->systemConfig = $this->ParseConfig(true);
 		}
Index: branches/5.1.x/core/kernel/startup.php
===================================================================
diff -u -N -r13168 -r13392
--- branches/5.1.x/core/kernel/startup.php	(.../startup.php)	(revision 13168)
+++ branches/5.1.x/core/kernel/startup.php	(.../startup.php)	(revision 13392)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: startup.php 13168 2010-02-24 17:26:57Z alex $
+* @version	$Id: startup.php 13392 2010-04-24 20:21:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -29,7 +29,7 @@
 	include_once(KERNEL_PATH . '/utility/multibyte.php');	// emulating multi-byte php extension
 	$globals_end = getmicrotime();
 
-	$vars = parse_portal_ini(FULL_PATH . '/config.php');
+	$vars = parse_portal_ini();
 
 	$admin_directory = isset($vars['AdminDirectory']) ? $vars['AdminDirectory'] : '/admin';
 	define('ADMIN_DIRECTORY', $admin_directory);
@@ -113,8 +113,8 @@
 		define('SAFE_MODE', 1);
 	}
 
-	if (file_exists(FULL_PATH . '/debug.php')) {
-		include_once(FULL_PATH . '/debug.php');
+	if (file_exists(WRITEABLE . '/debug.php')) {
+		include_once(WRITEABLE . '/debug.php');
 		if (array_key_exists('DEBUG_MODE', $dbg_options) && $dbg_options['DEBUG_MODE']) {
 			$debugger_start = getmicrotime();
 			include_once(KERNEL_PATH . '/utility/debugger.php');
Index: branches/5.1.x/core/kernel/globals.php
===================================================================
diff -u -N -r13086 -r13392
--- branches/5.1.x/core/kernel/globals.php	(.../globals.php)	(revision 13086)
+++ branches/5.1.x/core/kernel/globals.php	(.../globals.php)	(revision 13392)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: globals.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: globals.php 13392 2010-04-24 20:21:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -131,12 +131,12 @@
 		if(!defined($const_name)) define($const_name,$const_value);
 	}
 
-if( !function_exists('parse_portal_ini') )
-{
-	function parse_portal_ini($file, $parse_section = false)
+	function parse_portal_ini($parse_section = false)
 	{
-			if (!file_exists($file)) return false;
+		$file = FULL_PATH . DIRECTORY_SEPARATOR . 'system' . DIRECTORY_SEPARATOR . 'config.php';
 
+		if (!file_exists($file)) return false;
+
     	if( file_exists($file) && !is_readable($file) ) die('Could Not Open Ini File');
 
     	$contents = file($file);
@@ -185,9 +185,7 @@
 
     	return $retval;
 	}
-}
 
-
 if( !function_exists('getmicrotime') )
 {
 	function getmicrotime()
Index: branches/5.1.x/core/install.php
===================================================================
diff -u -N -r13369 -r13392
--- branches/5.1.x/core/install.php	(.../install.php)	(revision 13369)
+++ branches/5.1.x/core/install.php	(.../install.php)	(revision 13392)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 13369 2010-04-11 12:58:31Z alex $
+* @version	$Id: install.php 13392 2010-04-24 20:21:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -113,7 +113,6 @@
 			'$1/stylesheets',
 			'$1/user_files',
 			'$1/cache',
-			'/themes',
 		);
 
 		/**
@@ -160,15 +159,12 @@
 
 			if (file_exists($this->toolkit->INIFile)) {
 				// if config.php found, then check his write permission too
-				$this->writeableFolders[] = '/config.php';
+				$this->writeableFolders[] = $this->toolkit->defaultWritablePath . '/config.php';
 			}
-			else {
-				$this->writeableFolders[] = '/';
-			}
 
 			if (!$this->toolkit->getSystemConfig('Misc', 'WriteablePath')) {
 				// set global writable folder when such setting is missing
-				$this->toolkit->setSystemConfig('Misc', 'WriteablePath', DIRECTORY_SEPARATOR . 'system');
+				$this->toolkit->setSystemConfig('Misc', 'WriteablePath', $this->toolkit->defaultWritablePath);
 				$this->toolkit->SaveConfig(true); // immediately save, because this path will be used in Application later
 			}
 
@@ -389,7 +385,7 @@
 					}
 
 					$write_check = true;
-					$check_paths = Array ('/', '/index.php', '/config.php', ADMIN_DIRECTORY . '/index.php');
+					$check_paths = Array ('/', '/index.php', $this->toolkit->defaultWritablePath . '/config.php', ADMIN_DIRECTORY . '/index.php');
 					foreach ($check_paths as $check_path) {
 						$path_check_status = $this->toolkit->checkWritePermissions(FULL_PATH . $check_path);
 
Index: branches/5.1.x/core/units/helpers/modules_helper.php
===================================================================
diff -u -N -r13113 -r13392
--- branches/5.1.x/core/units/helpers/modules_helper.php	(.../modules_helper.php)	(revision 13113)
+++ branches/5.1.x/core/units/helpers/modules_helper.php	(.../modules_helper.php)	(revision 13392)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: modules_helper.php 13113 2010-01-13 19:00:24Z alex $
+* @version	$Id: modules_helper.php 13392 2010-04-24 20:21:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -165,7 +165,7 @@
 		    }
 
 		    $modules = Array();
-		    $vars = parse_portal_ini(FULL_PATH . DIRECTORY_SEPARATOR . 'config.php');
+		    $vars = parse_portal_ini();
 		    $license = array_key_exists('License', $vars) ? base64_decode($vars['License']) : false;
 		    if ($license) {
 			    list ( , , $i_Keys) = $this->_ParseLicense($license);
Index: branches/5.1.x/INSTALL
===================================================================
diff -u -N -r13086 -r13392
--- branches/5.1.x/INSTALL	(.../INSTALL)	(revision 13086)
+++ branches/5.1.x/INSTALL	(.../INSTALL)	(revision 13392)
@@ -222,14 +222,14 @@
 
 will guide you through the rest of the installation.
 
-Once installation completed you should have /config.php file
+Once installation completed you should have /system/config.php file
 created in the root folder of your In-Portal installation.
 
 In some rare cases servers might be configured the way when
-WEB INSTALLATION fails to create /config.php. In this case
+WEB INSTALLATION fails to create /system/config.php. In this case
 and you'll have to manually
 
-	a. copy /tools/config.php-dist file into the root folder
+	a. copy /tools/config.php-dist file into the /system subfolder
 	of your In-Portal installation.
 
 	b. rename it from config.php-dist to config.php. Make sure you
Index: branches/5.1.x/core/install/step_templates/security.tpl
===================================================================
diff -u -N -r12657 -r13392
--- branches/5.1.x/core/install/step_templates/security.tpl	(.../security.tpl)	(revision 12657)
+++ branches/5.1.x/core/install/step_templates/security.tpl	(.../security.tpl)	(revision 13392)
@@ -12,7 +12,7 @@
 
 	$output = '';
 	$write_check = true;
-	$check_paths = Array ('/', '/index.php', '/config.php', ADMIN_DIRECTORY . '/index.php');
+	$check_paths = Array ('/', '/index.php', $this->toolkit->defaultWritablePath . '/config.php', ADMIN_DIRECTORY . '/index.php');
 
 	foreach ($check_paths as $check_path) {
 		$path_secure = true;
Index: branches/5.1.x/.htaccess
===================================================================
diff -u -N -r13377 -r13392
--- branches/5.1.x/.htaccess	(.../.htaccess)	(revision 13377)
+++ branches/5.1.x/.htaccess	(.../.htaccess)	(revision 13392)
@@ -6,16 +6,10 @@
   deny from all
 </Files>
 
-# Exclude direct access
-<Files ~ "(config.php|debug.php)">
-  order allow,deny
-  deny from all
-</Files>
-
 ## Enable mod-rewrite
 RewriteEngine On
 
-###### Rewrite rule to force 'www.' prefix. Use only if needed 
+###### Rewrite rule to force 'www.' prefix. Use only if needed
 # If your site can be accessed both with and without the 'www.' prefix,
 # use the following setting to redirect all users to access the site with the 'www.'
 # when they access without 'www.'. Uncomment and MAKE sure to adapt for your domain name