diff --git a/common/autoload.php b/common/autoload.php
new file mode 100644
index 000000000..dc9361c63
--- /dev/null
+++ b/common/autoload.php
@@ -0,0 +1,191 @@
+<?php
+
+/**
+ * Set error reporting rules.
+ */
+error_reporting(E_ALL ^ E_WARNING ^ E_NOTICE ^ E_STRICT ^ E_DEPRECATED);
+
+/**
+ * Set the default timezone.
+ */
+date_default_timezone_set(@date_default_timezone_get());
+
+/**
+ * Set the default character encoding.
+ */
+ini_set('default_charset', 'UTF-8');
+if (function_exists('iconv_set_encoding') && version_compare(PHP_VERSION, '5.6', '<'))
+{
+	iconv_set_encoding('internal_encoding', 'UTF-8');
+}
+if (function_exists('mb_internal_encoding'))
+{
+	mb_internal_encoding('UTF-8');
+}
+if (function_exists('mb_regex_encoding'))
+{
+	mb_regex_encoding('UTF-8');
+}
+
+/**
+ * Load constants and common functions.
+ */
+require_once __DIR__ . '/constants.php';
+require_once __DIR__ . '/defaults.php';
+require_once __DIR__ . '/functions.php';
+require_once __DIR__ . '/legacy.php';
+
+/**
+ * Load user configuration.
+ */
+if(file_exists(RX_BASEDIR . 'config/config.user.inc.php'))
+{
+	require_once RX_BASEDIR . 'config/config.user.inc.php';
+}
+
+/**
+ * Define the list of legacy class names for the autoloader.
+ */
+$RX_AUTOLOAD_FILE_MAP = array_change_key_case(array(
+	'CacheBase' => 'classes/cache/CacheHandler.class.php',
+	'CacheHandler' => 'classes/cache/CacheHandler.class.php',
+	'Context' => 'classes/context/Context.class.php',
+	'DB' => 'classes/db/DB.class.php',
+	'Query' => 'classes/db/queryparts/Query.class.php',
+	'Subquery' => 'classes/db/queryparts/Subquery.class.php',
+	'Condition' => 'classes/db/queryparts/condition/Condition.class.php',
+	'ConditionGroup' => 'classes/db/queryparts/condition/ConditionGroup.class.php',
+	'ConditionSubquery' => 'classes/db/queryparts/condition/ConditionSubquery.class.php',
+	'ConditionWithArgument' => 'classes/db/queryparts/condition/ConditionWithArgument.class.php',
+	'ConditionWithoutArgument' => 'classes/db/queryparts/condition/ConditionWithoutArgument.class.php',
+	'ClickCountExpression' => 'classes/db/queryparts/expression/ClickCountExpression.class.php',
+	'documentItem' => 'modules/document/document.item.php',
+	'DeleteExpression' => 'classes/db/queryparts/expression/DeleteExpression.class.php',
+	'Expression' => 'classes/db/queryparts/expression/Expression.class.php',
+	'InsertExpression' => 'classes/db/queryparts/expression/InsertExpression.class.php',
+	'SelectExpression' => 'classes/db/queryparts/expression/SelectExpression.class.php',
+	'StarExpression' => 'classes/db/queryparts/expression/StarExpression.class.php',
+	'UpdateExpression' => 'classes/db/queryparts/expression/UpdateExpression.class.php',
+	'UpdateExpressionWithoutArgument' => 'classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php',
+	'Limit' => 'classes/db/queryparts/limit/Limit.class.php',
+	'OrderByColumn' => 'classes/db/queryparts/order/OrderByColumn.class.php',
+	'CubridTableWithHint' => 'classes/db/queryparts/table/CubridTableWithHint.class.php',
+	'IndexHint' => 'classes/db/queryparts/table/IndexHint.class.php',
+	'JoinTable' => 'classes/db/queryparts/table/JoinTable.class.php',
+	'MssqlTableWithHint' => 'classes/db/queryparts/table/MssqlTableWithHint.class.php',
+	'MysqlTableWithHint' => 'classes/db/queryparts/table/MysqlTableWithHint.class.php',
+	'Table' => 'classes/db/queryparts/table/Table.class.php',
+	'DisplayHandler' => 'classes/display/DisplayHandler.class.php',
+	'HTMLDisplayHandler' => 'classes/display/HTMLDisplayHandler.php',
+	'JSCallbackDisplayHandler' => 'classes/display/JSCallbackDisplayHandler.php',
+	'JSONDisplayHandler' => 'classes/display/JSONDisplayHandler.php',
+	'VirtualXMLDisplayHandler' => 'classes/display/VirtualXMLDisplayHandler.php',
+	'XMLDisplayHandler' => 'classes/display/XMLDisplayHandler.php',
+	'EditorHandler' => 'classes/editor/EditorHandler.class.php',
+	'ExtraVar' => 'classes/extravar/Extravar.class.php',
+	'ExtraItem' => 'classes/extravar/Extravar.class.php',
+	'FileHandler' => 'classes/file/FileHandler.class.php',
+	'FileObject' => 'classes/file/FileObject.class.php',
+	'FrontEndFileHandler' => 'classes/frontendfile/FrontEndFileHandler.class.php',
+	'Handler' => 'classes/handler/Handler.class.php',
+	'XEHttpRequest' => 'classes/httprequest/XEHttpRequest.class.php',
+	'Mail' => 'classes/mail/Mail.class.php',
+	'Mobile' => 'classes/mobile/Mobile.class.php',
+	'ModuleHandler' => 'classes/module/ModuleHandler.class.php',
+	'ModuleObject' => 'classes/module/ModuleObject.class.php',
+	'Object' => 'classes/object/Object.class.php',
+	'PageHandler' => 'classes/page/PageHandler.class.php',
+	'Crypto' => 'classes/security/Crypto.class.php',
+	'EmbedFilter' => 'classes/security/EmbedFilter.class.php',
+	'IpFilter' => 'classes/security/IpFilter.class.php',
+	'Password' => 'classes/security/Password.class.php',
+	'Purifier' => 'classes/security/Purifier.class.php',
+	'Security' => 'classes/security/Security.class.php',
+	'UploadFileFilter' => 'classes/security/UploadFileFilter.class.php',
+	'TemplateHandler' => 'classes/template/TemplateHandler.class.php',
+	'Validator' => 'classes/validator/Validator.class.php',
+	'WidgetHandler' => 'classes/widget/WidgetHandler.class.php',
+	'GeneralXmlParser' => 'classes/xml/GeneralXmlParser.class.php',
+	'Xml_Node_' => 'classes/xml/XmlParser.class.php',
+	'XmlGenerator' => 'classes/xml/XmlGenerator.class.php',
+	'XmlJsFilter' => 'classes/xml/XmlJsFilter.class.php',
+	'XmlLangParser' => 'classes/xml/XmlLangParser.class.php',
+	'XmlParser' => 'classes/xml/XmlParser.class.php',
+	'XmlQueryParser' => 'classes/xml/XmlQueryParser.class.php',
+	'DBParser' => 'classes/xml/xmlquery/DBParser.class.php',
+	'QueryParser' => 'classes/xml/xmlquery/QueryParser.class.php',
+	'Argument' => 'classes/xml/xmlquery/argument/Argument.class.php',
+	'ConditionArgument' => 'classes/xml/xmlquery/argument/ConditionArgument.class.php',
+	'SortArgument' => 'classes/xml/xmlquery/argument/SortArgument.class.php',
+	'DefaultValue' => 'classes/xml/xmlquery/queryargument/DefaultValue.class.php',
+	'QueryArgument' => 'classes/xml/xmlquery/queryargument/QueryArgument.class.php',
+	'SortQueryArgument' => 'classes/xml/xmlquery/queryargument/SortQueryArgument.class.php',
+	'QueryArgumentValidator' => 'classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php',
+	'ColumnTag' => 'classes/xml/xmlquery/tags/column/ColumnTag.class.php',
+	'InsertColumnTag' => 'classes/xml/xmlquery/tags/column/InsertColumnTag.class.php',
+	'InsertColumnTagWithoutArgument' => 'classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php',
+	'InsertColumnsTag' => 'classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php',
+	'SelectColumnTag' => 'classes/xml/xmlquery/tags/column/SelectColumnTag.class.php',
+	'SelectColumnsTag' => 'classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php',
+	'UpdateColumnTag' => 'classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php',
+	'UpdateColumnsTag' => 'classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php',
+	'ConditionGroupTag' => 'classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php',
+	'ConditionTag' => 'classes/xml/xmlquery/tags/condition/ConditionTag.class.php',
+	'ConditionsTag' => 'classes/xml/xmlquery/tags/condition/ConditionsTag.class.php',
+	'JoinConditionsTag' => 'classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php',
+	'GroupsTag' => 'classes/xml/xmlquery/tags/group/GroupsTag.class.php',
+	'IndexTag' => 'classes/xml/xmlquery/tags/navigation/IndexTag.class.php',
+	'LimitTag' => 'classes/xml/xmlquery/tags/navigation/LimitTag.class.php',
+	'NavigationTag' => 'classes/xml/xmlquery/tags/navigation/NavigationTag.class.php',
+	'QueryTag' => 'classes/xml/xmlquery/tags/query/QueryTag.class.php',
+	'HintTableTag' => 'classes/xml/xmlquery/tags/table/HintTableTag.class.php',
+	'TableTag' => 'classes/xml/xmlquery/tags/table/TableTag.class.php',
+	'TablesTag' => 'classes/xml/xmlquery/tags/table/TablesTag.class.php',
+	'Ftp' => 'common/libraries/ftp.php',
+	'Tar' => 'common/libraries/tar.php',
+), CASE_LOWER);
+
+/**
+ * Define the autoloader.
+ */
+spl_autoload_register(function($class_name)
+{
+	$filename = false;
+	$lc_class_name = str_replace('\\', '/', strtolower($class_name));
+	switch (substr($lc_class_name, 0, 10))
+	{
+		// Rhymix Framework classes.
+		case 'rhymix/fra':
+			$filename = RX_BASEDIR . 'common/framework/' . substr($lc_class_name, 17) . '.php';
+			break;
+		// Rhymix Plugin classes.
+		case 'rhymix/plu':
+			$filename = RX_BASEDIR . 'plugins/' . substr($lc_class_name, 15) . '.php';
+			break;
+		// XE compatible classes.
+		default:
+			if (isset($GLOBALS['RX_AUTOLOAD_FILE_MAP'][$lc_class_name]))
+			{
+				$filename = RX_BASEDIR . $GLOBALS['RX_AUTOLOAD_FILE_MAP'][$lc_class_name];
+			}
+			elseif (preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
+			{
+				$filename = RX_BASEDIR . 'modules/' . strtolower($matches[1] . '/' . $matches[1]);
+				if (isset($matches[2]) && $matches[2]) $filename .= '.admin';
+				$filename .= (isset($matches[3]) && $matches[3]) ? ('.' . strtolower($matches[3])) : '.class';
+				$filename .= '.php';
+			}
+	}
+	if ($filename && file_exists($filename))
+	{
+		include $filename;
+	}
+});
+
+/**
+ * Also include the Composer autoloader.
+ */
+if (file_exists(RX_BASEDIR  . 'vendor/autoload.php'))
+{
+	require_once RX_BASEDIR  . 'vendor/autoload.php';
+}
diff --git a/common/constants.php b/common/constants.php
new file mode 100644
index 000000000..0b03f78fe
--- /dev/null
+++ b/common/constants.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * RX_VERSION is the version number of the Rhymix CMS.
+ */
+define('RX_VERSION', '1.8.15');
+
+/**
+ * RX_MICROTIME is the startup time of the current script, in microseconds since the Unix epoch.
+ */
+define('RX_MICROTIME', microtime(true));
+
+/**
+ * RX_TIME is the startup time of the current script, in seconds since the Unix epoch.
+ */
+define('RX_TIME', intval(RX_MICROTIME));
+
+/**
+ * RX_BASEDIR is the SERVER-SIDE absolute path of Rhymix (with trailing slash).
+ */
+define('RX_BASEDIR', dirname(__DIR__) . '/');
+
+/**
+ * RX_BASEURL is the CLIENT-SIDE absolute path of Rhymix (with trailing slash, relative to the document root).
+ */
+if (isset($_SERVER['DOCUMENT_ROOT']) && !strncmp(RX_BASEDIR, $_SERVER['DOCUMENT_ROOT'], strlen($_SERVER['DOCUMENT_ROOT'])))
+{
+    define('RX_BASEURL', rtrim(substr(RX_BASEDIR, strlen($_SERVER['DOCUMENT_ROOT'])), '/') . '/');
+}
+elseif (isset($_SERVER['PHP_SELF']) && ($len = strlen($_SERVER['PHP_SELF'])) && $len >= 10 && substr($_SERVER['PHP_SELF'], $len - 10) === '/index.php')
+{
+    define('RX_BASEURL', rtrim(substr($_SERVER['PHP_SELF'], 0, $len - 10), '/') . '/');
+}
+else
+{
+    define('RX_BASEURL', '/');
+}
+
+/**
+ * RX_REQUEST_URL is the remainder of the current URL (not including RX_BASEURL).
+ */
+if (isset($_SERVER['REQUEST_URI']))
+{
+    define('RX_REQUEST_URL', RX_BASEURL === '/' ? substr($_SERVER['REQUEST_URI'], 1) : (substr($_SERVER['REQUEST_URI'], strlen(RX_BASEURL)) ?: ''));
+}
+else
+{
+    define('RX_REQUEST_URL', '');
+}
+
+/**
+ * RX_CLIENT_IP_VERSION and RX_CLIENT_IP contain information about the current visitor's IP address.
+ */
+if (isset($_SERVER['REMOTE_ADDR']) && preg_match('/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/', $_SERVER['REMOTE_ADDR'], $matches))
+{
+    define('RX_CLIENT_IP_VERSION', 4);
+    define('RX_CLIENT_IP', $matches[0]);
+}
+elseif (isset($_SERVER['REMOTE_ADDR']) && @inet_pton($_SERVER['REMOTE_ADDR']) !== false)
+{
+    define('RX_CLIENT_IP_VERSION', 6);
+    define('RX_CLIENT_IP', $_SERVER['REMOTE_ADDR']);
+}
+else
+{
+    define('RX_CLIENT_IP_VERSION', 4);
+    define('RX_CLIENT_IP', '0.0.0.0');
+}
+
+/*
+ * RX_SSL is true if the current request uses SSL/TLS.
+ */
+if (isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')
+{
+    define('RX_SSL', true);
+}
+elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https')
+{
+    define('RX_SSL', true);
+}
+elseif (isset($_SERVER['HTTP_X_FORWARDED_SSL']) && strtolower($_SERVER['HTTP_X_FORWARDED_SSL']) === 'on')
+{
+    define('RX_SSL', true);
+}
+elseif (isset($_SERVER['HTTP_CF_VISITOR']) && stripos($_SERVER['HTTP_CF_VISITOR'], 'https') !== false)
+{
+    define('RX_SSL', true);
+}
+elseif (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443)
+{
+    define('RX_SSL', true);
+}
+else
+{
+    define('RX_SSL', false);
+}
+
+/**
+ * RX_POST is true if the current request uses the POST method.
+ */
+if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST')
+{
+    define('RX_POST', true);
+}
+else
+{
+    define('RX_POST', false);
+}
+
+/**
+ * XE core compatibility constants (may be used by XE-compatible plugins and themes).
+ */
+if (!defined('__XE__'))
+{
+	define('__XE__', true);
+}
+define('__XE_VERSION__', RX_VERSION);
+define('__XE_VERSION_ALPHA__', false);
+define('__XE_VERSION_BETA__', false);
+define('__XE_VERSION_RC__', false);
+define('__XE_VERSION_STABLE__', true);
+define('__XE_MIN_PHP_VERSION__', '5.3.0');
+define('__XE_RECOMMEND_PHP_VERSION__', '5.5.0');
+define('__ZBXE__', true);
+define('__ZBXE_VERSION__', RX_VERSION);
+define('_XE_PATH_', RX_BASEDIR);
+define('_XE_PACKAGE_', 'XE');
+define('_XE_LOCATION_', 'en');
+define('_XE_LOCATION_SITE_', 'https://www.xpressengine.com/');
+define('_XE_DOWNLOAD_SERVER_', 'https://download.xpressengine.com/');
+
+/**
+ * XE debug compatibility constants (not used in Rhymix).
+ */
+define('__DEBUG__', 0);
+define('__DEBUG_OUTPUT__', 0);
+define('__DEBUG_PROTECT__', 1);
+define('__DEBUG_PROTECT_IP__', '127.0.0.1');
+define('__DEBUG_DB_OUTPUT__', 0);
+define('__LOG_SLOW_QUERY__', 0);
+define('__LOG_SLOW_TRIGGER__', 0);
+define('__LOG_SLOW_ADDON__', 0);
+define('__LOG_SLOW_WIDGET__', 0);
+define('__OB_GZHANDLER_ENABLE__', 0);
+define('__ENABLE_PHPUNIT_TEST__', 0);
+define('__PROXY_SERVER__', null);
+
+/**
+ * Other useful constants.
+ */
+define('DIGITS', '0123456789');
+define('XDIGITS', '0123456789abcdef');
+define('ALPHABETS', 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz');
+define('UPPER', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
+define('LOWER', 'abcdefghijklmnopqrstuvwxyz');
+define('CR', "\r");
+define('CRLF', "\r\n");
+define('LF', "\n");
diff --git a/common/defaults.php b/common/defaults.php
new file mode 100644
index 000000000..20c3d7894
--- /dev/null
+++ b/common/defaults.php
@@ -0,0 +1,7 @@
+<?php
+
+/**
+ * Default configuration for Rhymix
+ * 
+ * Copyright (c) Rhymix Developers and Contributors
+ */
diff --git a/common/functions.php b/common/functions.php
new file mode 100644
index 000000000..3e856d685
--- /dev/null
+++ b/common/functions.php
@@ -0,0 +1,7 @@
+<?php
+
+/**
+ * Function library for Rhymix
+ * 
+ * Copyright (c) Rhymix Developers and Contributors
+ */
diff --git a/config/func.inc.php b/common/legacy.php
similarity index 99%
rename from config/func.inc.php
rename to common/legacy.php
index e3992f9b6..874d1aad4 100644
--- a/config/func.inc.php
+++ b/common/legacy.php
@@ -1,15 +1,10 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * function library files for convenience
+ * Legacy function library for XE Compatibility
  *
- * @author NAVER (developers@xpressengine.com)
+ * Copyright (c) NAVER <http://www.navercorp.com>
  */
-if(!defined('__XE__'))
-{
-	exit();
-}
 
 // define an empty function to avoid errors when iconv function doesn't exist
 if(!function_exists('iconv'))
diff --git a/config/config.inc.php b/config/config.inc.php
index db7106ba9..7baa2f420 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -1,442 +1,6 @@
 <?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
 
 /**
- * set the include of the class file and other environment configurations
- *
- * @file   config/config.inc.php
- * @author NAVER (developers@xpressengine.com)
+ * The contents of this file have been moved to common/autoload.php
  */
-if(version_compare(PHP_VERSION, '5.4.0', '<'))
-{
-	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING);
-}
-else
-{
-	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_STRICT);
-}
-
-if(!defined('__XE__'))
-{
-	exit();
-}
-
-/**
- * @deprecated __ZBXE__ will be removed. Use __XE__ instead.
- */
-define('__ZBXE__', __XE__);
-
-/**
- * Display XE's full version.
- */
-define('__XE_VERSION__', '1.8.15');
-define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
-define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
-define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));
-define('__XE_VERSION_STABLE__', (!__XE_VERSION_ALPHA__ && !__XE_VERSION_BETA__ && !__XE_VERSION_RC__));
-
-define('__XE_MIN_PHP_VERSION__', '5.3.0');
-define('__XE_RECOMMEND_PHP_VERSION__', '5.5.0');
-
-/**
- * @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.
- */
-define('__ZBXE_VERSION__', __XE_VERSION__);
-
-/**
- * The base path to where you installed zbXE Wanted
- */
-define('_XE_PATH_', str_replace('config/config.inc.php', '', str_replace('\\', '/', __FILE__)));
-
-
-// Set can use other method instead cookie to store session id(for file upload)
-ini_set('session.use_only_cookies', 0);
-
-// Set default charset as UTF-8
-$charset = 'UTF-8';
-ini_set('default_charset', $charset);
-
-if (function_exists('iconv_set_encoding') && version_compare(PHP_VERSION, '5.6', '<'))
-{
-	iconv_set_encoding('internal_encoding', $charset);
-}
-
-if (function_exists('mb_internal_encoding'))
-{
-	mb_internal_encoding($charset);
-}
-
-if (function_exists('mb_regex_encoding'))
-{
-	mb_regex_encoding($charset);
-}
-
-
-if(file_exists(_XE_PATH_ . 'config/package.inc.php'))
-{
-	require _XE_PATH_ . 'config/package.inc.php';
-}
-else
-{
-	/**
-	 * Package type
-	 */
-	define('_XE_PACKAGE_', 'XE');
-
-	/**
-	 * Location
-	 */
-	define('_XE_LOCATION_', 'en');
-
-	/**
-	 * Location site
-	 */
-	define('_XE_LOCATION_SITE_', 'https://www.xpressengine.com/');
-
-	/**
-	 * Download server
-	 */
-	define('_XE_DOWNLOAD_SERVER_', 'https://download.xpressengine.com/');
-}
-
-/*
- * user configuration files which override the default settings
- * save the following information into config/config.user.inc.php
- * <?php
- * define('__DEBUG__', 0);
- * define('__DEBUG_OUTPUT__', 0);
- * define('__DEBUG_PROTECT__', 1);
- * define('__DEBUG_PROTECT_IP__', '127.0.0.1');
- * define('__DEBUG_DB_OUTPUT__', 0);
- * define('__LOG_SLOW_QUERY__', 0);
- * define('__LOG_SLOW_TRIGGER__', 0);
- * define('__LOG_SLOW_ADDON__', 0);
- * define('__LOG_SLOW_WIDGET__', 0);
- * define('__OB_GZHANDLER_ENABLE__', 1);
- * define('__ENABLE_PHPUNIT_TEST__', 0);
- * define('__PROXY_SERVER__', 'http://domain:port/path');
- */
-if(file_exists(_XE_PATH_ . 'config/config.user.inc.php'))
-{
-	require _XE_PATH_ . 'config/config.user.inc.php';
-}
-
-if(!defined('__DEBUG__'))
-{
-	/**
-	 * output debug message(bit value)
-	 *
-	 * <pre>
-	 * 0: generate debug messages/not display
-	 * 1: display messages through debugPrint() function
-	 * 2: output execute time, Request/Response info
-	 * 4: output DB query history
-	 * </pre>
-	 */
-	define('__DEBUG__', 0);
-}
-
-if(!defined('__DEBUG_OUTPUT__'))
-{
-	/**
-	 * output location of debug message
-	 *
-	 * <pre>
-	 * 0: connect to the files/_debug_message.php and output
-	 * 1: HTML output as a comment on the bottom (when response method is the HTML)
-	 * 2: Firebug console output (PHP 4 & 5. Firebug/FirePHP plug-in required)
-	 * </pre>
-	 */
-	define('__DEBUG_OUTPUT__', 0);
-}
-
-if(!defined('__DEBUG_PROTECT__'))
-{
-	/**
-	 * output comments of the firePHP console and browser
-	 *
-	 * <pre>
-	 * 0: No limit (not recommended)
-	 * 1: Allow only specified IP addresses
-	 * </pre>
-	 */
-	define('__DEBUG_PROTECT__', 1);
-}
-
-if(!defined('__DEBUG_PROTECT_IP__'))
-{
-	/**
-	 * Set a ip address to allow debug
-	 */
-	define('__DEBUG_PROTECT_IP__', '127.0.0.1');
-}
-
-if(!defined('__DEBUG_DB_OUTPUT__'))
-{
-	/**
-	 * DB error message definition
-	 *
-	 * <pre>
-	 * 0: No output
-	 * 1: files/_debug_db_query.php connected to the output
-	 * </pre>
-	 */
-	define('__DEBUG_DB_OUTPUT__', 0);
-}
-
-if(!defined('__LOG_SLOW_QUERY__'))
-{
-	/**
-	 * Query log for only timeout query among DB queries
-	 *
-	 * <pre>
-	 * 0: Do not leave a log
-	 * = 0: leave a log when the slow query takes over specified seconds
-	 * Log file is saved as ./files/_slowlog_query.php file
-	 * </pre>
-	 */
-	define('__LOG_SLOW_QUERY__', 0);
-}
-
-if(!defined('__LOG_SLOW_TRIGGER__'))
-{
-	/**
-	 * Trigger excute time log
-	 *
-	 * <pre>
-	 * 0: Do not leave a log
-	 * > 0: leave a log when the trigger takes over specified milliseconds
-	 * Log file is saved as ./files/_slowlog_trigger.php
-	 * </pre>
-	 */
-	define('__LOG_SLOW_TRIGGER__', 0);
-}
-
-if(!defined('__LOG_SLOW_ADDON__'))
-{
-	/**
-	 * Addon excute time log
-	 *
-	 * <pre>
-	 * 0: Do not leave a log
-	 * > 0: leave a log when the trigger takes over specified milliseconds
-	 * Log file is saved as ./files/_slowlog_addon.php
-	 * </pre>
-	 */
-	define('__LOG_SLOW_ADDON__', 0);
-}
-
-if(!defined('__LOG_SLOW_WIDGET__'))
-{
-	/**
-	 * Widget excute time log
-	 *
-	 * <pre>
-	 * 0: Do not leave a log
-	 * > 0: leave a log when the widget takes over specified milliseconds
-	 * Log file is saved as ./files/_slowlog_widget.php
-	 * </pre>
-	 */
-	define('__LOG_SLOW_WIDGET__', 0);
-}
-
-if(!defined('__DEBUG_QUERY__'))
-{
-	/**
-	 * Leave DB query information
-	 *
-	 * <pre>
-	 * 0: Do not add information to the query
-	 * 1: Comment the XML Query ID
-	 * </pre>
-	 */
-	define('__DEBUG_QUERY__', 0);
-}
-
-if(!defined('__OB_GZHANDLER_ENABLE__'))
-{
-	/**
-	 * option to enable/disable a compression feature using ob_gzhandler
-	 *
-	 * <pre>
-	 * 0: Not used
-	 * 1: Enabled
-	 * Only particular servers may have a problem in IE browser when sending a compression
-	 * </pre>
-	 */
-	define('__OB_GZHANDLER_ENABLE__', 0);
-}
-
-if(!defined('__ENABLE_PHPUNIT_TEST__'))
-{
-	/**
-	 * decide to use/not use the php unit test (Path/tests/index.php)
-	 *
-	 * <pre>
-	 * 0: Not used
-	 * 1: Enabled
-	 * </pre>
-	 */
-	define('__ENABLE_PHPUNIT_TEST__', 0);
-}
-
-if(!defined('__PROXY_SERVER__'))
-{
-	/**
-	 * __PROXY_SERVER__ has server information to request to the external through the target server
-	 * FileHandler:: getRemoteResource uses the constant
-	 */
-	define('__PROXY_SERVER__', NULL);
-}
-
-// Set Timezone as server time
-date_default_timezone_set(@date_default_timezone_get());
-
-// Require a function-defined-file for simple use
-require(_XE_PATH_ . 'config/func.inc.php');
-
-if(__DEBUG__) {
-	define('__StartTime__', microtime(true));
-}
-
-if(__DEBUG__) {
-	$GLOBALS['__elapsed_class_load__'] = 0;
-}
-
-$GLOBALS['__xe_autoload_file_map'] = array_change_key_case(array(
-	'CacheBase' => 'classes/cache/CacheHandler.class.php',
-	'CacheHandler' => 'classes/cache/CacheHandler.class.php',
-	'Context' => 'classes/context/Context.class.php',
-	'DB' => 'classes/db/DB.class.php',
-	'Query' => 'classes/db/queryparts/Query.class.php',
-	'Subquery' => 'classes/db/queryparts/Subquery.class.php',
-	'Condition' => 'classes/db/queryparts/condition/Condition.class.php',
-	'ConditionGroup' => 'classes/db/queryparts/condition/ConditionGroup.class.php',
-	'ConditionSubquery' => 'classes/db/queryparts/condition/ConditionSubquery.class.php',
-	'ConditionWithArgument' => 'classes/db/queryparts/condition/ConditionWithArgument.class.php',
-	'ConditionWithoutArgument' => 'classes/db/queryparts/condition/ConditionWithoutArgument.class.php',
-	'ClickCountExpression' => 'classes/db/queryparts/expression/ClickCountExpression.class.php',
-	'documentItem' => 'modules/document/document.item.php',
-	'DeleteExpression' => 'classes/db/queryparts/expression/DeleteExpression.class.php',
-	'Expression' => 'classes/db/queryparts/expression/Expression.class.php',
-	'InsertExpression' => 'classes/db/queryparts/expression/InsertExpression.class.php',
-	'SelectExpression' => 'classes/db/queryparts/expression/SelectExpression.class.php',
-	'StarExpression' => 'classes/db/queryparts/expression/StarExpression.class.php',
-	'UpdateExpression' => 'classes/db/queryparts/expression/UpdateExpression.class.php',
-	'UpdateExpressionWithoutArgument' => 'classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php',
-	'Limit' => 'classes/db/queryparts/limit/Limit.class.php',
-	'OrderByColumn' => 'classes/db/queryparts/order/OrderByColumn.class.php',
-	'CubridTableWithHint' => 'classes/db/queryparts/table/CubridTableWithHint.class.php',
-	'IndexHint' => 'classes/db/queryparts/table/IndexHint.class.php',
-	'JoinTable' => 'classes/db/queryparts/table/JoinTable.class.php',
-	'MssqlTableWithHint' => 'classes/db/queryparts/table/MssqlTableWithHint.class.php',
-	'MysqlTableWithHint' => 'classes/db/queryparts/table/MysqlTableWithHint.class.php',
-	'Table' => 'classes/db/queryparts/table/Table.class.php',
-	'DisplayHandler' => 'classes/display/DisplayHandler.class.php',
-	'HTMLDisplayHandler' => 'classes/display/HTMLDisplayHandler.php',
-	'JSCallbackDisplayHandler' => 'classes/display/JSCallbackDisplayHandler.php',
-	'JSONDisplayHandler' => 'classes/display/JSONDisplayHandler.php',
-	'VirtualXMLDisplayHandler' => 'classes/display/VirtualXMLDisplayHandler.php',
-	'XMLDisplayHandler' => 'classes/display/XMLDisplayHandler.php',
-	'EditorHandler' => 'classes/editor/EditorHandler.class.php',
-	'ExtraVar' => 'classes/extravar/Extravar.class.php',
-	'ExtraItem' => 'classes/extravar/Extravar.class.php',
-	'FileHandler' => 'classes/file/FileHandler.class.php',
-	'FileObject' => 'classes/file/FileObject.class.php',
-	'FrontEndFileHandler' => 'classes/frontendfile/FrontEndFileHandler.class.php',
-	'Handler' => 'classes/handler/Handler.class.php',
-	'XEHttpRequest' => 'classes/httprequest/XEHttpRequest.class.php',
-	'Mail' => 'classes/mail/Mail.class.php',
-	'Mobile' => 'classes/mobile/Mobile.class.php',
-	'ModuleHandler' => 'classes/module/ModuleHandler.class.php',
-	'ModuleObject' => 'classes/module/ModuleObject.class.php',
-	'Object' => 'classes/object/Object.class.php',
-	'PageHandler' => 'classes/page/PageHandler.class.php',
-	'Crypto' => 'classes/security/Crypto.class.php',
-	'EmbedFilter' => 'classes/security/EmbedFilter.class.php',
-	'IpFilter' => 'classes/security/IpFilter.class.php',
-	'Password' => 'classes/security/Password.class.php',
-	'Purifier' => 'classes/security/Purifier.class.php',
-	'Security' => 'classes/security/Security.class.php',
-	'UploadFileFilter' => 'classes/security/UploadFileFilter.class.php',
-	'TemplateHandler' => 'classes/template/TemplateHandler.class.php',
-	'Validator' => 'classes/validator/Validator.class.php',
-	'WidgetHandler' => 'classes/widget/WidgetHandler.class.php',
-	'GeneralXmlParser' => 'classes/xml/GeneralXmlParser.class.php',
-	'Xml_Node_' => 'classes/xml/XmlParser.class.php',
-	'XmlGenerator' => 'classes/xml/XmlGenerator.class.php',
-	'XmlJsFilter' => 'classes/xml/XmlJsFilter.class.php',
-	'XmlLangParser' => 'classes/xml/XmlLangParser.class.php',
-	'XmlParser' => 'classes/xml/XmlParser.class.php',
-	'XmlQueryParser' => 'classes/xml/XmlQueryParser.class.php',
-	'DBParser' => 'classes/xml/xmlquery/DBParser.class.php',
-	'QueryParser' => 'classes/xml/xmlquery/QueryParser.class.php',
-	'Argument' => 'classes/xml/xmlquery/argument/Argument.class.php',
-	'ConditionArgument' => 'classes/xml/xmlquery/argument/ConditionArgument.class.php',
-	'SortArgument' => 'classes/xml/xmlquery/argument/SortArgument.class.php',
-	'DefaultValue' => 'classes/xml/xmlquery/queryargument/DefaultValue.class.php',
-	'QueryArgument' => 'classes/xml/xmlquery/queryargument/QueryArgument.class.php',
-	'SortQueryArgument' => 'classes/xml/xmlquery/queryargument/SortQueryArgument.class.php',
-	'QueryArgumentValidator' => 'classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php',
-	'ColumnTag' => 'classes/xml/xmlquery/tags/column/ColumnTag.class.php',
-	'InsertColumnTag' => 'classes/xml/xmlquery/tags/column/InsertColumnTag.class.php',
-	'InsertColumnTagWithoutArgument' => 'classes/xml/xmlquery/tags/column/InsertColumnTagWithoutArgument.class.php',
-	'InsertColumnsTag' => 'classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php',
-	'SelectColumnTag' => 'classes/xml/xmlquery/tags/column/SelectColumnTag.class.php',
-	'SelectColumnsTag' => 'classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php',
-	'UpdateColumnTag' => 'classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php',
-	'UpdateColumnsTag' => 'classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php',
-	'ConditionGroupTag' => 'classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php',
-	'ConditionTag' => 'classes/xml/xmlquery/tags/condition/ConditionTag.class.php',
-	'ConditionsTag' => 'classes/xml/xmlquery/tags/condition/ConditionsTag.class.php',
-	'JoinConditionsTag' => 'classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php',
-	'GroupsTag' => 'classes/xml/xmlquery/tags/group/GroupsTag.class.php',
-	'IndexTag' => 'classes/xml/xmlquery/tags/navigation/IndexTag.class.php',
-	'LimitTag' => 'classes/xml/xmlquery/tags/navigation/LimitTag.class.php',
-	'NavigationTag' => 'classes/xml/xmlquery/tags/navigation/NavigationTag.class.php',
-	'QueryTag' => 'classes/xml/xmlquery/tags/query/QueryTag.class.php',
-	'HintTableTag' => 'classes/xml/xmlquery/tags/table/HintTableTag.class.php',
-	'TableTag' => 'classes/xml/xmlquery/tags/table/TableTag.class.php',
-	'TablesTag' => 'classes/xml/xmlquery/tags/table/TablesTag.class.php',
-	'Ftp' => 'common/libraries/ftp.php',
-	'Tar' => 'common/libraries/tar.php',
-), CASE_LOWER);
-
-function __xe_autoload($class_name)
-{
-	if(__DEBUG__) {
-		$time_at = microtime(true);
-	}
-
-	if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
-	{
-		require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
-	}
-	elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
-	{
-		$candidate_filename = array();
-		$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
-		if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
-		$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
-		$candidate_filename[] = 'php';
-
-		$candidate_filename = implode('.', $candidate_filename);
-
-		if(file_exists(_XE_PATH_ . $candidate_filename))
-		{
-			require _XE_PATH_ . $candidate_filename;
-		}
-	}
-
-	if(__DEBUG__) {
-		$GLOBALS['__elapsed_class_load__'] += microtime(true) - $time_at;
-	}
-}
-spl_autoload_register('__xe_autoload');
-
-if(file_exists(_XE_PATH_  . '/vendor/autoload.php'))
-{
-	require _XE_PATH_  . '/vendor/autoload.php';
-}
-/* End of file config.inc.php */
-/* Location: ./config/config.inc.php */
+include dirname(__DIR__) . '/common/autoload.php';
diff --git a/config/package.inc.php b/config/package.inc.php
deleted file mode 100644
index 46b31a6b4..000000000
--- a/config/package.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/* Copyright (C) NAVER <http://www.navercorp.com> */
-
-define('_XE_PACKAGE_', 'XE');
-define('_XE_LOCATION_', 'ko');
-define('_XE_LOCATION_SITE_', 'https://www.xpressengine.com/');
-define('_XE_DOWNLOAD_SERVER_', 'https://download.xpressengine.com/');
diff --git a/index.php b/index.php
index ca43f812e..16eaf1d17 100644
--- a/index.php
+++ b/index.php
@@ -32,13 +32,9 @@
  */
 
 /**
- * @brief Declare constants for generic use and for checking to avoid a direct call from the Web
- **/
-define('__XE__',   TRUE);
-/**
- * @brief Include the necessary configuration files
- **/
-require dirname(__FILE__) . '/config/config.inc.php';
+ * Include the autoloader.
+ */
+require dirname(__FILE__) . '/common/autoload.php';
 
 /**
  * @brief Initialize by creating Context object