diff --git a/_config.php b/_config.php
index 0bf109334..32802b59e 100644
--- a/_config.php
+++ b/_config.php
@@ -16,17 +16,10 @@
 
 
 
-/**
- * Add the security folder to the include path so that the
- * {@link http://www.openidenabled.com/ PHP OpenID library} finds it files
- */
-$path_extra = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'security';
 /**
  * Add Pear (pear.php.net)
  */
-$path_extra .= PATH_SEPARATOR . realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'pear';
-
-
+$path_extra = PATH_SEPARATOR . realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'pear';
 $path = ini_get('include_path');
 $path = $path_extra . PATH_SEPARATOR . $path;
 ini_set('include_path', $path);
@@ -64,6 +57,7 @@ Authenticator::register_authenticator('OpenIDAuthenticator');
  */
 //i18n::set_locale('ca_AD'); 
 
+
 /**
  * The root directory of TinyMCE
  */
@@ -94,4 +88,5 @@ Security::set_password_encryption_algorithm('sha1', true);
  */
 define('EMAIL_BOUNCEHANDLER_KEY', '1aaaf8fb60ea253dbf6efa71baaacbb3');
 
+
 ?>
\ No newline at end of file
diff --git a/security/Auth/OpenID.php b/security/OpenID/Auth/OpenID.php
similarity index 100%
rename from security/Auth/OpenID.php
rename to security/OpenID/Auth/OpenID.php
diff --git a/security/Auth/OpenID/Association.php b/security/OpenID/Auth/OpenID/Association.php
similarity index 100%
rename from security/Auth/OpenID/Association.php
rename to security/OpenID/Auth/OpenID/Association.php
diff --git a/security/Auth/OpenID/BigMath.php b/security/OpenID/Auth/OpenID/BigMath.php
similarity index 100%
rename from security/Auth/OpenID/BigMath.php
rename to security/OpenID/Auth/OpenID/BigMath.php
diff --git a/security/Auth/OpenID/Consumer.php b/security/OpenID/Auth/OpenID/Consumer.php
similarity index 100%
rename from security/Auth/OpenID/Consumer.php
rename to security/OpenID/Auth/OpenID/Consumer.php
diff --git a/security/Auth/OpenID/CryptUtil.php b/security/OpenID/Auth/OpenID/CryptUtil.php
similarity index 100%
rename from security/Auth/OpenID/CryptUtil.php
rename to security/OpenID/Auth/OpenID/CryptUtil.php
diff --git a/security/Auth/OpenID/DatabaseConnection.php b/security/OpenID/Auth/OpenID/DatabaseConnection.php
similarity index 100%
rename from security/Auth/OpenID/DatabaseConnection.php
rename to security/OpenID/Auth/OpenID/DatabaseConnection.php
diff --git a/security/Auth/OpenID/DiffieHellman.php b/security/OpenID/Auth/OpenID/DiffieHellman.php
similarity index 100%
rename from security/Auth/OpenID/DiffieHellman.php
rename to security/OpenID/Auth/OpenID/DiffieHellman.php
diff --git a/security/Auth/OpenID/Discover.php b/security/OpenID/Auth/OpenID/Discover.php
similarity index 100%
rename from security/Auth/OpenID/Discover.php
rename to security/OpenID/Auth/OpenID/Discover.php
diff --git a/security/Auth/OpenID/DumbStore.php b/security/OpenID/Auth/OpenID/DumbStore.php
similarity index 100%
rename from security/Auth/OpenID/DumbStore.php
rename to security/OpenID/Auth/OpenID/DumbStore.php
diff --git a/security/Auth/OpenID/Extension.php b/security/OpenID/Auth/OpenID/Extension.php
similarity index 100%
rename from security/Auth/OpenID/Extension.php
rename to security/OpenID/Auth/OpenID/Extension.php
diff --git a/security/Auth/OpenID/FileStore.php b/security/OpenID/Auth/OpenID/FileStore.php
similarity index 100%
rename from security/Auth/OpenID/FileStore.php
rename to security/OpenID/Auth/OpenID/FileStore.php
diff --git a/security/Auth/OpenID/HMACSHA1.php b/security/OpenID/Auth/OpenID/HMACSHA1.php
similarity index 100%
rename from security/Auth/OpenID/HMACSHA1.php
rename to security/OpenID/Auth/OpenID/HMACSHA1.php
diff --git a/security/Auth/OpenID/Interface.php b/security/OpenID/Auth/OpenID/Interface.php
similarity index 100%
rename from security/Auth/OpenID/Interface.php
rename to security/OpenID/Auth/OpenID/Interface.php
diff --git a/security/Auth/OpenID/KVForm.php b/security/OpenID/Auth/OpenID/KVForm.php
similarity index 100%
rename from security/Auth/OpenID/KVForm.php
rename to security/OpenID/Auth/OpenID/KVForm.php
diff --git a/security/Auth/OpenID/Message.php b/security/OpenID/Auth/OpenID/Message.php
similarity index 100%
rename from security/Auth/OpenID/Message.php
rename to security/OpenID/Auth/OpenID/Message.php
diff --git a/security/Auth/OpenID/MySQLStore.php b/security/OpenID/Auth/OpenID/MySQLStore.php
similarity index 100%
rename from security/Auth/OpenID/MySQLStore.php
rename to security/OpenID/Auth/OpenID/MySQLStore.php
diff --git a/security/Auth/OpenID/Nonce.php b/security/OpenID/Auth/OpenID/Nonce.php
similarity index 100%
rename from security/Auth/OpenID/Nonce.php
rename to security/OpenID/Auth/OpenID/Nonce.php
diff --git a/security/Auth/OpenID/Parse.php b/security/OpenID/Auth/OpenID/Parse.php
similarity index 100%
rename from security/Auth/OpenID/Parse.php
rename to security/OpenID/Auth/OpenID/Parse.php
diff --git a/security/Auth/OpenID/PostgreSQLStore.php b/security/OpenID/Auth/OpenID/PostgreSQLStore.php
similarity index 100%
rename from security/Auth/OpenID/PostgreSQLStore.php
rename to security/OpenID/Auth/OpenID/PostgreSQLStore.php
diff --git a/security/Auth/OpenID/SQLStore.php b/security/OpenID/Auth/OpenID/SQLStore.php
similarity index 100%
rename from security/Auth/OpenID/SQLStore.php
rename to security/OpenID/Auth/OpenID/SQLStore.php
diff --git a/security/Auth/OpenID/SQLiteStore.php b/security/OpenID/Auth/OpenID/SQLiteStore.php
similarity index 100%
rename from security/Auth/OpenID/SQLiteStore.php
rename to security/OpenID/Auth/OpenID/SQLiteStore.php
diff --git a/security/Auth/OpenID/SReg.php b/security/OpenID/Auth/OpenID/SReg.php
similarity index 100%
rename from security/Auth/OpenID/SReg.php
rename to security/OpenID/Auth/OpenID/SReg.php
diff --git a/security/Auth/OpenID/Server.php b/security/OpenID/Auth/OpenID/Server.php
similarity index 100%
rename from security/Auth/OpenID/Server.php
rename to security/OpenID/Auth/OpenID/Server.php
diff --git a/security/Auth/OpenID/ServerRequest.php b/security/OpenID/Auth/OpenID/ServerRequest.php
similarity index 100%
rename from security/Auth/OpenID/ServerRequest.php
rename to security/OpenID/Auth/OpenID/ServerRequest.php
diff --git a/security/Auth/OpenID/TrustRoot.php b/security/OpenID/Auth/OpenID/TrustRoot.php
similarity index 100%
rename from security/Auth/OpenID/TrustRoot.php
rename to security/OpenID/Auth/OpenID/TrustRoot.php
diff --git a/security/Auth/OpenID/URINorm.php b/security/OpenID/Auth/OpenID/URINorm.php
similarity index 100%
rename from security/Auth/OpenID/URINorm.php
rename to security/OpenID/Auth/OpenID/URINorm.php
diff --git a/security/Auth/Yadis/HTTPFetcher.php b/security/OpenID/Auth/Yadis/HTTPFetcher.php
similarity index 100%
rename from security/Auth/Yadis/HTTPFetcher.php
rename to security/OpenID/Auth/Yadis/HTTPFetcher.php
diff --git a/security/Auth/Yadis/Manager.php b/security/OpenID/Auth/Yadis/Manager.php
similarity index 100%
rename from security/Auth/Yadis/Manager.php
rename to security/OpenID/Auth/Yadis/Manager.php
diff --git a/security/Auth/Yadis/Misc.php b/security/OpenID/Auth/Yadis/Misc.php
similarity index 100%
rename from security/Auth/Yadis/Misc.php
rename to security/OpenID/Auth/Yadis/Misc.php
diff --git a/security/Auth/Yadis/ParanoidHTTPFetcher.php b/security/OpenID/Auth/Yadis/ParanoidHTTPFetcher.php
similarity index 100%
rename from security/Auth/Yadis/ParanoidHTTPFetcher.php
rename to security/OpenID/Auth/Yadis/ParanoidHTTPFetcher.php
diff --git a/security/Auth/Yadis/ParseHTML.php b/security/OpenID/Auth/Yadis/ParseHTML.php
similarity index 100%
rename from security/Auth/Yadis/ParseHTML.php
rename to security/OpenID/Auth/Yadis/ParseHTML.php
diff --git a/security/Auth/Yadis/PlainHTTPFetcher.php b/security/OpenID/Auth/Yadis/PlainHTTPFetcher.php
similarity index 100%
rename from security/Auth/Yadis/PlainHTTPFetcher.php
rename to security/OpenID/Auth/Yadis/PlainHTTPFetcher.php
diff --git a/security/Auth/Yadis/XML.php b/security/OpenID/Auth/Yadis/XML.php
similarity index 100%
rename from security/Auth/Yadis/XML.php
rename to security/OpenID/Auth/Yadis/XML.php
diff --git a/security/Auth/Yadis/XRDS.php b/security/OpenID/Auth/Yadis/XRDS.php
similarity index 100%
rename from security/Auth/Yadis/XRDS.php
rename to security/OpenID/Auth/Yadis/XRDS.php
diff --git a/security/Auth/Yadis/XRI.php b/security/OpenID/Auth/Yadis/XRI.php
similarity index 100%
rename from security/Auth/Yadis/XRI.php
rename to security/OpenID/Auth/Yadis/XRI.php
diff --git a/security/Auth/Yadis/XRIRes.php b/security/OpenID/Auth/Yadis/XRIRes.php
similarity index 100%
rename from security/Auth/Yadis/XRIRes.php
rename to security/OpenID/Auth/Yadis/XRIRes.php
diff --git a/security/Auth/Yadis/Yadis.php b/security/OpenID/Auth/Yadis/Yadis.php
similarity index 100%
rename from security/Auth/Yadis/Yadis.php
rename to security/OpenID/Auth/Yadis/Yadis.php
diff --git a/security/Auth/_manifest_exclude b/security/OpenID/Auth/_manifest_exclude
similarity index 100%
rename from security/Auth/_manifest_exclude
rename to security/OpenID/Auth/_manifest_exclude
diff --git a/security/OpenIDAuthenticatedRole.php b/security/OpenID/OpenIDAuthenticatedRole.php
similarity index 100%
rename from security/OpenIDAuthenticatedRole.php
rename to security/OpenID/OpenIDAuthenticatedRole.php
diff --git a/security/OpenIDAuthenticator.php b/security/OpenID/OpenIDAuthenticator.php
similarity index 97%
rename from security/OpenIDAuthenticator.php
rename to security/OpenID/OpenIDAuthenticator.php
index 38625f3bf..8db4772b4 100644
--- a/security/OpenIDAuthenticator.php
+++ b/security/OpenID/OpenIDAuthenticator.php
@@ -8,6 +8,15 @@
 
 
 
+/**
+ * Add the security folder to the include path so that the
+ * {@link http://www.openidenabled.com/ PHP OpenID library} finds its files
+ */
+ini_set('include_path', ini_get('include_path') . PATH_SEPARATOR .
+				realpath(dirname(__FILE__)));
+
+
+
 /**
  * Require the OpenID consumer code.
  */
diff --git a/security/OpenIDLoginForm.php b/security/OpenID/OpenIDLoginForm.php
similarity index 100%
rename from security/OpenIDLoginForm.php
rename to security/OpenID/OpenIDLoginForm.php
diff --git a/security/OpenIDStorage.php b/security/OpenID/OpenIDStorage.php
similarity index 100%
rename from security/OpenIDStorage.php
rename to security/OpenID/OpenIDStorage.php