110 files changed, 74 insertions, 62 deletions
diff --git a/.gitattributes b/.gitattributes
index a8cce7ac..d5fb12eb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -804,13 +804,13 @@ buildscripts/chmbuilder/classes/pages/MainLayout.tpl -text
 buildscripts/chmbuilder/classes/pages/style.css -text
 buildscripts/classtree/DWExtensionReadme.txt -text
 buildscripts/classtree/ExtensionReadme.html -text
-buildscripts/jGrouseDoc/3rdparty/ant/LICENSE -text
-buildscripts/jGrouseDoc/3rdparty/ant/LICENSE.dom -text
-buildscripts/jGrouseDoc/3rdparty/ant/LICENSE.sax -text
-buildscripts/jGrouseDoc/3rdparty/ant/LICENSE.xerces -text
-buildscripts/jGrouseDoc/3rdparty/ant/NOTICE -text
-buildscripts/jGrouseDoc/3rdparty/velocity/LICENSE -text
-buildscripts/jGrouseDoc/3rdparty/velocity/NOTICE -text
+buildscripts/jGrouseDoc/Vendor/ant/LICENSE -text
+buildscripts/jGrouseDoc/Vendor/ant/LICENSE.dom -text
+buildscripts/jGrouseDoc/Vendor/ant/LICENSE.sax -text
+buildscripts/jGrouseDoc/Vendor/ant/LICENSE.xerces -text
+buildscripts/jGrouseDoc/Vendor/ant/NOTICE -text
+buildscripts/jGrouseDoc/Vendor/velocity/LICENSE -text
+buildscripts/jGrouseDoc/Vendor/velocity/NOTICE -text
 buildscripts/jGrouseDoc/README-prado.txt -text
 buildscripts/jGrouseDoc/build.xml -text
 buildscripts/jGrouseDoc/jgdoc.jar -text
@@ -2737,41 +2737,41 @@ editors/Textmate/Prado.tmbundle/Syntaxes/Prado[!!-~]PHP.tmLanguage -text
 editors/Textmate/Prado.tmbundle/Syntaxes/Prado[!!-~]Template.tmLanguage -text
 editors/Textmate/Prado.tmbundle/info.plist -text
 framework/.htaccess -text
-framework/3rdParty/FirePHPCore/FirePHP.class.php4 -text
-framework/3rdParty/FirePHPCore/LICENSE -text
-framework/3rdParty/FirePHPCore/fb.php4 -text
-framework/3rdParty/Markdown/License.text -text
-framework/3rdParty/PhpShell/README -text
-framework/3rdParty/ReCaptcha/LICENSE -text
-framework/3rdParty/SafeHtml/license.txt -text
-framework/3rdParty/SafeHtml/readme.txt -text
-framework/3rdParty/TextHighlighter/Text/README -text
-framework/3rdParty/TextHighlighter/Text/TODO -text
-framework/3rdParty/TextHighlighter/Text/abap.xml -text
-framework/3rdParty/TextHighlighter/Text/cpp.xml -text
-framework/3rdParty/TextHighlighter/Text/css.xml -text
-framework/3rdParty/TextHighlighter/Text/diff.xml -text
-framework/3rdParty/TextHighlighter/Text/dtd.xml -text
-framework/3rdParty/TextHighlighter/Text/generate -text
-framework/3rdParty/TextHighlighter/Text/generate.bat -text
-framework/3rdParty/TextHighlighter/Text/html.xml -text
-framework/3rdParty/TextHighlighter/Text/java.xml -text
-framework/3rdParty/TextHighlighter/Text/javascript.xml -text
-framework/3rdParty/TextHighlighter/Text/mysql.xml -text
-framework/3rdParty/TextHighlighter/Text/package.xml -text
-framework/3rdParty/TextHighlighter/Text/perl.xml -text
-framework/3rdParty/TextHighlighter/Text/php.xml -text
-framework/3rdParty/TextHighlighter/Text/prado.xml -text
-framework/3rdParty/TextHighlighter/Text/python.xml -text
-framework/3rdParty/TextHighlighter/Text/ruby.xml -text
-framework/3rdParty/TextHighlighter/Text/sample.css -text
-framework/3rdParty/TextHighlighter/Text/sql.xml -text
-framework/3rdParty/TextHighlighter/Text/xml.xml -text
-framework/3rdParty/TextHighlighter/highlight.css -text
-framework/3rdParty/TinyMCE/license.txt -text
-framework/3rdParty/TinyMCE/tiny_mce.md5 -text
-framework/3rdParty/TinyMCE/tiny_mce.tar -text
-framework/3rdParty/readme.html -text
+framework/Vendor/FirePHPCore/FirePHP.class.php4 -text
+framework/Vendor/FirePHPCore/LICENSE -text
+framework/Vendor/FirePHPCore/fb.php4 -text
+framework/Vendor/Markdown/License.text -text
+framework/Vendor/PhpShell/README -text
+framework/Vendor/ReCaptcha/LICENSE -text
+framework/Vendor/SafeHtml/license.txt -text
+framework/Vendor/SafeHtml/readme.txt -text
+framework/Vendor/TextHighlighter/Text/README -text
+framework/Vendor/TextHighlighter/Text/TODO -text
+framework/Vendor/TextHighlighter/Text/abap.xml -text
+framework/Vendor/TextHighlighter/Text/cpp.xml -text
+framework/Vendor/TextHighlighter/Text/css.xml -text
+framework/Vendor/TextHighlighter/Text/diff.xml -text
+framework/Vendor/TextHighlighter/Text/dtd.xml -text
+framework/Vendor/TextHighlighter/Text/generate -text
+framework/Vendor/TextHighlighter/Text/generate.bat -text
+framework/Vendor/TextHighlighter/Text/html.xml -text
+framework/Vendor/TextHighlighter/Text/java.xml -text
+framework/Vendor/TextHighlighter/Text/javascript.xml -text
+framework/Vendor/TextHighlighter/Text/mysql.xml -text
+framework/Vendor/TextHighlighter/Text/package.xml -text
+framework/Vendor/TextHighlighter/Text/perl.xml -text
+framework/Vendor/TextHighlighter/Text/php.xml -text
+framework/Vendor/TextHighlighter/Text/prado.xml -text
+framework/Vendor/TextHighlighter/Text/python.xml -text
+framework/Vendor/TextHighlighter/Text/ruby.xml -text
+framework/Vendor/TextHighlighter/Text/sample.css -text
+framework/Vendor/TextHighlighter/Text/sql.xml -text
+framework/Vendor/TextHighlighter/Text/xml.xml -text
+framework/Vendor/TextHighlighter/highlight.css -text
+framework/Vendor/TinyMCE/license.txt -text
+framework/Vendor/TinyMCE/tiny_mce.md5 -text
+framework/Vendor/TinyMCE/tiny_mce.tar -text
+framework/Vendor/readme.html -text
 framework/Data/ActiveRecord/Exceptions/messages.txt -text
 framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.tpl -text
 framework/Data/ActiveRecord/Scaffold/TScaffoldListView.tpl -text
diff --git a/bin/prado-cli.php b/bin/prado-cli.php
index 1906946b..70fe75a1 100755
--- a/bin/prado-cli.php
+++ b/bin/prado-cli.php
@@ -34,7 +34,7 @@ if(count($_SERVER['argv']) > 1 && strtolower($_SERVER['argv'][1])==='shell')
 	{
 		if(!$shell->has_semicolon) echo Prado::varDump($var);
 	}
-	include_once($frameworkPath.'/3rdParty/PhpShell/php-shell-init.php');
+	include_once($frameworkPath.'/Vendor/PhpShell/php-shell-init.php');
 }
 
 
@@ -867,5 +867,5 @@ if(class_exists('PHP_Shell_Commands', false))
 	$__shell_exts->registerExtensions(array(
 		    "active-record"        => new PHP_Shell_Extensions_ActiveRecord)); /* the :set command */
 
-	include_once(realpath(dirname(dirname(__FILE__))).'/framework/3rdParty/PhpShell/php-shell-cmd.php');
+	include_once(realpath(dirname(dirname(__FILE__))).'/framework/Vendor/PhpShell/php-shell-cmd.php');
 }
diff --git a/build.xml b/build.xml
index e81c41db..f0c26e82 100644
--- a/build.xml
+++ b/build.xml
@@ -189,7 +189,7 @@
       executable="bin/apigen.php"
       source="${build.src.dir}/framework"
       destination="${build.doc.dir}/manual"
-      exclude="*pradolite.php,*prado-cli.php,*3rdParty/*,*Javascripts/source/*,*packages.php,*JSMin.php,*I18N/core/*,*WebControls/assets/*"
+      exclude="*pradolite.php,*prado-cli.php,*Vendor/*,*Javascripts/source/*,*packages.php,*JSMin.php,*I18N/core/*,*WebControls/assets/*"
       title="PRADO v${prado.version} API Manual"
       deprecated="true"
       todo="true"
diff --git a/buildscripts/classtree/build.php b/buildscripts/classtree/build.php
index f7b8d7e7..601ec12f 100644
--- a/buildscripts/classtree/build.php
+++ b/buildscripts/classtree/build.php
@@ -13,7 +13,7 @@ $exclusions=array(
 	'prado-cli.php',
 	'JSMin.php',
 	'/I18N/core',
-	'/3rdParty',
+	'/Vendor',
 	'/Testing',
 	'/Web/UI/WebControls/assets',
 	);
diff --git a/buildscripts/phing/tasks/PradoPearTask.php b/buildscripts/phing/tasks/PradoPearTask.php
index 541c972e..5d4766a5 100644
--- a/buildscripts/phing/tasks/PradoPearTask.php
+++ b/buildscripts/phing/tasks/PradoPearTask.php
@@ -90,7 +90,7 @@ class PradoPearTask extends Task
 						'examples'      => 'doc',
 						'framework'     => 'php',
 						'framework/js'  => 'doc',
-						'framework/3rdParty' => 'doc',
+						'framework/Vendor' => 'doc',
 					),
 				'exceptions' =>
 					array(
diff --git a/framework/Util/TFirePhpLogRoute.php b/framework/Util/TFirePhpLogRoute.php
index 371ebcc8..81ec2ede 100644
--- a/framework/Util/TFirePhpLogRoute.php
+++ b/framework/Util/TFirePhpLogRoute.php
@@ -49,7 +49,7 @@ class TFirePhpLogRoute extends TLogRoute
 			return;
 		}
 
-		require_once Prado::getPathOfNamespace('System.3rdParty.FirePHPCore') . '/FirePHP.class.php';
+		require_once Prado::getPathOfNamespace('System.Vendor.FirePHPCore') . '/FirePHP.class.php';
 		$firephp = FirePHP::getInstance(true);
 		$firephp->setOptions(array('useNativeJsonEncode' => false));
 		$firephp->group($this->getGroupLabel(), array('Collapsed' => true));
diff --git a/framework/3rdParty/FirePHPCore/FirePHP.class.php b/framework/Vendor/FirePHPCore/FirePHP.class.php
index 7d3b95f6..7d3b95f6 100644
--- a/framework/3rdParty/FirePHPCore/FirePHP.class.php
+++ b/framework/Vendor/FirePHPCore/FirePHP.class.php
diff --git a/framework/3rdParty/FirePHPCore/FirePHP.class.php4 b/framework/Vendor/FirePHPCore/FirePHP.class.php4
index 3e20120d..3e20120d 100644
--- a/framework/3rdParty/FirePHPCore/FirePHP.class.php4
+++ b/framework/Vendor/FirePHPCore/FirePHP.class.php4
diff --git a/framework/3rdParty/FirePHPCore/LICENSE b/framework/Vendor/FirePHPCore/LICENSE
index 3e390f9d..3e390f9d 100644
--- a/framework/3rdParty/FirePHPCore/LICENSE
+++ b/framework/Vendor/FirePHPCore/LICENSE
diff --git a/framework/3rdParty/FirePHPCore/fb.php b/framework/Vendor/FirePHPCore/fb.php
index 9d1857cb..9d1857cb 100644
--- a/framework/3rdParty/FirePHPCore/fb.php
+++ b/framework/Vendor/FirePHPCore/fb.php
diff --git a/framework/3rdParty/FirePHPCore/fb.php4 b/framework/Vendor/FirePHPCore/fb.php4
index 5b69e348..5b69e348 100644
--- a/framework/3rdParty/FirePHPCore/fb.php4
+++ b/framework/Vendor/FirePHPCore/fb.php4
diff --git a/framework/3rdParty/Parsedown/LICENSE.txt b/framework/Vendor/Parsedown/LICENSE.txt
index baca86f5..baca86f5 100644
--- a/framework/3rdParty/Parsedown/LICENSE.txt
+++ b/framework/Vendor/Parsedown/LICENSE.txt
diff --git a/framework/3rdParty/Parsedown/Parsedown.php b/framework/Vendor/Parsedown/Parsedown.php
index ebc80974..ebc80974 100755
--- a/framework/3rdParty/Parsedown/Parsedown.php
+++ b/framework/Vendor/Parsedown/Parsedown.php
diff --git a/framework/3rdParty/PhpShell/PHP/Shell.php b/framework/Vendor/PhpShell/PHP/Shell.php
index 8012475e..8012475e 100644
--- a/framework/3rdParty/PhpShell/PHP/Shell.php
+++ b/framework/Vendor/PhpShell/PHP/Shell.php
diff --git a/framework/3rdParty/PhpShell/PHP/Shell/Commands.php b/framework/Vendor/PhpShell/PHP/Shell/Commands.php
index 3d4bf5b2..3d4bf5b2 100644
--- a/framework/3rdParty/PhpShell/PHP/Shell/Commands.php
+++ b/framework/Vendor/PhpShell/PHP/Shell/Commands.php
diff --git a/framework/3rdParty/PhpShell/PHP/Shell/Extensions.php b/framework/Vendor/PhpShell/PHP/Shell/Extensions.php
index 9b210c47..9b210c47 100644
--- a/framework/3rdParty/PhpShell/PHP/Shell/Extensions.php
+++ b/framework/Vendor/PhpShell/PHP/Shell/Extensions.php
diff --git a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/Autoload.php b/framework/Vendor/PhpShell/PHP/Shell/Extensions/Autoload.php
index 72a5692b..72a5692b 100644
--- a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/Autoload.php
+++ b/framework/Vendor/PhpShell/PHP/Shell/Extensions/Autoload.php
diff --git a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/AutoloadDebug.php b/framework/Vendor/PhpShell/PHP/Shell/Extensions/AutoloadDebug.php
index 3926ff9e..3926ff9e 100644
--- a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/AutoloadDebug.php
+++ b/framework/Vendor/PhpShell/PHP/Shell/Extensions/AutoloadDebug.php
diff --git a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/Colour.php b/framework/Vendor/PhpShell/PHP/Shell/Extensions/Colour.php
index 05d7be1d..05d7be1d 100644
--- a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/Colour.php
+++ b/framework/Vendor/PhpShell/PHP/Shell/Extensions/Colour.php
diff --git a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/ExecutionTime.php b/framework/Vendor/PhpShell/PHP/Shell/Extensions/ExecutionTime.php
index 2c2bf9ad..2c2bf9ad 100644
--- a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/ExecutionTime.php
+++ b/framework/Vendor/PhpShell/PHP/Shell/Extensions/ExecutionTime.php
diff --git a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/InlineHelp.php b/framework/Vendor/PhpShell/PHP/Shell/Extensions/InlineHelp.php
index 4449d1f4..4449d1f4 100644
--- a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/InlineHelp.php
+++ b/framework/Vendor/PhpShell/PHP/Shell/Extensions/InlineHelp.php
diff --git a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/LoadScript.php b/framework/Vendor/PhpShell/PHP/Shell/Extensions/LoadScript.php
index a8c4697d..a8c4697d 100644
--- a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/LoadScript.php
+++ b/framework/Vendor/PhpShell/PHP/Shell/Extensions/LoadScript.php
diff --git a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/Prototypes.php b/framework/Vendor/PhpShell/PHP/Shell/Extensions/Prototypes.php
index 618074e5..618074e5 100644
--- a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/Prototypes.php
+++ b/framework/Vendor/PhpShell/PHP/Shell/Extensions/Prototypes.php
diff --git a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/VerbosePrint.php b/framework/Vendor/PhpShell/PHP/Shell/Extensions/VerbosePrint.php
index 425937c1..425937c1 100644
--- a/framework/3rdParty/PhpShell/PHP/Shell/Extensions/VerbosePrint.php
+++ b/framework/Vendor/PhpShell/PHP/Shell/Extensions/VerbosePrint.php
diff --git a/framework/3rdParty/PhpShell/PHP/Shell/Options.php b/framework/Vendor/PhpShell/PHP/Shell/Options.php
index 8f5e57d1..8f5e57d1 100644
--- a/framework/3rdParty/PhpShell/PHP/Shell/Options.php
+++ b/framework/Vendor/PhpShell/PHP/Shell/Options.php
diff --git a/framework/3rdParty/PhpShell/README b/framework/Vendor/PhpShell/README
index d15d83be..d15d83be 100644
--- a/framework/3rdParty/PhpShell/README
+++ b/framework/Vendor/PhpShell/README
diff --git a/framework/3rdParty/PhpShell/php-shell-cmd.php b/framework/Vendor/PhpShell/php-shell-cmd.php
index aec6d6ed..aec6d6ed 100644
--- a/framework/3rdParty/PhpShell/php-shell-cmd.php
+++ b/framework/Vendor/PhpShell/php-shell-cmd.php
diff --git a/framework/3rdParty/PhpShell/php-shell-init.php b/framework/Vendor/PhpShell/php-shell-init.php
index fd0e9063..fd0e9063 100644
--- a/framework/3rdParty/PhpShell/php-shell-init.php
+++ b/framework/Vendor/PhpShell/php-shell-init.php
diff --git a/framework/3rdParty/ReCaptcha/LICENSE b/framework/Vendor/ReCaptcha/LICENSE
index b612f71f..b612f71f 100644
--- a/framework/3rdParty/ReCaptcha/LICENSE
+++ b/framework/Vendor/ReCaptcha/LICENSE
diff --git a/framework/3rdParty/ReCaptcha/recaptchalib.php b/framework/Vendor/ReCaptcha/recaptchalib.php
index de639c11..de639c11 100644
--- a/framework/3rdParty/ReCaptcha/recaptchalib.php
+++ b/framework/Vendor/ReCaptcha/recaptchalib.php
diff --git a/framework/3rdParty/SafeHtml/HTMLSax3.php b/framework/Vendor/SafeHtml/HTMLSax3.php
index 262cf2ac..262cf2ac 100644
--- a/framework/3rdParty/SafeHtml/HTMLSax3.php
+++ b/framework/Vendor/SafeHtml/HTMLSax3.php
diff --git a/framework/3rdParty/SafeHtml/HTMLSax3/Decorators.php b/framework/Vendor/SafeHtml/HTMLSax3/Decorators.php
index d300ae65..d300ae65 100644
--- a/framework/3rdParty/SafeHtml/HTMLSax3/Decorators.php
+++ b/framework/Vendor/SafeHtml/HTMLSax3/Decorators.php
diff --git a/framework/3rdParty/SafeHtml/HTMLSax3/States.php b/framework/Vendor/SafeHtml/HTMLSax3/States.php
index 5001bb76..5001bb76 100644
--- a/framework/3rdParty/SafeHtml/HTMLSax3/States.php
+++ b/framework/Vendor/SafeHtml/HTMLSax3/States.php
diff --git a/framework/3rdParty/SafeHtml/TSafeHtmlParser.php b/framework/Vendor/SafeHtml/TSafeHtmlParser.php
index 29f2cb65..2c01bde2 100644
--- a/framework/3rdParty/SafeHtml/TSafeHtmlParser.php
+++ b/framework/Vendor/SafeHtml/TSafeHtmlParser.php
@@ -19,7 +19,7 @@
 /**
  * This package requires HTMLSax3 package
  */
-Prado::using('System.3rdParty.SafeHtml.HTMLSax3');
+Prado::using('System.Vendor.SafeHtml.HTMLSax3');
 
 
 /**
@@ -43,7 +43,7 @@ Prado::using('System.3rdParty.SafeHtml.HTMLSax3');
  *
  * <b>Example:</b>
  * <pre>
- * $parser = Prado::createComponent('System.3rdParty.SafeHtml.TSafeHtmlParser');
+ * $parser = Prado::createComponent('System.Vendor.SafeHtml.TSafeHtmlParser');
  * $result = $parser->parse($doc);
  * </pre>
  *
diff --git a/framework/3rdParty/SafeHtml/license.txt b/framework/Vendor/SafeHtml/license.txt
index 21496aa2..21496aa2 100644
--- a/framework/3rdParty/SafeHtml/license.txt
+++ b/framework/Vendor/SafeHtml/license.txt
diff --git a/framework/3rdParty/SafeHtml/readme.txt b/framework/Vendor/SafeHtml/readme.txt
index d525f92c..d525f92c 100644
--- a/framework/3rdParty/SafeHtml/readme.txt
+++ b/framework/Vendor/SafeHtml/readme.txt
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter.php b/framework/Vendor/TextHighlighter/Text/Highlighter.php
index f1743d8f..f1743d8f 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/ABAP.php b/framework/Vendor/TextHighlighter/Text/Highlighter/ABAP.php
index 153ce9fe..153ce9fe 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/ABAP.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/ABAP.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/CPP.php b/framework/Vendor/TextHighlighter/Text/Highlighter/CPP.php
index 761297ac..761297ac 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/CPP.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/CPP.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/CSS.php b/framework/Vendor/TextHighlighter/Text/Highlighter/CSS.php
index 28f92f34..28f92f34 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/CSS.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/CSS.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/DIFF.php b/framework/Vendor/TextHighlighter/Text/Highlighter/DIFF.php
index 21e97087..21e97087 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/DIFF.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/DIFF.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/DTD.php b/framework/Vendor/TextHighlighter/Text/Highlighter/DTD.php
index 1d4a403e..1d4a403e 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/DTD.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/DTD.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Generator.php b/framework/Vendor/TextHighlighter/Text/Highlighter/Generator.php
index 862c3233..862c3233 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Generator.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/Generator.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/HTML.php b/framework/Vendor/TextHighlighter/Text/Highlighter/HTML.php
index eaf001e2..eaf001e2 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/HTML.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/HTML.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/JAVA.php b/framework/Vendor/TextHighlighter/Text/Highlighter/JAVA.php
index 53c02680..53c02680 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/JAVA.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/JAVA.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/JAVASCRIPT.php b/framework/Vendor/TextHighlighter/Text/Highlighter/JAVASCRIPT.php
index 2055c94e..2055c94e 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/JAVASCRIPT.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/JAVASCRIPT.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/MYSQL.php b/framework/Vendor/TextHighlighter/Text/Highlighter/MYSQL.php
index ba240512..ba240512 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/MYSQL.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/MYSQL.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/PERL.php b/framework/Vendor/TextHighlighter/Text/Highlighter/PERL.php
index 9e8bd752..9e8bd752 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/PERL.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/PERL.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/PHP.php b/framework/Vendor/TextHighlighter/Text/Highlighter/PHP.php
index be504b65..be504b65 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/PHP.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/PHP.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/PRADO.php b/framework/Vendor/TextHighlighter/Text/Highlighter/PRADO.php
index dab4a4bc..dab4a4bc 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/PRADO.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/PRADO.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/PYTHON.php b/framework/Vendor/TextHighlighter/Text/Highlighter/PYTHON.php
index a1f381cb..a1f381cb 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/PYTHON.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/PYTHON.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/RUBY.php b/framework/Vendor/TextHighlighter/Text/Highlighter/RUBY.php
index 3deaa376..3deaa376 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/RUBY.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/RUBY.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer.php b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer.php
index 7abb4a5a..7abb4a5a 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Array.php b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/Array.php
index 56fcda7a..56fcda7a 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Array.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/Array.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/BB.php b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/BB.php
index eae45f44..eae45f44 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/BB.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/BB.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Console.php b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/Console.php
index 88d13761..88d13761 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Console.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/Console.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Html.php b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/Html.php
index d7e55a25..d7e55a25 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/Html.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/Html.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/HtmlTags.php b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/HtmlTags.php
index 00b33b96..00b33b96 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/HtmlTags.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/HtmlTags.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/JSON.php b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/JSON.php
index 91f6c674..91f6c674 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/JSON.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/JSON.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/XML.php b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/XML.php
index 36c78d85..36c78d85 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/Renderer/XML.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/Renderer/XML.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/SQL.php b/framework/Vendor/TextHighlighter/Text/Highlighter/SQL.php
index 6b0b4b7c..6b0b4b7c 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/SQL.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/SQL.php
diff --git a/framework/3rdParty/TextHighlighter/Text/Highlighter/XML.php b/framework/Vendor/TextHighlighter/Text/Highlighter/XML.php
index 3c454c77..3c454c77 100644
--- a/framework/3rdParty/TextHighlighter/Text/Highlighter/XML.php
+++ b/framework/Vendor/TextHighlighter/Text/Highlighter/XML.php
diff --git a/framework/3rdParty/TextHighlighter/Text/README b/framework/Vendor/TextHighlighter/Text/README
index b6f22450..b6f22450 100644
--- a/framework/3rdParty/TextHighlighter/Text/README
+++ b/framework/Vendor/TextHighlighter/Text/README
diff --git a/framework/3rdParty/TextHighlighter/Text/TODO b/framework/Vendor/TextHighlighter/Text/TODO
index 67fa21df..67fa21df 100644
--- a/framework/3rdParty/TextHighlighter/Text/TODO
+++ b/framework/Vendor/TextHighlighter/Text/TODO
diff --git a/framework/3rdParty/TextHighlighter/Text/abap.xml b/framework/Vendor/TextHighlighter/Text/abap.xml
index 79a32c95..79a32c95 100644
--- a/framework/3rdParty/TextHighlighter/Text/abap.xml
+++ b/framework/Vendor/TextHighlighter/Text/abap.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/cpp.xml b/framework/Vendor/TextHighlighter/Text/cpp.xml
index 81f0328e..81f0328e 100644
--- a/framework/3rdParty/TextHighlighter/Text/cpp.xml
+++ b/framework/Vendor/TextHighlighter/Text/cpp.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/css.xml b/framework/Vendor/TextHighlighter/Text/css.xml
index 4ca4ee99..4ca4ee99 100644
--- a/framework/3rdParty/TextHighlighter/Text/css.xml
+++ b/framework/Vendor/TextHighlighter/Text/css.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/diff.xml b/framework/Vendor/TextHighlighter/Text/diff.xml
index d369a272..d369a272 100644
--- a/framework/3rdParty/TextHighlighter/Text/diff.xml
+++ b/framework/Vendor/TextHighlighter/Text/diff.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/dtd.xml b/framework/Vendor/TextHighlighter/Text/dtd.xml
index 8e795313..8e795313 100644
--- a/framework/3rdParty/TextHighlighter/Text/dtd.xml
+++ b/framework/Vendor/TextHighlighter/Text/dtd.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/generate b/framework/Vendor/TextHighlighter/Text/generate
index 41048d91..41048d91 100644
--- a/framework/3rdParty/TextHighlighter/Text/generate
+++ b/framework/Vendor/TextHighlighter/Text/generate
diff --git a/framework/3rdParty/TextHighlighter/Text/generate.bat b/framework/Vendor/TextHighlighter/Text/generate.bat
index 3170190e..3170190e 100644
--- a/framework/3rdParty/TextHighlighter/Text/generate.bat
+++ b/framework/Vendor/TextHighlighter/Text/generate.bat
diff --git a/framework/3rdParty/TextHighlighter/Text/html.xml b/framework/Vendor/TextHighlighter/Text/html.xml
index c25a3ec5..c25a3ec5 100644
--- a/framework/3rdParty/TextHighlighter/Text/html.xml
+++ b/framework/Vendor/TextHighlighter/Text/html.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/java.xml b/framework/Vendor/TextHighlighter/Text/java.xml
index cafbec05..cafbec05 100644
--- a/framework/3rdParty/TextHighlighter/Text/java.xml
+++ b/framework/Vendor/TextHighlighter/Text/java.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/javascript.xml b/framework/Vendor/TextHighlighter/Text/javascript.xml
index de5e0117..de5e0117 100644
--- a/framework/3rdParty/TextHighlighter/Text/javascript.xml
+++ b/framework/Vendor/TextHighlighter/Text/javascript.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/mysql.xml b/framework/Vendor/TextHighlighter/Text/mysql.xml
index f0f1ef51..f0f1ef51 100644
--- a/framework/3rdParty/TextHighlighter/Text/mysql.xml
+++ b/framework/Vendor/TextHighlighter/Text/mysql.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/package.xml b/framework/Vendor/TextHighlighter/Text/package.xml
index 4cac5d6c..4cac5d6c 100644
--- a/framework/3rdParty/TextHighlighter/Text/package.xml
+++ b/framework/Vendor/TextHighlighter/Text/package.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/perl.xml b/framework/Vendor/TextHighlighter/Text/perl.xml
index f4317653..f4317653 100644
--- a/framework/3rdParty/TextHighlighter/Text/perl.xml
+++ b/framework/Vendor/TextHighlighter/Text/perl.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/php.xml b/framework/Vendor/TextHighlighter/Text/php.xml
index de00096a..de00096a 100644
--- a/framework/3rdParty/TextHighlighter/Text/php.xml
+++ b/framework/Vendor/TextHighlighter/Text/php.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/prado.xml b/framework/Vendor/TextHighlighter/Text/prado.xml
index 480b0bbe..480b0bbe 100644
--- a/framework/3rdParty/TextHighlighter/Text/prado.xml
+++ b/framework/Vendor/TextHighlighter/Text/prado.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/python.xml b/framework/Vendor/TextHighlighter/Text/python.xml
index 0baef89c..0baef89c 100644
--- a/framework/3rdParty/TextHighlighter/Text/python.xml
+++ b/framework/Vendor/TextHighlighter/Text/python.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/ruby.xml b/framework/Vendor/TextHighlighter/Text/ruby.xml
index 191f893a..191f893a 100644
--- a/framework/3rdParty/TextHighlighter/Text/ruby.xml
+++ b/framework/Vendor/TextHighlighter/Text/ruby.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/sample.css b/framework/Vendor/TextHighlighter/Text/sample.css
index 8b5c9d24..8b5c9d24 100644
--- a/framework/3rdParty/TextHighlighter/Text/sample.css
+++ b/framework/Vendor/TextHighlighter/Text/sample.css
diff --git a/framework/3rdParty/TextHighlighter/Text/sql.xml b/framework/Vendor/TextHighlighter/Text/sql.xml
index dcfcfab6..dcfcfab6 100644
--- a/framework/3rdParty/TextHighlighter/Text/sql.xml
+++ b/framework/Vendor/TextHighlighter/Text/sql.xml
diff --git a/framework/3rdParty/TextHighlighter/Text/xml.xml b/framework/Vendor/TextHighlighter/Text/xml.xml
index a80ffc1a..a80ffc1a 100644
--- a/framework/3rdParty/TextHighlighter/Text/xml.xml
+++ b/framework/Vendor/TextHighlighter/Text/xml.xml
diff --git a/framework/3rdParty/TextHighlighter/highlight.css b/framework/Vendor/TextHighlighter/highlight.css
index c581fb9f..c581fb9f 100644
--- a/framework/3rdParty/TextHighlighter/highlight.css
+++ b/framework/Vendor/TextHighlighter/highlight.css
diff --git a/framework/3rdParty/TinyMCE/license.txt b/framework/Vendor/TinyMCE/license.txt
index 60d6d4c8..60d6d4c8 100644
--- a/framework/3rdParty/TinyMCE/license.txt
+++ b/framework/Vendor/TinyMCE/license.txt
diff --git a/framework/3rdParty/TinyMCE/tiny_mce.md5 b/framework/Vendor/TinyMCE/tiny_mce.md5
index 48eb6ae9..48eb6ae9 100644
--- a/framework/3rdParty/TinyMCE/tiny_mce.md5
+++ b/framework/Vendor/TinyMCE/tiny_mce.md5
diff --git a/framework/3rdParty/TinyMCE/tiny_mce.tar b/framework/Vendor/TinyMCE/tiny_mce.tar
index e8283608..e8283608 100644
--- a/framework/3rdParty/TinyMCE/tiny_mce.tar
+++ b/framework/Vendor/TinyMCE/tiny_mce.tar
diff --git a/framework/3rdParty/WsdlGen/Wsdl.php b/framework/Vendor/WsdlGen/Wsdl.php
index 7344812b..7344812b 100644
--- a/framework/3rdParty/WsdlGen/Wsdl.php
+++ b/framework/Vendor/WsdlGen/Wsdl.php
diff --git a/framework/3rdParty/WsdlGen/WsdlGenerator.php b/framework/Vendor/WsdlGen/WsdlGenerator.php
index e4624ef4..e4624ef4 100644
--- a/framework/3rdParty/WsdlGen/WsdlGenerator.php
+++ b/framework/Vendor/WsdlGen/WsdlGenerator.php
diff --git a/framework/3rdParty/WsdlGen/WsdlMessage.php b/framework/Vendor/WsdlGen/WsdlMessage.php
index 3597c977..3597c977 100644
--- a/framework/3rdParty/WsdlGen/WsdlMessage.php
+++ b/framework/Vendor/WsdlGen/WsdlMessage.php
diff --git a/framework/3rdParty/WsdlGen/WsdlOperation.php b/framework/Vendor/WsdlGen/WsdlOperation.php
index 91adbda4..91adbda4 100644
--- a/framework/3rdParty/WsdlGen/WsdlOperation.php
+++ b/framework/Vendor/WsdlGen/WsdlOperation.php
diff --git a/framework/3rdParty/readme.html b/framework/Vendor/readme.html
index 8e57dd4e..a2368f63 100644
--- a/framework/3rdParty/readme.html
+++ b/framework/Vendor/readme.html
@@ -153,14 +153,14 @@ projects.
 </tr>
 
 <tr>
-	<td><a href="PhpShell">3rdParty/PhpShell</a></td>
+	<td><a href="PhpShell">Vendor/PhpShell</a></td>
 	<td><a href="http://pear.php.net/package/PHP_Shell">PHP_Shell</a></td>
 	<td><a href="http://www.opensource.org/licenses/mit-license.php">MIT</a></td>
 	<td>An interactive PHP Shell</td>
 	<td>Available throught the prado-cli.php script.</td>
 </tr>
 <tr>
-	<td><a href="FirePHPCore">3rdParty/FirePHPCore</a></td>
+	<td><a href="FirePHPCore">Vendor/FirePHPCore</a></td>
 	<td><a href="http://www.firephp.org/">FirePHPCore</a></td>
 	<td><a href="FirePHPCore/LICENSE">BSD</a></td>
 	<td>FirePHP enables you to log to your Firebug Console using a simple PHP method call.</td>
diff --git a/framework/Web/Services/TSoapServer.php b/framework/Web/Services/TSoapServer.php
index 7bfa7d86..f737ae20 100644
--- a/framework/Web/Services/TSoapServer.php
+++ b/framework/Web/Services/TSoapServer.php
@@ -195,14 +195,14 @@ class TSoapServer extends \Prado\TApplicationComponent
 				$wsdl=$cache->get(self::WSDL_CACHE_PREFIX.$providerClass);
 				if(is_string($wsdl))
 					return $wsdl;
-				Prado::using('System.3rdParty.WsdlGen.WsdlGenerator');
+				Prado::using('System.Vendor.WsdlGen.WsdlGenerator');
 				$wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass,$wsdl);
 				return $wsdl;
 			}
 			else
 			{
-				Prado::using('System.3rdParty.WsdlGen.WsdlGenerator');
+				Prado::using('System.Vendor.WsdlGen.WsdlGenerator');
 				return WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 			}
 		}
diff --git a/framework/Web/UI/WebControls/TAccordion.php b/framework/Web/UI/WebControls/TAccordion.php
index 22e0bffd..e615324a 100644
--- a/framework/Web/UI/WebControls/TAccordion.php
+++ b/framework/Web/UI/WebControls/TAccordion.php
@@ -13,6 +13,7 @@
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * Class TAccordion.
diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php
index 291a29e6..43834246 100644
--- a/framework/Web/UI/WebControls/TBaseValidator.php
+++ b/framework/Web/UI/WebControls/TBaseValidator.php
@@ -12,6 +12,7 @@
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataTypeException;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * TBaseValidator class
diff --git a/framework/Web/UI/WebControls/TColorPicker.php b/framework/Web/UI/WebControls/TColorPicker.php
index e114630f..876c464e 100644
--- a/framework/Web/UI/WebControls/TColorPicker.php
+++ b/framework/Web/UI/WebControls/TColorPicker.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * TColorPicker class.
diff --git a/framework/Web/UI/WebControls/TColorPickerClientSide.php b/framework/Web/UI/WebControls/TColorPickerClientSide.php
index ba0a64a8..e335fb37 100644
--- a/framework/Web/UI/WebControls/TColorPickerClientSide.php
+++ b/framework/Web/UI/WebControls/TColorPickerClientSide.php
@@ -10,6 +10,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\UI\TClientSideOptions;
 
 /**
  * TColorPickerClientSide class.
diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index a1a2b19d..d88eb38a 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  *
diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php
index 8535c3cf..3856cdb1 100644
--- a/framework/Web/UI/WebControls/THtmlArea.php
+++ b/framework/Web/UI/WebControls/THtmlArea.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * THtmlArea class
@@ -424,8 +425,8 @@ class THtmlArea extends TTextBox
 	 */
 	protected function getScriptDeploymentPath()
 	{
-		$tarfile = Prado::getPathOfNamespace('System.3rdParty.TinyMCE.tiny_mce', '.tar');
-		$md5sum = Prado::getPathOfNamespace('System.3rdParty.TinyMCE.tiny_mce', '.md5');
+		$tarfile = Prado::getPathOfNamespace('System.Vendor.TinyMCE.tiny_mce', '.tar');
+		$md5sum = Prado::getPathOfNamespace('System.Vendor.TinyMCE.tiny_mce', '.md5');
 		if($tarfile===null || $md5sum===null)
 			throw new TConfigurationException('htmlarea_tarfile_invalid');
 		$url = $this->getApplication()->getAssetManager()->publishTarFile($tarfile, $md5sum);
diff --git a/framework/Web/UI/WebControls/THtmlArea4.php b/framework/Web/UI/WebControls/THtmlArea4.php
index ae11ab8c..c5410ffd 100644
--- a/framework/Web/UI/WebControls/THtmlArea4.php
+++ b/framework/Web/UI/WebControls/THtmlArea4.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * THtmlArea4 class
diff --git a/framework/Web/UI/WebControls/TKeyboard.php b/framework/Web/UI/WebControls/TKeyboard.php
index e075a624..2aeb9d9e 100644
--- a/framework/Web/UI/WebControls/TKeyboard.php
+++ b/framework/Web/UI/WebControls/TKeyboard.php
@@ -12,6 +12,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * Class TKeyboard.
diff --git a/framework/Web/UI/WebControls/TReCaptcha.php b/framework/Web/UI/WebControls/TReCaptcha.php
index 5af6b0c5..c45c20da 100644
--- a/framework/Web/UI/WebControls/TReCaptcha.php
+++ b/framework/Web/UI/WebControls/TReCaptcha.php
@@ -12,6 +12,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * TReCaptcha class.
diff --git a/framework/Web/UI/WebControls/TReCaptchaValidator.php b/framework/Web/UI/WebControls/TReCaptchaValidator.php
index 84856c5c..80e195e0 100644
--- a/framework/Web/UI/WebControls/TReCaptchaValidator.php
+++ b/framework/Web/UI/WebControls/TReCaptchaValidator.php
@@ -11,6 +11,7 @@
  */
 
 namespace Prado\Web\UI\WebControls;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * TReCaptchaValidator class
diff --git a/framework/Web/UI/WebControls/TSafeHtml.php b/framework/Web/UI/WebControls/TSafeHtml.php
index 1edce6de..aa5316e0 100644
--- a/framework/Web/UI/WebControls/TSafeHtml.php
+++ b/framework/Web/UI/WebControls/TSafeHtml.php
@@ -79,7 +79,7 @@ class TSafeHtml extends \Prado\Web\UI\TControl
 	 */
 	protected function parseSafeHtml($text)
 	{
-		$renderer = Prado::createComponent('System.3rdParty.SafeHtml.TSafeHtmlParser');
+		$renderer = Prado::createComponent('System.Vendor.SafeHtml.TSafeHtmlParser');
 		return $renderer->parse($text, $this->getRepackUTF7());
 	}
 }
diff --git a/framework/Web/UI/WebControls/TTabPanel.php b/framework/Web/UI/WebControls/TTabPanel.php
index 97337fee..4186ce3d 100644
--- a/framework/Web/UI/WebControls/TTabPanel.php
+++ b/framework/Web/UI/WebControls/TTabPanel.php
@@ -13,6 +13,7 @@
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
 use Prado\Exceptions\TInvalidDataValueException;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * Class TTabPanel.
diff --git a/framework/Web/UI/WebControls/TTextBox.php b/framework/Web/UI/WebControls/TTextBox.php
index 14a333e8..4e8252ca 100644
--- a/framework/Web/UI/WebControls/TTextBox.php
+++ b/framework/Web/UI/WebControls/TTextBox.php
@@ -529,7 +529,7 @@ class TTextBox extends \Prado\Web\UI\WebControls\TWebControl implements \Prado\W
 	protected function getSafeTextParser()
 	{
 		if(!self::$_safeTextParser)
-			self::$_safeTextParser=Prado::createComponent('System.3rdParty.SafeHtml.TSafeHtmlParser');
+			self::$_safeTextParser=Prado::createComponent('System.Vendor.SafeHtml.TSafeHtmlParser');
 		return self::$_safeTextParser;
 	}
 
diff --git a/framework/Web/UI/WebControls/TTextHighlighter.php b/framework/Web/UI/WebControls/TTextHighlighter.php
index ea4e92ec..b6a0b46e 100644
--- a/framework/Web/UI/WebControls/TTextHighlighter.php
+++ b/framework/Web/UI/WebControls/TTextHighlighter.php
@@ -74,7 +74,7 @@ class TTextHighlighter extends TTextProcessor
 	/**
 	 * @param string language (case-insensitive) whose syntax is to be used for highlighting.
 	 * Valid values are those file names (without suffix) that are contained
-	 * in '3rdParty/TextHighlighter/Text/Highlighter'. Currently, the following languages are supported:
+	 * in 'Vendor/TextHighlighter/Text/Highlighter'. Currently, the following languages are supported:
 	 * ABAP, CPP, CSS, DIFF, DTD, HTML, JAVA, JAVASCRIPT,
 	 * MYSQL, PERL, PHP, PRADO, PYTHON, RUBY, SQL, XML
 	 * If a language is not supported, it will be displayed as plain text.
@@ -165,7 +165,7 @@ class TTextHighlighter extends TTextProcessor
 	protected function registerStyleSheet()
 	{
 		$cs=$this->getPage()->getClientScript();
-		$cssFile=Prado::getPathOfNamespace('Prado\\3rdParty\\TextHighlighter\\highlight','.css');
+		$cssFile=Prado::getPathOfNamespace('Prado\\Vendor\\TextHighlighter\\highlight','.css');
 		$cssKey='prado:TTextHighlighter:'.$cssFile;
 		if(!$cs->isStyleSheetFileRegistered($cssKey))
 			$cs->registerStyleSheetFile($cssKey, $this->publishFilePath($cssFile));
@@ -181,7 +181,7 @@ class TTextHighlighter extends TTextProcessor
 	{
 		try
 		{
-			$highlighter=\Prado\3rdParty\TextHighlighter\Text\Highlighter::factory($this->getLanguage());
+			$highlighter=\Prado\Vendor\TextHighlighter\Text\Highlighter::factory($this->getLanguage());
 		}
 		catch(\Exception $e)
 		{
diff --git a/framework/Web/UI/WebControls/TValidationSummary.php b/framework/Web/UI/WebControls/TValidationSummary.php
index 64570356..765d92ff 100644
--- a/framework/Web/UI/WebControls/TValidationSummary.php
+++ b/framework/Web/UI/WebControls/TValidationSummary.php
@@ -11,6 +11,7 @@
 
 namespace Prado\Web\UI\WebControls;
 use Prado\TPropertyValue;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * TValidationSummary class
diff --git a/index.html b/index.html
index 4fb55fcf..50e1bb45 100644
--- a/index.html
+++ b/index.html
@@ -142,7 +142,7 @@ A Textmate extension can be found under <b>editors/Textmate</b>.
 <li>Tomasz Wolny - TTabPanel control</li>
 <li>All PRADO users - great suggestions, feedback and support</li>
 <li>ASP.NET 2.0 for its great inspiration and reference</li>
-<li>All <a href="framework/3rdParty/readme.html">third-party work</a> used in PRADO</li>
+<li>All <a href="framework/Vendor/readme.html">third-party work</a> used in PRADO</li>
 </ul>